Update zope210 package to 2.10.7.

Zope 2.10.7 (2008/10/24)
Bugs fixed

    * Ensure that response header values cannot embed CRLF pairs,
      which violate the HTTP spec (RFC 2616).
    * Launchpad #282677: fixed implementation of guarded_map and
      provided tests and implementation for guarded_zip
      (RestrictedPython).
    * Lauchpad #143736,#271395: fixed AttributeError' on _ltid in TempStorage
    * AccessControl.ZopeGuards.guarded_import mapped some Unauthorized
      exceptions onto ImportErrors: don't do that! Also, removed
      mutable defaults from argument list, improved tests.
    * LP #281156: AccessControl.SecurityInfo.secureModule dropped
      ModuleSecurity for failed imports, obscuring later attempts to
      import the same broken module.
    * LP #142667: Updated to ZODB-3.7.3 to fix problem with product
      auto-refresh.
    * Updated to Five 1.5.8
    * Launchpad #245649: the Products package is now a proper
      "namespace package" under the rules specified by setuptools.
    * Fixed outdated transaction.commit(1) call in
      ZODBMountPoint.SimpleTrailblazer
    * Launchpad #239636: Ensure that HEAD requests lock an empty body
      for NotFound errors.
    * Launchpad #229549: Don't ignore debug flag when rendering page
      templates (thanks to Eric Steele for the patch).
    * integrated Hotfix-2008-08-12
    * Launchpad #267545: DateTime(DateTime()) now preserves the correct hour
    * Launchpad #262313: respect the Expand macros when editing flag
      when editing a page template through the ZMI

5 files changed, 8 insertions, 137 deletions

diff --git a/www/zope210/Makefile b/www/zope210/Makefile
index b65322f59fd..81157383f15 100644
--- a/www/zope210/Makefile
+++ b/www/zope210/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2008/08/17 15:12:57 taca Exp $
+# $NetBSD: Makefile,v 1.8 2008/10/25 16:19:33 taca Exp $
 # FreeBSD Id: ports/www/zope29/Makefile,v 1.86 2006/08/03 15:53:04 garga Exp
 
 DISTNAME=	Zope-${ZOPE210_VERSION}-final
 PKGNAME=	${ZOPE_PKG_PREFIX}-${ZOPE210_VERSION}
-PKGREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	http://www.zope.org/Products/Zope/${ZOPE210_VERSION}/
 EXTRACT_SUFX=	.tgz
diff --git a/www/zope210/PLIST b/www/zope210/PLIST
index 3b36c837cf3..e3aea7c19a8 100644
--- a/www/zope210/PLIST
+++ b/www/zope210/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2008/01/06 15:59:26 taca Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/10/25 16:19:33 taca Exp $
 ${ZOPE_DOC_BASE}/zeo/README.txt
 ${ZOPE_DOC_BASE}/zeo/ZopeREADME.txt
 ${ZOPE_DOC_BASE}/zeo/cache.txt
@@ -1712,6 +1712,8 @@ ${ZOPE_BASE}/lib/python/Products/PythonScripts/help/standard.py
 ${ZOPE_BASE}/lib/python/Products/PythonScripts/help/standard.pyc
 ${ZOPE_BASE}/lib/python/Products/PythonScripts/module_access_examples.py
 ${ZOPE_BASE}/lib/python/Products/PythonScripts/module_access_examples.pyc
+${ZOPE_BASE}/lib/python/Products/PythonScripts/patches.py
+${ZOPE_BASE}/lib/python/Products/PythonScripts/patches.pyc
 ${ZOPE_BASE}/lib/python/Products/PythonScripts/standard.py
 ${ZOPE_BASE}/lib/python/Products/PythonScripts/standard.pyc
 ${ZOPE_BASE}/lib/python/Products/PythonScripts/tests/__init__.py
diff --git a/www/zope210/distinfo b/www/zope210/distinfo
index f1ed45625c5..c0c674c4d19 100644
--- a/www/zope210/distinfo
+++ b/www/zope210/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2008/08/17 15:12:57 taca Exp $
+$NetBSD: distinfo,v 1.4 2008/10/25 16:19:33 taca Exp $
 
-SHA1 (Zope-2.10.6-final.tgz) = d0689fd3a0eac8fbb0f44a81c3c1427660f4c76d
-RMD160 (Zope-2.10.6-final.tgz) = f0f62d8e4e23041c3fc77179310561678a4458cc
-Size (Zope-2.10.6-final.tgz) = 7277894 bytes
+SHA1 (Zope-2.10.7-final.tgz) = 94bb8c2ff13345fc16052c4f6b3ef585f3f90f9e
+RMD160 (Zope-2.10.7-final.tgz) = 5a9123ab70d9fac6101bdfcdc2141dd10b4d7c41
+Size (Zope-2.10.7-final.tgz) = 7269082 bytes
 SHA1 (patch-aa) = 85124be8493036eb8b835c5050cac98d8e808aff
 SHA1 (patch-ab) = fb9da4fcf47fa1ec0119ff94f9e3124135016d2d
 SHA1 (patch-ac) = 62f2bcbaeb6bd064cbcbea2e2fa0d36a2c8bbf48
