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

2 files changed, 16 insertions, 8 deletions

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
 }