[SCM] Debian packaging of libnet-ssleay-perl branch, master, updated. debian/1.45-1-3-g141cd49
Salvatore Bonaccorso
carnil at debian.org
Sat Mar 31 07:14:40 UTC 2012
The following commit has been merged in the master branch:
commit 73614584658b99e41ae5c11d0e1b83a4d0fb0987
Author: Salvatore Bonaccorso <carnil at debian.org>
Date: Sat Mar 31 08:50:25 2012 +0200
Add Fixed-crashing-when-run-under-apache2.patch patch
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.
Patch is backported from upstream svn commit.
Closes: #661566
diff --git a/debian/patches/Fixed-crashing-when-run-under-apache2.patch b/debian/patches/Fixed-crashing-when-run-under-apache2.patch
new file mode 100644
index 0000000..e1241a7
--- /dev/null
+++ b/debian/patches/Fixed-crashing-when-run-under-apache2.patch
@@ -0,0 +1,29 @@
+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: backport, 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 ac08c15..1eca22c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
20no-stray-libz-link.patch
no_kwalitee_test.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