Update to 3.2.1, provided by the maintainer in PR 33388.

Zope 3.2.1

  Bug fixes

    - Fixed issue 573: @form.action(failure='name_of_method') didn't work.

    - Fixed issue 568: Typo in basicskin css file.

    - Fixed issue 560: Bug in default AddView class.

    - Fixed issue 546: non-ASCII docstring cause
      System Error in RootErrorReportingUtility.

    - Fixed issue 544: VocabularyRegistryError missing import.

    - Fixed issue 536: ErrorLogUtility has UnboundLocalError.

    - zope.app.testing.functional.defineLayer

      + Use the method param instead of an hardcoded value for the
      zcml filename

12 files changed, 63 insertions, 64 deletions

diff --git a/www/zope3/MESSAGE b/www/zope3/MESSAGE
index 86001ade57c..c7d797ad298 100644
--- a/www/zope3/MESSAGE
+++ b/www/zope3/MESSAGE
@@ -1,36 +1,22 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2006/01/07 13:13:28 wiz Exp $
+$NetBSD: MESSAGE,v 1.3 2006/05/06 22:38:27 wiz Exp $
 
 To run Zope, you need to make a new Zope instance home.
 
   1) If you want to run standalone Zope or ZEO client,
-     please run the following command:
+     please run following commands:
 
     ${PREFIX}/bin/mkzopeinstance --dir=${VARBASE}/zope3
+    chown -R ${ZOPE3_USER}:${ZOPE3_GROUP} ${VARBASE}/zope3
 
     Additionally, you need to edit ${VARBASE}/zope3/etc/zope.conf
     if you want to run ZEO client.
 
   2) If you want to run ZEO storage server,
-     please run the following command:
+     please run following commands:
 
     ${PREFIX}/bin/mkzeoinstance ${VARBASE}/zss3
-
-If you want to run Zope under the ${ZOPE3_USER} user account,
-you need to change the owner and group of Zope instance home
-and edit /etc/rc.conf.
-
-  1) If you want to run standalone Zope or ZEO client,
-     please run the following commands:
-
-    chown -R ${ZOPE3_USER}:${ZOPE3_GROUP} ${VARBASE}/zope3
-    echo 'zope3_user="${ZOPE3_USER}"' >> /etc/rc.conf
-
-  2) If you want to run ZEO storage server,
-     please run the following commands:
-
     chown -R ${ZOPE3_USER}:${ZOPE3_GROUP} ${VARBASE}/zss3
-    echo 'zss3_user="${ZOPE3_USER}"' >> /etc/rc.conf
 
 If you want to run Zope with following protocols, you need to
 install corresponding packages.
diff --git a/www/zope3/Makefile b/www/zope3/Makefile
index dbc7f112062..841844de462 100644
--- a/www/zope3/Makefile
+++ b/www/zope3/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2006/04/23 00:12:42 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/05/06 22:38:27 wiz Exp $
 #
 
-DISTNAME=		Zope-3.2.0
-PKGNAME=		zope3-3.2.0
-PKGREVISION=		2
+DISTNAME=		Zope-3.2.1
+PKGNAME=		zope3-3.2.1
 CATEGORIES=		www
-MASTER_SITES=		http://www.zope.org/Products/Zope3/3.2.0final/
+MASTER_SITES=		http://www.zope.org/Products/Zope3/3.2.1/
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		ykomatsu@akaumigame.org
@@ -30,10 +29,9 @@ BUILD_TARGET=		build
 
 RCD_SCRIPTS=		zope3 zss3
 PKG_GROUPS=		${ZOPE3_GROUP}
-PKG_USERS=		${ZOPE3_USER}:${ZOPE3_GROUP}::Zope3\ user
-
-PKG_GECOS.${ZOPE3_USER}=	Zope3 user
+PKG_USERS=		${ZOPE3_USER}:${ZOPE3_GROUP}
 
+FILES_SUBST+=		ZOPE3_USER=${ZOPE3_USER:Q}
 MESSAGE_SUBST+=		ZOPE3_USER=${ZOPE3_USER:Q} \
 			ZOPE3_GROUP=${ZOPE3_GROUP:Q} \
 			VARBASE=${VARBASE:Q}
