Update zope211 package to 2.11.8 (Zope 2.11.8)

Zope 2.11.8 (2011/02/04) Bugs fixed - Prevent publication of acquired attributes, where the acquired object does not have a docstring. https://bugs.launchpad.net/zope2/+bug/713253/ Zope 2.11.7 (2010/09/01) Bugs Fixed - Prevent uncaught exceptions from killing ZServer worker threads. https://bugs.launchpad.net/zope2/+bug/627988 - Ensure that mailhosts which share a queue directory do not double- deliver mails, by sharing the thread which processes emails for that directory. https://bugs.launchpad.net/zope2/+bug/574286 - Process "evil" JSON cookies which contain double quotes in violation of RFC 2965 / 2616. https://bugs.launchpad.net/zope2/+bug/563229 - Ensure that Acquistion wrapper classes always have a ``__getnewargs__`` method, even if it is not provided by the underlying ExtensionClass. - Fix the ``tp_name`` of the ImplicitAcquisitionWrapper and ExplicitAcquisitionWrapper to match their Python visible names and thus have a correct ``__name__``. - Expand the ``tp_name`` of Acquisition's extension types to hold the fully qualified name. This ensures classes have their ``__module__`` set correctly. - Updated 'pytz' external to point to '2010b' version. - Protect ZCTextIndex's clear method against storing Acquisition wrappers. - LP #195761: fixed ZMI XML export / import. - MailHost should fall back to HELO when EHLO fails. Zope 2.11.6 (2010/01/12) Bugs Fixed - LP #491224: proper escaping of rendered error message - Also look for ZEXP imports within the clienthome directory. This provides a place to put imports that won't be clobbered by buildout in a buildout-based Zope instance. - LP #143444: add labels to checkboxes / radio buttons on import / export form. - Fixed improper handling of IF_MODIFIED_SINCE header inside Five/browser/resource.py Zope 2.11.5 (2009/12/22) Bugs Fixed - LP #490514: preserve tainting when calling into DTML from ZPT. - LP #360761 (backported from Acquisition trunk): fix iteration proxy to pass `self` acquisition-wrapped into `__iter__` and `__getitem__`. - LP #414757 (backported from Zope trunk): don't emit a IEndRequestEvent when clearing a cloned request. - updated to ZODB 3.8.4 Zope 2.11.4 (2009/08/06) Restructuring - Moved exception MountedStorageError from ZODB.POSExceptions to Products.TemporaryFolder.mount (now its only client). - LP #253362: Moved Zope2-specific module, ZODB/Mount.py, to Products/TemporaryFolder/mount.py (its only client is Products/TemporaryFolder/TemporaryFolder.py). - Removed spurious import-time dependencies from Products/ZODBMountPoint/MountedObject.py. Bugs Fixed - Fixed vulnerabilities in the ZEO network protocol affecting ZEO storage servers. Zope 2.11.3 (2009/05/04) Features added - SiteErrorLog now includes the entry id in the information copied to the event log. This allowes you to correlate a user error report with the event log after a restart, or let's you find the REQUEST information in the SiteErrorLog when looking at a traceback in the event log. Restructuring - Updated to match all new versions from the yet-unreleased Zope 3.4.1 release (`http://svn.zope.org/zope.release/branches/3.4/ releases/controlled-packages.cfg?rev=99659`). - Updated to include all new versions from the final Zope 3.4.0 release (http://download.zope.org/zope3.4/3.4.0/). - Added 'InitializeClass' alias in 'App.class_init' to ease migration. In Zope 2.12 it will be recommended to import 'InitializeClass' from 'App.class_init' instead of 'Globals'. - Moved 'ApplicationDefaultPermissions' from 'App.class_init' to 'AccessControl.Permissions', in order to break an import cycle in third-party code which avoids imports from 'Globals.' Left the class importable from its old location without deprecation. - configure script: setting ZOPE_VERS to '2.11' - Products.PluginIndexes.PathIndex: backported doc fixes / optimizations from trunk (and ExtendedPathIndex). - Updated 'pytz' from '2007f' to '2008i'. - Moved svn:externals for 'mechanize', 'ClientPath', and 'pytz' to versions managed outside the Zope3 trunk. - Testing.ZopeTestCase: Remove quota argument from DemoStorage calls in preparation for ZODB 3.9. Bugs Fixed - Launchpad #373299: Removed bogus string exception in OFS.CopySupport. - ZPublisher response.setBody: don't append Accept-Encoding to Vary header if it is already present - this can make cache configuration difficult. (merged 99493) - Launchpad #267834: proper separation of HTTP header fields using CRLF as requested by RFC 2616. (merged 90980, 92625) - Launchpad #348223: optimize catalog query by breaking out early from loop over indexes if the result set is already empty. - "Permission tab": correct wrong form parameter for the user-permission report - Launchpad #290254, DateTime/DateTime.py: added '__setstate__' to cope with old pickles missing a '_micros' attribute; Python's pickling support was creating a new instance, *with* a '_micros' attribute, but not clearing that attribute before updating the instance dict with the unpickled state. - Launchpad #332168, Shared/DC/RDBMS/Connection.py: do not expose DB connection strings through exceptions - Launchpad #324876: tighened regex for detecting the charset from a meta-equiv header - Launchpad #174705: ensure that the error info object exposed to a 'tal:on_error' handler has attributes visible to restricted code. - Acquisition wrappers now correctly proxy __iter__.
author: taca <taca> 2011-05-14 02:58:08 +0000
committer: taca <taca> 2011-05-14 02:58:08 +0000
commit: 3ba99948a4ebb911bbd2871b5bd5447a46c271a5 (patch)
tree: 2ee339058d96ff98fffd3e15c88969a75f15c2e1 /www
parent: 160bf6a55a707f61b3a1428b8742d708eabf75ad (diff)
download: pkgsrc-3ba99948a4ebb911bbd2871b5bd5447a46c271a5.tar.gz
6 files changed, 117 insertions, 26 deletions
diff --git a/www/zope/zopeversion.mk b/www/zope/zopeversion.mk
index 94e9c764ddb..61cda4f9721 100644
--- a/www/zope/zopeversion.mk
+++ b/www/zope/zopeversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: zopeversion.mk,v 1.15 2011/05/14 02:56:33 taca Exp $
+# $NetBSD: zopeversion.mk,v 1.16 2011/05/14 02:58:08 taca Exp $
 #
 
 .if !defined(_ZOPEVERSION_MK)
