Update php70 to 7.0.6.

pkgsrc change: Fix build problem on Linux noted by Matthias Ferdinand on
pkgsrc-users@.

28 Apr 2016 PHP 7.0.6

- Core:
  . Fixed bug #71930 (_zval_dtor_func: Assertion `(arr)->gc.refcount <= 1'
    failed). (Laruence)
  . Fixed bug #71922 (Crash on assert(new class{})). (Nikita)
  . Fixed bug #71914 (Reference is lost in "switch"). (Laruence)
  . Fixed bug #71871 (Interfaces allow final and abstract functions). (Nikita)
  . Fixed Bug #71859 (zend_objects_store_call_destructors operates on realloced
    memory, crashing). (Laruence)
  . Fixed bug #71841 (EG(error_zval) is not handled well). (Laruence)
  . Fixed bug #71750 (Multiple Heap Overflows in php_raw_url_encode/
    php_url_encode). (Stas)
  . Fixed bug #71731 (Null coalescing operator and ArrayAccess). (Nikita)
  . Fixed bug #71609 (Segmentation fault on ZTS with gethostbyname). (krakjoe)
  . Fixed bug #71428 (inheritance and allow_null). (krakjoe)
  . Fixed bug #71414 (Inheritance, traits and interfaces). (krakjoe)
  . Fixed bug #71359 (Null coalescing operator and magic). (krakjoe)
  . Fixed bug #71334 (Cannot access array keys while uksort()). (Nikita)
  . Fixed bug #69659 (ArrayAccess, isset() and the offsetExists method).
    (Nikita)
  . Fixed bug #69537 (__debugInfo with empty string for key gives error).
    (krakjoe)
  . Fixed bug #62059 (ArrayObject and isset are not friends). (Nikita)
  . Fixed bug #71980 (Decorated/Nested Generator is Uncloseable in Finally).
    (Nikita)

- BCmath:
  . Fixed bug #72093 (bcpowmod accepts negative scale and corrupts
    _one_ definition). (Stas)

- Curl:
  . Fixed bug #71831 (CURLOPT_NOPROXY applied as long instead of string).
    (Michael Sierks)

- Date:
  . Fixed bug #71889 (DateInterval::format Segmentation fault). (Thomas Punt)

- EXIF:
  . Fixed bug #72094 (Out of bounds heap read access in exif header processing). (Stas)

- GD:
  . Fixed bug #71912 (libgd: signedness vulnerability). (Stas)

- Intl:
  . Fixed bug #71516 (IntlDateFormatter looses locale if pattern is set via
    constructor). (Anatol)
  . Fixed bug #70455 (Missing constant: IntlChar::NO_NUMERIC_VALUE). (Anatol)
  . Fixed bug #70451, #70452 (Inconsistencies in return values of IntlChar
    methods). (Daniel Persson)
  . Fixed bug #68893 (Stackoverflow in datefmt_create). (Anatol)
  . Fixed bug #66289 (Locale::lookup incorrectly returns en or en_US if locale
    is empty). (Anatol)
  . Fixed bug #70484 (selectordinal doesn't work with named parameters).
    (Anatol)
  . Fixed bug #72061 (Out-of-bounds reads in zif_grapheme_stripos with negative
    offset). (Stas)

- ODBC:
  . Fixed bug #63171 (Script hangs after max_execution_time). (Remi)

- Opcache:
  . Fixed bug #71843 (null ptr deref ZEND_RETURN_SPEC_CONST_HANDLER).
    (Laruence)

- PDO:
  . Fixed bug #52098 (Own PDOStatement implementation ignore __call()).
    (Daniel kalaspuffar, Julien)
  . Fixed bug #71447 (Quotes inside comments not properly handled). (Matteo)

- PDO_DBlib:
  . Fixed bug #71943 (dblib_handle_quoter needs to allocate an extra byte).
    (Adam Baratz)
  . Add DBLIB-specific attributes for controlling timeouts. (Adam Baratz)

- PDO_pgsql:
  . Fixed bug #62498 (pdo_pgsql inefficient when getColumnMeta() is used).
    (Joseph Bylund)

- Postgres:
  . Fixed bug #71820 (pg_fetch_object binds parameters before call
    constructor). (Anatol)
  . Fixed bug #71998 (Function pg_insert does not insert when column
    type = inet). (Anatol)

- SOAP:
  . Fixed bug #71986 (Nested foreach assign-by-reference creates broken
    variables). (Laruence)

