diff options
author | taca <taca@pkgsrc.org> | 2012-04-26 14:26:32 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2012-04-26 14:26:32 +0000 |
commit | 8fa8f82b98a967e6b784fc73ec385d204c249e9d (patch) | |
tree | 7096006d276adb5243f5fb252d78b59060d9ddf9 /lang | |
parent | 3c4e00aef220d61466b883dee4c995baf95f6515 (diff) | |
download | pkgsrc-8fa8f82b98a967e6b784fc73ec385d204c249e9d.tar.gz |
Update php53 package to 5.3.11.
For full changes, please refer <http://www.php.net/ChangeLog-5.php#5.3.11>.
Security Enhancements:
* Fixed bug #54374 (Insufficient validating of upload name leading to
corrupted $_FILES indices). (CVE-2012-1172).
* Add open_basedir checks to readline_write_history and readline_read_history.
* Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831).
Key enhancements in these releases include:
* Added debug info handler to DOM objects.
* Fixed bug #61172 (Add Apache 2.4 support).
Diffstat (limited to 'lang')
-rw-r--r-- | lang/php53/Makefile | 3 | ||||
-rw-r--r-- | lang/php53/Makefile.common | 4 | ||||
-rw-r--r-- | lang/php53/Makefile.php | 4 | ||||
-rw-r--r-- | lang/php53/distinfo | 15 | ||||
-rw-r--r-- | lang/php53/patches/patch-main_SAPI.c | 42 |
5 files changed, 12 insertions, 56 deletions
diff --git a/lang/php53/Makefile b/lang/php53/Makefile index 6ba4cf09c8f..9e84f3fbc72 100644 --- a/lang/php53/Makefile +++ b/lang/php53/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.24 2012/04/05 03:17:26 taca Exp $ +# $NetBSD: Makefile,v 1.25 2012/04/26 14:26:32 taca 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/ diff --git a/lang/php53/Makefile.common b/lang/php53/Makefile.common index 15f4d833797..4740ed76bbf 100644 --- a/lang/php53/Makefile.common +++ b/lang/php53/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.10 2012/02/03 03:10:34 taca Exp $ +# $NetBSD: Makefile.common,v 1.11 2012/04/26 14:26:33 taca Exp $ # used by lang/php53/Makefile.php # used by lang/php/ext.mk # used by meta-pkgs/php53-extensions/Makefile @@ -39,7 +39,7 @@ EXTRACT_SUFX?= .tar.bz2 MAINTAINER?= pkgsrc-users@NetBSD.org HOMEPAGE?= http://www.php.net/ -PHP_BASE_VERS= 5.3.10 +PHP_BASE_VERS= 5.3.11 PHP_EXTENSION_DIR= lib/php/20090630 PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} diff --git a/lang/php53/Makefile.php b/lang/php53/Makefile.php index 90bf8e80a57..e921ed2eefc 100644 --- a/lang/php53/Makefile.php +++ b/lang/php53/Makefile.php @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.13 2012/02/03 03:10:34 taca Exp $ +# $NetBSD: Makefile.php,v 1.14 2012/04/26 14:26:33 taca Exp $ # used by lang/php53/Makefile # used by www/ap-php/Makefile @@ -61,7 +61,7 @@ PKG_SUGGESTED_OPTIONS+= inet6 ssl .if !empty(PKG_OPTIONS:Msuhosin) SUHOSIN_PHPVER= 5.3.9 -. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && ${PHP_BASE_VERS} != 5.3.10 +. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && ${PHP_BASE_VERS} != 5.3.10 && ${PHP_BASE_VERS} != 5.3.11 PKG_FAIL_REASON+= "The suhosin patch is currently not available for" PKG_FAIL_REASON+= "this version of PHP. You may have to wait until" PKG_FAIL_REASON+= "an updated patch is released or temporarily" diff --git a/lang/php53/distinfo b/lang/php53/distinfo index 803dac82acc..3cf9fc4dd72 100644 --- a/lang/php53/distinfo +++ b/lang/php53/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.36 2012/04/05 03:17:26 taca Exp $ +$NetBSD: distinfo,v 1.37 2012/04/26 14:26:33 taca Exp $ -SHA1 (php-5.3.10/php-5.3.10.tar.bz2) = 689d8463b5d9e24b9bf297e35826f2ebdb69afda -RMD160 (php-5.3.10/php-5.3.10.tar.bz2) = acab30a19b340f21a64e06b524906f2b064dd1c9 -Size (php-5.3.10/php-5.3.10.tar.bz2) = 11707402 bytes -SHA1 (php-5.3.10/suhosin-patch-5.3.9-0.9.10.patch.gz) = 7b9ef5c3e0831154df0d6290aba0989ca90138ed -RMD160 (php-5.3.10/suhosin-patch-5.3.9-0.9.10.patch.gz) = ce43921fd9b183b154713ecda98294f6c68d5f22 -Size (php-5.3.10/suhosin-patch-5.3.9-0.9.10.patch.gz) = 40967 bytes +SHA1 (php-5.3.11/php-5.3.11.tar.bz2) = b7df71d926643b97a08ba0b103d010cbac01d5a1 +RMD160 (php-5.3.11/php-5.3.11.tar.bz2) = cdad550e94cb911fa68b99acba2a5925d0848cf3 +Size (php-5.3.11/php-5.3.11.tar.bz2) = 11396215 bytes +SHA1 (php-5.3.11/suhosin-patch-5.3.9-0.9.10.patch.gz) = 7b9ef5c3e0831154df0d6290aba0989ca90138ed +RMD160 (php-5.3.11/suhosin-patch-5.3.9-0.9.10.patch.gz) = ce43921fd9b183b154713ecda98294f6c68d5f22 +Size (php-5.3.11/suhosin-patch-5.3.9-0.9.10.patch.gz) = 40967 bytes SHA1 (patch-aa) = b0dc6cd0b2103d5858280202506b33322a98496e SHA1 (patch-ab) = d08bb50cf074a6065ef0d1d67a713b7573cb2f5b SHA1 (patch-ac) = 1720f154232241c19d0c6e08a824e33252f1b690 @@ -17,6 +17,5 @@ SHA1 (patch-ah) = b20c29c64b3099f77855a5ec28960dc1c4f65c83 SHA1 (patch-ai) = d4766893a2c47a4e4a744248dda265b0a9a66a1f SHA1 (patch-aj) = d611d13fcc28c5d2b9e9586832ce4b8ae5707b48 SHA1 (patch-al) = fbbee5502e0cd1c47c6e7c15e0d54746414ec32e -SHA1 (patch-main_SAPI.c) = 8fd664c97cb9fa295ad8a1f42ed3e1b878554065 SHA1 (patch-main_streams_cast.c) = c169ccb73dc660e40eff9f9e168374f35eedadad SHA1 (patch-php__mssql.c) = b46c688ff2d8da33ca2f9beb0eb9182b6edf7e23 diff --git a/lang/php53/patches/patch-main_SAPI.c b/lang/php53/patches/patch-main_SAPI.c deleted file mode 100644 index 093d9996dfa..00000000000 --- a/lang/php53/patches/patch-main_SAPI.c +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-main_SAPI.c,v 1.1 2012/04/05 03:17:26 taca Exp $ - -* Fix possible newline injection problem of header() function from PHP 5.4.0. - ---- main/SAPI.c.orig 2012-01-01 13:15:04.000000000 +0000 -+++ main/SAPI.c -@@ -590,16 +590,26 @@ SAPI_API int sapi_header_op(sapi_header_ - return FAILURE; - } - } else { -- /* new line safety check */ -- char *s = header_line, *e = header_line + header_line_len, *p; -- while (s < e && (p = memchr(s, '\n', (e - s)))) { -- if (*(p + 1) == ' ' || *(p + 1) == '\t') { -- s = p + 1; -- continue; -+ /* new line/NUL character safety check */ -+ int i; -+ for (i = 0; i < header_line_len; i++) { -+ /* RFC 2616 allows new lines if followed by SP or HT */ -+ int illegal_break = -+ (header_line[i+1] != ' ' && header_line[i+1] != '\t') -+ && ( -+ header_line[i] == '\n' -+ || (header_line[i] == '\r' && header_line[i+1] != '\n')); -+ if (illegal_break) { -+ efree(header_line); -+ sapi_module.sapi_error(E_WARNING, "Header may not contain " -+ "more than a single header, new line detected"); -+ return FAILURE; -+ } -+ if (header_line[i] == '\0') { -+ efree(header_line); -+ sapi_module.sapi_error(E_WARNING, "Header may not contain NUL bytes"); -+ return FAILURE; - } -- efree(header_line); -- sapi_module.sapi_error(E_WARNING, "Header may not contain more than a single header, new line detected."); -- return FAILURE; - } - } - |