@@ -58,7 +58,7 @@ ZOPE_VERSION_ACCEPTED?=	${ZOPE_VERSION_SUPPORTED}
 # current Zope version
 ZOPE29_VERSION=		2.9.12
 ZOPE210_VERSION=	2.10.13
-ZOPE211_VERSION=	2.11.2
+ZOPE211_VERSION=	2.11.8
 #ZOPE212_VERSION=	2.12.18
 #ZOPE213_VERSION=	2.13.7		# py26 py27
 
diff --git a/www/zope211/Makefile b/www/zope211/Makefile
index a69559740d8..a7dd0463217 100644
--- a/www/zope211/Makefile
+++ b/www/zope211/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/04/22 00:35:33 taca Exp $
+# $NetBSD: Makefile,v 1.6 2011/05/14 02:58:08 taca Exp $
 #
 
 DISTNAME=	Zope-${ZOPE211_VERSION}-final
@@ -37,10 +37,25 @@ SUBST_SED.param+=	-e "s|@ZOPE_USER@|${ZOPE_USER}|g"
 SUBST_SED.param+=	-e "s|@ZOPE_GROUP@|${ZOPE_GROUP}|g"
 SUBST_MESSAGE.param=	Fixing some parameters in files.
 
-REPLACE_PYTHON=		test.py lib/python/Zope2/Startup/zopectl.py \
-			lib/python/zdaemon/zdctl.py lib/python/zdaemon/zdrun.py
-REPLACE_PYTHON_DIRS+=	${WRKSRC}/lib/python/ZEO/scripts ${WRKSRC}/utilities
-
+REPLACE_PYTHON= \
+	lib/python/AccessControl/securitySuite/regressionSecurity.py \
+	lib/python/Interface/pyskel.py lib/python/OFS/ndiff.py \
+	lib/python/Products/PageTemplates/tests/run.py \
+	lib/python/Products/PluginIndexes/TextIndex/Splitter/setup.py \
+	lib/python/StructuredText/ClassicStructuredText.py \
+	lib/python/ZEO/zeoctl.py lib/python/ZTUtils/tests/run.py \
+	lib/python/Zope2/Startup/misc/zpasswd.py \
+	lib/python/Zope2/Startup/zopectl.py \
+	lib/python/docutils/readers/python/pynodes.py \
+	lib/python/pytz/tzfile.py lib/python/zdaemon/zdctl.py \
+	lib/python/zdaemon/zdrun.py lib/python/zdaemon/tests/nokill.py \
+	lib/python/zope/security/setup.py test.py
+REPLACE_PYTHON_DIRS+=	lib/python/Products/ZCTextIndex/tests \
+	lib/python/Products/ZCatalog/regressiontests lib/python/TAL \
+	lib/python/ZEO/scripts lib/python/ZODB/scripts \
+	lib/python/ZServer/medusa lib/python/zope/app/locales \
+	lib/python/zope/index/text lib/python/zope/rdb/gadfly \
+	lib/python/zope/tal utilities
 USE_TOOLS+=	pax
 
 pre-patch:
@@ -50,6 +65,9 @@ pre-patch:
 post-extract:
 	cd ${WRKSRC}; ${FIND} doc lib skel/import -type f -print | \
 		${XARGS} ${CHMOD} -x
+	cd ${WRKSRC}/lib/python/RestrictedPython/tests && \
+		${RM} -f before_and_after25.py before_and_after26.py \
+			security_in_syntax26.py
 
 post-build:
 	cd ${WRKSRC}; ${PY_COMPILE_ALL} .
