From caca35f9381868cb0e0fc51c0dc881c530cb6d62 Mon Sep 17 00:00:00 2001 From: taca Date: Sat, 11 Jan 2014 17:05:09 +0000 Subject: [PATCH] Update php55 to 5.5.8. 9 Jan 2014, PHP 5.5.8 - Core: . Disallowed JMP into a finally block. (Laruence) . Added validation of class names in the autoload process. (Dmitry) . Fixed invalid C code in zend_strtod.c. (Lior Kaplan) . Fixed bug #66041 (list() fails to unpack yielded ArrayAccess object). (Nikita) . Fixed bug #65764 (generators/throw_rethrow FAIL with ZEND_COMPILE_EXTENDED_INFO). (Nikita) . Fixed bug #61645 (fopen and O_NONBLOCK). (Mike) . Fixed bug #66218 (zend_register_functions breaks reflection). (Remi) - Date: . Fixed bug #66060 (Heap buffer over-read in DateInterval). (Remi) . Fixed bug #65768 (DateTimeImmutable::diff does not work). (Nikita Nefedov) - DOM: . Fixed bug #65196 (Passing DOMDocumentFragment to DOMDocument::saveHTML() Produces invalid Markup). (Mike) - Exif: . Fixed bug #65873 (Integer overflow in exif_read_data()). (Stas) - Filter: . Fixed bug #66229 (128.0.0.0/16 isn't reserved any longer). (Adam) - GD: . Fixed bug #64405 (Use freetype-config for determining freetype2 dir(s)). (Adam) - PDO_odbc: . Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries). (michael at orlitzky dot com) - MySQLi: . Fixed bug #65486 (mysqli_poll() is broken on win x64). (Anatol) - OPCache: . Fixed reavlidate_path=1 behavior to avoid caching of symlinks values. (Dmitry) . Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq". (Dmitry). - SNMP: . Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin) - SOAP . Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at) - Sockets: . Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined). (Felipe) - XSL . Fixed bug #49634 (Segfault throwing an exception in a XSL registered function). (Mike) - ZIP: . Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real). (Remi) --- lang/php/phpversion.mk | 4 ++-- lang/php55/distinfo | 17 +++++++---------- lang/php55/patches/patch-configure | 10 +++++----- .../patch-ext_date_lib_parse__iso__intervals.c | 15 --------------- .../patch-ext_date_lib_parse__iso__intervals.re | 15 --------------- .../patches/patch-ext_sockets_sockaddr__conv.c | 17 ----------------- lang/php55/patches/patch-php.ini-development | 10 +++++----- lang/php55/patches/patch-php.ini-production | 10 +++++----- 8 files changed, 24 insertions(+), 74 deletions(-) delete mode 100644 lang/php55/patches/patch-ext_date_lib_parse__iso__intervals.c delete mode 100644 lang/php55/patches/patch-ext_date_lib_parse__iso__intervals.re delete mode 100644 lang/php55/patches/patch-ext_sockets_sockaddr__conv.c diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk index 3439232ede718..fbcb3fb5afb15 100644 --- a/lang/php/phpversion.mk +++ b/lang/php/phpversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: phpversion.mk,v 1.53 2014/01/11 17:03:57 taca Exp $ +# $NetBSD: phpversion.mk,v 1.54 2014/01/11 17:05:09 taca Exp $ # # This file selects a PHP version, based on the user's preferences and # the installed packages. It does not add a dependency on the PHP @@ -83,7 +83,7 @@ PHPVERSION_MK= defined # Define each PHP's version. PHP53_VERSION= 5.3.28 PHP54_VERSION= 5.4.24 -PHP55_VERSION= 5.5.7 +PHP55_VERSION= 5.5.8 # Define initial release of major version. PHP53_RELDATE= 20090630 diff --git a/lang/php55/distinfo b/lang/php55/distinfo index 28d73606c5b7d..47f291568d839 100644 --- a/lang/php55/distinfo +++ b/lang/php55/distinfo @@ -1,12 +1,10 @@ -$NetBSD: distinfo,v 1.12 2013/12/13 15:33:22 taca Exp $ +$NetBSD: distinfo,v 1.13 2014/01/11 17:05:09 taca Exp $ -SHA1 (php-5.5.7.tar.bz2) = f32ccf1a2aa0592e2dcc151c89a7a811e53e0925 -RMD160 (php-5.5.7.tar.bz2) = d4285b6a4b151748395bddc9eedaaf6feaea109f -Size (php-5.5.7.tar.bz2) = 12991330 bytes +SHA1 (php-5.5.8.tar.bz2) = 94800df241864a2c66fd01adca3d22247dc1a8d5 +RMD160 (php-5.5.8.tar.bz2) = 7779602dfa1683a7938ed41d1713916bcb7ce296 +Size (php-5.5.8.tar.bz2) = 13005675 bytes SHA1 (patch-acinclude.m4) = 9e9c433e4cb96e469f7cf14b2064a0f41fc4568a -SHA1 (patch-configure) = 37b19e0f75619ffe016a1d834dbe774ea4452a2d -SHA1 (patch-ext_date_lib_parse__iso__intervals.c) = b0810f2e6d23cbc52356b38bc6a8fa545d1a0b6f -SHA1 (patch-ext_date_lib_parse__iso__intervals.re) = fb27d18d88f13dce8d44de805f255d5af61afef1 +SHA1 (patch-configure) = 5e7e78fe0cdfdb76cb2cdf77ad8774becb2426a0 SHA1 (patch-ext_gd_config.m4) = 91c9798333d4776856a0a9e20196986856b758b2 SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc SHA1 (patch-ext_mssql_php__mssql.c) = 4ef1837850443e9db2e71620a3ddaed5ab5c435b @@ -15,11 +13,10 @@ SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390 SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59 SHA1 (patch-ext_phar_Makefile.frag) = 1af23d9135557bc7ba2f3627b317d4cbef37aaba SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c -SHA1 (patch-ext_sockets_sockaddr__conv.c) = ca4a1e97208071b3e28598f23d4b88ffb9b56df4 SHA1 (patch-ext_standard_basic__functions.c) = f2a44998145306c2cb2d2f3822c0e7cc70c778b4 SHA1 (patch-makedist) = a2a77c3d15a28fee08fdd88f0c9fee6cbec107d8 -SHA1 (patch-php.ini-development) = b4690be8f589933ee5654bdd7bc80712481711a5 -SHA1 (patch-php.ini-production) = 535ee9bff509ee8cab31cc73ec49b25b3ffdbff5 +SHA1 (patch-php.ini-development) = 00245ed6a09f9faa9412e0749b087e2f0e01b33a +SHA1 (patch-php.ini-production) = 89ae95ddb864fc55535c16210d9630c4b77ec54a SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d SHA1 (patch-sapi_cgi_Makefile.frag) = 3784758c085066d1088ae1420b0f9bcf98f74de9 SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 2369bb6a426a7fb47dc73c88f0daa0f6fa67b593 diff --git a/lang/php55/patches/patch-configure b/lang/php55/patches/patch-configure index 7b515bbf041ee..966901d910538 100644 --- a/lang/php55/patches/patch-configure +++ b/lang/php55/patches/patch-configure @@ -1,6 +1,6 @@ -$NetBSD: patch-configure,v 1.3 2013/10/18 15:49:07 taca Exp $ +$NetBSD: patch-configure,v 1.4 2014/01/11 17:05:09 taca Exp $ ---- configure.orig 2013-10-15 14:29:41.000000000 +0000 +--- configure.orig 2014-01-08 10:33:50.000000000 +0000 +++ configure @@ -23604,7 +23604,7 @@ fi if test "$found_openssl" = "no"; then @@ -29,7 +29,7 @@ $NetBSD: patch-configure,v 1.3 2013/10/18 15:49:07 taca Exp $ fi for i in $PHP_OPENSSL_DIR; do -@@ -48569,7 +48569,7 @@ fi +@@ -48213,7 +48213,7 @@ fi if test "$found_openssl" = "no"; then if test "$PHP_OPENSSL_DIR" = "yes"; then @@ -38,7 +38,7 @@ $NetBSD: patch-configure,v 1.3 2013/10/18 15:49:07 taca Exp $ fi for i in $PHP_OPENSSL_DIR; do -@@ -65546,7 +65546,7 @@ rm -f core *.core core.conftest.* gmon.o +@@ -65190,7 +65190,7 @@ rm -f core *.core core.conftest.* gmon.o fi @@ -47,7 +47,7 @@ $NetBSD: patch-configure,v 1.3 2013/10/18 15:49:07 taca Exp $ as_fn_error $? "Don't know how to define struct flock on this system, set --enable-opcache=no" "$LINENO" 5 fi -@@ -104883,12 +104883,7 @@ old_CC=$CC +@@ -104584,12 +104584,7 @@ old_CC=$CC if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags" INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags" diff --git a/lang/php55/patches/patch-ext_date_lib_parse__iso__intervals.c b/lang/php55/patches/patch-ext_date_lib_parse__iso__intervals.c deleted file mode 100644 index f37ad891b0bfa..0000000000000 --- a/lang/php55/patches/patch-ext_date_lib_parse__iso__intervals.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ext_date_lib_parse__iso__intervals.c,v 1.1 2013/12/05 16:17:48 taca Exp $ - -Fix for CVE-2013-6712. - ---- ext/date/lib/parse_iso_intervals.c.orig 2013-11-12 14:17:27.000000000 +0000 -+++ ext/date/lib/parse_iso_intervals.c -@@ -380,7 +380,7 @@ yy6: - break; - } - ptr++; -- } while (*ptr); -+ } while (!s->errors->error_count && *ptr); - s->have_period = 1; - TIMELIB_DEINIT; - return TIMELIB_PERIOD; diff --git a/lang/php55/patches/patch-ext_date_lib_parse__iso__intervals.re b/lang/php55/patches/patch-ext_date_lib_parse__iso__intervals.re deleted file mode 100644 index 201dc78ac6514..0000000000000 --- a/lang/php55/patches/patch-ext_date_lib_parse__iso__intervals.re +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ext_date_lib_parse__iso__intervals.re,v 1.1 2013/12/05 16:17:48 taca Exp $ - -Fix for CVE-2013-6712. - ---- ext/date/lib/parse_iso_intervals.re.orig 2013-11-12 14:17:27.000000000 +0000 -+++ ext/date/lib/parse_iso_intervals.re -@@ -348,7 +348,7 @@ isoweek = year4 "-"? "W" weekof - break; - } - ptr++; -- } while (*ptr); -+ } while (!s->errors->error_count && *ptr); - s->have_period = 1; - TIMELIB_DEINIT; - return TIMELIB_PERIOD; diff --git a/lang/php55/patches/patch-ext_sockets_sockaddr__conv.c b/lang/php55/patches/patch-ext_sockets_sockaddr__conv.c deleted file mode 100644 index c4c62c93c9d41..0000000000000 --- a/lang/php55/patches/patch-ext_sockets_sockaddr__conv.c +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ext_sockets_sockaddr__conv.c,v 1.1 2013/10/15 15:46:37 taca Exp $ - -Not all operating system have AI_V4MAPPED. - ---- ext/sockets/sockaddr_conv.c.orig 2013-09-18 13:08:04.000000000 +0000 -+++ ext/sockets/sockaddr_conv.c -@@ -24,6 +24,10 @@ int php_set_inet6_addr(struct sockaddr_i - } else { - #if HAVE_GETADDRINFO - -+#ifndef AI_V4MAPPED -+#define AI_V4MAPPED 0 -+#endif -+ - memset(&hints, 0, sizeof(struct addrinfo)); - hints.ai_family = AF_INET6; - hints.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG; diff --git a/lang/php55/patches/patch-php.ini-development b/lang/php55/patches/patch-php.ini-development index e6ce909703a68..d46b09c52d106 100644 --- a/lang/php55/patches/patch-php.ini-development +++ b/lang/php55/patches/patch-php.ini-development @@ -1,8 +1,8 @@ -$NetBSD: patch-php.ini-development,v 1.2 2013/08/17 13:15:21 taca Exp $ +$NetBSD: patch-php.ini-development,v 1.3 2014/01/11 17:05:09 taca Exp $ ---- php.ini-development.orig 2013-08-15 20:42:04.000000000 +0000 +--- php.ini-development.orig 2014-01-08 10:15:20.000000000 +0000 +++ php.ini-development -@@ -702,7 +702,7 @@ default_mimetype = "text/html" +@@ -703,7 +703,7 @@ default_mimetype = "text/html" ;;;;;;;;;;;;;;;;;;;;;;;;; ; UNIX: "/path1:/path2" @@ -11,7 +11,7 @@ $NetBSD: patch-php.ini-development,v 1.2 2013/08/17 13:15:21 taca Exp $ ; ; Windows: "\path1;\path2" ;include_path = ".;c:\php\includes" -@@ -723,8 +723,8 @@ doc_root = +@@ -724,8 +724,8 @@ doc_root = ; http://php.net/user-dir user_dir = @@ -22,7 +22,7 @@ $NetBSD: patch-php.ini-development,v 1.2 2013/08/17 13:15:21 taca Exp $ ; extension_dir = "./" ; On windows: ; extension_dir = "ext" -@@ -797,7 +797,7 @@ file_uploads = On +@@ -798,7 +798,7 @@ file_uploads = On ; Temporary directory for HTTP uploaded files (will use system default if not ; specified). ; http://php.net/upload-tmp-dir diff --git a/lang/php55/patches/patch-php.ini-production b/lang/php55/patches/patch-php.ini-production index 21495050f0afd..fa0b55608271a 100644 --- a/lang/php55/patches/patch-php.ini-production +++ b/lang/php55/patches/patch-php.ini-production @@ -1,8 +1,8 @@ -$NetBSD: patch-php.ini-production,v 1.2 2013/08/17 13:15:21 taca Exp $ +$NetBSD: patch-php.ini-production,v 1.3 2014/01/11 17:05:09 taca Exp $ ---- php.ini-production.orig 2013-08-15 20:42:04.000000000 +0000 +--- php.ini-production.orig 2014-01-08 10:15:20.000000000 +0000 +++ php.ini-production -@@ -702,7 +702,7 @@ default_mimetype = "text/html" +@@ -703,7 +703,7 @@ default_mimetype = "text/html" ;;;;;;;;;;;;;;;;;;;;;;;;; ; UNIX: "/path1:/path2" @@ -11,7 +11,7 @@ $NetBSD: patch-php.ini-production,v 1.2 2013/08/17 13:15:21 taca Exp $ ; ; Windows: "\path1;\path2" ;include_path = ".;c:\php\includes" -@@ -723,8 +723,8 @@ doc_root = +@@ -724,8 +724,8 @@ doc_root = ; http://php.net/user-dir user_dir = @@ -22,7 +22,7 @@ $NetBSD: patch-php.ini-production,v 1.2 2013/08/17 13:15:21 taca Exp $ ; extension_dir = "./" ; On windows: ; extension_dir = "ext" -@@ -797,7 +797,7 @@ file_uploads = On +@@ -798,7 +798,7 @@ file_uploads = On ; Temporary directory for HTTP uploaded files (will use system default if not ; specified). ; http://php.net/upload-tmp-dir