diff --git a/php-5.4.7-imap.patch b/php-5.4.7-imap.patch new file mode 100644 index 0000000..d37d05c --- /dev/null +++ b/php-5.4.7-imap.patch @@ -0,0 +1,11 @@ +--- php-5.4.7/ext/imap/php_imap.c.orig 2012-09-22 09:00:39.661043173 +0200 ++++ php-5.4.7/ext/imap/php_imap.c 2012-09-22 09:01:13.606053829 +0200 +@@ -1191,7 +1191,7 @@ + if (zend_hash_index_find(Z_ARRVAL_PP(disabled_auth_method), i, (void **) &z_auth_method) == SUCCESS) { + if (Z_TYPE_PP(z_auth_method) == IS_STRING) { + if (Z_STRLEN_PP(z_auth_method) > 1) { +- mail_parameters (NIL, DISABLE_AUTHENTICATOR, (void *)Z_STRVAL_PP(disabled_auth_method)); ++ mail_parameters (NIL, DISABLE_AUTHENTICATOR, (void *)Z_STRVAL_PP(z_auth_method)); + } + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid argument, expect string or array of strings"); diff --git a/php.spec b/php.spec index 92371cb..1c7de14 100644 --- a/php.spec +++ b/php.spec @@ -52,7 +52,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: php Version: 5.4.7 -Release: 5%{?dist} +Release: 6%{?dist} License: PHP Group: Development/Languages URL: http://www.php.net/ @@ -75,6 +75,7 @@ Patch7: php-5.3.0-recode.patch Patch8: php-5.4.7-libdb.patch # Fixes for extension modules +Patch20: php-5.4.7-imap.patch # Functional changes Patch40: php-5.4.0-dlopen.patch @@ -578,6 +579,8 @@ support for using the enchant library to PHP. %patch7 -p1 -b .recode %patch8 -p1 -b .libdb +%patch20 -p1 -b .imap + %patch40 -p1 -b .dlopen %patch41 -p1 -b .easter %patch42 -p1 -b .systzdata @@ -1281,6 +1284,9 @@ fi %changelog +* Wed Sep 19 2012 Remi Collet 5.4.7-6 +- fix for http://bugs.php.net/63126 (#783967) + * Wed Sep 19 2012 Remi Collet 5.4.7-5 - patch to ensure we use latest libdb (not libdb4)