Update to version 4.4.2. Ok'd by jdolecek@.

This is a bug fix release, which addresses some security problems too.
The major points that this release corrects are:

    * Prevent header injection by limiting each header to a single line.
    * Possible XSS inside error reporting functionality.
    * Missing safe_mode/open_basedir checks into cURL extension.
    * Apache 2 regression with sub-request handling on non-Linux systems.
    * key() and current() regression related to references.

This release also fixes about 30 other defects.

9 files changed, 313 insertions, 246 deletions

diff --git a/www/php4/Makefile b/www/php4/Makefile
index d1e1d4c4f8f..43b27618645 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.61 2006/02/05 23:11:28 joerg Exp $
+# $NetBSD: Makefile,v 1.62 2006/03/03 07:11:34 cube Exp $
 
 PKGNAME=		php-${PHP_BASE_VERS}
-PKGREVISION=		3
 CATEGORIES+=		lang
 COMMENT=		HTML-embedded scripting language
 
diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common
index c022c2c15ad..f777b0b817f 100644
--- a/www/php4/Makefile.common
+++ b/www/php4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.51 2005/12/05 20:51:13 rillig Exp $
+# $NetBSD: Makefile.common,v 1.52 2006/03/03 07:11:34 cube Exp $
 
 DISTNAME?=		php-${PHP_DIST_VERS}
 CATEGORIES+=		www php4
@@ -18,7 +18,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.4.1
+PHP_DIST_VERS=		4.4.2
 PHP_BASE_VERS=		${PHP_DIST_VERS}
 
 DISTFILES?=		${PHP_DISTFILE}
diff --git a/www/php4/PLIST b/www/php4/PLIST
index 058172dd4b1..a90e93f5259 100644
--- a/www/php4/PLIST
+++ b/www/php4/PLIST
@@ -1,206 +1,217 @@
-@comment $NetBSD: PLIST,v 1.14 2005/11/02 10:48:01 tron Exp $
+@comment $NetBSD: PLIST,v 1.15 2006/03/03 07:11:34 cube Exp $
 bin/pear
+bin/peardev
+bin/pecl
 bin/php
 bin/php-config
 bin/phpize
 etc/pear.conf
+include/php/TSRM/TSRM.h
+include/php/TSRM/acconfig.h
+include/php/TSRM/readdir.h
+include/php/TSRM/tsrm_config.h
+include/php/TSRM/tsrm_config.nw.h
+include/php/TSRM/tsrm_config.w32.h
+include/php/TSRM/tsrm_config_common.h
+include/php/TSRM/tsrm_nw.h
+include/php/TSRM/tsrm_strtok_r.h
+include/php/TSRM/tsrm_virtual_cwd.h
+include/php/TSRM/tsrm_win32.h
 include/php/Zend/FlexLexer.h
-include/php/Zend/zend_types.h
-include/php/Zend/zend_strtod.h
-include/php/Zend/zend_static_allocator.h
-include/php/Zend/zend_stack.h
-include/php/Zend/zend_qsort.h
-include/php/Zend/zend_ptr_stack.h
-include/php/Zend/zend_operators.h
-include/php/Zend/zend_multiply.h
-include/php/Zend/zend_multibyte.h
-include/php/Zend/zend_modules.h
-include/php/Zend/zend_llist.h
-include/php/Zend/zend_list.h
-include/php/Zend/zend_language_scanner.h
-include/php/Zend/zend_language_parser.h
-include/php/Zend/zend_istdiostream.h
-include/php/Zend/zend_ini_scanner.h
-include/php/Zend/zend_ini_parser.h
-include/php/Zend/zend_ini.h
+include/php/Zend/acconfig.h
+include/php/Zend/zend.h
+include/php/Zend/zend_API.h
+include/php/Zend/zend_alloc.h
+include/php/Zend/zend_builtin_functions.h
+include/php/Zend/zend_compile.h
+include/php/Zend/zend_config.h
+include/php/Zend/zend_config.w32.h
+include/php/Zend/zend_constants.h
+include/php/Zend/zend_dynamic_array.h
+include/php/Zend/zend_errors.h
+include/php/Zend/zend_execute.h
+include/php/Zend/zend_execute_globals.h
+include/php/Zend/zend_execute_locks.h
+include/php/Zend/zend_extensions.h
+include/php/Zend/zend_fast_cache.h
+include/php/Zend/zend_globals.h
+include/php/Zend/zend_globals_macros.h
 include/php/Zend/zend_hash.h
