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

[jamie-guest at alioth.debian.org]

Author: jamie-guest
Date: 2008-06-19 16:16:44 +0000 (Thu, 19 Jun 2008)
New Revision: 331

Added:
   openssl-blacklist/trunk/
Removed:
   openssl-blacklist/trunk/
Modified:
   openssl-blacklist/trunk/debian/changelog
   openssl-blacklist/trunk/debian/control
   openssl-blacklist/trunk/debian/rules
   openssl-blacklist/trunk/openssl-vulnkey
Log:
merge with kees
update openssl-vulnkey to use GPL version 3


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


Property changes on: openssl-blacklist/trunk
___________________________________________________________________
Name: bzr:revision-info
   + timestamp: 2008-06-19 12:16:08.700999975 -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
svn-v3-trunk1:e5c9a478-d7fa-0310-a32d-da2538be928f:openssl-blacklist%2Ftrunk:330

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
10 jamie at canonical.com-20080616173025-h90sab8mvwv9gnqm
11 jamie at canonical.com-20080619161608-sczbwyhmt8vtbf9m

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


Modified: openssl-blacklist/trunk/debian/changelog
===================================================================
--- openssl-blacklist/trunk/debian/changelog	2008-06-16 17:32:52 UTC (rev 327)
+++ openssl-blacklist/trunk/debian/changelog	2008-06-19 16:16:44 UTC (rev 331)
@@ -1,12 +1,25 @@
+openssl-blacklist (0.4.2) unstable; urgency=low
+
+  * Add openssl to the Build-Deps, since it is required for the tests.
+
+ -- Kees Cook <kees at outflux.net>  Tue, 17 Jun 2008 15:27:38 -0700
+
 openssl-blacklist (0.4.1) unstable; urgency=low
 
+  [ Jamie Strandboge ]
   * add RSA-4096 blacklist for le64
   * install RSA-4096 blacklist
   * don't send STDERR to STDOUT as this may interfere with obtaining the
     modulus with long bits
 
- -- Jamie Strandboge <jamie at ubuntu.com>  Mon, 16 Jun 2008 07:35:18 -0400
+  [ Kees Cook ]
+  * debian/rules:
+    - add new examples (using wildcards)
+    - include run of internal tests during build
+  * debian/control: bump to standards version 3.8.0 (no changes needed)
 
+ -- Kees Cook <kees at outflux.net>  Mon, 16 Jun 2008 11:48:09 -0700
+
 openssl-blacklist (0.4) unstable; urgency=low
 
   * allow checking of certificate requests

Modified: openssl-blacklist/trunk/debian/control
===================================================================
--- openssl-blacklist/trunk/debian/control	2008-06-16 17:32:52 UTC (rev 327)
+++ openssl-blacklist/trunk/debian/control	2008-06-19 16:16:44 UTC (rev 331)
@@ -4,8 +4,8 @@
 Priority: optional
 Maintainer: Kees Cook <kees at outflux.net>
 Uploaders: Jamie Strandboge <jamie at ubuntu.com>, Christoph Martin <christoph.martin at uni-mainz.de>
-Build-Depends: debhelper (>= 5.0.38), python-central (>= 0.5.6)
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 5.0.38), python-central (>= 0.5.6), openssl (>= 0.9.8g-9)
+Standards-Version: 3.8.0.0
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-openssl/openssl-blacklist
 Vcs-Svn: svn://svn.debian.org/pkg-openssl/openssl-blacklist/
 

Modified: openssl-blacklist/trunk/debian/rules
===================================================================
--- openssl-blacklist/trunk/debian/rules	2008-06-16 17:32:52 UTC (rev 327)
+++ openssl-blacklist/trunk/debian/rules	2008-06-19 16:16:44 UTC (rev 331)
@@ -11,6 +11,7 @@
 build-stamp: configure-stamp 
 	dh_testdir
 	# Add here commands to compile the package.
+	sh ./test.sh
 	touch $@
 
 clean:
@@ -46,7 +47,7 @@
 	dh_testroot
 	dh_installchangelogs 
 	dh_installdocs
-	dh_installexamples examples/bad_req.csr examples/bad_rsa.key examples/bad_rsa_password_is_pass.key examples/bad_x509.pem examples/gen_certs.sh examples/getpid.c examples/good_req.csr examples/good_rsa.key examples/good_x509.pem
+	dh_installexamples examples/*.pem examples/*.csr examples/*.key examples/gen_certs.sh examples/getpid.c
 	dh_install --sourcedir=debian/tmp
 #	dh_installmenu
 #	dh_installdebconf	

Modified: openssl-blacklist/trunk/openssl-vulnkey
===================================================================
--- openssl-blacklist/trunk/openssl-vulnkey	2008-06-16 17:32:52 UTC (rev 327)
+++ openssl-blacklist/trunk/openssl-vulnkey	2008-06-19 16:16:44 UTC (rev 331)
@@ -6,7 +6,7 @@
 #    Author: Jamie Strandboge <jamie at canonical.com>
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 2,
+#    it under the terms of the GNU General Public License version 3,
 #    as published by the Free Software Foundation.
 #
 #    This program is distributed in the hope that it will be useful,