r6902 - in /trunk/libapache2-mod-perl2: ModPerl-Registry/lib/ModPerl/ debian/ debian/patches/

gwolf at users.alioth.debian.org gwolf at users.alioth.debian.org
Fri Aug 17 23:06:40 UTC 2007 

Author: gwolf
Date: Fri Aug 17 23:06:40 2007
New Revision: 6902

URL: http://svn.debian.org/wsvn/?sc=1&rev=6902
Log:
- Renamed patch 03 to be style-consistent 
- The bug extra data snippet will no longer appear to be sent directly
  to the upstream author
- Some extra bits of cleaning
- Applied fix for CVE advisory (see bug #384622)

Added:
    trunk/libapache2-mod-perl2/debian/patches/003-segfault-local-ENV-bug-384622.patch
      - copied unchanged from r6891, trunk/libapache2-mod-perl2/debian/patches/03-384622.patch
    trunk/libapache2-mod-perl2/debian/patches/004-bugs-to-debian-bts.patch
    trunk/libapache2-mod-perl2/debian/patches/005-regex-DoS-bug-433549.patch
Removed:
    trunk/libapache2-mod-perl2/debian/patches/03-384622.patch
Modified:
    trunk/libapache2-mod-perl2/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
    trunk/libapache2-mod-perl2/debian/changelog
    trunk/libapache2-mod-perl2/debian/control
    trunk/libapache2-mod-perl2/debian/rules

Modified: trunk/libapache2-mod-perl2/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm?rev=6902&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm (original)
+++ trunk/libapache2-mod-perl2/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm Fri Aug 17 23:06:40 2007
@@ -336,7 +336,7 @@
     my $self = shift;
 
     my $path_info = $self->{REQ}->path_info;
-    my $script_name = $path_info && $self->{URI} =~ /$path_info$/
+    my $script_name = $path_info && $self->{URI} =~ /\Q$path_info\E$/
         ? substr($self->{URI}, 0, length($self->{URI}) - length($path_info))
         : $self->{URI};
 

Modified: trunk/libapache2-mod-perl2/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/changelog?rev=6902&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/changelog (original)
+++ trunk/libapache2-mod-perl2/debian/changelog Fri Aug 17 23:06:40 2007
@@ -9,8 +9,12 @@
     needed: Moving mp2bug)
   * Added debian/watch
   * Moved libapache2-mod-perl2-doc to section: doc
-
- -- Gunnar Wolf <gwolf at debian.org>  Fri, 17 Aug 2007 14:29:02 -0500
+  * the -dev and -doc generated binary packages are now arch: all
+    insteaed of arch: any
+  * Applied upstream patch fixing CVE-2007-1349 DoS caused by improperly
+    quoted regex (Closes: #433549)
+
+ -- Gunnar Wolf <gwolf at debian.org>  Fri, 17 Aug 2007 18:07:56 -0500
 
 libapache2-mod-perl2 (2.0.2-2.4) unstable; urgency=high
 

Modified: trunk/libapache2-mod-perl2/debian/control
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/control?rev=6902&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/control (original)
+++ trunk/libapache2-mod-perl2/debian/control Fri Aug 17 23:06:40 2007
@@ -21,7 +21,7 @@
  based web sites - for example, http://slashdot.org.
  
 Package: libapache2-mod-perl2-dev
-Architecture: any
+Architecture: all
 Depends: libapache2-mod-perl2
 Description: Integration of perl with the Apache2 web server - development files
  mod_perl allows the use of Perl for just about anything
@@ -33,7 +33,7 @@
  C-based modules integrating with mod_perl.
 
 Package: libapache2-mod-perl2-doc
-Architecture: any
+Architecture: all
 Section: doc
 Description: Integration of perl with the Apache2 web server - documentation
  mod_perl allows the use of Perl for just about anything

Added: trunk/libapache2-mod-perl2/debian/patches/004-bugs-to-debian-bts.patch
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/patches/004-bugs-to-debian-bts.patch?rev=6902&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/patches/004-bugs-to-debian-bts.patch (added)
+++ trunk/libapache2-mod-perl2/debian/patches/004-bugs-to-debian-bts.patch Fri Aug 17 23:06:40 2007
@@ -1,0 +1,18 @@
+Index: lib/ModPerl/TestReport.pm
+===================================================================
+--- lib/ModPerl/TestReport.pm	(revision 6891)
++++ lib/ModPerl/TestReport.pm	(working copy)
+@@ -96,7 +96,11 @@
+     return $package;
+ }
+ 
+-sub report_to { 'modperl at perl.apache.org' }
++# We are reporting to the Debian BTS, not directly to the upstream (Apache)
++sub report_to { 'submit at bugs.debian.org' }
++sub postit_note {
++    # No, no postit notes required :) This report will be typically
++    # embedded in reportbug's, so...
++}
+ 
+-
+ 1;

Added: trunk/libapache2-mod-perl2/debian/patches/005-regex-DoS-bug-433549.patch
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/patches/005-regex-DoS-bug-433549.patch?rev=6902&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/patches/005-regex-DoS-bug-433549.patch (added)
+++ trunk/libapache2-mod-perl2/debian/patches/005-regex-DoS-bug-433549.patch Fri Aug 17 23:06:40 2007
@@ -1,0 +1,13 @@
+Index: ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
+===================================================================
+--- ModPerl-Registry/lib/ModPerl/RegistryCooker.pm	(revision 6891)
++++ ModPerl-Registry/lib/ModPerl/RegistryCooker.pm	(working copy)
+@@ -336,7 +336,7 @@
+     my $self = shift;
+ 
+     my $path_info = $self->{REQ}->path_info;
+-    my $script_name = $path_info && $self->{URI} =~ /$path_info$/
++    my $script_name = $path_info && $self->{URI} =~ /\Q$path_info\E$/
+         ? substr($self->{URI}, 0, length($self->{URI}) - length($path_info))
+         : $self->{URI};
+ 

Modified: trunk/libapache2-mod-perl2/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/rules?rev=6902&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/rules (original)
+++ trunk/libapache2-mod-perl2/debian/rules Fri Aug 17 23:06:40 2007
@@ -27,6 +27,7 @@
 	install -m644 $(CURDIR)/debian/perl.load debian/libapache2-mod-perl2/etc/apache2/mods-available
 	rm -rf $(BUILDDIR)/usr/man
 	rm -f $(BUILDDIR)/usr/share/man/man3/mod_perl.3pm
+	rm -rf $(BUILDDIR)/usr/share/perl5
 
 	# mp2bug goes into the /usr/share/bug infrastructure!
 	mv $(BUILDDIR)/usr/bin/mp2bug $(BUILDDIR)/usr/share/libapache2-mod-perl2/

More information about the Pkg-perl-cvs-commits mailing list