-include/php/Zend/zend_indent.h
 include/php/Zend/zend_highlight.h
-include/php/Zend/zend_globals_macros.h
-include/php/Zend/zend_globals.h
-include/php/Zend/zend_fast_cache.h
-include/php/Zend/zend_extensions.h
-include/php/Zend/zend_execute_locks.h
-include/php/Zend/zend_execute_globals.h
-include/php/Zend/zend_execute.h
-include/php/Zend/zend_errors.h
-include/php/Zend/zend_dynamic_array.h
-include/php/Zend/zend_constants.h
-include/php/Zend/zend_config.w32.h
-include/php/Zend/zend_config.h
-include/php/Zend/zend_compile.h
-include/php/Zend/zend_builtin_functions.h
-include/php/Zend/zend_alloc.h
-include/php/Zend/zend_API.h
-include/php/Zend/zend.h
-include/php/Zend/acconfig.h
+include/php/Zend/zend_indent.h
+include/php/Zend/zend_ini.h
+include/php/Zend/zend_ini_parser.h
+include/php/Zend/zend_ini_scanner.h
+include/php/Zend/zend_istdiostream.h
+include/php/Zend/zend_language_parser.h
+include/php/Zend/zend_language_scanner.h
+include/php/Zend/zend_list.h
+include/php/Zend/zend_llist.h
+include/php/Zend/zend_modules.h
+include/php/Zend/zend_multibyte.h
+include/php/Zend/zend_multiply.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_strtod.h
+include/php/Zend/zend_types.h
 include/php/Zend/zend_variables.h
-include/php/TSRM/TSRM.h
-include/php/TSRM/tsrm_virtual_cwd.h
-include/php/TSRM/tsrm_strtok_r.h
-include/php/TSRM/tsrm_nw.h
-include/php/TSRM/tsrm_config_common.h
-include/php/TSRM/tsrm_config.w32.h
-include/php/TSRM/tsrm_config.nw.h
-include/php/TSRM/tsrm_config.h
-include/php/TSRM/readdir.h
-include/php/TSRM/acconfig.h
-include/php/TSRM/tsrm_win32.h
+include/php/acconfig.h
 include/php/ext/iconv/php_iconv.h
+include/php/ext/mbstring/libmbfl/mbfl/eaw_table.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfilter.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_consts.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_convert.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_defs.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_ident.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_language.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_string.h
+include/php/ext/mbstring/mbstring.h
+include/php/ext/mbstring/php_mbregex.h
+include/php/ext/mbstring/php_unicode.h
+include/php/ext/mbstring/unicode_data.h
+include/php/ext/pgsql/php_pgsql.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/url_scanner.h
-include/php/ext/standard/url.h
-include/php/ext/standard/uniqid.h
-include/php/ext/standard/sha1.h
-include/php/ext/standard/scanf.h
-include/php/ext/standard/reg.h
-include/php/ext/standard/quot_print.h
-include/php/ext/standard/php_versioning.h
-include/php/ext/standard/php_var.h
-include/php/ext/standard/php_type.h
-include/php/ext/standard/php_string.h
-include/php/ext/standard/php_standard.h
-include/php/ext/standard/php_smart_str_public.h
-include/php/ext/standard/php_smart_str.h
-include/php/ext/standard/php_rand.h
-include/php/ext/standard/php_parsedate.h
-include/php/ext/standard/php_metaphone.h
-include/php/ext/standard/php_math.h
-include/php/ext/standard/php_mail.h
-include/php/ext/standard/php_link.h
-include/php/ext/standard/php_lcg.h
-include/php/ext/standard/php_iptc.h
-include/php/ext/standard/php_incomplete_class.h
-include/php/ext/standard/php_image.h
-include/php/ext/standard/php_ftok.h
-include/php/ext/standard/php_fopen_wrappers.h
-include/php/ext/standard/php_filestat.h
-include/php/ext/standard/php_ext_syslog.h
-include/php/ext/standard/php_dir.h
-include/php/ext/standard/php_crypt.h
-include/php/ext/standard/php_browscap.h
-include/php/ext/standard/php_assert.h
-include/php/ext/standard/php_array.h
-include/php/ext/standard/parsedate.h
-include/php/ext/standard/pageinfo.h
-include/php/ext/standard/pack.h
-include/php/ext/standard/microtime.h
-include/php/ext/standard/md5.h
-include/php/ext/standard/info.h
-include/php/ext/standard/html.h
-include/php/ext/standard/head.h
-include/php/ext/standard/fsock.h
-include/php/ext/standard/flock_compat.h
-include/php/ext/standard/file.h
-include/php/ext/standard/exec.h
-include/php/ext/standard/dns.h
-include/php/ext/standard/dl.h
-include/php/ext/standard/datetime.h
-include/php/ext/standard/cyr_convert.h
-include/php/ext/standard/css.h
-include/php/ext/standard/credits_sapi.h
-include/php/ext/standard/credits_ext.h
-include/php/ext/standard/credits.h
-include/php/ext/standard/crc32.h
-include/php/ext/standard/basic_functions.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
+include/php/ext/standard/css.h
+include/php/ext/standard/cyr_convert.h
+include/php/ext/standard/datetime.h
+include/php/ext/standard/dl.h
+include/php/ext/standard/dns.h
+include/php/ext/standard/exec.h
+include/php/ext/standard/file.h
+include/php/ext/standard/flock_compat.h
+include/php/ext/standard/fsock.h
+include/php/ext/standard/head.h
+include/php/ext/standard/html.h
+include/php/ext/standard/info.h
+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
+include/php/ext/standard/php_crypt.h
+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
+include/php/ext/standard/php_lcg.h
+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_parsedate.h
+include/php/ext/standard/php_rand.h
+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/sha1.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/session/php_session.h
-include/php/ext/session/mod_user.h
-include/php/ext/session/mod_mm.h
-include/php/ext/session/mod_files.h
 include/php/ext/xml/expat/ascii.h
-include/php/ext/xml/expat/xmltok.h
-include/php/ext/xml/expat/xmlrole.h
-include/php/ext/xml/expat/winconfig.h
-include/php/ext/xml/expat/utf8tab.h
-include/php/ext/xml/expat/nametab.h
-include/php/ext/xml/expat/latin1tab.h
-include/php/ext/xml/expat/internal.h
-include/php/ext/xml/expat/iasciitab.h
-include/php/ext/xml/expat/expat.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/internal.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/ext/mbstring/libmbfl/mbfl/eaw_table.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_string.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_language.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_ident.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_defs.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_convert.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_consts.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfilter.h
-include/php/ext/mbstring/unicode_data.h
-include/php/ext/mbstring/php_unicode.h
-include/php/ext/mbstring/php_mbregex.h
-include/php/ext/mbstring/mbstring.h
-include/php/ext/pgsql/php_pgsql.h
 include/php/include/php_sab_info.h
 include/php/main/SAPI.h
-include/php/main/spprintf.h
-include/php/main/snprintf.h
-include/php/main/safe_mode.h
-include/php/main/rfc1867.h
-include/php/main/php_version.h
-include/php/main/php_variables.h
-include/php/main/php_ticks.h
-include/php/main/php_syslog.h
-include/php/main/php_streams.h
-include/php/main/php_scandir.h
-include/php/main/php_regex.h
-include/php/main/php_reentrancy.h
-include/php/main/php_output.h
-include/php/main/php_open_temporary_file.h
-include/php/main/php_network.h
-include/php/main/php_memory_streams.h
-include/php/main/php_main.h
-include/php/main/php_logos.h
-include/php/main/php_ini.h
-include/php/main/php_globals.h
-include/php/main/php_content_types.h
-include/php/main/php_config.h
-include/php/main/php_compat.h
-include/php/main/php3_compat.h
-include/php/main/php.h
-include/php/main/logos.h
-include/php/main/internal_functions_registry.h
-include/php/main/fopen_wrappers.h
-include/php/main/config.w32.h
 include/php/main/build-defs.h
-include/php/main/win95nt.h
+include/php/main/config.w32.h
+include/php/main/fopen_wrappers.h
+include/php/main/internal_functions_registry.h
+include/php/main/logos.h
+include/php/main/php.h
+include/php/main/php3_compat.h
+include/php/main/php_compat.h
+include/php/main/php_config.h
+include/php/main/php_content_types.h
 include/php/main/php_embed.h
-include/php/regex/utils.h
-include/php/regex/regex_extra.h
-include/php/regex/regex2.h
-include/php/regex/regex.h
-include/php/regex/cname.h
+include/php/main/php_globals.h
+include/php/main/php_ini.h
+include/php/main/php_logos.h
+include/php/main/php_main.h
+include/php/main/php_memory_streams.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_scandir.h
+include/php/main/php_streams.h
+include/php/main/php_syslog.h
+include/php/main/php_ticks.h
+include/php/main/php_variables.h
+include/php/main/php_version.h
+include/php/main/rfc1867.h
+include/php/main/safe_mode.h
+include/php/main/snprintf.h
+include/php/main/spprintf.h
+include/php/main/win95nt.h
 include/php/regex/cclass.h
-include/php/acconfig.h
+include/php/regex/cname.h
+include/php/regex/regex.h
+include/php/regex/regex2.h
+include/php/regex/regex_extra.h
+include/php/regex/utils.h
+lib/php/.channels/.alias/pear.txt
+lib/php/.channels/.alias/pecl.txt
+lib/php/.channels/__uri.reg
+lib/php/.channels/pear.php.net.reg
+lib/php/.channels/pecl.php.net.reg
+lib/php/.depdb
+lib/php/.depdblock
 lib/php/.filemap
 lib/php/.lock
+@exec ${MKDIR} %D/lib/php/.registry/.channel.__uri
+@exec ${MKDIR} %D/lib/php/.registry/.channel.pecl.php.net
 lib/php/.registry/archive_tar.reg
 lib/php/.registry/console_getopt.reg
 lib/php/.registry/html_template_it.reg
 lib/php/.registry/net_useragent_detect.reg
 lib/php/.registry/pear.reg
-lib/php/.registry/xml_rpc.reg
+@exec ${MKDIR} %D/lib/php/20020429
 lib/php/Archive/Tar.php
 lib/php/Console/Getopt.php
 lib/php/HTML/Template/IT.php
@@ -211,32 +222,89 @@ lib/php/OS/Guess.php
 lib/php/PEAR.php
 lib/php/PEAR/Autoloader.php
 lib/php/PEAR/Builder.php
+lib/php/PEAR/ChannelFile.php
+lib/php/PEAR/ChannelFile/Parser.php
 lib/php/PEAR/Command.php
 lib/php/PEAR/Command/Auth.php
+lib/php/PEAR/Command/Auth.xml
 lib/php/PEAR/Command/Build.php
+lib/php/PEAR/Command/Build.xml
+lib/php/PEAR/Command/Channels.php
+lib/php/PEAR/Command/Channels.xml
 lib/php/PEAR/Command/Common.php
 lib/php/PEAR/Command/Config.php
+lib/php/PEAR/Command/Config.xml
 lib/php/PEAR/Command/Install.php
+lib/php/PEAR/Command/Install.xml
 lib/php/PEAR/Command/Mirror.php
+lib/php/PEAR/Command/Mirror.xml
 lib/php/PEAR/Command/Package.php
+lib/php/PEAR/Command/Package.xml
+lib/php/PEAR/Command/Pickle.php
+lib/php/PEAR/Command/Pickle.xml
 lib/php/PEAR/Command/Registry.php
+lib/php/PEAR/Command/Registry.xml
 lib/php/PEAR/Command/Remote.php
+lib/php/PEAR/Command/Remote.xml
+lib/php/PEAR/Command/Test.php
+lib/php/PEAR/Command/Test.xml
 lib/php/PEAR/Common.php
 lib/php/PEAR/Config.php
 lib/php/PEAR/Dependency.php
+lib/php/PEAR/Dependency2.php
+lib/php/PEAR/DependencyDB.php
 lib/php/PEAR/Downloader.php
+lib/php/PEAR/Downloader/Package.php
 lib/php/PEAR/ErrorStack.php
 lib/php/PEAR/Exception.php
+lib/php/PEAR/Frontend.php
 lib/php/PEAR/Frontend/CLI.php
 lib/php/PEAR/Installer.php
+lib/php/PEAR/Installer/Role.php
+lib/php/PEAR/Installer/Role/Common.php
+lib/php/PEAR/Installer/Role/Data.php
+lib/php/PEAR/Installer/Role/Data.xml
+lib/php/PEAR/Installer/Role/Doc.php
+lib/php/PEAR/Installer/Role/Doc.xml
+lib/php/PEAR/Installer/Role/Ext.php
+lib/php/PEAR/Installer/Role/Ext.xml
+lib/php/PEAR/Installer/Role/Php.php
+lib/php/PEAR/Installer/Role/Php.xml
+lib/php/PEAR/Installer/Role/Script.php
+lib/php/PEAR/Installer/Role/Script.xml
+lib/php/PEAR/Installer/Role/Src.php
+lib/php/PEAR/Installer/Role/Src.xml
+lib/php/PEAR/Installer/Role/Test.php
+lib/php/PEAR/Installer/Role/Test.xml
+lib/php/PEAR/PackageFile.php
+lib/php/PEAR/PackageFile/Generator/v1.php
+lib/php/PEAR/PackageFile/Generator/v2.php
+lib/php/PEAR/PackageFile/Parser/v1.php
+lib/php/PEAR/PackageFile/Parser/v2.php
+lib/php/PEAR/PackageFile/v1.php
+lib/php/PEAR/PackageFile/v2.php
+lib/php/PEAR/PackageFile/v2/Validator.php
+lib/php/PEAR/PackageFile/v2/rw.php
 lib/php/PEAR/Packager.php
+lib/php/PEAR/REST.php
+lib/php/PEAR/REST/10.php
+lib/php/PEAR/REST/11.php
 lib/php/PEAR/Registry.php
 lib/php/PEAR/Remote.php
 lib/php/PEAR/RunTest.php
+lib/php/PEAR/Task/Common.php
+lib/php/PEAR/Task/Postinstallscript.php
+lib/php/PEAR/Task/Postinstallscript/rw.php
+lib/php/PEAR/Task/Replace.php
+lib/php/PEAR/Task/Replace/rw.php
+lib/php/PEAR/Task/Unixeol.php
+lib/php/PEAR/Task/Unixeol/rw.php
+lib/php/PEAR/Task/Windowseol.php
+lib/php/PEAR/Task/Windowseol/rw.php
+lib/php/PEAR/Validate.php
+lib/php/PEAR/Validator/PECL.php
+lib/php/PEAR/XMLParser.php
 lib/php/System.php
-lib/php/XML/RPC.php
-lib/php/XML/RPC/Dump.php
-lib/php/XML/RPC/Server.php
 lib/php/build/Makefile.global
 lib/php/build/acinclude.m4
 lib/php/build/config.guess
