Updated php to 4.2.3

* lots of bug fixes
* experimental apache2 support
* added IPv6 support to gethostbyaddr()

ATTENTION!! register_globals defaults to 'off' now

11 files changed, 84 insertions, 111 deletions

diff --git a/www/php4/Makefile b/www/php4/Makefile
index 3ff377c9a35..7d3f7db8e5f 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2002/10/02 23:48:07 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2002/10/14 06:21:18 martti Exp $
 
 PKGNAME=		php-${PHP_BASE_VERS}
-PKGREVISION=		1
 CATEGORIES+=		lang
 COMMENT=		HTML-embedded scripting language
 
@@ -34,15 +33,12 @@ CONF_FILES=	${EGDIR}/php.ini-recommended ${PKG_SYSCONFDIR}/php.ini
 OWN_DIRS=	${PREFIX}/${PHP_EXTENSION_DIR}
 
 post-install:
-	${RMDIR} ${PREFIX}/include/php/ext/xml/expat/xmltok
-	${RMDIR} ${PREFIX}/include/php/ext/xml/expat/xmlparse
-	${RMDIR} ${PREFIX}/include/php/ext/xml/expat
 	${INSTALL_DATA_DIR} ${CGIDIR}
 	${LN} -sf ../../bin/php ${CGIDIR}/php
 	${INSTALL_DATA_DIR} ${EGDIR}
 	cd ${WRKSRC}; ${INSTALL_DATA} php.ini-dist php.ini-recommended ${EGDIR}
 	${INSTALL_DATA_DIR} ${PREFIX}/share/php
-	${INSTALL_DATA} ${WRKSRC}/php4.gif ${PREFIX}/share/php
+	${INSTALL_DATA} ${WRKSRC}/php.gif ${PREFIX}/share/php
 
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common
index 10a39927779..a7a1c9a38cf 100644
--- a/www/php4/Makefile.common
+++ b/www/php4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2002/04/12 17:59:57 jlam Exp $
+# $NetBSD: Makefile.common,v 1.26 2002/10/14 06:21:18 martti Exp $
 
 DISTNAME?=		php-${PHP_DIST_VERS}
 CATEGORIES+=		www php4
@@ -14,7 +14,7 @@ HOMEPAGE?=		http://www.php.net/
 # PHP_DIST_VERS		version number on the php distfile
 # PHP_BASE_VERS		pkgsrc-mangled version number (convert pl -> .)
 #
-PHP_DIST_VERS=		4.1.2
+PHP_DIST_VERS=		4.2.3
 PHP_BASE_VERS=		${PHP_DIST_VERS}
 
 DISTFILES?=		${PHP_DISTFILE}
@@ -25,7 +25,7 @@ PHP_DISTFILE=		${DISTNAME}${EXTRACT_SUFX}
 # The number for the last part of the path represents a specific version
 # of the Zend API.
 #
-PHP_EXTENSION_DIR=	lib/php/20010901
+PHP_EXTENSION_DIR=	lib/php/20020429
 PLIST_SUBST+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
 
 PKG_SYSCONFVAR?=	php
diff --git a/www/php4/Makefile.module b/www/php4/Makefile.module
index b552cb44286..ebd4020901a 100644
--- a/www/php4/Makefile.module
+++ b/www/php4/Makefile.module
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.module,v 1.20 2002/10/05 10:54:12 wiz Exp $
+# $NetBSD: Makefile.module,v 1.21 2002/10/14 06:21:18 martti Exp $
 #
 # This Makefile is provided to ease creating PHP4 packages for the extension
 # modules distributed in the PHP4 sources.
@@ -12,9 +12,9 @@
 PKGNAME?=		php-${MODNAME}-${PHP_BASE_VERS}
 PKGREVISION?=		# empty
 
-DEPENDS+=		php>=${PHP_BASE_VERS}nb1:../../www/php4
+DEPENDS+=		php>=${PHP_BASE_VERS}:../../www/php4
 
-AUTOMAKE_REQD?=		1.4
+AUTOMAKE_REQD?=		1.7
 .include "../../mk/automake.mk"
 
 PKGMODNAME?=		${MODNAME:S/-/_/}