diff --git a/www/zope211/PLIST b/www/zope211/PLIST
index a0de7582bd6..94d8a28ee06 100644
--- a/www/zope211/PLIST
+++ b/www/zope211/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 22:00:42 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2011/05/14 02:58:08 taca Exp $
 ${ZOPE_DOC_BASE}/zeo/README.txt
 ${ZOPE_DOC_BASE}/zeo/ZopeREADME.txt
 ${ZOPE_DOC_BASE}/zeo/cache.txt
@@ -407,8 +407,6 @@ ${ZOPE_BASE}/lib/python/BTrees/tests/test_check.py
 ${ZOPE_BASE}/lib/python/BTrees/tests/test_check.pyc
 ${ZOPE_BASE}/lib/python/BTrees/tests/test_compare.py
 ${ZOPE_BASE}/lib/python/BTrees/tests/test_compare.pyc
-${ZOPE_BASE}/lib/python/ClientForm/ClientForm.py
-${ZOPE_BASE}/lib/python/ClientForm/ClientForm.pyc
 ${ZOPE_BASE}/lib/python/ClientForm/__init__.py
 ${ZOPE_BASE}/lib/python/ClientForm/__init__.pyc
 ${ZOPE_BASE}/lib/python/ComputedAttribute/_ComputedAttribute.so
@@ -746,6 +744,7 @@ ${ZOPE_BASE}/lib/python/OFS/subscribers.py
 ${ZOPE_BASE}/lib/python/OFS/subscribers.pyc
 ${ZOPE_BASE}/lib/python/OFS/tests/__init__.py
 ${ZOPE_BASE}/lib/python/OFS/tests/__init__.pyc
+${ZOPE_BASE}/lib/python/OFS/tests/export.xml
 ${ZOPE_BASE}/lib/python/OFS/tests/mime.types-1
 ${ZOPE_BASE}/lib/python/OFS/tests/mime.types-2
 ${ZOPE_BASE}/lib/python/OFS/tests/test.gif
@@ -1872,6 +1871,8 @@ ${ZOPE_BASE}/lib/python/Products/TemporaryFolder/__init__.pyc
 ${ZOPE_BASE}/lib/python/Products/TemporaryFolder/dtml/addTemporaryFolder.dtml
 ${ZOPE_BASE}/lib/python/Products/TemporaryFolder/dtml/mountfail.dtml
 ${ZOPE_BASE}/lib/python/Products/TemporaryFolder/help/TemporaryFolder.stx
+${ZOPE_BASE}/lib/python/Products/TemporaryFolder/mount.py
+${ZOPE_BASE}/lib/python/Products/TemporaryFolder/mount.pyc
 ${ZOPE_BASE}/lib/python/Products/TemporaryFolder/patchfs.py
 ${ZOPE_BASE}/lib/python/Products/TemporaryFolder/patchfs.pyc
 ${ZOPE_BASE}/lib/python/Products/TemporaryFolder/www/tempfolder.gif
@@ -2182,6 +2183,8 @@ ${ZOPE_BASE}/lib/python/RestrictedPython/tests/testREADME.py
 ${ZOPE_BASE}/lib/python/RestrictedPython/tests/testREADME.pyc
 ${ZOPE_BASE}/lib/python/RestrictedPython/tests/testRestrictions.py
 ${ZOPE_BASE}/lib/python/RestrictedPython/tests/testRestrictions.pyc
+${ZOPE_BASE}/lib/python/RestrictedPython/tests/testUtiliities.py
+${ZOPE_BASE}/lib/python/RestrictedPython/tests/testUtiliities.pyc
 ${ZOPE_BASE}/lib/python/RestrictedPython/tests/unpack.py
 ${ZOPE_BASE}/lib/python/RestrictedPython/tests/unpack.pyc
 ${ZOPE_BASE}/lib/python/RestrictedPython/tests/verify.py
@@ -2849,6 +2852,8 @@ ${ZOPE_BASE}/lib/python/ZEO/tests/invalidations_while_connecting.test
 ${ZOPE_BASE}/lib/python/ZEO/tests/multi.py
 ${ZOPE_BASE}/lib/python/ZEO/tests/multi.pyc
 ${ZOPE_BASE}/lib/python/ZEO/tests/registerDB.test
+${ZOPE_BASE}/lib/python/ZEO/tests/servertesting.py
+${ZOPE_BASE}/lib/python/ZEO/tests/servertesting.pyc
 ${ZOPE_BASE}/lib/python/ZEO/tests/speed.py
 ${ZOPE_BASE}/lib/python/ZEO/tests/speed.pyc
 ${ZOPE_BASE}/lib/python/ZEO/tests/stress.py
@@ -2865,6 +2870,8 @@ ${ZOPE_BASE}/lib/python/ZEO/tests/testTransactionBuffer.py
 ${ZOPE_BASE}/lib/python/ZEO/tests/testTransactionBuffer.pyc
 ${ZOPE_BASE}/lib/python/ZEO/tests/testZEO.py
 ${ZOPE_BASE}/lib/python/ZEO/tests/testZEO.pyc
