Update php55 to 5.5.5.

17 Oct 2013, PHP 5.5.5

- Core:
  . Fixed bug #64979 (Wrong behavior of static variables in closure generators).
    (Nikita)
  . Fixed bug #65322 (compile time errors won't trigger auto loading). (Nikita)
  . Fixed bug #65821 (By-ref foreach on property access of string offset
    segfaults). (Nikita)

- CLI server:
  . Fixed bug #65633 (built-in server treat some http headers as
    case-sensitive). (Adam)
  . Fixed bug #65818 (Segfault with built-in webserver and chunked transfer
    encoding). (Felipe)
  . Added application/pdf to PHP CLI Web Server mime types (Chris Jones)

- Datetime:
  . Fixed bug #64157 (DateTime::createFromFormat() reports confusing error
    message). (Boro Sitnikovski)
  . Fixed bug #65502 (DateTimeImmutable::createFromFormat returns DateTime).
    (Boro Sitnikovski)
  . Fixed bug #65548 (Comparison for DateTimeImmutable doesn't work).
    (Boro Sitnikovski)

- DBA extension:
  . Fixed bug #65708 (dba functions cast $key param to string in-place,
    bypassing copy on write). (Adam)

- Filter:
  . Add RFC 6598 IPs to reserved addresses. (Sebastian Nohn)
  . Fixed bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names).
    (Syra)

- FTP:
  . Fixed bug #65667 (ftp_nb_continue produces segfault). (Philip Hofstetter)

- GD
  . Ensure that the defined interpolation method is used with the generic
    scaling methods. (Pierre)

- IMAP:
  . Fixed bug #65721 (configure script broken in 5.5.4 and 5.4.20 when enabling
    imap). (ryotakatsuki at gmail dot com)

- OPcache:
  . Added support for GNU Hurd. (Svante Signell)
  . Added function opcache_compile_file() to load PHP scripts into cache
    without execution. (Julien)
  . Fixed bug #65845 (Error when Zend Opcache Optimizer is fully enabled).
    (Dmitry)
  . Fixed bug #65665 (Exception not properly caught when opcache enabled).
    (Laruence)
  . Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var). (Dmitry)
  . Fixed issue #135 (segfault in interned strings if initial memory is too
    low). (Julien)

- Sockets:
  . Fixed bug #65808 (the socket_connect() won't work with IPv6 address).
    (Mike)

- SPL:
  . Fix bug #64782 (SplFileObject constructor make $context optional / give it
    a default value). (Nikita)

- Standard:
  . Fixed bug #61548 (content-type must appear at the end of headers for 201
    Location to work in http). (Mike)

- XMLReader:
  . Fixed bug #51936 (Crash with clone XMLReader). (Mike)
  . Fixed bug #64230 (XMLReader does not suppress errors). (Mike)

- Build system:
  . Fixed bug #51076 (race condition in shtool's mkdir -p implementation).
    (Mike, Raphael Geissert)
  . Fixed bug #62396 ('make test' crashes starting with 5.3.14 (missing
    gzencode())). (Mike)

4 files changed, 39 insertions, 14 deletions

diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk
index 4a04ff5f9b4..819f187522a 100644
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.46 2013/10/18 12:25:12 taca Exp $
+# $NetBSD: phpversion.mk,v 1.47 2013/10/18 15:49:07 taca 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.
 PHP53_VERSION=	5.3.27
 PHP54_VERSION=	5.4.21
-PHP55_VERSION=	5.5.4
+PHP55_VERSION=	5.5.5
 
 # Define initial release of major version.
 PHP53_RELDATE=	20090630
diff --git a/lang/php55/distinfo b/lang/php55/distinfo
index c39a9a903a1..6a400a2c104 100644
--- a/lang/php55/distinfo
+++ b/lang/php55/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.8 2013/10/15 15:46:37 taca Exp $
+$NetBSD: distinfo,v 1.9 2013/10/18 15:49:07 taca Exp $
 
