Pullup ticket #4946 - requested by taca

lang/php70: security fix

Revisions pulled up:
- lang/php/phpversion.mk                                        1.128
- lang/php70/distinfo                                           1.6
- lang/php70/patches/patch-configure                            1.2
- lang/php70/patches/patch-ext_opcache_config.m4                deleted

---
   Module Name:    pkgsrc
   Committed By:   taca
   Date:           Sat Mar  5 05:20:17 UTC 2016

   Modified Files:
           pkgsrc/lang/php: phpversion.mk
           pkgsrc/lang/php70: distinfo
           pkgsrc/lang/php70/patches: patch-configure
   Removed Files:
           pkgsrc/lang/php70/patches: patch-ext_opcache_config.m4

   Log Message:
   Update php70 to 7.0.4 (PHP 7.0.4), including security fxies.

   03 Mar 2016 PHP 7.0.4

   - Core:
     . Fixed bug (Low probability segfault in zend_arena). (Laruence)
     . Fixed bug #71441 (Typehinted Generator with return in try/finally crashes).
       (Bob)
     . Fixed bug #71442 (forward_static_call crash). (Laruence)
     . Fixed bug #71443 (Segfault using built-in webserver with intl using
       symfony). (Laruence)
     . Fixed bug #71449 (An integer overflow bug in php_implode()). (Stas)
     . Fixed bug #71450 (An integer overflow bug in php_str_to_str_ex()). (Stas)
     . Fixed bug #71474 (Crash because of VM stack corruption on Magento2).
       (Dmitry)
     . Fixed bug #71485 (Return typehint on internal func causes Fatal error
       when it throws exception). (Laruence)
     . Fixed bug #71529 (Variable references on array elements don't work when
       using count). (Nikita)
     . Fixed bug #71601 (finally block not executed after yield from). (Bob)
     . Fixed bug #71637 (Multiple Heap Overflow due to integer overflows in
       xml/filter_url/addcslashes). (Stas)

   - CLI server:
     . Fixed bug #71559 (Built-in HTTP server, we can download file in web by bug).
       (Johannes, Anatol)

   - CURL:
     . Fixed bug #71523 (Copied handle with new option CURLOPT_HTTPHEADER crashes
       while curl_multi_exec). (Laruence)
     . Fixed memory leak in curl_getinfo(). (Leigh)

   - Date:
     . Fixed bug #71525 (Calls to date_modify will mutate timelib_rel_time,
       causing date_date_set issues). (Sean DuBois)

   - Fileinfo:
     . Fixed bug #71434 (finfo throws notice for specific python file). (Laruence)

   - FPM:
     . Fixed bug #62172 (FPM not working with Apache httpd 2.4 balancer/fcgi
       setup). (Matt Haught, Remi)
     . Fixed bug #71269 (php-fpm dumped core). (Mickaël)

   - Opcache:
     . Fixed bug #71584 (Possible use-after-free of ZCG(cwd) in Zend Opcache).
       (Yussuf Khalil)

   - PCRE:
     . Fixed bug #71537 (PCRE segfault from Opcache). (Laruence)

   - phpdbg:
     . Fixed inherited functions from unspecified files being included in
       phpdbg_get_executable(). (Bob)

   - SOAP:
     . Fixed bug #71610 (Type Confusion Vulnerability - SOAP /
       make_http_soap_request()). (Stas)

   - Standard:
     . Fixed bug #71603 (compact() maintains references in php7). (Laruence)
     . Fixed bug #70720 (strip_tags improper php code parsing). (Julien)

   - XMLRPC:
     . Fixed bug #71501 (xmlrpc_encode_request ignores encoding option). (Hieu Le)

   - Zip:
     . Fixed bug #71561 (NULL pointer dereference in Zip::ExtractTo). (Laruence)

4 files changed, 9 insertions, 62 deletions

diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk
index 2cb5cb98fef..5cc11b7f9e3 100644
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.119.2.8 2016/03/08 15:37:56 bsiegert Exp $
+# $NetBSD: phpversion.mk,v 1.119.2.9 2016/03/09 20:03:23 bsiegert 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.33
 PHP56_VERSION=	5.6.19
-PHP70_VERSION=	7.0.3
+PHP70_VERSION=	7.0.4
 
 # Define initial release of major version.
 PHP55_RELDATE=	20130620
diff --git a/lang/php70/distinfo b/lang/php70/distinfo
index cfe40c9ba57..b425ee776dd 100644
--- a/lang/php70/distinfo
+++ b/lang/php70/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.2.2.2 2016/02/10 20:45:48 bsiegert Exp $
+$NetBSD: distinfo,v 1.2.2.3 2016/03/09 20:03:23 bsiegert Exp $
 
