Update php54 to 5.4.11.

17 Jan 2013, PHP 5.4.11

- Core:
  . Fixed bug #63762 (Sigsegv when Exception::$trace is changed by user).
    (Johannes)
  . Fixed bug #43177 (Errors in eval()'ed code produce status code 500).
    (Todd Ruth, Stas).

- Filter:
  . Fixed bug #63757 (getenv() produces memory leak with CGI SAPI). (Dmitry)
  . Fixed bug #54096 (FILTER_VALIDATE_INT does not accept +0 and -0).
    (martin at divbyzero dot net, Lars)

- JSON:
  . Fixed bug #63737 (json_decode does not properly decode with options
    parameter). (Adam)

- CLI server
  . Update list of common mime types. Added webm, ogv, ogg. (Lars,
    pascalc at gmail dot com)

- cURL extension:
  . Fixed bug (segfault due to libcurl connection caching). (Pierrick)
  . Fixed bug #63859 (Memory leak when reusing curl-handle). (Pierrick)
  . Fixed bug #63795 (CURL >= 7.28.0 no longer support value 1 for
    CURLOPT_SSL_VERIFYHOST). (Pierrick)
  . Fixed bug #63352 (Can't enable hostname validation when using curl stream
    wrappers). (Pierrick)
  . Fixed bug #55438 (Curlwapper is not sending http header randomly).
    (phpnet@lostreality.org, Pierrick)

3 files changed, 11 insertions, 11 deletions

diff --git a/lang/php54/Makefile.common b/lang/php54/Makefile.common
index 13dde31b886..66d58b35f6c 100644
--- a/lang/php54/Makefile.common
+++ b/lang/php54/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2013/01/07 14:24:33 taca Exp $
+# $NetBSD: Makefile.common,v 1.8 2013/01/17 15:48:09 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.10
+PHP_BASE_VERS=		5.4.11
 
 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 5daf5aaa08c..37be469a740 100644
--- a/lang/php54/distinfo
+++ b/lang/php54/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2013/01/07 14:24:34 taca Exp $
+$NetBSD: distinfo,v 1.11 2013/01/17 15:48:09 taca Exp $
 
-SHA1 (php-5.4.10.tar.bz2) = a7fd2c02b9ae81f164229b477b84a8715bd6d543
-RMD160 (php-5.4.10.tar.bz2) = 27a85aae2561ccba21fe036a3b3c257885db1928
-Size (php-5.4.10.tar.bz2) = 11145757 bytes
+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 (patch-acinclude.m4) = afead7122844e8290d9ef4fdb8deec3c40cf0746
 SHA1 (patch-configure) = 5930b32de104cda553c9701086ffdf35a93f8d97
 SHA1 (patch-ext_gd_config.m4) = 089f1c88bd4daa8ebc8911122423c1f88e5d84a0
@@ -13,7 +13,7 @@ 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_standard_basic__functions.c) = 563fe67eb78b786cd46195026381ef22128e0841
-SHA1 (patch-main_main.c) = 3e8f62eed3daadf2c93adeade234e378e792be04
+SHA1 (patch-main_main.c) = ca7e3c2ddc2efd8d03c00c10f75f0145fd1c85af
 SHA1 (patch-main_streams_cast.c) = ebf23f9908340be3d1f947c4112ec940f9324ecb
 SHA1 (patch-php.ini-development) = 79512bd276adaed6bcf5f7f28e965f8a6b589add
 SHA1 (patch-php.ini-production) = f5d275abe7668a139999b3607e99f271450f56ae
diff --git a/lang/php54/patches/patch-main_main.c b/lang/php54/patches/patch-main_main.c
index 739a6f15289..e6e6feb2ba5 100644
--- a/lang/php54/patches/patch-main_main.c
+++ b/lang/php54/patches/patch-main_main.c
@@ -1,13 +1,13 @@
-$NetBSD: patch-main_main.c,v 1.2 2012/08/17 15:34:01 taca Exp $
+$NetBSD: patch-main_main.c,v 1.3 2013/01/17 15:48:09 taca Exp $
 
 Fix fd leak on SunOS (https://bugs.php.net/bug.php?id=47675).
 
---- main/main.c.orig	2012-06-13 04:54:23.000000000 +0000
+--- main/main.c.orig	2013-01-16 07:10:30.000000000 +0000
 +++ main/main.c
-@@ -2388,7 +2388,7 @@ PHPAPI int php_execute_script(zend_file_
+@@ -2407,7 +2407,7 @@ PHPAPI int php_execute_script(zend_file_
  	zend_file_handle *prepend_file_p, *append_file_p;
  	zend_file_handle prepend_file = {0}, append_file = {0};
- #if HAVE_BROKEN_GETCWD 
+ #if HAVE_BROKEN_GETCWD
 -	int old_cwd_fd = -1;
 +	volatile int old_cwd_fd = -1;
  #else