Pullup ticket #4222 - requested by taca

lang/php54: security update

Revisions pulled up:
- lang/php/phpversion.mk                                    1.40,1.42 via patch
- lang/php54/Makefile                                       1.13-1.14
- lang/php54/Makefile.common                                patch
- lang/php54/PLIST                                          1.5
- lang/php54/distinfo                                       1.22-1.26 via patch
- lang/php54/patches/patch-configure                        1.3
- lang/php54/patches/patch-ext_openssl_openssl.c            deleted
- lang/php54/patches/patch-ext_xml_xml.c                    deleted
- lang/php54/patches/patch-sapi_cgi_Makefile.frag           1.2

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Wed Aug 14 15:43:22 UTC 2013

   Modified Files:
   	pkgsrc/lang/php54: Makefile distinfo
   Added Files:
   	pkgsrc/lang/php54/patches: patch-ext_openssl_openssl.c

   Log Message:
   Add fix fo openssl, CVE-2013-4073.

   Bump PKGREVISION.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Aug 16 00:38:24 UTC 2013

   Modified Files:
   	pkgsrc/lang/php54: distinfo
   	pkgsrc/lang/php54/patches: patch-ext_openssl_openssl.c

   Log Message:
   Since openssl's security problem has assigned CVE-2013-4248, update comment
   in the patch file.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Aug 16 15:28:23 UTC 2013

   Modified Files:
   	pkgsrc/lang/php: phpversion.mk
   	pkgsrc/lang/php54: Makefile PLIST distinfo
   	pkgsrc/lang/php54/patches: patch-configure patch-sapi_cgi_Makefile.frag
   Removed Files:
   	pkgsrc/lang/php54/patches: patch-ext_openssl_openssl.c
   	    patch-ext_xml_xml.c

   Log Message:
   Update php54 to 5.4.18.

   15 Aug 2013, PHP 5.4.18

   - Core:
     . Fixed value of FILTER_SANITIZE_FULL_SPECIAL_CHARS constant (previously was
       erroneously set to FILTER_SANITIZE_SPECIAL_CHARS value). (Andrey
       avp200681 gmail com).
     . Fixed bug #65254 (Exception not catchable when exception thrown in autoload
       with a namespace). (Laruence)
     . Fixed bug #65108 (is_callable() triggers Fatal Error).
       (David Soria Parra, Laruence)
     . Fixed bug #65088 (Generated configure script is malformed on OpenBSD).
       (Adam)
     . Fixed bug #62964 (Possible XSS on "Registered stream filters" info).
       (david at nnucomputerwhiz dot com)
     . Fixed bug #62672 (Error on serialize of ArrayObject). (Lior Kaplan)
     . Fixed bug #62475 (variant_* functions causes crash when null given as an
       argument). (Felipe)
     . Fixed bug #60732 (php_error_docref links to invalid pages). (Jakub Vrana)
     . Fixed bug #65226 (chroot() does not get enabled). (Anatol)

   - CGI:
     . Fixed Bug #65143 (Missing php-cgi man page). (Remi)

   - CLI server:
     . Fixed bug #65066 (Cli server not responsive when responding with 422 http
       status code). (Adam)

   - CURL:
     . Fixed bug #62665 (curl.cainfo doesn't appear in php.ini). (Lior Kaplan)

   - FPM:
     . Fixed bug #63983 (enabling FPM borks compile on FreeBSD).
       (chibisuke at web dot de, Felipe)

   - FTP:
     . Fixed bug #65228 (FTPs memory leak with SSL).
       (marco dot beierer at mbsecurity dot ch)

   - GMP:
     . Fixed bug #65227 (Memory leak in gmp_cmp second parameter). (Felipe)

   - Imap:
     . Fixed bug #64467 (Segmentation fault after imap_reopen failure).
       (askalski at gmail dot com)

   - Intl:
     . Fixed bug #62759 (Buggy grapheme_substr() on edge case). (Stas)
     . Fixed bug #61860 (Offsets may be wrong for grapheme_stri* functions).
       (Stas)

   - mysqlnd:
     . Fixed segfault in mysqlnd when doing long prepare. (Andrey)

   - ODBC:
     . Fixed bug #61387 (NULL valued anonymous column causes segfault in
       odbc_fetch_array). (Brandon Kirsch)

   - Openssl:
     . Fixed handling null bytes in subjectAltName (CVE-2013-4073).
       (Christian Heimes)

   - PDO:
     . Allowed PDO_OCI to compile with Oracle Database 12c client libraries.
       (Chris Jones)

   - PDO_dblib:
     . Fixed bug #65219 (PDO/dblib not working anymore ("use dbName" not sent)).
       (Stanley Sufficool)

   - PDO_pgsql:
     . Fixed meta data retrieve when OID is larger than 2^31. (Yasuo)

   - Phar:
     . Fixed Bug #65142 (Missing phar man page). (Remi)

   - Session
     . Fixed bug #62535 ($_SESSION[$key]["cancel_upload"] doesn't work as
       documented). (Arpad)
     . Fixed bug #35703 (when session_name("123") consist only digits,
       should warning). (Yasuo)
     . Fixed bug #49175 (mod_files.sh does not support hash bits). Patch by
       oorza2k5 at gmail dot com (Yasuo)

   - Sockets:
     . Implemented FR #63472 (Setting SO_BINDTODEVICE with socket_set_option).
       (Damjan Cvetko)

   - SPL:
     . Fixed bug #65136 (RecursiveDirectoryIterator segfault). (Laruence)
     . Fixed bug #61828 (Memleak when calling Directory(Recursive)Iterator
       /Spl(Temp)FileObject ctor twice). (Laruence)
     . Fixed bug #60560 (SplFixedArray un-/serialize, getSize(), count() return 0,
       keys are strings). (Adam)

   - XML:
     . Fixed bug #65236 (heap corruption in xml parser, CVE-2013-4113). (Rob)

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sat Aug 17 00:35:08 UTC 2013

   Modified Files:
   	pkgsrc/lang/php54: distinfo

   Log Message:
   Make sure to update distinfo.  Thanks to Greg Oster noted the problem to me.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Aug 23 03:11:55 UTC 2013

   Modified Files:
   	pkgsrc/lang/php: phpversion.mk
   	pkgsrc/lang/php54: distinfo

   Log Message:
   Update php54 to 5.4.19.

   22 Aug 2013, PHP 5.4.19
   - Core:
     . Fixed bug #64503 (Compilation fails with error: conflicting types for
       'zendparse'). (Laruence)

   - Openssl:
     . Fixed UMR in fix for CVE-2013-4248.