diff --git a/www/php4/Makefile.php b/www/php4/Makefile.php
index 1d641999368..441d9e53e83 100644
--- a/www/php4/Makefile.php
+++ b/www/php4/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.5 2001/11/26 07:34:07 jlam Exp $
+# $NetBSD: Makefile.php,v 1.6 2002/10/14 06:21:18 martti Exp $
 
 .include "../../www/php4/Makefile.common"
 
@@ -42,6 +42,7 @@ PHP4_CONFIGURE_ARGS?=	# empty
 CONFIGURE_ARGS+=	${PHP4_CONFIGURE_ARGS}
 
 CONFIGURE_ENV+=		ac_cv_lib_pam_pam_start=no
+CONFIGURE_ENV+=		EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
 
 post-configure: create-shlibtool
 
diff --git a/www/php4/PLIST b/www/php4/PLIST
index 58353c8b4c7..2e6f81769c8 100644
--- a/www/php4/PLIST
+++ b/www/php4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/02/28 06:14:46 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/10/14 06:21:18 martti Exp $
 bin/pear
 bin/pearize
 bin/php
@@ -47,16 +47,26 @@ include/php/Zend/zend_llist.h
 include/php/Zend/zend_modules.h
 include/php/Zend/zend_operators.h
 include/php/Zend/zend_ptr_stack.h
+include/php/Zend/zend_qsort.h
 include/php/Zend/zend_stack.h
 include/php/Zend/zend_static_allocator.h
 include/php/Zend/zend_variables.h
 include/php/acconfig.h
+include/php/ext/mbstring/cp932_table.h
+include/php/ext/mbstring/mbfilter.h
+include/php/ext/mbstring/mbfilter_ja.h
+include/php/ext/mbstring/mbregex.h
+include/php/ext/mbstring/mbstring.h
+include/php/ext/mbstring/unicode_table.h
+include/php/ext/mbstring/unicode_table_ja.h
 include/php/ext/session/mod_files.h
 include/php/ext/session/mod_mm.h
 include/php/ext/session/mod_user.h
 include/php/ext/session/php_session.h
+include/php/ext/standard/aggregation.h
 include/php/ext/standard/base64.h
 include/php/ext/standard/basic_functions.h
+include/php/ext/standard/crc32.h
 include/php/ext/standard/credits.h
 include/php/ext/standard/credits_ext.h
 include/php/ext/standard/credits_sapi.h
@@ -75,6 +85,7 @@ include/php/ext/standard/md5.h
 include/php/ext/standard/microtime.h
 include/php/ext/standard/pack.h
 include/php/ext/standard/pageinfo.h
+include/php/ext/standard/parsedate.h
 include/php/ext/standard/php_array.h
 include/php/ext/standard/php_assert.h
 include/php/ext/standard/php_browscap.h
@@ -83,6 +94,7 @@ include/php/ext/standard/php_dir.h
 include/php/ext/standard/php_ext_syslog.h
 include/php/ext/standard/php_filestat.h
 include/php/ext/standard/php_fopen_wrappers.h
+include/php/ext/standard/php_ftok.h
 include/php/ext/standard/php_image.h
 include/php/ext/standard/php_incomplete_class.h
 include/php/ext/standard/php_iptc.h
@@ -97,16 +109,27 @@ include/php/ext/standard/php_smart_str.h
 include/php/ext/standard/php_smart_str_public.h
 include/php/ext/standard/php_standard.h
 include/php/ext/standard/php_string.h
+include/php/ext/standard/php_type.h
 include/php/ext/standard/php_var.h
 include/php/ext/standard/php_versioning.h
 include/php/ext/standard/quot_print.h
 include/php/ext/standard/reg.h
 include/php/ext/standard/scanf.h
-include/php/ext/standard/type.h
 include/php/ext/standard/uniqid.h
 include/php/ext/standard/url.h
 include/php/ext/standard/url_scanner.h
 include/php/ext/standard/url_scanner_ex.h
+include/php/ext/xml/expat/ascii.h
+include/php/ext/xml/expat/asciitab.h
+include/php/ext/xml/expat/expat.h
+include/php/ext/xml/expat/iasciitab.h
+include/php/ext/xml/expat/latin1tab.h
+include/php/ext/xml/expat/nametab.h
+include/php/ext/xml/expat/utf8tab.h
+include/php/ext/xml/expat/winconfig.h
+include/php/ext/xml/expat/xmlrole.h
+include/php/ext/xml/expat/xmltok.h
+include/php/ext/xml/expat/xmltok_impl.h
 include/php/ext/xml/php_xml.h
 include/php/main/SAPI.h
 include/php/main/build-defs.h
