[libembperl-perl] 01/01: Add patch to take PL_sv_objcount removal in Perl 5.22 into account
Axel Beckert
abe at deuxchevaux.org
Thu Jan 14 03:06:15 UTC 2016
This is an automated email from the git hooks/post-receive script.
abe pushed a commit to branch master
in repository libembperl-perl.
commit 8762eee0f152b2c3c3f6e1da197065f1ffe099a7
Author: Axel Beckert <abe at deuxchevaux.org>
Date: Thu Jan 14 04:04:37 2016 +0100
Add patch to take PL_sv_objcount removal in Perl 5.22 into account
Fixes FTBFS with Perl 5.22 in upstream code.
Afterwards the test suite as tons of failures. The remainder of that
patch starts to cover them. But the patch is still incomplete. Will
continue on it another day.
---
debian/changelog | 8 +
.../perl5.22-compat-PL_sv_objcount-removal.patch | 386 +++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 395 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index b58d133..2714eb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
libembperl-perl (2.5.0-5) UNRELEASED; urgency=medium
+ TODO: Patch for FTBFS (c.f. #806897) doesn't cover whole test suite yet
+ and I'm also not sure if all those "0+" to enforce scalar/number
+ context are really correct or if there's some 5.22-related bug in
+ Embperl causing the empty values without this patch. -- Axel
+
* debian/rules: use find -perm /xxx instead of +xxx.
Thanks to Andreas Metzler for the bug report. (Closes: #803024)
* Drop hard a2enmod dependency on mod_perl in zembperl.load. mod_perl is
enabled by default anyways if installed. (Closes: #810655)
+ * Add patch to take PL_sv_objcount removal in Perl 5.22 into
+ account. Fixes FTBFS with Perl 5.22. (Closes: #806897, but results in
+ test suite failures afterwards)
-- gregor herrmann <gregoa at debian.org> Thu, 29 Oct 2015 22:29:31 +0100
diff --git a/debian/patches/perl5.22-compat-PL_sv_objcount-removal.patch b/debian/patches/perl5.22-compat-PL_sv_objcount-removal.patch
new file mode 100644
index 0000000..9f5e726
--- /dev/null
+++ b/debian/patches/perl5.22-compat-PL_sv_objcount-removal.patch
@@ -0,0 +1,386 @@
+Index: libembperl-perl/epmain.c
+===================================================================
+--- libembperl-perl.orig/epmain.c 2016-01-14 03:18:34.000000000 +0100
++++ libembperl-perl/epmain.c 2016-01-14 03:19:24.000000000 +0100
+@@ -1506,8 +1506,8 @@
+ #ifdef DMALLOC
+ /* unsigned long mark, int not_freed_b, int freed_b, int details_b */
+ dmalloc_log_changed (nMemCheckpoint, 1, 0, 1) ;
+- dmalloc_message ( "[%d]Request freed. Exit-SVs: %d -OBJs: %d\n", getpid(),
+- sv_count, sv_objcount) ;
++ dmalloc_message ( "[%d]Request freed. Exit-SVs: %d\n", getpid(),
++ sv_count) ;
+ if (nMemCheckpoint2)
+ {
+ dmalloc_message ( "***TO PREVIOUS REQUEST***\n") ;
+Index: libembperl-perl/epnames.h
+===================================================================
+--- libembperl-perl.orig/epnames.h 2016-01-14 03:18:34.000000000 +0100
++++ libembperl-perl/epnames.h 2016-01-14 03:19:24.000000000 +0100
+@@ -325,9 +325,6 @@
+ #ifndef sv_count
+ #define sv_count PL_sv_count
+ #endif
+-#ifndef sv_objcount
+-#define sv_objcount PL_sv_objcount
+-#endif
+ #ifndef op_mask
+ #define op_mask PL_op_mask
+ #endif
+Index: libembperl-perl/Old.xs
+===================================================================
+--- libembperl-perl.orig/Old.xs 2016-01-14 03:18:34.000000000 +0100
++++ libembperl-perl/Old.xs 2016-01-14 03:19:24.000000000 +0100
+@@ -252,7 +252,7 @@
+ tReq * r
+ char * sText
+ CODE:
+- lprintf (r->pApp,"[%d]MEM: %s: SVs: %d OBJs: %d\n", r->pThread->nPid, sText, sv_count, sv_objcount) ;
++ lprintf (r->pApp,"[%d]MEM: %s: SVs: %d\n", r->pThread->nPid, sText, sv_count) ;
+
+ SV *
+ embperl_Escape(r, str, mode)
+Index: libembperl-perl/test/html/plain.htm
+===================================================================
+--- libembperl-perl.orig/test/html/plain.htm 2016-01-14 03:18:34.000000000 +0100
++++ libembperl-perl/test/html/plain.htm 2016-01-14 03:19:24.000000000 +0100
+@@ -20,8 +20,8 @@
+
+ ARRAY @d = [+ do { my @tmp1 = @d; "@tmp1" } +] num = [+ @d +] <BR>
+ ARRAY @x = [+ do { my @tmp1 = %x; "@tmp1" } +] num = [+ @x +] <BR>
+-HASH %a = [+ do { my @tmp1 = %a; my @tmp11 = sort @tmp1 ; "@tmp11" } +] num = [+ keys %a +] <BR>
+-HASH %y = [+ do { my @tmp2 = %y; my @tmp21 = sort @tmp2 ; "@tmp21" } +] num = [+ keys %y +] <BR>
++HASH %a = [+ do { my @tmp1 = %a; my @tmp11 = sort @tmp1 ; "@tmp11" } +] num = [+ 0+keys %a +] <BR>
++HASH %y = [+ do { my @tmp2 = %y; my @tmp21 = sort @tmp2 ; "@tmp21" } +] num = [+ 0+keys %y +] <BR>
+
+
+ First of all assign a value:
+@@ -40,8 +40,8 @@
+
+ ARRAY @d = [+ "@d" +] num = [+ @d +] <BR>
+ ARRAY @x = [+ "@x" +] num = [+ @x +] <BR>
+-HASH %a = [+ do { my @tmp1 = %a; my @tmp11 = sort @tmp1 ; "@tmp11" } +] num = [+ keys %a +] <BR>
+-HASH %y = [+ do { my @tmp2 = %y; my @tmp21 = sort @tmp2 ; "@tmp21" } +] num = [+ keys %y +] <BR>
++HASH %a = [+ do { my @tmp1 = %a; my @tmp11 = sort @tmp1 ; "@tmp11" } +] num = [+ 0+keys %a +] <BR>
++HASH %y = [+ do { my @tmp2 = %y; my @tmp21 = sort @tmp2 ; "@tmp21" } +] num = [+ 0+keys %y +] <BR>
+
+ And now a and b together: [+ "$a$b" +]<P>
+
+Index: libembperl-perl/test/cmp/errorfirstrun.htm
+===================================================================
+--- libembperl-perl.orig/test/cmp/errorfirstrun.htm 2016-01-14 03:18:34.000000000 +0100
++++ libembperl-perl/test/cmp/errorfirstrun.htm 2016-01-14 03:19:24.000000000 +0100
+@@ -5,7 +5,7 @@
+ <table cellspacing='2' cellpadding='5'>
+ <tr bgcolor='#eeeeee'><td>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+-^\[\d+\]ERR:.+in Perl code: Global symbol \"\$x\" requires explicit package name at
++^\[\d+\]ERR:.+in Perl code: Global symbol \"\$x\" requires explicit package name
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ </td></tr>
+ <tr bgcolor='#eeeeee'><td>
+Index: libembperl-perl/test/cmp/varerr.htm56
+===================================================================
+--- libembperl-perl.orig/test/cmp/varerr.htm56 2016-01-14 03:18:34.000000000 +0100
++++ libembperl-perl/test/cmp/varerr.htm56 2016-01-14 03:19:24.000000000 +0100
+@@ -9,13 +9,13 @@
+ <table cellspacing='2' cellpadding='5'>
+ <tr bgcolor='#eeeeee'><td>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+-^\[.*?\]ERR\: 24\: Error in Perl code\: Global symbol "\$d" requires explicit package name at
+-^<br> Global symbol "\$e" requires explicit package name at
+-^<br> Global symbol "\$e" requires explicit package name at
+-^<br> Global symbol "\$d" requires explicit package name at
+-^<br> Global symbol "\$e" requires explicit package name at
+-^<br> Global symbol "\$d" requires explicit package name at
+-^<br> Global symbol "\$e" requires explicit package name at
++^\[.*?\]ERR\: 24\: Error in Perl code\: Global symbol "\$d" requires explicit package name
++^<br> Global symbol "\$e" requires explicit package name
++^<br> Global symbol "\$e" requires explicit package name
++^<br> Global symbol "\$d" requires explicit package name
++^<br> Global symbol "\$e" requires explicit package name
++^<br> Global symbol "\$d" requires explicit package name
++^<br> Global symbol "\$e" requires explicit package name
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ </td></tr>
+ </table>
+Index: libembperl-perl/test.pl
+===================================================================
+--- libembperl-perl.orig/test.pl 2016-01-14 03:19:24.000000000 +0100
++++ libembperl-perl/test.pl 2016-01-14 03:19:24.000000000 +0100
+@@ -2125,7 +2125,7 @@
+ unshift (@testargs, 'dbgbreak') if ($opt_dbgbreak) ;
+
+ $txt = "#$testnum ". $file . ($debug != $defaultdebug ?"-d $debug ":"") . ($test->{msg} || '') . '...' ;
+- $txt .= ' ' x (30 - length ($txt)) ;
++ $txt .= ' ' x (50 - length ($txt)) ;
+ print $txt ;
+
+
+@@ -2211,7 +2211,7 @@
+
+
+ $txt2 = "$txt from file...";
+- $txt2 .= ' ' x (30 - length ($txt2)) ;
++ $txt2 .= ' ' x (50 - length ($txt2)) ;
+ print $txt2 ;
+
+ unlink ($outfile) ;
+@@ -2232,7 +2232,7 @@
+ if ($err == 0 || $opt_ignoreerror)
+ {
+ $txt2 = "$txt from memory...";
+- $txt2 .= ' ' x (30 - length ($txt2)) ;
++ $txt2 .= ' ' x (50 - length ($txt2)) ;
+ print $txt2 ;
+
+ unlink ($outfile) ;
+@@ -2254,7 +2254,7 @@
+ if ($err == 0 || $opt_ignoreerror)
+ {
+ $txt2 = "$txt to memory...";
+- $txt2 .= ' ' x (30 - length ($txt2)) ;
++ $txt2 .= ' ' x (50 - length ($txt2)) ;
+ print $txt2 ;
+
+ my $outdata ;
+@@ -2281,7 +2281,7 @@
+ if ($err == 0 || $opt_ignoreerror)
+ {
+ $txt2 = "$txt to tied handle...";
+- $txt2 .= ' ' x (30 - length ($txt2)) ;
++ $txt2 .= ' ' x (50 - length ($txt2)) ;
+ print $txt2 ;
+
+ my $outdata ;
+@@ -2310,7 +2310,7 @@
+ if ($err == 0 || $opt_ignoreerror)
+ {
+ $txt2 = "$txt from/to memory...";
+- $txt2 .= ' ' x (30 - length ($txt2)) ;
++ $txt2 .= ' ' x (50 - length ($txt2)) ;
+ print $txt2 ;
+
+ my $outdata ;
+@@ -2355,7 +2355,7 @@
+ if ($err == 0 || $opt_ignoreerror)
+ {
+ $txt2 = "$txt to memory...";
+- $txt2 .= ' ' x (30 - length ($txt2)) ;
++ $txt2 .= ' ' x (50 - length ($txt2)) ;
+ print $txt2 ;
+
+ my $outdata ;
+@@ -2389,7 +2389,7 @@
+ if (0) #$err == 0 || $opt_ignoreerror)
+ {
+ $txt2 = "errornous parameter (path) ...";
+- $txt2 .= ' ' x (30 - length ($txt2)) ;
++ $txt2 .= ' ' x (50 - length ($txt2)) ;
+ print $txt2 ;
+
+ $err = eval { Embperl::Execute ({'inputfile' => 'xxxx0',
+@@ -2411,7 +2411,7 @@
+ if ($err == 0 || $opt_ignoreerror)
+ {
+ $txt2 = "errornous parameter (input) ...";
+- $txt2 .= ' ' x (30 - length ($txt2)) ;
++ $txt2 .= ' ' x (50 - length ($txt2)) ;
+ print $txt2 ;
+ my $out ;
+ @errors = () ;
+@@ -2438,7 +2438,7 @@
+ if ($err == 0 || $opt_ignoreerror)
+ {
+ $txt2 = "errornous parameter (output) ...";
+- $txt2 .= ' ' x (30 - length ($txt2)) ;
++ $txt2 .= ' ' x (50 - length ($txt2)) ;
+ print $txt2 ;
+ my $out ;
+ @errors = () ;
+@@ -2488,7 +2488,7 @@
+ $page = $src ;
+
+ $txt2 = "$src ...";
+- $txt2 .= ' ' x (30 - length ($txt2)) ;
++ $txt2 .= ' ' x (50 - length ($txt2)) ;
+ print $txt2 ;
+
+ my $outdata ;
+@@ -3006,7 +3006,7 @@
+ }
+
+ $txt = "#$testnum $file" . ($debug != $defaultdebug ?"-d $debug ":"") . '...' ;
+- $txt .= ' ' x (30 - length ($txt)) ;
++ $txt .= ' ' x (50 - length ($txt)) ;
+ print $txt ;
+ unlink ($outfile) ;
+
+Index: libembperl-perl/test/html/mdatsess.htm
+===================================================================
+--- libembperl-perl.orig/test/html/mdatsess.htm 2014-10-13 23:44:08.661838975 +0200
++++ libembperl-perl/test/html/mdatsess.htm 2016-01-14 03:21:32.586137846 +0100
+@@ -13,7 +13,7 @@
+ }
+ -]
+
+- $mdat{cnt} = [+ $mdat{cnt} +] <br>
++ $mdat{cnt} = [+ 0+$mdat{cnt} +] <br>
+ $fdat{cnt} = [+ $fdat{cnt} +] <br>
+
+ equal ? [+ ($mdat{cnt} == $fdat{cnt})?'yes':'no' +] <br>
+Index: libembperl-perl/test/html/getsess.htm
+===================================================================
+--- libembperl-perl.orig/test/html/getsess.htm 2014-10-13 23:44:08.661838975 +0200
++++ libembperl-perl/test/html/getsess.htm 2016-01-14 03:38:13.211682827 +0100
+@@ -41,7 +41,7 @@
+
+ <table>
+ <tr>
+- <td>[+ $ks[$row] +]</td><td>[+ $udat{$ks[$row] || ''} +]</td>
++ <td>[+ $ks[$row] +]</td><td>[+ 0+$udat{$ks[$row] || ''} +]</td>
+ </tr>
+ </table>
+
+@@ -55,7 +55,7 @@
+ -]
+
+
+- $mdat{cnt} = -[+ $mdat{cnt} +]- <br>
++ $mdat{cnt} = -[+ 0+$mdat{cnt} +]- <br>
+ $udat{cnt} = -[+ $udat{cnt} +]- <br>
+
+
+Index: libembperl-perl/test/html/execgetsess.htm
+===================================================================
+--- libembperl-perl.orig/test/html/execgetsess.htm 2014-10-13 23:44:08.661838975 +0200
++++ libembperl-perl/test/html/execgetsess.htm 2016-01-14 03:51:13.225791835 +0100
+@@ -13,7 +13,7 @@
+
+ <table>
+ <tr>
+- <td>[+ $ks[$row] +]</td><td>[+ $fdat{$ks[$row] || ''} +]</td>
++ <td>[+ $ks[$row] +]</td><td>[+ 0+$fdat{$ks[$row] || ''} +]</td>
+ </tr>
+ </table>
+
+@@ -22,7 +22,7 @@
+
+ <table>
+ <tr>
+- <td>[+ $ks[$row] +]</td><td>[+ $udat{$ks[$row] || ''} +]</td>
++ <td>[+ $ks[$row] +]</td><td>[+ 0+$udat{$ks[$row] || ''} +]</td>
+ </tr>
+ </table>
+
+@@ -36,7 +36,7 @@
+ -]
+
+
+- $mdat{cnt} = -[+ $mdat{cnt} +]- <br>
++ $mdat{cnt} = -[+ 0+$mdat{cnt} +]- <br>
+ $udat{cnt} = -[+ $udat{cnt} +]- <br>
+
+
+Index: libembperl-perl/test/html/delwrsess.htm
+===================================================================
+--- libembperl-perl.orig/test/html/delwrsess.htm 2014-10-13 23:44:08.661838975 +0200
++++ libembperl-perl/test/html/delwrsess.htm 2016-01-14 03:49:12.546075932 +0100
+@@ -11,13 +11,13 @@
+
+ <table>
+ <tr>
+- <td>[+ $ks[$row] +]</td><td>[+ $udat{$ks[$row] || ''} +]</td>
++ <td>[+ $ks[$row] +]</td><td>[+ 0+$udat{$ks[$row] || ''} +]</td>
+ </tr>
+ </table>
+
+ [+ $num > 0?"ok (num=$num)":"Not a session hash (num=$num)" +]<p>
+
+- $mdat{cnt} = -[+ $mdat{cnt} +]- <br>
++ $mdat{cnt} = -[+ 0+$mdat{cnt} +]- <br>
+ $udat{cnt} = -[+ $udat{cnt} +]- <br>
+
+ [- $_[0] -> DeleteSession (1) ; -]
+@@ -27,7 +27,7 @@
+
+ <table>
+ <tr>
+- <td>[+ $ks[$row] +]</td><td>[+ $udat{$ks[$row] || ''} +]</td>
++ <td>[+ $ks[$row] +]</td><td>[+ 0+$udat{$ks[$row] || ''} +]</td>
+ </tr>
+ </table>
+
+@@ -39,7 +39,7 @@
+
+ <table>
+ <tr>
+- <td>[+ $ks[$row] +]</td><td>[+ $udat{$ks[$row] || ''} +]</td>
++ <td>[+ $ks[$row] +]</td><td>[+ 0+$udat{$ks[$row] || ''} +]</td>
+ </tr>
+ </table>
+
+Index: libembperl-perl/test/html/getbsess.htm
+===================================================================
+--- libembperl-perl.orig/test/html/getbsess.htm 2014-10-13 23:44:08.661838975 +0200
++++ libembperl-perl/test/html/getbsess.htm 2016-01-14 03:55:18.685255504 +0100
+@@ -22,7 +22,7 @@
+
+ <table>
+ <tr>
+- <td>[+ $ks[$row] +]</td><td>[+ $udat{$ks[$row] || ''} +]</td>
++ <td>[+ $ks[$row] +]</td><td>[+ 0+$udat{$ks[$row] || ''} +]</td>
+ </tr>
+ </table>
+
+@@ -36,7 +36,7 @@
+ -]
+
+
+- $mdat{cnt} = -[+ $mdat{cnt} +]- <br>
++ $mdat{cnt} = -[+ 0+$mdat{cnt} +]- <br>
+ $udat{cnt} = -[+ $udat{cnt} +]- <br>
+
+
+Index: libembperl-perl/test/html/delrdsess.htm
+===================================================================
+--- libembperl-perl.orig/test/html/delrdsess.htm 2014-10-13 23:44:08.661838975 +0200
++++ libembperl-perl/test/html/delrdsess.htm 2016-01-14 03:58:58.600779742 +0100
+@@ -11,13 +11,13 @@
+
+ <table>
+ <tr>
+- <td>[+ $ks[$row] +]</td><td>[+ $udat{$ks[$row] || ''} +]</td>
++ <td>[+ $ks[$row] +]</td><td>[+ 0+$udat{$ks[$row] || ''} +]</td>
+ </tr>
+ </table>
+
+ [+ $num > 0?"ok (num=$num)":"Not a session hash (num=$num)" +]<p>
+
+- $mdat{cnt} = -[+ $mdat{cnt} +]- <br>
++ $mdat{cnt} = -[+ 0+$mdat{cnt} +]- <br>
+ $udat{cnt} = -[+ $udat{cnt} +]- <br>
+
+ [- $_[0] -> DeleteSession (1) ; -]
+@@ -27,7 +27,7 @@
+
+ <table>
+ <tr>
+- <td>[+ $ks[$row] +]</td><td>[+ $udat{$ks[$row] || ''} +]</td>
++ <td>[+ $ks[$row] +]</td><td>[+ 0+$udat{$ks[$row] || ''} +]</td>
+ </tr>
+ </table>
+
+Index: libembperl-perl/test/html/getdelsess.htm
+===================================================================
+--- libembperl-perl.orig/test/html/getdelsess.htm 2014-10-13 23:44:08.661838975 +0200
++++ libembperl-perl/test/html/getdelsess.htm 2016-01-14 04:00:58.256519445 +0100
+@@ -36,7 +36,7 @@
+ -]
+
+
+- $mdat{cnt} = -[+ $mdat{cnt} +]- <br>
++ $mdat{cnt} = -[+ 0+$mdat{cnt} +]- <br>
+ $udat{cnt} = -[+ $udat{cnt} +]- <br>
+
+
diff --git a/debian/patches/series b/debian/patches/series
index 9df62a9..8b9a58b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ pod-errors.patch
apache2.4-compat.patch
perl5.20-compat.patch
cgi-pm-4.04-compatibility.patch
+perl5.22-compat-PL_sv_objcount-removal.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libembperl-perl.git
More information about the Pkg-perl-cvs-commits
mailing list