8 files changed, 36 insertions, 202 deletions

diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk
index 580c0acb490..a2c7bc721f4 100644
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.34.2.2 2013/08/25 16:56:44 tron Exp $
+# $NetBSD: phpversion.mk,v 1.34.2.3 2013/08/25 17:26:38 tron Exp $
 #
 # This file selects a PHP version, based on the user's preferences and
 # the installed packages. It does not add a dependency on the PHP
@@ -82,7 +82,7 @@ PHPVERSION_MK=	defined
 
 # Define each PHP's version.
 PHP53_VERSION=	5.3.27
-PHP54_VERSION=	5.4.17
+PHP54_VERSION=	5.4.19
 
 # Define initial release of major version.
 PHP53_RELDATE=	20090630
diff --git a/lang/php54/Makefile b/lang/php54/Makefile
index 9d0114c927f..7c97c2ec625 100644
--- a/lang/php54/Makefile
+++ b/lang/php54/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8.4.1 2013/08/04 20:24:10 spz Exp $
+# $NetBSD: Makefile,v 1.8.4.2 2013/08/25 17:26:38 tron Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=		php-${PHP_BASE_VERS}
-PKGREVISION=		1
 CATEGORIES=		lang
 
 HOMEPAGE=		http://www.php.net/
@@ -31,7 +30,7 @@ PLIST_SUBST+=		PHPEXTDIR="${PHP_EXTENSION_DIR}"
 SUBST_CLASSES+=		path
 SUBST_MESSAGE.path=	Fixing common paths.
 SUBST_STAGE.path=	pre-configure