@@ -12,5 +12,3 @@ SHA1 (patch-af) = 3b352c8bd6cc8f7360025d3d27267a0319cd6b17
 SHA1 (patch-ag) = dffc88b9d087e01bf853441c4a9064a9184a310f
 SHA1 (patch-ah) = 360c8f69e1f23a9f0dec666d509e03e4ef55d93b
 SHA1 (patch-ai) = d7987483068b677aeab5ceb59dd8261e204065d7
-SHA1 (patch-aj) = afebb47b9c65af23c6d158b04608239731f1b7b3
-SHA1 (patch-ak) = 95633060bc99be604b75ac49e37e6483168bc362
diff --git a/www/zope210/patches/patch-aj b/www/zope210/patches/patch-aj
deleted file mode 100644
index 499c6622a64..00000000000
--- a/www/zope210/patches/patch-aj
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2008/08/17 15:12:57 taca Exp $
-
-Patch #1 corresponding to security advisory 2008-08-12.
-
---- lib/python/Products/PythonScripts/PythonScript.py.orig	2008-05-10 15:33:18.000000000 +0900
-+++ lib/python/Products/PythonScripts/PythonScript.py
-@@ -324,7 +324,11 @@ class PythonScript(Script, Historical, C
-         g['__file__'] = getattr(self, '_filepath', None) or self.get_filepath()
-         f = new.function(fcode, g, None, fadefs)
- 
--        result = f(*args, **kw)
-+        try:
-+            result = f(*args, **kw)
-+        except SystemExit:
-+            raise ValueError('SystemExit cannot be raised within a PythonScript')
-+
-         if keyset is not None:
-             # Store the result in the cache.
-             self.ZCacheable_set(result, keywords=keyset)
diff --git a/www/zope210/patches/patch-ak b/www/zope210/patches/patch-ak
deleted file mode 100644
index 6446e606243..00000000000
--- a/www/zope210/patches/patch-ak
+++ /dev/null
@@ -1,109 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2008/08/17 15:12:57 taca Exp $
-
-Patch #2 corresponding to security advisory 2008-08-12.
-
---- lib/python/Products/PythonScripts/__init__.py.orig	2008-05-10 15:35:03.000000000 +0900
-+++ lib/python/Products/PythonScripts/__init__.py
-@@ -61,3 +61,102 @@ def recompile(self):
-     if names:
-         return 'The following Scripts were recompiled:\n' + '\n'.join(names)
-     return 'No Scripts were found that required recompilation.'
-+
-+
-+# Monkey patch for LP #257276
-+
-+# This code is taken from the encodings module of Python 2.4.
-+# Note that this code is originally (C) CNRI and it is possibly not compatible
-+# with the ZPL and therefore should not live within svn.zope.org. However this
-+# checkin is blessed by Jim Fulton for now. The fix is no longer required with
-+# Python 2.5 and hopefully fixed in Python 2.4.6 release.
-+
-+
-+# Written by Marc-Andre Lemburg (mal@lemburg.com).
-+# (c) Copyright CNRI, All Rights Reserved. NO WARRANTY.
-+
-+def search_function(encoding):
-+
-+    # Cache lookup
-+    entry = _cache.get(encoding, _unknown)
-+    if entry is not _unknown:
-+        return entry
-+
-+    # Import the module:
-+    #
-+    # First try to find an alias for the normalized encoding
-+    # name and lookup the module using the aliased name, then try to
-+    # lookup the module using the standard import scheme, i.e. first
-+    # try in the encodings package, then at top-level.
-+    #
-+    norm_encoding = normalize_encoding(encoding)
-+    aliased_encoding = _aliases.get(norm_encoding) or \
-+                       _aliases.get(norm_encoding.replace('.', '_'))
-+    if aliased_encoding is not None:
-+        modnames = [aliased_encoding,
-+                    norm_encoding]
-+    else:
-+        modnames = [norm_encoding]
-+    for modname in modnames:
-+
-+        if not modname or '.' in modname:
-+            continue
-+
-+        try:
-+            mod = __import__(modname,
-+                             globals(), locals(), _import_tail)
-+            if not mod.__name__.startswith('encodings.'):
-+                continue
-+
-+        except ImportError:
-+            pass
-+        else:
-+            break
-+    else:
-+        mod = None
-+
-+    try:
-+        getregentry = mod.getregentry
-+    except AttributeError:
-+        # Not a codec module
-+        mod = None
-+
-+    if mod is None:
-+        # Cache misses
-+        _cache[encoding] = None
-+        return None
-+
-+    # Now ask the module for the registry entry
-+    entry = tuple(getregentry())
-+    if len(entry) != 4:
-+        raise CodecRegistryError,\
-+              'module "%s" (%s) failed to register' % \
-+              (mod.__name__, mod.__file__)
-+    for obj in entry:
-+        if not callable(obj):
-+            raise CodecRegistryError,\
-+                  'incompatible codecs in module "%s" (%s)' % \
-+                  (mod.__name__, mod.__file__)
-+
-+    # Cache the codec registry entry
-+    _cache[encoding] = entry
-+
-+    # Register its aliases (without overwriting previously registered
-+    # aliases)
-+    try:
-+        codecaliases = mod.getaliases()
-+    except AttributeError:
-+        pass
-+    else:
-+        for alias in codecaliases:
-+            if not _aliases.has_key(alias):
-+                _aliases[alias] = modname
-+
-+    # Return the registry entry
-+    return entry
-+
-+
-+# MONKEY
-+
-+import encodings
-+encodings.search_function.func_code = search_function.func_code