From a6bbb8d213be515a817d0c34f53339640fa628a7 Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Wed, 5 Oct 2005 15:59:47 +0000
Subject: Add patch from Debian bug report 323585 to fix CAN-2005-3054.

---
 www/php4/Makefile         |  3 ++-
 www/php4/distinfo         |  3 ++-
 www/php4/patches/patch-ab | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 www/php4/patches/patch-ab

(limited to 'www/php4')

diff --git a/www/php4/Makefile b/www/php4/Makefile
index 84775585ec0..03977cd529a 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2005/09/10 09:04:01 jdolecek Exp $
+# $NetBSD: Makefile,v 1.53 2005/10/05 15:59:47 tron Exp $
 
 PKGNAME=		php-${PHP_BASE_VERS}
+PKGREVISION=		1
 CATEGORIES+=		lang
 COMMENT=		HTML-embedded scripting language
 
diff --git a/www/php4/distinfo b/www/php4/distinfo
index 197fd68f961..2c0ec1b6282 100644
--- a/www/php4/distinfo
+++ b/www/php4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.43 2005/09/10 09:04:01 jdolecek Exp $
+$NetBSD: distinfo,v 1.44 2005/10/05 15:59:47 tron Exp $
 
 SHA1 (php-4.4.0.tar.bz2) = 5e0afe6e5f8c751f880a50ad4fa1716f0242ef37
 RMD160 (php-4.4.0.tar.bz2) = 4792e78b6f2f3e3347a1ac945b48efaccedf4542
@@ -7,6 +7,7 @@ SHA1 (XML_RPC-1.4.0.tgz) = 461f0b70675a37f524043d19078e9c0502dd13ac
 RMD160 (XML_RPC-1.4.0.tgz) = 8647565c7fa973ac800683d91c32d781fce9437c
 Size (XML_RPC-1.4.0.tgz) = 26776 bytes
 SHA1 (patch-aa) = feb064407950d0fc732b7240e65cac84420d2407
+SHA1 (patch-ab) = deaceb8d997af26fe051eb94d5b9a3f4307ffaea
 SHA1 (patch-ad) = 9ca5d2f59bfeea77a98cd0e727546d11669114cd
 SHA1 (patch-ag) = 1ded1d7f4daac6806f41864c783f16d3403315e4
 SHA1 (patch-ah) = 0ac37bd35c4594cb58f1ea85ef811154b644a931
diff --git a/www/php4/patches/patch-ab b/www/php4/patches/patch-ab
new file mode 100644
index 00000000000..27f7d2bc02c
--- /dev/null
+++ b/www/php4/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.18 2005/10/05 15:59:47 tron Exp $
+
+--- main/fopen_wrappers.c.orig	2005-02-02 23:44:07.000000000 +0000
++++ main/fopen_wrappers.c	2005-10-05 16:52:55.000000000 +0100
+@@ -120,8 +120,8 @@
+ 		/* Handler for basedirs that end with a / */
+ 		resolved_basedir_len = strlen(resolved_basedir);
+ 		if (basedir[strlen(basedir) - 1] == PHP_DIR_SEPARATOR) {
+-			if (resolved_basedir[resolved_basedir_len - 1] == '/') {
+-				resolved_basedir[resolved_basedir_len - 1] = PHP_DIR_SEPARATOR;
++			if (resolved_basedir[resolved_basedir_len - 1] != PHP_DIR_SEPARATOR) {
++				resolved_basedir[resolved_basedir_len] = PHP_DIR_SEPARATOR;
+ 				resolved_basedir[++resolved_basedir_len] = '\0';
+ 			}
+ 		}
-- 
cgit v1.2.3