-SUBST_FILES.path=	configure ext/phar/phar/phar.php
+SUBST_FILES.path=	ext/phar/phar/phar.php
 SUBST_FILES.path+=	php.ini-development php.ini-production run-tests.php
 SUBST_FILES.path+=	sapi/cgi/Makefile.frag
 SUBST_SED.path=		-e 's,@CGIDIR@,${CGIDIR},g'
diff --git a/lang/php54/Makefile.common b/lang/php54/Makefile.common
index 625832d4d6d..0e3e07ad35d 100644
--- a/lang/php54/Makefile.common
+++ b/lang/php54/Makefile.common
@@ -1,49 +1,15 @@
-# $NetBSD: Makefile.common,v 1.13.2.1 2013/08/06 14:55:05 tron Exp $
+# $NetBSD: Makefile.common,v 1.13.2.2 2013/08/25 17:26:38 tron Exp $
 # used by lang/php54/Makefile.php
 # used by lang/php/ext.mk
 # used by meta-pkgs/php54-extensions/Makefile
 
-#
-# NOTE:
-# The suhosin option includes a patch from http://www.hardened-php.net/
-# Which tracks with the exact version number of PHP.  There may be a delay
-# in the patch which can leave the option broken until an updated patch
-# is released.  When updating PHP please don't forget to update the
-# distnfo with the details of the suhosin patch as well.
-#
-# Check these packages when update to new release of PHP and consider to
-# reset PKG_REVISION:
-#
-#	databases/php-mysqlnd (not yet packaged)
-#	misc/php-intl
-#	textproc/php-enchant
-#
-# Since other PHP extensions are shared between www/php5, we can't reset
-# PKGREVSION.
-#
+PHP_VERSION_REQD=	54
+PHP_BASE_VERS=		${PHP54_VERSION}
 
-.if !defined(DISTNAME)
-DISTNAME=		php-${PHP_BASE_VERS}
-.endif
-CATEGORIES+=		www
-
-.if !defined(PECL_VERSION)
-MASTER_SITES?=		http://www.php.net/distributions/ \
-			http://uk.php.net/distributions/ \
-			http://de.php.net/distributions/ \
-			http://us.php.net/distributions/
-EXTRACT_SUFX?=		.tar.bz2
-.endif
+.include "../../lang/php/common.mk"
 
+CATEGORIES+=		www
 MAINTAINER?=		pkgsrc-users@NetBSD.org
-HOMEPAGE?=		http://www.php.net/
-
-PHP_BASE_VERS=		5.4.17
-
-PHP_EXTENSION_DIR=	lib/php/20120301
-PLIST_SUBST+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
-
-PKG_SYSCONFVAR?=	php
 
 # needed due to (broken?) configure checks in php-xmlrpc and php5-dom
 CONFIGURE_ENV+=		PHP_LIBXML_SHARED="1"
diff --git a/lang/php54/PLIST b/lang/php54/PLIST
index 6646f4e949b..3f6aecac7aa 100644
--- a/lang/php54/PLIST
+++ b/lang/php54/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2012/08/17 15:34:01 taca Exp $
+@comment $NetBSD: PLIST,v 1.3.8.1 2013/08/25 17:26:38 tron Exp $
 bin/phar
 bin/phar.phar
 bin/php
@@ -231,6 +231,9 @@ lib/php/build/run-tests.php
 lib/php/build/scan_makefile_in.awk
 lib/php/build/shtool
 libexec/cgi-bin/php
+man/man1/phar.1
+man/man1/phar.phar.1
+man/man1/php-cgi.1
 man/man1/php-config.1
 man/man1/php.1
 man/man1/phpize.1
diff --git a/lang/php54/distinfo b/lang/php54/distinfo
index 3f0343443b1..365e24584a9 100644
--- a/lang/php54/distinfo
+++ b/lang/php54/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.18.2.2 2013/08/06 14:55:05 tron Exp $
+$NetBSD: distinfo,v 1.18.2.3 2013/08/25 17:26:38 tron Exp $
 