-SHA1 (php-5.5.4.tar.bz2) = fdc6724a7a3f23f7c87a3470e5b29d260685e2b6
-RMD160 (php-5.5.4.tar.bz2) = fcd69b4d4716392edf065b5cd5dabb68b4bacd45
-Size (php-5.5.4.tar.bz2) = 12047184 bytes
+SHA1 (php-5.5.5.tar.bz2) = 85b9db72cb6af5612703aec45deba4262eadbb1a
+RMD160 (php-5.5.5.tar.bz2) = 6adf3c747f05f74c38fd10d721f38d3f1a21e132
+Size (php-5.5.5.tar.bz2) = 12547974 bytes
 SHA1 (patch-acinclude.m4) = 9e9c433e4cb96e469f7cf14b2064a0f41fc4568a
-SHA1 (patch-configure) = 9ac8c43978df580c592631c923283e61e15e90af
+SHA1 (patch-configure) = 37b19e0f75619ffe016a1d834dbe774ea4452a2d
 SHA1 (patch-ext_gd_config.m4) = 91c9798333d4776856a0a9e20196986856b758b2
 SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc
 SHA1 (patch-ext_mssql_php__mssql.c) = 4ef1837850443e9db2e71620a3ddaed5ab5c435b
+SHA1 (patch-ext_opcache_config.m4) = 7c0d98feaeec8a0ca61f6f77a1906aa2d601be3f
 SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390
 SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59
 SHA1 (patch-ext_phar_Makefile.frag) = 1af23d9135557bc7ba2f3627b317d4cbef37aaba
diff --git a/lang/php55/patches/patch-configure b/lang/php55/patches/patch-configure
index dfaa3d8e1ad..7b515bbf041 100644
--- a/lang/php55/patches/patch-configure
+++ b/lang/php55/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.2 2013/08/17 13:15:21 taca Exp $
+$NetBSD: patch-configure,v 1.3 2013/10/18 15:49:07 taca Exp $
 
---- configure.orig	2013-08-15 20:48:19.000000000 +0000
+--- configure.orig	2013-10-15 14:29:41.000000000 +0000
 +++ configure
-@@ -23571,7 +23571,7 @@ fi
+@@ -23604,7 +23604,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -11,7 +11,7 @@ $NetBSD: patch-configure,v 1.2 2013/08/17 13:15:21 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -25721,7 +25721,7 @@ $as_echo "yes" >&6; }
+@@ -25754,7 +25754,7 @@ $as_echo "yes" >&6; }
      PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
  
  
@@ -20,7 +20,7 @@ $NetBSD: patch-configure,v 1.2 2013/08/17 13:15:21 taca Exp $
  
  
    unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-@@ -36778,7 +36778,7 @@ fi
+@@ -36811,7 +36811,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -29,7 +29,7 @@ $NetBSD: patch-configure,v 1.2 2013/08/17 13:15:21 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -48536,7 +48536,7 @@ fi
+@@ -48569,7 +48569,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -38,7 +38,16 @@ $NetBSD: patch-configure,v 1.2 2013/08/17 13:15:21 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -104360,12 +104360,7 @@ old_CC=$CC
+@@ -65546,7 +65546,7 @@ rm -f core *.core core.conftest.* gmon.o
+ fi
+ 
+ 
+-if test "$flock_type" == "unknown"; then
++if test "$flock_type" = "unknown"; then
+ 	as_fn_error $? "Don't know how to define struct flock on this system, set --enable-opcache=no" "$LINENO" 5
+ fi
+ 
+@@ -104883,12 +104883,7 @@ old_CC=$CC
  if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
    CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
    INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
diff --git a/lang/php55/patches/patch-ext_opcache_config.m4 b/lang/php55/patches/patch-ext_opcache_config.m4
new file mode 100644
index 00000000000..b852da614c0
--- /dev/null
+++ b/lang/php55/patches/patch-ext_opcache_config.m4
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_opcache_config.m4,v 1.1 2013/10/18 15:49:07 taca Exp $
+
+Avoid use "==" in test(1).
+
+--- ext/opcache/config.m4.orig	2013-10-15 13:49:47.000000000 +0000
++++ ext/opcache/config.m4
+@@ -359,7 +359,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
+