@@ -49,6 +47,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Zope/LICENSES.txt ${ZOPE3_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/Zope/ZopePublicLicense.txt ${ZOPE3_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/Zope/doc/*.txt ${ZOPE3_DOCDIR}
+	${ECHO} "3.2.1" > ${ZOPE3_DIR}/lib/python/zope/app/version.txt
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/zope3/Makefile.common b/www/zope3/Makefile.common
index 192fc934d55..fa3258bbaa5 100644
--- a/www/zope3/Makefile.common
+++ b/www/zope3/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2006/01/07 13:13:28 wiz Exp $
+# $NetBSD: Makefile.common,v 1.2 2006/05/06 22:38:27 wiz Exp $
 #
 
 PYTHON_VERSIONS_ACCEPTED=	24
diff --git a/www/zope3/PLIST b/www/zope3/PLIST
index a4c88117be5..a9b38d1d156 100644
--- a/www/zope3/PLIST
+++ b/www/zope3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/01/07 13:13:28 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/05/06 22:38:27 wiz Exp $
 bin/mkzeoinstance
 bin/mkzopeinstance
 bin/zopetest
@@ -131,6 +131,9 @@ share/zope3/lib/python/ClientCookie/__init__.pyo
 share/zope3/lib/python/ClientCookie/_urllib2_support.py
 share/zope3/lib/python/ClientCookie/_urllib2_support.pyc
 share/zope3/lib/python/ClientCookie/_urllib2_support.pyo
+share/zope3/lib/python/ClientForm.py
+share/zope3/lib/python/ClientForm.pyc
+share/zope3/lib/python/ClientForm.pyo
 share/zope3/lib/python/RestrictedPython/Eval.py
 share/zope3/lib/python/RestrictedPython/Eval.pyc
 share/zope3/lib/python/RestrictedPython/Eval.pyo
@@ -1066,6 +1069,9 @@ share/zope3/lib/python/persistent/tests/test_wref.pyo
 share/zope3/lib/python/persistent/wref.py
 share/zope3/lib/python/persistent/wref.pyc
 share/zope3/lib/python/persistent/wref.pyo
+share/zope3/lib/python/pullparser.py
+share/zope3/lib/python/pullparser.pyc
+share/zope3/lib/python/pullparser.pyo
 share/zope3/lib/python/pytz/LICENSE.txt
 share/zope3/lib/python/pytz/README.txt
 share/zope3/lib/python/pytz/__init__.py
@@ -9172,6 +9178,9 @@ share/zope3/lib/python/zope/formlib/i18n.pyo
 share/zope3/lib/python/zope/formlib/interfaces.py
 share/zope3/lib/python/zope/formlib/interfaces.pyc
 share/zope3/lib/python/zope/formlib/interfaces.pyo
+share/zope3/lib/python/zope/formlib/locales/de/LC_MESSAGES/zope.formlib.mo
+share/zope3/lib/python/zope/formlib/locales/de/LC_MESSAGES/zope.formlib.po
+share/zope3/lib/python/zope/formlib/locales/zope.formlib.pot
 share/zope3/lib/python/zope/formlib/namedtemplate.py
 share/zope3/lib/python/zope/formlib/namedtemplate.pyc
 share/zope3/lib/python/zope/formlib/namedtemplate.pyo
@@ -10732,9 +10741,6 @@ share/zope3/lib/python/zope/tales/tests/test_tales.pyo
 share/zope3/lib/python/zope/tales/tests/test_traverser.py
 share/zope3/lib/python/zope/tales/tests/test_traverser.pyc
 share/zope3/lib/python/zope/tales/tests/test_traverser.pyo
-share/zope3/lib/python/zope/testbrowser/ClientForm.py
-share/zope3/lib/python/zope/testbrowser/ClientForm.pyc
-share/zope3/lib/python/zope/testbrowser/ClientForm.pyo
 share/zope3/lib/python/zope/testbrowser/DEPENDENCIES.cfg
 share/zope3/lib/python/zope/testbrowser/README.txt
 share/zope3/lib/python/zope/testbrowser/SETUP.cfg
@@ -10764,9 +10770,6 @@ share/zope3/lib/python/zope/testbrowser/interfaces.py
 share/zope3/lib/python/zope/testbrowser/interfaces.pyc
 share/zope3/lib/python/zope/testbrowser/interfaces.pyo
 share/zope3/lib/python/zope/testbrowser/over_the_wire.txt
-share/zope3/lib/python/zope/testbrowser/pullparser.py
-share/zope3/lib/python/zope/testbrowser/pullparser.pyc
-share/zope3/lib/python/zope/testbrowser/pullparser.pyo
 share/zope3/lib/python/zope/testbrowser/testing.py
 share/zope3/lib/python/zope/testbrowser/testing.pyc
 share/zope3/lib/python/zope/testbrowser/testing.pyo
@@ -11263,6 +11266,9 @@ share/zope3/zopeskel/var/README.txt
 @dirrm share/zope3/lib/python/zope/i18n
 @dirrm share/zope3/lib/python/zope/hookable/tests
 @dirrm share/zope3/lib/python/zope/hookable
+@dirrm share/zope3/lib/python/zope/formlib/locales/de/LC_MESSAGES
+@dirrm share/zope3/lib/python/zope/formlib/locales/de
+@dirrm share/zope3/lib/python/zope/formlib/locales
 @dirrm share/zope3/lib/python/zope/formlib
 @dirrm share/zope3/lib/python/zope/exceptions/tests
 @dirrm share/zope3/lib/python/zope/exceptions
diff --git a/www/zope3/distinfo b/www/zope3/distinfo
index b06ad93f1fc..b3b21834d39 100644
--- a/www/zope3/distinfo
+++ b/www/zope3/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2006/01/07 13:13:28 wiz Exp $
+$NetBSD: distinfo,v 1.3 2006/05/06 22:38:28 wiz Exp $
 
-SHA1 (Zope-3.2.0.tgz) = 1fa9610a1e1a7a6fe03ae0a94759110ad56ad22b
-RMD160 (Zope-3.2.0.tgz) = dcb47d95328ef29342c18bcf75582281dc1b34f3
-Size (Zope-3.2.0.tgz) = 6566282 bytes
-SHA1 (patch-aa) = e0bdbe22e31cb282e6956ee4617cfc655c5d12a8
-SHA1 (patch-ab) = 78d87de66d3c8aac8f1cc637fe7ce0cd76b8a703
-SHA1 (patch-ac) = d8a6a68c1b53acc3b311328984886ac08f911a49
-SHA1 (patch-ad) = e1d15f0936b25d0dbc026efaae247e34b600081c
+SHA1 (Zope-3.2.1.tgz) = cb45ab704e3a60376e3025e169b782f2c3968074
+RMD160 (Zope-3.2.1.tgz) = f7aeb56ab5f09e6780d0df787939af4c7815ceba
+Size (Zope-3.2.1.tgz) = 6532373 bytes
+SHA1 (patch-aa) = cbcbcd103741c82f315d5f2b851181d28b27c520
+SHA1 (patch-ab) = d3852c2278cbe02c8b86d399c0dcbcbd4eab6f4e
+SHA1 (patch-ac) = 48bb22e2a58192ba15d320231ccfa600f726d974
+SHA1 (patch-ad) = 58d2d40fd61a5114e77697e5199228f0f7e7e77a
diff --git a/www/zope3/files/zope3.sh b/www/zope3/files/zope3.sh
index 034452e5e44..f0529d4196f 100644
--- a/www/zope3/files/zope3.sh
+++ b/www/zope3/files/zope3.sh
@@ -1,12 +1,12 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: zope3.sh,v 1.2 2006/01/07 13:13:28 wiz Exp $
+# $NetBSD: zope3.sh,v 1.3 2006/05/06 22:38:28 wiz Exp $
 #
 # PROVIDE: zope3
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 
-$_rc_subr_loaded .  /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr
 
 name="zope3"
 rcvar=$name
@@ -30,20 +30,24 @@ zope3_precmd() {
         err 1 "${_dir} is not a directory."
     fi
     done
-    if test "${zope3_user}"; then
-        command_args="${command_args} --user ${zope3_user}"
+    if test -z "${zope3_user}"; then
+        zope3_user="@ZOPE3_USER@"
     fi
+    command_args="${command_args} --user ${zope3_user}"
 }
 
 zope3_start() {
+    echo -n "Starting Zope Application Server: "
     ${command} ${rc_flags} ${command_args} start
 }
 
 zope3_stop() {
+    echo -n "Stopping Zope Application Server: "
     ${command} ${rc_flags} ${command_args} stop
 }
 
 zope3_restart() {
+    echo -n "Restarting Zope Application Server: "
     ${command} ${rc_flags} ${command_args} restart
 }
 
diff --git a/www/zope3/files/zss3.sh b/www/zope3/files/zss3.sh
index dde3c0646ab..5e98bc9c41d 100644
--- a/www/zope3/files/zss3.sh
+++ b/www/zope3/files/zss3.sh
@@ -1,13 +1,13 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: zss3.sh,v 1.2 2006/01/07 13:13:28 wiz Exp $
+# $NetBSD: zss3.sh,v 1.3 2006/05/06 22:38:28 wiz Exp $
 #
 # PROVIDE: zss3
 # REQUIRE: DAEMON
 # BEFORE: zope3
 # KEYWORD: shutdown
 
-$_rc_subr_loaded .  /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr
 
 name="zss3"
 rcvar=$name
@@ -31,20 +31,24 @@ zss3_precmd() {
         err 1 "${_dir} is not a directory."
     fi
     done
-    if test "${zss3_user}"; then
-        command_args="${command_args} --user ${zss3_user}"
+    if test -z "${zss3_user}"; then
+        zss3_user="@ZOPE3_USER@"
     fi
+    command_args="${command_args} --user ${zss3_user}"
 }
 
 zss3_start() {
+    echo -n "Starting Zope Storage Server: "
     ${command} ${rc_flags} ${command_args} start
 }
 
 zss3_stop() {
+    echo -n "Stopping Zope Storage Server: "
     ${command} ${rc_flags} ${command_args} stop
 }
 
 zss3_restart() {
+    echo -n "Restarting Zope Storage Server: "
     ${command} ${rc_flags} ${command_args} restart
 }
 
diff --git a/www/zope3/package.mk b/www/zope3/package.mk
index 6d67c167ee9..6f6a35ef09a 100644
--- a/www/zope3/package.mk
+++ b/www/zope3/package.mk
@@ -1,7 +1,7 @@
-# $NetBSD: package.mk,v 1.1 2006/01/07 13:13:28 wiz Exp $
+# $NetBSD: package.mk,v 1.2 2006/05/06 22:38:28 wiz Exp $
 #
 
-DEPENDS+=		zope3>=3.2.0:../../www/zope3
+DEPENDS+=		zope3>=3.2.1:../../www/zope3
 
 .include "Makefile.common"
 
diff --git a/www/zope3/patches/patch-aa b/www/zope3/patches/patch-aa
index 20d0fc3ac44..a6f40057ff6 100644
--- a/www/zope3/patches/patch-aa
+++ b/www/zope3/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2006/01/07 13:13:28 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2006/05/06 22:38:28 wiz Exp $
 
---- Dependencies/ZConfig-Zope-3.2.0/ZConfig/scripts/zconfig.orig	2006-01-06 05:04:42.000000000 +0900
-+++ Dependencies/ZConfig-Zope-3.2.0/ZConfig/scripts/zconfig
+--- Dependencies/ZConfig-Zope-3.2.1/ZConfig/scripts/zconfig.orig	2006-04-28 09:02:23.000000000 +0900
++++ Dependencies/ZConfig-Zope-3.2.1/ZConfig/scripts/zconfig
 @@ -40,2 +40,13 @@
  import sys
 +import os
diff --git a/www/zope3/patches/patch-ab b/www/zope3/patches/patch-ab
index fa3f9b1b981..5c6b04262c7 100644
--- a/www/zope3/patches/patch-ab
+++ b/www/zope3/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2006/01/07 13:13:28 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2006/05/06 22:38:28 wiz Exp $
 
---- Dependencies/ZConfig-Zope-3.2.0/ZConfig/scripts/zconfig_schema2html.orig	2006-01-06 05:04:42.000000000 +0900
-+++ Dependencies/ZConfig-Zope-3.2.0/ZConfig/scripts/zconfig_schema2html
+--- Dependencies/ZConfig-Zope-3.2.1/ZConfig/scripts/zconfig_schema2html.orig	2006-04-28 09:02:23.000000000 +0900
++++ Dependencies/ZConfig-Zope-3.2.1/ZConfig/scripts/zconfig_schema2html
 @@ -17,5 +17,18 @@
  
 +import sys
diff --git a/www/zope3/patches/patch-ac b/www/zope3/patches/patch-ac
index bb824b67bf5..42866ac7d50 100644
--- a/www/zope3/patches/patch-ac
+++ b/www/zope3/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.2 2006/01/07 13:13:28 wiz Exp $
+$NetBSD: patch-ac,v 1.3 2006/05/06 22:38:28 wiz Exp $
 
---- Dependencies/zdaemon-Zope-3.2.0/zdaemon/zdctl.py.orig	2006-01-06 05:04:52.000000000 +0900
-+++ Dependencies/zdaemon-Zope-3.2.0/zdaemon/zdctl.py
+--- Dependencies/zdaemon-Zope-3.2.1/zdaemon/zdctl.py.orig	2006-04-28 09:02:23.000000000 +0900
++++ Dependencies/zdaemon-Zope-3.2.1/zdaemon/zdctl.py
 @@ -60,2 +60,10 @@
          sys.path.append(dirname(scriptdir))
 +    here = os.path.dirname(os.path.realpath(__file__))
diff --git a/www/zope3/patches/patch-ad b/www/zope3/patches/patch-ad
index 35e4b06935e..32b5f8966af 100644
--- a/www/zope3/patches/patch-ad
+++ b/www/zope3/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.2 2006/01/07 13:13:28 wiz Exp $
+$NetBSD: patch-ad,v 1.3 2006/05/06 22:38:28 wiz Exp $
 
---- Dependencies/zdaemon-Zope-3.2.0/zdaemon/zdrun.py.orig	2006-01-06 05:04:52.000000000 +0900
-+++ Dependencies/zdaemon-Zope-3.2.0/zdaemon/zdrun.py
+--- Dependencies/zdaemon-Zope-3.2.1/zdaemon/zdrun.py.orig	2006-04-28 09:02:23.000000000 +0900
++++ Dependencies/zdaemon-Zope-3.2.1/zdaemon/zdrun.py
 @@ -85,2 +85,10 @@
          sys.path.append(dirname(scriptdir))
 +    here = os.path.dirname(os.path.realpath(__file__))