up to 5.3.26. fixes CVE-2013-2110

diff --git a/php-mysql-charsetphpini.patch b/php-mysql-charsetphpini.patch
index d3a2a64adb378171feda46dc84c797aa6585dfb9..a4de03b4eef96e64313e7348e90f82dfdbaaf4e5 100644 (file)
--- 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.3.26/ext/mysql/php_mysql.c~  2013-06-10 11:24:49.710731868 +0000
++++ php-5.3.26/ext/mysql/php_mysql.c   2013-06-10 11:27:25.811562208 +0000
 @@ -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 @@
+@@ -693,6 +693,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 @@
  
  

diff --git a/php.spec b/php.spec
index d27fdb52e24b33175b887199eaf32d0ccec9ebb1..8e74f1b9a29bbc49232e1214bf73f7ae2880028f 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -126,13 +126,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:          %{orgname}%{php_suffix}
-Version:       5.3.25
+Version:       5.3.26
 Release:       %{rel}%{?with_type_hints:.th}%{?with_oci8:.oci}
 Epoch:         4
 License:       PHP
 Group:         Libraries
 Source0:       http://www.php.net/distributions/%{orgname}-%{version}.tar.bz2
-# Source0-md5: 347625ed7fbf2fe1f1c70b0f879fee2a
+# Source0-md5: d71db8d92edbb48beb5b645b55471139
 Source2:       %{orgname}-mod_%{orgname}.conf
 Source3:       %{orgname}-cgi-fcgi.ini
 Source4:       %{orgname}-apache.ini