packages: php/php-ini.patch, php/php.spec, php/php-bug-48880.patch (REMOVED...

[arekm]

Author: arekm                        Date: Thu Nov 19 21:27:25 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.3.1

---- Files affected:
packages/php:
   php-ini.patch (1.35 -> 1.36) , php.spec (1.817 -> 1.818) , php-bug-48880.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/php/php-ini.patch
diff -u packages/php/php-ini.patch:1.35 packages/php/php-ini.patch:1.36
--- packages/php/php-ini.patch:1.35	Mon Jul  6 21:57:01 2009
+++ packages/php/php-ini.patch	Thu Nov 19 22:27:19 2009
@@ -81,7 +81,7 @@
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
  ;;;;;;;;;;;;;;;;
-@@ -939,53 +892,6 @@
+@@ -891,54 +891,6 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -90,7 +90,7 @@
 -; 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.
--; 
+-;
 -;extension=php_bz2.dll
 -;extension=php_curl.dll
 -;extension=php_dba.dll
@@ -132,9 +132,10 @@
 -;extension=php_xmlrpc.dll
 -;extension=php_xsl.dll
 -;extension=php_zip.dll
- 
+-
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
+ ;;;;;;;;;;;;;;;;;;;
 @@ -1232,6 +1138,9 @@
  ; http://php.net/mysql.connect-timeout
  mysql.connect_timeout = 60

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.817 packages/php/php.spec:1.818
--- packages/php/php.spec:1.817	Fri Sep 18 11:08:15 2009
+++ packages/php/php.spec	Thu Nov 19 22:27:19 2009
@@ -77,7 +77,7 @@
 ERROR: You need to select at least one Apache SAPI to build shared modules.
 %endif
 
-%define		rel		0.4
+%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
@@ -85,13 +85,13 @@
 Summary(ru.UTF-8):	PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):	PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		php
-Version:	5.3.0
+Version:	5.3.1
 Release:	%{rel}%{?with_type_hints:th}
 Epoch:		4
 License:	PHP
 Group:		Libraries
 Source0:	http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-# Source0-md5:	846760cd655c98dfd86d6d97c3d964b0
+# Source0-md5:	63e97ad450f0f7259e785100b634c797
 Source2:	%{name}-mod_%{name}.conf
 Source3:	%{name}-cgi-fcgi.ini
 Source4:	%{name}-apache.ini
@@ -109,6 +109,7 @@
 Patch8:		%{name}-sapi-ini-file.patch
 Patch9:		%{name}-sh.patch
 Patch10:	%{name}-ini.patch
+Patch11:	extension-shared-optional-dep.patch
 Patch14:	%{name}-no_pear_install.patch
 Patch15:	%{name}-zlib.patch
 Patch17:	%{name}-readline.patch
@@ -125,7 +126,6 @@
 Patch32:	%{name}-m4-divert.patch
 Patch38:	%{name}-tds.patch
 Patch43:	%{name}-use-prog_sendmail.patch
-Patch44:	%{name}-bug-48880.patch
 %if %{with type_hints}
 Patch50:	http://ilia.ws/patch/type_hint_53_v2.txt
 %endif
@@ -1590,8 +1590,6 @@
 %patch50 -p0
 %endif
 
-%patch44 -p1
-
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -1606,6 +1604,7 @@
 cp php.ini-production php.ini
 %patch10 -p1
 
+%patch11 -p1
 %patch14 -p1
 %patch15 -p1
 %patch17 -p1
@@ -2729,6 +2728,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.818  2009/11/19 21:27:19  arekm
+- up to 5.3.1
+
 Revision 1.817  2009/09/18 09:08:15  glen
 - mhash BC layer is now entirely within ext/hash according to 5.3.0 changelog
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-ini.patch?r1=1.35&r2=1.36&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.817&r2=1.818&f=u