Update php70 to 7.0.18.

13 Apr 2017 PHP 7.0.18

- Core:
  . Fixed bug #73370 (falsely exits with "Out of Memory" when using
    USE_ZEND_ALLOC=0). (Nikita)
  . Fixed bug #73960 (Leak with instance method calling static method with
    referenced return). (Nikita)
  . Fixed bug #74265 (Build problems after 7.0.17 release: undefined reference
    to `isfinite'). (Nikita)
  . Fixed bug #74302 (yield fromLABEL is over-greedy). (Sara)

- Apache:
  . Reverted patch for bug #61471, fixes bug #74318. (Anatol)

- Date:
  . Fixed bug #72096 (Swatch time value incorrect for dates before 1970). (mcq8)

- DOM:
  . Fixed bug #74004 (LIBXML_NOWARNING flag ingnored on loadHTML*).
    (somedaysummer)

- iconv:
  . Fixed bug #74230 (iconv fails to fail on surrogates). (Anatol)

- OpenSSL:
  . Fixed bug #72333 (fwrite() on non-blocking SSL sockets doesn't work).
    (Jakub Zelenka)

- PDO MySQL:
  . Fixed bug #71003 (Expose MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT to PDO
    interface). (Thomas Orozco)

- Streams:
  . Fixed bug #74216 (Correctly fail on invalid IP address ports). (Sara)

- Zlib:
  . Fixed bug #74240 (deflate_add can allocate too much memory). (Matt Bonneau)

4 files changed, 8 insertions, 42 deletions

diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk
index 8092cc2e65d..ed16b4cfd30 100644
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.175 2017/03/17 15:35:13 taca Exp $
+# $NetBSD: phpversion.mk,v 1.176 2017/04/13 14:19:19 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
@@ -88,7 +88,7 @@ PHPVERSION_MK=	defined
 
 # Define each PHP's version.
 PHP56_VERSION=	5.6.30
-PHP70_VERSION=	7.0.17
+PHP70_VERSION=	7.0.18
 PHP71_VERSION=	7.1.3
 
 # Define initial release of major version.
diff --git a/lang/php70/Makefile b/lang/php70/Makefile
index 487f8320d9b..3e0042f7835 100644
--- a/lang/php70/Makefile
+++ b/lang/php70/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2017/04/05 12:28:59 fhajny Exp $
+# $NetBSD: Makefile,v 1.7 2017/04/13 14:19:19 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 c3ea7d81731..acab41ced8b 100644
--- a/lang/php70/distinfo
+++ b/lang/php70/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.31 2017/04/05 12:28:59 fhajny Exp $
+$NetBSD: distinfo,v 1.32 2017/04/13 14:19:19 taca Exp $
 
-SHA1 (php-7.0.17.tar.bz2) = 6c20436c50fdf342891f836f2864a43fdbe0bf71
-RMD160 (php-7.0.17.tar.bz2) = 2f4dd83e4d4253aaad45fa5f28cd973815382edb
-SHA512 (php-7.0.17.tar.bz2) = a50e53915cb4af59d90cf5a754f74bc307bf0de7904297eb8364d85418399203b6f81ddff23e4c68d36bfe8c4ce8ae1d511ec3cad21872c5113acc0f494b43d7
-Size (php-7.0.17.tar.bz2) = 15326542 bytes
+SHA1 (php-7.0.18.tar.bz2) = b1959c8134f6bb241799d8eb840a2b892108c72a
+RMD160 (php-7.0.18.tar.bz2) = 54e2d897642d51976d24abf7c862b7ec6165fa05
+SHA512 (php-7.0.18.tar.bz2) = eccd9d68578373bb27aeb2d3b6d1a202e428bd622daaa069e1d526a81f2a406bf9d1852d73fbf9dc7a4488f514ab50f4a6c87ee6b4ac172c6f2b7f214b1dea56
+Size (php-7.0.18.tar.bz2) = 15328539 bytes
 SHA1 (patch-acinclude.m4) = 81a8f33a536500978ea5a9aa2d2875c61c843e56
 SHA1 (patch-configure) = a129e19ef87338f6e53ccc967c40ddcde7c7357c
 SHA1 (patch-ext_gd_config.m4) = bde93678626592cdcee619189bfc6532d0913a76
diff --git a/lang/php70/patches/patch-main_php__config.h.in b/lang/php70/patches/patch-main_php__config.h.in
deleted file mode 100644
index 1c3bafb0276..00000000000
--- a/lang/php70/patches/patch-main_php__config.h.in
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-main_php__config.h.in,v 1.1 2017/03/23 09:50:36 jperkin Exp $
-
-Fix tests for defines which are 0/1 not defined/undefined.
-
---- main/php_config.h.in.orig	2017-03-14 11:26:16.000000000 +0000
-+++ main/php_config.h.in
-@@ -2530,7 +2530,7 @@ int zend_sprintf(char *buffer, const cha
- #endif
- 
- #ifndef zend_isnan
--#ifdef HAVE_DECL_ISNAN
-+#if HAVE_DECL_ISNAN == 1
- #define zend_isnan(a) isnan(a)
- #elif defined(HAVE_FPCLASS)
- #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
-@@ -2539,7 +2539,7 @@ int zend_sprintf(char *buffer, const cha
- #endif
- #endif
- 
--#ifdef HAVE_DECL_ISINF
-+#if HAVE_DECL_ISINF == 1
- #define zend_isinf(a) isinf(a)
- #elif defined(INFINITY)
- /* Might not work, but is required by ISO C99 */
-@@ -2550,7 +2550,7 @@ int zend_sprintf(char *buffer, const cha
- #define zend_isinf(a) 0
- #endif
- 
--#if defined(HAVE_DECL_ISFINITE)
-+#if HAVE_DECL_ISFINITE == 1
- #define zend_finite(a) isfinite(a)
- #elif defined(HAVE_FINITE)
- #define zend_finite(a) finite(a)