-SHA1 (php-5.4.17.tar.bz2) = 7151b2cef85aaf3c2109ee28e88d01ddb6274d5b
-RMD160 (php-5.4.17.tar.bz2) = b167420094885593f068bcd3a012452a0156bb5b
-Size (php-5.4.17.tar.bz2) = 11697434 bytes
+SHA1 (php-5.4.19.tar.bz2) = 465f4cd1f8a0fec3c63b79b229bc3893770e2d0b
+RMD160 (php-5.4.19.tar.bz2) = 1b03e20b89d360ccaeac41e1a972a781b891e83a
+Size (php-5.4.19.tar.bz2) = 11692563 bytes
 SHA1 (patch-acinclude.m4) = afead7122844e8290d9ef4fdb8deec3c40cf0746
-SHA1 (patch-configure) = 5930b32de104cda553c9701086ffdf35a93f8d97
+SHA1 (patch-configure) = 64941d85b36fa2d44cf544c426cab41c8e4358d1
 SHA1 (patch-ext_gd_config.m4) = 2353efe6f25e1081b41d61033c3185cc643c7891
 SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc
 SHA1 (patch-ext_mssql_php__mssql.c) = 732e48b05086180585a3087c2e9737db557dbc3b
@@ -13,10 +13,9 @@ 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-ext_xml_xml.c) = 77785dd4849efe07746061a0b385989b9f7cc1bd
 SHA1 (patch-main_streams_cast.c) = 955aee9efb4868e00fbfc443bb7d92c71844a853
 SHA1 (patch-php.ini-development) = 79512bd276adaed6bcf5f7f28e965f8a6b589add
 SHA1 (patch-php.ini-production) = f5d275abe7668a139999b3607e99f271450f56ae
 SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d
-SHA1 (patch-sapi_cgi_Makefile.frag) = ba16463cc2a350df1db80c78ac9aec44b20d4bfe
+SHA1 (patch-sapi_cgi_Makefile.frag) = 9a0736e5aee5b50179427013386645acdf74bffc
 SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 2369bb6a426a7fb47dc73c88f0daa0f6fa67b593
diff --git a/lang/php54/patches/patch-configure b/lang/php54/patches/patch-configure
index e2811eb30d9..d2c7a36199c 100644
--- a/lang/php54/patches/patch-configure
+++ b/lang/php54/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.2 2012/07/25 13:01:05 fhajny Exp $
+$NetBSD: patch-configure,v 1.2.8.1 2013/08/25 17:26:38 tron Exp $
 
---- configure.orig	2012-06-13 06:08:07.000000000 +0000
+--- configure.orig	2013-08-14 06:04:57.000000000 +0000
 +++ configure
-@@ -20528,7 +20528,7 @@ _ACEOF
+@@ -20689,7 +20689,7 @@ _ACEOF
    cat>>Makefile.objects<<EOF
  
  $ac_bdir$ac_hdrobj: $abs_srcdir/$ac_provsrc
@@ -11,7 +11,7 @@ $NetBSD: patch-configure,v 1.2 2012/07/25 13:01:05 fhajny Exp $
  
  \$(PHP_DTRACE_OBJS): $ac_bdir$ac_hdrobj
  
-@@ -23313,7 +23313,7 @@ fi
+@@ -23476,7 +23476,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -20,7 +20,7 @@ $NetBSD: patch-configure,v 1.2 2012/07/25 13:01:05 fhajny Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -25312,7 +25312,7 @@ $as_echo "yes" >&6; }
+@@ -25626,7 +25626,7 @@ $as_echo "yes" >&6; }
      PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
  
  
@@ -29,7 +29,7 @@ $NetBSD: patch-configure,v 1.2 2012/07/25 13:01:05 fhajny Exp $
  
  
    unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-@@ -36556,7 +36556,7 @@ fi
+@@ -36872,7 +36872,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -38,7 +38,7 @@ $NetBSD: patch-configure,v 1.2 2012/07/25 13:01:05 fhajny Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -51090,7 +51090,7 @@ fi
+@@ -51704,7 +51704,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -47,7 +47,7 @@ $NetBSD: patch-configure,v 1.2 2012/07/25 13:01:05 fhajny Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -105147,12 +105147,7 @@ old_CC=$CC
+@@ -105814,12 +105814,7 @@ old_CC=$CC
  if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
    CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
    INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
