|
|
@@ -25,7 +25,6 @@
|
|
|
%define V_php 5.2.6
|
|
|
%define V_php_suhosin_p 5.2.6-0.9.6.2
|
|
|
%define V_php_suhosin_e 0.9.23
|
|
|
-%define V_php_hardened 5.1.6-0.4.15
|
|
|
%define V_php_kolab 5.2.6
|
|
|
%define V_php_pecl_memcache 2.2.3
|
|
|
|
|
|
@@ -44,7 +43,6 @@ Release: 20080503
|
|
|
|
|
|
# package options
|
|
|
%option with_suhosin no
|
|
|
-%option with_hardened no
|
|
|
%option with_bc no
|
|
|
%option with_bdb no
|
|
|
%option with_bzip2 no
|
|
|
@@ -119,10 +117,6 @@ Release: 20080503
|
|
|
%undefine with_ssl
|
|
|
%define with_ssl yes
|
|
|
%endif
|
|
|
-%if "%{with_suhosin}" == "yes" && "%{with_hardened}" == "yes"
|
|
|
-%undefine with_hardened
|
|
|
-%define with_hardened no
|
|
|
-%endif
|
|
|
|
|
|
# list of sources
|
|
|
Source0: http://static.php.net/www.php.net/distributions/php-%{V_php}.tar.bz2
|
|
|
@@ -130,9 +124,8 @@ Source1: http://download.suhosin.org/suhosin-%{V_php_suhosin_e}.tgz
|
|
|
Source2: apache-php.ini
|
|
|
Source3: apache-php.conf
|
|
|
Source4: http://pecl.php.net/get/memcache-%{V_php_pecl_memcache}.tgz
|
|
|
-Patch0: http://www.hardened-php.net/hardening-patch-%{V_php_hardened}.patch.gz
|
|
|
-Patch1: http://download.suhosin.org/suhosin-patch-%{V_php_suhosin_p}.patch.gz
|
|
|
-Patch2: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_Annotations.patch
|
|
|
+Patch0: http://download.suhosin.org/suhosin-patch-%{V_php_suhosin_p}.patch.gz
|
|
|
+Patch1: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_Annotations.patch
|
|
|
|
|
|
# build information
|
|
|
Prefix: %{l_prefix}
|
|
|
@@ -290,11 +283,6 @@ AutoReqProv: no
|
|
|
url = http://www.php.net/downloads.php
|
|
|
regex = php-(5\.\d+\.\d+)\.tar\.(bz2|gz)
|
|
|
}
|
|
|
- prog apache-php:hardened = {
|
|
|
- version = %{V_php_hardened}
|
|
|
- url = http://www.hardened-php.net/downloads.13.html
|
|
|
- regex = hardening-patch-(5\.\d+\.\d+-\d+(\.\d+)+)\.patch\.gz
|
|
|
- }
|
|
|
prog apache-php:suhosin-patch = {
|
|
|
version = %{V_php_suhosin_p}
|
|
|
url = http://www.hardened-php.net/suhosin/download.html
|
|
|
@@ -318,12 +306,9 @@ AutoReqProv: no
|
|
|
|
|
|
%prep
|
|
|
%setup -q -n php-%{V_php}
|
|
|
-%if "%{with_hardened}" == "yes"
|
|
|
- %patch -p1 -P 0
|
|
|
-%endif
|
|
|
%if "%{with_suhosin}" == "yes"
|
|
|
%setup -q -n php-%{V_php} -T -D -a 1
|
|
|
- %patch -p1 -P 1
|
|
|
+ %patch -p1
|
|
|
mv suhosin-%{V_php_suhosin_e} ext/suhosin
|
|
|
rm -f package.xml
|
|
|
%endif
|
|
|
@@ -346,7 +331,7 @@ AutoReqProv: no
|
|
|
configure \
|
|
|
ext/gd/config.m4
|
|
|
%if "%{with_imap_annotate}" == "yes"
|
|
|
- sed <%{PATCH2} -e '/php-5.2.1\/ext\/imap\/php_imap.c.orig/,/^[^\+]/d' | %{l_patch} -p1
|
|
|
+ sed <%{PATCH1} -e '/php-5.2.1\/ext\/imap\/php_imap.c.orig/,/^[^\+]/d' | %{l_patch} -p1
|
|
|
%endif
|
|
|
|
|
|
%build
|
