Pullup ticket 2056 - requested by taca

security patch for zope29

- pkgsrc/www/zope29/Makefile				1.8-1.10
- pkgsrc/www/zope29/PLIST				1.3
- pkgsrc/www/zope29/distinfo				1.2-1.4

   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Thu Feb 22 19:27:30 UTC 2007

   Modified Files:
	   pkgsrc/www/zope29: Makefile

   Log Message:
   Whitespace cleanup, courtesy of pkglint.
   Patch provided by Sergey Svishchev in private mail.
---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Wed Mar 21 14:26:26 UTC 2007

   Modified Files:
	   pkgsrc/www/zope29: Makefile PLIST distinfo

   Log Message:
   Add Hotfix_20070320 which fixes a security of privilege escalation.

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

   Bump PKGREVISION.
---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Thu Mar 22 09:58:45 UTC 2007

   Modified Files:
	pkgsrc/www/zope29: distinfo

   Log Message:
   Hotfix file has updated, only addition reference to CVS-2007-0240
   in README.txt.
---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Thu Mar 22 13:44:10 UTC 2007

   Modified Files:
	pkgsrc/www/zope29: Makefile distinfo

   Log Message:
   - Set DIST_SUBDIR including date string to handle sudden change of
     hotfix's content without chaging its name.
   - Correct MASTER_SITES.

3 files changed, 34 insertions, 14 deletions

diff --git a/www/zope29/Makefile b/www/zope29/Makefile
index 224d92f7cbe..b3a10bfd0d6 100644
--- a/www/zope29/Makefile
+++ b/www/zope29/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.7 2006/09/10 00:56:53 taca Exp $
+# $NetBSD: Makefile,v 1.7.4.1 2007/03/22 14:45:45 ghen 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
+DISTNAME=	Zope-${VER}-final
+PKGNAME=	zope-${VER}
+PKGREVISION=	4
 CATEGORIES=	www python
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PKGVERSION}/
+MASTER_SITES=	http://www.zope.org/Products/Zope/${VER}/
 EXTRACT_SUFX=	.tgz
-DIST_SUBDIR=	zope
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.zope.org/
@@ -15,10 +14,20 @@ 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
 
+VER=		2.9.4
+DIST_SUBDIR=	${PKGBASE}29-20070321
+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 +60,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..ee9a238357b 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.2.4.1 2007/03/22 14:45:46 ghen 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..27efb91daf0 100644
--- a/www/zope29/distinfo
+++ b/www/zope29/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.1 2006/08/17 11:57:25 darcy Exp $
+$NetBSD: distinfo,v 1.1.4.1 2007/03/22 14:45:46 ghen Exp $
 
-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
+SHA1 (zope29-20070321/Hotfix_20070320.tgz) = eb6255d78234605c9b3d9f4095ad9ba784055620
+RMD160 (zope29-20070321/Hotfix_20070320.tgz) = d1a92e0dbfb6ff445bf3687422fd8fc2a76b4d46
+Size (zope29-20070321/Hotfix_20070320.tgz) = 3805 bytes
+SHA1 (zope29-20070321/Zope-2.9.4-final.tgz) = 37e525b662de5f878d4da39b6578c1d9f15e2669
+RMD160 (zope29-20070321/Zope-2.9.4-final.tgz) = 297254e4ad0a27bdc585c88147a6e42698de485e
+Size (zope29-20070321/Zope-2.9.4-final.tgz) = 6962298 bytes
 SHA1 (patch-aa) = 92c65a0042cbd8837e7888a26f6862535656f47f
 SHA1 (patch-ab) = f3654a4ed30df8a7dd8b63ba99bb165a25cfdb5e
 SHA1 (patch-ac) = ec923f833156fa0b934ec69a2c26a4ea370cd2c8