diff --git a/lang/php54/patches/patch-ext_xml_xml.c b/lang/php54/patches/patch-ext_xml_xml.c
deleted file mode 100644
index c5a64a3ecf9..00000000000
--- a/lang/php54/patches/patch-ext_xml_xml.c
+++ /dev/null
@@ -1,137 +0,0 @@
-$NetBSD: patch-ext_xml_xml.c,v 1.1.2.2 2013/08/04 20:24:10 spz Exp $
-
-Fix for CVE-2013-4113 as php 5.3.27.
-
---- ext/xml/xml.c.orig	2013-07-03 06:10:53.000000000 +0000
-+++ ext/xml/xml.c
-@@ -428,7 +428,7 @@ static void xml_parser_dtor(zend_rsrc_li
- 	}
- 	if (parser->ltags) {
- 		int inx;
--		for (inx = 0; inx < parser->level; inx++)
-+		for (inx = 0; ((inx < parser->level) && (inx < XML_MAXLEVEL)); inx++)
- 			efree(parser->ltags[ inx ]);
- 		efree(parser->ltags);
- 	}
-@@ -805,45 +805,50 @@ void _xml_startElementHandler(void *user
- 		} 
- 
- 		if (parser->data) {
--			zval *tag, *atr;
--			int atcnt = 0;
-+			if (parser->level <= XML_MAXLEVEL)  {
-+				zval *tag, *atr;
-+				int atcnt = 0;
- 
--			MAKE_STD_ZVAL(tag);
--			MAKE_STD_ZVAL(atr);
-+				MAKE_STD_ZVAL(tag);
-+				MAKE_STD_ZVAL(atr);
- 
--			array_init(tag);
--			array_init(atr);
-+				array_init(tag);
-+				array_init(atr);
- 
--			_xml_add_to_info(parser,((char *) tag_name) + parser->toffset);
-+				_xml_add_to_info(parser,((char *) tag_name) + parser->toffset);
- 
--			add_assoc_string(tag,"tag",((char *) tag_name) + parser->toffset,1); /* cast to avoid gcc-warning */
--			add_assoc_string(tag,"type","open",1);
--			add_assoc_long(tag,"level",parser->level);
-+				add_assoc_string(tag,"tag",((char *) tag_name) + parser->toffset,1); /* cast to avoid gcc-warning */
-+				add_assoc_string(tag,"type","open",1);
-+				add_assoc_long(tag,"level",parser->level);
- 
--			parser->ltags[parser->level-1] = estrdup(tag_name);
--			parser->lastwasopen = 1;
-+				parser->ltags[parser->level-1] = estrdup(tag_name);
-+				parser->lastwasopen = 1;
- 
--			attributes = (const XML_Char **) attrs;
-+				attributes = (const XML_Char **) attrs;
- 
--			while (attributes && *attributes) {
--				att = _xml_decode_tag(parser, attributes[0]);
--				val = xml_utf8_decode(attributes[1], strlen(attributes[1]), &val_len, parser->target_encoding);
--				
--				add_assoc_stringl(atr,att,val,val_len,0);
-+				while (attributes && *attributes) {
-+					att = _xml_decode_tag(parser, attributes[0]);
-+					val = xml_utf8_decode(attributes[1], strlen(attributes[1]), &val_len, parser->target_encoding);
- 
--				atcnt++;
--				attributes += 2;
-+					add_assoc_stringl(atr,att,val,val_len,0);
- 
--				efree(att);
--			}
-+					atcnt++;
-+					attributes += 2;
- 
--			if (atcnt) {
--				zend_hash_add(Z_ARRVAL_P(tag),"attributes",sizeof("attributes"),&atr,sizeof(zval*),NULL);
--			} else {
--				zval_ptr_dtor(&atr);
--			}
-+					efree(att);
-+				}
-+
-+				if (atcnt) {
-+					zend_hash_add(Z_ARRVAL_P(tag),"attributes",sizeof("attributes"),&atr,sizeof(zval*),NULL);
-+				} else {
-+					zval_ptr_dtor(&atr);
-+				}
- 
--			zend_hash_next_index_insert(Z_ARRVAL_P(parser->data),&tag,sizeof(zval*),(void *) &parser->ctag);
-+				zend_hash_next_index_insert(Z_ARRVAL_P(parser->data),&tag,sizeof(zval*),(void *) &parser->ctag);
-+			} else if (parser->level == (XML_MAXLEVEL + 1)) {
-+				TSRMLS_FETCH();
-+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Maximum depth exceeded - Results truncated");
-+			}
- 		}
- 
- 		efree(tag_name);
-@@ -895,7 +900,7 @@ void _xml_endElementHandler(void *userDa
- 
- 		efree(tag_name);
- 
--		if (parser->ltags) {
-+		if ((parser->ltags) && (parser->level <= XML_MAXLEVEL)) {
- 			efree(parser->ltags[parser->level-1]);
- 		}
- 
-@@ -979,18 +984,23 @@ void _xml_characterDataHandler(void *use
- 						}
- 					}
- 
--					MAKE_STD_ZVAL(tag);
--					
--					array_init(tag);
--					
--					_xml_add_to_info(parser,parser->ltags[parser->level-1] + parser->toffset);
-+					if (parser->level <= XML_MAXLEVEL) {
-+						MAKE_STD_ZVAL(tag);
- 
--					add_assoc_string(tag,"tag",parser->ltags[parser->level-1] + parser->toffset,1);
--					add_assoc_string(tag,"value",decoded_value,0);
--					add_assoc_string(tag,"type","cdata",1);
--					add_assoc_long(tag,"level",parser->level);
-+						array_init(tag);
- 
--					zend_hash_next_index_insert(Z_ARRVAL_P(parser->data),&tag,sizeof(zval*),NULL);
-+						_xml_add_to_info(parser,parser->ltags[parser->level-1] + parser->toffset);
-+
-+						add_assoc_string(tag,"tag",parser->ltags[parser->level-1] + parser->toffset,1);
-+						add_assoc_string(tag,"value",decoded_value,0);
-+						add_assoc_string(tag,"type","cdata",1);
-+						add_assoc_long(tag,"level",parser->level);
-+
-+						zend_hash_next_index_insert(Z_ARRVAL_P(parser->data),&tag,sizeof(zval*),NULL);
-+					} else if (parser->level == (XML_MAXLEVEL + 1)) {
-+						TSRMLS_FETCH();
-+						php_error_docref(NULL TSRMLS_CC, E_WARNING, "Maximum depth exceeded - Results truncated");
-+					}
- 				}
- 			} else {
- 				efree(decoded_value);
diff --git a/lang/php54/patches/patch-sapi_cgi_Makefile.frag b/lang/php54/patches/patch-sapi_cgi_Makefile.frag
index 3e704a96373..1cdf98b278e 100644
--- a/lang/php54/patches/patch-sapi_cgi_Makefile.frag
+++ b/lang/php54/patches/patch-sapi_cgi_Makefile.frag
@@ -1,13 +1,17 @@
-$NetBSD: patch-sapi_cgi_Makefile.frag,v 1.1 2012/06/16 05:21:55 taca Exp $
+$NetBSD: patch-sapi_cgi_Makefile.frag,v 1.1.10.1 2013/08/25 17:26:38 tron Exp $
 
---- sapi/cgi/Makefile.frag.orig	2012-05-03 17:10:43.000000000 +0000
+Install cgi binary as php instead of php-cgi.
+
+--- sapi/cgi/Makefile.frag.orig	2013-08-14 05:47:24.000000000 +0000
 +++ sapi/cgi/Makefile.frag
-@@ -4,6 +4,6 @@ $(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(P
+@@ -4,8 +4,8 @@ $(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(P
  	$(BUILD_CGI)
  
  install-cgi: $(SAPI_CGI_PATH)
 -	@echo "Installing PHP CGI binary:        $(INSTALL_ROOT)$(bindir)/"
 -	@$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT)
 +	@echo "Installing PHP CGI binary:        $(INSTALL_ROOT)@CGIDIR@/"
-+	@$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)@CGIDIR@/php
- 
++	@$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)@CGIDIR@/$(program_prefix)php$(program_suffix)$(EXEEXT)
+ 	@echo "Installing PHP CGI man page:      $(INSTALL_ROOT)$(mandir)/man1/"
+ 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
+ 	@$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1