Update php55 to 5.5.15.

24 Jul 2014, PHP 5.5.15

- Core:
  . Fixed bug #67428 (header('Location: foo') will override a 308-399 response
    code). (Adam)
  . Fixed bug #67436 (Autoloader isn't called if two method definitions don't
    match). (Bob)
  . Fixed bug #67091 (make install fails to install libphp5.so on FreeBSD 10.0).
    (Ferenc)
  . Fixed bug #67497 (eval with parse error causes segmentation fault in
    generator). (Nikita)
  . Fixed bug #67151 (strtr with empty array crashes). (Nikita)
  . Fixed bug #67407 (Windows 8.1/Server 2012 R2 reported as Windows 8/Server
    2012). (Christian Wenz)

- CLI server:
  . Implemented FR #67429 (CLI server is missing some new HTTP response codes).
    (Adam)
  . Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
    (Adam)

- FPM:
  . Fixed bug #67530 (error_log=syslog ignored). (Remi)
  . Fixed bug #67531 (syslog cannot be set in pool configuration). (Remi)

- Intl:
  . Fixed bug #66921 (Wrong argument type hint for function
    intltz_from_date_time_zone). (Stas)
  . Fixed bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting).
    (Stas)

- OPCache:
  . Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault
    happen) (Dmitry, Laruence)

- pgsql:
  . Fixed bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756),
    which affected builds against libpq < 7.3. (Adam)

- Phar:
  . Fixed bug #67587 (Redirection loop on nginx with FPM). (Christian Weiske)

- SPL:
  . Fixed bug #67539 (ArrayIterator use-after-free due to object change during
    sorting). (research at insighti dot org, Laruence)
  . Fixed bug #67538 (SPL Iterators use-after-free). (CVE-2014-4670) (Laruence)

- Streams:
  . Fixed bug #67430 (http:// wrapper doesn't follow 308 redirects). (Adam)

7 files changed, 21 insertions, 132 deletions

diff --git a/lang/php55/Makefile b/lang/php55/Makefile
index 77718501b91..dc3b5b0c1e0 100644
--- a/lang/php55/Makefile
+++ b/lang/php55/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2014/07/13 15:23:42 taca Exp $
+# $NetBSD: Makefile,v 1.16 2014/07/26 00:11:55 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=		php-${PHP_BASE_VERS}
-PKGREVISION=		1
 CATEGORIES=		lang
 
 HOMEPAGE=		http://www.php.net/
diff --git a/lang/php55/distinfo b/lang/php55/distinfo
index 9f83e7e5cd9..9bf1af59a83 100644
--- a/lang/php55/distinfo
+++ b/lang/php55/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.26 2014/07/13 15:23:42 taca Exp $
+$NetBSD: distinfo,v 1.27 2014/07/26 00:11:55 taca Exp $
 
-SHA1 (php-5.5.14.tar.bz2) = 062d351da165aa0568e4d8cbc53a18d73b99f49a
-RMD160 (php-5.5.14.tar.bz2) = d3f87693d3118cfdc64a7b77e9b765ce4eb7ae60
-Size (php-5.5.14.tar.bz2) = 13282773 bytes
+SHA1 (php-5.5.15.tar.bz2) = 7e487b27342994e405180dd11a01921b7f34161f
+RMD160 (php-5.5.15.tar.bz2) = 16871d2a9afb0c23e313d6759cfed3dceef4d30b
+Size (php-5.5.15.tar.bz2) = 13244903 bytes
 SHA1 (patch-acinclude.m4) = 9e9c433e4cb96e469f7cf14b2064a0f41fc4568a
-SHA1 (patch-aclocal.m4) = 14ae2898e1d68b552e76a7e4ee7006f1aee1f932
-SHA1 (patch-build_libtool.m4) = 6ee935c55cc01704c6e9edb4e383b2ddb7c746e7
-SHA1 (patch-configure) = efbdae6f90fbf5ccfde3735997e66e79a119439b
+SHA1 (patch-aclocal.m4) = 46f192351e541453b1e32299acd1b4cfefc93cb2
+SHA1 (patch-build_libtool.m4) = 3811edd697fd21eadc4f65cba35c6297141e8ff2
+SHA1 (patch-configure) = e81731b426b31656de72a4e4b3ad341b5ac34f82
 SHA1 (patch-ext_gd_config.m4) = 91c9798333d4776856a0a9e20196986856b758b2
 SHA1 (patch-ext_gd_libgd_gdxpm.c) = 9a175417fad9ac23037a24122f8d1258b9eebbcb
 SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc
@@ -16,8 +16,6 @@ SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390
 SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59
 SHA1 (patch-ext_phar_Makefile.frag) = 1af23d9135557bc7ba2f3627b317d4cbef37aaba
 SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c
