Pullup ticket #4156 - requested by taca

lang/php53: security update

Revisions pulled up:
- lang/php53/Makefile.common                             1.24-1.26
- lang/php53/Makefile.php                                1.33 via patch
- lang/php53/distinfo                                    1.63-1.64 via patch
- lang/php53/patches/patch-main_main.c                   deleted

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Apr 12 16:59:51 UTC 2013

   Modified Files:
   	pkgsrc/lang/php53: Makefile.common Makefile.php distinfo
   	pkgsrc/lang/php53/patches: patch-ab

   Log Message:
   Update php53 to 5.3.24.

   11 Apr 2013, PHP 5.3.24

   - Core
     . Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT']).
       (Anatol)
     . Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle
       exceptions properly). (Jeff Welch)
     . Fixed bug #62343 (Show class_alias In get_declared_classes()) (Dmitry)

   - PCRE:
     . Merged PCRE 8.32). (Anatol)

   - mysqlnd
     . Fixed bug #63530 (mysqlnd_stmt::bind_one_parameter crashes, uses wrong alloc
       for stmt->param_bind). (Andrey)

   - DateTime
     . Fixed bug #62852 (Unserialize Invalid Date causes crash). (Anatol)

   - Zip:
     . Bug #64452 (Zip crash intermittently). (Anatol)

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Thu May 16 16:19:14 UTC 2013

   Modified Files:
   	pkgsrc/lang/php53: Makefile.common Makefile.php distinfo
   Removed Files:
   	pkgsrc/lang/php53/patches: patch-main_main.c

   Log Message:
   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)

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Jun  7 13:53:52 UTC 2013

   Modified Files:
   	pkgsrc/lang/php53: Makefile.common distinfo

   Log Message:
   Update php53 to 5.3.26.

   06 Jun 2013, PHP 5.3.26

   - Core:
     . Fixed bug #64879 (Heap based buffer overflow in quoted_printable_encode,
       CVE 2013-2110). (Stas)

   - Calendar:
     . Fixed bug #64895 (Integer overflow in SndToJewish). (Remi)

   - FPM:
     . Fixed some possible memory or resource leaks and possible null dereference
       detected by code coverity scan. (Remi)
     . Log a warning when a syscall fails. (Remi)

   - MySQLi:
     . Fixed bug #64726 (Segfault when calling fetch_object on a use_result and DB
       pointer has closed). (Laruence)

   - Phar
     . Fixed bug #64214 (PHAR PHPTs intermittently crash when run on DFS, SMB or
       with non std tmp dir). (Pierre)

   - Streams:
     . Fixed bug #64770 (stream_select() fails with pipes returned by proc_open()
       on Windows x64). (Anatol)

   - Zend Engine:
     . Fixed bug #64821 (Custom Exception crash when internal properties
       overridden). (Anatol)

4 files changed, 11 insertions, 29 deletions

diff --git a/lang/php53/Makefile.common b/lang/php53/Makefile.common
index bfa47fdca62..c1c87ca4340 100644
--- a/lang/php53/Makefile.common
+++ b/lang/php53/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2013/03/16 01:58:18 taca Exp $
+# $NetBSD: Makefile.common,v 1.23.2.1 2013/06/10 10:39:28 tron 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.23
+PHP_BASE_VERS=		5.3.26
 
 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 838404ed990..1ae552afa28 100644
--- a/lang/php53/Makefile.php
+++ b/lang/php53/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.29.2.2 2013/05/17 07:26:48 spz Exp $
+# $NetBSD: Makefile.php,v 1.29.2.3 2013/06/10 10:39:28 tron 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.23"
+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 4ef53c73aa5..f0bf1d739e8 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.60.2.1 2013/04/15 22:18:29 tron Exp $
+$NetBSD: distinfo,v 1.60.2.2 2013/06/10 10:39:28 tron Exp $
 
-SHA1 (php-5.3.23.tar.bz2) = fe9d84ada4747629f31051f9c689629261558056
-RMD160 (php-5.3.23.tar.bz2) = a537ed70a94ebbc8c1ee12a897f2f78b98a1dee4
-Size (php-5.3.23.tar.bz2) = 11410987 bytes
-SHA1 (suhosin-patch-5.3.23-0.9.10.patch.bz2) = 4db2a9266013c9647d14a6e5875c3081fce263ca
-RMD160 (suhosin-patch-5.3.23-0.9.10.patch.bz2) = 82f3c4f80cef7e7d44fb23bec9fa349c4cba6762
-Size (suhosin-patch-5.3.23-0.9.10.patch.bz2) = 32474 bytes
+SHA1 (php-5.3.26.tar.bz2) = d2f97da600b640d618a8790dab22b519aa87b056
+RMD160 (php-5.3.26.tar.bz2) = a902aef59683dc7b051c81111b2995f8d5ebad93
+Size (php-5.3.26.tar.bz2) = 11430170 bytes
 SHA1 (patch-aa) = b0dc6cd0b2103d5858280202506b33322a98496e
-SHA1 (patch-ab) = 718248326c74ffa8a0f7df47b641fed39b838ba1
+SHA1 (patch-ab) = 7e9aab00e1d5f18e320ef5e513c0ff6833a5b69a
 SHA1 (patch-ac) = b6eb40116f3770464120b6ea9061624609b9564e
 SHA1 (patch-ad) = 1608c58860a43b4e31df8646b5ded253ec9aa881
 SHA1 (patch-ae) = e590db60a60f4e5ef2da4e5edb786335a67a3d56
@@ -18,7 +15,7 @@ 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_main.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
 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)