OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Mar-2007 11:02:43
Branch: HEAD Handle: 2007031310024100
Modified files:
openpkg-src/apache-php4 apache-php4.spec
Log:
make Hardening patch apply on PHP 4.4.6
Summary:
Revision Changes Path
1.9 +7 -2 openpkg-src/apache-php4/apache-php4.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache-php4/apache-php4.spec
============================================================================
$ cvs diff -u -r1.8 -r1.9 apache-php4.spec
--- openpkg-src/apache-php4/apache-php4.spec 6 Mar 2007 17:07:37 -0000
1.8
+++ openpkg-src/apache-php4/apache-php4.spec 13 Mar 2007 10:02:41 -0000
1.9
@@ -68,7 +68,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20070306
+Release: 20070313
# package options (suexec related)
%option with_suexec yes
@@ -492,6 +492,7 @@
regex = php-(4\.\d+\.\d+)\.tar\.gz
}
prog apache-php4:mod_php_hardened = {
+ comment = "cs: year 2006 -> 2007 substitution probably obselete
with next release"
version = %{V_mod_php_hardened}
url = http://www.hardened-php.net/downloads.13.html
regex = hardening-patch-(4\.\d+\.\d+-\d+(\.\d+)+)\.patch\.gz
@@ -563,7 +564,11 @@
%setup -q -T -D -a 3
( cd php-%{V_mod_php}
%if "%{with_mod_php_hardened}" == "yes"
- %patch -p1 -P 2
+ # substitude year 2006 -> 2007 to make Hardening patch apply on
+ # recent versions of PHP
+ %{l_gzip} -dc %{PATCH2} |\
+ %{l_sed} -e 's;\(1997-200\)6\( The PHP Group\);\17\2;'g |\
+ %{l_patch} -p1 -b
%endif
%if "%{with_mod_php_suhosin}" == "yes"
%{l_gzip} -d -c %{SOURCE21} | %{l_tar} xf -
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
