|
|
@@ -68,7 +68,7 @@ Class: PLUS
|
|
|
Group: Web
|
|
|
License: ASF
|
|
|
Version: %{V_apache}
|
|
|
-Release: 20070306
|
|
|
+Release: 20070313
|
|
|
|
|
|
# package options (suexec related)
|
|
|
%option with_suexec yes
|
|
|
@@ -492,6 +492,7 @@ Provides: apache = %{version}-%{release}
|
|
|
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 @@ Provides: apache = %{version}-%{release}
|
|
|
%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 -
|