Update php55 to 5.5.12.

01 May 2014, PHP 5.5.12
- Core:
  . Fixed bug #61019 (Out of memory on command stream_get_contents). (Mike)
  . Fixed bug #64330 (stream_socket_server() creates wrong Abstract Namespace
    UNIX sockets). (Mike)
  . Fixed bug #66182 (exit in stream filter produces segfault). (Mike)
  . Fixed bug #66736 (fpassthru broken). (Mike)
  . Fixed bug #67024 (getimagesize should recognize BMP files with negative
    height). (Gabor Buella)
  . Fixed bug #67043 (substr_compare broke by previous change) (Tjerk)

- cURL:
  . Fixed bug #66562 (curl_exec returns differently than curl_multi_getcontent).
    (Freek Lijten)

- Date:
  . Fixed bug #66721 (__wakeup of DateTime segfaults when invalid object data is
    supplied). (Boro Sitnikovski)

- Embed:
  . Fixed bug #65715 (php5embed.lib isn't provided anymore). (Anatol).

- Fileinfo:
  . Fixed bug #66987 (Memory corruption in fileinfo ext / bigendian).
    (Remi)

- FPM:
  . Fixed bug #66482 (unknown entry 'priority' in php-fpm.conf).
  . Fixed bug #67060 (possible privilege escalation due to insecure default configuration). (CVE-2014-0185) (christian at hoffie dot info)

- JSON:
  . Fixed bug #66021 (Blank line inside empty array/object when
    JSON_PRETTY_PRINT is set). (Kevin Israel)

- LDAP:
  . Fixed issue with null bytes in LDAP bindings. (Matthew Daley)

- mysqli:
  . Fixed problem in mysqli_commit()/mysqli_rollback() with second parameter
    (extra comma) and third parameters (lack of escaping). (Andrey)

- OpenSSL:
  . Fix bug #66942 (memory leak in openssl_seal()). (Chuan Ma)
  . Fix bug #66952 (memory leak in openssl_open()). (Chuan Ma)

- SimpleXML:
  . Fixed bug #66084 (simplexml_load_string() mangles empty node name)
    (Anatol)

- SQLite:
  . Fixed bug #66967 (Updated bundled libsqlite to 3.8.4.3). (Anatol)

- XSL:
  . Fixed bug #53965 (<xsl:include> cannot find files with relative paths
    when loaded with "file://"). (Anatol)

- Apache2 Handler SAPI:
  . Fixed Apache log issue caused by APR's lack of support for %zu
    (APR issue https://issues.apache.org/bugzilla/show_bug.cgi?id=56120).
    (Jeff Trawick)

4 files changed, 21 insertions, 21 deletions

diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk
index d504b197a1f..9af7ae5cda6 100644
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.60 2014/04/05 03:43:40 taca Exp $
+# $NetBSD: phpversion.mk,v 1.61 2014/05/01 15:52:33 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.28
 PHP54_VERSION=	5.4.27
-PHP55_VERSION=	5.5.11
+PHP55_VERSION=	5.5.12
 
 # Define initial release of major version.
 PHP53_RELDATE=	20090630
diff --git a/lang/php55/distinfo b/lang/php55/distinfo
index d2e5abadba3..209b7f426f4 100644
--- a/lang/php55/distinfo
+++ b/lang/php55/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.19 2014/04/14 10:17:19 jperkin Exp $
+$NetBSD: distinfo,v 1.20 2014/05/01 15:52:33 taca Exp $
 
-SHA1 (php-5.5.11.tar.bz2) = 58d660e5455b3f2abdfe3205182ffe3a58b5d1cd
-RMD160 (php-5.5.11.tar.bz2) = 9666e7e595ffa8cc8db87534d75fb05efda495ad
-Size (php-5.5.11.tar.bz2) = 13207627 bytes
+SHA1 (php-5.5.12.tar.bz2) = eaa0b27368f98af2fa9aa6f08d7ea23bdb53c748
+RMD160 (php-5.5.12.tar.bz2) = c09c98e85c503cf030b0f215fcab0986945ce7ba
+Size (php-5.5.12.tar.bz2) = 13251734 bytes
 SHA1 (patch-acinclude.m4) = 9e9c433e4cb96e469f7cf14b2064a0f41fc4568a
 SHA1 (patch-aclocal.m4) = 14ae2898e1d68b552e76a7e4ee7006f1aee1f932
 SHA1 (patch-build_libtool.m4) = 6ee935c55cc01704c6e9edb4e383b2ddb7c746e7
-SHA1 (patch-configure) = 8d8af34ce99d91f8086079963b31b145caab66d3
+SHA1 (patch-configure) = 7b4bef368e6709c26c0db31a4c7ebc04e4d55e9c
 SHA1 (patch-ext_gd_config.m4) = 91c9798333d4776856a0a9e20196986856b758b2
 SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc
 SHA1 (patch-ext_mssql_php__mssql.c) = 4ef1837850443e9db2e71620a3ddaed5ab5c435b
@@ -15,7 +15,7 @@ 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_sqlite3_libsqlite_sqlite3.c) = 8b72c83819e4d348001c11ec122d377f95b2099d
+SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = b384b9daa466f2a8a3e6cfd4ea6cff81f9342941
 SHA1 (patch-ext_standard_basic__functions.c) = f2a44998145306c2cb2d2f3822c0e7cc70c778b4
 SHA1 (patch-makedist) = 3f6b0621d30264824f2cb4c2903d15ba95be3937
 SHA1 (patch-php.ini-development) = 4fc40f0af5f6e58b614794e066a5738694dc8ef8
