Update php54 to 5.4.15 (PHP 5.4.15).

09 May 2013, PHP 5.4.15
- Core:
  . Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap:
    segfault). (Laruence)
  . Fixed bug #64458 (dns_get_record result with string of length -1). (Stas)
  . Fixed bug #64433 (follow_location parameter of context is ignored for most
    response codes). (Sergey Akbarov)
  . Fixed bugs #47675 and #64577 (fd leak on Solaris)

- Fileinfo:
  . Upgraded libmagic to 5.14. (Anatol)

- Zip:
  . Fixed bug #64342 (ZipArchive::addFile() has to check for file existence).
    (Anatol)

- Streams:
  . Fixed Windows x64 version of stream_socket_pair() and improved error
    handling (Anatol Belski)

3 files changed, 6 insertions, 22 deletions

diff --git a/lang/php54/Makefile.common b/lang/php54/Makefile.common
index f8054e301c6..fc080aa540c 100644
--- a/lang/php54/Makefile.common
+++ b/lang/php54/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2013/04/12 17:00:40 taca Exp $
+# $NetBSD: Makefile.common,v 1.12 2013/05/16 16:19:58 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.14
+PHP_BASE_VERS=		5.4.15
 
 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 6260c9891e0..0c1c640a294 100644
--- a/lang/php54/distinfo
+++ b/lang/php54/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.16 2013/04/12 17:00:40 taca Exp $
+$NetBSD: distinfo,v 1.17 2013/05/16 16:19:58 taca Exp $
 
-SHA1 (php-5.4.14.tar.bz2) = 68e90795071f769b8fda22af7d71092d09f42dea
-RMD160 (php-5.4.14.tar.bz2) = 7a05ed52757ce617ca0ed052cab017c75eb07fb0
-Size (php-5.4.14.tar.bz2) = 11961015 bytes
+SHA1 (php-5.4.15.tar.bz2) = 63126ef43e45adfcb2dd19590a4fb88da3c6d280
+RMD160 (php-5.4.15.tar.bz2) = 91eedfca8b9cd31da30707d821111a263663b11e
+Size (php-5.4.15.tar.bz2) = 11662269 bytes
 SHA1 (patch-acinclude.m4) = afead7122844e8290d9ef4fdb8deec3c40cf0746
 SHA1 (patch-configure) = 5930b32de104cda553c9701086ffdf35a93f8d97
 SHA1 (patch-ext_gd_config.m4) = 2353efe6f25e1081b41d61033c3185cc643c7891
@@ -13,7 +13,6 @@ 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) = 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
deleted file mode 100644
index e6e6feb2ba5..00000000000
--- a/lang/php54/patches/patch-main_main.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$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	2013-01-16 07:10:30.000000000 +0000
-+++ main/main.c
-@@ -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
--	int old_cwd_fd = -1;
-+	volatile int old_cwd_fd = -1;
- #else
- 	char *old_cwd;
- 	ALLOCA_FLAG(use_heap)