+${ZOPE_BASE}/lib/python/ZEO/tests/testZEO2.py
+${ZOPE_BASE}/lib/python/ZEO/tests/testZEO2.pyc
 ${ZOPE_BASE}/lib/python/ZEO/tests/testZEOOptions.py
 ${ZOPE_BASE}/lib/python/ZEO/tests/testZEOOptions.pyc
 ${ZOPE_BASE}/lib/python/ZEO/tests/test_cache.py
@@ -3010,6 +3017,9 @@ ${ZOPE_BASE}/lib/python/ZODB/scripts/space.py
 ${ZOPE_BASE}/lib/python/ZODB/scripts/space.pyc
 ${ZOPE_BASE}/lib/python/ZODB/scripts/stats.py
 ${ZOPE_BASE}/lib/python/ZODB/scripts/stats.pyc
+${ZOPE_BASE}/lib/python/ZODB/scripts/strip_versions.py
+${ZOPE_BASE}/lib/python/ZODB/scripts/strip_versions.pyc
+${ZOPE_BASE}/lib/python/ZODB/scripts/strip_versions.test
 ${ZOPE_BASE}/lib/python/ZODB/scripts/tests.py
 ${ZOPE_BASE}/lib/python/ZODB/scripts/tests.pyc
 ${ZOPE_BASE}/lib/python/ZODB/scripts/zodbload.py
@@ -3377,6 +3387,8 @@ ${ZOPE_BASE}/lib/python/Zope2/App/startup.py
 ${ZOPE_BASE}/lib/python/Zope2/App/startup.pyc
 ${ZOPE_BASE}/lib/python/Zope2/App/tests/__init__.py
 ${ZOPE_BASE}/lib/python/Zope2/App/tests/__init__.pyc
+${ZOPE_BASE}/lib/python/Zope2/App/tests/testDoomedTransaction.py
+${ZOPE_BASE}/lib/python/Zope2/App/tests/testDoomedTransaction.pyc
 ${ZOPE_BASE}/lib/python/Zope2/App/tests/testExceptionHook.py
 ${ZOPE_BASE}/lib/python/Zope2/App/tests/testExceptionHook.pyc
 ${ZOPE_BASE}/lib/python/Zope2/ClassFactory.py
@@ -3675,16 +3687,38 @@ ${ZOPE_BASE}/lib/python/initgroups/__init__.pyc
 ${ZOPE_BASE}/lib/python/initgroups/_initgroups.so
 ${ZOPE_BASE}/lib/python/mechanize/_auth.py
 ${ZOPE_BASE}/lib/python/mechanize/_auth.pyc
+${ZOPE_BASE}/lib/python/mechanize/_beautifulsoup.py
+${ZOPE_BASE}/lib/python/mechanize/_beautifulsoup.pyc
 ${ZOPE_BASE}/lib/python/mechanize/_clientcookie.py
 ${ZOPE_BASE}/lib/python/mechanize/_clientcookie.pyc
+${ZOPE_BASE}/lib/python/mechanize/_debug.py
+${ZOPE_BASE}/lib/python/mechanize/_debug.pyc
+${ZOPE_BASE}/lib/python/mechanize/_file.py
+${ZOPE_BASE}/lib/python/mechanize/_file.pyc
+${ZOPE_BASE}/lib/python/mechanize/_firefox3cookiejar.py
+${ZOPE_BASE}/lib/python/mechanize/_firefox3cookiejar.pyc
 ${ZOPE_BASE}/lib/python/mechanize/_gzip.py
 ${ZOPE_BASE}/lib/python/mechanize/_gzip.pyc
 ${ZOPE_BASE}/lib/python/mechanize/_headersutil.py
 ${ZOPE_BASE}/lib/python/mechanize/_headersutil.pyc
 ${ZOPE_BASE}/lib/python/mechanize/_html.py
 ${ZOPE_BASE}/lib/python/mechanize/_html.pyc
+${ZOPE_BASE}/lib/python/mechanize/_http.py
+${ZOPE_BASE}/lib/python/mechanize/_http.pyc
 ${ZOPE_BASE}/lib/python/mechanize/_pullparser.py
 ${ZOPE_BASE}/lib/python/mechanize/_pullparser.pyc
