[pkgsrc/trunk]: pkgsrc/www/php4 Update to version 4.4.2. Ok'd by jdolecek@.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3951e2d5b608
branches:  trunk
changeset: 509104:3951e2d5b608
user:      cube <cube%pkgsrc.org@localhost>
date:      Fri Mar 03 07:11:34 2006 +0000

description:
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.

diffstat:

 www/php4/Makefile         |    3 +-
 www/php4/Makefile.common  |    4 +-
 www/php4/PLIST            |  476 +++++++++++++++++++++++++++------------------
 www/php4/distinfo         |   13 +-
 www/php4/patches/patch-ab |   15 -
 www/php4/patches/patch-am |   12 -
 www/php4/patches/patch-an |   13 -
 www/php4/patches/patch-ao |   13 +
 www/php4/patches/patch-ap |   12 +
 9 files changed, 314 insertions(+), 247 deletions(-)

diffs (truncated from 727 to 300 lines):

diff -r 2532bbba95bd -r 3951e2d5b608 www/php4/Makefile
--- a/www/php4/Makefile Fri Mar 03 04:46:50 2006 +0000
+++ b/www/php4/Makefile Fri Mar 03 07:11:34 2006 +0000
@@ -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 -r 2532bbba95bd -r 3951e2d5b608 www/php4/Makefile.common
--- a/www/php4/Makefile.common  Fri Mar 03 04:46:50 2006 +0000
+++ b/www/php4/Makefile.common  Fri Mar 03 07:11:34 2006 +0000
@@ -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 @@
 # 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 -r 2532bbba95bd -r 3951e2d5b608 www/php4/PLIST
--- a/www/php4/PLIST    Fri Mar 03 04:46:50 2006 +0000
+++ b/www/php4/PLIST    Fri Mar 03 07:11:34 2006 +0000
@@ -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/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/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_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_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_highlight.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/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_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/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/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/utf8tab.h
-include/php/ext/xml/expat/nametab.h