rpms/mod_perl/F-12 mod_perl-2.0.4-CVE-2009-0796.patch, NONE, 1.1 mod_perl.spec, 1.69, 1.70

[jorton]

Author: jorton

Update of /cvs/extras/rpms/mod_perl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15412

Modified Files:
	mod_perl.spec 
Added Files:
	mod_perl-2.0.4-CVE-2009-0796.patch 
Log Message:
* Tue Dec  8 2009 Joe Orton <jorton at redhat.com> - 2.0.4-10
- add security fix for CVE-2009-0796 (#544455)


mod_perl-2.0.4-CVE-2009-0796.patch:
 Status.pm |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE mod_perl-2.0.4-CVE-2009-0796.patch ---
--- mod_perl-2.0.4/lib/Apache2/Status.pm.cve0796
+++ mod_perl-2.0.4/lib/Apache2/Status.pm
@@ -29,7 +29,7 @@ use File::Spec ();
 
 use Apache2::Const -compile => qw(OK);
 
-$Apache2::Status::VERSION = '4.00'; # mod_perl 2.0
+$Apache2::Status::VERSION = '4.01'; # mod_perl 2.0
 
 use constant IS_WIN32 => ($^O eq "MSWin32");
 
@@ -126,7 +126,7 @@ sub handler {
         $r->print(symdump($r, $qs));
     }
     else {
-        my $uri = $r->uri;
+        my $uri = $r->location;
         $r->print('<p>');
         $r->print(
             map { qq[<a href="$uri?$_">$status{$_}</a><br />\n] } sort { lc $a cmp lc $b } keys %status
@@ -198,7 +198,7 @@ sub status_section_config {
 sub status_inc {
     my ($r) = @_;
 
-    my $uri = $r->uri;
+    my $uri = $r->location;
     my @retval = (
         '<table border="1">',
         "<tr>",
@@ -289,7 +289,7 @@ sub status_rgysubs {
     my ($r) = @_;
 
     local $_;
-    my $uri = $r->uri;
+    my $uri = $r->location;
     my $cache = __PACKAGE__->registry_cache;
 
     my @retval = "<h2>Compiled registry scripts grouped by their handler</h2>";
@@ -765,7 +765,7 @@ sub as_HTML {
     my ($self, $package, $r) = @_;
 
     my @m = qw(<table>);
-    my $uri = $r->uri;
+    my $uri = $r->location;
     my $is_main = $package eq "main";
 
     my $do_dump = has($r, "dumper");


Index: mod_perl.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_perl/F-12/mod_perl.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- mod_perl.spec	25 Jul 2009 14:47:25 -0000	1.69
+++ mod_perl.spec	8 Dec 2009 17:15:55 -0000	1.70
@@ -2,7 +2,7 @@
 
 Name:           mod_perl
 Version:        2.0.4
-Release:        9
+Release:        10%{?dist}
 Summary:        An embedded Perl interpreter for the Apache HTTP Server
 
 Group:          System Environment/Daemons
@@ -14,6 +14,7 @@ Source2:        filter-requires.sh
 Source3:        filter-provides.sh
 Patch0:         mod_perl-2.0.4-multilib.patch
 Patch1:         mod_perl-2.0.4-inline.patch
+Patch2:         mod_perl-2.0.4-CVE-2009-0796.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl-devel, perl(ExtUtils::Embed)
@@ -51,6 +52,7 @@ modules that use mod_perl.
 %setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1 -b .inline
+%patch2 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fpic" %{__perl} Makefile.PL </dev/null \
@@ -129,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/httpd/*
 
 %changelog
+* Tue Dec  8 2009 Joe Orton <jorton at redhat.com> - 2.0.4-10
+- add security fix for CVE-2009-0796 (#544455)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild