Update php54 to 5.4.12.

PHP                                                                        NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
21 Feb 2012, PHP 5.4.12

- Core:
  . Fixed bug #64099 (Wrong TSRM usage in zend_Register_class alias). (Johannes)
  . Fixed bug #64011 (get_html_translation_table() output incomplete with
    HTML_ENTITIES and ISO-8859-1). (Gustavo)
  . Fixed bug #63982 (isset() inconsistently produces a fatal error on
    protected property). (Stas)
  . Fixed bug #63943 (Bad warning text from strpos() on empty needle).
    (Laruence)
  . Fixed bug #63899 (Use after scope error in zend_compile). (Laruence)
  . Fixed bug #63893 (Poor efficiency of strtr() using array with keys of very
    different length). (Gustavo)
  . Fixed bug #63882 (zend_std_compare_objects crash on recursion). (Dmitry)
  . Fixed bug #63462 (Magic methods called twice for unset protected
    properties). (Stas)
  . Fixed bug #62524 (fopen follows redirects for non-3xx statuses).
    (Wes Mason)
  . Support BITMAPV5HEADER in getimagesize(). (AsamK, Lars)

- Date:
  . Fixed bug #63699 (Performance improvements for various ext/date functions).
    (Lars, original patch by njaguar at gmail dot com)
  . Fixed bug #55397: Comparsion of incomplete DateTime causes SIGSEGV.
    (Derick)

- FPM:
  . Fixed bug #63999 (php with fpm fails to build on Solaris 10 or 11). (Adam)

- Litespeed:
  . Fixed bug #63228 (-Werror=format-security error in lsapi code). (George)

- SOAP
  . Added check that soap.wsdl_cache_dir conforms to open_basedir
    (CVE-2013-1635). (Dmitry)
  . Disabled external entities loading (CVE-2013-1643). (Dmitry)

- sqlite3:
  . Fixed bug #63921 (sqlite3::bindvalue and relative PHP functions aren't
    using sqlite3_*_int64 API). (srgoogleguy, Lars)

- PDO_OCI
  . Fixed bug #57702 (Multi-row BLOB fetches). (hswong3i, Laruence)
  . Fixed bug #52958 (Segfault in PDO_OCI on cleanup after running a long
    testsuite). (hswong3i, Lars)

- PDO_sqlite:
  . Fixed bug #63916 (PDO::PARAM_INT casts to 32bit int internally even
    on 64bit builds in pdo_sqlite). (srgoogleguy, Lars)

4 files changed, 7 insertions, 24 deletions

diff --git a/lang/php54/Makefile b/lang/php54/Makefile
index abaaec19944..489e31f1ffb 100644
--- a/lang/php54/Makefile
+++ b/lang/php54/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2013/02/06 23:22:38 jperkin Exp $
+# $NetBSD: Makefile,v 1.6 2013/02/22 03:06:50 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/php54/Makefile.common b/lang/php54/Makefile.common
index 66d58b35f6c..db7c06117c1 100644
--- a/lang/php54/Makefile.common
+++ b/lang/php54/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2013/01/17 15:48:09 taca Exp $
+# $NetBSD: Makefile.common,v 1.9 2013/02/22 03:06:50 taca Exp $
 # used by lang/php54/Makefile.php
 # used by lang/php/ext.mk
 # used by meta-pkgs/php54-extensions/Makefile
@@ -38,7 +38,7 @@ EXTRACT_SUFX?=		.tar.bz2
 MAINTAINER?=		pkgsrc-users@NetBSD.org
 HOMEPAGE?=		http://www.php.net/
 
-PHP_BASE_VERS=		5.4.11
+PHP_BASE_VERS=		5.4.12
 
 PHP_EXTENSION_DIR=	lib/php/20120301
 PLIST_SUBST+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
diff --git a/lang/php54/distinfo b/lang/php54/distinfo
index a8856aa1928..beca2c1db78 100644
--- a/lang/php54/distinfo
+++ b/lang/php54/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2013/02/17 13:10:13 taca Exp $
+$NetBSD: distinfo,v 1.13 2013/02/22 03:06:50 taca Exp $
 
-SHA1 (php-5.4.11.tar.bz2) = 85666f32bf1f2850c769fe58fed788ae8fdfa1cb
-RMD160 (php-5.4.11.tar.bz2) = 33513161846240bc128eb7e917a293711c9214c3
-Size (php-5.4.11.tar.bz2) = 11147685 bytes
+SHA1 (php-5.4.12.tar.bz2) = 9e1af30b763ba3de19b68b9b8abde1aae1e5e630
+RMD160 (php-5.4.12.tar.bz2) = 51fb60f669ff5410fefcb5a00369fbc4707a5044
+Size (php-5.4.12.tar.bz2) = 11501953 bytes
 SHA1 (patch-acinclude.m4) = afead7122844e8290d9ef4fdb8deec3c40cf0746
 SHA1 (patch-configure) = 5930b32de104cda553c9701086ffdf35a93f8d97
 SHA1 (patch-ext_gd_config.m4) = 2353efe6f25e1081b41d61033c3185cc643c7891
@@ -19,4 +19,3 @@ SHA1 (patch-php.ini-development) = 79512bd276adaed6bcf5f7f28e965f8a6b589add
 SHA1 (patch-php.ini-production) = f5d275abe7668a139999b3607e99f271450f56ae
 SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d
 SHA1 (patch-sapi_cgi_Makefile.frag) = ba16463cc2a350df1db80c78ac9aec44b20d4bfe
-SHA1 (patch-sapi_fpm_fpm__fpm_sockets.h) = 012cfc14cb912cee3045ca1741876161ee44e8d5
diff --git a/lang/php54/patches/patch-sapi_fpm_fpm__fpm_sockets.h b/lang/php54/patches/patch-sapi_fpm_fpm__fpm_sockets.h
deleted file mode 100644
index ed62a66b7a2..00000000000
--- a/lang/php54/patches/patch-sapi_fpm_fpm__fpm_sockets.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-sapi_fpm_fpm__fpm_sockets.h,v 1.2 2012/08/17 15:34:01 taca Exp $
-
-Silly bug. 'sun' is of course taken on SunOS.
-
---- sapi/fpm/fpm/fpm_sockets.h.orig	2012-08-15 04:26:05.000000000 +0000
-+++ sapi/fpm/fpm/fpm_sockets.h
-@@ -25,7 +25,7 @@
- enum fpm_address_domain fpm_sockets_domain_from_address(char *addr);
- int fpm_sockets_init_main();
- int fpm_socket_get_listening_queue(int sock, unsigned *cur_lq, unsigned *max_lq);
--int fpm_socket_unix_test_connect(struct sockaddr_un *sun, size_t socklen);
-+int fpm_socket_unix_test_connect(struct sockaddr_un *sock, size_t socklen);
- 
- 
- static inline int fd_set_blocked(int fd, int blocked) /* {{{ */