Pullup ticket #4155 - requested by taca

lang/php54: security update

Revisions pulled up:
- lang/php54/Makefile.common                                    1.11-1.13
- lang/php54/distinfo                                           1.16-1.18
- lang/php54/patches/patch-main_main.c                          deleted

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Apr 12 17:00:40 UTC 2013

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

   Log Message:
   Update php54 to 5.4.14.

   11 Apr 2013, PHP 5.4.14
   - Core
     . Fixed bug #64529 (Ran out of opcode space). (Dmitry)
     . Fixed bug #64515 (Memoryleak when using the same variablename two t=
   imes in
       function declaration). (Laruence)
     . Fixed bug #64432 (more empty delimiter warning in strX methods). (L=
   aruence)
     . Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal=
    error).
       (Dmitry)
     . Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_=
   FLOAT']).
       (Anatol)
     . Fixed bug #64239 (Debug backtrace changed behavior since 5.4.10 or =
   5.4.11).
       (Dmitry, Laruence)
     . Fixed bug #63976 (Parent class incorrectly using child constant in =
   class
       property). (Dmitry)
     . 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()) (Dmit=
   ry)

   - PCRE:
     . Merged PCRE 8.32. (Anatol)

   - SNMP:
     . Fixed bug #61981 (OO API, walk: $suffix_as_key is not working corre=
   ctly).
   	(Boris Lytochkin)

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

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

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

   Log Message:
   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 zen=
   d 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 f=
   or 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 exist=
   ence).
       (Anatol)

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

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Jun  7 13:54:33 UTC 2013

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

   Log Message:
   Update php54 to 5.4.16.

   06 Jun 2013, PHP 5.4.16

   - Core:
     . Fixed bug #64879 (Heap based buffer overflow in quoted_printable_en=
   code,
       CVE 2013-2110). (Stas)
     . Fixed bug #64853 (Use of no longer available ini directives causes =
   crash on
       TS build). (Anatol)
     . Fixed bug #64729 (compilation failure on x32). (Gustavo)
     . Fixed bug #64720 (SegFault on zend_deactivate). (Dmitry)
     . Fixed bug #64660 (Segfault on memory exhaustion within function def=
   inition).
       (Stas, reported by Kylm=E4nen)

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

   - Fileinfo:
     . Fixed bug #64830 (mimetype detection segfaults on mp3 file). (Anato=
   l)

   - FPM:
     . Ignore QUERY_STRING when sent in SCRIPT_FILENAME. (Remi)
     . Fixed some possible memory or resource leaks and possible null dere=
   ference
       detected by code coverity scan. (Remi)
     . Log a warning when a syscall fails. (Remi)
     . Add --with-fpm-systemd option to report health to systemd, and
       systemd_interval option to configure this. The service can now use
       Type=3Dnotify in the systemd unit file. (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)

   - SNMP:
     . Fixed bug #64765 (Some IPv6 addresses get interpreted wrong).
       (Boris Lytochkin)
     . Fixed bug #64159 (Truncated snmpget). (Boris Lytochkin)

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

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

3 files changed, 6 insertions, 22 deletions

diff --git a/lang/php54/Makefile.common b/lang/php54/Makefile.common
index cf04c3b5de9..43a4d8c3e56 100644
--- a/lang/php54/Makefile.common
+++ b/lang/php54/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2013/03/16 01:58:53 taca Exp $
+# $NetBSD: Makefile.common,v 1.10.2.1 2013/06/09 20:08:41 tron 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.13
+PHP_BASE_VERS=		5.4.16
 
 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 d4edfab5db8..7d5013b00e1 100644
--- a/lang/php54/distinfo
+++ b/lang/php54/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2013/03/16 01:58:53 taca Exp $
+$NetBSD: distinfo,v 1.15.2.1 2013/06/09 20:08:42 tron Exp $
 
-SHA1 (php-5.4.13.tar.bz2) = 5c229046b5f1d5c1dcd8df6e9cb388aa11504236
-RMD160 (php-5.4.13.tar.bz2) = b2b40fe8bc939b2c315f34a79fa08884c64d3ff9
-Size (php-5.4.13.tar.bz2) = 11545777 bytes
+SHA1 (php-5.4.16.tar.bz2) = 7e70ba419778a54f5ff9d7de8d6190ca82de3786
+RMD160 (php-5.4.16.tar.bz2) = 8fa3d93006f950706fd1f2544108cd69201a4d9e
+Size (php-5.4.16.tar.bz2) = 11690340 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)