-SHA1 (patch-ext_spl_spl__array.c) = de3ac1ade2201fedb41fb23efb03887307de45bc
-SHA1 (patch-ext_spl_spl__dllist.c) = f98d5dc1199eb021e776599761e0823ce8463f2e
 SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = b384b9daa466f2a8a3e6cfd4ea6cff81f9342941
 SHA1 (patch-ext_standard_basic__functions.c) = f2a44998145306c2cb2d2f3822c0e7cc70c778b4
 SHA1 (patch-makedist) = 3f6b0621d30264824f2cb4c2903d15ba95be3937
diff --git a/lang/php55/patches/patch-aclocal.m4 b/lang/php55/patches/patch-aclocal.m4
index 90178766cd1..7546bbb8729 100644
--- a/lang/php55/patches/patch-aclocal.m4
+++ b/lang/php55/patches/patch-aclocal.m4
@@ -1,17 +1,8 @@
-$NetBSD: patch-aclocal.m4,v 1.1 2014/03/19 21:56:31 asau Exp $
+$NetBSD: patch-aclocal.m4,v 1.2 2014/07/26 00:11:55 taca Exp $
 
---- aclocal.m4.orig	2014-03-05 10:52:28.000000000 +0000
+--- aclocal.m4.orig	2014-07-23 09:08:13.000000000 +0000
 +++ aclocal.m4
-@@ -4546,7 +4546,7 @@ dgux*)
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
--freebsd1*)
-+freebsd1|freebsd1.*)
-   dynamic_linker=no
-   ;;
- 
-@@ -4557,7 +4557,7 @@ freebsd* | dragonfly*)
+@@ -4553,7 +4553,7 @@ freebsd* | dragonfly*)
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -20,7 +11,7 @@ $NetBSD: patch-aclocal.m4,v 1.1 2014/03/19 21:56:31 asau Exp $
      *) objformat=elf ;;
      esac
    fi
-@@ -6174,7 +6174,7 @@ case $host_os in
+@@ -6170,7 +6170,7 @@ case $host_os in
  	;;
      esac
      ;;
@@ -29,12 +20,3 @@ $NetBSD: patch-aclocal.m4,v 1.1 2014/03/19 21:56:31 asau Exp $
      # C++ shared libraries reported to be fairly broken before switch to ELF
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
      ;;
-@@ -8857,7 +8857,7 @@ _LT_EOF
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-       ;;
- 
--    freebsd1*)
-+    freebsd1|freebsd1.*)
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
- 
diff --git a/lang/php55/patches/patch-build_libtool.m4 b/lang/php55/patches/patch-build_libtool.m4
index 6a328bba7d1..fc81fd48b18 100644
--- a/lang/php55/patches/patch-build_libtool.m4
+++ b/lang/php55/patches/patch-build_libtool.m4
@@ -1,17 +1,8 @@
-$NetBSD: patch-build_libtool.m4,v 1.1 2014/03/19 21:56:31 asau Exp $
+$NetBSD: patch-build_libtool.m4,v 1.2 2014/07/26 00:11:55 taca Exp $
 
---- build/libtool.m4.orig	2014-03-05 10:18:00.000000000 +0000
+--- build/libtool.m4.orig	2014-07-23 09:00:58.000000000 +0000
 +++ build/libtool.m4
-@@ -1532,7 +1532,7 @@ dgux*)
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
--freebsd1*)
-+freebsd1|freebsd1.*)
-   dynamic_linker=no
-   ;;
- 
-@@ -1543,7 +1543,7 @@ freebsd* | dragonfly*)
+@@ -1539,7 +1539,7 @@ freebsd* | dragonfly*)
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -20,7 +11,7 @@ $NetBSD: patch-build_libtool.m4,v 1.1 2014/03/19 21:56:31 asau Exp $
      *) objformat=elf ;;
      esac
    fi
-@@ -3160,7 +3160,7 @@ case $host_os in
+@@ -3156,7 +3156,7 @@ case $host_os in
  	;;
      esac
      ;;
@@ -29,12 +20,3 @@ $NetBSD: patch-build_libtool.m4,v 1.1 2014/03/19 21:56:31 asau Exp $
      # C++ shared libraries reported to be fairly broken before switch to ELF
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
      ;;
-@@ -5843,7 +5843,7 @@ _LT_EOF
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-       ;;
- 
--    freebsd1*)
-+    freebsd1|freebsd1.*)
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
- 
diff --git a/lang/php55/patches/patch-configure b/lang/php55/patches/patch-configure
index 217b53a7770..274c5207401 100644
--- a/lang/php55/patches/patch-configure
+++ b/lang/php55/patches/patch-configure
@@ -1,6 +1,6 @@
-$NetBSD: patch-configure,v 1.7 2014/06/13 14:31:19 fhajny Exp $
+$NetBSD: patch-configure,v 1.8 2014/07/26 00:11:55 taca Exp $
 
