[pkgsrc/trunk]: pkgsrc/www/php4 Update php to 4.4.1. Besides incorporating XM...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/02363c608107
branches:  trunk
changeset: 502060:02363c608107
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Tue Nov 01 23:12:15 2005 +0000

description:
Update php to 4.4.1. Besides incorporating XML_RPC-1.4.0 and fopen wrappers
security fix, this fixes serious security problems regarding overwriting
of the GLOBALS array.

All users of PHP 4.3 and 4.4 sare encouradged to update to this version.

The --with-regex=system bug with re_magic has been fixed too, so re-enabling
use of --with-regex=system for all operating systems again

diffstat:

 www/php4/Makefile         |  13 +------------
 www/php4/Makefile.common  |   4 ++--
 www/php4/Makefile.php     |   8 +-------
 www/php4/distinfo         |   8 ++++----
 www/php4/patches/patch-ab |  15 ---------------
 5 files changed, 8 insertions(+), 40 deletions(-)

diffs (112 lines):

diff -r 100c3e505b96 -r 02363c608107 www/php4/Makefile
--- a/www/php4/Makefile Tue Nov 01 23:08:42 2005 +0000
+++ b/www/php4/Makefile Tue Nov 01 23:12:15 2005 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2005/10/08 16:49:35 jdolecek Exp $
+# $NetBSD: Makefile,v 1.55 2005/11/01 23:12:15 jdolecek Exp $
 
 PKGNAME=               php-${PHP_BASE_VERS}
-PKGREVISION=           2
 CATEGORIES+=           lang
 COMMENT=               HTML-embedded scripting language
 
@@ -21,11 +20,6 @@
 CGIDIR=                        ${PREFIX}/libexec/cgi-bin
 EGDIR=                 ${PREFIX}/share/examples/php
 
-EXTRACT_ONLY=                  ${DISTNAME}${EXTRACT_SUFX}
-XMLRPC_DISTFILE=               XML_RPC-1.4.0.tgz
-SITES_${XMLRPC_DISTFILE}=      http://pear.php.net/get/
-DISTFILES=                     ${EXTRACT_ONLY} ${XMLRPC_DISTFILE}
-
 # On NetBSD ELF platforms, we need to link libgcc.a whole-archive so that
 # certain symbols from the C++ implementation (__get_eh_context, etc.)
 # referenced by DSOs written in C++ will resolve correctly.  We need to
@@ -46,11 +40,6 @@
 
 USE_TOOLS+=    gzcat
 
-post-extract:
-       ${RM} -f ${WRKSRC}/pear/packages/XML_RPC-1.3.1.tar
-       ${GZCAT} ${DISTDIR}/${XMLRPC_DISTFILE} \
-         >${WRKSRC}/pear/packages/${XMLRPC_DISTFILE:S/.tgz/.tar/}
-
 post-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${PREFIX}/bin/php
        ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 ${PREFIX}/man/man1/php.1
diff -r 100c3e505b96 -r 02363c608107 www/php4/Makefile.common
--- a/www/php4/Makefile.common  Tue Nov 01 23:08:42 2005 +0000
+++ b/www/php4/Makefile.common  Tue Nov 01 23:12:15 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.49 2005/08/17 19:58:34 tron Exp $
+# $NetBSD: Makefile.common,v 1.50 2005/11/01 23:12:15 jdolecek Exp $
 
 DISTNAME?=             php-${PHP_DIST_VERS}
 CATEGORIES+=           www php4
@@ -18,7 +18,7 @@
 # PHP_DIST_VERS                version number on the php distfile
 # PHP_BASE_VERS                pkgsrc-mangled version number (convert pl -> .)
 #
-PHP_DIST_VERS=         4.4.0
+PHP_DIST_VERS=         4.4.1
 PHP_BASE_VERS=         ${PHP_DIST_VERS}
 
 DISTFILES?=            ${PHP_DISTFILE}
diff -r 100c3e505b96 -r 02363c608107 www/php4/Makefile.php
--- a/www/php4/Makefile.php     Tue Nov 01 23:08:42 2005 +0000
+++ b/www/php4/Makefile.php     Tue Nov 01 23:12:15 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.29 2005/10/23 16:59:49 jdolecek Exp $
+# $NetBSD: Makefile.php,v 1.30 2005/11/01 23:12:15 jdolecek Exp $
 
 .include "../../www/php4/Makefile.common"
 
@@ -21,13 +21,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-# The Solaris system regex structures miss re_magic used by PHP build 
-.if (${OPSYS} != "SunOS") && (${OPSYS} != "Linux")
 CONFIGURE_ARGS+=       --with-regex=system
-.else
-CONFIGURE_ARGS+=       --with-regex=php
-.endif
-
 CONFIGURE_ARGS+=       --enable-memory-limit
 CONFIGURE_ARGS+=       --enable-track-vars
 
diff -r 100c3e505b96 -r 02363c608107 www/php4/distinfo
--- a/www/php4/distinfo Tue Nov 01 23:08:42 2005 +0000
+++ b/www/php4/distinfo Tue Nov 01 23:12:15 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.46 2005/10/16 12:17:47 jdolecek Exp $
+$NetBSD: distinfo,v 1.47 2005/11/01 23:12:15 jdolecek Exp $
 
-SHA1 (php-4.4.0.tar.bz2) = 5e0afe6e5f8c751f880a50ad4fa1716f0242ef37
-RMD160 (php-4.4.0.tar.bz2) = 4792e78b6f2f3e3347a1ac945b48efaccedf4542
-Size (php-4.4.0.tar.bz2) = 4086074 bytes
+SHA1 (php-4.4.1.tar.bz2) = 61fe43719c707e1163eaaab33b65907733e34a1f
+RMD160 (php-4.4.1.tar.bz2) = fb7f5b90d05a2efa8f0122740e2c27a29f28574e
+Size (php-4.4.1.tar.bz2) = 4157749 bytes
 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
diff -r 100c3e505b96 -r 02363c608107 www/php4/patches/patch-ab
--- a/www/php4/patches/patch-ab Tue Nov 01 23:08:42 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$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';
-                       }
-               }