@@ -253,6 +321,7 @@ lib/php/doc/Archive_Tar/docs/Archive_Tar.txt
 lib/php/doc/HTML_Template_IT/examples/sample_it.php
 lib/php/doc/HTML_Template_IT/examples/templates/main.tpl.htm
 lib/php/pearcmd.php
+lib/php/peclcmd.php
 lib/php/test/HTML_Template_IT/tests/Console_TestListener.php
 lib/php/test/HTML_Template_IT/tests/ITX_api_testcase.php
 lib/php/test/HTML_Template_IT/tests/ITX_usage_testcase.php
@@ -267,8 +336,6 @@ lib/php/test/HTML_Template_IT/tests/templates/include.html
 lib/php/test/HTML_Template_IT/tests/templates/loadtemplatefile.html
 lib/php/test/HTML_Template_IT/tests/templates/replaceblock.html
 lib/php/test/HTML_Template_IT/tests/test.php
-lib/php/test/XML_RPC/tests/protoport.php
-lib/php/test/XML_RPC/tests/test_Dump.php
 libexec/cgi-bin/php
 man/man1/php-config.1
 man/man1/php.1
@@ -278,46 +345,63 @@ share/examples/php/php.ini-recommended
 share/php/php.gif
 @dirrm share/php
 @dirrm share/examples/php
-@dirrm lib/php/.registry
-@dirrm lib/php/build
 @dirrm lib/php/data/PEAR
 @dirrm lib/php/data
+@dirrm lib/php/test/HTML_Template_IT/tests/templates
+@dirrm lib/php/test/HTML_Template_IT/tests
+@dirrm lib/php/test/HTML_Template_IT
 @dirrm lib/php/doc/HTML_Template_IT/examples/templates
 @dirrm lib/php/doc/HTML_Template_IT/examples
 @dirrm lib/php/doc/HTML_Template_IT
 @dirrm lib/php/doc/Archive_Tar/docs
 @dirrm lib/php/doc/Archive_Tar
 @dirrm lib/php/doc
-@dirrm lib/php/test/HTML_Template_IT/tests/templates
-@dirrm lib/php/test/HTML_Template_IT/tests
-@dirrm lib/php/test/HTML_Template_IT
-@dirrm lib/php/test/XML_RPC/tests
-@dirrm lib/php/test/XML_RPC
 @dirrm lib/php/test
-@dirrm lib/php/XML/RPC
-@dirrm lib/php/XML
-@dirrm lib/php/PEAR/Command
+@dirrm lib/php/build
+@dirrm lib/php/PEAR/Validator
+@dirrm lib/php/PEAR/Task/Windowseol
+@dirrm lib/php/PEAR/Task/Unixeol
+@dirrm lib/php/PEAR/Task/Replace
+@dirrm lib/php/PEAR/Task/Postinstallscript
+@dirrm lib/php/PEAR/Task
+@dirrm lib/php/PEAR/REST
+@dirrm lib/php/PEAR/PackageFile/v2
+@dirrm lib/php/PEAR/PackageFile/Parser
+@dirrm lib/php/PEAR/PackageFile/Generator
+@dirrm lib/php/PEAR/PackageFile
+@dirrm lib/php/PEAR/Installer/Role
+@dirrm lib/php/PEAR/Installer
 @dirrm lib/php/PEAR/Frontend
+@dirrm lib/php/PEAR/Downloader
+@dirrm lib/php/PEAR/Command
+@dirrm lib/php/PEAR/ChannelFile
 @dirrm lib/php/PEAR
 @dirrm lib/php/OS
 @dirrm lib/php/Net/UserAgent
 @dirrm lib/php/Net
+@dirrm lib/php/.channels/.alias
+@dirrm lib/php/.channels
+@dirrm lib/php/.registry/.channel.pecl.php.net
+@dirrm lib/php/.registry/.channel.__uri
+@dirrm lib/php/.registry
+@dirrm lib/php/20020429
+@dirrm lib/php/Archive
+@dirrm lib/php/Console
 @dirrm lib/php/HTML/Template
 @dirrm lib/php/HTML
