From 20a68faa5eeda07808a7c7e3a1cbe71e016271b5 Mon Sep 17 00:00:00 2001 From: tron Date: Mon, 25 Aug 2014 16:14:59 +0000 Subject: Pullup ticket #4487 - requested by tron lang/php55: security update Revisions pulled up: - lang/php/phpversion.mk patch - lang/php55/Makefile 1.16 - lang/php55/distinfo 1.27-1.28 - lang/php55/patches/patch-aclocal.m4 1.2 - lang/php55/patches/patch-build_libtool.m4 1.2 - lang/php55/patches/patch-configure 1.8 - lang/php55/patches/patch-ext_gd_libgd_gdxpm.c deleted - lang/php55/patches/patch-ext_spl_spl__array.c deleted - lang/php55/patches/patch-ext_spl_spl__dllist.c deleted --- Module Name: pkgsrc Committed By: taca Date: Sat Jul 26 00:11:55 UTC 2014 Modified Files: pkgsrc/lang/php: phpversion.mk pkgsrc/lang/php55: Makefile distinfo pkgsrc/lang/php55/patches: patch-aclocal.m4 patch-build_libtool.m4 patch-configure Removed Files: pkgsrc/lang/php55/patches: patch-ext_spl_spl__array.c patch-ext_spl_spl__dllist.c Log Message: Update php55 to 5.5.15. 24 Jul 2014, PHP 5.5.15 - Core: . Fixed bug #67428 (header('Location: foo') will override a 308-399 response code). (Adam) . Fixed bug #67436 (Autoloader isn't called if two method definitions don't match). (Bob) . Fixed bug #67091 (make install fails to install libphp5.so on FreeBSD 10.0). (Ferenc) . Fixed bug #67497 (eval with parse error causes segmentation fault in generator). (Nikita) . Fixed bug #67151 (strtr with empty array crashes). (Nikita) . Fixed bug #67407 (Windows 8.1/Server 2012 R2 reported as Windows 8/Server 2012). (Christian Wenz) - CLI server: . Implemented FR #67429 (CLI server is missing some new HTTP response codes). (Adam) . Fixed bug #66830 (Empty header causes PHP built-in web server to hang). (Adam) - FPM: . Fixed bug #67530 (error_log=syslog ignored). (Remi) . Fixed bug #67531 (syslog cannot be set in pool configuration). (Remi) - Intl: . Fixed bug #66921 (Wrong argument type hint for function intltz_from_date_time_zone). (Stas) . Fixed bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting). (Stas) - OPCache: . Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault happen) (Dmitry, Laruence) - pgsql: . Fixed bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756), which affected builds against libpq < 7.3. (Adam) - Phar: . Fixed bug #67587 (Redirection loop on nginx with FPM). (Christian Weiske) - SPL: . Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting). (research at insighti dot org, Laruence) . Fixed bug #67538 (SPL Iterators use-after-free). (CVE-2014-4670) (Laruence) - Streams: . Fixed bug #67430 (http:// wrapper doesn't follow 308 redirects). (Adam) --- Module Name: pkgsrc Committed By: taca Date: Sat Aug 23 16:09:21 UTC 2014 Modified Files: pkgsrc/lang/php: phpversion.mk pkgsrc/lang/php55: distinfo Removed Files: pkgsrc/lang/php55/patches: patch-ext_gd_libgd_gdxpm.c Log Message: Update php55 to 5.5.16 (PHP 5.5.16). 21 Aug 2014, PHP 5.5.16 - COM: . Fixed missing type checks in com_event_sink (Yussuf Khalil, Stas). - Fileinfo: . Fixed bug #67705 (extensive backtracking in rule regular expression). (CVE-2014-3538) (Remi) . Fixed bug #67716 (Segfault in cdf.c). (CVE-2014-3587) (Remi) - FPM: . Fixed bug #67635 (php links to systemd libraries without using pkg-config). (pacho@gentoo.org, Remi) - GD: . Fixed bug #66901 (php-gd 'c_color' NULL pointer dereference). (CVE-2014-2497) (Remi) . Fixed bug #67730 (Null byte injection possible with imagexxx functions). (CVE-2014-5120) (Ryan Mauger) - Milter: . Fixed bug #67715 (php-milter does not build and crashes randomly). (Mike) - OpenSSL: . Fixed missing type checks in OpenSSL options (Yussuf Khalil, Stas). - readline: . Fixed bug #55496 (Interactive mode doesn't force a newline before the prompt). (Bob, Johannes) . Fixed bug #67496 (Save command history when exiting interactive shell with control-c). (Dmitry Saprykin, Johannes) - Sessions: . Fixed missing type checks in php_session_create_id (Yussuf Khalil, Stas). - Core: . Fixed bug #67693 (incorrect push to the empty array) (Tjerk) . Fixed bug #67717 (segfault in dns_get_record). (CVE-2014-3597) (Remi) - ODBC: . Fixed bug #60616 (odbc_fetch_into returns junk data at end of multi-byte char fields). (Keyur) --- lang/php/phpversion.mk | 4 +-- lang/php55/Makefile | 3 +-- lang/php55/distinfo | 17 +++++------- lang/php55/patches/patch-aclocal.m4 | 26 +++--------------- lang/php55/patches/patch-build_libtool.m4 | 26 +++--------------- lang/php55/patches/patch-configure | 37 ++++---------------------- lang/php55/patches/patch-ext_gd_libgd_gdxpm.c | 31 --------------------- lang/php55/patches/patch-ext_spl_spl__array.c | 27 ------------------- lang/php55/patches/patch-ext_spl_spl__dllist.c | 18 ------------- 9 files changed, 23 insertions(+), 166 deletions(-) delete mode 100644 lang/php55/patches/patch-ext_gd_libgd_gdxpm.c delete mode 100644 lang/php55/patches/patch-ext_spl_spl__array.c delete mode 100644 lang/php55/patches/patch-ext_spl_spl__dllist.c diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk index 50d00633b8f..84c1888637b 100644 --- a/lang/php/phpversion.mk +++ b/lang/php/phpversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: phpversion.mk,v 1.66.2.2 2014/08/25 15:59:27 tron Exp $ +# $NetBSD: phpversion.mk,v 1.66.2.3 2014/08/25 16:14:59 tron 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.29 PHP54_VERSION= 5.4.32 -PHP55_VERSION= 5.5.14 +PHP55_VERSION= 5.5.16 # Define initial release of major version. PHP53_RELDATE= 20090630 diff --git a/lang/php55/Makefile b/lang/php55/Makefile index 3f9c1b6d33f..fb59521d338 100644 --- a/lang/php55/Makefile +++ b/lang/php55/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.14.2.1 2014/07/17 18:03:59 tron Exp $ +# $NetBSD: Makefile,v 1.14.2.2 2014/08/25 16:14:59 tron Exp $ # # We can't omit PKGNAME here to handle PKG_OPTIONS. # PKGNAME= php-${PHP_BASE_VERS} -PKGREVISION= 1 CATEGORIES= lang HOMEPAGE= http://www.php.net/ diff --git a/lang/php55/distinfo b/lang/php55/distinfo index 55ffa6969b9..61a3699a1f6 100644 --- a/lang/php55/distinfo +++ b/lang/php55/distinfo @@ -1,14 +1,13 @@ -$NetBSD: distinfo,v 1.25.2.1 2014/07/17 18:03:59 tron Exp $ +$NetBSD: distinfo,v 1.25.2.2 2014/08/25 16:14:59 tron Exp $ -SHA1 (php-5.5.14.tar.bz2) = 062d351da165aa0568e4d8cbc53a18d73b99f49a -RMD160 (php-5.5.14.tar.bz2) = d3f87693d3118cfdc64a7b77e9b765ce4eb7ae60 -Size (php-5.5.14.tar.bz2) = 13282773 bytes +SHA1 (php-5.5.16.tar.bz2) = 36c007e24a440f97c4f56ac094ac5e271dbd1a11 +RMD160 (php-5.5.16.tar.bz2) = dc0f15b662c37e99a5eea728774e29a54fb58db7 +Size (php-5.5.16.tar.bz2) = 13257031 bytes SHA1 (patch-acinclude.m4) = 9e9c433e4cb96e469f7cf14b2064a0f41fc4568a -SHA1 (patch-aclocal.m4) = 14ae2898e1d68b552e76a7e4ee7006f1aee1f932 -SHA1 (patch-build_libtool.m4) = 6ee935c55cc01704c6e9edb4e383b2ddb7c746e7 -SHA1 (patch-configure) = efbdae6f90fbf5ccfde3735997e66e79a119439b +SHA1 (patch-aclocal.m4) = 46f192351e541453b1e32299acd1b4cfefc93cb2 +SHA1 (patch-build_libtool.m4) = 3811edd697fd21eadc4f65cba35c6297141e8ff2 +SHA1 (patch-configure) = e81731b426b31656de72a4e4b3ad341b5ac34f82 SHA1 (patch-ext_gd_config.m4) = 91c9798333d4776856a0a9e20196986856b758b2 -SHA1 (patch-ext_gd_libgd_gdxpm.c) = 9a175417fad9ac23037a24122f8d1258b9eebbcb SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc SHA1 (patch-ext_mssql_php__mssql.c) = 4ef1837850443e9db2e71620a3ddaed5ab5c435b SHA1 (patch-ext_opcache_config.m4) = 7c0d98feaeec8a0ca61f6f77a1906aa2d601be3f @@ -16,8 +15,6 @@ 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_spl_spl__array.c) = de3ac1ade2201fedb41fb23efb03887307de45bc -SHA1 (patch-ext_spl_spl__dllist.c) = f98d5dc1199eb021e776599761e0823ce8463f2e SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = b384b9daa466f2a8a3e6cfd4ea6cff81f9342941 SHA1 (patch-ext_standard_basic__functions.c) = f2a44998145306c2cb2d2f3822c0e7cc70c778b4 SHA1 (patch-makedist) = 3f6b0621d30264824f2cb4c2903d15ba95be3937 diff --git a/lang/php55/patches/patch-aclocal.m4 b/lang/php55/patches/patch-aclocal.m4 index 90178766cd1..1fade512144 100644 --- a/lang/php55/patches/patch-aclocal.m4 +++ b/lang/php55/patches/patch-aclocal.m4 @@ -1,17 +1,8 @@ -$NetBSD: patch-aclocal.m4,v 1.1 2014/03/19 21:56:31 asau Exp $ +$NetBSD: patch-aclocal.m4,v 1.1.4.1 2014/08/25 16:14:59 tron Exp $ ---- aclocal.m4.orig 2014-03-05 10:52:28.000000000 +0000 +--- aclocal.m4.orig 2014-07-23 09:08:13.000000000 +0000 +++ aclocal.m4 -@@ -4546,7 +4546,7 @@ dgux*) - shlibpath_var=LD_LIBRARY_PATH - ;; - --freebsd1*) -+freebsd1|freebsd1.*) - dynamic_linker=no - ;; - -@@ -4557,7 +4557,7 @@ freebsd* | dragonfly*) +@@ -4553,7 +4553,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in @@ -20,7 +11,7 @@ $NetBSD: patch-aclocal.m4,v 1.1 2014/03/19 21:56:31 asau Exp $ *) objformat=elf ;; esac fi -@@ -6174,7 +6174,7 @@ case $host_os in +@@ -6170,7 +6170,7 @@ case $host_os in ;; esac ;; @@ -29,12 +20,3 @@ $NetBSD: patch-aclocal.m4,v 1.1 2014/03/19 21:56:31 asau Exp $ # C++ shared libraries reported to be fairly broken before switch to ELF _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; -@@ -8857,7 +8857,7 @@ _LT_EOF - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - -- freebsd1*) -+ freebsd1|freebsd1.*) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - diff --git a/lang/php55/patches/patch-build_libtool.m4 b/lang/php55/patches/patch-build_libtool.m4 index 6a328bba7d1..8a0e8d9a0dc 100644 --- a/lang/php55/patches/patch-build_libtool.m4 +++ b/lang/php55/patches/patch-build_libtool.m4 @@ -1,17 +1,8 @@ -$NetBSD: patch-build_libtool.m4,v 1.1 2014/03/19 21:56:31 asau Exp $ +$NetBSD: patch-build_libtool.m4,v 1.1.4.1 2014/08/25 16:14:59 tron Exp $ ---- build/libtool.m4.orig 2014-03-05 10:18:00.000000000 +0000 +--- build/libtool.m4.orig 2014-07-23 09:00:58.000000000 +0000 +++ build/libtool.m4 -@@ -1532,7 +1532,7 @@ dgux*) - shlibpath_var=LD_LIBRARY_PATH - ;; - --freebsd1*) -+freebsd1|freebsd1.*) - dynamic_linker=no - ;; - -@@ -1543,7 +1543,7 @@ freebsd* | dragonfly*) +@@ -1539,7 +1539,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in @@ -20,7 +11,7 @@ $NetBSD: patch-build_libtool.m4,v 1.1 2014/03/19 21:56:31 asau Exp $ *) objformat=elf ;; esac fi -@@ -3160,7 +3160,7 @@ case $host_os in +@@ -3156,7 +3156,7 @@ case $host_os in ;; esac ;; @@ -29,12 +20,3 @@ $NetBSD: patch-build_libtool.m4,v 1.1 2014/03/19 21:56:31 asau Exp $ # C++ shared libraries reported to be fairly broken before switch to ELF _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; -@@ -5843,7 +5843,7 @@ _LT_EOF - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - -- freebsd1*) -+ freebsd1|freebsd1.*) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - diff --git a/lang/php55/patches/patch-configure b/lang/php55/patches/patch-configure index 217b53a7770..67c1508c10f 100644 --- a/lang/php55/patches/patch-configure +++ b/lang/php55/patches/patch-configure @@ -1,6 +1,6 @@ -$NetBSD: patch-configure,v 1.7 2014/06/13 14:31:19 fhajny Exp $ +$NetBSD: patch-configure,v 1.7.2.1 2014/08/25 16:14:59 tron Exp $ ---- configure.orig 2014-05-28 09:23:59.000000000 +0000 +--- configure.orig 2014-07-23 09:08:17.000000000 +0000 +++ configure @@ -8321,27 +8321,6 @@ EOF ;; @@ -117,25 +117,7 @@ $NetBSD: patch-configure,v 1.7 2014/06/13 14:31:19 fhajny Exp $ fi if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then -@@ -107701,7 +107654,7 @@ if test -z "$aix_libpath"; then aix_libp - hardcode_shlibpath_var=no - ;; - -- freebsd1*) -+ freebsd1|freebsd1.*) - ld_shlibs=no - ;; - -@@ -108350,7 +108303,7 @@ dgux*) - shlibpath_var=LD_LIBRARY_PATH - ;; - --freebsd1*) -+freebsd1|freebsd1.*) - dynamic_linker=no - ;; - -@@ -108361,7 +108314,7 @@ freebsd* | dragonfly*) +@@ -108353,7 +108306,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in @@ -144,7 +126,7 @@ $NetBSD: patch-configure,v 1.7 2014/06/13 14:31:19 fhajny Exp $ *) objformat=elf ;; esac fi -@@ -110441,7 +110394,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -110433,7 +110386,7 @@ if test -z "$aix_libpath"; then aix_libp ;; esac ;; @@ -153,16 +135,7 @@ $NetBSD: patch-configure,v 1.7 2014/06/13 14:31:19 fhajny Exp $ # C++ shared libraries reported to be fairly broken before switch to ELF ld_shlibs_CXX=no ;; -@@ -111987,7 +111940,7 @@ dgux*) - shlibpath_var=LD_LIBRARY_PATH - ;; - --freebsd1*) -+freebsd1|freebsd1.*) - dynamic_linker=no - ;; - -@@ -111998,7 +111951,7 @@ freebsd* | dragonfly*) +@@ -111986,7 +111939,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in diff --git a/lang/php55/patches/patch-ext_gd_libgd_gdxpm.c b/lang/php55/patches/patch-ext_gd_libgd_gdxpm.c deleted file mode 100644 index 69500e3e012..00000000000 --- a/lang/php55/patches/patch-ext_gd_libgd_gdxpm.c +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ext_gd_libgd_gdxpm.c,v 1.1 2014/05/11 11:20:47 he Exp $ - -Patch to fix CVE-2014-2497, taken from -https://bugs.php.net/patch-display.php?bug_id=66901 - ---- ext/gd/libgd/gdxpm.c.orig 2014-04-29 08:04:30.000000000 +0000 -+++ ext/gd/libgd/gdxpm.c -@@ -39,6 +39,13 @@ gdImagePtr gdImageCreateFromXpm (char *f - number = image.ncolors; - colors = (int *) safe_emalloc(number, sizeof(int), 0); - for (i = 0; i < number; i++) { -+ if (!image.colorTable[i].c_color) -+ { -+ /* unsupported color key or color key not defined */ -+ gdImageDestroy(im); -+ im = 0; -+ goto done; -+ } - switch (strlen (image.colorTable[i].c_color)) { - case 4: - buf[1] = '\0'; -@@ -125,8 +132,8 @@ gdImagePtr gdImageCreateFromXpm (char *f - } - } - -- gdFree(colors); - done: -+ gdFree(colors); - XpmFreeXpmImage(&image); - XpmFreeXpmInfo(&info); - return im; diff --git a/lang/php55/patches/patch-ext_spl_spl__array.c b/lang/php55/patches/patch-ext_spl_spl__array.c deleted file mode 100644 index fed009e8697..00000000000 --- a/lang/php55/patches/patch-ext_spl_spl__array.c +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-ext_spl_spl__array.c,v 1.1.2.2 2014/07/17 18:03:59 tron Exp $ - -Fix for CVE-2014-4698. - ---- ext/spl/spl_array.c.orig 2014-06-25 13:06:23.000000000 +0000 -+++ ext/spl/spl_array.c -@@ -1733,6 +1733,7 @@ SPL_METHOD(Array, unserialize) - const unsigned char *p, *s; - php_unserialize_data_t var_hash; - zval *pmembers, *pflags = NULL; -+ HashTable *aht; - long flags; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &buf, &buf_len) == FAILURE) { -@@ -1744,6 +1745,12 @@ SPL_METHOD(Array, unserialize) - return; - } - -+ aht = spl_array_get_hash_table(intern, 0 TSRMLS_CC); -+ if (aht->nApplyCount > 0) { -+ zend_error(E_WARNING, "Modification of ArrayObject during sorting is prohibited"); -+ return; -+ } -+ - /* storage */ - s = p = (const unsigned char*)buf; - PHP_VAR_UNSERIALIZE_INIT(var_hash); diff --git a/lang/php55/patches/patch-ext_spl_spl__dllist.c b/lang/php55/patches/patch-ext_spl_spl__dllist.c deleted file mode 100644 index 0561d78640c..00000000000 --- a/lang/php55/patches/patch-ext_spl_spl__dllist.c +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ext_spl_spl__dllist.c,v 1.1.2.2 2014/07/17 18:03:59 tron Exp $ - -Fix for CVE-2014-4670. - ---- ext/spl/spl_dllist.c.orig 2014-06-25 13:06:23.000000000 +0000 -+++ ext/spl/spl_dllist.c -@@ -916,6 +916,11 @@ SPL_METHOD(SplDoublyLinkedList, offsetUn - llist->dtor(element TSRMLS_CC); - } - -+ if (intern->traverse_pointer == element) { -+ SPL_LLIST_DELREF(element); -+ intern->traverse_pointer = NULL; -+ } -+ - zval_ptr_dtor((zval **)&element->data); - element->data = NULL; - -- cgit v1.2.3