Update php54 to 5.4.20, approved by wiz@.

19 Sep 2013, PHP 5.4.20

- Core:
  . Fixed bug #60598 (cli/apache sapi segfault on objects manipulation).
    (Laruence)
  . Fixed bug #65579 (Using traits with get_class_methods causes segfault).
    (Adam)
  . Fixed bug #65490 (Duplicate calls to get lineno & filename for
    DTRACE_FUNCTION_*). (Chris Jones)
  . Fixed bug #65483 (quoted-printable encode stream filter incorrectly encoding
    spaces). (Michael M Slusarz)
  . Fixed bug #65481 (shutdown segfault due to serialize) (Mike)
  . Fixed bug #65470 (Segmentation fault in zend_error() with
    --enable-dtrace). (Chris Jones, Kris Van Hees)
  . Fixed bug #65372 (Segfault in gc_zval_possible_root when return reference
    fails). (Laruence)
  . Fixed bug #65304 (Use of max int in array_sum). (Laruence)
  . Fixed bug #65291 (get_defined_constants() causes PHP to crash in a very
    limited case). (Arpad)
  . Fixed bug #65225 (PHP_BINARY incorrectly set). (Patrick Allaert)
  . Improved fix for bug #63186 (compile failure on netbsd). (Matteo)
  . Fixed bug #62692 (PHP fails to build with DTrace). (Chris Jones, Kris Van Hees)
  . Fixed bug #61759 (class_alias() should accept classes with leading
    backslashes). (Julien)
  . Fixed bug #61345 (CGI mode - make install don't work). (Michael Heimpold)
  . Cherry-picked some DTrace build commits (allowing builds on Linux,
    bug #62691, and bug #63706) from PHP 5.5 branch
  . Fixed bug #61268 (--enable-dtrace leads make to clobber
    Zend/zend_dtrace.d) (Chris Jones)

- cURL:
  . Fixed bug #65458 (curl memory leak). (Adam)

- Datetime:
  . Fixed bug #65554 (createFromFormat broken when weekday name is followed
    by some delimiters). (Valentin Logvinskiy, Stas).
  . Fixed bug #65564 (stack-buffer-overflow in DateTimeZone stuff caught
    by AddressSanitizer). (Remi).

- Openssl:
  . Fixed bug #64802 (openssl_x509_parse fails to parse subject properly in
    some cases). (Mark Jones)

- Session:
  . Fixed bug #62129 (rfc1867 crashes php even though turned off). (gxd305 at
    gmail dot com)
  . Fixed bug #50308 (session id not appended properly for empty anchor tags).
    (Arpad)
  . Fixed possible buffer overflow under Windows. Note: Not a security fix.
    (Yasuo)
  . Changed session.auto_start to PHP_INI_PERDIR. (Yasuo)

- SOAP:
  . Fixed bug #65018 (SoapHeader problems with SoapServer). (Dmitry)

- SPL:
  . Fixed bug #65328 (Segfault when getting SplStack object Value). (Laruence)

- PDO:
  . Fixed bug #64953 (Postgres prepared statement positional parameter
    casting). (Mike)

- Phar:
  . Fixed bug #65028 (Phar::buildFromDirectory creates corrupt archives for
    some specific contents). (Stas)

- Pgsql:
  . Fixed bug #65336 (pg_escape_literal/identifier() silently returns false).
    (Yasuo)
  . Fixed bug #62978 (Disallow possible SQL injections with pg_select()/pg_update()
    /pg_delete()/pg_insert()). (Yasuo)

- Zlib:
  . Fixed bug #65391 (Unable to send vary header user-agent when
    ob_start('ob_gzhandler') is called) (Mike)

5 files changed, 22 insertions, 48 deletions

diff --git a/lang/php54/distinfo b/lang/php54/distinfo
index c3555f8f9f7..e3d777281c1 100644
--- a/lang/php54/distinfo
+++ b/lang/php54/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.26 2013/08/23 03:11:55 taca Exp $
+$NetBSD: distinfo,v 1.27 2013/09/21 16:06:07 taca Exp $
 
-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) = 64941d85b36fa2d44cf544c426cab41c8e4358d1
+SHA1 (php-5.4.20.tar.bz2) = b468faaf1f88dd4dd5dbeb11283dd9d76c523cd5
+RMD160 (php-5.4.20.tar.bz2) = 629a1ac46a8a067bec99e4fb0469ada072fca12e
+Size (php-5.4.20.tar.bz2) = 11700446 bytes
+SHA1 (patch-acinclude.m4) = 71635e5381abf99a9fc9f2537b1c2f18e8096f00
+SHA1 (patch-configure) = ce3205292370fb279033aaa06138cea1a3725ef1
 SHA1 (patch-ext_gd_config.m4) = 2353efe6f25e1081b41d61033c3185cc643c7891
 SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc
 SHA1 (patch-ext_mssql_php__mssql.c) = 732e48b05086180585a3087c2e9737db557dbc3b
@@ -13,9 +13,8 @@ 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_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) = 9a0736e5aee5b50179427013386645acdf74bffc
+SHA1 (patch-sapi_cgi_Makefile.frag) = c271096b8565e89a85b0189c6f503f3fb5cd4b27
 SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 2369bb6a426a7fb47dc73c88f0daa0f6fa67b593
