From be67145ac8f81ad83265374a438dbecc8d0c53f832b55dbe22bd1a4d09118d98 Mon Sep 17 00:00:00 2001 From: Pedro Monreal Gonzalez Date: Mon, 5 Jun 2017 11:51:32 +0000 Subject: [PATCH] Accepting request 501128 from home:vitezslav_cizek:branches:devel:languages:perl - update to the latest upstream version 1.81 * introduces compatibility with openssl 1.1.x - drop net-ssleay-no-ofb.patch (not needed anymore) OBS-URL: https://build.opensuse.org/request/show/501128 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-Net-SSLeay?expand=0&rev=36 --- Net-SSLeay-1.69.tar.gz | 3 --- Net-SSLeay-1.81.tar.gz | 3 +++ net-ssleay-no-ofb.patch | 25 ------------------------- perl-Net-SSLeay.changes | 7 +++++++ perl-Net-SSLeay.spec | 9 +++------ 5 files changed, 13 insertions(+), 34 deletions(-) delete mode 100644 Net-SSLeay-1.69.tar.gz create mode 100644 Net-SSLeay-1.81.tar.gz delete mode 100644 net-ssleay-no-ofb.patch diff --git a/Net-SSLeay-1.69.tar.gz b/Net-SSLeay-1.69.tar.gz deleted file mode 100644 index cf5111c..0000000 --- a/Net-SSLeay-1.69.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bad0fdd74ee0e2153f817574c109ff0d4d8bedf2518e3244191f6b800e543db2 -size 385706 diff --git a/Net-SSLeay-1.81.tar.gz b/Net-SSLeay-1.81.tar.gz new file mode 100644 index 0000000..575ec82 --- /dev/null +++ b/Net-SSLeay-1.81.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00cbb6174e628b42178e1445c9fd5a3c5ae2cfd6a5a43e03610ba14786f21b7d +size 396631 diff --git a/net-ssleay-no-ofb.patch b/net-ssleay-no-ofb.patch deleted file mode 100644 index 0828422..0000000 --- a/net-ssleay-no-ofb.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 44ab0c2..d84ca9e 100644 --- a/perl-Net-SSLeay.changes +++ b/perl-Net-SSLeay.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jun 5 10:48:38 UTC 2017 - vcizek@suse.com + +- update to the latest upstream version 1.81 + * introduces compatibility with openssl 1.1.x +- drop net-ssleay-no-ofb.patch (not needed anymore) + ------------------------------------------------------------------- Wed Jun 24 08:05:15 UTC 2015 - meissner@suse.com diff --git a/perl-Net-SSLeay.spec b/perl-Net-SSLeay.spec index 2943034..fa1e4bc 100644 --- a/perl-Net-SSLeay.spec +++ b/perl-Net-SSLeay.spec @@ -1,7 +1,7 @@ # # spec file for package perl-Net-SSLeay # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %bcond_with test Name: perl-Net-SSLeay -Version: 1.69 +Version: 1.81 Release: 0 %define cpan_name Net-SSLeay Summary: Perl extension for using OpenSSL @@ -27,10 +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: libopenssl-devel BuildRequires: openssl -BuildRequires: openssl-devel BuildRequires: perl BuildRequires: perl-macros BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -53,7 +51,6 @@ 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