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)

1 files changed, 3 insertions, 3 deletions

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"