Subject: Re: pkg/33388: www/zope3: Please update to 3.2.1
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: Yoshito Komatsu <ykomatsu@akaumigame.org>
List: pkgsrc-bugs
Date: 05/02/2006 17:10:03
The following reply was made to PR pkg/33388; it has been noted by GNATS.
From: Yoshito Komatsu <ykomatsu@akaumigame.org>
To: gnats-bugs@netbsd.org
Cc:
Subject: Re: pkg/33388: www/zope3: Please update to 3.2.1
Date: Wed, 03 May 2006 02:05:42 +0900
This is a multi-part message in MIME format.
--------------020906000706070208090906
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
I have made a patch for www/zope3.
Please apply the following patch.
--------------020906000706070208090906
Content-Type: text/plain;
name="zope3.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="zope3.diff"
diff -uNr -x CVS www/zope3/MESSAGE www/zope3.new/MESSAGE
--- www/zope3/MESSAGE 2006-01-08 16:14:28.000000000 +0900
+++ www/zope3.new/MESSAGE 2006-05-03 01:36:52.000000000 +0900
@@ -1,36 +1,22 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.2 2006/01/07 13:13:28 wiz Exp $
+$NetBSD$
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 -uNr -x CVS www/zope3/Makefile www/zope3.new/Makefile
--- www/zope3/Makefile 2006-04-23 23:20:39.000000000 +0900
+++ www/zope3.new/Makefile 2006-05-03 01:36:52.000000000 +0900
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2006/04/23 00:12:42 jlam Exp $
+# $NetBSD$
#
-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 @@
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 @@
${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 -uNr -x CVS www/zope3/Makefile.common www/zope3.new/Makefile.common
--- www/zope3/Makefile.common 2006-01-07 22:13:28.000000000 +0900
+++ www/zope3.new/Makefile.common 2006-05-03 01:36:52.000000000 +0900
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2006/01/07 13:13:28 wiz Exp $
+# $NetBSD$
#
PYTHON_VERSIONS_ACCEPTED= 24
diff -uNr -x CVS www/zope3/PLIST www/zope3.new/PLIST
--- www/zope3/PLIST 2006-01-08 16:14:30.000000000 +0900
+++ www/zope3.new/PLIST 2006-05-03 01:36:52.000000000 +0900
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/01/07 13:13:28 wiz Exp $
+@comment $NetBSD$
bin/mkzeoinstance
bin/mkzopeinstance
bin/zopetest
@@ -131,6 +131,9 @@
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/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/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_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.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 @@
@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 -uNr -x CVS www/zope3/distinfo www/zope3.new/distinfo
--- www/zope3/distinfo 2006-01-08 16:14:30.000000000 +0900
+++ www/zope3.new/distinfo 2006-05-03 01:36:52.000000000 +0900
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2006/01/07 13:13:28 wiz Exp $
+$NetBSD$
-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 -uNr -x CVS www/zope3/files/zope3.sh www/zope3.new/files/zope3.sh
--- www/zope3/files/zope3.sh 2006-01-08 16:14:30.000000000 +0900
+++ www/zope3.new/files/zope3.sh 2006-05-03 01:36:52.000000000 +0900
@@ -1,12 +1,12 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: zope3.sh,v 1.2 2006/01/07 13:13:28 wiz Exp $
+# $NetBSD$
#
# 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 @@
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 -uNr -x CVS www/zope3/files/zss3.sh www/zope3.new/files/zss3.sh
--- www/zope3/files/zss3.sh 2006-01-08 16:14:30.000000000 +0900
+++ www/zope3.new/files/zss3.sh 2006-05-03 01:36:52.000000000 +0900
@@ -1,13 +1,13 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: zss3.sh,v 1.2 2006/01/07 13:13:28 wiz Exp $
+# $NetBSD$
#
# 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 @@
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 -uNr -x CVS www/zope3/package.mk www/zope3.new/package.mk
--- www/zope3/package.mk 2006-01-07 22:13:28.000000000 +0900
+++ www/zope3.new/package.mk 2006-05-03 01:37:44.000000000 +0900
@@ -1,7 +1,7 @@
-# $NetBSD: package.mk,v 1.1 2006/01/07 13:13:28 wiz Exp $
+# $NetBSD$
#
-DEPENDS+= zope3>=3.2.0:../../www/zope3
+DEPENDS+= zope3>=3.2.1:../../www/zope3
.include "Makefile.common"
diff -uNr -x CVS www/zope3/patches/patch-aa www/zope3.new/patches/patch-aa
--- www/zope3/patches/patch-aa 2006-01-08 16:14:30.000000000 +0900
+++ www/zope3.new/patches/patch-aa 2006-05-03 01:36:52.000000000 +0900
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2006/01/07 13:13:28 wiz Exp $
+$NetBSD$
---- 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 -uNr -x CVS www/zope3/patches/patch-ab www/zope3.new/patches/patch-ab
--- www/zope3/patches/patch-ab 2006-01-08 16:14:30.000000000 +0900
+++ www/zope3.new/patches/patch-ab 2006-05-03 01:36:52.000000000 +0900
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2006/01/07 13:13:28 wiz Exp $
+$NetBSD$
---- 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 -uNr -x CVS www/zope3/patches/patch-ac www/zope3.new/patches/patch-ac
--- www/zope3/patches/patch-ac 2006-01-08 16:14:30.000000000 +0900
+++ www/zope3.new/patches/patch-ac 2006-05-03 01:36:52.000000000 +0900
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.2 2006/01/07 13:13:28 wiz Exp $
+$NetBSD$
---- 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 -uNr -x CVS www/zope3/patches/patch-ad www/zope3.new/patches/patch-ad
--- www/zope3/patches/patch-ad 2006-01-08 16:14:30.000000000 +0900
+++ www/zope3.new/patches/patch-ad 2006-05-03 01:36:52.000000000 +0900
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.2 2006/01/07 13:13:28 wiz Exp $
+$NetBSD$
---- 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__))
--------------020906000706070208090906--