Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian....@packages.debian.org
Usertags: pu
As per #789344 the last point release caused libnet-ssleay-perl to
FTBFS because of a test suite failure.
Please find attached a proposed patch.
Thanks,
Dominic.
diff --git a/debian/changelog b/debian/changelog
index d43f89d..f623dcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libnet-ssleay-perl (1.65-1+deb8u1) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Fix FTBFS: apply patch to disable test 33_x509_create_cert.t which fails
+ with openssl 1.0.1t-1+deb8u1 (Closes: #789344)
+
+ -- Dominic Hargreaves <d...@earth.li> Sat, 11 Jun 2016 16:26:36 +0100
+
libnet-ssleay-perl (1.65-1) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/disable_33_x509_create_cert.patch b/debian/patches/disable_33_x509_create_cert.patch
new file mode 100644
index 0000000..5933927
--- /dev/null
+++ b/debian/patches/disable_33_x509_create_cert.patch
@@ -0,0 +1,35 @@
+Description: Removed a test in t/local/33_x509_create_cert.t which fails due to changes in 1.0.1n and later
+Author: Mike McCauley <mi...@airspayce.com>
+Origin: svn://svn.debian.org/svn/net-ssleay@448
+
+Index: t/local/33_x509_create_cert.t
+===================================================================
+--- a/t/local/33_x509_create_cert.t (revision 447)
++++ b/t/local/33_x509_create_cert.t (revision 448)
+@@ -2,7 +2,7 @@
+
+ use strict;
+ use warnings;
+-use Test::More tests => 123;
++use Test::More tests => 121;
+ use Net::SSLeay qw/MBSTRING_ASC MBSTRING_UTF8 EVP_PK_RSA EVP_PKT_SIGN EVP_PKT_ENC/;
+ use File::Spec;
+ use utf8;
+@@ -99,10 +99,13 @@
+ }
+ ok(my $alg1 = Net::SSLeay::EVP_get_cipherbyname("DES-EDE3-CBC"), "EVP_get_cipherbyname");
+ like(my $key_pem3 = Net::SSLeay::PEM_get_string_PrivateKey($pk,"password",$alg1), qr/-----BEGIN (ENCRYPTED|RSA) PRIVATE KEY-----/, "PEM_get_string_PrivateKey+passwd+enc_alg");
+-
+- ok(my $alg2 = Net::SSLeay::EVP_get_cipherbyname("DES-EDE3-OFB"), "EVP_get_cipherbyname");
+- like(my $key_pem4 = Net::SSLeay::PEM_get_string_PrivateKey($pk,"password",$alg2), qr/-----BEGIN (ENCRYPTED|RSA) PRIVATE KEY-----/, "PEM_get_string_PrivateKey+passwd+enc_alg");
+-
++
++# DES-EDE3-OFB has no ASN1 support, detected by changes to do_pk8pkey as of openssl 1.0.1n
++# https://git.openssl.org/?p=openssl.git;a=commit;h=4d9dc0c269be87b92da188df1fbd8bfee4700eb3
++# this test now fails
++# ok(my $alg2 = Net::SSLeay::EVP_get_cipherbyname("DES-EDE3-OFB"), "EVP_get_cipherbyname");
++# like(my $key_pem4 = Net::SSLeay::PEM_get_string_PrivateKey($pk,"password",$alg2), qr/-----BEGIN (ENCRYPTED|RSA) PRIVATE KEY-----/, "PEM_get_string_PrivateKey+passwd+enc_alg");
++
+ is(Net::SSLeay::X509_NAME_print_ex($name), "O=Company Name,C=UK,CN=Common name text X509", "X509_NAME_print_ex");
+
+ # 2014-06-06: Sigh, some versions of openssl have this patch, which afffects the results of this test:
diff --git a/debian/patches/series b/debian/patches/series
index 3462bc3..e4cc605 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
20no-stray-libz-link.patch
+disable_33_x509_create_cert.patch
