rpms/mod_perl/FC-5 filter-provides.sh, NONE, 1.1 mod_perl-2.0.2-CVE-2007-1349.patch, NONE, 1.1 filter-requires.sh, 1.4, 1.5 mod_perl.spec, 1.38, 1.39

[fedora-cvs-commits at redhat.com]

Author: jorton

Update of /cvs/dist/rpms/mod_perl/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11484

Modified Files:
	filter-requires.sh mod_perl.spec 
Added Files:
	filter-provides.sh mod_perl-2.0.2-CVE-2007-1349.patch 
Log Message:
* Fri Jun  8 2007 Joe Orton <jorton at redhat.com> 2.0.2-5.2.fc5
- add security fix for CVE-2007-1349
- drop perl(warnings) provide (#228429) 
- drop perl(HTTP::Request::Common) provide



--- NEW FILE filter-provides.sh ---
#!/bin/sh

/usr/lib/rpm/perl.prov $* | \
    sed -e '/perl(warnings)/d'

mod_perl-2.0.2-CVE-2007-1349.patch:
 RegistryCooker.pm |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mod_perl-2.0.2-CVE-2007-1349.patch ---
--- mod_perl-2.0.2/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm.cve1349
+++ mod_perl-2.0.2/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
@@ -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};
 


Index: filter-requires.sh
===================================================================
RCS file: /cvs/dist/rpms/mod_perl/FC-5/filter-requires.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- filter-requires.sh	18 Apr 2005 14:35:41 -0000	1.4
+++ filter-requires.sh	8 Jun 2007 15:06:06 -0000	1.5
@@ -3,7 +3,6 @@
 /usr/lib/rpm/perl.req $* |\
     sed -e '/perl(Apache2::FunctionTable)/d' \
         -e '/perl(Apache2::StructureTable)/d' \
-        -e '/perl(Apache::TestConfigParse)/d' \
-        -e '/perl(Apache::TestConfigPerl)/d' \
+        -e '/perl(Apache::Test.*)/d' \
 	-e '/perl(Data::Flow)/d' \
 	-e '/perl(Module::Build)/d' 


Index: mod_perl.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_perl/FC-5/mod_perl.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- mod_perl.spec	11 Feb 2006 04:37:38 -0000	1.38
+++ mod_perl.spec	8 Jun 2007 15:06:06 -0000	1.39
@@ -2,7 +2,7 @@
 
 Name:           mod_perl
 Version:        2.0.2
-Release:        5.1
+Release:        5.2%{?dist}
 Summary:        An embedded Perl interpreter for the Apache Web server
 
 Group:          System Environment/Daemons
@@ -11,10 +11,9 @@
 Source0:        http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
 Source1:        perl.conf
 Source2:        filter-requires.sh
-Source3:        reap-stale-servers.sh
-Source4:        testlock.sh
+Source3:        filter-provides.sh
+Patch0:         mod_perl-2.0.2-CVE-2007-1349.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  httpd-devel >= 2.2.0, httpd, gdbm-devel
 BuildRequires:  apr-devel >= 1.2.0, apr-util-devel
@@ -22,6 +21,7 @@
 Requires:       httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing)
 
 %define __perl_requires %{SOURCE2}
+%define __perl_provides %{SOURCE3}
 
 %description
 Mod_perl incorporates a Perl interpreter into the Apache web server,
@@ -34,7 +34,6 @@
 Install mod_perl if you're installing the Apache web server and you'd
 like for it to directly incorporate a Perl interpreter.
 
-
 %package devel
 Summary:        Files needed for building XS modules that use mod_perl
 Group:          Development/Libraries
@@ -44,10 +43,9 @@
 The mod_perl-devel package contains the files needed for building XS
 modules that use mod_perl.
 
-
 %prep
 %setup -q -n %{name}-%{version}
-
+%patch0 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fpic" %{__perl} Makefile.PL </dev/null \
@@ -57,7 +55,6 @@
 	MP_APR_CONFIG=%{_bindir}/apr-1-config
 make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS -fpic"
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/httpd/modules
@@ -78,41 +75,12 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
 install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
 
-# Install its manual.
-#mkdir -p $RPM_BUILD_ROOT%{contentdir}/manual/mod/mod_perl
-#install -c -m 644 htdocs/manual/mod/mod_perl.html \
-#        $RPM_BUILD_ROOT%{contentdir}/manual/mod
-
-#make -C faq
-#rm faq/pod2htm*
-#install -m644 faq/*.html $RPM_BUILD_ROOT%{contentdir}/manual/mod/mod_perl/
-
-
-%check || :
-# Run the test suite --- NOT, because it has requirements that cannot be
-# assumed to be satisfied in build roots.
-%if 0
-#  Need to chmod t/htdocs/perlio because it isn't expecting to be run as
-#  root and will fail tests that try and write files because the server
-#  will have changed it's uid.
-%ifarch %{ix86}
-chmod 777 t/htdocs/perlio
-$RPM_SOURCE_DIR/testlock.sh acquire
-$RPM_SOURCE_DIR/reap-stale-servers.sh
-make test
-$RPM_SOURCE_DIR/testlock.sh release
-%endif
-%endif
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root,-)
 %doc Changes LICENSE README* STATUS SVN-MOVE docs/
-#%{contentdir}/manual/mod/*
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 %{_bindir}/*
 %{_libdir}/httpd/modules/mod_perl.so
@@ -125,13 +93,16 @@
 %{perl_vendorarch}/*.pm
 %{_mandir}/man3/*.3*
 
-
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/httpd/*
 
-
 %changelog
+* Fri Jun  8 2007 Joe Orton <jorton at redhat.com> 2.0.2-5.2.fc5
+- add security fix for CVE-2007-1349
+- drop perl(warnings) provide (#228429) 
+- drop perl(HTTP::Request::Common) provide
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0.2-5.1
 - bump again for double-long bug on ppc(64)