Pullup ticket #4774 - requested by taca

lang/php56: security update

Revisions pulled up:
- lang/php/phpversion.mk                                        1.105
- lang/php56/Makefile                                           1.7
- lang/php56/distinfo                                           1.13
- lang/php56/patches/patch-ext_spl_spl__heap.c                  deleted

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sat Jul 11 00:31:01 UTC 2015

   Modified Files:
   	pkgsrc/lang/php: phpversion.mk
   	pkgsrc/lang/php56: Makefile distinfo
   Removed Files:
   	pkgsrc/lang/php56/patches: patch-ext_spl_spl__heap.c

   Log Message:
   Update php56 to 5.6.11.

   10 Jul 2015, PHP 5.6.11

   - Core:
     . Fixed bug #69768 (escapeshell*() doesn't cater to !). (cmb)
     . Fixed bug #69703 (Use __builtin_clzl on PowerPC).
       (dja at axtens dot net, Kalle)
     . Fixed bug #69732 (can induce segmentation fault with basic php code).
       (Dmitry)
     . Fixed bug #69642 (Windows 10 reported as Windows 8).
       (Christian Wenz, Anatol Belski)
     . Fixed bug #69551 (parse_ini_file() and parse_ini_string() segmentation
       fault). (Christoph M. Becker)
     . Fixed bug #69781 (phpinfo() reports Professional Editions of Windows
       7/8/8.1/10 as "Business"). (Christian Wenz)
     . Fixed bug #69740 (finally in generator (yield) swallows exception in
       iteration). (Nikita)
     . Fixed bug #69835 (phpinfo() does not report many Windows SKUs).
       (Christian Wenz)
     . Fixed bug #69892 (Different arrays compare indentical due to integer key
       truncation). (Nikita)
     . Fixed bug #69874 (Can't set empty additional_headers for mail()), regression
       from fix to bug #68776. (Yasuo)

   - GD:
     . Fixed bug #61221 (imagegammacorrect function loses alpha channel). (cmb)

   - GMP:
     . Fixed bug #69803 (gmp_random_range() modifies second parameter if GMP
       number). (Nikita)

   - PCRE:
     . Fixed Bug #53823 (preg_replace: * qualifier on unicode replace garbles the
       string). (cmb)
     . Fixed bug #69864 (Segfault in preg_replace_callback) (cmb, ab)

   - PDO_pgsql:
     . Fixed bug #69752 (PDOStatement::execute() leaks memory with DML
       Statements when closeCuror() is u). (Philip Hofstetter)
     . Fixed bug #69362 (PDO-pgsql fails to connect if password contains a
       leading single quote). (Matteo)
     . Fixed bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps).
       (Matteo)

   - SimpleXML:
     . Refactored the fix for bug #66084 (simplexml_load_string() mangles empty
       node name). (Christoph Michael Becker)

   - SPL:
     . Fixed bug #69737 (Segfault when SplMinHeap::compare produces fatal error).
       (Stas)
     . Fixed bug #67805 (SplFileObject setMaxLineLength). (Willian Gustavo Veiga).
     . Fixed bug #69970 (Use-after-free vulnerability in
       spl_recursive_it_move_forward_ex()). (Laruence)

   - Sqlite3:
     . Fixed bug #69972 (Use-after-free vulnerability in
       sqlite3SafetyCheckSickOrOk()). (Laruence)

4 files changed, 7 insertions, 27 deletions

diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk
index 6887e0666fa..012ff892890 100644
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.102.2.2 2015/07/14 22:11:16 tron Exp $
+# $NetBSD: phpversion.mk,v 1.102.2.3 2015/07/14 22:14:30 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.43
 PHP55_VERSION=	5.5.27
-PHP56_VERSION=	5.6.10
+PHP56_VERSION=	5.6.11
 
 # Define initial release of major version.
 PHP54_RELDATE=	20120301
diff --git a/lang/php56/Makefile b/lang/php56/Makefile
index 5536179af95..f704b8a0e70 100644
--- a/lang/php56/Makefile
+++ b/lang/php56/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2015/06/28 15:35:33 taca Exp $
+# $NetBSD: Makefile,v 1.6.2.1 2015/07/14 22:14:30 tron 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/php56/distinfo b/lang/php56/distinfo
index 82f8c702a66..ba942d50308 100644
--- a/lang/php56/distinfo
+++ b/lang/php56/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2015/06/28 15:35:33 taca Exp $
+$NetBSD: distinfo,v 1.12.2.1 2015/07/14 22:14:30 tron Exp $
 
-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 (php-5.6.11.tar.bz2) = 513bbde88a8b8270b2bff357d41c4f1c42e51fcd
+RMD160 (php-5.6.11.tar.bz2) = fb07baeead5c5eb477fc8d06960e669aff47968e
+Size (php-5.6.11.tar.bz2) = 14081292 bytes
 SHA1 (patch-acinclude.m4) = b38fc34c3a3847dc317e8e286612b21ec8fd5ce8
 SHA1 (patch-aclocal.m4) = 49117c42e03bd3ed57d967d33ba543f936013b4f
 SHA1 (patch-build_libtool.m4) = f459cda09cbdad9780568d271091fb17bbc5d965
@@ -15,7 +15,6 @@ SHA1 (patch-ext_pdo__mysql_config.m4) = 9d25c673fc151e1b8ae137f2a0fc540189ef5398
 SHA1 (patch-ext_pdo_config.m4) = f6deef3ac631769baa587dd7c27e55bd2e9ca6a5
 SHA1 (patch-ext_phar_Makefile.frag) = 1564c188e57d48f83de7c2420fdde183598539e2
 SHA1 (patch-ext_phar_phar_phar.php) = 5a82d55c7965027115065412f9b68defb278db64
-SHA1 (patch-ext_spl_spl__heap.c) = 0380d44f56efc2992eb64bd9446a75ec46a61a42
 SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 85cd8f3e115705aa2eeab0e7229f24422e322a7f
 SHA1 (patch-ext_standard_basic__functions.c) = 669fe55c975bf2d971f6fdcb5b3004f7e20304d2
 SHA1 (patch-makedist) = 8e8660b2e0a34f06f433e24dbb0a9c872963e419
diff --git a/lang/php56/patches/patch-ext_spl_spl__heap.c b/lang/php56/patches/patch-ext_spl_spl__heap.c
deleted file mode 100644
index e81eaea870f..00000000000
--- a/lang/php56/patches/patch-ext_spl_spl__heap.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ext_spl_spl__heap.c,v 1.1 2015/06/28 15:35:33 taca Exp $
-
-Fix Bug #69737 	Segfault when SplMinHeap::compare produces fatal error.
-
---- ext/spl/spl_heap.c.orig	2015-06-10 07:42:27.000000000 +0000
-+++ ext/spl/spl_heap.c
-@@ -249,9 +249,10 @@ static void spl_ptr_heap_insert(spl_ptr_
- 	heap->ctor(elem TSRMLS_CC);
- 
- 	/* sifting up */
--	for(i = heap->count++; i > 0 && heap->cmp(heap->elements[(i-1)/2], elem, cmp_userdata TSRMLS_CC) < 0; i = (i-1)/2) {
-+	for(i = heap->count; i > 0 && heap->cmp(heap->elements[(i-1)/2], elem, cmp_userdata TSRMLS_CC) < 0; i = (i-1)/2) {
- 		heap->elements[i] = heap->elements[(i-1)/2];
- 	}
-+	heap->count++;
- 
- 	if (EG(exception)) {
- 		/* exception thrown during comparison */