Pullup ticket #4749 - requested by taca

lang/php56: security update

Revisions pulled up:
- lang/php/phpversion.mk                                        1.101
- lang/php56/distinfo                                           1.11
- lang/php56/patches/patch-ext_phar_Makefile.frag               1.3

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Jun 12 00:47:03 UTC 2015

   Modified Files:
   	pkgsrc/lang/php: phpversion.mk
   	pkgsrc/lang/php56: distinfo
   	pkgsrc/lang/php56/patches: patch-ext_phar_Makefile.frag

   Log Message:
   Update php56 to 5.6.10.

   11 Jun 2015, PHP 5.6.10

   - Core:
     . Fixed bug #66048 (temp. directory is cached during multiple requests).
       (Julien)
     . Fixed bug #69566 (Conditional jump or move depends on uninitialised value
       in extension trait). (jbboehr at gmail dot com)
     . Fixed bug #69599 (Strange generator+exception+variadic crash). (Nikita)
     . Fixed bug #69628 (complex GLOB_BRACE fails on Windows).
       (Christoph M. Becker)
     . Fixed POST data processing slowdown due to small input buffer size
       on Windows. (Jorge Oliveira, Anatol)
     . Fixed bug #69646 (OS command injection vulnerability in escapeshellarg).
       (Anatol Belski)
     . Fixed bug #69719 (Incorrect handling of paths with NULs). (Stas)

   - FTP
     . Improved fix for bug #69545 (Integer overflow in ftp_genlist()
       resulting in heap overflow). (Max Spelsberg)

   - GD:
     . Fixed bug #69479 (GD fails to build with newer libvpx). (Remi)

   - Iconv:
     . Fixed bug #48147 (iconv with //IGNORE cuts the string). (Stas)

   - Litespeed SAPI:
     . Fixed bug #68812 (Unchecked return value). (George Wang)

   - Mail:
     . Fixed bug #68776 (mail() does not have mail header injection prevention for
       additional headers). (Yasuo)

   - MCrypt:
     . Added file descriptor caching to mcrypt_create_iv() (Leigh)

   - Opcache
     . Fixed bug #69549 (Memory leak with opcache.optimization_level=0xFFFFFFFF).
       (Laruence, Dmitry)

   - Phar:
     . Fixed bug #69680 (phar symlink in binary directory broken).
       (Matteo Bernardini, Remi)

   - Postgres:
     . Fixed bug #69667 (segfault in php_pgsql_meta_data). (Remi)

   - Sqlite3:
     . Upgrade bundled sqlite to 3.8.10.2. (CVE-2015-3414, CVE-2015-3415,
       CVE-2015-3416) (Kaplan)

3 files changed, 9 insertions, 18 deletions

diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk
index e32ac511ffa..8cf01fb826f 100644
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.93.2.7 2015/06/13 10:46:49 tron Exp $
+# $NetBSD: phpversion.mk,v 1.93.2.8 2015/06/13 11:00:12 tron 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.
 PHP54_VERSION=	5.4.41
 PHP55_VERSION=	5.5.26
-PHP56_VERSION=	5.6.9
+PHP56_VERSION=	5.6.10
 
 # Define initial release of major version.
 PHP54_RELDATE=	20120301
diff --git a/lang/php56/distinfo b/lang/php56/distinfo
index 2e26577961e..b173f00bc7d 100644
--- a/lang/php56/distinfo
+++ b/lang/php56/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8.2.2 2015/05/19 18:01:25 tron Exp $
+$NetBSD: distinfo,v 1.8.2.3 2015/06/13 11:00:12 tron Exp $
 
-SHA1 (php-5.6.9.tar.bz2) = a03f3a168a83a5e6fb983c44933f23fc44323a00
-RMD160 (php-5.6.9.tar.bz2) = b99aefd6118cbfc139b08fd137026edcb49d3e63
-Size (php-5.6.9.tar.bz2) = 14037070 bytes
+SHA1 (php-5.6.10.tar.bz2) = 309255ff5ac3d789f0277354f0686404af646e09
+RMD160 (php-5.6.10.tar.bz2) = c5cad85f011889997b0ba9dd5e5b6f013be0fd65
+Size (php-5.6.10.tar.bz2) = 14080915 bytes
 SHA1 (patch-acinclude.m4) = b38fc34c3a3847dc317e8e286612b21ec8fd5ce8
 SHA1 (patch-aclocal.m4) = 49117c42e03bd3ed57d967d33ba543f936013b4f
 SHA1 (patch-build_libtool.m4) = f459cda09cbdad9780568d271091fb17bbc5d965
@@ -13,7 +13,7 @@ SHA1 (patch-ext_mssql_php__mssql.c) = c4fa9231dc539ffb027f1beb6f182f21ddb94a3c
 SHA1 (patch-ext_opcache_config.m4) = 031db201f68a120615561a5abd3e84aff58b523d
 SHA1 (patch-ext_pdo__mysql_config.m4) = 9d25c673fc151e1b8ae137f2a0fc540189ef5398
 SHA1 (patch-ext_pdo_config.m4) = f6deef3ac631769baa587dd7c27e55bd2e9ca6a5
-SHA1 (patch-ext_phar_Makefile.frag) = 3dc3627a908d129b54cfb745d60e352e0372b271
+SHA1 (patch-ext_phar_Makefile.frag) = 1564c188e57d48f83de7c2420fdde183598539e2
 SHA1 (patch-ext_phar_phar_phar.php) = 5a82d55c7965027115065412f9b68defb278db64
 SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 85cd8f3e115705aa2eeab0e7229f24422e322a7f
 SHA1 (patch-ext_standard_basic__functions.c) = 669fe55c975bf2d971f6fdcb5b3004f7e20304d2
diff --git a/lang/php56/patches/patch-ext_phar_Makefile.frag b/lang/php56/patches/patch-ext_phar_Makefile.frag
index 21a17b7ed9f..da46ef27598 100644
--- a/lang/php56/patches/patch-ext_phar_Makefile.frag
+++ b/lang/php56/patches/patch-ext_phar_Makefile.frag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ext_phar_Makefile.frag,v 1.2 2014/12/19 16:12:48 taca Exp $
+$NetBSD: patch-ext_phar_Makefile.frag,v 1.2.4.1 2015/06/13 11:00:12 tron Exp $
 
---- ext/phar/Makefile.frag.orig	2014-12-17 01:25:00.000000000 +0000
+--- ext/phar/Makefile.frag.orig	2015-06-10 07:42:27.000000000 +0000
 +++ ext/phar/Makefile.frag
 @@ -18,7 +18,7 @@ PHP_PHARCMD_EXECUTABLE = ` \
  	else \
@@ -11,12 +11,3 @@ $NetBSD: patch-ext_phar_Makefile.frag,v 1.2 2014/12/19 16:12:48 taca Exp $
  
  $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
  	-@test -d $(builddir)/phar || mkdir $(builddir)/phar
-@@ -39,7 +39,7 @@ install-pharcmd: pharcmd
- 	-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
- 	$(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)
- 	-@rm -f $(INSTALL_ROOT)$(bindir)/phar
--	$(LN_S) -f $(INSTALL_ROOT)$(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar
-+	$(LN_S) -f phar.phar $(INSTALL_ROOT)$(bindir)/phar
- 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
- 	@$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.1
- 	@$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.phar.1