tags 398675 - upstream tags 399640 - upstream tags 399639 - upstream tags 398675 + fixed-upstream patch tags 399640 + fixed-upstream tags 399639 + fixed-upstream tags 401737 + patch block 398675 by 401737 block 399640 by 401737 block 399639 by 401737 thanks
These bugs are all fixed by version 2.0.3 of mod_perl2. Attached is the interdiff to package the upstream release. Please try and get it into etch. -- Sam Morris http://robots.org.uk/ PGP key id 1024D/5EA01078 3412 EA18 1277 354B 991B C869 B219 7FDB 5EA0 1078
diff -ruN libapache2-mod-perl2-2.0.2/debian/changelog libapache2-mod-perl2-2.0.3/debian/changelog
--- libapache2-mod-perl2-2.0.2/debian/changelog 2007-01-13 14:41:58.000000000 +0000
+++ libapache2-mod-perl2-2.0.3/debian/changelog 2007-01-13 15:01:45.000000000 +0000
@@ -1,3 +1,11 @@
+libapache2-mod-perl2 (2.0.3-1) UNRELEASED; urgency=low
+
+ * New upstream release (closes: #401737, #398675, #399640, #399639)
+ * 002-crash-404051.patch dropped: merged upstream
+ * 03-384622.patch dropped: merged upstream
+
+ -- Sam Morris <[EMAIL PROTECTED]> Sat, 13 Jan 2007 14:48:32 +0000
+
libapache2-mod-perl2 (2.0.2-2.3) unstable; urgency=high
* Non-maintainer upload. Thanks to Kjetil Kjernsmo for noticing the issues.
diff -ruN libapache2-mod-perl2-2.0.2/debian/patches/002-crash-404051.patch libapache2-mod-perl2-2.0.3/debian/patches/002-crash-404051.patch
--- libapache2-mod-perl2-2.0.2/debian/patches/002-crash-404051.patch 2007-01-13 14:41:58.000000000 +0000
+++ libapache2-mod-perl2-2.0.3/debian/patches/002-crash-404051.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- 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 -ruN libapache2-mod-perl2-2.0.2/debian/patches/03-384622.patch libapache2-mod-perl2-2.0.3/debian/patches/03-384622.patch
--- libapache2-mod-perl2-2.0.2/debian/patches/03-384622.patch 2007-01-13 14:41:58.000000000 +0000
+++ libapache2-mod-perl2-2.0.3/debian/patches/03-384622.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,38 +0,0 @@
---- 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)",
signature.asc
Description: This is a digitally signed message part
