r68500 - in /trunk/libembperl-perl/debian: changelog control patches/perl5.12.patch patches/series
dom at users.alioth.debian.org
dom at users.alioth.debian.org
Sun Feb 13 15:38:49 UTC 2011
Author: dom
Date: Sun Feb 13 15:38:33 2011
New Revision: 68500
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=68500
Log:
* Cherry-pick Perl 5.12 fixes from upstream (svn r960450)
(Closes: #578490)
Added:
trunk/libembperl-perl/debian/patches/perl5.12.patch
Modified:
trunk/libembperl-perl/debian/changelog
trunk/libembperl-perl/debian/control
trunk/libembperl-perl/debian/patches/series
Modified: trunk/libembperl-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libembperl-perl/debian/changelog?rev=68500&op=diff
==============================================================================
--- trunk/libembperl-perl/debian/changelog (original)
+++ trunk/libembperl-perl/debian/changelog Sun Feb 13 15:38:33 2011
@@ -1,10 +1,15 @@
libembperl-perl (2.3.0-2) UNRELEASED; urgency=low
+ [ gregor herrmann ]
* debian/control: Changed: (build-)depend on perl instead of perl-
modules.
* debian/control: Added: ${misc:Depends} to Depends: field.
- -- gregor herrmann <gregoa at debian.org> Fri, 23 Oct 2009 02:24:49 +0200
+ [ Dominic Hargreaves ]
+ * Cherry-pick Perl 5.12 fixes from upstream (svn r960450)
+ (Closes: #578490)
+
+ -- Dominic Hargreaves <dom at earth.li> Sun, 13 Feb 2011 15:31:09 +0000
libembperl-perl (2.3.0-1) unstable; urgency=low
Modified: trunk/libembperl-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libembperl-perl/debian/control?rev=68500&op=diff
==============================================================================
--- trunk/libembperl-perl/debian/control (original)
+++ trunk/libembperl-perl/debian/control Sun Feb 13 15:38:33 2011
@@ -6,7 +6,8 @@
libapache2-mod-perl2, libwww-perl, libapache-sessionx-perl,
libxslt1-dev, netbase
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Jonathan Yu <jawnsy at cpan.org>, Gunnar Wolf <gwolf at debian.org>
+Uploaders: Jonathan Yu <jawnsy at cpan.org>, Gunnar Wolf <gwolf at debian.org>,
+ Dominic Hargreaves <dom at earth.li>
Standards-Version: 3.8.3
Homepage: http://search.cpan.org/dist/Embperl/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libembperl-perl/
Added: trunk/libembperl-perl/debian/patches/perl5.12.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libembperl-perl/debian/patches/perl5.12.patch?rev=68500&op=file
==============================================================================
--- trunk/libembperl-perl/debian/patches/perl5.12.patch (added)
+++ trunk/libembperl-perl/debian/patches/perl5.12.patch Sun Feb 13 15:38:33 2011
@@ -1,0 +1,143 @@
+Index: epeval.c
+===================================================================
+--- a/epeval.c (revision 960449)
++++ b/epeval.c (revision 960450)
+@@ -350,12 +350,12 @@
+ sRef = "; \\&" ;
+
+ if (r -> Component.bStrict)
+- if (flags & G_ARRAY)
++ if ((flags & G_ARRAY) != G_SCALAR)
+ pSVCmd = newSVpvf(sFormatStrictArray, r -> Component.sEvalPackage, sName, r -> Component.nSourceline, r -> Component.sSourcefile, sArg, sRef, sName) ;
+ else
+ pSVCmd = newSVpvf(sFormatStrict, r -> Component.sEvalPackage, sName, r -> Component.nSourceline, r -> Component.sSourcefile, sArg, sRef, sName) ;
+ else
+- if (flags & G_ARRAY)
++ if ((flags & G_ARRAY) != G_SCALAR)
+ pSVCmd = newSVpvf(sFormatArray, r -> Component.sEvalPackage, sName, r -> Component.nSourceline, r -> Component.sSourcefile, sArg, sRef, sName) ;
+ else
+ pSVCmd = newSVpvf(sFormat, r -> Component.sEvalPackage, sName, r -> Component.nSourceline, r -> Component.sSourcefile, sArg, sRef, sName) ;
+@@ -624,7 +624,7 @@
+ if (ppSV && *ppSV)
+ SvREFCNT_dec (*ppSV) ;
+
+- if (rc == ok && pSub != NULL && SvTYPE (pSub) == SVt_RV)
++ if (rc == ok && pSub != NULL && SvROK (pSub))
+ {
+ /*sv_setsv (*ppSV, pSub) ;*/
+ *ppSV = SvRV(pSub) ;
+Index: epcache.c
+===================================================================
+--- a/epcache.c (revision 960449)
++++ b/epcache.c (revision 960450)
+@@ -265,7 +265,7 @@
+
+ /* lprintf (r -> pApp, "XXXXX Cache_New [%d/%d] pProviders=%x %s pCacheItems=%x %s pCachesToRelease=%x %s\n", _getpid(), GetCurrentThreadId(), pProviders, IsBadReadPtr (pProviders,4 )?"bad":"ok", pCacheItems, IsBadReadPtr (pCacheItems, 4)?"bad":"ok", pCachesToRelease, IsBadReadPtr (pCachesToRelease, 4)?"bad":"ok") ; */
+
+- if (SvTYPE(pParam) == SVt_RV)
++ if (SvROK(pParam))
+ pParam = SvRV (pParam) ;
+
+ if (SvTYPE(pParam) == SVt_PV)
+@@ -435,7 +435,7 @@
+ }
+
+
+- if (SvTYPE(pParam) == SVt_RV)
++ if (SvROK(pParam))
+ pParam = SvRV (pParam) ;
+
+ if (SvTYPE(pParam) == SVt_PV)
+Index: epcmd2.c
+===================================================================
+--- a/epcmd2.c (revision 960449)
++++ b/epcmd2.c (revision 960450)
+@@ -426,7 +426,7 @@
+ HV * pHV ;
+ tDomTree * pDomTree = DomTree_self(xDomTree) ;
+
+- if (SvTYPE(sText) == SVt_RV && SvTYPE((pAV = (AV *)SvRV(sText))) == SVt_PVAV)
++ if (SvROK(sText) && SvTYPE((pAV = (AV *)SvRV(sText))) == SVt_PVAV)
+ { /* Array reference inside URL */
+ SV ** ppSV ;
+ int i ;
+@@ -453,7 +453,7 @@
+
+ }
+
+- else if (SvTYPE(sText) == SVt_RV && SvTYPE((pHV = (HV *)SvRV(sText))) == SVt_PVHV)
++ else if (SvROK(sText) && SvTYPE((pHV = (HV *)SvRV(sText))) == SVt_PVHV)
+ { /* Hash reference inside URL */
+ HE * pEntry ;
+ char * pKey ;
+Index: epcomp.c
+===================================================================
+--- a/epcomp.c (revision 960449)
++++ b/epcomp.c (revision 960450)
+@@ -143,7 +143,7 @@
+
+ ppSV = hv_fetch(pHash, "perlcode", 8, 0) ;
+ if (ppSV != NULL && *ppSV != NULL &&
+- SvTYPE(*ppSV) == SVt_RV && SvTYPE((pAV = (AV *)SvRV(*ppSV))) == SVt_PVAV)
++ SvROK(*ppSV) && SvTYPE((pAV = (AV *)SvRV(*ppSV))) == SVt_PVAV)
+ { /* Array reference */
+ int f = AvFILL(pAV) + 1 ;
+ int i ;
+@@ -176,7 +176,7 @@
+
+ ppSV = hv_fetch(pHash, "compiletimeperlcode", 19, 0) ;
+ if (ppSV != NULL && *ppSV != NULL &&
+- SvTYPE(*ppSV) == SVt_RV && SvTYPE((pAV = (AV *)SvRV(*ppSV))) == SVt_PVAV)
++ SvROK(*ppSV) && SvTYPE((pAV = (AV *)SvRV(*ppSV))) == SVt_PVAV)
+ { /* Array reference */
+ int f = AvFILL(pAV) + 1 ;
+ int i ;
+@@ -420,7 +420,7 @@
+ if (ppSV == NULL)
+ return ;
+
+- if (*ppSV == NULL || SvTYPE (*ppSV) != SVt_RV)
++ if (*ppSV == NULL || !SvROK (*ppSV))
+ {
+ if (*ppSV)
+ SvREFCNT_dec (*ppSV) ;
+@@ -456,7 +456,7 @@
+ SV * pSV ;
+
+ ppSV = hv_fetch((HV *)(pDomTree -> pSV), (char *)sStackName, strlen (sStackName), 0) ;
+- if (ppSV == NULL || *ppSV == NULL || SvTYPE (*ppSV) != SVt_RV)
++ if (ppSV == NULL || *ppSV == NULL || !SvROK (*ppSV))
+ return ;
+
+ pSV = av_pop ((AV *)SvRV (*ppSV)) ;
+@@ -486,7 +486,7 @@
+ char * s ;
+
+ ppSV = hv_fetch((HV *)(pDomTree -> pSV), (char *)sStackName, strlen (sStackName), 0) ;
+- if (ppSV == NULL || *ppSV == NULL || SvTYPE (*ppSV) != SVt_RV)
++ if (ppSV == NULL || *ppSV == NULL || !SvROK (*ppSV))
+ {
+ strcpy (r -> errdat1, "CompileMatchStack") ;
+ strncat (r -> errdat1, (char *)sStackName, sizeof (r -> errdat1) - 20) ;
+@@ -541,7 +541,7 @@
+
+
+ ppSV = hv_fetch((HV *)(pDomTree -> pSV), (char *)p, e - p, 0) ;
+- if (ppSV == NULL || *ppSV == NULL || SvTYPE (*ppSV) != SVt_RV)
++ if (ppSV == NULL || *ppSV == NULL || !SvROK (*ppSV))
+ return op == '!'?1:0 ;
+
+ pAV = (AV *)SvRV (*ppSV) ;
+Index: epcmd.c
+===================================================================
+--- a/epcmd.c (revision 960449)
++++ b/epcmd.c (revision 960450)
+@@ -637,7 +637,7 @@
+ if (pRV == NULL)
+ return rcMissingArgs ;
+
+- if (SvTYPE (pRV) != SVt_RV)
++ if (!SvROK (pRV))
+ {
+ SvREFCNT_dec (pRV) ;
+ return rcNotAnArray ;
Modified: trunk/libembperl-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libembperl-perl/debian/patches/series?rev=68500&op=diff
==============================================================================
--- trunk/libembperl-perl/debian/patches/series (original)
+++ trunk/libembperl-perl/debian/patches/series Sun Feb 13 15:38:33 2011
@@ -10,3 +10,4 @@
fix-whatis.patch
fix-string-typo.patch
fix-pod-unescaped-unicode.patch
+perl5.12.patch
More information about the Pkg-perl-cvs-commits
mailing list