[SCM] Debian packaging of libapache2-mod-perl2 branch, master, updated. debian/2.0.5-3-1-gcc870cb

[Dominic Hargreaves]

The following commit has been merged in the master branch:
commit cc870cb9d7489c16353006a0d357930159d91606
Author: Dominic Hargreaves <dom at earth.li>
Date:   Thu Nov 3 22:18:29 2011 +0000

    Add patch from upstream svn adopting the Perl_sv_dup() changes in Perl 5.14 (relates to: #636651)

diff --git a/debian/changelog b/debian/changelog
index acc58dd..bb7aea4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libapache2-mod-perl2 (2.0.5-4) UNRELEASED; urgency=low
+
+  * Add patch from upstream svn adopting the Perl_sv_dup() changes in
+    Perl 5.14 (relates to: #636651)
+
+ -- Dominic Hargreaves <dom at earth.li>  Thu, 03 Nov 2011 22:16:52 +0000
+
 libapache2-mod-perl2 (2.0.5-3) unstable; urgency=low
 
   [ Ansgar Burchardt ]
diff --git a/debian/control b/debian/control
index 579467c..d63a785 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Damyan Ivanov <dmn at debian.org>,
  Niko Tyni <ntyni at debian.org>, gregor herrmann <gregoa at debian.org>,
- Nicholas Bamber <nicholas at periapt.co.uk>
+ Nicholas Bamber <nicholas at periapt.co.uk>, Dominic Hargreaves <dom at earth.li>
 Standards-Version: 3.9.2
 Homepage: http://perl.apache.org/
 Vcs-Git: git://git.debian.org/pkg-perl/packages/libapache2-mod-perl2.git
diff --git a/debian/patches/240-perl-5.14-svrefcnt.patch b/debian/patches/240-perl-5.14-svrefcnt.patch
new file mode 100644
index 0000000..c80e254
--- /dev/null
+++ b/debian/patches/240-perl-5.14-svrefcnt.patch
@@ -0,0 +1,39 @@
+Description: adopt the Perl_sv_dup() changes in Perl 5.14
+
+Bug-Debian: http://bugs.debian.org/636651
+Origin: commit:1125476, http://svn.apache.org/viewvc?view=revision&revision=1125476
+
+--- perl/modperl/trunk/src/modules/perl/modperl_svptr_table.c	2010/04/11 12:20:06	932879
++++ perl/modperl/trunk/src/modules/perl/modperl_svptr_table.c	2011/05/20 17:22:24	1125476
+@@ -30,7 +30,7 @@
+ #ifdef USE_ITHREADS
+ 
+ #if MP_PERL_BRANCH(5, 6)
+-#   define my_sv_dup(s, p) sv_dup(s)
++#   define my_sv_dup(s, p) SvREFCNT_inc(sv_dup(s))
+ 
+ typedef struct {
+     AV *stashes;
+@@ -39,7 +39,11 @@
+ } CLONE_PARAMS;
+ 
+ #else
+-#   define my_sv_dup(s, p) sv_dup(s, p)
++#   ifdef sv_dup_inc
++#       define my_sv_dup(s, p) sv_dup_inc(s, p)
++#   else
++#       define my_sv_dup(s, p) SvREFCNT_inc(sv_dup(s, p))
++#   endif
+ #endif
+ 
+ /*
+@@ -89,8 +93,7 @@
+             /* key is just a pointer we do not modify, no need to copy */
+             dst_ent->oldval = src_ent->oldval;
+ 
+-            dst_ent->newval =
+-                SvREFCNT_inc(my_sv_dup((SV*)src_ent->newval, &parms));
++            dst_ent->newval = my_sv_dup((SV*)src_ent->newval, &parms);
+         }
+     }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 44bba64..e7e1352 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ avoid-db-linkage.patch
 210_fix-pod-errors.patch
 220_fix-bad-whatis-entry.patch
 230-test-failures-fix.patch
+240-perl-5.14-svrefcnt.patch

-- 
Debian packaging of libapache2-mod-perl2