-@dirrm lib/php/Console
-@dirrm lib/php/Archive
+@dirrm lib/php
 @dirrm include/php/regex
 @dirrm include/php/main
 @dirrm include/php/include
-@dirrm include/php/ext/iconv
 @dirrm include/php/ext/xml/expat
 @dirrm include/php/ext/xml
+@dirrm include/php/ext/standard
+@dirrm include/php/ext/session
+@dirrm include/php/ext/pgsql
 @dirrm include/php/ext/mbstring/libmbfl/mbfl
 @dirrm include/php/ext/mbstring/libmbfl
 @dirrm include/php/ext/mbstring
-@dirrm include/php/ext/pgsql
-@dirrm include/php/ext/standard
-@dirrm include/php/ext/session
+@dirrm include/php/ext/iconv
 @dirrm include/php/ext
 @dirrm include/php/Zend
 @dirrm include/php/TSRM
diff --git a/www/php4/distinfo b/www/php4/distinfo
index 23b34cd9847..c6beb9f293b 100644
--- a/www/php4/distinfo
+++ b/www/php4/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.49 2005/11/08 20:33:55 bouyer Exp $
+$NetBSD: distinfo,v 1.50 2006/03/03 07:11:34 cube Exp $
 
-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 (php-4.4.2.tar.bz2) = 88f2e9efff0add8d8e3034d4ce3a948429b88756
+RMD160 (php-4.4.2.tar.bz2) = cbef0fa4e233529422bc0944dcfb79d866013f5e
+Size (php-4.4.2.tar.bz2) = 4371185 bytes
 SHA1 (patch-aa) = feb064407950d0fc732b7240e65cac84420d2407
-SHA1 (patch-ab) = 75463903cf9b3d276556b83e0d422b146c105852
 SHA1 (patch-ad) = 9ca5d2f59bfeea77a98cd0e727546d11669114cd
 SHA1 (patch-ag) = 1ded1d7f4daac6806f41864c783f16d3403315e4
 SHA1 (patch-ah) = 0ac37bd35c4594cb58f1ea85ef811154b644a931
@@ -12,5 +11,5 @@ SHA1 (patch-ai) = 0b9c1c9fb75a64026f2fb3cbd44cc19e0a1f186c
 SHA1 (patch-aj) = cc68ce876dc5998becbe2f1f74288b5da5bbaca3
 SHA1 (patch-ak) = 1f9fbe26c7329e1d18eec053499ee2d574b5b970
 SHA1 (patch-al) = 28ad9006b387e2b9984ad49beea21c9d46e63b46
