Update php56 to 5.6.20, including security fix.

Add add an patch to fix memory leak noted from Zafer Aydo«»an via
private mail.

31 Mar 2016, PHP 5.6.20

- CLI Server:
  . Fixed bug #69953 (Support MKCALENDAR request method). (Christoph)

- Core:
  . Fixed bug #71596 (Segmentation fault on ZTS with date function
    (setlocale)). (Anatol)

- Curl:
  . Fixed bug #71694 (Support constant CURLM_ADDED_ALREADY). (mpyw)

- Date:
  . Fixed bug #71635 (DatePeriod::getEndDate segfault). (Thomas Punt)

- 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)

- ODBC:
  . Fixed bug #47803, #69526 (Executing prepared statements is succesfull only
    for the first two statements). (einavitamar at gmail dot com, Anatol)
  . Fixed bug #71860 (Invalid memory write in phar on filename with \0 in
    name). (Stas)

- PDO_DBlib:
  . Bug #54648 (PDO::MSSQL forces format of datetime fields).
    (steven dot lambeth at gmx dot de, Anatol)

- Phar:
  . Fixed bug #71625 (Crash in php7.dll with bad phar filename).
    (Anatol)
  . Fixed bug #71504 (Parsing of tar file with duplicate filenames causes
    memory leak). (Jos Elstgeest)

- 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)

4 files changed, 24 insertions, 9 deletions

diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk
index 6bd703fddc8..6da51d63704 100644
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.129 2016/04/02 08:59:24 taca Exp $
+# $NetBSD: phpversion.mk,v 1.130 2016/04/02 09:00:25 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
@@ -82,7 +82,7 @@ PHPVERSION_MK=	defined
 
 # Define each PHP's version.
 PHP55_VERSION=	5.5.34
-PHP56_VERSION=	5.6.19
+PHP56_VERSION=	5.6.20
 PHP70_VERSION=	7.0.4
 
 # Define initial release of major version.
diff --git a/lang/php56/Makefile b/lang/php56/Makefile
index 0057275544c..f27b99109d3 100644
--- a/lang/php56/Makefile
+++ b/lang/php56/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2016/03/05 11:28:43 jperkin Exp $
+# $NetBSD: Makefile,v 1.11 2016/04/02 09:00:25 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/php56/distinfo b/lang/php56/distinfo
index 69685bf096b..3f9140055e1 100644
--- a/lang/php56/distinfo
+++ b/lang/php56/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.24 2016/03/05 05:18:51 taca Exp $
+$NetBSD: distinfo,v 1.25 2016/04/02 09:00:25 taca Exp $
 
-SHA1 (php-5.6.19.tar.bz2) = 725e097a795e102a72b24eda81c6511413a04db9
-RMD160 (php-5.6.19.tar.bz2) = 93b1b25b14154c20fa50d23ab2920b3e2bd6c39d
-SHA512 (php-5.6.19.tar.bz2) = c8c2b3bdfc1a8abe834612c33123b4f103e841c230b53934fb7bafe11af7f1175f02ca54c92f33e8e603485e6283897bebb51acc55d1213b7433024684215c14
-Size (php-5.6.19.tar.bz2) = 14100438 bytes
+SHA1 (php-5.6.20.tar.bz2) = 41fcaf7a61936baf3ea9543697291865f9870a59
+RMD160 (php-5.6.20.tar.bz2) = 6cde7ace4a02711b46a2853cb43dc10edf72e167
+SHA512 (php-5.6.20.tar.bz2) = 9e26f2564ee7329ab50d4d8d27f029c4f88317ea761888138e60d13a3cf51e49676ded406a3ec18433be2ec5d2a49c904eaa9f32d473b99d11550025e026a61c
+Size (php-5.6.20.tar.bz2) = 14162188 bytes
 SHA1 (patch-acinclude.m4) = b38fc34c3a3847dc317e8e286612b21ec8fd5ce8
 SHA1 (patch-configure) = a72aa43759c6f3d3ad350659397570582c3ca3ff
 SHA1 (patch-ext_gd_config.m4) = 4b44853250eb4a638af4c663e618307ff25d2cbd
@@ -17,6 +17,7 @@ SHA1 (patch-ext_phar_Makefile.frag) = 1564c188e57d48f83de7c2420fdde183598539e2
 SHA1 (patch-ext_phar_phar_phar.php) = 5a82d55c7965027115065412f9b68defb278db64
 SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 85cd8f3e115705aa2eeab0e7229f24422e322a7f
 SHA1 (patch-ext_standard_basic__functions.c) = 669fe55c975bf2d971f6fdcb5b3004f7e20304d2
+SHA1 (patch-ext_standard_php__dns.h) = 4a1c0d9abff6ee1d278f9c680414530530efc6f7
 SHA1 (patch-makedist) = 8e8660b2e0a34f06f433e24dbb0a9c872963e419
 SHA1 (patch-php.ini-development) = 3c54a41310d28ecff4996c966934350368657c2f
 SHA1 (patch-php.ini-production) = 9b7ae64f3133139f0c3d42753ad5d8622873423d
diff --git a/lang/php56/patches/patch-ext_standard_php__dns.h b/lang/php56/patches/patch-ext_standard_php__dns.h
new file mode 100644
index 00000000000..114f295f9bf
--- /dev/null
+++ b/lang/php56/patches/patch-ext_standard_php__dns.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_standard_php__dns.h,v 1.1 2016/04/02 09:00:25 taca Exp $
+
+Fix memory leak.
+
+--- ext/standard/php_dns.h.orig	2016-03-30 23:35:38.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)