Upgrade to Zope 2.2.4, with 2000-12-08, 2000-12-15a, and 2000-12-18

security hotfixes.

All Zope users are encouraged to upgrade, or apply the hotfixes
themselves.

3 files changed, 46 insertions, 17 deletions

diff --git a/www/zope28/Makefile b/www/zope28/Makefile
index e3b06d80ce90..908f472a5a9f 100644
--- a/www/zope28/Makefile
+++ b/www/zope28/Makefile
@@ -6,17 +6,19 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTVERSION=	2.2.4
+PORTREVISION=	0
 CATEGORIES=	www python
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/ \
-		http://www.zope.org/Products/Zope/Hotfix_2000-10-02/ \
-		http://www.zope.org/Products/Zope/Hotfix_2000-10-11/
+		http://www.zope.org/Products/Zope/Hotfix_2000-12-08/ \
+		http://www.zope.org/Products/Zope/Hotfix_2000-12-15a/ \
+		http://www.zope.org/Products/Zope/Hotfix_2000-12-18/
 DISTNAME=	Zope-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		Hotfix_2000-10-02.tar.gz \
-		Hotfix_2000-10-11.tgz
+		Hotfix_2000-12-08.tgz \
+		Hotfix_2000-12-15a.tgz \
+		Hotfix_2000-12-18.tgz
 
 MAINTAINER=	nbm@FreeBSD.org
 
diff --git a/www/zope28/distinfo b/www/zope28/distinfo
index f9022ab310be..7aae63fba762 100644
--- a/www/zope28/distinfo
+++ b/www/zope28/distinfo
@@ -1,3 +1,4 @@
-MD5 (zope/Zope-2.2.2-src.tgz) = 83c8197f18bf97ad62bf2c5e424e2b82
-MD5 (zope/Hotfix_2000-10-02.tar.gz) = 86e4c142d4be005e427cc2ccfee381fd
-MD5 (zope/Hotfix_2000-10-11.tgz) = a0aa11f5410e7be68d55a504c7b09392
+MD5 (zope/Zope-2.2.4-src.tgz) = dcd0c7a9cce61e7d9f42391b1a72fffa
+MD5 (zope/Hotfix_2000-12-08.tgz) = f923f3e72881a4be99f850c8a626c0fb
+MD5 (zope/Hotfix_2000-12-15a.tgz) = 3550a4cd23f556ac6f986e8db73b326d
+MD5 (zope/Hotfix_2000-12-18.tgz) = fa9f5b0dfb9a53b9450038403cff65e3
diff --git a/www/zope28/pkg-plist b/www/zope28/pkg-plist
index 51c19843b2f5..661c2e887111 100644
--- a/www/zope28/pkg-plist
+++ b/www/zope28/pkg-plist
@@ -566,12 +566,16 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/methodEdit.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/version.txt
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/www/function.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2000-10-02/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2000-10-02/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2000-10-02/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2000-10-11/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2000-10-11/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2000-10-11/README.txt
+%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2000-12-08/README.txt
+%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2000-12-08/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2000-12-08/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2000-12-15a/README.txt
+%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2000-12-15a/README.txt~
+%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2000-12-15a/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2000-12-15a/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2000-12-18/README.txt
+%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2000-12-18/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2000-12-18/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.py
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/README.txt
@@ -712,6 +716,27 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/Zope-Permission.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/Zope-Permission_Add.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/Zope-Permission_Edit.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-call.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-comment.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-funcs.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-if.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-in.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-let.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-math.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-mime.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-raise.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-return.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sendmail.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sqlgroup.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sqltest.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sqlvar.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-string.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-tree.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-try.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-unless.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-var.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-whrandom.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-with.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/images/File_icon.gif
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/images/Folder_icon.gif
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/images/Image_icon.gif
@@ -1312,8 +1337,9 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/www
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2000-10-02
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2000-10-11
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2000-12-08
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2000-12-15a
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2000-12-18
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MIMETools
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost/release