- up to 5.4.1 (CVE-2012-1172), should compile with apache 2.4

Changed files:
    php-ini.patch -> 1.42.4.3
    php.spec -> 1.945.2.15

diff --git a/php-ini.patch b/php-ini.patch
index 7d6be8e0f7f0b3a5c39fa0622e4531afd0cfada8..56250b5c3c4fe908777edb53f57d5950c989bed2 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- php-5.4.0RC3/php.ini~      2011-12-10 03:28:54.000000000 +0200
-+++ php-5.4.0RC3/php.ini       2011-12-10 03:29:47.322573066 +0200
+--- php-5.4.1/php.ini~ 2012-04-28 01:25:58.000000000 +0300
++++ php-5.4.1/php.ini  2012-04-28 01:27:51.622637977 +0300
 @@ -223,7 +223,7 @@
  ; Development Value: Off
  ; Production Value: Off
@@ -83,7 +83,7 @@
  
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
-@@ -805,52 +805,8 @@
+@@ -812,52 +812,9 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -92,7 +92,9 @@
 -; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
 -; extension folders as well as the separate PECL DLL download (PHP 5).
 -; Be sure to appropriately set the extension_dir directive.
--;
++; Ideally in PLD Linux you should install appropriate php-<extension> or
++; php-pecl-<extension> package.
+ ;
 -;extension=php_bz2.dll
 -;extension=php_curl.dll
 -;extension=php_fileinfo.dll
@@ -126,18 +128,16 @@
 -
 -;extension=php_soap.dll
 -;extension=php_sockets.dll
--;extension=php_sqlite.dll
 -;extension=php_sqlite3.dll
 -;extension=php_sybase_ct.dll
 -;extension=php_tidy.dll
 -;extension=php_xmlrpc.dll
 -;extension=php_xsl.dll
 -;extension=php_zip.dll
-+; Ideally in PLD Linux you should install appropriate php-<extension> or
-+; php-pecl-<extension> package.
- 
+-
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
+ ;;;;;;;;;;;;;;;;;;;
 @@ -1235,6 +1140,9 @@
  ; http://php.net/mysql.connect-timeout
  mysql.connect_timeout = 60

diff --git a/php.spec b/php.spec
index 95ccf94cbbd16bfd287674641bf93fdb1cf07413..2c8d84c5c4c0775e4e28c9ccdb9b8e17375eeecb 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -122,7 +122,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine      with_filter
 %endif
 
-%define                rel     0.9
+%define                rel     0.1
 Summary:       PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):     Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):     Język skryptowy PHP
@@ -130,13 +130,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.4.0
+Version:       5.4.1
 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: 04bb6f9d71ea86ba05685439d50db074
+# Source0-md5: 5b9529ed89dbc48c498e9693d1af3caf
 Source2:       %{name}-mod_%{name}.conf
 Source3:       %{name}-cgi-fcgi.ini
 Source4:       %{name}-apache.ini