[packages/php/PHP_5_5] up to 5.5.0 RC2 (23 May 2013)

[glen]

commit fdbf13b1a411781cbc08e24861a8df16873e3416
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Jun 11 22:25:15 2013 +0300

    up to 5.5.0 RC2 (23 May 2013)
    
    release highlights:
    
    FPM: Add --with-fpm-systemd option to report health to systemd, and
    systemd_interval option to configure this. The service can now use
    Type=notify in the systemd unit file. (Remi)

 php-mysql-charsetphpini.patch | 10 +++++-----
 php.spec                      |  6 ++++--
 2 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/php.spec b/php.spec
index 6b44742..edef83e 100644
--- a/php.spec
+++ b/php.spec
@@ -1,3 +1,5 @@
+# TODO 5.5:
+# - enable --with-fpm-systemd, but ensure it checks for sd_booted()
 # TODO 5.4:
 # - do not remove PatchX: definitions until merged to HEAD, needed for tracking their state
 # - check php-sapi-ini-file.patch for safe mode removal
@@ -128,7 +130,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %define		php_suffix 55
 
 %define		rel	0.3
-%define		subver	RC1
+%define		subver	RC2
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -142,7 +144,7 @@ Epoch:		4
 License:	PHP
 Group:		Libraries
 Source0:	http://downloads.php.net/dsp/%{orgname}-%{version}%{subver}.tar.xz
-# Source0-md5:	c36bf7812526b1d5e90ba891e31a3b54
+# Source0-md5:	767599568ea94f16b9da7e05214d53c7
 Source2:	%{orgname}-mod_%{orgname}.conf
 Source3:	%{orgname}-cgi-fcgi.ini
 Source4:	%{orgname}-apache.ini
diff --git a/php-mysql-charsetphpini.patch b/php-mysql-charsetphpini.patch
index d3a2a64..37ff15b 100644
--- a/php-mysql-charsetphpini.patch
+++ b/php-mysql-charsetphpini.patch
@@ -1,5 +1,5 @@
---- php-5.2.5_p20080206.orig/ext/mysql/php_mysql.c	2008-02-06 14:22:57.652600900 +0100
-+++ php-5.2.5_p20080206/ext/mysql/php_mysql.c	2008-02-06 14:24:40.216655403 +0100
+--- php-5.5.0RC2/ext/mysql/php_mysql.c~	2013-06-11 22:12:11.000000000 +0300
++++ php-5.5.0RC2/ext/mysql/php_mysql.c	2013-06-11 22:16:04.192270533 +0300
 @@ -360,6 +360,7 @@
  	PHP_INI_ENTRY("mysql.default_port",				NULL,	PHP_INI_ALL,		OnMySQLPort)
  	STD_PHP_INI_ENTRY("mysql.default_socket",		NULL,	PHP_INI_ALL,		OnUpdateStringUnempty,	default_socket,	zend_mysql_globals,		mysql_globals)
@@ -16,14 +16,14 @@
  	mysql_globals->trace_mode = 0;
  	mysql_globals->result_allocated = 0;
  }
-@@ -515,6 +517,7 @@
+@@ -723,6 +723,7 @@
  {
  	char *user=NULL, *passwd=NULL, *host_and_port=NULL, *socket=NULL, *tmp=NULL, *host=NULL;
- 	int  user_len, passwd_len, host_len;
+ 	int  user_len = 0, passwd_len = 0, host_len = 0;
 +	char *connect_charset=NULL;
  	char *hashed_details=NULL;
  	int hashed_details_length, port = MYSQL_PORT;
- 	int client_flags = 0;
+ 	long client_flags = 0;
 @@ -527,6 +530,7 @@
  
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/fdbf13b1a411781cbc08e24861a8df16873e3416