Update php4 package to bug-fix release 4.3.9.

Changes since 4.3.8:
* fixes to GPC input processing
* bundled GD extension synced with 2.0.28, re-introducing write support
  for GIF (patent expiration worldwide)
* Implemented periodic PCRE compiled regexp cache cleanup, to avoid memory
  exhaustion
* Fixed strip_tags() to correctly handle '\0' characters.
* Rewritten UNIX and Windows install help files.
* Fixed a file-descriptor leak with phpinfo() and other 'special' URLs.
* Fixed possible crash inside php_shutdown_config().
* Fixed isset crashes on arrays.
* Fixed imagecreatefromstring() crashes with external GD library.
* Fixed fgetcsv() parsing of strings ending with escaped enclosures.
* Fixed overflow in array_slice(), array_splice(), substr(), substr_replace(),
  strspn(), strcspn().
* Fixed '\0' in Authenticate header passed via safe_mode.
* Allow bundled GD to compile against freetype 2.1.2.

All in all this release fixes over 50 bugs that have been discovered
and resolved since the 4.3.8 release.

8 files changed, 16 insertions, 60 deletions

diff --git a/databases/php4-mssql/Makefile b/databases/php4-mssql/Makefile
index b4cf114de72..7c82bd658a8 100644
--- a/databases/php4-mssql/Makefile
+++ b/databases/php4-mssql/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2004/07/14 08:03:16 jdolecek Exp $
+# $NetBSD: Makefile,v 1.4 2004/09/28 12:41:13 jdolecek Exp $
 
 MODNAME=		mssql
 CATEGORIES+=		databases
 COMMENT=		PHP4 extension for MS SQL databases
 
-DISTINFO_FILE=		${.CURDIR}/distinfo
-
 .include "../../www/php4/Makefile.module"
 
 USE_BUILDLINK3=		yes
diff --git a/databases/php4-mssql/distinfo b/databases/php4-mssql/distinfo
deleted file mode 100644
index 121570747f1..00000000000
--- a/databases/php4-mssql/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2004/07/29 19:03:57 wiz Exp $
-
-SHA1 (php-4.3.8.tar.bz2) = 95da913b932859239f544a7b2f38c9257aa3d735
-Size (php-4.3.8.tar.bz2) = 3963437 bytes
-SHA1 (patch-aa) = 7b32b73720513c1b5efb7282def96cfa8efc717a
diff --git a/databases/php4-mssql/patches/patch-aa b/databases/php4-mssql/patches/patch-aa
deleted file mode 100644
index d19d11f4547..00000000000
--- a/databases/php4-mssql/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/07/29 19:03:57 wiz Exp $
-
-===================================================================
-RCS file: /repository/php-src/ext/mssql/php_mssql.h,v
-retrieving revision 1.23.4.10
-retrieving revision 1.23.4.11
-diff -p --unified=3 -r1.23.4.10 -r1.23.4.11
---- php_mssql.h	2004/04/20 23:37:26	1.23.4.10
-+++ php_mssql.h	2004/06/04 01:02:21	1.23.4.11
-@@ -37,9 +37,7 @@
- #include "sqldb.h"
-
- #if HAVE_FREETDS
--#ifndef SHORT
--typedef short SHORT;
--#endif
-+typedef short TDS_SHORT;
- #define SQLTEXT SYBTEXT
- #define SQLCHAR SYBCHAR
- #define SQLVARCHAR SYBVARCHAR
diff --git a/doc/CHANGES b/doc/CHANGES
index 612fdc494fc..18d40038dd2 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.7281 2004/09/28 12:36:09 adrianp Exp $
+$NetBSD: CHANGES,v 1.7282 2004/09/28 12:41:13 jdolecek Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -4477,3 +4477,4 @@ Changes to the packages collection and infrastructure in 2004:
 	Added kbarcode-1.8.1 [seb 2004-09-27]
 	Updated chkrootkit to 0.44 [adrianp 2004-09-28]
 	Updated ircu to 2.10.11.07 [adrianp 2004-09-28]
+	Updated php4 to 4.3.9 [jdolecek 2004-04-28]
diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common
index 9f8820e4e95..6ace4359d6d 100644
--- a/www/php4/Makefile.common
+++ b/www/php4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.43 2004/07/14 08:03:16 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.44 2004/09/28 12:41:13 jdolecek Exp $
 
 DISTNAME?=		php-${PHP_DIST_VERS}
 CATEGORIES+=		www php4
@@ -15,7 +15,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.3.8
+PHP_DIST_VERS=		4.3.9
 PHP_BASE_VERS=		${PHP_DIST_VERS}
 
 DISTFILES?=		${PHP_DISTFILE}