+${ZOPE_BASE}/lib/python/mechanize/_response.py
+${ZOPE_BASE}/lib/python/mechanize/_response.pyc
+${ZOPE_BASE}/lib/python/mechanize/_rfc3986.py
+${ZOPE_BASE}/lib/python/mechanize/_rfc3986.pyc
+${ZOPE_BASE}/lib/python/mechanize/_seek.py
+${ZOPE_BASE}/lib/python/mechanize/_seek.pyc
+${ZOPE_BASE}/lib/python/mechanize/_sockettimeout.py
+${ZOPE_BASE}/lib/python/mechanize/_sockettimeout.pyc
+${ZOPE_BASE}/lib/python/mechanize/_testcase.py
+${ZOPE_BASE}/lib/python/mechanize/_testcase.pyc
+${ZOPE_BASE}/lib/python/mechanize/_upgrade.py
+${ZOPE_BASE}/lib/python/mechanize/_upgrade.pyc
 ${ZOPE_BASE}/lib/python/mechanize/__init__.py
 ${ZOPE_BASE}/lib/python/mechanize/__init__.pyc
 ${ZOPE_BASE}/lib/python/mechanize/_lwpcookiejar.py
@@ -3701,8 +3735,6 @@ ${ZOPE_BASE}/lib/python/mechanize/_request.py
 ${ZOPE_BASE}/lib/python/mechanize/_request.pyc
 ${ZOPE_BASE}/lib/python/mechanize/_urllib2.py
 ${ZOPE_BASE}/lib/python/mechanize/_urllib2.pyc
-${ZOPE_BASE}/lib/python/mechanize/_urllib2_support.py
-${ZOPE_BASE}/lib/python/mechanize/_urllib2_support.pyc
 ${ZOPE_BASE}/lib/python/mechanize/_util.py
 ${ZOPE_BASE}/lib/python/mechanize/_util.pyc
 ${ZOPE_BASE}/lib/python/mechanize/_useragent.py
@@ -3748,8 +3780,6 @@ ${ZOPE_BASE}/lib/python/persistent/tests/test_wref.py
 ${ZOPE_BASE}/lib/python/persistent/tests/test_wref.pyc
 ${ZOPE_BASE}/lib/python/persistent/wref.py
 ${ZOPE_BASE}/lib/python/persistent/wref.pyc
-${ZOPE_BASE}/lib/python/pytz/LICENSE.txt
-${ZOPE_BASE}/lib/python/pytz/README.txt
 ${ZOPE_BASE}/lib/python/pytz/__init__.py
 ${ZOPE_BASE}/lib/python/pytz/__init__.pyc
 ${ZOPE_BASE}/lib/python/pytz/reference.py
