Add Hotfix_20070320 which fixes a security of privilege escalation.

http://www.zope.org/Products/Zope/Hotfix-2007-03-20/

Bump PKGREVISION.

3 files changed, 26 insertions, 7 deletions

diff --git a/www/zope29/Makefile b/www/zope29/Makefile
index 6537645bacd..fce73edd52f 100644
--- a/www/zope29/Makefile
+++ b/www/zope29/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:25 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/03/21 14:26:26 taca Exp $
 # FreeBSD Id: ports/www/zope29/Makefile,v 1.86 2006/08/03 15:53:04 garga Exp
 
 DISTNAME=	Zope-2.9.4-final
 PKGNAME=	zope-2.9.4
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www python
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PKGVERSION}/
 EXTRACT_SUFX=	.tgz
@@ -15,10 +15,18 @@ COMMENT=	Zope, the Z Object Publishing Environment
 
 DEPENDS+=	${PYPKGPREFIX}-xml-[0-9]*:../../textproc/py-xml
 
-DIST_SUBDIR=	zope
 PYTHON_VERSIONS_ACCEPTED=   24
 RCD_SCRIPTS=	${PKGBASE}29 zeo29
 
+HOTFIXES=	Hotfix_20070320
+
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+.for f in ${HOTFIXES}
+DISTFILES+=		${f}.tgz
+SITES.${f}.tgz= \
+	http://www.zope.org/Products/Zope/Hotfix-2007-03-20/Hotfix-20070320/
+.endfor
+
 # Change these, if you like, via the environment.
 ZOPE_USER?=		www
 WEBBASEDIR?=		www
@@ -51,9 +59,10 @@ post-patch:
 post-install:
 	${MV} ${ZOPEBASEDIR}/skel/etc/zope.conf.in \
 		${ZOPEBASEDIR}/skel/etc/zope.conf.sample.in
-
 	${MKDIR} ${ZOPEBASEDIR}/Products
-
+.for d in ${HOTFIXES}
+	cd ${WRKDIR}; ${PAX} -rw ${d} ${ZOPEBASEDIR}/lib/python/Products
+.endfor
 	${FIND} ${ZOPEBASEDIR} -type f -print0 | ${XARGS} -0 -- ${CHMOD} a-w
 
 pre-package:
diff --git a/www/zope29/PLIST b/www/zope29/PLIST
index 502c1f78f26..aeafe9ac2d2 100644
--- a/www/zope29/PLIST
+++ b/www/zope29/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/09/10 00:56:53 taca Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/03/21 14:26:26 taca Exp $
 ${ZOPEBASEDIR}/bin/README.txt
 ${ZOPEBASEDIR}/bin/analyze.py
 ${ZOPEBASEDIR}/bin/check_catalog.py
@@ -1121,6 +1121,11 @@ ${ZOPEBASEDIR}/lib/python/Products/Five/viewable.py
 ${ZOPEBASEDIR}/lib/python/Products/Five/viewable.pyc
 ${ZOPEBASEDIR}/lib/python/Products/Five/zcml.py
 ${ZOPEBASEDIR}/lib/python/Products/Five/zcml.pyc
+${ZOPEBASEDIR}/lib/python/Products/Hotfix_20070320/README.txt
+${ZOPEBASEDIR}/lib/python/Products/Hotfix_20070320/__init__.py
+${ZOPEBASEDIR}/lib/python/Products/Hotfix_20070320/version.txt
+${ZOPEBASEDIR}/lib/python/Products/Hotfix_20070320/tests/__init__.py
+${ZOPEBASEDIR}/lib/python/Products/Hotfix_20070320/tests/test_hotfix.py
 ${ZOPEBASEDIR}/lib/python/Products/MIMETools/MIMETag.py
 ${ZOPEBASEDIR}/lib/python/Products/MIMETools/MIMETag.pyc
 ${ZOPEBASEDIR}/lib/python/Products/MIMETools/README.txt
@@ -9411,6 +9416,8 @@ share/examples/rc.d/zope29
 @dirrm ${ZOPEBASEDIR}/lib/python/Products/MailHost/dtml
 @dirrm ${ZOPEBASEDIR}/lib/python/Products/MailHost
 @dirrm ${ZOPEBASEDIR}/lib/python/Products/MIMETools
+@dirrm ${ZOPEBASEDIR}/lib/python/Products/Hotfix_20070320/tests
+@dirrm ${ZOPEBASEDIR}/lib/python/Products/Hotfix_20070320
 @dirrm ${ZOPEBASEDIR}/lib/python/Products/Five/utilities/browser/tests
 @dirrm ${ZOPEBASEDIR}/lib/python/Products/Five/utilities/browser
 @dirrm ${ZOPEBASEDIR}/lib/python/Products/Five/utilities
diff --git a/www/zope29/distinfo b/www/zope29/distinfo
index 0ce6d55a1a2..568391a0e95 100644
--- a/www/zope29/distinfo
+++ b/www/zope29/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.1 2006/08/17 11:57:25 darcy Exp $
+$NetBSD: distinfo,v 1.2 2007/03/21 14:26:26 taca Exp $
 
+SHA1 (zope/Hotfix_20070320.tgz) = 772316a543fea3873750c7fd8def0a7470d74749
+RMD160 (zope/Hotfix_20070320.tgz) = d655a4fbfaa5f32fa4cb9f71edb924d6d3f6c391
+Size (zope/Hotfix_20070320.tgz) = 3735 bytes
 SHA1 (zope/Zope-2.9.4-final.tgz) = 37e525b662de5f878d4da39b6578c1d9f15e2669
 RMD160 (zope/Zope-2.9.4-final.tgz) = 297254e4ad0a27bdc585c88147a6e42698de485e
 Size (zope/Zope-2.9.4-final.tgz) = 6962298 bytes