From c92675b7b2d4ba01247689274419a826275ee01f Mon Sep 17 00:00:00 2001 From: taca Date: Sat, 19 Aug 2006 16:44:15 +0000 Subject: Update php5 package to 5.1.5: 17 Aug 2006, PHP 5.1.5 - Fixed memory_limit on 64bit systems. (Stefan E.) - Fixed overflow on 64bit systems in str_repeat() and wordwrap(). (Stefan E.) - Disabled CURLOPT_FOLLOWLOCATION in curl when open_basedir or safe_mode are enabled. (Stefan E., Ilia) - Fixed bug #38322 (reading past array in sscanf() leads to arbitrary code execution). (Tony) - Fixed bug #38125 (undefined reference to spl_dual_it_free_storage). (Marcus) - Fixed bug #38112 (corrupted gif segfaults) (Pierre) - Fixed bug #37587 (var without attribute causes segfault). (Marcus) - Fixed bug #37576 (FastCGI env (cgi vars) table overflow). (Piotr) - Fixed bug #37496 (FastCGI output buffer overrun). (Piotr, Dmitry) - Fixed bug #37487 (oci_fetch_array() array-type should always default to OCI_BOTH). (Tony) - Fixed bug #37416 (iterator_to_array() hides exceptions thrown in rewind() method). (Tony) - Fixed bug #37392 (Unnecessary call to OCITransRollback() at the end of request). (Tony) - Fixed bug #37341 ($_SERVER in included file is shortened to two entries, if $_ENV gets used). (Dmitry) - Fixed bug #37313 (sigemptyset() used without including ). (jdolecek) - Fixed bug #37346 (invalid colormap format) (Pierre) - Fixed bug #37360 (invalid gif size) (Pierre) - Fixed bug #37306 (max_execution_time = max_input_time). (Dmitry) - Fixed Bug #37278 (SOAP not respecting uri in __soapCall). (Dmitry) - Fixed bug #37265 (Added missing safe_mode & open_basedir checks to imap_body()). (Ilia) - Fixed bug #37256 (php-fastcgi dosen't handle connection abort). (Dmitry) --- lang/php5/Makefile | 3 +- lang/php5/Makefile.common | 6 ++-- lang/php5/distinfo | 14 +++----- lang/php5/patches/patch-ao | 15 --------- lang/php5/patches/patch-as | 16 +++++++-- lang/php5/patches/patch-at | 13 -------- lang/php5/patches/patch-av | 15 --------- lang/php5/patches/patch-aw | 81 ---------------------------------------------- 8 files changed, 23 insertions(+), 140 deletions(-) delete mode 100644 lang/php5/patches/patch-ao delete mode 100644 lang/php5/patches/patch-at delete mode 100644 lang/php5/patches/patch-av delete mode 100644 lang/php5/patches/patch-aw (limited to 'lang/php5') diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 7a96922116f..62e7e0323c4 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.41 2006/08/19 14:47:44 taca Exp $ +# $NetBSD: Makefile,v 1.42 2006/08/19 16:44:15 taca Exp $ PKGNAME= php-${PHP_BASE_VERS} -PKGREVISION= 5 CATEGORIES= lang HOMEPAGE= http://www.php.net/ diff --git a/lang/php5/Makefile.common b/lang/php5/Makefile.common index 036434453d0..3275f91456b 100644 --- a/lang/php5/Makefile.common +++ b/lang/php5/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.18 2006/07/08 16:56:56 minskim Exp $ +# $NetBSD: Makefile.common,v 1.19 2006/08/19 16:44:15 taca Exp $ .if !defined(DISTNAME) DISTNAME= php-${PHP_BASE_VERS} -DIST_SUBDIR= ${DISTNAME}nb1 +DIST_SUBDIR= ${DISTNAME} .endif CATEGORIES+= www php5 @@ -16,7 +16,7 @@ EXTRACT_SUFX?= .tar.bz2 MAINTAINER?= jdolecek@NetBSD.org HOMEPAGE?= http://www.php.net/ -PHP_BASE_VERS= 5.1.4 +PHP_BASE_VERS= 5.1.5 PHP_EXTENSION_DIR= lib/php/20040412 PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q} diff --git a/lang/php5/distinfo b/lang/php5/distinfo index 6c816d8b012..5d14ac83066 100644 --- a/lang/php5/distinfo +++ b/lang/php5/distinfo @@ -1,15 +1,11 @@ -$NetBSD: distinfo,v 1.26 2006/08/10 05:57:09 taca Exp $ +$NetBSD: distinfo,v 1.27 2006/08/19 16:44:15 taca Exp $ -SHA1 (php-5.1.4nb1/php-5.1.4.tar.bz2) = 83d4c5a4a3e8f3bcb0da841edd8d55893dbf5394 -RMD160 (php-5.1.4nb1/php-5.1.4.tar.bz2) = d4ab11884a3a899f21eef777767a553cf81584ce -Size (php-5.1.4nb1/php-5.1.4.tar.bz2) = 6356171 bytes +SHA1 (php-5.1.5nb1/php-5.1.5.tar.bz2) = 2e8ba214677fa2002fe2f10c2b917d626a5fe5b0 +RMD160 (php-5.1.5nb1/php-5.1.5.tar.bz2) = 0b72153f1bdfc4dd8654961c3441d3601753ff53 +Size (php-5.1.5nb1/php-5.1.5.tar.bz2) = 6454521 bytes SHA1 (patch-ag) = 4ccb67ba6f5370b1d16b087e3e714de3e5ae604e SHA1 (patch-ah) = c7cbd4b9ea0796ea3b7491c2cffb6ddddc518587 SHA1 (patch-aj) = 54812097499c81e5cb0196ab949cc86a4f24a9cc SHA1 (patch-ak) = 2d5264d33ebef631d4a2d0cdf8a2ed365bdbeb7e -SHA1 (patch-ao) = 60fec83647ca5924a38bf4d5e8abb51feba1620e -SHA1 (patch-as) = 217c06efe5912570fab64f205d0b4faa07cda063 -SHA1 (patch-at) = d1dd8decd0e5528e9166bd313bc382e3e138a82f +SHA1 (patch-as) = 4fc74c8e8d0a7a152a7bbe1672ad0834021db16c SHA1 (patch-au) = 90264101db6c2f000c30d1f513392acec781202b -SHA1 (patch-av) = a6cfc9b508d6e6e8fe2523a1b8a2480b6c767014 -SHA1 (patch-aw) = 5f075e62d57a77280e173a27bfeb096a4c4ceaa2 diff --git a/lang/php5/patches/patch-ao b/lang/php5/patches/patch-ao deleted file mode 100644 index b415cb1f98b..00000000000 --- a/lang/php5/patches/patch-ao +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ao,v 1.3 2006/02/06 06:39:59 martti Exp $ - ---- ext/bz2/bz2_filter.c.orig 2006-01-01 14:50:00.000000000 +0200 -+++ ext/bz2/bz2_filter.c 2006-02-05 15:37:44.000000000 +0200 -@@ -22,6 +22,10 @@ - #include "config.h" - #endif - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include "php.h" - #include "php_bz2.h" - diff --git a/lang/php5/patches/patch-as b/lang/php5/patches/patch-as index 0665bd8cb40..2dd299ff4e2 100644 --- a/lang/php5/patches/patch-as +++ b/lang/php5/patches/patch-as @@ -1,6 +1,6 @@ -$NetBSD: patch-as,v 1.1 2006/04/22 10:54:53 jdolecek Exp $ +$NetBSD: patch-as,v 1.2 2006/08/19 16:44:15 taca Exp $ ---- ext/date/lib/timelib_structs.h.orig 2006-04-22 12:51:57.000000000 +0200 +--- ext/date/lib/timelib_structs.h.orig 2006-04-12 03:03:52.000000000 +0900 +++ ext/date/lib/timelib_structs.h @@ -21,7 +21,7 @@ #ifndef __TIMELIB_STRUCTS_H__ @@ -11,3 +11,15 @@ $NetBSD: patch-as,v 1.1 2006/04/22 10:54:53 jdolecek Exp $ #ifdef HAVE_SYS_TYPES_H #include +@@ -183,7 +183,11 @@ typedef struct _timelib_tzdb { + #define TIMELIB_ZONETYPE_ABBR 2 + #define TIMELIB_ZONETYPE_ID 3 + ++#if defined(SIZEOF_LONG_LONG_INT) && (SIZEOF_LONG_LONG_INT == 8) ++#define SECS_PER_ERA 12622780800LL ++#else + #define SECS_PER_ERA 12622780800L ++#endif + #define SECS_PER_DAY 86400 + #define DAYS_PER_YEAR 365 + #define DAYS_PER_LYEAR 366 diff --git a/lang/php5/patches/patch-at b/lang/php5/patches/patch-at deleted file mode 100644 index 3b8fc93e7d0..00000000000 --- a/lang/php5/patches/patch-at +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-at,v 1.2 2006/05/06 22:42:44 jdolecek Exp $ - ---- sapi/cgi/fastcgi.c.orig 2006-04-27 13:39:32.000000000 +0200 -+++ sapi/cgi/fastcgi.c -@@ -69,7 +69,7 @@ - # include - # include - # include --# include -+# include - - #ifndef INADDR_NONE - #define INADDR_NONE ((unsigned long) -1) diff --git a/lang/php5/patches/patch-av b/lang/php5/patches/patch-av deleted file mode 100644 index 4e81927e281..00000000000 --- a/lang/php5/patches/patch-av +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-av,v 1.1 2006/07/18 21:57:30 adrianp Exp $ - -# This is CVE-2006-3011 - ---- ext/standard/basic_functions.c.orig 2006-04-03 14:46:11.000000000 +0100 -+++ ext/standard/basic_functions.c -@@ -2034,7 +2034,7 @@ PHPAPI int _php_error_log(int opt_err, c - break; - - case 3: /*save to a file */ -- stream = php_stream_open_wrapper(opt, "a", IGNORE_URL | ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL); -+ stream = php_stream_open_wrapper(opt, "a", IGNORE_URL_WIN | ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL); - if (!stream) - return FAILURE; - php_stream_write(stream, message, strlen(message)); diff --git a/lang/php5/patches/patch-aw b/lang/php5/patches/patch-aw deleted file mode 100644 index 2505e7b8ba2..00000000000 --- a/lang/php5/patches/patch-aw +++ /dev/null @@ -1,81 +0,0 @@ -$NetBSD: patch-aw,v 1.1 2006/08/10 05:57:09 taca Exp $ - -# Fix for Secunia Advisory SA21403 - ---- ext/standard/scanf.c.orig 2006-01-01 21:50:15.000000000 +0900 -+++ ext/standard/scanf.c -@@ -732,7 +732,7 @@ PHPAPI int php_sscanf_internal( char *st - if (*end == '$') { - format = end+1; - ch = format++; -- objIndex = varStart + value; -+ objIndex = varStart + value - 1; - } - } - -@@ -762,7 +762,9 @@ PHPAPI int php_sscanf_internal( char *st - switch (*ch) { - case 'n': - if (!(flags & SCAN_SUPPRESS)) { -- if (numVars) { -+ if (numVars && objIndex >= argCount) { -+ break; -+ } else if (numVars) { - zend_uint refcount; - - current = args[objIndex++]; -@@ -888,7 +890,9 @@ PHPAPI int php_sscanf_internal( char *st - } - } - if (!(flags & SCAN_SUPPRESS)) { -- if (numVars) { -+ if (numVars && objIndex >= argCount) { -+ break; -+ } else if (numVars) { - zend_uint refcount; - - current = args[objIndex++]; -@@ -932,7 +936,9 @@ PHPAPI int php_sscanf_internal( char *st - goto done; - } - if (!(flags & SCAN_SUPPRESS)) { -- if (numVars) { -+ if (numVars && objIndex >= argCount) { -+ break; -+ } else if (numVars) { - current = args[objIndex++]; - zval_dtor( *current ); - ZVAL_STRINGL( *current, string, end-string, 1); -@@ -1089,7 +1095,9 @@ PHPAPI int php_sscanf_internal( char *st - value = (int) (*fn)(buf, NULL, base); - if ((flags & SCAN_UNSIGNED) && (value < 0)) { - sprintf(buf, "%u", value); /* INTL: ISO digit */ -- if (numVars) { -+ if (numVars && objIndex >= argCount) { -+ break; -+ } else if (numVars) { - /* change passed value type to string */ - current = args[objIndex++]; - convert_to_string( *current ); -@@ -1098,7 +1106,9 @@ PHPAPI int php_sscanf_internal( char *st - add_index_string(*return_value, objIndex++, buf, 1); - } - } else { -- if (numVars) { -+ if (numVars && objIndex >= argCount) { -+ break; -+ } else if (numVars) { - current = args[objIndex++]; - convert_to_long( *current ); - Z_LVAL(**current) = value; -@@ -1206,7 +1216,9 @@ PHPAPI int php_sscanf_internal( char *st - double dvalue; - *end = '\0'; - dvalue = zend_strtod(buf, NULL); -- if (numVars) { -+ if (numVars && objIndex >= argCount) { -+ break; -+ } else if (numVars) { - current = args[objIndex++]; - convert_to_double( *current ); - Z_DVAL_PP( current ) = dvalue; -- cgit v1.2.3