@@ -145,21 +168,6 @@ include/php/regex/regex2.h
 include/php/regex/regex_extra.h
 include/php/regex/utils.h
 lib/php/Archive/Tar.php
-lib/php/Benchmark/Iterate.php
-lib/php/Benchmark/Timer.php
-lib/php/Cache.php
-lib/php/Cache/Container.php
-lib/php/Cache/Container/db.php
-lib/php/Cache/Container/dbx.php
-lib/php/Cache/Container/file.php
-lib/php/Cache/Container/phplib.php
-lib/php/Cache/Container/shm.php
-lib/php/Cache/DB.php
-lib/php/Cache/Error.php
-lib/php/Cache/Function.php
-lib/php/Cache/Graphics.php
-lib/php/Cache/Output.php
-lib/php/Cache/OutputCompression.php
 lib/php/Console/Getopt.php
 lib/php/Crypt/CBC.php
 lib/php/Crypt/HCEMD5.php
@@ -192,35 +200,31 @@ lib/php/HTML/Select.php
 lib/php/HTML/Table.php
 lib/php/HTTP.php
 lib/php/HTTP/Compress.php
-lib/php/Image/Remote.php
-lib/php/Log.php
-lib/php/Log/Observer.php
-lib/php/Log/composite.php
-lib/php/Log/file.php
-lib/php/Log/mcal.php
-lib/php/Log/sql.php
-lib/php/Log/syslog.php
 lib/php/Mail.php
 lib/php/Mail/RFC822.php
-lib/php/Mail/mime.php
 lib/php/Mail/sendmail.php
 lib/php/Mail/smtp.php
-lib/php/Math/Fraction.php
-lib/php/Math/Util.php
 lib/php/Net/Curl.php
 lib/php/Net/Dig.php
 lib/php/Net/SMTP.php
-lib/php/Net/Socket.php
-lib/php/Numbers/Roman.php
 lib/php/PEAR.php
+lib/php/PEAR/Autoloader.php
+lib/php/PEAR/Command.php
+lib/php/PEAR/Command/Auth.php
+lib/php/PEAR/Command/Common.php
+lib/php/PEAR/Command/Config.php
+lib/php/PEAR/Command/Install.php
+lib/php/PEAR/Command/Package.php
+lib/php/PEAR/Command/Registry.php
+lib/php/PEAR/Command/Remote.php
 lib/php/PEAR/Common.php
 lib/php/PEAR/Config.php
+lib/php/PEAR/Dependency.php
+lib/php/PEAR/Frontend/CLI.php
 lib/php/PEAR/Installer.php
 lib/php/PEAR/Packager.php
 lib/php/PEAR/Registry.php
 lib/php/PEAR/Remote.php
-lib/php/PEAR/Uploader.php
-lib/php/Payment/Verisign.php
 lib/php/Schedule/At.php
 lib/php/System.php
 lib/php/XML/Parser.php
@@ -240,19 +244,17 @@ lib/php/build/shtool
 libexec/cgi-bin/php
 share/examples/php/php.ini-dist
 share/examples/php/php.ini-recommended
-share/php/php4.gif
+share/php/php.gif
 @dirrm share/php
 @dirrm share/examples/php
 @dirrm lib/php/build
 @dirrm lib/php/XML
 @dirrm lib/php/Schedule
-@dirrm lib/php/Payment
+@dirrm lib/php/PEAR/Command
+@dirrm lib/php/PEAR/Frontend
 @dirrm lib/php/PEAR
-@dirrm lib/php/Numbers
 @dirrm lib/php/Net
-@dirrm lib/php/Math
 @dirrm lib/php/Mail
-@dirrm lib/php/Log
 @dirrm lib/php/Image
 @dirrm lib/php/HTTP
 @dirrm lib/php/HTML
@@ -261,13 +263,12 @@ share/php/php4.gif
 @dirrm lib/php/DB
 @dirrm lib/php/Crypt
 @dirrm lib/php/Console
-@dirrm lib/php/Cache/Container
-@dirrm lib/php/Cache
-@dirrm lib/php/Benchmark
 @dirrm lib/php/Archive
 @dirrm include/php/regex
 @dirrm include/php/main
+@dirrm include/php/ext/xml/expat
 @dirrm include/php/ext/xml
+@dirrm include/php/ext/mbstring
 @dirrm include/php/ext/standard
 @dirrm include/php/ext/session
 @dirrm include/php/ext
diff --git a/www/php4/distinfo b/www/php4/distinfo
index 3d55cd1bcbe..6ddebd446f5 100644
--- a/www/php4/distinfo
+++ b/www/php4/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.13 2002/10/02 23:48:07 wiz Exp $
+$NetBSD: distinfo,v 1.14 2002/10/14 06:21:19 martti Exp $
 
-SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466
-Size (php-4.1.2.tar.gz) = 3359964 bytes
+SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc
+Size (php-4.2.3.tar.gz) = 3413829 bytes
 SHA1 (patch-aa) = 09fb15fde09bf866d9be016839f33c889d9cefb9
 SHA1 (patch-ab) = f385cce407fed6fc1ed705a4507015684bebb1b5
-SHA1 (patch-ac) = 9478c18dbe18e8c4c05dffce31fa3f923562c832
-SHA1 (patch-ad) = 4ac02d0e0e5bd612254020d46292534a0e9445b0
+SHA1 (patch-ac) = f3a3a4a5af6f03a6274aa4875a922b838f1bde1b
+SHA1 (patch-ad) = 75288e1a09a12f9ff0ad962282caece245dda942
 SHA1 (patch-ae) = e7acc06a63f47053c81ab442b53c68d89d122f78
-SHA1 (patch-af) = 34ec060ed3cdbcfc44286323f85f9938a79b0444
-SHA1 (patch-ag) = 91e84f6d6862a328d3f66f87260e8f2b2953fc11
-SHA1 (patch-ah) = 75404d3b85a82a2b23ceb2b1e9f41d9b09257100
+SHA1 (patch-ag) = a1948af6361e898880e4598654a8ac15fd193b7d
+SHA1 (patch-ah) = 27ac564d2d378852ba328fbc0458d222a4bfdb22
diff --git a/www/php4/patches/patch-ac b/www/php4/patches/patch-ac
index af613d4f86f..d120f510f29 100644
--- a/www/php4/patches/patch-ac
+++ b/www/php4/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2001/12/31 23:54:25 jlam Exp $
+$NetBSD: patch-ac,v 1.6 2002/10/14 06:21:19 martti Exp $
 
---- acinclude.m4.orig	Sat Nov 17 19:33:19 2001
-+++ acinclude.m4
-@@ -341,10 +341,19 @@
+--- acinclude.m4.orig	Mon Jul 29 02:15:18 2002
++++ acinclude.m4	Sat Oct 12 09:25:51 2002
+@@ -364,10 +364,19 @@
    ;;
  esac
  
@@ -23,8 +23,8 @@ $NetBSD: patch-ac,v 1.5 2001/12/31 23:54:25 jlam Exp $
 -  test "[$]$1" = "no" && $1=yes
  fi
  
- AC_MSG_RESULT($ext_output)
-@@ -675,7 +684,7 @@
+ if test -n "$2"; then
+@@ -704,7 +713,7 @@
    if test "$1" != "/usr/lib"; then
      PHP_EXPAND_PATH($1, ai_p)
      if test "$ext_shared" = "yes" && test -n "$2"; then
diff --git a/www/php4/patches/patch-ad b/www/php4/patches/patch-ad
index 4a5faeed9f8..856d6bd3f17 100644
--- a/www/php4/patches/patch-ad
+++ b/www/php4/patches/patch-ad
@@ -1,31 +1,19 @@
-$NetBSD: patch-ad,v 1.10 2002/08/26 00:42:34 grant Exp $
+$NetBSD: patch-ad,v 1.11 2002/10/14 06:21:19 martti Exp $
 
---- configure.orig	Wed Feb 27 04:18:32 2002
-+++ configure
-@@ -5138,11 +5138,6 @@
-   fi
+--- configure.orig	Thu Sep  5 23:40:53 2002
++++ configure	Sat Oct 12 09:27:49 2002
+@@ -5396,10 +5396,6 @@
  
+   fi
  
 -if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
 -       CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
 -       LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
 -fi
--
  INCLUDES="$INCLUDES -I\$(top_builddir)/Zend"
- 
- 
-@@ -16148,10 +16143,6 @@
- 
- else
-   echo "$ac_t""no" 1>&6
--  cat >> confdefs.h <<\EOF
--#define HAVE_DBA 0
--EOF
--
- fi
- 
- 
-@@ -23572,19 +23563,10 @@
+ test -d /usr/ucblib && 
+   if test "/usr/ucblib" != "/usr/lib"; then
+@@ -26847,19 +26843,10 @@
  
  
    else
@@ -45,7 +33,7 @@ $NetBSD: patch-ad,v 1.10 2002/08/26 00:42:34 grant Exp $
    echo "$ac_t""no" 1>&6
  
  fi
-@@ -58680,7 +58662,7 @@
+@@ -72831,7 +72818,7 @@
  
  TSRM_LIB='TSRM/libtsrm.la'
  TSRM_DIR=TSRM
@@ -54,7 +42,7 @@ $NetBSD: patch-ad,v 1.10 2002/08/26 00:42:34 grant Exp $
  
  if test "$ZEND_EXPERIMENTAL_ZTS" = "yes"; then
    cat >> confdefs.h <<\EOF
-@@ -63418,7 +63400,7 @@
+@@ -73625,7 +73612,7 @@
  
  if test "$enable_debug" != "yes"; then
    
diff --git a/www/php4/patches/patch-af b/www/php4/patches/patch-af
deleted file mode 100644
index 8eefe367d72..00000000000
--- a/www/php4/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.4 2001/12/31 23:54:26 jlam Exp $
-
---- pear/Makefile.in.orig	Wed Dec 26 14:50:18 2001
-+++ pear/Makefile.in
-@@ -168,6 +168,7 @@
- 	/ \
- 	Zend \
- 	TSRM \
-+	ext/session \
- 	ext/standard \
- 	ext/xml \
- 	ext/xml/expat/xmlparse \
diff --git a/www/php4/patches/patch-ag b/www/php4/patches/patch-ag
index cc81b6312d0..d55e8853186 100644
--- a/www/php4/patches/patch-ag
+++ b/www/php4/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.3 2001/12/31 23:54:26 jlam Exp $
+$NetBSD: patch-ag,v 1.4 2002/10/14 06:21:20 martti Exp $
 
---- php.ini-dist.orig	Tue Aug 14 16:23:25 2001
-+++ php.ini-dist
-@@ -354,8 +354,9 @@
+--- php.ini-dist.orig	Sat Aug 24 00:57:06 2002
++++ php.ini-dist	Sat Oct 12 09:29:27 2002
+@@ -367,8 +367,9 @@
  ; if nonempty.
  user_dir =
  
@@ -14,7 +14,7 @@ $NetBSD: patch-ag,v 1.3 2001/12/31 23:54:26 jlam Exp $
  
  ; Whether or not to enable the dl() function.  The dl() function does NOT work
  ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
-@@ -372,7 +373,7 @@
+@@ -396,7 +397,7 @@
  
  ; Temporary directory for HTTP uploaded files (will use system default if not
  ; specified).
diff --git a/www/php4/patches/patch-ah b/www/php4/patches/patch-ah
index 9a9a88ef93a..f2b54b1338b 100644
--- a/www/php4/patches/patch-ah
+++ b/www/php4/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.4 2001/12/31 23:54:26 jlam Exp $
+$NetBSD: patch-ah,v 1.5 2002/10/14 06:21:20 martti Exp $
 
---- php.ini-recommended.orig	Fri Aug 17 12:54:16 2001
-+++ php.ini-recommended
-@@ -368,7 +368,7 @@
+--- php.ini-recommended.orig	Sat Aug 24 00:57:06 2002
++++ php.ini-recommended	Sat Oct 12 09:29:54 2002
+@@ -373,7 +373,7 @@
  user_dir =
  
  ; Directory in which the loadable extensions (modules) reside.
@@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.4 2001/12/31 23:54:26 jlam Exp $
  
  ; Whether or not to enable the dl() function.  The dl() function does NOT work
  ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
-@@ -385,7 +385,7 @@
+@@ -403,7 +403,7 @@
  
  ; Temporary directory for HTTP uploaded files (will use system default if not
  ; specified).