SPECS (DEVEL): php4.spec - update from HEAD: Hardening patch updat...

[glen]

Author: glen                         Date: Sat Jul  9 19:18:06 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- update from HEAD: Hardening patch updated to 0.3.1

---- Files affected:
SPECS:
   php4.spec (1.421.2.3.2.28 -> 1.421.2.3.2.29) 

---- Diffs:

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.421.2.3.2.28 SPECS/php4.spec:1.421.2.3.2.29
--- SPECS/php4.spec:1.421.2.3.2.28	Thu Jul  7 00:27:33 2005
+++ SPECS/php4.spec	Sat Jul  9 21:18:01 2005
@@ -77,7 +77,7 @@
 Summary(uk):	PHP ÷ĹŇÓŚ§ 4 - ÍĎ×Á ĐŇĹĐŇĎĂĹÓŐ×ÁÎÎŃ HTML-ĆÁĘĚŚ×, ×ÉËĎÎŐ×ÁÎÁ ÎÁ ÓĹŇ×ĹŇŚ
 Name:		php4
 Version:	4.3.11
-Release:	4.22%{?with_hardening:hardened}
+Release:	4.23%{?with_hardening:hardened}
 Epoch:		3
 Group:		Libraries
 License:	PHP
@@ -91,8 +91,8 @@
 Source6:	%{name}-cgi.ini
 Source7:	%{name}-apache.ini
 Source8:	%{name}-cli.ini
-Source9:	http://www.hardened-php.net/hardening-patch-4.3.11-0.3.0.patch.gz
-# Source9-md5:	afb80fb24545aab2f78996b4f8521809
+Source9:	http://www.hardened-php.net/hardening-patch-4.3.11-0.3.1.patch.gz
+# Source9-md5:	b231e363b60c8749fcafe1e24e8bacbb
 Patch0:		%{name}-shared.patch
 Patch1:		%{name}-pldlogo.patch
 Patch2:		%{name}-xml-expat-fix.patch
@@ -127,8 +127,7 @@
 Patch32:	%{name}-gd_imagerotate_enable.patch
 Patch33:	%{name}-uint32_t.patch
 Patch34:	%{name}-install_gd_headers.patch
-Patch35:	%{name}-hardening-fix.patch
-Patch36:	%{name}-both-apxs.patch
+Patch35:	%{name}-both-apxs.patch
 #Icon:		php4.gif
 URL:		http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
@@ -1632,11 +1631,10 @@
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
-%patch36 -p1
+%patch35 -p1
 
 %if %{with hardening}
 zcat %{SOURCE9} | patch -p1
-patch -p1 < %{PATCH35}
 %endif
 
 # new apr
@@ -2925,6 +2923,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.421.2.3.2.29  2005/07/09 19:18:01  glen
+- update from HEAD: Hardening patch updated to 0.3.1
+
 Revision 1.421.2.3.2.28  2005/07/06 22:27:33  glen
 - md5 fix
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php4.spec?r1=1.421.2.3.2.28&r2=1.421.2.3.2.29&f=u