Update php70 to 7.0.5, including security fix.

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

31 Mar 2016 PHP 7.0.5

- Core:
  . Huge pages disabled by default. (Rasmus)
  . Added ability to enable huge pages in Zend Memory Manager through
    the environment variable USE_ZEND_ALLOC_HUGE_PAGES=1. (Dmitry)
  . Fixed bug #71756 (Call-by-reference widens scope to uninvolved functions
    when used in switch). (Laruence)
  . Fixed bug #71729 (Possible crash in zend_bin_strtod, zend_oct_strtod,
    zend_hex_strtod). (Laruence)
  . Fixed bug #71695 (Global variables are reserved before execution).
    (Laruence)
  . Fixed bug #71629 (Out-of-bounds access in php_url_decode in context
    php_stream_url_wrap_rfc2397). (mt at debian dot org)
  . Fixed bug #71622 (Strings used in pass-as-reference cannot be used to
    invoke C::$callable()). (Bob)
  . Fixed bug #71596 (Segmentation fault on ZTS with date function
    (setlocale)). (Anatol)
  . Fixed bug #71535 (Integer overflow in zend_mm_alloc_heap()). (Dmitry)
  . Fixed bug #71470 (Leaked 1 hashtable iterators). (Nikita)
  . Fixed bug #71575 (ISO C does not allow extra ‘;’ outside of a function).
    (asgrim)
  . Fixed bug #71724 (yield from does not count EOLs). (Nikita)
  . Fixed bug #71767 (ReflectionMethod::getDocComment returns the wrong
    comment). (Grigorii Sokolik)
  . Fixed bug #71806 (php_strip_whitespace() fails on some numerical values).
    (Nikita)
  . Fixed bug #71624 (`php -R` (PHP_MODE_PROCESS_STDIN) is broken).
    (Sean DuBois)

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

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

- libxml:
  . Fixed bug #71536 (Access Violation crashes php-cgi.exe). (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)

- PCRE:
  . Fixed bug #71659 (segmentation fault in pcre running twig tests).
    (nish dot aravamudan at canonical dot com)

- 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 #71317 (PharData fails to open specific file). (Jos Elstgeest)
  . Fixed bug #71860 (Invalid memory write in phar on filename with \0 in
    name). (Stas)

- phpdbg:
  . Fixed crash when advancing (except step) inside an internal function. (Bob)

- Session:
  . Fixed Bug #71683 (Null pointer dereference in zend_hash_str_find_bucket).
    (Yasuo)

- SNMP:
  . Fixed bug #71704 (php_snmp_error() Format String Vulnerability).
    (andrew at jmpesp dot org)

- SPL:
  . Fixed bug #71617 (private properties lost when unserializing ArrayObject).
    (Nikita)

- Standard:
  . Fixed bug #71660 (array_column behaves incorrectly after foreach by
    reference). (Laruence)
  . Fixed bug #71798 (Integer Overflow in php_raw_url_encode).
    (taoguangchen at icloud dot com, Stas)

- Zip:
  . Update bundled libzip to 1.1.2. (Remi, Anatol)

4 files changed, 24 insertions, 9 deletions

diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk
index 6da51d63704..39d16d9fd15 100644
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.130 2016/04/02 09:00:25 taca Exp $
+# $NetBSD: phpversion.mk,v 1.131 2016/04/02 09:02:11 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.
 PHP55_VERSION=	5.5.34
 PHP56_VERSION=	5.6.20
-PHP70_VERSION=	7.0.4
+PHP70_VERSION=	7.0.5
 
 # Define initial release of major version.
 PHP55_RELDATE=	20130620
diff --git a/lang/php70/Makefile b/lang/php70/Makefile
index a76ddb0cc8d..e5761f8459b 100644
--- a/lang/php70/Makefile
+++ b/lang/php70/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2016/03/05 11:28:44 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2016/04/02 09:02:11 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/php70/distinfo b/lang/php70/distinfo
index e7dbefcbf68..027e22b0710 100644
--- a/lang/php70/distinfo
+++ b/lang/php70/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2016/03/05 05:20:17 taca Exp $
+$NetBSD: distinfo,v 1.7 2016/04/02 09:02:11 taca Exp $
 
-SHA1 (php-7.0.4.tar.bz2) = 4e6ad0af73e9b8de66844dee2f14cc089cb5aea8
-RMD160 (php-7.0.4.tar.bz2) = 026b36537a9f86864bcb932389760c0dd1f5acd2
-SHA512 (php-7.0.4.tar.bz2) = 9d1dc761cdd9103a91299e01117c1790550e3b94e7694dcc2555d83e5abe3d2170acd6226e8501c5f2a77b5c374b1c9f5ea009999d476818c2682a54def86b96
-Size (php-7.0.4.tar.bz2) = 14027088 bytes
+SHA1 (php-7.0.5.tar.bz2) = e447f1a58b848bdbce7edad9b1607bf2e24edbe8
+RMD160 (php-7.0.5.tar.bz2) = e36195d03b142a8b23a121842f456f4fd21279e7
+SHA512 (php-7.0.5.tar.bz2) = 13d6dcd339211b22761586f2804c7470634e00b36e5e0b7bcf5188c017f950cbf49a2d4dd41047a7d44c70ed9474097a7290fc84ee3c26532e2ad8a2cbe706d7
+Size (php-7.0.5.tar.bz2) = 14086522 bytes
 SHA1 (patch-acinclude.m4) = b682280fd89950c082c2226bdb7364b0dc475bad
 SHA1 (patch-configure) = 9097646e71cbfa21322ca2f01c8c256822b056ea
 SHA1 (patch-ext_gd_config.m4) = a7ec1bd0d876657d4b5e597b9aa1e97c2d2801e3
@@ -15,6 +15,7 @@ SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426
 SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8
 SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5
 SHA1 (patch-ext_standard_basic__functions.c) = f97a2748c7b15fbd9a2d3c21e56079088cc05d56
+SHA1 (patch-ext_standard_php__dns.h) = f78db6bd4d99b41837589b70faba7c1ce353d36a
 SHA1 (patch-makedist) = 2ac0e0391c031c4fcf4993e2269cde4c6bfddfd5
 SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd
 SHA1 (patch-php.ini-production) = ae61dffedf574b688fe576b0b2af748b7a28cd89
diff --git a/lang/php70/patches/patch-ext_standard_php__dns.h b/lang/php70/patches/patch-ext_standard_php__dns.h
new file mode 100644
index 00000000000..2869d53d473
--- /dev/null
+++ b/lang/php70/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:02:11 taca Exp $
+
+Fix memory leak.
+
+--- ext/standard/php_dns.h.orig	2016-03-29 14:44:22.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)