From 38c22cb58c25d3930445d6383b323b1bc09b9875 Mon Sep 17 00:00:00 2001
From: Warren Togami <wtogami@fedoraproject.org>
Date: Sun, 24 Apr 2005 21:39:02 +0000
Subject: [PATCH] Updating CGI.pm from version 3.05 to 3.08 (mod_perl 2.0.0
 RC5). (#155839)

---
 .cvsignore |  1 +
 perl.spec  | 15 +++++++++++----
 sources    |  1 +
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index d4818d7..4aa33a2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 perl-5.8.6.tar.gz
+perl-5.8.6-CGI-3.08.patch
diff --git a/perl.spec b/perl.spec
index d36b08e..1644737 100644
--- a/perl.spec
+++ b/perl.spec
@@ -5,7 +5,7 @@
 %define multilib_64_archs x86_64 s390x ppc64 sparc64
 
 %define perlver 5.8.6
-%define perlrel 6
+%define perlrel 7
 %define perlepoch 3
 
 Provides: perl(:WITH_PERLIO)
@@ -99,6 +99,9 @@ Patch23: perl-5.8.3-findbin-selinux.patch
 # fix empty RPATH security issue
 Patch24: perl-5.8.3-empty-rpath.patch
 
+# mod_perl 2.0.0 RC5 requires CGI.pm 3.08
+Patch25: perl-5.8.6-CGI-3.08.patch
+
 # arch-specific patches
 Patch100: perl-5.8.1-fpic.patch
 Patch101: perl-5.8.0-libdir64.patch
@@ -110,7 +113,7 @@ Patch32003: perl-5.8.6-libresolv.patch
 # module updatesd
 # Patch202: perl-5.8.0-Safe2.09.patch
 
-Buildroot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, grep, tcsh, gdbm-devel, db4-devel, dos2unix, man, groff
 
 # By definition of 'do' (see 'man perlfunc') this package provides all
@@ -215,6 +218,7 @@ more secure running of setuid perl scripts.
 %patch21 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p1
 
 %patch100 -p1
 
@@ -297,9 +301,9 @@ sh Configure -des -Doptimize="$RPM_OPT_FLAGS" \
 	-Ud_sethostent_r_proto -Ud_setprotoent_r_proto -Ud_setservent_r_proto \
 	-Dinc_version_list='%{perlmodcompat}' 
 
-make -f Makefile
+make
 
-make -f Makefile test < /dev/null || /bin/true
+make test < /dev/null || /bin/true
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -414,6 +418,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Apr 24 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3:5.8.6-7
+- Updating CGI.pm from version 3.05 to 3.08 (mod_perl 2.0.0 RC5). (#155839)
+
 * Wed Apr 20 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3:5.8.6-6
 - FCGI is not provided by perl (#148847).
 - Drop the '.1' suffix from the perl-suidperl subpackage.
diff --git a/sources b/sources
index 1e2cd87..3490586 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 8d4aa4e061fd5bc0c39e4f0a63267880  perl-5.8.6.tar.gz
+31b8773f84db2740d4ca452398bd0dcc  perl-5.8.6-CGI-3.08.patch