r15823 - in /trunk/libapache2-mod-perl2/debian: changelog patches/010-svn-fix-bleadperl.patch patches/series

[ntyni at users.alioth.debian.org]

Author: ntyni
Date: Wed Feb 27 20:24:40 2008
New Revision: 15823

URL: http://svn.debian.org/wsvn/?sc=1&rev=15823
Log:
  + 010-svn-fix-bleadperl.patch: more Perl 5.10 fixes from upstream SVN.

Added:
    trunk/libapache2-mod-perl2/debian/patches/010-svn-fix-bleadperl.patch
Modified:
    trunk/libapache2-mod-perl2/debian/changelog
    trunk/libapache2-mod-perl2/debian/patches/series

Modified: trunk/libapache2-mod-perl2/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/changelog?rev=15823&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/changelog (original)
+++ trunk/libapache2-mod-perl2/debian/changelog Wed Feb 27 20:24:40 2008
@@ -38,6 +38,7 @@
   * debian/patches:
     + remove those Debian patches included upstream from the source package,
       as they had not been applied since 2.0.3-1.
+    + 010-svn-fix-bleadperl.patch: more Perl 5.10 fixes from upstream SVN.
 
  -- Frank Lichtenheld <djpig at debian.org>  Tue, 30 Oct 2007 09:57:01 +0100
 

Added: trunk/libapache2-mod-perl2/debian/patches/010-svn-fix-bleadperl.patch
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/patches/010-svn-fix-bleadperl.patch?rev=15823&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/patches/010-svn-fix-bleadperl.patch (added)
+++ trunk/libapache2-mod-perl2/debian/patches/010-svn-fix-bleadperl.patch Wed Feb 27 20:24:40 2008
@@ -1,0 +1,54 @@
+Perl 5.9.x fixes from upstream SVN r480890 and r480903
+
+--- libapache2-mod-perl2.orig/src/modules/perl/mod_perl.c
++++ libapache2-mod-perl2/src/modules/perl/mod_perl.c
+@@ -584,6 +584,15 @@
+ 
+ static apr_status_t modperl_sys_term(void *data)
+ {
++    /* PERL_SYS_TERM() needs 'my_perl' as of 5.9.5 */
++#ifdef USE_ITHREADS
++# if PERL_REVISION == 5 && \
++  ((PERL_VERSION == 9 && PERL_SUBVERSION > 4) || \
++   PERL_VERSION > 9)
++    modperl_cleanup_data_t *cdata = (modperl_cleanup_data_t *)data;
++    PerlInterpreter *my_perl = (PerlInterpreter *)cdata->data;
++# endif
++#endif
+     MP_init_status = 0;
+     MP_threads_started = 0;
+     MP_post_post_config_phase = 0;
+--- libapache2-mod-perl2.orig/src/modules/perl/modperl_interp.h
++++ libapache2-mod-perl2/src/modules/perl/modperl_interp.h
+@@ -36,16 +36,30 @@
+  * cleaner solution. of course it must be really fast.
+  */
+ #ifndef HvPMROOT
++# if PERL_REVISION == 5 && \
++    ((PERL_VERSION == 9 && PERL_SUBVERSION > 4) || \
++    PERL_VERSION > 9)
+ #define MP_THX_INTERP_GET(thx)                                  \
+-    (modperl_interp_t *) ((XPVMG*)SvANY(*Perl_Imodglobal_ptr(thx)))->xmg_magic
++    (modperl_interp_t *) ((XPVMG*)SvANY(*Perl_Imodglobal_ptr(thx)))->xmg_u.xmg_magic
++# else
++#define MP_THX_INTERP_GET(thx)                                  \
++      (modperl_interp_t *) ((XPVMG*)SvANY(*Perl_Imodglobal_ptr(thx)))->xmg_magic
++# endif
+ #else
+ #define MP_THX_INTERP_GET(thx) \
+     (modperl_interp_t *)HvPMROOT(*Perl_Imodglobal_ptr(thx))
+ #endif
+ 
+ #ifndef HvPMROOT
++# if PERL_REVISION == 5 && \
++    ((PERL_VERSION == 9 && PERL_SUBVERSION > 4) || \
++    PERL_VERSION > 9)
++#define MP_THX_INTERP_SET(thx, interp)                          \
++    ((XPVMG*)SvANY(*Perl_Imodglobal_ptr(thx)))->xmg_u.xmg_magic = (MAGIC*)interp
++# else
+ #define MP_THX_INTERP_SET(thx, interp)                          \
+     ((XPVMG*)SvANY(*Perl_Imodglobal_ptr(thx)))->xmg_magic = (MAGIC*)interp
++# endif
+ #else
+ #define MP_THX_INTERP_SET(thx, interp)                          \
+     HvPMROOT(*Perl_Imodglobal_ptr(thx)) = (PMOP*)interp

Modified: trunk/libapache2-mod-perl2/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/patches/series?rev=15823&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/patches/series (original)
+++ trunk/libapache2-mod-perl2/debian/patches/series Wed Feb 27 20:24:40 2008
@@ -4,4 +4,5 @@
 006_man_section_and_build_warnings.patch
 008_fix_version_check_in_t_response_TestAPI_server_const_pm.patch
 009-allow-parallel-build.patch
+010-svn-fix-bleadperl.patch
 011-svn-fix-perl5.10-build.patch