- SPL:
  . Fixed bug #71838 (Deserializing serialized SPLObjectStorage-Object can't
    access properties in PHP). (Nikita)
  . Fixed bug #71735 (Double-free in SplDoublyLinkedList::offsetSet). (Stas)
  . Fixed bug #67582 (Cloned SplObjectStorage with overwritten getHash fails
    offsetExists()). (Nikita)
  . Fixed bug #52339 (SPL autoloader breaks class_exists()). (Nikita)

- Standard:
  . Fixed bug #71995 (Returning the same var twice from __sleep() produces
    broken serialized data). (Laruence)
  . Fixed bug #71940 (Unserialize crushes on restore object reference).
    (Laruence)
  . Fixed bug #71969 (str_replace returns an incorrect resulting array after
    a foreach by reference). (Laruence)
  . Fixed bug #71891 (header_register_callback() and
    register_shutdown_function()). (Laruence)
  . Fixed bug #71884 (Null pointer deref (segfault) in
    stream_context_get_default). (Laruence)
  . Fixed bug #71840 (Unserialize accepts wrongly data). (Ryat, Laruence)
  . Fixed bug #71837 (Wrong arrays behaviour). (Laruence)
  . Fixed bug #71827 (substr_replace bug, string length). (krakjoe)
  . Fixed bug #67512 (php_crypt() crashes if crypt_r() does not exist or
    _REENTRANT is not defined). (Nikita)
  . Fixed bug #72116 (array_fill optimization breaks implementation). (Bob)

- XML:
  . Fixed bug #72099 (xml_parse_into_struct segmentation fault). (Stas)

- Zip:
  . Fixed bug #71923 (integer overflow in ZipArchive::getFrom*). (Stas)

5 files changed, 29 insertions, 46 deletions

diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk
index 468c88ec6fb..acbfd95086e 100644
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.134 2016/05/02 13:08:00 taca Exp $
+# $NetBSD: phpversion.mk,v 1.135 2016/05/02 13:09:49 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.35
 PHP56_VERSION=	5.6.21
-PHP70_VERSION=	7.0.5
+PHP70_VERSION=	7.0.6
 
 # Define initial release of major version.
 PHP55_RELDATE=	20130620
diff --git a/lang/php70/distinfo b/lang/php70/distinfo
index 05426f070ca..43e7c248258 100644
--- a/lang/php70/distinfo
+++ b/lang/php70/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.8 2016/04/02 13:02:36 taca Exp $
+$NetBSD: distinfo,v 1.9 2016/05/02 13:09:49 taca Exp $
 
-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 (php-7.0.6.tar.bz2) = c7fb6b98124f5d367b18893e34aebb184d4fa715
+RMD160 (php-7.0.6.tar.bz2) = b81bea4b3c6ecfc125b71d1c9407b4c1e854aa75
+SHA512 (php-7.0.6.tar.bz2) = 7f44cc5df3b9bb4394ac39069fdc2993086dd8e159e97275bf5fa4dd399d416e9ea1b057cdf855bae1c0f9c2129af1914495d9d2512ce90a7dd3ce4206aa9286
+Size (php-7.0.6.tar.bz2) = 14102594 bytes
 SHA1 (patch-acinclude.m4) = b682280fd89950c082c2226bdb7364b0dc475bad
-SHA1 (patch-configure) = 9097646e71cbfa21322ca2f01c8c256822b056ea
+SHA1 (patch-configure) = a129e19ef87338f6e53ccc967c40ddcde7c7357c
 SHA1 (patch-ext_gd_config.m4) = a7ec1bd0d876657d4b5e597b9aa1e97c2d2801e3
 SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92
-SHA1 (patch-ext_opcache_config.m4) = 48e67c8b98be787c00b7ce20ee8dc231dffb36e1
 SHA1 (patch-ext_pcre_pcrelib_config.h) = 0cb05c3b3bfafd8119cf43162c0f4db7f5b37ba8
 SHA1 (patch-ext_pdo__mysql_config.m4) = b1ef91be5a729040197e9af50da0f5fd1f6c90a8
 SHA1 (patch-ext_pdo_config.m4) = 522281775cc0e70a135b1f813158988ef1f3e244
@@ -16,7 +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-ext_standard_php__dns.h) = 3687ceac4dff4605263b53acb761b071f7446ccb
 SHA1 (patch-makedist) = 2ac0e0391c031c4fcf4993e2269cde4c6bfddfd5
 SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd
 SHA1 (patch-php.ini-production) = ae61dffedf574b688fe576b0b2af748b7a28cd89
