Update "php4" package to version 4.4.0. The update fixes a large number

of bugs discovered since the 4.3.11 release which could e.g. lead to
memory corruption.

Furthermore integrate version 1.4.0 of PEAR XML_RPC which contains a fix
for the "PEAR XML_RPC Remote PHP Code Injection Vulnerability" security
problem reported by the Hardened-PHP Project.

5 files changed, 30 insertions, 12 deletions

diff --git a/www/php4/Makefile b/www/php4/Makefile
index 9f873822f17..93b24f9bf82 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2005/06/12 08:18:28 jdolecek Exp $
+# $NetBSD: Makefile,v 1.46 2005/08/17 19:58:34 tron Exp $
 
 PKGNAME=		php-${PHP_BASE_VERS}
 CATEGORIES+=		lang
@@ -17,6 +17,11 @@ USE_TOOLS+=		gmake
 CGIDIR=			${PREFIX}/libexec/cgi-bin
 EGDIR=			${PREFIX}/share/examples/php
 
+MASTER_SITES+=		http://pear.php.net/get/
+EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
+XMLRPC_DISTFILE=	XML_RPC-1.4.0.tgz
+DISTFILES=		${EXTRACT_ONLY} ${XMLRPC_DISTFILE}
+
 # On NetBSD ELF platforms, we need to link libgcc.a whole-archive so that
 # certain symbols from the C++ implementation (__get_eh_context, etc.)
 # referenced by DSOs written in C++ will resolve correctly.  We need to
@@ -35,6 +40,11 @@ MAKE_ENV+=		EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
 CONF_FILES=	${EGDIR}/php.ini-recommended ${PKG_SYSCONFDIR}/php.ini
 OWN_DIRS=	${PREFIX}/${PHP_EXTENSION_DIR}
 
+post-extract:
+	${RM} -f ${WRKSRC}/pear/packages/XML_RPC-1.3.1.tar
+	${GZIP_CMD} -cd ${DISTDIR}/${XMLRPC_DISTFILE} \
+	  >${WRKSRC}/pear/packages/${XMLRPC_DISTFILE:S/.tgz/.tar/}
+
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${PREFIX}/bin/php
 	${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 ${PREFIX}/man/man1/php.1
diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common
index b5880887e9b..1e73df537d6 100644
--- a/www/php4/Makefile.common
+++ b/www/php4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.48 2005/05/07 18:50:25 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.49 2005/08/17 19:58:34 tron 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.3.11
+PHP_DIST_VERS=		4.4.0
 PHP_BASE_VERS=		${PHP_DIST_VERS}
 
 DISTFILES?=		${PHP_DISTFILE}
diff --git a/www/php4/PLIST b/www/php4/PLIST
index 915dea51aa6..0205a9a3849 100644
--- a/www/php4/PLIST
+++ b/www/php4/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.12 2005/04/11 20:02:57 jdolecek Exp $
+@comment $NetBSD: PLIST,v 1.13 2005/08/17 19:58:34 tron Exp $
 bin/pear
 bin/php
 bin/php-config
-bin/phpextdist
 bin/phpize
 etc/pear.conf
 include/php/Zend/FlexLexer.h
@@ -57,6 +56,7 @@ include/php/TSRM/tsrm_config.h
 include/php/TSRM/readdir.h
 include/php/TSRM/acconfig.h
 include/php/TSRM/tsrm_win32.h
+include/php/ext/iconv/php_iconv.h
 include/php/ext/standard/aggregation.h
 include/php/ext/standard/url_scanner.h
 include/php/ext/standard/url.h
@@ -152,6 +152,7 @@ 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
@@ -270,7 +271,9 @@ 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
+man/man1/phpize.1
 share/examples/php/php.ini-dist
 share/examples/php/php.ini-recommended
 share/php/php.gif
@@ -306,6 +309,8 @@ share/php/php.gif
 @dirrm lib/php/Archive
 @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/mbstring/libmbfl/mbfl
diff --git a/www/php4/buildlink3.mk b/www/php4/buildlink3.mk
index e20ffef2b1c..58e2751f17e 100644
--- a/www/php4/buildlink3.mk
+++ b/www/php4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2005/04/11 20:02:57 jdolecek Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2005/08/17 19:58:34 tron Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PHP_BUILDLINK3_MK:=	${PHP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nphp}
 BUILDLINK_PACKAGES+=	php
 
 .if !empty(PHP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.php+=		php-4.3.*
-BUILDLINK_RECOMMENDED.php+=	php>=4.3.11
+BUILDLINK_DEPENDS.php+=		php-4.4.*
+BUILDLINK_RECOMMENDED.php+=	php>=4.4.0
 BUILDLINK_PKGSRCDIR.php?=	../../www/php4
 .endif	# PHP_BUILDLINK3_MK
 
diff --git a/www/php4/distinfo b/www/php4/distinfo
index a65572bdba4..ef371db3e8c 100644
--- a/www/php4/distinfo
+++ b/www/php4/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.40 2005/04/21 23:47:46 salo Exp $
+$NetBSD: distinfo,v 1.41 2005/08/17 19:58:34 tron Exp $
 
-SHA1 (php-4.3.11.tar.bz2) = 617ce50bb125ee841f71e67638c492999cd3bd18
-RMD160 (php-4.3.11.tar.bz2) = fe44f6c2783ddd469b94744e440e836cff3329e5
-Size (php-4.3.11.tar.bz2) = 4012575 bytes
+SHA1 (php-4.4.0.tar.bz2) = 5e0afe6e5f8c751f880a50ad4fa1716f0242ef37
+RMD160 (php-4.4.0.tar.bz2) = 4792e78b6f2f3e3347a1ac945b48efaccedf4542
+Size (php-4.4.0.tar.bz2) = 4086074 bytes
+SHA1 (XML_RPC-1.4.0.tgz) = 461f0b70675a37f524043d19078e9c0502dd13ac
+RMD160 (XML_RPC-1.4.0.tgz) = 8647565c7fa973ac800683d91c32d781fce9437c
+Size (XML_RPC-1.4.0.tgz) = 26776 bytes
 SHA1 (patch-aa) = feb064407950d0fc732b7240e65cac84420d2407
 SHA1 (patch-ad) = 9ca5d2f59bfeea77a98cd0e727546d11669114cd
 SHA1 (patch-ag) = 1ded1d7f4daac6806f41864c783f16d3403315e4