pghmcfc pushed to perl-Net-SSLeay (master). "SSLv3_method not dropped in OpenSSL 1.0.2, so revert that change (#1222521)"

[notifications at fedoraproject.org]

From 3db5d975cb16ee2918cd63e534d7294941b14b94 Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul at city-fan.org>
Date: Mon, 18 May 2015 15:23:53 +0100
Subject: SSLv3_method not dropped in OpenSSL 1.0.2, so revert that change
 (#1222521)


diff --git a/Net-SSLeay-1.68-revert-rt101484.patch b/Net-SSLeay-1.68-revert-rt101484.patch
new file mode 100644
index 0000000..b9cdd00
--- /dev/null
+++ b/Net-SSLeay-1.68-revert-rt101484.patch
@@ -0,0 +1,40 @@
+Index: SSLeay.xs
+===================================================================
+--- SSLeay.xs	(revision 430)
++++ SSLeay.xs	(working copy)
+@@ -1413,6 +1413,9 @@
+ #endif
+ #endif
+ 
++#ifndef OPENSSL_NO_SSL3
++#if OPENSSL_VERSION_NUMBER < 0x10002000L
++
+ SSL_CTX *
+ SSL_CTX_v3_new()
+      CODE:
+@@ -1420,6 +1423,9 @@
+      OUTPUT:
+      RETVAL
+ 
++#endif
++#endif
++
+ SSL_CTX *
+ SSL_CTX_v23_new()
+      CODE:
+@@ -3762,9 +3768,15 @@
+ #endif
+ #endif
+ 
++#ifndef OPENSSL_NO_SSL3
++#if OPENSSL_VERSION_NUMBER < 0x10002000L
++
+ const SSL_METHOD *
+ SSLv3_method()
+ 
++#endif
++#endif
++
+ const SSL_METHOD *
+ TLSv1_method()
+ 
diff --git a/perl-Net-SSLeay.spec b/perl-Net-SSLeay.spec
index 3e7dffb..a0181b0 100644
--- a/perl-Net-SSLeay.spec
+++ b/perl-Net-SSLeay.spec
@@ -3,12 +3,13 @@
 
 Name:		perl-Net-SSLeay
 Version:	1.68
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Perl extension for using OpenSSL
 Group:		Development/Libraries
 License:	Artistic 2.0
 URL:		http://search.cpan.org/dist/Net-SSLeay/
 Source0:	http://search.cpan.org/CPAN/authors/id/M/MI/MIKEM/Net-SSLeay-%{version}.tar.gz
+Patch0:		Net-SSLeay-1.68-revert-rt101484.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildRequires:	openssl, openssl-devel
 # =========== Module Build ===========================
@@ -51,6 +52,9 @@ so you can write servers or clients for more complicated applications.
 %prep
 %setup -q -n Net-SSLeay-%{version}
 
+# SSLv3_method not dropped in OpenSSL 1.0.2, so revert that change (#1222521)
+%patch0 -R
+
 # Fix permissions in examples to avoid bogus doc-file dependencies
 chmod -c 644 examples/*
 
@@ -79,6 +83,9 @@ rm -f %{buildroot}%{perl_vendorarch}/Net/ptrtstrun.pl
 %check
 make test
 
+# Check for https://bugzilla.redhat.com/show_bug.cgi?id=1222521
+perl -Iblib/{arch,lib} -MNet::SSLeay -e 'Net::SSLeay::CTX_v3_new()'
+
 %clean
 rm -rf %{buildroot}
 
@@ -98,6 +105,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/Net::SSLeay::Handle.3*
 
 %changelog
+* Mon May 18 2015 Paul Howarth <paul at city-fan.org> - 1.68-2
+- SSLv3_method not dropped in OpenSSL 1.0.2, so revert that change (#1222521)
+
 * Fri Jan 30 2015 Paul Howarth <paul at city-fan.org> - 1.68-1
 - Update to 1.68
   - Improvements to inc/Module/Install/PRIVATE/Net/SSLeay.pm to handle the case
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/perl-Net-SSLeay.git/commit/?h=master&id=3db5d975cb16ee2918cd63e534d7294941b14b94