diff --git a/lang/php70/patches/patch-configure b/lang/php70/patches/patch-configure
index 40d3bfd53ea..b2b7fa03c60 100644
--- a/lang/php70/patches/patch-configure
+++ b/lang/php70/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.2 2016/03/05 05:20:17 taca Exp $
+$NetBSD: patch-configure,v 1.3 2016/05/02 13:09:49 taca Exp $
 
---- configure.orig	2015-12-01 13:36:27.000000000 +0000
+--- configure.orig	2016-04-28 18:12:26.000000000 +0000
 +++ configure
-@@ -6862,27 +6862,6 @@ EOF
+@@ -6930,27 +6930,6 @@ EOF
      ;;
    esac
  
@@ -30,7 +30,7 @@ $NetBSD: patch-configure,v 1.2 2016/03/05 05:20:17 taca Exp $
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  
-@@ -18211,7 +18190,7 @@ fi
+@@ -18408,7 +18387,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -39,7 +39,7 @@ $NetBSD: patch-configure,v 1.2 2016/03/05 05:20:17 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -20373,7 +20352,7 @@ $as_echo "yes" >&6; }
+@@ -20572,7 +20551,7 @@ $as_echo "yes" >&6; }
      PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
  
  
@@ -48,7 +48,7 @@ $NetBSD: patch-configure,v 1.2 2016/03/05 05:20:17 taca Exp $
  
  
    unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-@@ -31526,7 +31505,7 @@ fi
+@@ -31742,7 +31721,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -57,7 +57,7 @@ $NetBSD: patch-configure,v 1.2 2016/03/05 05:20:17 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -42409,7 +42388,7 @@ fi
+@@ -42631,7 +42610,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -66,16 +66,7 @@ $NetBSD: patch-configure,v 1.2 2016/03/05 05:20:17 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -57721,7 +57700,7 @@ rm -f core *.core core.conftest.* gmon.o
- fi
- 
- 
--if test "$flock_type" == "unknown"; then
-+if test "$flock_type" = "unknown"; then
- 	as_fn_error $? "Don't know how to define struct flock on this system, set --enable-opcache=no" "$LINENO" 5
- fi
- 
-@@ -92550,7 +92529,7 @@ fi
+@@ -92806,7 +92785,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -84,7 +75,7 @@ $NetBSD: patch-configure,v 1.2 2016/03/05 05:20:17 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -95978,12 +95957,7 @@ old_CC=$CC
+@@ -96439,12 +96418,7 @@ old_CC=$CC
  if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
    CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
    INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
diff --git a/lang/php70/patches/patch-ext_opcache_config.m4 b/lang/php70/patches/patch-ext_opcache_config.m4
deleted file mode 100644
index 8e4f9463aff..00000000000
--- a/lang/php70/patches/patch-ext_opcache_config.m4
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ext_opcache_config.m4,v 1.3 2016/04/02 13:02:36 taca Exp $
-
-* Fix using of "==" for test(1).
-
---- ext/opcache/config.m4.orig	2016-03-29 14:44:24.000000000 +0000
-+++ ext/opcache/config.m4
-@@ -376,7 +376,7 @@ AC_TRY_RUN([
-     AC_MSG_RESULT("yes")
- ], AC_MSG_RESULT("no") )
- 
--if test "$flock_type" == "unknown"; then
-+if test "$flock_type" = "unknown"; then
- 	AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no])
- fi
- 
diff --git a/lang/php70/patches/patch-ext_standard_php__dns.h b/lang/php70/patches/patch-ext_standard_php__dns.h
index 2869d53d473..bcf50b2481c 100644
--- a/lang/php70/patches/patch-ext_standard_php__dns.h
+++ b/lang/php70/patches/patch-ext_standard_php__dns.h
@@ -1,15 +1,23 @@
-$NetBSD: patch-ext_standard_php__dns.h,v 1.1 2016/04/02 09:02:11 taca Exp $
+$NetBSD: patch-ext_standard_php__dns.h,v 1.2 2016/05/02 13:09:49 taca Exp $
 
 Fix memory leak.
 
---- ext/standard/php_dns.h.orig	2016-03-29 14:44:22.000000000 +0000
+--- ext/standard/php_dns.h.orig	2016-04-28 18:13:00.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) \