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)

7 files changed, 29 insertions, 276 deletions

diff --git a/lang/php54/Makefile b/lang/php54/Makefile
index 2370f30708a..21f12e613c5 100644
--- a/lang/php54/Makefile
+++ b/lang/php54/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2013/08/14 15:43:22 taca Exp $
+# $NetBSD: Makefile,v 1.14 2013/08/16 15:28:23 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=		php-${PHP_BASE_VERS}
-PKGREVISION=		2
 CATEGORIES=		lang
 
 HOMEPAGE=		http://www.php.net/
@@ -34,7 +33,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/PLIST b/lang/php54/PLIST
index 3dda1bbaf97..661b57dcb0c 100644
--- a/lang/php54/PLIST
+++ b/lang/php54/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2013/07/21 17:29:47 taca Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/08/16 15:28:23 taca Exp $
 bin/phar
 bin/phar.phar
 bin/php
@@ -228,6 +228,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 39f5c867672..c6aab410c64 100644
--- a/lang/php54/distinfo
+++ b/lang/php54/distinfo
@@ -1,23 +1,21 @@
-$NetBSD: distinfo,v 1.23 2013/08/16 00:38:24 taca Exp $
+$NetBSD: distinfo,v 1.24 2013/08/16 15:28:23 taca 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.18.tar.bz2) = 38592e3ba06f2004ccf5d38251782d3f4580a740
+RMD160 (php-5.4.18.tar.bz2) = 4310a38c110b34c3aba6aabed520ec910a4a945c
+Size (php-5.4.18.tar.bz2) = 11691676 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
-SHA1 (patch-ext_openssl_openssl.c) = 5413f54cb3ba40b61ba74c4350446120020334a6
 SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390
 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) = b0d838e5e5b04afdd2d47973cd028d3e43ca2b1c
 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..ebe626611b4 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.3 2013/08/16 15:28:23 taca 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_openssl_openssl.c b/lang/php54/patches/patch-ext_openssl_openssl.c
deleted file mode 100644
index 75cb407dddd..00000000000
--- a/lang/php54/patches/patch-ext_openssl_openssl.c
+++ /dev/null
@@ -1,114 +0,0 @@
-$NetBSD: patch-ext_openssl_openssl.c,v 1.2 2013/08/16 00:38:24 taca Exp $
-
-Fix for CVE-2013-4248.
-
---- ext/openssl/openssl.c.orig	2013-07-03 06:10:53.000000000 +0000
-+++ ext/openssl/openssl.c
-@@ -1398,6 +1398,75 @@ PHP_FUNCTION(openssl_x509_check_private_
- }
- /* }}} */
- 
-+
-+/* Special handling of subjectAltName, see CVE-2013-4073
-+ * Christian Heimes
-+ */
-+
-+static int openssl_x509v3_subjectAltName(BIO *bio, X509_EXTENSION *extension)
-+{
-+	GENERAL_NAMES *names;
-+	const X509V3_EXT_METHOD *method = NULL;
-+	long i, length, num;
-+	const unsigned char *p;
-+
-+	method = X509V3_EXT_get(extension);
-+	if (method == NULL) {
-+		return -1;
-+	}
-+
-+	p = extension->value->data;
-+	length = extension->value->length;
-+	if (method->it) {
-+		names = (GENERAL_NAMES*)(ASN1_item_d2i(NULL, &p, length,
-+						       ASN1_ITEM_ptr(method->it)));
-+	} else {
-+		names = (GENERAL_NAMES*)(method->d2i(NULL, &p, length));
-+	}
-+	if (names == NULL) {
-+		return -1;
-+	}
-+
-+	num = sk_GENERAL_NAME_num(names);
-+	for (i = 0; i < num; i++) {
-+		GENERAL_NAME *name;
-+		ASN1_STRING *as;
-+		name = sk_GENERAL_NAME_value(names, i);
-+		switch (name->type) {
-+		case GEN_EMAIL:
-+			BIO_puts(bio, "email:");
-+			as = name->d.rfc822Name;
-+			BIO_write(bio, ASN1_STRING_data(as),
-+				  ASN1_STRING_length(as));
-+			break;
-+		case GEN_DNS:
-+			BIO_puts(bio, "DNS:");
-+			as = name->d.dNSName;
-+			BIO_write(bio, ASN1_STRING_data(as),
-+				  ASN1_STRING_length(as));
-+			break;
-+		case GEN_URI:
-+			BIO_puts(bio, "URI:");
-+			as = name->d.uniformResourceIdentifier;
-+			BIO_write(bio, ASN1_STRING_data(as),
-+				  ASN1_STRING_length(as));
-+			break;
-+		default:
-+			/* use builtin print for GEN_OTHERNAME, GEN_X400,
-+			 * GEN_EDIPARTY, GEN_DIRNAME, GEN_IPADD and GEN_RID
-+			 */
-+			GENERAL_NAME_print(bio, name);
-+		}
-+		/* trailing ', ' except for last element */
-+		if (i < (num - 1)) {
-+			BIO_puts(bio, ", ");
-+		}
-+	}
-+	sk_GENERAL_NAME_pop_free(names, GENERAL_NAME_free);
-+
-+	return 0;
-+}
-+
- /* {{{ proto array openssl_x509_parse(mixed x509 [, bool shortnames=true])
-    Returns an array of the fields/values of the CERT */
- PHP_FUNCTION(openssl_x509_parse)
-@@ -1494,15 +1563,29 @@ PHP_FUNCTION(openssl_x509_parse)
- 
- 
- 	for (i = 0; i < X509_get_ext_count(cert); i++) {
-+		int nid;
- 		extension = X509_get_ext(cert, i);
--		if (OBJ_obj2nid(X509_EXTENSION_get_object(extension)) != NID_undef) {
-+		nid = OBJ_obj2nid(X509_EXTENSION_get_object(extension));
-+		if (nid != NID_undef) {
- 			extname = (char *)OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(extension)));
- 		} else {
- 			OBJ_obj2txt(buf, sizeof(buf)-1, X509_EXTENSION_get_object(extension), 1);
- 			extname = buf;
- 		}
- 		bio_out = BIO_new(BIO_s_mem());
--		if (X509V3_EXT_print(bio_out, extension, 0, 0)) {
-+		if (nid == NID_subject_alt_name) {
-+			if (openssl_x509v3_subjectAltName(bio_out, extension) == 0) {
-+				add_assoc_stringl(subitem, extname, bio_buf->data, bio_buf->length, 1);
-+			} else {
-+				zval_dtor(return_value);
-+				if (certresource == -1 && cert) {
-+					X509_free(cert);
-+				}
-+				BIO_free(bio_out);
-+				RETURN_FALSE;
-+			}
-+		}
-+		else if (X509V3_EXT_print(bio_out, extension, 0, 0)) {
- 			BIO_get_mem_ptr(bio_out, &bio_buf);
- 			add_assoc_stringl(subitem, extname, bio_buf->data, bio_buf->length, 1);
- 		} else {
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 d75ac5fca53..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 2013/07/29 16:22:38 taca 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..c56a1a5b0e0 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.2 2013/08/16 15:28:23 taca 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