diff --git a/Net-SSLeay-1.68.tar.gz b/Net-SSLeay-1.68.tar.gz deleted file mode 100644 index 49bac48..0000000 --- a/Net-SSLeay-1.68.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1701e24ec683529cb114e7b7877632f2e965a81381a70b696ee0692ee1e75cd4 -size 384100 diff --git a/Net-SSLeay-1.69.tar.gz b/Net-SSLeay-1.69.tar.gz new file mode 100644 index 0000000..cf5111c --- /dev/null +++ b/Net-SSLeay-1.69.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bad0fdd74ee0e2153f817574c109ff0d4d8bedf2518e3244191f6b800e543db2 +size 385706 diff --git a/net-ssleay-no-ofb.patch b/net-ssleay-no-ofb.patch new file mode 100644 index 0000000..0828422 --- /dev/null +++ b/net-ssleay-no-ofb.patch @@ -0,0 +1,25 @@ +Index: Net-SSLeay-1.69/t/local/33_x509_create_cert.t +=================================================================== +--- Net-SSLeay-1.69.orig/t/local/33_x509_create_cert.t ++++ Net-SSLeay-1.69/t/local/33_x509_create_cert.t +@@ -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; +@@ -100,8 +100,9 @@ is(Net::SSLeay::X509_NAME_cmp($ca_issuer + 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"); ++# OFB is not in our openssl 1.0.2 - Marcus ++# 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"); + diff --git a/perl-Net-SSLeay.changes b/perl-Net-SSLeay.changes index 5f3b2f5..44ab0c2 100644 --- a/perl-Net-SSLeay.changes +++ b/perl-Net-SSLeay.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Jun 24 08:05:15 UTC 2015 - meissner@suse.com + +- net-ssleay-no-ofb.patch: disable the OFB cipher, not exported by + our openssl 1.0.2 currently. + +------------------------------------------------------------------- +Tue Jun 23 09:33:48 UTC 2015 - zaitor@opensuse.org + +- Update to version 1.69: + + Testing with OpenSSL 1.0.2, 1.0.2a. OK. + + Completed LibreSSL compatibility. + + Improved compatibility with OpenSSL 1.0.2a. + + Added the X509_check_* functions introduced in OpenSSL 1.0.2. + + Added support for X509_V_FLAG_TRUSTED_FIRST constant. Patch + allows get_keyblock_size to work correctly with OpenSSL 1.0.1 + and later versions. + ------------------------------------------------------------------- Tue Apr 7 14:05:17 UTC 2015 - vcizek@suse.com diff --git a/perl-Net-SSLeay.spec b/perl-Net-SSLeay.spec index da98de4..2943034 100644 --- a/perl-Net-SSLeay.spec +++ b/perl-Net-SSLeay.spec @@ -19,7 +19,7 @@ %bcond_with test Name: perl-Net-SSLeay -Version: 1.68 +Version: 1.69 Release: 0 %define cpan_name Net-SSLeay Summary: Perl extension for using OpenSSL @@ -27,6 +27,8 @@ License: OpenSSL Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Net-SSLeay/ Source: http://www.cpan.org/modules/by-module/Net/Net-SSLeay-%{version}.tar.gz +# Broken by 1.0.2c openssl update ... probably an openssl bug. -Marcus +Patch0: net-ssleay-no-ofb.patch BuildRequires: openssl BuildRequires: openssl-devel BuildRequires: perl @@ -51,6 +53,7 @@ Net::SSLeay module basically comprise of: %prep %setup -q -n %{cpan_name}-%{version} +%patch0 -p1 # replace rest of /usr/local/bin/perl with /usr/bin/perl for f in $(find . -type f -exec grep -l "/usr/local/bin/perl" {} \; ); do sed -i -e "s@/usr/local/bin/perl@perl@g" $f