-SHA1 (patch-am) = 0de0be745262c1e986062c7a50261dbe58f97ac9
-SHA1 (patch-an) = dfe696f416ab5deffd38150441a65246a4816cf4
+SHA1 (patch-ao) = b14552305f14c01c922a6261d7fe7e2eda70dfa3
+SHA1 (patch-ap) = 2f852abd1e9d0f089add18b2eade2831253ad00e
diff --git a/www/php4/patches/patch-ab b/www/php4/patches/patch-ab
deleted file mode 100644
index dd9a1d16673..00000000000
--- a/www/php4/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.20 2005/11/08 20:33:55 bouyer Exp $
-
---- ext/standard/basic_functions.c.orig	Tue Nov  8 18:08:58 2005
-+++ ext/standard/basic_functions.c	Tue Nov  8 18:08:28 2005
-@@ -802,8 +802,8 @@
- 	PHP_FE(prev,					first_arg_force_ref)
- 	PHP_FE(next,					first_arg_force_ref)
- 	PHP_FE(reset,					first_arg_force_ref)
--	PHP_FE(current,					NULL)
--	PHP_FE(key,					NULL)
-+	PHP_FE(current,					first_arg_force_ref)
-+	PHP_FE(key,					first_arg_force_ref)
- 	PHP_FE(min,																NULL)
- 	PHP_FE(max,																NULL)
- 	PHP_FE(in_array,														NULL)
diff --git a/www/php4/patches/patch-am b/www/php4/patches/patch-am
deleted file mode 100644
index 71ff02daf8c..00000000000
--- a/www/php4/patches/patch-am
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-am,v 1.3 2005/10/07 21:09:28 jdolecek Exp $
-
---- ext/ldap/config.m4.orig	2005-05-08 16:06:24.000000000 +0000
-+++ ext/ldap/config.m4
-@@ -114,6 +114,7 @@ if test "$PHP_LDAP" != "no"; then
-   _SAVE_CPPFLAGS=$CPPFLAGS
-   _SAVE_LDFLAGS=$LDFLAGS
-   CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR"
-+  LDFLAGS="$LDFLAGS $LDAP_SHARED_LIBADD"
-   AC_CACHE_CHECK([for 3 arg ldap_set_rebind_proc], ac_cv_3arg_setrebindproc,
-   [AC_TRY_COMPILE([#include <ldap.h>], [ldap_set_rebind_proc(0,0,0)],
-   ac_cv_3arg_setrebindproc=yes, ac_cv_3arg_setrebindproc=no)])
diff --git a/www/php4/patches/patch-an b/www/php4/patches/patch-an
deleted file mode 100644
index e708f67cab6..00000000000
--- a/www/php4/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1 2005/10/16 12:17:47 jdolecek Exp $
-
---- ext/mbstring/libmbfl/mbfl/mbfilter.c.orig	2005-10-16 14:09:17.000000000 +0200
-+++ ext/mbstring/libmbfl/mbfl/mbfilter.c	2005-10-16 14:09:21.000000000 +0200
-@@ -1990,7 +1990,7 @@
- 		break;
- 
- 	default:	/* ASCII */
--		if (!qp_table[(c & 0xff)]) { /* ordinary characters */
-+		if (c >= 0 && c < 0x100 && !qp_table[(c & 0xff)]) { /* ordinary characters */
- 			mbfl_memory_device_output(c, &pe->tmpdev);
- 			pe->status1 = 1;
- 		} else if (pe->status1 == 0 && c == 0x20) {	/* repeat SPACE */
diff --git a/www/php4/patches/patch-ao b/www/php4/patches/patch-ao
new file mode 100644
index 00000000000..ff5b636baae
--- /dev/null
+++ b/www/php4/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2006/03/03 07:11:34 cube Exp $
+
+--- pear/Makefile.frag.orig	2005-11-05 19:19:23.000000000 +0100
++++ pear/Makefile.frag
+@@ -6,7 +6,7 @@ peardir=$(PEAR_INSTALLDIR)
+ PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0
+ 
+ install-pear-packages: $(top_builddir)/sapi/cli/php
+-	@$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(srcdir)/install-pear.php -d "$(peardir)" -b "$(bindir)" $(srcdir)/packages/*.tar
++	@$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(srcdir)/install-pear.php -d "$(peardir)" -b "$(bindir)" --force $(srcdir)/packages/*.tar
+ 
+ install-pear:
+ 	@echo "Installing PEAR environment:      $(INSTALL_ROOT)$(peardir)/"
diff --git a/www/php4/patches/patch-ap b/www/php4/patches/patch-ap
new file mode 100644
index 00000000000..bc9bf0ec89a
--- /dev/null
+++ b/www/php4/patches/patch-ap
@@ -0,0 +1,12 @@
+$NetBSD: patch-ap,v 1.1 2006/03/03 07:11:34 cube Exp $
+
+--- pear/install-pear.php.orig	2006-01-07 18:51:54.000000000 +0100
++++ pear/install-pear.php
+@@ -167,6 +167,7 @@ foreach ($install_files as $package => $
+         }
+     } else {
+         $options['nodeps'] = true;
++	$options['force'] = $force;
+         $installer->setOptions($options);
+         $dp = array(&$downloaderpackage);
+         $installer->setDownloadedPackages($dp);