From 6581f35d08b976efb9e6d29904386b37416eac04 Mon Sep 17 00:00:00 2001 From: taca Date: Sat, 2 Apr 2016 08:59:24 +0000 Subject: Update php55 to 5.5.34, including security fix. Add add an patch to fix memory leak noted from Zafer Aydo«»an via private mail. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 31 Mar 2016, PHP 5.5.34 - Fileinfo: . Fixed bug #71527 (Buffer over-write in finfo_open with malformed magic file). (Anatol) - Mbstring: . Fixed bug #71906 (AddressSanitizer: negative-size-param (-1) in mbfl_strcut). (Stas) - OBBC . Fixed bug #71860 (Invalid memory write in phar on filename with \0 in name). (Stas) - SNMP: . Fixed bug #71704 (php_snmp_error() Format String Vulnerability). (andrew at jmpesp dot org) - Standard . Fixed bug #71798 (Integer Overflow in php_raw_url_encode). (taoguangchen at icloud dot com, Stas) --- lang/php/phpversion.mk | 4 ++-- lang/php55/Makefile | 3 +-- lang/php55/distinfo | 11 ++++++----- lang/php55/patches/patch-ext_standard_php__dns.h | 15 +++++++++++++++ 4 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 lang/php55/patches/patch-ext_standard_php__dns.h diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk index 43a0822ccea..6bd703fddc8 100644 --- a/lang/php/phpversion.mk +++ b/lang/php/phpversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: phpversion.mk,v 1.128 2016/03/05 05:20:17 taca Exp $ +# $NetBSD: phpversion.mk,v 1.129 2016/04/02 08:59:24 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 @@ -81,7 +81,7 @@ PHPVERSION_MK= defined # Define each PHP's version. -PHP55_VERSION= 5.5.33 +PHP55_VERSION= 5.5.34 PHP56_VERSION= 5.6.19 PHP70_VERSION= 7.0.4 diff --git a/lang/php55/Makefile b/lang/php55/Makefile index b3e324734de..c5befe278a5 100644 --- a/lang/php55/Makefile +++ b/lang/php55/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.25 2016/03/05 11:28:43 jperkin Exp $ +# $NetBSD: Makefile,v 1.26 2016/04/02 08:59:24 taca Exp $ # # We can't omit PKGNAME here to handle PKG_OPTIONS. # PKGNAME= php-${PHP_VERSION} -PKGREVISION= 1 CATEGORIES= lang HOMEPAGE= http://www.php.net/ diff --git a/lang/php55/distinfo b/lang/php55/distinfo index 52507ec44c7..bb5cbf17436 100644 --- a/lang/php55/distinfo +++ b/lang/php55/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.50 2016/03/05 05:17:33 taca Exp $ +$NetBSD: distinfo,v 1.51 2016/04/02 08:59:24 taca Exp $ -SHA1 (php-5.5.33.tar.bz2) = b9f709ad257256b8040141c994ecb1b72235ce92 -RMD160 (php-5.5.33.tar.bz2) = 930a9fe01432ef5878cb9781670e50a5b17548ef -SHA512 (php-5.5.33.tar.bz2) = a0ac57adcc4b0caec153265a8d1ded8d4d0f71b44f08158feb0add9c8fdd36826767882e85dd03399cf146800eddcb6b6cc1b21051d4fc4371e3f61b1169132b -Size (php-5.5.33.tar.bz2) = 13686486 bytes +SHA1 (php-5.5.34.tar.bz2) = 0aaae3a7727480d9cf993d07d7633393edf97ae4 +RMD160 (php-5.5.34.tar.bz2) = 4b6dd3064ca6d7eea632e1d06eca62097f87c5e8 +SHA512 (php-5.5.34.tar.bz2) = c4269f79f5acaac64e9d2e20feef4bbd5aa7a84e69445dee64bf068197d611aa8ceb3697ae6461d8c96068be7839f22eeaff61f201f6e7a8749d284eaa68c0f8 +Size (php-5.5.34.tar.bz2) = 13686681 bytes SHA1 (patch-acinclude.m4) = 9e9c433e4cb96e469f7cf14b2064a0f41fc4568a SHA1 (patch-aclocal.m4) = 46f192351e541453b1e32299acd1b4cfefc93cb2 SHA1 (patch-build_libtool.m4) = 3811edd697fd21eadc4f65cba35c6297141e8ff2 @@ -18,6 +18,7 @@ SHA1 (patch-ext_phar_Makefile.frag) = f465bb5acd4bb87bb403baa98b61ac707800fd30 SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = b384b9daa466f2a8a3e6cfd4ea6cff81f9342941 SHA1 (patch-ext_standard_basic__functions.c) = f2a44998145306c2cb2d2f3822c0e7cc70c778b4 +SHA1 (patch-ext_standard_php__dns.h) = 72b5d1061bc3f6ce8bee2a683db6cd9ef9b1e1a7 SHA1 (patch-makedist) = 3f6b0621d30264824f2cb4c2903d15ba95be3937 SHA1 (patch-php.ini-development) = 4fc40f0af5f6e58b614794e066a5738694dc8ef8 SHA1 (patch-php.ini-production) = 47c1b14ee78fbcaa084a58d2c0c3e843104072be diff --git a/lang/php55/patches/patch-ext_standard_php__dns.h b/lang/php55/patches/patch-ext_standard_php__dns.h new file mode 100644 index 00000000000..8bab5a9bf43 --- /dev/null +++ b/lang/php55/patches/patch-ext_standard_php__dns.h @@ -0,0 +1,15 @@ +$NetBSD: patch-ext_standard_php__dns.h,v 1.1 2016/04/02 08:59:24 taca Exp $ + +Fix memory leak. + +--- ext/standard/php_dns.h.orig 2016-03-29 16:08:54.000000000 +0000 ++++ ext/standard/php_dns.h +@@ -33,7 +33,7 @@ + #define php_dns_search(res, dname, class, type, answer, anslen) \ + res_nsearch(res, dname, class, type, answer, anslen); + #define php_dns_free_handle(res) \ +- res_nclose(res); \ ++ res_ndestroy(res); \ + php_dns_free_res(*res) + + #elif defined(HAVE_RES_SEARCH) -- cgit v1.2.3