packages (DEVEL): php/php-ini.patch, php/php.spec - up to 5.4.1 (CVE-2012-1...

[glen]

Author: glen                         Date: Fri Apr 27 22:37:55 2012 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- up to 5.4.1 (CVE-2012-1172), should compile with apache 2.4

---- Files affected:
packages/php:
   php-ini.patch (1.42.4.2 -> 1.42.4.3) , php.spec (1.945.2.14 -> 1.945.2.15) 

---- Diffs:

================================================================
Index: packages/php/php-ini.patch
diff -u packages/php/php-ini.patch:1.42.4.2 packages/php/php-ini.patch:1.42.4.3
--- packages/php/php-ini.patch:1.42.4.2	Sat Dec 10 10:53:54 2011
+++ packages/php/php-ini.patch	Sat Apr 28 00:37:49 2012
@@ -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

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.945.2.14 packages/php/php.spec:1.945.2.15
--- packages/php/php.spec:1.945.2.14	Mon Mar 12 10:15:33 2012
+++ packages/php/php.spec	Sat Apr 28 00:37:49 2012
@@ -123,7 +123,7 @@
 %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
@@ -131,13 +131,13 @@
 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
@@ -3292,6 +3292,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.945.2.15  2012/04/27 22:37:49  glen
+- up to 5.4.1 (CVE-2012-1172), should compile with apache 2.4
+
 Revision 1.945.2.14  2012/03/12 09:15:33  glen
 - junk removal
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/php/php-ini.patch?r1=1.42.4.2&r2=1.42.4.3
    http://cvs.pld-linux.org/packages/php/php.spec?r1=1.945.2.14&r2=1.945.2.15