diff options
| -rw-r--r-- | lang/php/phpversion.mk | 4 | ||||
| -rw-r--r-- | lang/php55/distinfo | 12 | ||||
| -rw-r--r-- | lang/php55/patches/patch-ext_standard_php__dns.h | 14 |
3 files changed, 19 insertions, 11 deletions
diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk index 4d386b86ad7..b248d79745d 100644 --- a/lang/php/phpversion.mk +++ b/lang/php/phpversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: phpversion.mk,v 1.132 2016/04/22 09:46:50 wiz Exp $ +# $NetBSD: phpversion.mk,v 1.133 2016/05/02 13:06:21 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.34 +PHP55_VERSION= 5.5.35 PHP56_VERSION= 5.6.20 PHP70_VERSION= 7.0.5 diff --git a/lang/php55/distinfo b/lang/php55/distinfo index bb5cbf17436..61d4fecc039 100644 --- a/lang/php55/distinfo +++ b/lang/php55/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.51 2016/04/02 08:59:24 taca Exp $ +$NetBSD: distinfo,v 1.52 2016/05/02 13:06:21 taca Exp $ -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 (php-5.5.35.tar.bz2) = ac6bd9c35e1dad5d88b9169142189c13d8879a05 +RMD160 (php-5.5.35.tar.bz2) = 2178c43607892bdac50951a8b48a684c00b63bc8 +SHA512 (php-5.5.35.tar.bz2) = cfa62f83cd79b678c55ffdb1325906962bb7dae23fdbe963d57c3b24d13223229448f4c45727df1ab042bbd2db85804051c66993c28c68c0c873481cfe7e6834 +Size (php-5.5.35.tar.bz2) = 13690152 bytes SHA1 (patch-acinclude.m4) = 9e9c433e4cb96e469f7cf14b2064a0f41fc4568a SHA1 (patch-aclocal.m4) = 46f192351e541453b1e32299acd1b4cfefc93cb2 SHA1 (patch-build_libtool.m4) = 3811edd697fd21eadc4f65cba35c6297141e8ff2 @@ -18,7 +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-ext_standard_php__dns.h) = 61028fffaae8d9e590cfed7dab0bcb53eb689f96 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 index 8bab5a9bf43..e78bbb41a0e 100644 --- a/lang/php55/patches/patch-ext_standard_php__dns.h +++ b/lang/php55/patches/patch-ext_standard_php__dns.h @@ -1,15 +1,23 @@ -$NetBSD: patch-ext_standard_php__dns.h,v 1.1 2016/04/02 08:59:24 taca Exp $ +$NetBSD: patch-ext_standard_php__dns.h,v 1.2 2016/05/02 13:06:21 taca Exp $ Fix memory leak. ---- ext/standard/php_dns.h.orig 2016-03-29 16:08:54.000000000 +0000 +--- ext/standard/php_dns.h.orig 2016-04-27 12:00:31.000000000 +0000 +++ ext/standard/php_dns.h -@@ -33,7 +33,7 @@ +@@ -32,9 +32,15 @@ + #elif defined(HAVE_RES_NSEARCH) #define php_dns_search(res, dname, class, type, answer, anslen) \ res_nsearch(res, dname, class, type, answer, anslen); ++#ifdef __GLIBC__ #define php_dns_free_handle(res) \ - res_nclose(res); \ ++ res_nclose(res); \ ++ php_dns_free_res(*res) ++#else ++#define php_dns_free_handle(res) \ + res_ndestroy(res); \ php_dns_free_res(*res) ++#endif #elif defined(HAVE_RES_SEARCH) + #define php_dns_search(res, dname, class, type, answer, anslen) \ |