SPECS: php.spec - fixed some typos in hardening patch, now it builds
prism
prism at pld-linux.org
Sun Jul 3 02:15:31 CEST 2005
Author: prism Date: Sun Jul 3 00:15:31 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- fixed some typos in hardening patch, now it builds
---- Files affected:
SPECS:
php.spec (1.452 -> 1.453)
---- Diffs:
================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.452 SPECS/php.spec:1.453
--- SPECS/php.spec:1.452 Sat Jul 2 22:17:17 2005
+++ SPECS/php.spec Sun Jul 3 02:15:26 2005
@@ -124,6 +124,7 @@
Patch27: %{name}-install_gd_headers.patch
Patch28: %{name}-cpdf-fix.patch
Patch29: %{name}-gcc4.patch
+Patch30: %{name}-hardening-fix.patch
Icon: php.gif
URL: http://www.php.net/
%{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel >= 1.0.2.908-2}}
@@ -1434,7 +1435,10 @@
%patch27 -p1
%patch29 -p1
-%{?with_hardening:zcat %{SOURCE9} | patch -p1}
+%if %{with hardening}
+zcat %{SOURCE9} | patch -p1
+patch -p1 < %{PATCH30}
+%endif
# conflict seems to be resolved by recode patches
rm -f ext/recode/config9.m4
@@ -2589,6 +2593,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.453 2005/07/03 00:15:26 prism
+- fixed some typos in hardening patch, now it builds
+
Revision 1.452 2005/07/02 20:17:17 prism
- Hardened-PHP is renamed to Hardening-Patch due to the PHP license
- s/hardened/hardening/ in bconds
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/php.spec?r1=1.452&r2=1.453&f=u
More information about the pld-cvs-commit
mailing list