summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authoradrianp <adrianp@pkgsrc.org>2006-07-18 21:57:30 +0000
committeradrianp <adrianp@pkgsrc.org>2006-07-18 21:57:30 +0000
commitfa1ca9f0864e05f7c6b90065ed33f00d16d85e8f (patch)
tree08dc3b568f12a0dae3218af9156014fee4d9993b /lang
parent3c73469517bcdf615ae7c799a4ea674a86adf2fc (diff)
downloadpkgsrc-fa1ca9f0864e05f7c6b90065ed33f00d16d85e8f.tar.gz
Fix for CVE-2006-3011
Bump to nb2
Diffstat (limited to 'lang')
-rw-r--r--lang/php5/Makefile4
-rw-r--r--lang/php5/distinfo3
-rw-r--r--lang/php5/patches/patch-av15
3 files changed, 19 insertions, 3 deletions
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 70f0f68c870..093228bc5ce 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2006/07/08 00:53:09 minskim Exp $
+# $NetBSD: Makefile,v 1.38 2006/07/18 21:57:30 adrianp 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 27ffbcd97b5..643d76131ca 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2006/07/08 00:53:09 minskim Exp $
+$NetBSD: distinfo,v 1.25 2006/07/18 21:57:30 adrianp 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
@@ -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..4e81927e281
--- /dev/null
+++ b/lang/php5/patches/patch-av
@@ -0,0 +1,15 @@
+$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));