[Pkg-openssl-changes] r326 - in openssl-blacklist: . trunk trunk/debian

[jamie-guest at alioth.debian.org]

Author: jamie-guest
Date: 2008-06-16 17:30:56 +0000 (Mon, 16 Jun 2008)
New Revision: 326

Added:
   openssl-blacklist/trunk/
Removed:
   openssl-blacklist/trunk/
Modified:
   openssl-blacklist/trunk/debian/changelog
   openssl-blacklist/trunk/debian/rules
Log:
merge kees' changes


Copied: openssl-blacklist/trunk (from rev 322, openssl-blacklist/trunk)


Property changes on: openssl-blacklist/trunk
___________________________________________________________________
Name: bzr:revision-info
   + timestamp: 2008-06-11 16:33:03.934999943 -0400
committer: Jamie Strandboge <jamie at canonical.com>
properties: 
	branch-nick: trunk

Name: bzr:file-ids
   + 
Name: bzr:ancestry:v3-trunk1
   + svn-v3-trunk1:e5c9a478-d7fa-0310-a32d-da2538be928f:openssl-blacklist%2Ftrunk:323

Name: bzr:revision-id:v3-trunk1
   + 7 jamie at canonical.com-20080611181628-1jidf2vvbj6fhrej
8 jamie at canonical.com-20080611182038-0jvtotmqzgpztqmy
9 jamie at canonical.com-20080611203303-ntv6xbllqf4nke36

Name: svk:merge
   + e5c9a478-d7fa-0310-a32d-da2538be928f:/openssl-blacklist/trunk:323


Modified: openssl-blacklist/trunk/debian/changelog
===================================================================
--- openssl-blacklist/trunk/debian/changelog	2008-06-11 18:42:23 UTC (rev 322)
+++ openssl-blacklist/trunk/debian/changelog	2008-06-16 17:30:56 UTC (rev 326)
@@ -1,4 +1,4 @@
-openssl-blacklist (0.3.3) unstable; urgency=low
+openssl-blacklist (0.4) unstable; urgency=low
 
   * allow checking of certificate requests
   * only check moduli with an exponent of 65537 (the default on Debian/Ubuntu)

Modified: openssl-blacklist/trunk/debian/rules
===================================================================
--- openssl-blacklist/trunk/debian/rules	2008-06-11 18:42:23 UTC (rev 322)
+++ openssl-blacklist/trunk/debian/rules	2008-06-16 17:30:56 UTC (rev 326)
@@ -32,7 +32,7 @@
 	# Trim blacklists to reduce the size of the package without too
 	# drastically creating false positives.
 	for keysize in 512 1024 2048 4096; do \
-		cat $(CURDIR)/debian/blacklist.prefix > $(CURDIR)/debian/tmp/usr/share/openssl-blacklist/blacklist.$$keysize; \
+		cat $(CURDIR)/debian/blacklist.prefix > $(CURDIR)/debian/tmp/usr/share/openssl-blacklist/blacklist.RSA-$$keysize; \
 		cat $(CURDIR)/blacklists/be32/blacklist-$$keysize.db $(CURDIR)/blacklists/le32/blacklist-$$keysize.db $(CURDIR)/blacklists/le64/blacklist-$$keysize.db | cut -d ' ' -f 5 | cut -b21- | sort >> $(CURDIR)/debian/tmp/usr/share/openssl-blacklist/blacklist.RSA-$$keysize; \
 	done