@@ -3828,6 +3858,8 @@ ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Argentina/Jujuy
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Argentina/La_Rioja
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Argentina/Mendoza
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Argentina/Rio_Gallegos
+${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Argentina/Salta
+${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Argentina/San_Luis
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Argentina/San_Juan
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Argentina/Tucuman
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Argentina/Ushuaia
@@ -3886,6 +3918,7 @@ ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Indiana/Indianapolis
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Indiana/Knox
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Indiana/Marengo
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Indiana/Petersburg
+${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Indiana/Tell_City
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Indiana/Vevay
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Indiana/Vincennes
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Indiana/Winamac
@@ -3905,7 +3938,9 @@ ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Louisville
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Maceio
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Managua
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Manaus
+${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Marigot
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Martinique
+${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Matamoros
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Mazatlan
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Mendoza
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Menominee
@@ -3924,6 +3959,7 @@ ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Nome
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Noronha
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/North_Dakota/Center
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/North_Dakota/New_Salem
+${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Ojinaga
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Panama
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Pangnirtung
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Paramaribo
@@ -3941,10 +3977,13 @@ ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Resolute
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Rio_Branco
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Rosario
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Santiago
+${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Santarem
+${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Santa_Isabel
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Santo_Domingo
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Sao_Paulo
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Scoresbysund
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/Shiprock
+${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/St_Barthelemy
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/St_Johns
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/St_Kitts
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/America/St_Lucia
@@ -4003,6 +4042,7 @@ ${ZOPE_BASE}/lib/python/pytz/zoneinfo/Asia/Dushanbe
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/Asia/Gaza
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/Asia/Harbin
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/Asia/Hong_Kong
+${ZOPE_BASE}/lib/python/pytz/zoneinfo/Asia/Ho_Chi_Minh
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/Asia/Hovd
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/Asia/Irkutsk
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/Asia/Istanbul
@@ -4013,7 +4053,9 @@ ${ZOPE_BASE}/lib/python/pytz/zoneinfo/Asia/Kabul
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/Asia/Kamchatka
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/Asia/Karachi
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/Asia/Kashgar
+${ZOPE_BASE}/lib/python/pytz/zoneinfo/Asia/Kathmandu
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/Asia/Katmandu
+${ZOPE_BASE}/lib/python/pytz/zoneinfo/Asia/Kolkata
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/Asia/Krasnoyarsk
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/Asia/Kuala_Lumpur
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/Asia/Kuching
@@ -4025,6 +4067,7 @@ ${ZOPE_BASE}/lib/python/pytz/zoneinfo/Asia/Makassar
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/Asia/Manila
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/Asia/Muscat
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/Asia/Nicosia
+${ZOPE_BASE}/lib/python/pytz/zoneinfo/Asia/Novokuznetsk
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/Asia/Novosibirsk
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/Asia/Omsk
 ${ZOPE_BASE}/lib/python/pytz/zoneinfo/Asia/Oral
@@ -4515,7 +4558,6 @@ ${ZOPE_BASE}/lib/python/zope/annotation/tests/annotations.py
 ${ZOPE_BASE}/lib/python/zope/annotation/tests/annotations.pyc
 ${ZOPE_BASE}/lib/python/zope/annotation/tests/test_attributeannotations.py
 ${ZOPE_BASE}/lib/python/zope/annotation/tests/test_attributeannotations.pyc
-${ZOPE_BASE}/lib/python/zope/app/EXTERNALS.txt
 ${ZOPE_BASE}/lib/python/zope/app/__init__.py
 ${ZOPE_BASE}/lib/python/zope/app/__init__.pyc
 ${ZOPE_BASE}/lib/python/zope/app/annotation/__init__.py
@@ -4767,6 +4809,8 @@ ${ZOPE_BASE}/lib/python/zope/app/applicationcontrol/browser/tests/test_runtimein
 ${ZOPE_BASE}/lib/python/zope/app/applicationcontrol/browser/tests/test_runtimeinfoview.pyc
 ${ZOPE_BASE}/lib/python/zope/app/applicationcontrol/browser/tests/test_servercontrolview.py
 ${ZOPE_BASE}/lib/python/zope/app/applicationcontrol/browser/tests/test_servercontrolview.pyc
+${ZOPE_BASE}/lib/python/zope/app/applicationcontrol/browser/tests/test_translationdomaincontrol.py
+${ZOPE_BASE}/lib/python/zope/app/applicationcontrol/browser/tests/test_translationdomaincontrol.pyc
 ${ZOPE_BASE}/lib/python/zope/app/applicationcontrol/browser/translationdomaincontrol.pt
 ${ZOPE_BASE}/lib/python/zope/app/applicationcontrol/browser/translationdomaincontrol.py
 ${ZOPE_BASE}/lib/python/zope/app/applicationcontrol/browser/translationdomaincontrol.pyc
@@ -5522,6 +5566,8 @@ ${ZOPE_BASE}/lib/python/zope/app/http/tests/test_delete.py
 ${ZOPE_BASE}/lib/python/zope/app/http/tests/test_delete.pyc
 ${ZOPE_BASE}/lib/python/zope/app/http/tests/test_functional_put.py
 ${ZOPE_BASE}/lib/python/zope/app/http/tests/test_functional_put.pyc
+${ZOPE_BASE}/lib/python/zope/app/http/tests/test_options.py
+${ZOPE_BASE}/lib/python/zope/app/http/tests/test_options.pyc
 ${ZOPE_BASE}/lib/python/zope/app/http/tests/test_put.py
 ${ZOPE_BASE}/lib/python/zope/app/http/tests/test_put.pyc
 ${ZOPE_BASE}/lib/python/zope/app/http/tests/test_traversers.py
@@ -5652,6 +5698,8 @@ ${ZOPE_BASE}/lib/python/zope/app/locales/it/LC_MESSAGES/zope.mo
 ${ZOPE_BASE}/lib/python/zope/app/locales/it/LC_MESSAGES/zope.po
 ${ZOPE_BASE}/lib/python/zope/app/locales/ja/LC_MESSAGES/zope.mo
 ${ZOPE_BASE}/lib/python/zope/app/locales/ja/LC_MESSAGES/zope.po
+${ZOPE_BASE}/lib/python/zope/app/locales/nl/LC_MESSAGES/zope.mo
+${ZOPE_BASE}/lib/python/zope/app/locales/nl/LC_MESSAGES/zope.po
 ${ZOPE_BASE}/lib/python/zope/app/locales/pl/LC_MESSAGES/zope.mo
 ${ZOPE_BASE}/lib/python/zope/app/locales/pl/LC_MESSAGES/zope.po
 ${ZOPE_BASE}/lib/python/zope/app/locales/pt_BR/LC_MESSAGES/zope.mo
@@ -6872,11 +6920,11 @@ ${ZOPE_BASE}/lib/python/zope/documenttemplate/untrusted/untrusted.py
 ${ZOPE_BASE}/lib/python/zope/documenttemplate/untrusted/untrusted.pyc
 ${ZOPE_BASE}/lib/python/zope/documenttemplate/ustr.py
 ${ZOPE_BASE}/lib/python/zope/documenttemplate/ustr.pyc
+${ZOPE_BASE}/lib/python/zope/dottedname/README.txt
 ${ZOPE_BASE}/lib/python/zope/dottedname/__init__.py
 ${ZOPE_BASE}/lib/python/zope/dottedname/__init__.pyc
 ${ZOPE_BASE}/lib/python/zope/dottedname/resolve.py
 ${ZOPE_BASE}/lib/python/zope/dottedname/resolve.pyc
-${ZOPE_BASE}/lib/python/zope/dottedname/resolve.txt
 ${ZOPE_BASE}/lib/python/zope/dottedname/tests.py
 ${ZOPE_BASE}/lib/python/zope/dottedname/tests.pyc
 ${ZOPE_BASE}/lib/python/zope/dublincore/__init__.py
@@ -8491,17 +8539,19 @@ ${ZOPE_BASE}/lib/python/zope/testbrowser/__init__.py
 ${ZOPE_BASE}/lib/python/zope/testbrowser/__init__.pyc
 ${ZOPE_BASE}/lib/python/zope/testbrowser/browser.py
 ${ZOPE_BASE}/lib/python/zope/testbrowser/browser.pyc
-${ZOPE_BASE}/lib/python/zope/testbrowser/dummymodules.py
-${ZOPE_BASE}/lib/python/zope/testbrowser/dummymodules.pyc
+${ZOPE_BASE}/lib/python/zope/testbrowser/fixed-bugs.txt
 ${ZOPE_BASE}/lib/python/zope/testbrowser/ftests/__init__.py
 ${ZOPE_BASE}/lib/python/zope/testbrowser/ftests/__init__.pyc
 ${ZOPE_BASE}/lib/python/zope/testbrowser/ftests/controls.html
 ${ZOPE_BASE}/lib/python/zope/testbrowser/ftests/forms.html
+${ZOPE_BASE}/lib/python/zope/testbrowser/ftests/fragment.html
 ${ZOPE_BASE}/lib/python/zope/testbrowser/ftests/ftesting.zcml
 ${ZOPE_BASE}/lib/python/zope/testbrowser/ftests/navigate.html
 ${ZOPE_BASE}/lib/python/zope/testbrowser/ftests/notitle.html
 ${ZOPE_BASE}/lib/python/zope/testbrowser/ftests/oneform.html
+${ZOPE_BASE}/lib/python/zope/testbrowser/ftests/radio.html
 ${ZOPE_BASE}/lib/python/zope/testbrowser/ftests/simple.html
+${ZOPE_BASE}/lib/python/zope/testbrowser/ftests/textarea.html
 ${ZOPE_BASE}/lib/python/zope/testbrowser/ftests/zope3logo.gif
 ${ZOPE_BASE}/lib/python/zope/testbrowser/interfaces.py
 ${ZOPE_BASE}/lib/python/zope/testbrowser/interfaces.pyc
@@ -8516,6 +8566,7 @@ ${ZOPE_BASE}/lib/python/zope/testing/cleanup.py
 ${ZOPE_BASE}/lib/python/zope/testing/cleanup.pyc
 ${ZOPE_BASE}/lib/python/zope/testing/doctest.py
 ${ZOPE_BASE}/lib/python/zope/testing/doctest.pyc
+${ZOPE_BASE}/lib/python/zope/testing/doctest.txt
 ${ZOPE_BASE}/lib/python/zope/testing/doctestunit.py
 ${ZOPE_BASE}/lib/python/zope/testing/doctestunit.pyc
 ${ZOPE_BASE}/lib/python/zope/testing/formparser.py
@@ -8560,6 +8611,10 @@ ${ZOPE_BASE}/lib/python/zope/testing/testrunner-ex-pp-products/more/sampletests.
 ${ZOPE_BASE}/lib/python/zope/testing/testrunner-ex-pp-products/more/sampletests.pyc
 ${ZOPE_BASE}/lib/python/zope/testing/testrunner-ex-pp-products/sampletests.py
 ${ZOPE_BASE}/lib/python/zope/testing/testrunner-ex-pp-products/sampletests.pyc
+${ZOPE_BASE}/lib/python/zope/testing/testrunner-ex-r/innertests.py
+${ZOPE_BASE}/lib/python/zope/testing/testrunner-ex-r/innertests.pyc
+${ZOPE_BASE}/lib/python/zope/testing/testrunner-ex-r/outertests.py
+${ZOPE_BASE}/lib/python/zope/testing/testrunner-ex-r/outertests.pyc
 ${ZOPE_BASE}/lib/python/zope/testing/testrunner-ex/README.txt
 ${ZOPE_BASE}/lib/python/zope/testing/testrunner-ex/gc0.py
 ${ZOPE_BASE}/lib/python/zope/testing/testrunner-ex/gc0.pyc
@@ -8712,9 +8767,11 @@ ${ZOPE_BASE}/lib/python/zope/testing/testrunner-layers-ntd.txt
 ${ZOPE_BASE}/lib/python/zope/testing/testrunner-layers.txt
 ${ZOPE_BASE}/lib/python/zope/testing/testrunner-leaks-err.txt
 ${ZOPE_BASE}/lib/python/zope/testing/testrunner-leaks.txt
+${ZOPE_BASE}/lib/python/zope/testing/testrunner-package-normalization.txt
 ${ZOPE_BASE}/lib/python/zope/testing/testrunner-profiling-cprofiler.txt
 ${ZOPE_BASE}/lib/python/zope/testing/testrunner-profiling.txt
 ${ZOPE_BASE}/lib/python/zope/testing/testrunner-progress.txt
+${ZOPE_BASE}/lib/python/zope/testing/testrunner-reentrancy.txt
 ${ZOPE_BASE}/lib/python/zope/testing/testrunner-repeat.txt
 ${ZOPE_BASE}/lib/python/zope/testing/testrunner-simple.txt
 ${ZOPE_BASE}/lib/python/zope/testing/testrunner-test-selection.txt
diff --git a/www/zope211/distinfo b/www/zope211/distinfo
index ebcb34b9cf2..0eb7bcb92c0 100644
--- a/www/zope211/distinfo
+++ b/www/zope211/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2008/10/25 16:21:30 taca Exp $
+$NetBSD: distinfo,v 1.5 2011/05/14 02:58:09 taca Exp $
 
-SHA1 (Zope-2.11.2-final.tgz) = 68967f1428a59299d5a81f07c3019338dd4cf6e2
-RMD160 (Zope-2.11.2-final.tgz) = 8bd8fdf7d7ae079c3fac91c4f7549c1286339ec4
-Size (Zope-2.11.2-final.tgz) = 7161224 bytes
+SHA1 (Zope-2.11.8-final.tgz) = 0d06b6c4842f00db7c4b900f9f3860e911276a46
+RMD160 (Zope-2.11.8-final.tgz) = 64cedf8576296fa1722af9bd17df5e074a8b2fce
+Size (Zope-2.11.8-final.tgz) = 7335479 bytes
 SHA1 (patch-aa) = 85124be8493036eb8b835c5050cac98d8e808aff
 SHA1 (patch-ab) = fb9da4fcf47fa1ec0119ff94f9e3124135016d2d
 SHA1 (patch-ac) = 62f2bcbaeb6bd064cbcbea2e2fa0d36a2c8bbf48
@@ -11,4 +11,5 @@ SHA1 (patch-ae) = 427deb06bbed0f0b23efa14ce1ad5f820d2f3d0f
 SHA1 (patch-af) = 3b352c8bd6cc8f7360025d3d27267a0319cd6b17
 SHA1 (patch-ag) = dffc88b9d087e01bf853441c4a9064a9184a310f
 SHA1 (patch-ah) = 360c8f69e1f23a9f0dec666d509e03e4ef55d93b
-SHA1 (patch-ai) = d7987483068b677aeab5ceb59dd8261e204065d7
+SHA1 (patch-ai) = 1b08b88cbd9e8950c1c24a85ddceff273a175892
+SHA1 (patch-lib_python_mechanize___firefox3cookiejar.py) = 21e5350bf364b6df919251c08dfc66a72c356ac6
diff --git a/www/zope211/patches/patch-ai b/www/zope211/patches/patch-ai
index 4ee05df35ce..5be4093d670 100644
--- a/www/zope211/patches/patch-ai
+++ b/www/zope211/patches/patch-ai
@@ -1,9 +1,9 @@
-$NetBSD: patch-ai,v 1.1.1.1 2008/06/21 10:39:31 taca Exp $
+$NetBSD: patch-ai,v 1.2 2011/05/14 02:58:09 taca Exp $
 
---- utilities/reindex_catalog.py.orig	2007-10-29 22:09:41.000000000 +0900
+--- utilities/reindex_catalog.py.orig	2011-02-04 21:44:27.000000000 +0000
 +++ utilities/reindex_catalog.py
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python2.4
  ##############################################################################
  #
- # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+ # Copyright (c) 2002 Zope Foundation and Contributors.
diff --git a/www/zope211/patches/patch-lib_python_mechanize___firefox3cookiejar.py b/www/zope211/patches/patch-lib_python_mechanize___firefox3cookiejar.py
new file mode 100644
index 00000000000..a05da5680c7
--- /dev/null
+++ b/www/zope211/patches/patch-lib_python_mechanize___firefox3cookiejar.py
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_python_mechanize___firefox3cookiejar.py,v 1.1 2011/05/14 02:58:09 taca Exp $
+
+--- lib/python/mechanize/_firefox3cookiejar.py.orig	2011-02-04 21:45:35.000000000 +0000
++++ lib/python/mechanize/_firefox3cookiejar.py
+@@ -89,8 +89,9 @@ class Firefox3CookieJar(CookieJar):
+             cur.execute(query, params)
+             for row in cur.fetchall():
+                 yield row
+-        finally:
++        except:
+             cur.close()
++            raise
+ 
+     def _create_table_if_necessary(self):
+         self._execute("""\
author	taca <taca>	2011-05-14 02:58:08 +0000
committer	taca <taca>	2011-05-14 02:58:08 +0000
commit	3ba99948a4ebb911bbd2871b5bd5447a46c271a5 (patch)
tree	2ee339058d96ff98fffd3e15c88969a75f15c2e1 /www
parent	160bf6a55a707f61b3a1428b8742d708eabf75ad (diff)
download	pkgsrc-3ba99948a4ebb911bbd2871b5bd5447a46c271a5.tar.gz