SPECS (AC-branch): php.spec - add bunch of crash patches from gentoo. likel...

[glen]

Author: glen                         Date: Tue Oct  7 23:12:15 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- add bunch of crash patches from gentoo. likely resolves CVE-2008-2371, CVE-2008-2665, CVE-2008-2666 
- rel 7

---- Files affected:
SPECS:
   php.spec (1.631.2.71 -> 1.631.2.72) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.631.2.71 SPECS/php.spec:1.631.2.72
--- SPECS/php.spec:1.631.2.71	Wed Oct  8 00:37:18 2008
+++ SPECS/php.spec	Wed Oct  8 01:12:10 2008
@@ -73,7 +73,7 @@
 %undefine	with_filter
 %endif
 
-%define		rel 6
+%define		rel 7
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -97,6 +97,8 @@
 # Source7-md5:	47a742fa9fab2826ad10c13a2376111a
 # Taken from: http://browsers.garykeith.com/downloads.asp
 Source8:	%{name}_browscap.ini
+Source9:	http://ftp.linux.ee/pub/gentoo/distfiles/distfiles/%{name}-patchset-%{version}-r8.tar.bz2
+# Source9-md5:	0f411800537648d0748417124291bd58
 Patch0:		%{name}-shared.patch
 Patch1:		%{name}-pldlogo.patch
 Patch2:		%{name}-mail.patch
@@ -1584,7 +1586,7 @@
 
 %if %{with hardening}
 zcat %{SOURCE7} | patch -p1 || exit 1
-patch -p1 < %{PATCH22} || exit 1
+%{__patch} -p1 < %{PATCH22} || exit 1
 %endif
 %patch23 -p1
 %patch24 -p1
@@ -1592,6 +1594,11 @@
 
 %{?with_versioning:%patch26 -p1}
 
+%{__tar} jxf %{SOURCE9}
+for a in %{version}/%{version}/*.patch; do
+	%{__patch} -p1 < $a
+done
+
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
@@ -2757,6 +2764,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.631.2.72  2008/10/07 23:12:10  glen
+- add bunch of crash patches from gentoo. likely resolves CVE-2008-2371, CVE-2008-2665, CVE-2008-2666
+- rel 7
+
 Revision 1.631.2.71  2008/10/07 22:37:18  glen
 - modify php.ini aswell
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php.spec?r1=1.631.2.71&r2=1.631.2.72&f=u