- merged RH's security patches from AC-branch

[packages/php.git] / php.spec

diff --git a/php.spec b/php.spec
index d079306b68ae188c34a205b30cd690910ab44e89..ee0e94ad22b656c9b9181d5ba0ba1f16a8dd55cd 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -70,7 +70,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine      with_filter
 %endif
 
-%define        _rel 5
+%define        _rel 6
 Summary:       PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):     Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):     Język skryptowy PHP
@@ -126,6 +126,10 @@ Patch26:   %{name}-versioning.patch
 Patch27:       %{name}-linkflags-clean.patch
 Patch28:       %{name}-pear.patch
 Patch29:       %{name}-config-dir.patch
+Patch30:       %{name}-5.1.6-CVE-2007-0455.patch
+Patch31:       %{name}-5.1.6-CVE-2007-1001.patch
+Patch32:       %{name}-5.1.6-CVE-2007-1583.patch
+Patch33:       %{name}-5.1.6-CVE-2007-1718.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}
@@ -1587,6 +1591,10 @@ patch -p1 < %{PATCH22} || exit 1
 
 %patch28 -p1
 %patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
 
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4