Update php to 5.4.24.

09 Jan 2014, PHP 5.4.24

- Core:
  . Added validation of class names in the autoload process. (Dmitry)
  . Fixed invalid C code in zend_strtod.c. (Lior Kaplan)
  . Fixed bug #61645 (fopen and O_NONBLOCK). (Mike)

- Date:
  . Fixed bug #66060 (Heap buffer over-read in DateInterval). (Remi)
  . Fixed bug #63391 (Incorrect/inconsistent day of week prior to the year
    1600). (Derick, T. Carter)
  . Fixed bug #61599 (Wrong Day of Week). (Derick, T. Carter)

- DOM:
  . Fixed bug #65196 (Passing DOMDocumentFragment to DOMDocument::saveHTML()
    Produces invalid Markup). (Mike)

- Exif:
  . Fixed bug #65873 (Integer overflow in exif_read_data()). (Stas)

- Filter:
  . Fixed bug #66229 (128.0.0.0/16 isn't reserved any longer). (Adam)

- GD:
  . Fixed bug #64405 (Use freetype-config for determining freetype2 dir(s)).
    (Adam)

- PDO_odbc:
  . Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries).
    (michael at orlitzky dot com)

- SNMP:
  . Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)

- XSL
  . Fixed bug #49634 (Segfault throwing an exception in a XSL registered
    function). (Mike)

- ZIP:
  . Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real). (Remi)

7 files changed, 26 insertions, 58 deletions

diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk
index 447f7a758a3..3439232ede7 100644
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.52 2013/12/13 15:33:22 taca Exp $
+# $NetBSD: phpversion.mk,v 1.53 2014/01/11 17:03:57 taca 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.28
-PHP54_VERSION=	5.4.23
+PHP54_VERSION=	5.4.24
 PHP55_VERSION=	5.5.7
 
 # Define initial release of major version.
diff --git a/lang/php54/distinfo b/lang/php54/distinfo
index 757810404c1..6c5a79e1605 100644
--- a/lang/php54/distinfo
+++ b/lang/php54/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.31 2013/12/13 15:32:21 taca Exp $
+$NetBSD: distinfo,v 1.32 2014/01/11 17:03:57 taca Exp $
 
-SHA1 (php-5.4.23.tar.bz2) = 1ad25b03486742dba18134ce07111146805d930f
-RMD160 (php-5.4.23.tar.bz2) = 3a5e3b7a6013f5a284c80d41a95989ba2a78b6d4
-Size (php-5.4.23.tar.bz2) = 12251671 bytes
+SHA1 (php-5.4.24.tar.bz2) = 0f6c16e393a837b1576e3a332ade6ae7c1f5305b
+RMD160 (php-5.4.24.tar.bz2) = 8248a1314986b071de990f725fc802729ca97e3c
+Size (php-5.4.24.tar.bz2) = 12256796 bytes
 SHA1 (patch-acinclude.m4) = 71635e5381abf99a9fc9f2537b1c2f18e8096f00
-SHA1 (patch-configure) = ce3205292370fb279033aaa06138cea1a3725ef1
-SHA1 (patch-ext_date_lib_parse__iso__intervals.c) = c2b18faed698a6ace171ca93cd082985ac3e1b83
-SHA1 (patch-ext_date_lib_parse__iso__intervals.re) = 1a6b18d1d9bec66b0ab67cb2f602cc9ef97678b1
+SHA1 (patch-configure) = 592b4521f78d7dbfa666dab21e85a64196c3978c
 SHA1 (patch-ext_gd_config.m4) = 2353efe6f25e1081b41d61033c3185cc643c7891
 SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc
 SHA1 (patch-ext_mssql_php__mssql.c) = 732e48b05086180585a3087c2e9737db557dbc3b
@@ -15,8 +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-php.ini-development) = 79512bd276adaed6bcf5f7f28e965f8a6b589add
-SHA1 (patch-php.ini-production) = f5d275abe7668a139999b3607e99f271450f56ae
+SHA1 (patch-php.ini-development) = e6c4509378e26534d06103751d5616823492e18f
+SHA1 (patch-php.ini-production) = a24a270e27b0163178c4f0ba4aac753794707f21
 SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d
 SHA1 (patch-sapi_cgi_Makefile.frag) = c271096b8565e89a85b0189c6f503f3fb5cd4b27
 SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 2369bb6a426a7fb47dc73c88f0daa0f6fa67b593
diff --git a/lang/php54/patches/patch-configure b/lang/php54/patches/patch-configure
index 7d2871f8859..79bf78c4bad 100644
--- a/lang/php54/patches/patch-configure
+++ b/lang/php54/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.4 2013/09/21 16:06:07 taca Exp $
+$NetBSD: patch-configure,v 1.5 2014/01/11 17:03:57 taca Exp $
 
---- configure.orig	2013-09-18 05:57:45.000000000 +0000
+--- configure.orig	2014-01-08 02:58:52.000000000 +0000
 +++ configure
-@@ -23514,7 +23514,7 @@ fi
+@@ -23554,7 +23554,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -11,7 +11,7 @@ $NetBSD: patch-configure,v 1.4 2013/09/21 16:06:07 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -25664,7 +25664,7 @@ $as_echo "yes" >&6; }
+@@ -25704,7 +25704,7 @@ $as_echo "yes" >&6; }
      PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
  
  
@@ -20,7 +20,7 @@ $NetBSD: patch-configure,v 1.4 2013/09/21 16:06:07 taca Exp $
  
  
    unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-@@ -36910,7 +36910,7 @@ fi
