Update php53 to 5.3.25 (PHP 5.3.25).

09 May 2013, PHP 5.3.25

- 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 bugs #47675 and #64577 (fd leak on Solaris). (Rasmus)

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

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

4 files changed, 12 insertions, 25 deletions

diff --git a/lang/php53/Makefile.common b/lang/php53/Makefile.common
index 28141ac0332..556170fc959 100644
--- a/lang/php53/Makefile.common
+++ b/lang/php53/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2013/04/12 16:59:51 taca Exp $
+# $NetBSD: Makefile.common,v 1.25 2013/05/16 16:19:14 taca Exp $
 # used by lang/php53/Makefile.php
 # used by lang/php/ext.mk
 # used by meta-pkgs/php53-extensions/Makefile
@@ -38,7 +38,7 @@ EXTRACT_SUFX?=		.tar.bz2
 MAINTAINER?=		pkgsrc-users@NetBSD.org
 HOMEPAGE?=		http://www.php.net/
 
-PHP_BASE_VERS=		5.3.24
+PHP_BASE_VERS=		5.3.25
 
 PHP_EXTENSION_DIR=	lib/php/20090630
 PLIST_SUBST+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
diff --git a/lang/php53/Makefile.php b/lang/php53/Makefile.php
index 830afb953a0..88e6808b90a 100644
--- a/lang/php53/Makefile.php
+++ b/lang/php53/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.32 2013/05/09 14:31:48 taca Exp $
+# $NetBSD: Makefile.php,v 1.33 2013/05/16 16:19:14 taca Exp $
 # used by lang/php53/Makefile
 # used by www/ap-php/Makefile
 
@@ -57,8 +57,8 @@ PKG_SUGGESTED_OPTIONS+=	inet6 ssl
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Msuhosin)
-SUHOSIN_PHPVER=		5.3.23
-.  if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && ${PHP_BASE_VERS} != "5.3.24"
+SUHOSIN_PHPVER=		5.3.25
+.  if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && ${PHP_BASE_VERS} != "5.3.25"
 PKG_FAIL_REASON+=	"The suhosin patch is currently not available for"
 PKG_FAIL_REASON+=	"this version of PHP.  You may have to wait until"
 PKG_FAIL_REASON+=	"an updated patch is released or temporarily"
diff --git a/lang/php53/distinfo b/lang/php53/distinfo
index 496e5b1c633..5b542b47b72 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.62 2013/04/12 16:59:51 taca Exp $
+$NetBSD: distinfo,v 1.63 2013/05/16 16:19:14 taca Exp $
 
-SHA1 (php-5.3.24.tar.bz2) = ff591a89d77123c7823adf94fea4aca7de5a3dc6
-RMD160 (php-5.3.24.tar.bz2) = 09e6ee41912f38d203869b79e15c6ec0168dc93d
-Size (php-5.3.24.tar.bz2) = 11428201 bytes
+SHA1 (php-5.3.25.tar.bz2) = 8f948bf74a56f0bca70b2f37de6b585af6602b11
+RMD160 (php-5.3.25.tar.bz2) = 09889369bd711e37ce8d4c79b1ae6513614a2e24
+Size (php-5.3.25.tar.bz2) = 11429225 bytes
+SHA1 (suhosin-patch-5.3.25-0.9.10.patch.bz2) = ce5883b05daf91e8a44fffbfa4d3989ac3311dd1
+RMD160 (suhosin-patch-5.3.25-0.9.10.patch.bz2) = 6c4d0cfe070802481121be465b66d3cefe44da83
+Size (suhosin-patch-5.3.25-0.9.10.patch.bz2) = 32447 bytes
 SHA1 (patch-aa) = b0dc6cd0b2103d5858280202506b33322a98496e
 SHA1 (patch-ab) = 7e9aab00e1d5f18e320ef5e513c0ff6833a5b69a
 SHA1 (patch-ac) = b6eb40116f3770464120b6ea9061624609b9564e
@@ -15,7 +18,6 @@ SHA1 (patch-ai) = d4766893a2c47a4e4a744248dda265b0a9a66a1f
 SHA1 (patch-aj) = 8698b3caa6299843c7483473b0cb18ceffa3dada
 SHA1 (patch-al) = fbbee5502e0cd1c47c6e7c15e0d54746414ec32e
 SHA1 (patch-ext_standard_basic__functions.c) = 18596d281017760293189d87d19de9c5c772232d
-SHA1 (patch-main_main.c) = 3e8f62eed3daadf2c93adeade234e378e792be04
 SHA1 (patch-main_streams_cast.c) = c169ccb73dc660e40eff9f9e168374f35eedadad
 SHA1 (patch-php__mssql.c) = b46c688ff2d8da33ca2f9beb0eb9182b6edf7e23
 SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 6453d0cea05c0f86dcabc95a656532a0ed084aed
diff --git a/lang/php53/patches/patch-main_main.c b/lang/php53/patches/patch-main_main.c
deleted file mode 100644
index 9f80943d0b2..00000000000
--- a/lang/php53/patches/patch-main_main.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-main_main.c,v 1.4 2012/08/17 15:32:31 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
-@@ -2388,7 +2388,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)