SPECS (DEVEL): php4.spec - merge Hardened-PHP to rename Hardening-...

[glen]

Author: glen                         Date: Wed Jul  6 22:21:52 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- merge Hardened-PHP to rename Hardening-Patch changes from HEAD

---- Files affected:
SPECS:
   php4.spec (1.421.2.3.2.26 -> 1.421.2.3.2.27) 

---- Diffs:

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.421.2.3.2.26 SPECS/php4.spec:1.421.2.3.2.27
--- SPECS/php4.spec:1.421.2.3.2.26	Wed Jul  6 23:31:25 2005
+++ SPECS/php4.spec	Thu Jul  7 00:21:46 2005
@@ -13,7 +13,7 @@
 # Conditional build:
 %bcond_with	db3		# use db3 packages instead of db (4.x) for Berkeley DB support
 %bcond_with	fdf		# with FDF (PDF forms) module		(BR: proprietary lib)
-%bcond_with	hardened	# build with hardened patch applied (http://www.hardened-php.net/)
+%bcond_with	hardening	# build with hardening patch applied (http://www.hardened-php.net/)
 %bcond_with	interbase_inst	# use InterBase install., not Firebird	(BR: proprietary libs)
 %bcond_with	java		# with Java extension module		(BR: jdk)
 %bcond_with	oci8		# with Oracle oci8 extension module	(BR: proprietary libs)
@@ -77,7 +77,7 @@
 Summary(uk):	PHP ÷ĹŇÓŚ§ 4 - ÍĎ×Á ĐŇĹĐŇĎĂĹÓŐ×ÁÎÎŃ HTML-ĆÁĘĚŚ×, ×ÉËĎÎŐ×ÁÎÁ ÎÁ ÓĹŇ×ĹŇŚ
 Name:		php4
 Version:	4.3.11
-Release:	4.21%{?with_hardened:hardened}
+Release:	4.22%{?with_hardening:hardened}
 Epoch:		3
 Group:		Libraries
 License:	PHP
@@ -91,7 +91,7 @@
 Source6:	%{name}-cgi.ini
 Source7:	%{name}-apache.ini
 Source8:	%{name}-cli.ini
-Source9:	http://www.hardened-php.net/hardened-php-4.3.11-0.2.7.patch.gz
+Source9:	http://www.hardened-php.net/hardening-patch-4.3.11-0.3.0.patch.gz
 # Source9-md5:	c649f58458a39532889ed82f1aebee34
 Patch0:		%{name}-shared.patch
 Patch1:		%{name}-pldlogo.patch
@@ -127,7 +127,8 @@
 Patch32:	%{name}-gd_imagerotate_enable.patch
 Patch33:	%{name}-uint32_t.patch
 Patch34:	%{name}-install_gd_headers.patch
-Patch35:	%{name}-both-apxs.patch
+Patch35:	%{name}-hardening-fix.patch
+Patch36:	%{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}}
@@ -1631,9 +1632,12 @@
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
-%patch35 -p1
+%patch36 -p1
 
-%{?with_hardened:zcat %{SOURCE9} | patch -p1}
+%if %{with hardening}
+zcat %{SOURCE9} | patch -p1
+patch -p1 < %{PATCH35}
+%endif
 
 # new apr
 sed -i -e 's#apr-config#apr-1-config#g' sapi/apache*/*.m4
@@ -2921,6 +2925,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.421.2.3.2.27  2005/07/06 22:21:46  glen
+- merge Hardened-PHP to rename Hardening-Patch changes from HEAD
+
 Revision 1.421.2.3.2.26  2005/07/06 21:31:25  glen
 - cleanups
 
================================================================

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