diff --git a/www/php4/distinfo b/www/php4/distinfo
index c8b1a56bca8..4989d9eee3f 100644
--- a/www/php4/distinfo
+++ b/www/php4/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.31 2004/07/14 08:03:16 jdolecek Exp $
+$NetBSD: distinfo,v 1.32 2004/09/28 12:41:13 jdolecek Exp $
 
-SHA1 (php-4.3.8.tar.bz2) = 95da913b932859239f544a7b2f38c9257aa3d735
-Size (php-4.3.8.tar.bz2) = 3963437 bytes
+SHA1 (php-4.3.9.tar.bz2) = 9995ce1f0b84a6d3c230552446dbcd91dbf426b0
+Size (php-4.3.9.tar.bz2) = 4001681 bytes
 SHA1 (patch-aa) = feb064407950d0fc732b7240e65cac84420d2407
-SHA1 (patch-ab) = cc7785755774377d4eb2d3d4816cea61234da167
+SHA1 (patch-ab) = fd09b2a1f56d50859f2ee632f7feab28e624fe15
 SHA1 (patch-ag) = 1ded1d7f4daac6806f41864c783f16d3403315e4
 SHA1 (patch-ah) = 0ac37bd35c4594cb58f1ea85ef811154b644a931
-SHA1 (patch-ai) = 91938849757745b13c7738c3aff662b86c41320f
diff --git a/www/php4/patches/patch-ab b/www/php4/patches/patch-ab
index d01c1148a88..749650d001c 100644
--- a/www/php4/patches/patch-ab
+++ b/www/php4/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.15 2004/04/20 19:19:23 jdolecek Exp $
+$NetBSD: patch-ab,v 1.16 2004/09/28 12:41:13 jdolecek Exp $
 
---- scripts/phpize.in.orig	2003-11-14 04:21:15.000000000 +0100
-+++ scripts/phpize.in	2004-04-02 20:23:49.000000000 +0200
+--- scripts/phpize.in.orig	2004-06-19 22:37:55.000000000 +0200
++++ scripts/phpize.in	2004-09-28 11:35:45.000000000 +0200
 @@ -54,18 +54,25 @@
  
  touch install-sh mkinstalldirs missing
@@ -9,8 +9,8 @@ $NetBSD: patch-ab,v 1.15 2004/04/20 19:19:23 jdolecek Exp $
 -aclocal || exit 1
 -autoconf || exit 1
 -autoheader || exit 1
--test -x $builddir/build/shtool || chmod +x $builddir/build/shtool
--if test ! -x $builddir/build/shtool; then
+-test -x "$builddir/build/shtool" || chmod +x "$builddir/build/shtool"
+-if test ! -x "$builddir/build/shtool"; then
 -  echo "shtool at '$builddir/build/shtool' not executable. "
 -  echo "Make sure that the file exists and is executable and then rerun this script. "
 -  echo 
@@ -19,8 +19,8 @@ $NetBSD: patch-ab,v 1.15 2004/04/20 19:19:23 jdolecek Exp $
 +if [ -z "$AUTOCONF" ]; then AUTOCONF=autoconf; fi
 +if [ -z "$AUTOHEADER" ]; then AUTOHEADER=autoheader; fi
 +if [ -z "$LIBTOOLIZE" ]; then
-+	test -x $builddir/build/shtool || chmod +x $builddir/build/shtool
-+	if test ! -x $builddir/build/shtool; then
++	test -x "$builddir/build/shtool" || chmod +x "$builddir/build/shtool"
++	if test ! -x "$builddir/build/shtool"; then
 +	  echo "shtool at '$builddir/build/shtool' not executable. "
 +	  echo "Make sure that the file exists and is executable and then rerun this script. "
 +	  echo 
diff --git a/www/php4/patches/patch-ai b/www/php4/patches/patch-ai
deleted file mode 100644
index 482383b7b88..00000000000
--- a/www/php4/patches/patch-ai
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ai,v 1.7 2004/07/13 12:22:29 jdolecek Exp $
-
---- Zend/zend_constants.c.orig	2004-07-13 14:01:27.000000000 +0200
-+++ Zend/zend_constants.c	2004-07-13 14:01:54.000000000 +0200
-@@ -265,11 +265,11 @@
- 	}
- 
- 	if (zend_hash_add(EG(zend_constants), name, c->name_len, (void *) c, sizeof(zend_constant), NULL)==FAILURE) {
-+		zend_error(E_NOTICE,"Constant %s already defined", name);
- 		free(c->name);
- 		if (!(c->flags & CONST_PERSISTENT)) {
- 			zval_dtor(&c->value);
- 		}
--		zend_error(E_NOTICE,"Constant %s already defined", name);
- 		ret = FAILURE;
- 	}
- 	if (lowercase_name) {