diff options
| author | salo <salo@pkgsrc.org> | 2006-07-23 16:17:02 +0000 |
|---|---|---|
| committer | salo <salo@pkgsrc.org> | 2006-07-23 16:17:02 +0000 |
| commit | 20e894385feba21d7f5174f33c7338b3c1cfe250 (patch) | |
| tree | 1265bfcd2cf3758a740e151b63d3d1daf0b05cf4 /lang | |
| parent | 430da61be49d64323e3754ce940212a9bc4821f7 (diff) | |
| download | pkgsrc-20e894385feba21d7f5174f33c7338b3c1cfe250.tar.gz | |
Pullup ticket 1751 - requested by adrianp
security fix for php5
Revisions pulled up:
- pkgsrc/lang/php5/Makefile 1.38
- pkgsrc/lang/php5/distinfo 1.25
- pkgsrc/lang/php5/patches/patch-av 1.1
Module Name: pkgsrc
Committed By: adrianp
Date: Tue Jul 18 21:57:30 UTC 2006
Modified Files:
pkgsrc/lang/php5: Makefile distinfo
Added Files:
pkgsrc/lang/php5/patches: patch-av
Log Message:
Fix for CVE-2006-3011
Bump to nb2
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/php5/Makefile | 4 | ||||
| -rw-r--r-- | lang/php5/distinfo | 3 | ||||
| -rw-r--r-- | lang/php5/patches/patch-av | 15 |
3 files changed, 19 insertions, 3 deletions
diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 76a4111e3c4..6b1a604b0ff 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.36 2006/06/06 16:42:02 jlam Exp $ +# $NetBSD: Makefile,v 1.36.2.1 2006/07/23 16:17:02 salo Exp $ PKGNAME= php-${PHP_BASE_VERS} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang HOMEPAGE= http://www.php.net/ diff --git a/lang/php5/distinfo b/lang/php5/distinfo index 6d91c11d81a..0585e53f603 100644 --- a/lang/php5/distinfo +++ b/lang/php5/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.23 2006/05/23 22:55:22 jdolecek Exp $ +$NetBSD: distinfo,v 1.23.2.1 2006/07/23 16:17:02 salo Exp $ SHA1 (php-5.1.4/php-5.1.4.tar.bz2) = 83d4c5a4a3e8f3bcb0da841edd8d55893dbf5394 RMD160 (php-5.1.4/php-5.1.4.tar.bz2) = d4ab11884a3a899f21eef777767a553cf81584ce @@ -11,3 +11,4 @@ SHA1 (patch-ao) = 60fec83647ca5924a38bf4d5e8abb51feba1620e SHA1 (patch-as) = 217c06efe5912570fab64f205d0b4faa07cda063 SHA1 (patch-at) = d1dd8decd0e5528e9166bd313bc382e3e138a82f SHA1 (patch-au) = 90264101db6c2f000c30d1f513392acec781202b +SHA1 (patch-av) = a6cfc9b508d6e6e8fe2523a1b8a2480b6c767014 diff --git a/lang/php5/patches/patch-av b/lang/php5/patches/patch-av new file mode 100644 index 00000000000..63695029f03 --- /dev/null +++ b/lang/php5/patches/patch-av @@ -0,0 +1,15 @@ +$NetBSD: patch-av,v 1.1.2.2 2006/07/23 16:17:02 salo 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)); |