up to 5.4.41 (14 May 2015)

- fix for CVE-2006-7243
- disable suhosin patch (unmaintained, not needed for PHP>5.3, see e14ff99)
- x32 patch is for suhosin enabled only

diff --git a/php.spec b/php.spec
index 65be569dd26259bf8df6fd7e145e147f09e593c1..051eba6c7a61181d1a3d05d0e0ad2cdb16f65729 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -82,7 +82,7 @@
 %bcond_without cgi             # disable CGI/FCGI SAPI
 %bcond_without fpm             # disable FPM
 %bcond_with    embed           # disable Embedded API
-%bcond_without suhosin         # with suhosin patch
+%bcond_with    suhosin         # with suhosin patch
 %bcond_with    tests           # default off; test process very often hangs on builders, approx run time 45m; perform "make test"
 %bcond_with    gcov            # Enable Code coverage reporting
 %bcond_with    type_hints      # experimental support for strict typing/casting
@@ -135,7 +135,7 @@ Summary(pt_BR.UTF-8):       A linguagem de script PHP
 Summary(ru.UTF-8):     PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):     PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:          %{orgname}%{php_suffix}
-Version:       5.4.40
+Version:       5.4.41
 Release:       %{rel}%{?with_type_hints:.th}%{?with_oci8:.oci}
 Epoch:         4
 # All files licensed under PHP version 3.01, except
@@ -144,7 +144,7 @@ Epoch:              4
 License:       PHP 3.01 and Zend and BSD
 Group:         Libraries
 Source0:       http://www.php.net/distributions/%{orgname}-%{version}.tar.bz2
-# Source0-md5: 19dafb2b9fc31517cf5c3309fb8a9923
+# Source0-md5: e00817b920cfc6dde2d01d7a74c654c0
 Source2:       %{orgname}-mod_%{orgname}.conf
 Source3:       %{orgname}-cgi-fcgi.ini
 Source4:       %{orgname}-apache.ini
@@ -1923,6 +1923,7 @@ cp -p php.ini-production php.ini
 #%patch46 -p1 # imap myrights. fixme
 %if %{with suhosin}
 %patch47 -p1
+%patch68 -p1
 %endif
 %patch50 -p1
 %patch51 -p1
@@ -1937,7 +1938,6 @@ cp -p php.ini-production php.ini
 %{?with_system_libzip:%patch65 -p1}
 %patch66 -p1
 %patch67 -p1
-%patch68 -p1
 
 sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4