Bug#819758: jessie-pu: package perl/5.20.2-3+deb8u5
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian.org@packages.debian.org
Usertags: pu
The attached patch improves binary compatibility for debugperl (provided
in the perl-debug package) and fixes
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=816280
Thanks,
Dominic.
-- System Information:
Debian Release: 8.3
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: i386 (i686)
Kernel: Linux 3.16.0-4-686-pae (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: sysvinit (via /sbin/init)
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 1ea6490..23337bd 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
# see git-dpm(1) from git-dpm package
-1237ea93fb2475a5ae576d5ee1358a5bb4ebe426
-1237ea93fb2475a5ae576d5ee1358a5bb4ebe426
+b40a8334d0a81d88be7371fa2124ce30994d4f94
+b40a8334d0a81d88be7371fa2124ce30994d4f94
708ce0747a55640ef1136be276185cc1a5a82564
708ce0747a55640ef1136be276185cc1a5a82564
perl_5.20.2.orig.tar.bz2
diff --git a/debian/changelog b/debian/changelog
index df53340..d1e9660 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+perl (5.20.2-3+deb8u5) UNRELEASED; urgency=medium
+
+ * Apply patch from Niko Tyni fixing debugperl crashes with XS
+ modules (Closes: #816280)
+
+ -- Dominic Hargreaves <dom@earth.li> Fri, 01 Apr 2016 22:13:30 +0100
+
perl (5.20.2-3+deb8u4) jessie-security; urgency=high
* Work around a t/op/stat.t failure on GNU/kFreeBSD, possibly related
diff --git a/debian/patches/debian/debugperl-compat-fix.diff b/debian/patches/debian/debugperl-compat-fix.diff
new file mode 100644
index 0000000..07547e4
--- /dev/null
+++ b/debian/patches/debian/debugperl-compat-fix.diff
@@ -0,0 +1,30 @@
+From b40a8334d0a81d88be7371fa2124ce30994d4f94 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Fri, 8 Jan 2016 14:27:36 +0200
+Subject: Disable PERL_TRACK_MEMPOOL for debugging builds
+
+This is a workaround for an ABI incompatibility between
+-DDEBUGGING and normal builds.
+
+Bug-Debian: https://bugs.debian.org/810326
+Bug: https://rt.perl.org/Public/Bug/Display.html?id=127212
+Patch-Name: debian/debugperl-compat-fix.diff
+---
+ perl.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/perl.h b/perl.h
+index 1325de9..8f19b28 100644
+--- a/perl.h
++++ b/perl.h
+@@ -176,7 +176,9 @@
+ # define pTHX_8 9
+ # define pTHX_9 10
+ # define pTHX_12 13
+-# if defined(DEBUGGING) && !defined(PERL_TRACK_MEMPOOL)
++/* PERL_TRACK_MEMPOOL temporarily disabled for DEBUGGING */
++/* see https://bugs.debian.org/810326 */
++# if 0 && defined(DEBUGGING) && !defined(PERL_TRACK_MEMPOOL)
+ # define PERL_TRACK_MEMPOOL
+ # endif
+ #else
diff --git a/debian/patches/series b/debian/patches/series
index 3251835..0f4ce8a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -45,3 +45,4 @@ fixes/encode-unicode-bom.diff
debian/encode-unicode-bom-doc.diff
debian/kfreebsd-softupdates.diff
fixes/CVE-2016-2381_duplicate_env.diff
+debian/debugperl-compat-fix.diff
diff --git a/perl.h b/perl.h
index 1325de9..8f19b28 100644
--- a/perl.h
+++ b/perl.h
@@ -176,7 +176,9 @@
# define pTHX_8 9
# define pTHX_9 10
# define pTHX_12 13
-# if defined(DEBUGGING) && !defined(PERL_TRACK_MEMPOOL)
+/* PERL_TRACK_MEMPOOL temporarily disabled for DEBUGGING */
+/* see https://bugs.debian.org/810326 */
+# if 0 && defined(DEBUGGING) && !defined(PERL_TRACK_MEMPOOL)
# define PERL_TRACK_MEMPOOL
# endif
#else
Reply to: