Update www/php4 to 4.1.0. Major changes from version 4.0.6 include:

- Introduced a new $_REQUEST array, which includes any GET, POST or COOKIE
  variables.  Like the other new variables, this variable is also available
  regardless of the context.
- Introduced $_GET, $_POST, $_COOKIE, $_SERVER and $_ENV variables, which
  deprecate the old $HTTP_*_VARS arrays.  In addition to be much shorter to
  type - these variables are also available regardless of the scope, and
  there's no need to import them using the 'global' statement.

Other relevant changes include:

- Bug fixes to prevent crashes on unexpected input.
- Huge performance improvements, especially in thread-safe code.
- Introduced extension version numbers.
- Added support for single dimensional SafeArrays and Enumerations.
  Added an is_enum() function to check if a component implements an
  enumeration.
- Improved speed of the serializer/deserializer.
- Floating point numbers are better detected when converting from strings.
- Added import_request_variables(), to allow users to safely import form
  variables to the global scope
- Add config option (always_populate_raw_post_data) which when enabled
  will always populate $HTTP_RAW_POST_DATA regardless of the post mime
  type
- Added getmygid() and safe_mode_gid ini directive to allow safe mode to do
  a gid check instead of a uid check.
- Assigning to a string offset beyond the end of the string now automatically
  increases the string length by padding it with spaces, and performs the
  assignment.

11 files changed, 88 insertions, 94 deletions

diff --git a/www/php4/Makefile b/www/php4/Makefile
index c7e845a0dee..f6bddf56143 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/12/11 06:12:44 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2001/12/31 23:54:24 jlam Exp $
 
 .include "Makefile.php"
 
@@ -29,14 +29,14 @@ LINK_LIBGCC_LDFLAGS=	-Wl,--whole-archive -Wl,-lgcc -Wl,--no-whole-archive
 MAKE_ENV+=		LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}"
 .endif
 
-CONF_FILES=	${EGDIR}/php.ini-dist ${PKG_SYSCONFDIR}/php.ini
+CONF_FILES=	${EGDIR}/php.ini-recommended ${PKG_SYSCONFDIR}/php.ini
 
 post-install:
 	${INSTALL_DATA_DIR} ${CGIDIR}
 	${LN} -sf ../../bin/php ${CGIDIR}/php
 	${TOUCH} ${PREFIX}/${PHP_EXTENSION_DIR}/.directory
 	${INSTALL_DATA_DIR} ${EGDIR}
-	cd ${WRKSRC}; ${INSTALL_DATA} php.ini-dist php.ini-optimized ${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
 
diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common
index ab4414f2542..cd82a5daa04 100644
--- a/www/php4/Makefile.common
+++ b/www/php4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2001/12/03 08:31:05 jlam Exp $
+# $NetBSD: Makefile.common,v 1.21 2001/12/31 23:54:24 jlam 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.0.6
+PHP_DIST_VERS=		4.1.0
 PHP_BASE_VERS=		${PHP_DIST_VERS}
 
 # Location of installed PHP4 loadable modules under ${PREFIX}.
@@ -22,7 +22,7 @@ PHP_BASE_VERS=		${PHP_DIST_VERS}
 # The number for the last part of the path represents a specific version
 # of the Zend API.
 #
-PHP_EXTENSION_DIR=	lib/php/20001222
+PHP_EXTENSION_DIR=	lib/php/20010901
 PLIST_SUBST+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/www/php4/PLIST b/www/php4/PLIST
index 27a1febf1fc..357b1020fe8 100644
--- a/www/php4/PLIST
+++ b/www/php4/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:18:38 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/12/31 23:54:25 jlam Exp $
 bin/pear
+bin/pearize
 bin/php
 bin/php-config
 bin/phpextdist
 bin/phpize
+bin/phptar
 include/php/TSRM/TSRM.h
 include/php/TSRM/acconfig.h
 include/php/TSRM/readdir.h
@@ -89,7 +91,6 @@ include/php/ext/standard/php_link.h
 include/php/ext/standard/php_mail.h
 include/php/ext/standard/php_math.h
 include/php/ext/standard/php_metaphone.h
-include/php/ext/standard/php_output.h
 include/php/ext/standard/php_parsedate.h
 include/php/ext/standard/php_rand.h
 include/php/ext/standard/php_smart_str.h
@@ -97,6 +98,7 @@ 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_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
@@ -105,17 +107,6 @@ 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/xmlparse/expat_hashtable.h
-include/php/ext/xml/expat/xmlparse/xmlparse.h
-include/php/ext/xml/expat/xmltok/asciitab.h
-include/php/ext/xml/expat/xmltok/iasciitab.h
-include/php/ext/xml/expat/xmltok/latin1tab.h
-include/php/ext/xml/expat/xmltok/nametab.h
-include/php/ext/xml/expat/xmltok/utf8tab.h
-include/php/ext/xml/expat/xmltok/xmldef.h
-include/php/ext/xml/expat/xmltok/xmlrole.h
-include/php/ext/xml/expat/xmltok/xmltok.h
-include/php/ext/xml/expat/xmltok/xmltok_impl.h
 include/php/ext/xml/php_xml.h
 include/php/main/SAPI.h
 include/php/main/build-defs.h
@@ -134,6 +125,7 @@ include/php/main/php_logos.h
 include/php/main/php_main.h
 include/php/main/php_network.h
 include/php/main/php_open_temporary_file.h
+include/php/main/php_output.h
 include/php/main/php_reentrancy.h
 include/php/main/php_regex.h
 include/php/main/php_streams.h
@@ -153,6 +145,7 @@ include/php/regex/regex2.h
 include/php/regex/regex_extra.h
 include/php/regex/utils.h
 ${PHP_EXTENSION_DIR}/.directory
+lib/php/Archive/Tar.php
 lib/php/Benchmark/Iterate.php
 lib/php/Benchmark/Timer.php
 lib/php/Cache.php
@@ -162,6 +155,7 @@ 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
@@ -172,6 +166,7 @@ lib/php/Crypt/CBC.php
 lib/php/Crypt/HCEMD5.php
 lib/php/DB.php
 lib/php/DB/common.php
+lib/php/DB/fbsql.php
 lib/php/DB/ibase.php
 lib/php/DB/ifx.php
 lib/php/DB/msql.php
@@ -190,6 +185,7 @@ lib/php/File/SearchReplace.php
 lib/php/HTML/Common.php
 lib/php/HTML/Form.php
 lib/php/HTML/IT.php
+lib/php/HTML/IT_Error.php
 lib/php/HTML/ITX.php
 lib/php/HTML/Page.php
 lib/php/HTML/Processor.php
@@ -199,14 +195,15 @@ 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/observer.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
@@ -218,14 +215,16 @@ lib/php/Net/Socket.php
 lib/php/Numbers/Roman.php
 lib/php/PEAR.php
 lib/php/PEAR/Common.php
+lib/php/PEAR/Config.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
-lib/php/XML/RPC.php
-lib/php/XML/RPC/Server.php
 lib/php/build/acinclude.m4
 lib/php/build/dynlib.m4
 lib/php/build/dynlib.mk
@@ -241,12 +240,11 @@ lib/php/build/rules_pear.mk
 lib/php/build/shtool
 libexec/cgi-bin/php
 share/examples/php/php.ini-dist
-share/examples/php/php.ini-optimized
+share/examples/php/php.ini-recommended
 share/php/php4.gif
 @dirrm share/php
 @dirrm share/examples/php
 @dirrm lib/php/build
-@dirrm lib/php/XML/RPC
 @dirrm lib/php/XML
 @dirrm lib/php/Schedule
 @dirrm lib/php/Payment
@@ -267,6 +265,7 @@ share/php/php4.gif
 @dirrm lib/php/Cache/Container
 @dirrm lib/php/Cache
 @dirrm lib/php/Benchmark
+@dirrm lib/php/Archive
 @unexec rmdir -p %D/${PHP_EXTENSION_DIR} 2>/dev/null || true
 @dirrm include/php/regex
 @dirrm include/php/main
diff --git a/www/php4/buildlink.mk b/www/php4/buildlink.mk
index a73129372eb..06b025f0769 100644
--- a/www/php4/buildlink.mk
+++ b/www/php4/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/10/16 04:54:24 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/12/31 23:54:25 jlam Exp $
 #
 # This Makefile fragment is included by packages that use php4.
 #
@@ -18,7 +18,7 @@ PHP4_BUILDLINK_MK=	# defined
 .include "../../mk/bsd.buildlink.mk"
 
 # This adds a build-dependency as php4 has no libraries.
-BUILDLINK_DEPENDS.php4?=	php>=4.0.6
+BUILDLINK_DEPENDS.php4?=	php>=4.1.0
 BUILD_DEPENDS+=			${BUILDLINK_DEPENDS.php4}:../../www/php4
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.php4=php
diff --git a/www/php4/distinfo b/www/php4/distinfo
index 4ed8b35077c..333d49f7631 100644
--- a/www/php4/distinfo
+++ b/www/php4/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.5 2001/10/16 04:54:24 jlam Exp $
+$NetBSD: distinfo,v 1.6 2001/12/31 23:54:25 jlam Exp $
 
-SHA1 (php-4.0.6.tar.gz) = 6544eb1085b916541af914a11074e9bb8a037a03
-Size (php-4.0.6.tar.gz) = 3157346 bytes
+SHA1 (php-4.1.0.tar.gz) = d8ce2c3b1dd9551980340d20064a1e939ef49431
+Size (php-4.1.0.tar.gz) = 3371385 bytes
 SHA1 (patch-aa) = 08f98c6b41c24a2aa8fa417bba50cf0cb5f711af
-SHA1 (patch-ab) = f5b7660b78e9555af27dbb50dd104cd099396341
-SHA1 (patch-ac) = 40bc1a1fd8ff07eeec4ec4c4e65467e6adac4863
-SHA1 (patch-ad) = 0cbb6381e8a72cdd7f76056a8901304ad9f6b0a9
+SHA1 (patch-ac) = 9478c18dbe18e8c4c05dffce31fa3f923562c832
+SHA1 (patch-ad) = 86558b18a03fef6fcbebdfd8587a73dfa5a66f17
 SHA1 (patch-ae) = e7acc06a63f47053c81ab442b53c68d89d122f78
-SHA1 (patch-af) = bb76894ca29b9f3a53bc7c0675f63ec16126c0ab
-SHA1 (patch-ag) = 0b22f10386cbe27aec6a90f95fc30d1bf2e65856
-SHA1 (patch-ah) = 4e720082fb8e02931d66770b544a6328fe569489
+SHA1 (patch-af) = 34ec060ed3cdbcfc44286323f85f9938a79b0444
+SHA1 (patch-ag) = 91e84f6d6862a328d3f66f87260e8f2b2953fc11
+SHA1 (patch-ah) = 75404d3b85a82a2b23ceb2b1e9f41d9b09257100
diff --git a/www/php4/patches/patch-ab b/www/php4/patches/patch-ab
deleted file mode 100644
index 2fd1f72ef34..00000000000
--- a/www/php4/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2001/10/16 04:54:24 jlam Exp $
-
---- Zend/zend_alloc.c.orig	Tue Jun 19 14:04:53 2001
-+++ Zend/zend_alloc.c
-@@ -446,6 +446,9 @@
- 		for (i=1; i<MAX_CACHED_MEMORY; i++) {
- 			for (j=0; j<AG(cache_count)[i]; j++) {
- 				ptr = (zend_mem_header *) AG(cache)[i][j];
-+#if MEMORY_LIMIT
-+				AG(allocated_memory) -= REAL_SIZE(ptr->size);
-+#endif
- 				REMOVE_POINTER_FROM_LIST(ptr);
- 				free(ptr);
- 			}
diff --git a/www/php4/patches/patch-ac b/www/php4/patches/patch-ac
index ee38f37c012..af613d4f86f 100644
--- a/www/php4/patches/patch-ac
+++ b/www/php4/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2001/10/16 04:54:24 jlam Exp $
+$NetBSD: patch-ac,v 1.5 2001/12/31 23:54:25 jlam Exp $
 
---- acinclude.m4.orig	Sun Jun 10 15:52:56 2001
+--- acinclude.m4.orig	Sat Nov 17 19:33:19 2001
 +++ acinclude.m4
-@@ -251,10 +251,19 @@
+@@ -341,10 +341,19 @@
    ;;
  esac
  
@@ -24,3 +24,12 @@ $NetBSD: patch-ac,v 1.4 2001/10/16 04:54:24 jlam Exp $
  fi
  
  AC_MSG_RESULT($ext_output)
+@@ -675,7 +684,7 @@
+   if test "$1" != "/usr/lib"; then
+     PHP_EXPAND_PATH($1, ai_p)
+     if test "$ext_shared" = "yes" && test -n "$2"; then
+-      $2="-R$1 -L$1 [$]$2"
++      $2="-L$1 [$]$2"
+     else
+       AC_PHP_ONCE(LIBPATH, $ai_p, [
+         test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
diff --git a/www/php4/patches/patch-ad b/www/php4/patches/patch-ad
index 964189e449d..f03619bf17e 100644
--- a/www/php4/patches/patch-ad
+++ b/www/php4/patches/patch-ad
@@ -1,8 +1,20 @@
-$NetBSD: patch-ad,v 1.5 2001/10/16 04:54:24 jlam Exp $
+$NetBSD: patch-ad,v 1.6 2001/12/31 23:54:26 jlam Exp $
 
---- configure.orig	Thu Jun 21 02:28:57 2001
+--- configure.orig	Sat Dec  8 14:40:35 2001
 +++ configure
-@@ -14903,10 +14903,6 @@
+@@ -5132,11 +5132,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"
+ 
+ 
+@@ -16142,10 +16137,6 @@
  
  else
    echo "$ac_t""no" 1>&6
@@ -13,7 +25,7 @@ $NetBSD: patch-ad,v 1.5 2001/10/16 04:54:24 jlam Exp $
  fi
  
  
-@@ -21394,19 +21390,10 @@
+@@ -23549,19 +23540,10 @@
  
  
    else
@@ -33,7 +45,7 @@ $NetBSD: patch-ad,v 1.5 2001/10/16 04:54:24 jlam Exp $
    echo "$ac_t""no" 1>&6
  
  fi
-@@ -55797,7 +55784,7 @@
+@@ -63204,7 +63186,7 @@
  
  if test "$enable_debug" != "yes"; then
    
@@ -42,14 +54,3 @@ $NetBSD: patch-ad,v 1.5 2001/10/16 04:54:24 jlam Exp $
  
  fi
  
-@@ -55815,8 +55802,8 @@
-     $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache $srcdir/ltmain.sh
-     SHARED_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool'
-   else
--    PHP_COMPILE='$(COMPILE) -c $< && touch $@'
--    CXX_PHP_COMPILE='$(CXX_COMPILE) -c $< && touch $@'
-+    PHP_COMPILE='$(LIBTOOL) --mode=compile $(COMPILE) -c $<'
-+    CXX_PHP_COMPILE='$(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $<'
-   fi
- fi
- 
diff --git a/www/php4/patches/patch-af b/www/php4/patches/patch-af
index 332aaf28285..8eefe367d72 100644
--- a/www/php4/patches/patch-af
+++ b/www/php4/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.3 2001/10/16 04:54:24 jlam Exp $
+$NetBSD: patch-af,v 1.4 2001/12/31 23:54:26 jlam Exp $
 
---- pear/Makefile.in.orig	Tue May 15 06:17:21 2001
+--- pear/Makefile.in.orig	Wed Dec 26 14:50:18 2001
 +++ pear/Makefile.in
-@@ -157,6 +157,7 @@
+@@ -168,6 +168,7 @@
  	/ \
  	Zend \
  	TSRM \
diff --git a/www/php4/patches/patch-ag b/www/php4/patches/patch-ag
index a71349ae109..cc81b6312d0 100644
--- a/www/php4/patches/patch-ag
+++ b/www/php4/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2001/10/16 04:54:24 jlam Exp $
+$NetBSD: patch-ag,v 1.3 2001/12/31 23:54:26 jlam Exp $
 
---- php.ini-dist.orig	Thu May 31 23:20:49 2001
+--- php.ini-dist.orig	Tue Aug 14 16:23:25 2001
 +++ php.ini-dist
-@@ -320,8 +320,9 @@
+@@ -354,8 +354,9 @@
  ; if nonempty.
  user_dir =
  
@@ -14,7 +14,7 @@ $NetBSD: patch-ag,v 1.2 2001/10/16 04:54:24 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
-@@ -338,7 +339,7 @@
+@@ -372,7 +373,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 abca36dacb6..9a9a88ef93a 100644
--- a/www/php4/patches/patch-ah
+++ b/www/php4/patches/patch-ah
@@ -1,22 +1,22 @@
-$NetBSD: patch-ah,v 1.3 2001/10/16 04:54:24 jlam Exp $
+$NetBSD: patch-ah,v 1.4 2001/12/31 23:54:26 jlam Exp $
 
---- php.ini-optimized.orig	Thu May 31 23:20:49 2001
-+++ php.ini-optimized
-@@ -231,7 +231,7 @@
- include_path	=                   ; UNIX: "/path1:/path2"  Windows: "\path1;\path2"
- doc_root		=					; the root of the php pages, used only if nonempty
- user_dir		=					; the directory under which php opens the script using /~username, used only if nonempty
--extension_dir	=	./				; directory in which the loadable extensions (modules) reside
-+;extension_dir	=	./				; directory in which the loadable extensions (modules) reside
- enable_dl		= On				; Whether or not to enable the dl() function.
- 									; The dl() function does NOT properly work in multithreaded
- 									; servers, such as IIS or Zeus, and is automatically disabled
-@@ -242,7 +242,7 @@
- ; File Uploads ;
- ;;;;;;;;;;;;;;;;
- file_uploads	= On				; Whether to allow HTTP file uploads
--;upload_tmp_dir	=	                ; temporary directory for HTTP uploaded files (will use system default if not specified)
-+upload_tmp_dir	= /tmp	                ; temporary directory for HTTP uploaded files (will use system default if not specified)
- upload_max_filesize = 2M		    ; Maximum allowed size for uploaded files
+--- php.ini-recommended.orig	Fri Aug 17 12:54:16 2001
++++ php.ini-recommended
+@@ -368,7 +368,7 @@
+ user_dir =
  
+ ; Directory in which the loadable extensions (modules) reside.
+-extension_dir = ./
++;extension_dir = ./
  
+ ; 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 @@
+ 
+ ; Temporary directory for HTTP uploaded files (will use system default if not
+ ; specified).
+-;upload_tmp_dir =
++upload_tmp_dir = /tmp
+ 
+ ; Maximum allowed size for uploaded files.
+ upload_max_filesize = 2M