[pkgsrc/pkgsrc-2005Q3]: pkgsrc/www/php4 Pullup ticket 806 - requested by Matt...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5732c328dccb
branches:  pkgsrc-2005Q3
changeset: 499562:5732c328dccb
user:      salo <salo%pkgsrc.org@localhost>
date:      Wed Oct 05 20:39:15 2005 +0000

description:
Pullup ticket 806 - requested by Matthias Scheler
security fix for php4

Revisions pulled up:
- pkgsrc/www/php4/Makefile              1.53
- pkgsrc/www/php4/distinfo              1.44
- pkgsrc/www/php4/patches/patch-ab      1.18

   Module Name:         pkgsrc
   Committed By:        tron
   Date:                Wed Oct  5 15:59:47 UTC 2005

   Modified Files:
        pkgsrc/www/php4: Makefile distinfo
   Added Files:
        pkgsrc/www/php4/patches: patch-ab

   Log Message:
   Add patch from Debian bug report 323585 to fix CAN-2005-3054.

diffstat:

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

diffs (48 lines):

diff -r e4f7283ef90b -r 5732c328dccb www/php4/Makefile
--- a/www/php4/Makefile Wed Oct 05 13:45:58 2005 +0000
+++ b/www/php4/Makefile Wed Oct 05 20:39:15 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2005/09/10 09:04:01 jdolecek Exp $
+# $NetBSD: Makefile,v 1.52.2.1 2005/10/05 20:39:15 salo Exp $
 
 PKGNAME=               php-${PHP_BASE_VERS}
+PKGREVISION=           1
 CATEGORIES+=           lang
 COMMENT=               HTML-embedded scripting language
 
diff -r e4f7283ef90b -r 5732c328dccb www/php4/distinfo
--- a/www/php4/distinfo Wed Oct 05 13:45:58 2005 +0000
+++ b/www/php4/distinfo Wed Oct 05 20:39:15 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.43 2005/09/10 09:04:01 jdolecek Exp $
+$NetBSD: distinfo,v 1.43.2.1 2005/10/05 20:39:15 salo Exp $
 
 SHA1 (php-4.4.0.tar.bz2) = 5e0afe6e5f8c751f880a50ad4fa1716f0242ef37
 RMD160 (php-4.4.0.tar.bz2) = 4792e78b6f2f3e3347a1ac945b48efaccedf4542
@@ -7,6 +7,7 @@
 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 -r e4f7283ef90b -r 5732c328dccb www/php4/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/php4/patches/patch-ab Wed Oct 05 20:39:15 2005 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.17.4.1 2005/10/05 20:39:15 salo 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';
+                       }
+               }