diff --git a/lang/php54/patches/patch-acinclude.m4 b/lang/php54/patches/patch-acinclude.m4
index bb27de121fa..fbf4614e078 100644
--- a/lang/php54/patches/patch-acinclude.m4
+++ b/lang/php54/patches/patch-acinclude.m4
@@ -1,8 +1,8 @@
-$NetBSD: patch-acinclude.m4,v 1.1 2012/06/16 05:21:55 taca Exp $
+$NetBSD: patch-acinclude.m4,v 1.2 2013/09/21 16:06:07 taca Exp $
 
---- acinclude.m4.orig	2012-05-03 17:10:43.000000000 +0000
+--- acinclude.m4.orig	2013-09-18 05:48:57.000000000 +0000
 +++ acinclude.m4
-@@ -2352,7 +2352,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
+@@ -2354,7 +2354,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
    if test "$found_openssl" = "no"; then
    
      if test "$PHP_OPENSSL_DIR" = "yes"; then
diff --git a/lang/php54/patches/patch-configure b/lang/php54/patches/patch-configure
index ebe626611b4..7d2871f8859 100644
--- a/lang/php54/patches/patch-configure
+++ b/lang/php54/patches/patch-configure
@@ -1,17 +1,8 @@
-$NetBSD: patch-configure,v 1.3 2013/08/16 15:28:23 taca Exp $
+$NetBSD: patch-configure,v 1.4 2013/09/21 16:06:07 taca Exp $
 
---- configure.orig	2013-08-14 06:04:57.000000000 +0000
+--- configure.orig	2013-09-18 05:57:45.000000000 +0000
 +++ configure
-@@ -20689,7 +20689,7 @@ _ACEOF
-   cat>>Makefile.objects<<EOF
- 
- $ac_bdir$ac_hdrobj: $abs_srcdir/$ac_provsrc
--	dtrace -h -C -s $ac_srcdir$ac_provsrc -o \$@ && \$(SED) -ibak 's,PHP_,DTRACE_,g' \$@
-+	dtrace -h -C -s $ac_srcdir$ac_provsrc -o \$@ && \$(SED) 's,PHP_,DTRACE_,g' \$@ > \$@.tmp && mv \$@.tmp \$@
- 
- \$(PHP_DTRACE_OBJS): $ac_bdir$ac_hdrobj
- 
-@@ -23476,7 +23476,7 @@ fi
+@@ -23514,7 +23514,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -20,7 +11,7 @@ $NetBSD: patch-configure,v 1.3 2013/08/16 15:28:23 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -25626,7 +25626,7 @@ $as_echo "yes" >&6; }
+@@ -25664,7 +25664,7 @@ $as_echo "yes" >&6; }
      PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
  
  
@@ -29,7 +20,7 @@ $NetBSD: patch-configure,v 1.3 2013/08/16 15:28:23 taca Exp $
  
  
    unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-@@ -36872,7 +36872,7 @@ fi
+@@ -36910,7 +36910,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -38,7 +29,7 @@ $NetBSD: patch-configure,v 1.3 2013/08/16 15:28:23 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -51704,7 +51704,7 @@ fi
+@@ -51742,7 +51742,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -47,7 +38,7 @@ $NetBSD: patch-configure,v 1.3 2013/08/16 15:28:23 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -105814,12 +105814,7 @@ old_CC=$CC
+@@ -105999,12 +105999,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-main_streams_cast.c b/lang/php54/patches/patch-main_streams_cast.c
deleted file mode 100644
index dbea91bf6e5..00000000000
--- a/lang/php54/patches/patch-main_streams_cast.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-main_streams_cast.c,v 1.3 2013/07/08 13:16:21 taca Exp $
-
-* For NetBSD 6.0+, __NetBSD_Version__ should includes 600000000.
-
---- main/streams/cast.c.orig	2013-07-03 06:10:53.000000000 +0000
-+++ main/streams/cast.c
-@@ -33,7 +33,7 @@
- #if defined(HAVE_FUNOPEN) && !defined(HAVE_FOPENCOOKIE)
- 
- /* NetBSD 6.0+ uses off_t instead of fpos_t in funopen */
--# if defined(__NetBSD__) && (__NetBSD_Version__ > 600000000)
-+# if defined(__NetBSD__) && (__NetBSD_Version__ >= 600000000)
- #  define PHP_FPOS_T off_t
- # else
- #  define PHP_FPOS_T fpos_t
diff --git a/lang/php54/patches/patch-sapi_cgi_Makefile.frag b/lang/php54/patches/patch-sapi_cgi_Makefile.frag
index c56a1a5b0e0..fab8c04240c 100644
--- a/lang/php54/patches/patch-sapi_cgi_Makefile.frag
+++ b/lang/php54/patches/patch-sapi_cgi_Makefile.frag
@@ -1,14 +1,13 @@
-$NetBSD: patch-sapi_cgi_Makefile.frag,v 1.2 2013/08/16 15:28:23 taca Exp $
+$NetBSD: patch-sapi_cgi_Makefile.frag,v 1.3 2013/09/21 16:06:07 taca Exp $
 
 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.orig	2013-09-18 05:48:57.000000000 +0000
 +++ sapi/cgi/Makefile.frag
-@@ -4,8 +4,8 @@ $(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(P
- 	$(BUILD_CGI)
- 
+@@ -6,7 +6,8 @@ $(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(P
  install-cgi: $(SAPI_CGI_PATH)
--	@echo "Installing PHP CGI binary:        $(INSTALL_ROOT)$(bindir)/"
+ 	@echo "Installing PHP CGI binary:        $(INSTALL_ROOT)$(bindir)/"
+ 	@$(mkinstalldirs) $(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@/$(program_prefix)php$(program_suffix)$(EXEEXT)