+@@ -36944,7 +36944,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -29,7 +29,7 @@ $NetBSD: patch-configure,v 1.4 2013/09/21 16:06:07 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -51742,7 +51742,7 @@ fi
+@@ -51409,7 +51409,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -38,7 +38,7 @@ $NetBSD: patch-configure,v 1.4 2013/09/21 16:06:07 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -105999,12 +105999,7 @@ old_CC=$CC
+@@ -105616,12 +105616,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_date_lib_parse__iso__intervals.c b/lang/php54/patches/patch-ext_date_lib_parse__iso__intervals.c
deleted file mode 100644
index a49dcca18c4..00000000000
--- a/lang/php54/patches/patch-ext_date_lib_parse__iso__intervals.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ext_date_lib_parse__iso__intervals.c,v 1.1 2013/12/05 16:17:15 taca Exp $
-
-Fix for CVE-2013-6712.
-
---- ext/date/lib/parse_iso_intervals.c.orig	2013-11-13 06:46:59.000000000 +0000
-+++ ext/date/lib/parse_iso_intervals.c
-@@ -415,7 +415,7 @@ yy6:
- 					break;
- 			}
- 			ptr++;
--		} while (*ptr);
-+		} while (!s->errors->error_count && *ptr);
- 		s->have_period = 1;
- 		TIMELIB_DEINIT;
- 		return TIMELIB_PERIOD;
diff --git a/lang/php54/patches/patch-ext_date_lib_parse__iso__intervals.re b/lang/php54/patches/patch-ext_date_lib_parse__iso__intervals.re
deleted file mode 100644
index 03569f06228..00000000000
--- a/lang/php54/patches/patch-ext_date_lib_parse__iso__intervals.re
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ext_date_lib_parse__iso__intervals.re,v 1.1 2013/12/05 16:17:15 taca Exp $
-
-Fix for CVE-2013-6712.
-
---- ext/date/lib/parse_iso_intervals.re.orig	2013-11-13 06:46:59.000000000 +0000
-+++ ext/date/lib/parse_iso_intervals.re
-@@ -383,7 +383,7 @@ isoweek          = year4 "-"? "W" weekof
- 					break;
- 			}
- 			ptr++;
--		} while (*ptr);
-+		} while (!s->errors->error_count && *ptr);
- 		s->have_period = 1;
- 		TIMELIB_DEINIT;
- 		return TIMELIB_PERIOD;
diff --git a/lang/php54/patches/patch-php.ini-development b/lang/php54/patches/patch-php.ini-development
index ac6c87a1dd4..9e60e9dab87 100644
--- a/lang/php54/patches/patch-php.ini-development
+++ b/lang/php54/patches/patch-php.ini-development
@@ -1,8 +1,8 @@
-$NetBSD: patch-php.ini-development,v 1.1 2012/06/16 05:21:55 taca Exp $
+$NetBSD: patch-php.ini-development,v 1.2 2014/01/11 17:03:57 taca Exp $
 
---- php.ini-development.orig	2012-05-03 17:10:43.000000000 +0000
+--- php.ini-development.orig	2014-01-08 02:57:08.000000000 +0000
 +++ php.ini-development
-@@ -702,7 +702,7 @@ default_mimetype = "text/html"
+@@ -703,7 +703,7 @@ default_mimetype = "text/html"
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
@@ -11,7 +11,7 @@ $NetBSD: patch-php.ini-development,v 1.1 2012/06/16 05:21:55 taca Exp $
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
-@@ -723,8 +723,8 @@ doc_root =
+@@ -724,8 +724,8 @@ doc_root =
  ; http://php.net/user-dir
  user_dir =
  
@@ -22,7 +22,7 @@ $NetBSD: patch-php.ini-development,v 1.1 2012/06/16 05:21:55 taca Exp $
  ; extension_dir = "./"
  ; On windows:
  ; extension_dir = "ext"
-@@ -793,7 +793,7 @@ file_uploads = On
+@@ -794,7 +794,7 @@ file_uploads = On
  ; Temporary directory for HTTP uploaded files (will use system default if not
  ; specified).
  ; http://php.net/upload-tmp-dir
diff --git a/lang/php54/patches/patch-php.ini-production b/lang/php54/patches/patch-php.ini-production
index af1da423ae3..fe17ddb7f42 100644
--- a/lang/php54/patches/patch-php.ini-production
+++ b/lang/php54/patches/patch-php.ini-production
@@ -1,8 +1,8 @@
-$NetBSD: patch-php.ini-production,v 1.1 2012/06/16 05:21:55 taca Exp $
+$NetBSD: patch-php.ini-production,v 1.2 2014/01/11 17:03:57 taca Exp $
 
---- php.ini-production.orig	2012-05-03 17:10:43.000000000 +0000
+--- php.ini-production.orig	2014-01-08 02:57:08.000000000 +0000
 +++ php.ini-production
-@@ -702,7 +702,7 @@ default_mimetype = "text/html"
+@@ -703,7 +703,7 @@ default_mimetype = "text/html"
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
@@ -11,7 +11,7 @@ $NetBSD: patch-php.ini-production,v 1.1 2012/06/16 05:21:55 taca Exp $
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
-@@ -723,8 +723,8 @@ doc_root =
+@@ -724,8 +724,8 @@ doc_root =
  ; http://php.net/user-dir
  user_dir =
  
@@ -22,7 +22,7 @@ $NetBSD: patch-php.ini-production,v 1.1 2012/06/16 05:21:55 taca Exp $
  ; extension_dir = "./"
  ; On windows:
  ; extension_dir = "ext"
-@@ -793,7 +793,7 @@ file_uploads = On
+@@ -794,7 +794,7 @@ file_uploads = On
  ; Temporary directory for HTTP uploaded files (will use system default if not
  ; specified).
  ; http://php.net/upload-tmp-dir