[SCM] Debian packaging of libnet-ssleay-perl branch, master, updated. debian/1.45-2-9-g946a207

Salvatore Bonaccorso carnil at debian.org
Tue Apr 3 05:41:27 UTC 2012


The following commit has been merged in the master branch:
commit 7311cfad8586c8130d670ac4cdee25e2dd67014a
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Tue Apr 3 07:27:21 2012 +0200

    Drop Fixed-crashing-when-run-under-apache2.patch
    
    The patch is included in the new upstream version 1.46.

diff --git a/debian/patches/Fixed-crashing-when-run-under-apache2.patch b/debian/patches/Fixed-crashing-when-run-under-apache2.patch
deleted file mode 100644
index 2d0a2ce..0000000
--- a/debian/patches/Fixed-crashing-when-run-under-apache2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Fix crashing when run under apache2
- .
- If Net::SSLeay is running under ModPerl the own thread locking is not
- needed as perl threads are not supported under mod-perl. Falls back to
- thread locking build in to mod-ssl.
-Origin: upstream, commit: http://anonscm.debian.org/viewvc/net-ssleay/trunk/SSLeay.xs?r1=331&r2=332
-Bug: http://rt.cpan.org/Public/Bug/Display.html?id=75841
-Bug-Debian: http://bugs.debian.org/661566
-Forwarded: not-needed
-Author: Salvatore Bonaccorso <carnil at debian.org>
-Last-Update: 2012-03-31
-Applied-Upstream: yes
-
---- a/SSLeay.xs
-+++ b/SSLeay.xs
-@@ -893,7 +893,12 @@
- #ifdef USE_ITHREADS
-     MUTEX_INIT(&LIB_init_mutex);
- #if defined(OPENSSL_THREADS) && OPENSSL_VERSION_NUMBER >= 0x00904000L
--    openssl_threads_init();    
-+    /* If we running under ModPerl, we dont need our own thread locking because
-+     * perl threads are not supported under mod-perl, and we can fall back to the thread
-+     * locking built in to mod-ssl
-+     */
-+     if (!hv_fetch(get_hv("ENV", 1), "MOD_PERL", 8, 0))
-+       openssl_threads_init();
- #endif
- #endif
-     MY_CXT.ssleay_ctx_verify_callbacks = (HV*)NULL;
diff --git a/debian/patches/series b/debian/patches/series
index 10bd753..222fc44 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 10fix_pod.patch
 20no-stray-libz-link.patch
 fix_spelling.patch
-Fixed-crashing-when-run-under-apache2.patch

-- 
Debian packaging of libnet-ssleay-perl



More information about the Pkg-perl-cvs-commits mailing list