diff --git a/lang/php55/patches/patch-configure b/lang/php55/patches/patch-configure
index 47a51d8713e..fcd23eef3e7 100644
--- a/lang/php55/patches/patch-configure
+++ b/lang/php55/patches/patch-configure
@@ -1,6 +1,6 @@
-$NetBSD: patch-configure,v 1.5 2014/03/19 21:56:31 asau Exp $
+$NetBSD: patch-configure,v 1.6 2014/05/01 15:52:33 taca Exp $
 
---- configure.orig	2014-03-05 10:52:32.000000000 +0000
+--- configure.orig	2014-04-30 08:40:22.000000000 +0000
 +++ configure
 @@ -23604,7 +23604,7 @@ fi
      if test "$found_openssl" = "no"; then
@@ -38,7 +38,7 @@ $NetBSD: patch-configure,v 1.5 2014/03/19 21:56:31 asau Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -65190,7 +65190,7 @@ rm -f core *.core core.conftest.* gmon.o
+@@ -65189,7 +65189,7 @@ rm -f core *.core core.conftest.* gmon.o
  fi
  
  
@@ -47,7 +47,7 @@ $NetBSD: patch-configure,v 1.5 2014/03/19 21:56:31 asau Exp $
  	as_fn_error $? "Don't know how to define struct flock on this system, set --enable-opcache=no" "$LINENO" 5
  fi
  
-@@ -104584,12 +104584,7 @@ old_CC=$CC
+@@ -104582,12 +104582,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"
@@ -61,7 +61,7 @@ $NetBSD: patch-configure,v 1.5 2014/03/19 21:56:31 asau Exp $
  fi
  
  if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
-@@ -107703,7 +107698,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -107701,7 +107696,7 @@ if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var=no
        ;;
  
@@ -70,7 +70,7 @@ $NetBSD: patch-configure,v 1.5 2014/03/19 21:56:31 asau Exp $
        ld_shlibs=no
        ;;
  
-@@ -108352,7 +108347,7 @@ dgux*)
+@@ -108350,7 +108345,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -79,7 +79,7 @@ $NetBSD: patch-configure,v 1.5 2014/03/19 21:56:31 asau Exp $
    dynamic_linker=no
    ;;
  
-@@ -108363,7 +108358,7 @@ freebsd* | dragonfly*)
+@@ -108361,7 +108356,7 @@ freebsd* | dragonfly*)
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -88,7 +88,7 @@ $NetBSD: patch-configure,v 1.5 2014/03/19 21:56:31 asau Exp $
      *) objformat=elf ;;
      esac
    fi
-@@ -110443,7 +110438,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -110441,7 +110436,7 @@ if test -z "$aix_libpath"; then aix_libp
  	;;
      esac
      ;;
@@ -97,7 +97,7 @@ $NetBSD: patch-configure,v 1.5 2014/03/19 21:56:31 asau Exp $
      # C++ shared libraries reported to be fairly broken before switch to ELF
      ld_shlibs_CXX=no
      ;;
-@@ -111989,7 +111984,7 @@ dgux*)
+@@ -111987,7 +111982,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -106,7 +106,7 @@ $NetBSD: patch-configure,v 1.5 2014/03/19 21:56:31 asau Exp $
    dynamic_linker=no
    ;;
  
-@@ -112000,7 +111995,7 @@ freebsd* | dragonfly*)
+@@ -111998,7 +111993,7 @@ freebsd* | dragonfly*)
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
diff --git a/lang/php55/patches/patch-ext_sqlite3_libsqlite_sqlite3.c b/lang/php55/patches/patch-ext_sqlite3_libsqlite_sqlite3.c
index 6d74cf4ee66..6d6e465b0bb 100644
--- a/lang/php55/patches/patch-ext_sqlite3_libsqlite_sqlite3.c
+++ b/lang/php55/patches/patch-ext_sqlite3_libsqlite_sqlite3.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-ext_sqlite3_libsqlite_sqlite3.c,v 1.1 2014/04/14 10:17:19 jperkin Exp $
+$NetBSD: patch-ext_sqlite3_libsqlite_sqlite3.c,v 1.2 2014/05/01 15:52:33 taca Exp $
 
 Don't redefine _XOPEN_SOURCE, it is already set from php.
 
---- ext/sqlite3/libsqlite/sqlite3.c.orig	2014-04-01 12:32:03.000000000 +0000
+--- ext/sqlite3/libsqlite/sqlite3.c.orig	2014-04-29 08:04:30.000000000 +0000
 +++ ext/sqlite3/libsqlite/sqlite3.c
-@@ -7822,7 +7822,7 @@ struct sqlite3_rtree_geometry {
+@@ -7867,7 +7867,7 @@ struct sqlite3_rtree_geometry {
  ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit
  ** it.
  */