Pullup ticket 736 - requested by Adrian Portelli

security fix for php5

Revisions pulled up:
- pkgsrc/lang/php5/Makefile		1.14
- pkgsrc/lang/php5/PLIST		1.6
- pkgsrc/lang/php5/buildlink3.mk	1.5
- pkgsrc/lang/php5/distinfo		1.7

   Module Name:		pkgsrc
   Committed By:	adrianp
   Date:		Sat Sep  3 13:37:36 UTC 2005

   Modified Files:
   	pkgsrc/lang/php5: Makefile PLIST distinfo

   Log Message:
   Update php5 to 5.0.4nb1 to address XML_RPC security issue(s)
   Fix based on work done by tron@ for the PHP 4.x branch fix
   PLIST fixup to correctly remove @PREFIX@/lib/php
---
   Module Name:		pkgsrc
   Committed By:	adrianp
   Date:		Sat Sep  3 14:41:05 UTC 2005

   Modified Files:
   	pkgsrc/lang/php5: buildlink3.mk

   Log Message:
   Bump BUILDLINK_RECOMMENDED to nb1 for recent security issue and fix typo
   Fix suggested by salo@.

4 files changed, 22 insertions, 7 deletions

diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index cefb0525992..082f6420a90 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:10 jlam Exp $
+# $NetBSD: Makefile,v 1.13.2.1 2005/09/03 15:12:32 salo Exp $
 #
 
 PKGNAME=		php-${PHP_BASE_VERS}
-PKGREVISION=		# empty
+PKGREVISION=		1
 CATEGORIES=		lang
 
 HOMEPAGE=		http://www.php.net/
 COMMENT=		PHP Hypertext Preprocessor version 5
 
 USE_PKGINSTALL=		YES
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake gzcat
 LIBTOOL_OVERRIDE=	# empty
 
 .include "Makefile.php"
@@ -17,9 +17,19 @@ LIBTOOL_OVERRIDE=	# empty
 CGIDIR=			${PREFIX}/libexec/cgi-bin
 EGDIR=			${PREFIX}/share/examples/php
 
+EXTRACT_ONLY=			${DISTNAME}${EXTRACT_SUFX}
+XMLRPC_DISTFILE=		XML_RPC-1.4.0.tgz
+SITES_${XMLRPC_DISTFILE}=	http://pear.php.net/get/
+DISTFILES=			${EXTRACT_ONLY} ${XMLRPC_DISTFILE}
+
 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.2.2.tar
+	${GZCAT} ${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/lang/php5/PLIST b/lang/php5/PLIST
index 15cbe384d7f..01bfba35243 100644
--- a/lang/php5/PLIST
+++ b/lang/php5/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/04/11 20:16:02 jdolecek Exp $
+@comment $NetBSD: PLIST,v 1.5.2.1 2005/09/03 15:12:32 salo Exp $
 bin/pear
 bin/php
 bin/php-config
@@ -293,6 +293,7 @@ share/php/php.gif
 @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
 @dirrm lib/php/doc/HTML_Template_IT/examples/templates
 @dirrm lib/php/doc/HTML_Template_IT/examples
 @dirrm lib/php/doc/HTML_Template_IT
@@ -336,3 +337,4 @@ share/php/php.gif
 @dirrm include/php/Zend
 @dirrm include/php/TSRM
 @dirrm include/php
+@unexec ${RMDIR} %D/lib/php 2>/dev/null || ${TRUE}
diff --git a/lang/php5/buildlink3.mk b/lang/php5/buildlink3.mk
index 14b0d5c2a3e..f0332776754 100644
--- a/lang/php5/buildlink3.mk
+++ b/lang/php5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/04/11 20:16:02 jdolecek Exp $
+# $NetBSD: buildlink3.mk,v 1.4.2.1 2005/09/03 15:12:32 salo Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PHP_BUILDLINK3_MK:=	${PHP_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	php
 
 .if !empty(PHP_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.php+=	php-5.0.*
-BUILDLINK_RECOMMENTED.php+=	php-5.0.4
+BUILDLINK_RECOMMENDED.php+=	php-5.0.4nb1
 BUILDLINK_PKGSRCDIR.php?=	../../lang/php5
 .endif	# PHP_BUILDLINK3_MK
 
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index 16f15fe82f6..213ac2dcf9d 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.6 2005/04/11 20:16:02 jdolecek Exp $
+$NetBSD: distinfo,v 1.6.2.1 2005/09/03 15:12:32 salo Exp $
 
 SHA1 (php-5.0.4.tar.bz2) = 37780b89acbc492e0e5c0ace956d1dc1e93bf779
 RMD160 (php-5.0.4.tar.bz2) = c0e0126637527d2e7352b123e102a4231349784e
 Size (php-5.0.4.tar.bz2) = 4731383 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-aj) = cc68ce876dc5998becbe2f1f74288b5da5bbaca3
 SHA1 (patch-ak) = 0faa523103e0a9a3c01c78c2fe9a64c0a9b2fc43
 SHA1 (patch-al) = 28ad9006b387e2b9984ad49beea21c9d46e63b46