[SCM] Debian packaging of libnet-ssleay-perl branch, master, updated. debian/1.38-1

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit 38a850983f3561db8f7714d49b182fbb5aa35ef8
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Sun Sep 18 10:25:33 2011 +0200

    Drop patch no_sslv2.patch: applied upstream.

diff --git a/debian/patches/no_sslv2.patch b/debian/patches/no_sslv2.patch
deleted file mode 100644
index 77b135c..0000000
--- a/debian/patches/no_sslv2.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Description: Make SSLv2 support conditional
- OpenSSL may be compiled without SSLv2 support, so do not try to use the SSLv2
- functions if they're not present.
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=612780
-Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=65631
-Author: Chris Butler <chrisb at debian.org>
-Last-Update: 2011-02-10
-
---- a/lib/Net/SSLeay.pm
-+++ b/lib/Net/SSLeay.pm
-@@ -1600,6 +1600,11 @@
- nonsensical error codes (at the SSL handshake level), try this option
- before mailing me.
- 
-+On some systems, OpenSSL may be compiled without support for SSLv2.
-+If this is the case, Net::SSLeay will warn if ssl_version has been set
-+to 2. Support for SSLv2 was removed from the OpenSSL packages in Debian
-+from version 1.0.0c-2, see: http://bugs.debian.org/589706
-+
- The high level API returns the certificate of the peer, thus allowing
- one to check what certificate was supplied. However, you will only be
- able to check the certificate after the fact, i.e. you already sent
-@@ -2239,7 +2244,13 @@
- }
- 
- sub new_x_ctx {
--    if    ($ssl_version == 2)  { $ctx = CTX_v2_new(); }
-+    if ($ssl_version == 2)  {
-+	unless (exists &Net::SSLeay::CTX_v2_new) {
-+	    warn "ssl_version has been set to 2, but this version of OpenSSL has been compiled without SSLv2 support";
-+	    return undef;
-+	}
-+	$ctx = CTX_v2_new();
-+    }
-     elsif ($ssl_version == 3)  { $ctx = CTX_v3_new(); }
-     elsif ($ssl_version == 10) { $ctx = CTX_tlsv1_new(); }
-     else                       { $ctx = CTX_new(); }
---- a/SSLeay.xs
-+++ b/SSLeay.xs
-@@ -724,6 +724,8 @@
-      OUTPUT:
-      RETVAL
- 
-+#ifndef OPENSSL_NO_SSL2
-+
- SSL_CTX *
- SSL_CTX_v2_new()
-      CODE:
-@@ -731,6 +733,8 @@
-      OUTPUT:
-      RETVAL
- 
-+#endif
-+
- SSL_CTX *
- SSL_CTX_v3_new()
-      CODE:
-@@ -1821,9 +1825,13 @@
- 
- #endif
- 
-+#ifndef OPENSSL_NO_SSL2
-+
- SSL_METHOD *
- SSLv2_method()
- 
-+#endif
-+
- SSL_METHOD *
- SSLv3_method()
- 
diff --git a/debian/patches/series b/debian/patches/series
index bc9f2cc..ee338ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 10fix_pod.patch
 20no-stray-libz-link.patch
-no_sslv2.patch
 no_kwalitee_test.patch

-- 
Debian packaging of libnet-ssleay-perl