From e9aefc9401877d7640e4d574dff78cec586ee145 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 21 Aug 2014 07:34:16 +0200 Subject: PHP 5.4.32: rebuild with new sources --- php-5.3.7-oci8conf.patch | 2 +- php-bug67873.patch | 41 +++++++++++++++++++++++++++++++++++++++++ php-wddx.patch | 41 ----------------------------------------- php54.spec | 11 +++++------ 4 files changed, 47 insertions(+), 48 deletions(-) create mode 100644 php-bug67873.patch delete mode 100644 php-wddx.patch diff --git a/php-5.3.7-oci8conf.patch b/php-5.3.7-oci8conf.patch index 4a5c44f..66dc0b0 100644 --- a/php-5.3.7-oci8conf.patch +++ b/php-5.3.7-oci8conf.patch @@ -13,7 +13,7 @@ diff -up php5.3-201104170830/ext/ldap/php_ldap.h.remi-oci8 php5.3-201104170830/e diff -up php5.3-201104170830/ext/oci8/config.m4.remi-oci8 php5.3-201104170830/ext/oci8/config.m4 --- php5.3-201104170830/ext/oci8/config.m4.remi-oci8 2011-03-30 00:35:22.000000000 +0200 +++ php5.3-201104170830/ext/oci8/config.m4 2011-04-17 11:55:25.628871315 +0200 -@@ -291,6 +291,7 @@ if test "$PHP_OCI8" != "no"; then +@@ -298,6 +298,7 @@ if test "$PHP_OCI8" != "no"; then dnl Header directory for Instant Client SDK RPM install OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client\('${PHP_OCI8_IC_LIBDIR_SUFFIX}'\)*/lib[/]*$!/usr/include/oracle/\1/client\2!'` diff --git a/php-bug67873.patch b/php-bug67873.patch new file mode 100644 index 0000000..c3b0eb6 --- /dev/null +++ b/php-bug67873.patch @@ -0,0 +1,41 @@ +From 95ea1e7ca787537a93c25c401dba010d51aa8d59 Mon Sep 17 00:00:00 2001 +From: Anatol Belski +Date: Sat, 11 May 2013 02:47:48 +0200 +Subject: [PATCH] fixed variable corruption under win x64 + +--- + ext/wddx/wddx.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c +index 967da6a..afeca90 100644 +--- a/ext/wddx/wddx.c ++++ b/ext/wddx/wddx.c +@@ -405,7 +405,7 @@ static void php_wddx_serialize_string(wddx_packet *packet, zval *var TSRMLS_DC) + + if (Z_STRLEN_P(var) > 0) { + char *buf; +- int buf_len; ++ size_t buf_len; + + buf = php_escape_html_entities(Z_STRVAL_P(var), Z_STRLEN_P(var), &buf_len, 0, ENT_QUOTES, NULL TSRMLS_CC); + +@@ -626,12 +626,12 @@ static void php_wddx_serialize_array(wddx_packet *packet, zval *arr) + */ + void php_wddx_serialize_var(wddx_packet *packet, zval *var, char *name, int name_len TSRMLS_DC) + { +- char *tmp_buf; +- char *name_esc; +- int name_esc_len; + HashTable *ht; + + if (name) { ++ size_t name_esc_len; ++ char *tmp_buf, *name_esc; ++ + name_esc = php_escape_html_entities(name, name_len, &name_esc_len, 0, ENT_QUOTES, NULL TSRMLS_CC); + tmp_buf = emalloc(name_esc_len + sizeof(WDDX_VAR_S)); + snprintf(tmp_buf, name_esc_len + sizeof(WDDX_VAR_S), WDDX_VAR_S, name_esc); +-- +1.9.2 + diff --git a/php-wddx.patch b/php-wddx.patch deleted file mode 100644 index c3b0eb6..0000000 --- a/php-wddx.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 95ea1e7ca787537a93c25c401dba010d51aa8d59 Mon Sep 17 00:00:00 2001 -From: Anatol Belski -Date: Sat, 11 May 2013 02:47:48 +0200 -Subject: [PATCH] fixed variable corruption under win x64 - ---- - ext/wddx/wddx.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c -index 967da6a..afeca90 100644 ---- a/ext/wddx/wddx.c -+++ b/ext/wddx/wddx.c -@@ -405,7 +405,7 @@ static void php_wddx_serialize_string(wddx_packet *packet, zval *var TSRMLS_DC) - - if (Z_STRLEN_P(var) > 0) { - char *buf; -- int buf_len; -+ size_t buf_len; - - buf = php_escape_html_entities(Z_STRVAL_P(var), Z_STRLEN_P(var), &buf_len, 0, ENT_QUOTES, NULL TSRMLS_CC); - -@@ -626,12 +626,12 @@ static void php_wddx_serialize_array(wddx_packet *packet, zval *arr) - */ - void php_wddx_serialize_var(wddx_packet *packet, zval *var, char *name, int name_len TSRMLS_DC) - { -- char *tmp_buf; -- char *name_esc; -- int name_esc_len; - HashTable *ht; - - if (name) { -+ size_t name_esc_len; -+ char *tmp_buf, *name_esc; -+ - name_esc = php_escape_html_entities(name, name_len, &name_esc_len, 0, ENT_QUOTES, NULL TSRMLS_CC); - tmp_buf = emalloc(name_esc_len + sizeof(WDDX_VAR_S)); - snprintf(tmp_buf, name_esc_len + sizeof(WDDX_VAR_S), WDDX_VAR_S, name_esc); --- -1.9.2 - diff --git a/php54.spec b/php54.spec index 6966586..a3287a1 100644 --- a/php54.spec +++ b/php54.spec @@ -88,7 +88,7 @@ Version: 5.4.32 %if 0%{?snapdate:1}%{?rcver:1} Release: 0.2.%{?snapdate}%{?rcver}%{?dist} %else -Release: 2%{?dist} +Release: 1%{?dist} %endif # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -139,7 +139,7 @@ Patch46: php-5.4.9-fixheader.patch Patch47: php-5.4.9-phpinfo.patch # Upstream fixes -Patch100: php-wddx.patch +Patch100: php-bug67873.patch # Security fixes @@ -1699,13 +1699,12 @@ fi %changelog -* Wed Aug 20 2014 Remi Collet 5.4.32-2 -- test build for php bug #67873 - -* Wed Aug 20 2014 Remi Collet 5.4.32-1 +* Thu Aug 21 2014 Remi Collet 5.4.32-1 - Update to 5.4.32 http://www.php.net/releases/5_4_32.php - fix zts-php-config --php-binary output #1124605 +- fix segfault in php_wddx_serialize_var + upstream patch for https://bugs.php.net/67873 * Thu Jul 24 2014 Remi Collet 5.4.31-1 - Update to 5.4.31 -- cgit