update to 5.3.15

fixes CVE-2012-2688, CVE-2012-3365

diff --git a/php-ini.patch b/php-ini.patch
index f9b46a0a13337819a456f0ab24e990a161e9d0c8..00d4a506a95f02ab1335c4ebda0b0b1b93b417f5 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- php-5.3.9/php.ini~ 2012-01-11 21:35:14.000000000 +0200
-+++ php-5.3.9/php.ini  2012-01-11 21:35:49.227068991 +0200
+--- php-5.3.15/php.ini~        2012-08-02 03:24:53.000000000 +0300
++++ php-5.3.15/php.ini 2012-08-02 03:31:32.384194939 +0300
 @@ -223,7 +223,7 @@
  ; Development Value: Off
  ; Production Value: Off
@@ -27,12 +27,10 @@
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -812,54 +812,7 @@
- ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
- ; disabled on them.
+@@ -826,53 +826,6 @@
  ; http://php.net/enable-dl
--enable_dl = Off
--
+ enable_dl = Off
+ 
 -; cgi.force_redirect is necessary to provide security running PHP as a CGI under
 -; most web servers.  Left undefined, PHP turns this on by default.  You can
 -; turn it off here AT YOUR OWN RISK
@@ -49,7 +47,7 @@
 -; will look for to know it is OK to continue execution.  Setting this variable MAY
 -; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
 -; http://php.net/cgi.redirect-status-env
--;cgi.redirect_status_env = ;
+-;cgi.redirect_status_env =
 -
 -; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI.  PHP's
 -; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok
@@ -66,7 +64,7 @@
 -; does not currently support this feature (03/17/2002)
 -; Set to 1 if running under IIS.  Default is zero.
 -; http://php.net/fastcgi.impersonate
--;fastcgi.impersonate = 1;
+-;fastcgi.impersonate = 1
 -
 -; Disable logging through FastCGI connection. PHP's default behavior is to enable
 -; this feature.
@@ -79,10 +77,10 @@
 -; Default is zero.
 -; http://php.net/cgi.rfc2616-headers
 -;cgi.rfc2616_headers = 0
-+enable_dl = Off
- 
+-
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
+ ;;;;;;;;;;;;;;;;
 @@ -876,11 +876,7 @@
  ;
  ;   extension=modulename.extension

diff --git a/php.spec b/php.spec
index ee86db132baa9af2bbd6b6840cbb78d45f5e4be8..722ea44b465cff7eae91ee97ca566324ad3b9c1d 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -110,7 +110,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine      with_filter
 %endif
 
-%define                rel     2
+%define                rel     1
 Summary:       PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):     Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):     Język skryptowy PHP
@@ -118,13 +118,13 @@ 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:          php
-Version:       5.3.14
+Version:       5.3.15
 Release:       %{rel}%{?with_type_hints:.th}%{?with_oci8:.oci}
 Epoch:         4
 License:       PHP
 Group:         Libraries
 Source0:       http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-# Source0-md5: 7caac4f71e2f21426c11ac153e538392
+# Source0-md5: 5cfcfd0fa4c4da7576f397073e7993cc
 Source2:       %{name}-mod_%{name}.conf
 Source3:       %{name}-cgi-fcgi.ini
 Source4:       %{name}-apache.ini
@@ -297,7 +297,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                jsonver         1.2.1
 %define                pharver         2.0.1
 %define                sqlitever       2.0-dev
-%define                zipver          1.9.1
+%define                zipver          1.11.0
 
 %define                zend_zts                %{!?with_zts:0}%{?with_zts:1}
 %define                php_debug               %{!?debug:0}%{?debug:1}
@@ -2282,7 +2282,7 @@ cp -pf php_config.h.cgi-fcgi main/php_config.h
 %if %{with fpm}
 cp -pf php_config.h.fpm main/php_config.h
 %{__make} -f Makefile.fpm
- ./sapi/fpm/php-fpm -qn -m > /dev/null
+[ $(./sapi/fpm/php-fpm -n -m | grep cgi-fcgi) = "cgi-fcgi" ]
 %endif
 
 # CLI