Importing Zope 2.10.5 as zope210 with new framework.

Zope is an exciting new object-based, open source web application
platform. It allows you to build powerful and dynamic web applications
easily. Zope comes with source code and is friendly to developers as
well as users.

Zope 2.10.x is needed to run Plone 3.

9 files changed, 204 insertions, 0 deletions

diff --git a/www/zope210/patches/patch-aa b/www/zope210/patches/patch-aa
new file mode 100644
index 00000000000..0bdbda832fe
--- /dev/null
+++ b/www/zope210/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1.1.1 2007/12/18 15:35:28 taca Exp $
+
+--- lib/python/Products/SiteAccess/tests/testVirtualHostMonster.py.orig	2007-03-25 18:46:14.000000000 +0900
++++ lib/python/Products/SiteAccess/tests/testVirtualHostMonster.py
+@@ -12,6 +12,7 @@
+ 
+ from Testing.makerequest import makerequest
+ 
++from __future__ import generators
+ import Zope2
+ Zope2.startup()
+ 
diff --git a/www/zope210/patches/patch-ab b/www/zope210/patches/patch-ab
new file mode 100644
index 00000000000..9f366d5bfe3
--- /dev/null
+++ b/www/zope210/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1.1.1 2007/12/18 15:35:28 taca Exp $
+
+--- lib/python/RestrictedPython/tests/verify.py.orig	2007-03-25 18:46:21.000000000 +0900
++++ lib/python/RestrictedPython/tests/verify.py
+@@ -21,6 +21,7 @@ all attribute access is performed via th
+ function.
+ """
+ 
++from __future__ import generators
+ import dis
+ import types
+ 
diff --git a/www/zope210/patches/patch-ac b/www/zope210/patches/patch-ac
new file mode 100644
index 00000000000..e399d7b3166
--- /dev/null
+++ b/www/zope210/patches/patch-ac
@@ -0,0 +1,73 @@
+$NetBSD: patch-ac,v 1.1.1.1 2007/12/18 15:35:28 taca Exp $
+
+--- lib/python/zope/structuredtext/document.py.orig	2007-03-25 18:51:59.000000000 +0900
++++ lib/python/zope/structuredtext/document.py
+@@ -556,7 +556,7 @@ class Document:
+ 
+     def doc_literal(
+         self, s,
+-        expr = re.compile(r"(\W+|^)'([%s%s%s\s]+)'([%s]+|$)" % (letters, digits, literal_punc, phrase_delimiters)).search,):
++        expr = re.compile(r"(\W+|^)'((?:\w|[%s%s\s])+)'([%s]+|$)" % (digits, literal_punc, phrase_delimiters), re.U).search,):
+         r = expr(s)
+         if r:
+             start, end = r.span(2)
+@@ -564,7 +564,8 @@ class Document:
+ 
+     def doc_emphasize(
+         self, s,
+-        expr = re.compile(r'\*([%s%s%s\s]+?)\*' % (letters, digits, strongem_punc)).search
++        # i18nal variant
++        expr = re.compile(r'\*((?:\w|[%s\s])+?)\*' % (strongem_punc), re.U).search
+         ):
+ 
+         r=expr(s)
+@@ -605,7 +606,7 @@ class Document:
+ 
+     def doc_underline(self,
+                       s,
+-                      expr=re.compile(r'_([%s%s%s\s]+)_([\s%s]|$)' % (letters, digits, under_punc,phrase_delimiters)).search):
++                      expr=re.compile(r'_((?:\w|[%s\s])+)_([\s%s]|$)' % (under_punc,phrase_delimiters), re.U).search):
+ 
+         result = expr(s)
+         if result:
+@@ -617,7 +618,7 @@ class Document:
+ 
+     def doc_strong(self,
+                    s,
+-                   expr = re.compile(r'\*\*([%s%s%s\s]+?)\*\*' % (letters, digits, strongem_punc)).search
++                   expr = re.compile(r'\*\*((?:\w|[%s%s\s])+?)\*\*' % (digits, strongem_punc), re.U).search
+                    #expr = re.compile(r'\s*\*\*([ \n\r%s0-9.:/;,\'\"\?\-\_\/\=\-\>\<\(\)]+)\*\*(?!\*|-)' % letters).search, # old expr, inconsistent punc, failed to cross newlines.
+         ):
+ 
+@@ -627,19 +628,19 @@ class Document:
+             return (stng.StructuredTextStrong(s[start:end]), start-2, end+2)
+ 
+     ## Some constants to make the doc_href() regex easier to read.
+-    _DQUOTEDTEXT = r'("[ %s0-9\n\r%s]+")' % (letters,dbl_quoted_punc) ## double quoted text
++    _DQUOTEDTEXT = r'("[^"]+")'  ## double quoted text
+     _ABSOLUTE_URL=r'((http|https|ftp|mailto|file|about)[:/]+?[%s0-9_\@\.\,\?\!\/\:\;\-\#\~\=\&\%%\+]+)' % letters
+     _ABS_AND_RELATIVE_URL=r'([%s0-9_\@\.\,\?\!\/\:\;\-\#\~\=\&\%%\+]+)' % letters
+ 
+     _SPACES = r'(\s*)'
+ 
+     def doc_href1(self, s,
+-                  expr=re.compile(_DQUOTEDTEXT + "(:)" + _ABS_AND_RELATIVE_URL + _SPACES).search
++                  expr=re.compile(_DQUOTEDTEXT + "(:)" + _ABS_AND_RELATIVE_URL + _SPACES, re.U).search
+                    ):
+         return self.doc_href(s, expr)
+ 
+     def doc_href2(self, s,
+-                  expr=re.compile(_DQUOTEDTEXT + r'(\,\s+)' + _ABSOLUTE_URL + _SPACES).search
++                  expr=re.compile(_DQUOTEDTEXT + r'(\,\s+)' + _ABSOLUTE_URL + _SPACES, re.U).search
+                   ):
+         return self.doc_href(s, expr)
+ 
+@@ -693,7 +694,7 @@ class DocumentWithImages(Document):
+ 
+     def doc_img(
+         self, s,
+-        expr1=re.compile('\"([ _a-zA-Z0-9*.:/;,\[\]\'\-\n\~]+)\":img:([a-zA-Z0-9%\_\-.:/\?=;,\n\~]+)').search,
++        expr1=re.compile('\"((?:\w|[ *.:/;,\-\n\~])+)\":img:([a-zA-Z0-9\_\-.:/;,\n\~]+)', re.U).search,
+         ):
+ 
+         r=expr1(s)
diff --git a/www/zope210/patches/patch-ad b/www/zope210/patches/patch-ad
new file mode 100644
index 00000000000..e38b2183fce
--- /dev/null
+++ b/www/zope210/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1.1.1 2007/12/18 15:35:28 taca Exp $
+
+--- lib/python/zope/structuredtext/stletters.py.orig	2007-03-25 18:51:59.000000000 +0900
++++ lib/python/zope/structuredtext/stletters.py
+@@ -24,7 +24,7 @@ def punc_func(exclude):
+     return punc
+ 
+ digits = string.digits
+-letters = string.letters
++letters = string.letters + '\200-\377\?\!'
+ literal_punc = punc_func("'")
+ dbl_quoted_punc = punc_func("\"")
+ strongem_punc = punc_func('*')
diff --git a/www/zope210/patches/patch-ae b/www/zope210/patches/patch-ae
new file mode 100644
index 00000000000..e01ca9c50fc
--- /dev/null
+++ b/www/zope210/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1.1.1 2007/12/18 15:35:28 taca Exp $
+
+--- lib/python/zope/structuredtext/stng.py.orig	2007-03-25 18:51:59.000000000 +0900
++++ lib/python/zope/structuredtext/stng.py
+@@ -105,6 +105,9 @@ def structurize(paragraphs, delimiter=re
+     [paragraph,[sub-paragraphs]]
+     """
+ 
++    if type(paragraphs) == type(''):
++        paragraphs = unicode(paragraphs, 'utf-8')
++
+     currentlevel   = 0
+     currentindent  = 0
+     levels         = {0:0}
diff --git a/www/zope210/patches/patch-af b/www/zope210/patches/patch-af
new file mode 100644
index 00000000000..ce453c506ca
--- /dev/null
+++ b/www/zope210/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1.1.1 2007/12/18 15:35:28 taca Exp $
+
+--- setup.py.orig	2007-03-25 18:46:27.000000000 +0900
++++ setup.py
+@@ -493,7 +493,6 @@ def skel_visit(skel, dirname, names):
+     skel.append(("../../" + dirname, L))
+ 
+ installed_data_files = [
+-    ["../../doc", ['doc/*.txt']],
+     ["../../bin", ['utilities/README.txt']],
+     ]
+ 
diff --git a/www/zope210/patches/patch-ag b/www/zope210/patches/patch-ag
new file mode 100644
index 00000000000..11baa6178cb
--- /dev/null
+++ b/www/zope210/patches/patch-ag
@@ -0,0 +1,21 @@
+$NetBSD: patch-ag,v 1.1.1.1 2007/12/18 15:35:28 taca Exp $
+
+--- skel/etc/zope.conf.in.orig	2007-03-25 18:46:27.000000000 +0900
++++ skel/etc/zope.conf.in
+@@ -90,6 +90,8 @@ instancehome $INSTANCE
+ # Example:
+ #
+ #    products /home/chrism/projects/myproducts
++products @ZOPE_PRODUCTS_DIR@
++products $INSTANCE/Products
+ 
+ 
+ # Directive: environment
+@@ -147,6 +149,7 @@ instancehome $INSTANCE
+ # Example:
+ #
+ #    effective-user chrism
++effective-user zope
+ 
+ 
+ # Directive: enable-product-installation
diff --git a/www/zope210/patches/patch-ah b/www/zope210/patches/patch-ah
new file mode 100644
index 00000000000..4a40cc02995
--- /dev/null
+++ b/www/zope210/patches/patch-ah
@@ -0,0 +1,38 @@
+$NetBSD: patch-ah,v 1.1.1.1 2007/12/18 15:35:28 taca Exp $
+
+# set owner/group for Zone instance's some directories.
+
+--- utilities/mkzopeinstance.py.orig	2007-10-29 22:09:41.000000000 +0900
++++ utilities/mkzopeinstance.py
+@@ -32,8 +32,14 @@ import os
+ import shutil
+ import sys
+ import copyzopeskel
++import pwd
++import grp
+ 
+ def main():
++    dirs = ['log', 'var']
++    user = '@ZOPE_USER@'
++    group = '@ZOPE_GROUP@'
++
+     try:
+         opts, args = getopt.getopt(sys.argv[1:],
+             "hu:d:s:",
+@@ -124,6 +130,16 @@ def main():
+     copyzopeskel.copyskel(skelsrc, skeltarget, None, None, **kw)
+     if user and password:
+         write_inituser(inituser, user, password)
++    try:
++        u = pwd.getpwnam(user)
++        g = grp.getgrnam(group)
++
++        for d in dirs:
++            p = os.path.join(instancehome, d)
++            os.chown(p, u.pw_uid, g.gr_gid)
++    except:
++        sys.exit(1)
++
+ 
+ def usage(stream, msg=None):
+     if msg:
diff --git a/www/zope210/patches/patch-ai b/www/zope210/patches/patch-ai
new file mode 100644
index 00000000000..421a1f7833b
--- /dev/null
+++ b/www/zope210/patches/patch-ai
@@ -0,0 +1,9 @@
+$NetBSD: patch-ai,v 1.1.1.1 2007/12/18 15:35:28 taca Exp $
+
+--- utilities/reindex_catalog.py.orig	2007-10-29 22:09:41.000000000 +0900
++++ utilities/reindex_catalog.py
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python2.4
+ ##############################################################################
+ #
+ # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.