---- configure.orig	2014-05-28 09:23:59.000000000 +0000
+--- configure.orig	2014-07-23 09:08:17.000000000 +0000
 +++ configure
 @@ -8321,27 +8321,6 @@ EOF
      ;;
@@ -117,25 +117,7 @@ $NetBSD: patch-configure,v 1.7 2014/06/13 14:31:19 fhajny Exp $
  fi
  
  if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
-@@ -107701,7 +107654,7 @@ if test -z "$aix_libpath"; then aix_libp
-       hardcode_shlibpath_var=no
-       ;;
- 
--    freebsd1*)
-+    freebsd1|freebsd1.*)
-       ld_shlibs=no
-       ;;
- 
-@@ -108350,7 +108303,7 @@ dgux*)
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
--freebsd1*)
-+freebsd1|freebsd1.*)
-   dynamic_linker=no
-   ;;
- 
-@@ -108361,7 +108314,7 @@ freebsd* | dragonfly*)
+@@ -108353,7 +108306,7 @@ freebsd* | dragonfly*)
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -144,7 +126,7 @@ $NetBSD: patch-configure,v 1.7 2014/06/13 14:31:19 fhajny Exp $
      *) objformat=elf ;;
      esac
    fi
-@@ -110441,7 +110394,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -110433,7 +110386,7 @@ if test -z "$aix_libpath"; then aix_libp
  	;;
      esac
      ;;
@@ -153,16 +135,7 @@ $NetBSD: patch-configure,v 1.7 2014/06/13 14:31:19 fhajny Exp $
      # C++ shared libraries reported to be fairly broken before switch to ELF
      ld_shlibs_CXX=no
      ;;
-@@ -111987,7 +111940,7 @@ dgux*)
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
--freebsd1*)
-+freebsd1|freebsd1.*)
-   dynamic_linker=no
-   ;;
- 
-@@ -111998,7 +111951,7 @@ freebsd* | dragonfly*)
+@@ -111986,7 +111939,7 @@ freebsd* | dragonfly*)
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
diff --git a/lang/php55/patches/patch-ext_spl_spl__array.c b/lang/php55/patches/patch-ext_spl_spl__array.c
deleted file mode 100644
index 592c8c6d699..00000000000
--- a/lang/php55/patches/patch-ext_spl_spl__array.c
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ext_spl_spl__array.c,v 1.1 2014/07/13 15:23:42 taca Exp $
-
-Fix for CVE-2014-4698.
-
---- ext/spl/spl_array.c.orig	2014-06-25 13:06:23.000000000 +0000
-+++ ext/spl/spl_array.c
-@@ -1733,6 +1733,7 @@ SPL_METHOD(Array, unserialize)
- 	const unsigned char *p, *s;
- 	php_unserialize_data_t var_hash;
- 	zval *pmembers, *pflags = NULL;
-+	HashTable *aht;
- 	long flags;
- 
- 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &buf, &buf_len) == FAILURE) {
-@@ -1744,6 +1745,12 @@ SPL_METHOD(Array, unserialize)
- 		return;
- 	}
- 
-+	aht = spl_array_get_hash_table(intern, 0 TSRMLS_CC);
-+	if (aht->nApplyCount > 0) {
-+		zend_error(E_WARNING, "Modification of ArrayObject during sorting is prohibited");
-+		return;
-+	}
-+
- 	/* storage */
- 	s = p = (const unsigned char*)buf;
- 	PHP_VAR_UNSERIALIZE_INIT(var_hash);
diff --git a/lang/php55/patches/patch-ext_spl_spl__dllist.c b/lang/php55/patches/patch-ext_spl_spl__dllist.c
deleted file mode 100644
index 32d0944c58b..00000000000
--- a/lang/php55/patches/patch-ext_spl_spl__dllist.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ext_spl_spl__dllist.c,v 1.1 2014/07/13 15:23:42 taca Exp $
-
-Fix for CVE-2014-4670.
-
---- ext/spl/spl_dllist.c.orig	2014-06-25 13:06:23.000000000 +0000
-+++ ext/spl/spl_dllist.c
-@@ -916,6 +916,11 @@ SPL_METHOD(SplDoublyLinkedList, offsetUn
- 			llist->dtor(element TSRMLS_CC);
- 		}
- 
-+		if (intern->traverse_pointer == element) {
-+			SPL_LLIST_DELREF(element);
-+			intern->traverse_pointer = NULL;
-+		}
-+
- 		zval_ptr_dtor((zval **)&element->data);
- 		element->data = NULL;
-