[libhttp-daemon-ssl-perl] 07/07: Import Debian changes 1.04-3.1
Mike Gabriel
sunweaver at debian.org
Mon Sep 18 16:02:15 UTC 2017
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository libhttp-daemon-ssl-perl.
commit 2b1100d1a724e29e758ae7c32d4f1bfe3b016cb8
Author: Mike Gabriel <sunweaver at debian.org>
Date: Tue Dec 27 13:34:04 2016 +0100
Import Debian changes 1.04-3.1
libhttp-daemon-ssl-perl (1.04-3.1) unstable; urgency=medium
* Non-maintainer upload.
* debian/{control,compat}: Bump to DH version level 9.
* debian/patches: Add testmodule.diff. Fix FTBFS during unit testing
due to incompatibility with latest SSL libs. (Closes: #711628).
This patch amongst other things regenerate the test certificates at
build time.
* debian/rules: Save upstream's certificate files, so that the package
build stays idempotent.
---
debian/changelog | 13 ++++++
debian/compat | 2 +-
debian/control | 2 +-
debian/patches/series | 1 +
debian/patches/testmodule.diff | 94 ++++++++++++++++++++++++++++++++++++++++++
debian/rules | 13 ++++++
6 files changed, 123 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 44a3d32..59a5933 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+libhttp-daemon-ssl-perl (1.04-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/{control,compat}: Bump to DH version level 9.
+ * debian/patches: Add testmodule.diff. Fix FTBFS during unit testing
+ due to incompatibility with latest SSL libs. (Closes: #711628).
+ This patch amongst other things regenerate the test certificates at
+ build time.
+ * debian/rules: Save upstream's certificate files, so that the package
+ build stays idempotent.
+
+ -- Mike Gabriel <sunweaver at debian.org> Tue, 27 Dec 2016 13:34:04 +0100
+
libhttp-daemon-ssl-perl (1.04-3) unstable; urgency=low
* Prepare for libwww-perl 6; thanks to Nicholas Bamber. Closes: #620485.
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index df77356..1f45290 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: libhttp-daemon-ssl-perl
Section: perl
Priority: extra
-Build-Depends: debhelper (>= 8)
+Build-Depends: debhelper (>= 9)
Build-Depends-Indep: perl, libio-socket-ssl-perl, libhttp-daemon-perl | libwww-perl (<< 6)
Maintainer: Matej Vela <vela at debian.org>
Standards-Version: 3.9.1
diff --git a/debian/patches/series b/debian/patches/series
index 6085f13..6708fc8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
pod-errors.diff
+testmodule.diff
diff --git a/debian/patches/testmodule.diff b/debian/patches/testmodule.diff
new file mode 100644
index 0000000..733ed56
--- /dev/null
+++ b/debian/patches/testmodule.diff
@@ -0,0 +1,94 @@
+From 2b728bdd6df8968d1dae92856ac5ebed85d71d2a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Wed, 14 May 2014 10:36:50 +0200
+Subject: [PATCH] Generate keys and certificates at test-time
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fixes <https://rt.cpan.org/Public/Bug/Display.html?id=88998>.
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ Makefile.PL | 2 ++
+ t/testmodule.t | 38 +++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 39 insertions(+), 1 deletion(-)
+
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -10,5 +10,7 @@
+ 'VERSION_FROM' => 'SSL.pm',
+ 'DISTNAME' => 'HTTP-Daemon-SSL',
+ 'PREREQ_PM' => { 'HTTP::Daemon' => 1.0, 'IO::Socket::SSL' => 0.93 },
++ 'BUILD_REQUIRES' => { 'HTTP::Daemon' => 1.0, 'IO::Socket::SSL' => 0.93,
++ 'IO::Socket::SSL::Utils' => 0 },
+ 'dist' => { COMPRESS => 'gzip', SUFFIX => 'gz', },
+ );
+--- a/t/testmodule.t
++++ b/t/testmodule.t
+@@ -4,10 +4,11 @@
+
+ use HTTP::Daemon::SSL;
+ use HTTP::Status;
++use IO::Socket::SSL::Utils;
+ eval {require "t/ssl_settings.req";} ||
+ eval {require "ssl_settings.req";};
+
+-$numtests = 9;
++$numtests = 14;
+ $|=1;
+ $SIG{PIPE}='IGNORE';
+
+@@ -22,6 +23,41 @@
+
+ $test = 0;
+
++my ($ca_cert, $ca_key) = CERT_create(
++ subject => { commonName => 'Dummy IO::Socket::SSL Certificate Authority' },
++ CA => 1,
++);
++(defined $ca_cert and defined $ca_key) || print 'not ';
++&ok('authority certificate generated');
++
++my ($server_cert, $server_key) = CERT_create(
++ subject => { commonName => 'IO::Socket::SSL Dummy Server Certificate' },
++ CA => 0,
++ issuer_cert => $ca_cert,
++ issuer_key => $ca_key,
++);
++(defined $server_cert and defined $server_key) || print 'not ';
++&ok('server certificate generated');
++
++eval { PEM_cert2file($ca_cert, 'certs/test-ca.pem') };
++(!$@ and -s 'certs/test-ca.pem') || print 'not ';
++&ok('authority certificate saved');
++
++PEM_cert2file($server_cert, 'certs/server-cert.pem');
++(!$@ and -s 'certs/server-cert.pem') || print 'not ';
++&ok('server certificate saved');
++
++PEM_key2file($server_key, 'certs/server-key.pem');
++(!$@ and -s 'certs/server-key.pem') || print 'not ';
++&ok('server key saved');
++
++# freeing fails now <https://bugzilla.redhat.com/show_bug.cgi?id=1097640>
++#CERT_free($ca_cert);
++#KEY_free($ca_key);
++#CERT_free($server_cert);
++#KEY_free($server_key);
++
++
+ unless (fork) {
+ sleep 1;
+
+@@ -57,8 +93,10 @@
+ Listen => 5,
+ Timeout => 30,
+ ReuseAddr => 1,
++ SSL_cipher_list => 'ALL:!LOW',
+ SSL_verify_mode => 0x00,
+ SSL_ca_file => "certs/test-ca.pem",
++ SSL_key_file => "certs/server-key.pem",
+ SSL_cert_file => "certs/server-cert.pem");
+
+ if (!$server) {
diff --git a/debian/rules b/debian/rules
index 2d33f6a..af61dcf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,3 +2,16 @@
%:
dh $@
+
+override_dh_auto_build:
+ cp certs/server-cert.pem certs/server-cert.pem.orig
+ cp certs/server-key.pem certs/server-key.pem.orig
+ cp certs/test-ca.pem certs/test-ca.pem.orig
+ dh_auto_build
+
+override_dh_auto_clean:
+ dh_auto_clean
+ -mv certs/server-cert.pem.orig certs/server-cert.pem
+ -mv certs/server-key.pem.orig certs/server-key.pem
+ -mv certs/test-ca.pem.orig certs/test-ca.pem
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libhttp-daemon-ssl-perl.git
More information about the Pkg-perl-cvs-commits
mailing list