SPECS: php.spec - add bunch of crash patches from gentoo. likely resolves C...

[glen]

Author: glen                         Date: Wed Oct  8 21:32:57 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add bunch of crash patches from gentoo. likely resolves CVE-2008-2371, CVE-2008-2665, CVE-2008-2666
- default charset ini settings for mysql from gentoo
- rel 11

---- Files affected:
SPECS:
   php.spec (1.732 -> 1.733) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.732 SPECS/php.spec:1.733
--- SPECS/php.spec:1.732	Sun Sep  7 21:13:08 2008
+++ SPECS/php.spec	Wed Oct  8 23:32:51 2008
@@ -74,7 +74,7 @@
 %undefine	with_filter
 %endif
 
-%define		rel 10
+%define		rel 11
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -98,6 +98,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
@@ -137,6 +139,10 @@
 Patch36:	%{name}-mime_magic.patch
 Patch37:	%{name}-libtool.patch
 Patch38:	%{name}-tds.patch
+Patch39:	%{name}-mysql-charsetphpini.patch
+Patch40:	%{name}-mysqli-charsetphpini.patch
+Patch41:	%{name}-pdo_mysql-charsetphpini.patch
+Patch42:	%{name}-ini-charsetphpini.patch
 URL:		http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:	aspell-devel >= 2:0.50.0}
@@ -1594,6 +1600,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
@@ -1606,6 +1617,12 @@
 %patch37 -p1
 %patch38 -p1
 
+# mysql default charset for mysql/mysql/pdo-mysql extensions
+%patch39 -p1
+%patch40 -p0
+%patch41 -p0
+%patch42 -p1
+
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4
 
@@ -2760,6 +2777,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.733  2008/10/08 21:32:51  glen
+- add bunch of crash patches from gentoo. likely resolves CVE-2008-2371, CVE-2008-2665, CVE-2008-2666
+- default charset ini settings for mysql from gentoo
+- rel 11
+
 Revision 1.732  2008/09/07 19:13:08  adamg
 - release 10 (against libltdl-2.2.6-1)
 
================================================================

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