diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-06-12 03:40:12 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-06-13 23:01:07 -0400 |
| commit | 0ad8f76f7ff3233533dbc0afb109946d5c459b1e (patch) | |
| tree | 243a9483c1099392668b102f988c45892459b5ea /gnu | |
| parent | 4c50e5ab3a393c6d86fc6362c58f7ecf32dd9680 (diff) | |
| download | patches-0ad8f76f7ff3233533dbc0afb109946d5c459b1e.tar patches-0ad8f76f7ff3233533dbc0afb109946d5c459b1e.tar.gz | |
gnu: perl-net-ssleay: Disable test that fails with openssl-1.0.2b.
* gnu/packages/patches/perl-net-ssleay-disable-ede-test.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/openssl.scm (perl-net-ssleay): Add patch.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/openssl.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/patches/perl-net-ssleay-disable-ede-test.patch | 23 |
2 files changed, 27 insertions, 1 deletions
diff --git a/gnu/packages/openssl.scm b/gnu/packages/openssl.scm index 1ed7a7a1f2..5ed0f63268 100644 --- a/gnu/packages/openssl.scm +++ b/gnu/packages/openssl.scm @@ -91,7 +91,10 @@ "Net-SSLeay-" version ".tar.gz")) (sha256 (base32 - "1m2wwzhjwsg0drlhp9w12fl6bsgj69v8gdz72jqrqll3qr7f408p")))) + "1m2wwzhjwsg0drlhp9w12fl6bsgj69v8gdz72jqrqll3qr7f408p")) + (patches + ;; XXX Try removing this patch for perl-net-ssleay > 1.68 + (list (search-patch "perl-net-ssleay-disable-ede-test.patch"))))) (build-system perl-build-system) (inputs `(("openssl" ,openssl))) (arguments diff --git a/gnu/packages/patches/perl-net-ssleay-disable-ede-test.patch b/gnu/packages/patches/perl-net-ssleay-disable-ede-test.patch new file mode 100644 index 0000000000..16f136fb54 --- /dev/null +++ b/gnu/packages/patches/perl-net-ssleay-disable-ede-test.patch @@ -0,0 +1,23 @@ +Disable a test that fails with openssl-1.0.2b. + +--- Net-SSLeay-1.68/t/local/33_x509_create_cert.t.orig 2014-06-07 02:01:39.000000000 -0400 ++++ Net-SSLeay-1.68/t/local/33_x509_create_cert.t 2015-06-12 03:38:57.620286888 -0400 +@@ -2,7 +2,7 @@ + + use strict; + use warnings; +-use Test::More tests => 123; ++use Test::More tests => 122; + use Net::SSLeay qw/MBSTRING_ASC MBSTRING_UTF8 EVP_PK_RSA EVP_PKT_SIGN EVP_PKT_ENC/; + use File::Spec; + use utf8; +@@ -101,7 +101,8 @@ + 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"); ++ # This test fails with openssl-1.0.2b ++ #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"); + |