[libembperl-perl] 01/01: Embperl finally builds again
Axel Beckert
abe at deuxchevaux.org
Fri Jan 15 00:41:47 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 86b26e64e905f5fdbad12bde27d2302509b348bf
Author: Axel Beckert <abe at deuxchevaux.org>
Date: Fri Jan 15 01:41:38 2016 +0100
Embperl finally builds again
---
debian/changelog | 7 +-
.../perl5.22-compat-PL_sv_objcount-removal.patch | 92 +++++++++++++---------
2 files changed, 57 insertions(+), 42 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2714eb9..ce5713f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,8 @@
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
+ TODO: I'm 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)
diff --git a/debian/patches/perl5.22-compat-PL_sv_objcount-removal.patch b/debian/patches/perl5.22-compat-PL_sv_objcount-removal.patch
index ecf0bbc..d0d12ea 100644
--- a/debian/patches/perl5.22-compat-PL_sv_objcount-removal.patch
+++ b/debian/patches/perl5.22-compat-PL_sv_objcount-removal.patch
@@ -11,8 +11,8 @@ Bug: https://rt.cpan.org/Ticket/Display.html?id=110023
Index: libembperl-perl/epmain.c
===================================================================
---- libembperl-perl.orig/epmain.c 2016-01-15 00:12:44.888011266 +0100
-+++ libembperl-perl/epmain.c 2016-01-15 00:12:44.876011302 +0100
+--- libembperl-perl.orig/epmain.c 2016-01-15 01:39:13.086977162 +0100
++++ libembperl-perl/epmain.c 2016-01-15 01:39:13.082977172 +0100
@@ -1506,8 +1506,8 @@
#ifdef DMALLOC
/* unsigned long mark, int not_freed_b, int freed_b, int details_b */
@@ -26,8 +26,8 @@ Index: libembperl-perl/epmain.c
dmalloc_message ( "***TO PREVIOUS REQUEST***\n") ;
Index: libembperl-perl/epnames.h
===================================================================
---- libembperl-perl.orig/epnames.h 2016-01-15 00:12:44.888011266 +0100
-+++ libembperl-perl/epnames.h 2016-01-15 00:12:44.876011302 +0100
+--- libembperl-perl.orig/epnames.h 2016-01-15 01:39:13.086977162 +0100
++++ libembperl-perl/epnames.h 2016-01-15 01:39:13.082977172 +0100
@@ -325,9 +325,6 @@
#ifndef sv_count
#define sv_count PL_sv_count
@@ -40,8 +40,8 @@ Index: libembperl-perl/epnames.h
#endif
Index: libembperl-perl/Old.xs
===================================================================
---- libembperl-perl.orig/Old.xs 2016-01-15 00:12:44.888011266 +0100
-+++ libembperl-perl/Old.xs 2016-01-15 00:12:44.880011290 +0100
+--- libembperl-perl.orig/Old.xs 2016-01-15 01:39:13.086977162 +0100
++++ libembperl-perl/Old.xs 2016-01-15 01:39:13.082977172 +0100
@@ -252,7 +252,7 @@
tReq * r
char * sText
@@ -53,8 +53,8 @@ Index: libembperl-perl/Old.xs
embperl_Escape(r, str, mode)
Index: libembperl-perl/test/html/plain.htm
===================================================================
---- libembperl-perl.orig/test/html/plain.htm 2016-01-15 00:12:44.888011266 +0100
-+++ libembperl-perl/test/html/plain.htm 2016-01-15 00:12:44.880011290 +0100
+--- libembperl-perl.orig/test/html/plain.htm 2016-01-15 01:39:13.086977162 +0100
++++ libembperl-perl/test/html/plain.htm 2016-01-15 01:39:13.082977172 +0100
@@ -20,8 +20,8 @@
ARRAY @d = [+ do { my @tmp1 = @d; "@tmp1" } +] num = [+ @d +] <BR>
@@ -79,8 +79,8 @@ Index: libembperl-perl/test/html/plain.htm
Index: libembperl-perl/test/cmp/errorfirstrun.htm
===================================================================
---- libembperl-perl.orig/test/cmp/errorfirstrun.htm 2016-01-15 00:12:44.888011266 +0100
-+++ libembperl-perl/test/cmp/errorfirstrun.htm 2016-01-15 00:12:44.880011290 +0100
+--- libembperl-perl.orig/test/cmp/errorfirstrun.htm 2016-01-15 01:39:13.086977162 +0100
++++ libembperl-perl/test/cmp/errorfirstrun.htm 2016-01-15 01:39:13.082977172 +0100
@@ -5,7 +5,7 @@
<table cellspacing='2' cellpadding='5'>
<tr bgcolor='#eeeeee'><td>
@@ -92,8 +92,8 @@ Index: libembperl-perl/test/cmp/errorfirstrun.htm
<tr bgcolor='#eeeeee'><td>
Index: libembperl-perl/test/cmp/varerr.htm56
===================================================================
---- libembperl-perl.orig/test/cmp/varerr.htm56 2016-01-15 00:12:44.888011266 +0100
-+++ libembperl-perl/test/cmp/varerr.htm56 2016-01-15 00:12:44.880011290 +0100
+--- libembperl-perl.orig/test/cmp/varerr.htm56 2016-01-15 01:39:13.086977162 +0100
++++ libembperl-perl/test/cmp/varerr.htm56 2016-01-15 01:39:13.082977172 +0100
@@ -9,13 +9,13 @@
<table cellspacing='2' cellpadding='5'>
<tr bgcolor='#eeeeee'><td>
@@ -117,8 +117,8 @@ Index: libembperl-perl/test/cmp/varerr.htm56
</table>
Index: libembperl-perl/test.pl
===================================================================
---- libembperl-perl.orig/test.pl 2016-01-15 00:12:44.888011266 +0100
-+++ libembperl-perl/test.pl 2016-01-15 00:12:44.880011290 +0100
+--- libembperl-perl.orig/test.pl 2016-01-15 01:39:13.086977162 +0100
++++ libembperl-perl/test.pl 2016-01-15 01:39:13.082977172 +0100
@@ -2125,7 +2125,7 @@
unshift (@testargs, 'dbgbreak') if ($opt_dbgbreak) ;
@@ -229,8 +229,8 @@ Index: libembperl-perl/test.pl
Index: libembperl-perl/test/html/mdatsess.htm
===================================================================
---- libembperl-perl.orig/test/html/mdatsess.htm 2016-01-15 00:12:44.888011266 +0100
-+++ libembperl-perl/test/html/mdatsess.htm 2016-01-15 00:12:44.880011290 +0100
+--- libembperl-perl.orig/test/html/mdatsess.htm 2016-01-15 01:39:13.086977162 +0100
++++ libembperl-perl/test/html/mdatsess.htm 2016-01-15 01:39:13.082977172 +0100
@@ -13,7 +13,7 @@
}
-]
@@ -242,8 +242,8 @@ Index: libembperl-perl/test/html/mdatsess.htm
equal ? [+ ($mdat{cnt} == $fdat{cnt})?'yes':'no' +] <br>
Index: libembperl-perl/test/html/getsess.htm
===================================================================
---- libembperl-perl.orig/test/html/getsess.htm 2016-01-15 00:12:44.888011266 +0100
-+++ libembperl-perl/test/html/getsess.htm 2016-01-15 00:12:44.884011278 +0100
+--- libembperl-perl.orig/test/html/getsess.htm 2016-01-15 01:39:13.086977162 +0100
++++ libembperl-perl/test/html/getsess.htm 2016-01-15 01:39:13.082977172 +0100
@@ -41,7 +41,7 @@
<table>
@@ -264,8 +264,8 @@ Index: libembperl-perl/test/html/getsess.htm
Index: libembperl-perl/test/html/execgetsess.htm
===================================================================
---- libembperl-perl.orig/test/html/execgetsess.htm 2016-01-15 00:12:44.888011266 +0100
-+++ libembperl-perl/test/html/execgetsess.htm 2016-01-15 00:12:44.884011278 +0100
+--- libembperl-perl.orig/test/html/execgetsess.htm 2016-01-15 01:39:13.086977162 +0100
++++ libembperl-perl/test/html/execgetsess.htm 2016-01-15 01:39:13.082977172 +0100
@@ -13,7 +13,7 @@
<table>
@@ -295,8 +295,8 @@ Index: libembperl-perl/test/html/execgetsess.htm
Index: libembperl-perl/test/html/delwrsess.htm
===================================================================
---- libembperl-perl.orig/test/html/delwrsess.htm 2016-01-15 00:12:44.888011266 +0100
-+++ libembperl-perl/test/html/delwrsess.htm 2016-01-15 00:12:44.884011278 +0100
+--- libembperl-perl.orig/test/html/delwrsess.htm 2016-01-15 01:39:13.086977162 +0100
++++ libembperl-perl/test/html/delwrsess.htm 2016-01-15 01:39:13.082977172 +0100
@@ -11,13 +11,13 @@
<table>
@@ -333,8 +333,8 @@ Index: libembperl-perl/test/html/delwrsess.htm
Index: libembperl-perl/test/html/getbsess.htm
===================================================================
---- libembperl-perl.orig/test/html/getbsess.htm 2016-01-15 00:12:44.888011266 +0100
-+++ libembperl-perl/test/html/getbsess.htm 2016-01-15 00:12:44.884011278 +0100
+--- libembperl-perl.orig/test/html/getbsess.htm 2016-01-15 01:39:13.086977162 +0100
++++ libembperl-perl/test/html/getbsess.htm 2016-01-15 01:39:13.082977172 +0100
@@ -22,7 +22,7 @@
<table>
@@ -355,8 +355,8 @@ Index: libembperl-perl/test/html/getbsess.htm
Index: libembperl-perl/test/html/delrdsess.htm
===================================================================
---- libembperl-perl.orig/test/html/delrdsess.htm 2016-01-15 00:12:44.888011266 +0100
-+++ libembperl-perl/test/html/delrdsess.htm 2016-01-15 00:12:44.884011278 +0100
+--- libembperl-perl.orig/test/html/delrdsess.htm 2016-01-15 01:39:13.086977162 +0100
++++ libembperl-perl/test/html/delrdsess.htm 2016-01-15 01:39:13.082977172 +0100
@@ -11,13 +11,13 @@
<table>
@@ -384,8 +384,8 @@ Index: libembperl-perl/test/html/delrdsess.htm
Index: libembperl-perl/test/html/getdelsess.htm
===================================================================
---- libembperl-perl.orig/test/html/getdelsess.htm 2016-01-15 00:12:44.888011266 +0100
-+++ libembperl-perl/test/html/getdelsess.htm 2016-01-15 00:12:44.884011278 +0100
+--- libembperl-perl.orig/test/html/getdelsess.htm 2016-01-15 01:39:13.086977162 +0100
++++ libembperl-perl/test/html/getdelsess.htm 2016-01-15 01:39:13.082977172 +0100
@@ -36,7 +36,7 @@
-]
@@ -397,8 +397,8 @@ Index: libembperl-perl/test/html/getdelsess.htm
Index: libembperl-perl/test/html/delsess.htm
===================================================================
---- libembperl-perl.orig/test/html/delsess.htm 2014-10-13 23:44:08.661838975 +0200
-+++ libembperl-perl/test/html/delsess.htm 2016-01-15 00:36:34.567890757 +0100
+--- libembperl-perl.orig/test/html/delsess.htm 2016-01-15 01:39:13.086977162 +0100
++++ libembperl-perl/test/html/delsess.htm 2016-01-15 01:39:13.082977172 +0100
@@ -11,13 +11,13 @@
<table>
@@ -417,8 +417,8 @@ Index: libembperl-perl/test/html/delsess.htm
[- $_[0] -> DeleteSession (1) ; -]
Index: libembperl-perl/test/html/setbadsess.htm
===================================================================
---- libembperl-perl.orig/test/html/setbadsess.htm 2014-10-13 23:44:08.661838975 +0200
-+++ libembperl-perl/test/html/setbadsess.htm 2016-01-15 00:49:32.293852894 +0100
+--- libembperl-perl.orig/test/html/setbadsess.htm 2016-01-15 01:39:13.086977162 +0100
++++ libembperl-perl/test/html/setbadsess.htm 2016-01-15 01:39:13.082977172 +0100
@@ -10,6 +10,6 @@
$udat{$k} = $fdat{$k} ;
}
@@ -429,8 +429,8 @@ Index: libembperl-perl/test/html/setbadsess.htm
</html>
Index: libembperl-perl/test/html/setunknownsess.htm
===================================================================
---- libembperl-perl.orig/test/html/setunknownsess.htm 2014-10-13 23:44:08.661838975 +0200
-+++ libembperl-perl/test/html/setunknownsess.htm 2016-01-15 00:51:51.757524619 +0100
+--- libembperl-perl.orig/test/html/setunknownsess.htm 2016-01-15 01:39:13.086977162 +0100
++++ libembperl-perl/test/html/setunknownsess.htm 2016-01-15 01:39:13.082977172 +0100
@@ -10,6 +10,6 @@
$udat{$k} = $fdat{$k} ;
}
@@ -441,8 +441,8 @@ Index: libembperl-perl/test/html/setunknownsess.htm
</html>
Index: libembperl-perl/test/html/sidurl/geturlsess.htm
===================================================================
---- libembperl-perl.orig/test/html/sidurl/geturlsess.htm 2014-10-13 23:44:08.661838975 +0200
-+++ libembperl-perl/test/html/sidurl/geturlsess.htm 2016-01-15 01:04:46.919657023 +0100
+--- libembperl-perl.orig/test/html/sidurl/geturlsess.htm 2016-01-15 01:39:13.086977162 +0100
++++ libembperl-perl/test/html/sidurl/geturlsess.htm 2016-01-15 01:39:13.082977172 +0100
@@ -41,7 +41,7 @@
<table>
@@ -463,8 +463,8 @@ Index: libembperl-perl/test/html/sidurl/geturlsess.htm
Index: libembperl-perl/test/html/sidurl/getsdaturlsess.htm
===================================================================
---- libembperl-perl.orig/test/html/sidurl/getsdaturlsess.htm 2014-10-13 23:44:08.661838975 +0200
-+++ libembperl-perl/test/html/sidurl/getsdaturlsess.htm 2016-01-15 01:07:37.859244096 +0100
+--- libembperl-perl.orig/test/html/sidurl/getsdaturlsess.htm 2016-01-15 01:39:13.086977162 +0100
++++ libembperl-perl/test/html/sidurl/getsdaturlsess.htm 2016-01-15 01:39:13.082977172 +0100
@@ -22,7 +22,7 @@
<table>
@@ -474,3 +474,19 @@ Index: libembperl-perl/test/html/sidurl/getsdaturlsess.htm
</tr>
</table>
+Index: libembperl-perl/Makefile.PL
+===================================================================
+--- libembperl-perl.orig/Makefile.PL 2016-01-15 01:39:13.086977162 +0100
++++ libembperl-perl/Makefile.PL 2016-01-15 01:40:22.206816908 +0100
+@@ -1451,6 +1451,11 @@
+ #else
+ # {
+ s/^\#\!.*?perl.*?\s(.*?)/#!$perlbinpath $1/ ;
++ # For some reason $perlbinpath contains double
++ # quotes which Apache doesn't like at all for
++ # CGI script interpreters. So remove them
++ # again.
++ s/^\#\!"(.*?)"/#!$1/;
+ # }
+ s/^.*?perl.*?\s-x/$perlbinpath -x/ ;
+ }
--
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