Pullup ticket #5051 - requested by taca

lang/php56: security fix

Revisions pulled up:
- lang/php/phpversion.mk                                        1.140
- lang/php56/Makefile                                           1.12
- lang/php56/distinfo                                           1.28

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Jun 24 15:25:21 UTC 2016

   Modified Files:
   	pkgsrc/lang/php: phpversion.mk
   	pkgsrc/lang/php56: Makefile distinfo

   Log Message:
   Update php56 to 5.6.23 (PHP 5.6.23), including security fixes.

   pkgsrc change: remove confiugre from SUBST_FILES.path.

   23 Jun 2016, PHP 5.6.23

   - Core:
     . Fixed bug #72275 (Integer Overflow in json_encode()/json_decode()/
       json_utf8_to_utf16()). (Stas)
     . Fixed bug #72400 (Integer Overflow in addcslashes/addslashes). (Stas)
     . Fixed bug #72403 (Integer Overflow in Length of String-typed ZVAL). (Stas)

   - GD:
     . Fixed bug #72298 (pass2_no_dither out-of-bounds access). (Stas)
     . Fixed bug #72337 (invalid dimensions can lead to crash) (Pierre)
     . Fixed bug #72339 (Integer Overflow in _gd2GetHeader() resulting in
       heap overflow). (Pierre)
     . Fixed bug #72407 (NULL Pointer Dereference at _gdScaleVert). (Stas)
     . Fixed bug #72446 (Integer Overflow in gdImagePaletteToTrueColor() resulting
       in heap overflow). (Pierre)

   - Intl:
     . Fixed bug #70484 (selectordinal doesn't work with named parameters).
       (Anatol)

   - mbstring:
      . Fixed bug #72402 (_php_mb_regex_ereg_replace_exec - double free). (Stas)

   - mcrypt:
      . Fixed bug #72455 (Heap Overflow due to integer overflows). (Stas)

   - Phar:
     . Fixed bug #72321 (invalid free in phar_extract_file()).
       (hji at dyntopia dot com)

   - SPL:
     . Fixed bug #72262 (int/size_t confusion in SplFileObject::fread). (Stas)
     . Fixed bug #72433 (Use After Free Vulnerability in PHP's GC algorithm and
       unserialize). (Dmitry)

   - OpenSSL:
     . Fixed bug #72140 (segfault after calling ERR_free_strings()).
       (Jakub Zelenka)

   - WDDX:
     . Fixed bug #72340 (Double Free Courruption in wddx_deserialize). (Stas)

   - zip:
     . Fixed bug #72434 (ZipArchive class Use After Free Vulnerability in PHP's GC
       algorithm and unserialize). (Dmitry)

3 files changed, 9 insertions, 9 deletions

diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk
index 35eab862faa..0ed34887778 100644
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.131.2.7 2016/06/28 19:35:57 bsiegert Exp $
+# $NetBSD: phpversion.mk,v 1.131.2.8 2016/06/28 19:37:34 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
@@ -82,7 +82,7 @@ PHPVERSION_MK=	defined
 
 # Define each PHP's version.
 PHP55_VERSION=	5.5.37
-PHP56_VERSION=	5.6.22
+PHP56_VERSION=	5.6.23
 PHP70_VERSION=	7.0.7
 
 # Define initial release of major version.
diff --git a/lang/php56/Makefile b/lang/php56/Makefile
index f27b99109d3..367983c2dd8 100644
--- a/lang/php56/Makefile
+++ b/lang/php56/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/04/02 09:00:25 taca Exp $
+# $NetBSD: Makefile,v 1.11.2.1 2016/06/28 19:37:34 bsiegert Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -33,7 +33,7 @@ PLIST_SUBST+=		PHPEXTDIR="${PHP_EXTENSION_DIR}"
 SUBST_CLASSES+=		path
 SUBST_MESSAGE.path=	Fixing common paths.
 SUBST_STAGE.path=	pre-configure
-SUBST_FILES.path=	configure ext/phar/phar/phar.php
+SUBST_FILES.path=	ext/phar/phar/phar.php
 SUBST_FILES.path+=	php.ini-development php.ini-production run-tests.php
 SUBST_FILES.path+=	sapi/cgi/Makefile.frag
 SUBST_SED.path=		-e 's,@CGIDIR@,${CGIDIR},g'
diff --git a/lang/php56/distinfo b/lang/php56/distinfo
index e39921027ff..51fb413ec65 100644
--- a/lang/php56/distinfo
+++ b/lang/php56/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.25.2.2 2016/06/04 19:50:02 bsiegert Exp $
+$NetBSD: distinfo,v 1.25.2.3 2016/06/28 19:37:34 bsiegert Exp $
 
-SHA1 (php-5.6.22.tar.bz2) = c51c80e56659467c2bcee4a6a2ad217760dda177
-RMD160 (php-5.6.22.tar.bz2) = 0862fb4703c73e82c5c8e13538994756fd8a5cce
-SHA512 (php-5.6.22.tar.bz2) = 9d21104832a1053a350ff31196e2c41cef713a9dfe207491236219954cf2eea216049b2f40313fb2a8e9ef641aad0af3f69456bbcebdf8fee312b0dd4a7df320
-Size (php-5.6.22.tar.bz2) = 14170522 bytes
+SHA1 (php-5.6.23.tar.bz2) = 27a5b59f28e92cf8b7961ac400d1fa7e3e7e191c
+RMD160 (php-5.6.23.tar.bz2) = 9907d4f13917c3aa1e015baf299ddb8220ec92f0
+SHA512 (php-5.6.23.tar.bz2) = 92be3685926f302223465e9673496971f0ee1b05c7b3a09682d4ef93a27b4c17e5c53c36acab15d26f38508f6d65bebe11a6f0f0fc98b27eafe95b02b4d9897d
+Size (php-5.6.23.tar.bz2) = 14178077 bytes
 SHA1 (patch-acinclude.m4) = b38fc34c3a3847dc317e8e286612b21ec8fd5ce8
 SHA1 (patch-configure) = 5d76f71aa903efa3c3491b908ff76419aa4af27c
 SHA1 (patch-ext_gd_config.m4) = 4b44853250eb4a638af4c663e618307ff25d2cbd