Hi,

I uploaded an NMU of your package.

Please see this as help to get the package into a releaseable condition for
etch.

Please find the used diff below.


Cheers,
Andi

diff -Nur ../libapache2-mod-perl2-2.0.2~/debian/changelog 
../libapache2-mod-perl2-2.0.2/debian/changelog
--- ../libapache2-mod-perl2-2.0.2~/debian/changelog     2006-12-23 
17:10:22.000000000 +0000
+++ ../libapache2-mod-perl2-2.0.2/debian/changelog      2006-12-23 
17:15:44.000000000 +0000
@@ -1,3 +1,12 @@
+libapache2-mod-perl2 (2.0.2-2.3) unstable; urgency=high
+
+  * Non-maintainer upload. Thanks to Kjetil Kjernsmo for noticing the issues.
+  * Fix segfault if localizing %ENV. Closes: #384622
+    Using patch from 
http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_env.c?r1=158000&r2=357236&pathrev=357236
+  * Fix typo in Apache2::SizeLimit that could cause crash. Closes: #404051
+
+ -- Andreas Barth <[EMAIL PROTECTED]>  Sat, 23 Dec 2006 17:10:47 +0000
+
 libapache2-mod-perl2 (2.0.2-2.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nur ../libapache2-mod-perl2-2.0.2~/debian/patches/002-crash-404051.patch 
../libapache2-mod-perl2-2.0.2/debian/patches/002-crash-404051.patch
--- ../libapache2-mod-perl2-2.0.2~/debian/patches/002-crash-404051.patch        
1970-01-01 00:00:00.000000000 +0000
+++ ../libapache2-mod-perl2-2.0.2/debian/patches/002-crash-404051.patch 
2006-12-23 17:14:25.000000000 +0000
@@ -0,0 +1,11 @@
+--- lib/Apache2/SizeLimit.pm~  2005-10-21 00:04:43.000000000 +0000
++++ lib/Apache2/SizeLimit.pm   2006-12-23 17:13:33.000000000 +0000
+@@ -110,7 +110,7 @@
+ sub linux_smaps_size_check {
+ 
+     my $s = Linux::Smaps->new($$)->all;
+-    return ($s->size, $s->shared_cleani + $s->shared_dirty);
++    return ($s->size, $s->shared_clean + $s->shared_dirty);
+ }
+ 
+ # return process size (in KB)
diff -Nur ../libapache2-mod-perl2-2.0.2~/debian/patches/03-384622.patch 
../libapache2-mod-perl2-2.0.2/debian/patches/03-384622.patch
--- ../libapache2-mod-perl2-2.0.2~/debian/patches/03-384622.patch       
1970-01-01 00:00:00.000000000 +0000
+++ ../libapache2-mod-perl2-2.0.2/debian/patches/03-384622.patch        
2006-12-23 17:17:25.000000000 +0000
@@ -0,0 +1,38 @@
+--- src/modules/perl/modperl_env.c   2005/03/18 00:59:38
++++ src/modules/perl/modperl_env.c   2005/12/16 21:20:23
+@@ -15,8 +15,13 @@
+
+ #include "mod_perl.h"
+
+-#define EnvMgObj SvMAGIC((SV*)ENVHV)->mg_ptr
+-#define EnvMgLen SvMAGIC((SV*)ENVHV)->mg_len
++#define EnvMgOK  ((SV*)ENVHV && SvMAGIC((SV*)ENVHV))
++#define EnvMgObj (EnvMgOK ? SvMAGIC((SV*)ENVHV)->mg_ptr : NULL)
++#define EnvMgLen (EnvMgOK ? SvMAGIC((SV*)ENVHV)->mg_len : 0)
++#define EnvMgObjSet(val){ \
++    if (EnvMgOK) SvMAGIC((SV*)ENVHV)->mg_ptr = (char *)val;}
++#define EnvMgLenSet(val) {\
++    if (EnvMgOK) SvMAGIC((SV*)ENVHV)->mg_len = val;}
+
+ /* XXX: move to utils? */
+ static unsigned long modperl_interp_address(pTHX)
+@@ -401,8 +406,8 @@
+
+ void modperl_env_request_tie(pTHX_ request_rec *r)
+ {
+-    EnvMgObj = (char *)r;
+-    EnvMgLen = -1;
++    EnvMgObjSet(r);
++    EnvMgLenSet(-1);
+
+ #ifdef MP_PERL_HV_GMAGICAL_AWARE
+     MP_TRACE_e(MP_FUNC, "[%s/0x%lx] tie %%ENV, $r\n\t (%s%s)",
+@@ -414,7 +419,7 @@
+
+ void modperl_env_request_untie(pTHX_ request_rec *r)
+ {
+-    EnvMgObj = NULL;
++    EnvMgObjSet(NULL);
+
+ #ifdef MP_PERL_HV_GMAGICAL_AWARE
+     MP_TRACE_e(MP_FUNC, "[%s/0x%lx] untie %%ENV; # from r\n\t (%s%s)",
-- 
  http://home.arcor.de/andreas-barth/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to