-SHA1 (php-7.0.3.tar.bz2) = 60127213896626ba218eb3425271918080f25054
-RMD160 (php-7.0.3.tar.bz2) = 5faa785d77bee469cdbbb313e63c991b7c162c46
-SHA512 (php-7.0.3.tar.bz2) = 3a7aa542f53a38499eb126c3d489bed057a5a9b8e4a8fb45a55b1080fc573646615699bd94b03c882e58554b23ac5d6e3aaf54d0b502b9d110e91e69339bd7a0
-Size (php-7.0.3.tar.bz2) = 14011153 bytes
+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 (patch-acinclude.m4) = b682280fd89950c082c2226bdb7364b0dc475bad
-SHA1 (patch-configure) = 2ef84d463f4eeb35ecc3df82c1aaca8e74f3a276
+SHA1 (patch-configure) = 9097646e71cbfa21322ca2f01c8c256822b056ea
 SHA1 (patch-ext_gd_config.m4) = a7ec1bd0d876657d4b5e597b9aa1e97c2d2801e3
 SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92
-SHA1 (patch-ext_opcache_config.m4) = d0dc7dbf2e5fe498cbf03c4514e4efdb6c6d2c4a
 SHA1 (patch-ext_pcre_pcrelib_config.h) = 0cb05c3b3bfafd8119cf43162c0f4db7f5b37ba8
 SHA1 (patch-ext_pdo__mysql_config.m4) = b1ef91be5a729040197e9af50da0f5fd1f6c90a8
 SHA1 (patch-ext_pdo_config.m4) = 522281775cc0e70a135b1f813158988ef1f3e244
diff --git a/lang/php70/patches/patch-configure b/lang/php70/patches/patch-configure
index 3b66f0ddce4..fed6da2f651 100644
--- a/lang/php70/patches/patch-configure
+++ b/lang/php70/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.1 2015/12/06 15:17:31 taca Exp $
+$NetBSD: patch-configure,v 1.1.2.1 2016/03/09 20:03:23 bsiegert Exp $
 
 --- configure.orig	2015-12-01 13:36:27.000000000 +0000
 +++ configure
@@ -30,15 +30,6 @@ $NetBSD: patch-configure,v 1.1 2015/12/06 15:17:31 taca Exp $
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  
-@@ -9468,7 +9447,7 @@ $as_echo "$ext_output" >&6; }
- 
- 
- 
--if test "$BUILD_PHPDBG" == "" && test "$PHP_PHPDBG" != "no"; then
-+if test "$BUILD_PHPDBG" = "" && test "$PHP_PHPDBG" != "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether termios.h defines TIOCGWINSZ" >&5
- $as_echo_n "checking whether termios.h defines TIOCGWINSZ... " >&6; }
- if ${ac_cv_sys_tiocgwinsz_in_termios_h+:} false; then :
 @@ -18211,7 +18190,7 @@ fi
      if test "$found_openssl" = "no"; then
  
@@ -75,22 +66,6 @@ $NetBSD: patch-configure,v 1.1 2015/12/06 15:17:31 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -57215,13 +57194,13 @@ $as_echo "$ext_output" >&6; }
- 
- if test "$PHP_OPCACHE" != "no"; then
- 
--  if test "$PHP_OPCACHE_FILE" == "yes"; then
-+  if test "$PHP_OPCACHE_FILE" = "yes"; then
- 
- $as_echo "#define HAVE_OPCACHE_FILE_CACHE 1" >>confdefs.h
- 
-   fi
- 
--  if test "$PHP_HUGE_CODE_PAGES" == "yes"; then
-+  if test "$PHP_HUGE_CODE_PAGES" = "yes"; then
- 
- $as_echo "#define HAVE_HUGE_CODE_PAGES 1" >>confdefs.h
- 
 @@ -57721,7 +57700,7 @@ rm -f core *.core core.conftest.* gmon.o
  fi
  
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 52f09e9d341..00000000000
--- a/lang/php70/patches/patch-ext_opcache_config.m4
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ext_opcache_config.m4,v 1.1 2015/12/06 15:17:31 taca Exp $
-
---- ext/opcache/config.m4.orig	2015-12-01 13:36:41.000000000 +0000
-+++ ext/opcache/config.m4
-@@ -14,11 +14,11 @@ PHP_ARG_ENABLE(huge-code-pages, whether 
- 
- if test "$PHP_OPCACHE" != "no"; then
- 
--  if test "$PHP_OPCACHE_FILE" == "yes"; then
-+  if test "$PHP_OPCACHE_FILE" = "yes"; then
-     AC_DEFINE(HAVE_OPCACHE_FILE_CACHE, 1, [Define to enable file based caching (experimental)])
-   fi
- 
--  if test "$PHP_HUGE_CODE_PAGES" == "yes"; then
-+  if test "$PHP_HUGE_CODE_PAGES" = "yes"; then
-     AC_DEFINE(HAVE_HUGE_CODE_PAGES, 1, [Define to enable copying PHP CODE pages into HUGE PAGES (experimental)])
-   fi
- 
-@@ -374,7 +374,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
-