Upgrade to 2.5.0 plus the security fix.

PR:		ports/34430
Submitted by:	HAYASHI Yasushi <yasi@yasi.to>

4 files changed, 575 insertions, 145 deletions

diff --git a/www/zope/Makefile b/www/zope/Makefile
index 8aeabc4..628f4de 100644
--- a/www/zope/Makefile
+++ b/www/zope/Makefile
@@ -6,21 +6,29 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.4.2
+PORTVERSION=	2.5.0
 PORTREVISION=	0
 CATEGORIES=	www python zope
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
-DISTFILES=	${DISTNAME}.tgz
+EXTRACT_SUFX=	.tgz
+
+PATCHFILES=	Zope-2.5.0-unix-security.patch
+PATCH_DIST_STRIP=	-p1
+PATCH_SITES=	http://www.zope.org/Members/zigg/UnixSecurityPatch/
 
 MAINTAINER=	nbm@FreeBSD.org
 
 USE_PYTHON=	yes
+PYTHON_VERSION=	python2.1
 
 #RUN_DEPENDS=	${LOCALBASE}/sbin/apache:${PORTSDIR}/www/apache13-modssl
 
 DIST_SUBDIR=	zope
 
+post-patch:
+	@${FIND} ${WRKSRC} -name \*.orig -exec ${RM} {} \;
+
 # Build has to be done in the final location after installing the sources
 # there. It was a major action to fix all paths otherwise.
 do-build:	# empty, but needs to be there for the python dependency.
@@ -30,13 +38,11 @@ WEBBASEDIR?=		www
 SZOPEBASEDIR?=		${WEBBASEDIR}/Zope
 SCGIBINDIR?=		${WEBBASEDIR}/cgi-bin.default
 SAPACHE_CONFDIR?=	etc/apache
+ZOPE_HTTP_PORT?=	8080
+ZOPE_FTP_PORT?=		8021
+ZOPE_MONITOR_PORT?=	''
 
-WHOAMI!=	id -un
-.if ${WHOAMI} == "root"
-NOBODY_USER?=	nobody
-.else
-NOBODY_USER?=	${WHOAMI}
-.endif
+ZOPE_USER=	www
 
 # Don't change these.
 ZOPEBASEDIR=	${PREFIX}/${SZOPEBASEDIR}
@@ -49,6 +55,9 @@ PLIST_SUB=	ZOPEBASEDIR=${SZOPEBASEDIR} \
 		VERSION=${PORTVERSION} \
 		WEBBASEDIR=${WEBBASEDIR}
 
+pre-install:
+	PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
+
 # I decided to consider the whole souce tree to be part of the package
 # since in there, Zope can live on its own. I can use Zope's own building
 # mechanism.
@@ -86,8 +95,8 @@ do-install:
 	@#
 	@${ECHO} "===>   Fixing permissions of Zope's own var directory..."
 	@${CHMOD} ugo+rwt ${ZOPEBASEDIR}/var
-	@${CHOWN} ${NOBODY_USER} ${ZOPEBASEDIR}/var
-	@${CHOWN} ${NOBODY_USER} ${ZOPEBASEDIR}/var/*
+	@${CHOWN} ${ZOPE_USER} ${ZOPEBASEDIR}/var
+	@${CHOWN} ${ZOPE_USER} ${ZOPEBASEDIR}/var/*
 	@${RM} ${ZOPEBASEDIR}/var/.cvsignore
 	@if [ -e ${ZOPEBASEDIR}/var/Data.fs.preserve ] ; then \
 		${ECHO} "Restoring existing Database from ${ZOPEBASEDIR}/var/Data.fs.preserve." ; \
@@ -101,7 +110,7 @@ do-install:
 				-p test -e CLEARTEXT access ); \
 	fi
 	@#
-	@${CHOWN} ${NOBODY_USER} ${ZOPEBASEDIR}/access
+	@${CHOWN} ${ZOPE_USER} ${ZOPEBASEDIR}/access
 	@#
 	@${ECHO} "===>   Copying Apache config file changes to ${APACHE_CONFDIR}/apache.conf.Zope-Changes."
 	@${MKDIR} ${APACHE_CONFDIR}
@@ -111,7 +120,12 @@ do-install:
 	@${ECHO} "===>   therein and incorporate them to your apache.conf."
 	@${ECHO} "===>   Creating rc startup file for Zope-${PORTVERSION}..."
 	@${MKDIR} ${PREFIX}/etc/rc.d
-	@${SED} -e "s|%%ZOPEBASEDIR%%|${ZOPEBASEDIR}|g" -e "s|%%CGIBINDIR%%|${CGIBINDIR}|g" \
+	@${SED} -e "s|%%ZOPEBASEDIR%%|${ZOPEBASEDIR}|g" \
+	        -e "s|%%CGIBINDIR%%|${CGIBINDIR}|g" \
+	        -e "s|%%ZOPE_USER%%|${ZOPE_USER}|g" \
+		-e "s|%%ZOPE_HTTP_PORT%%|${ZOPE_HTTP_PORT}|g" \
+		-e "s|%%ZOPE_FTP_PORT%%|${ZOPE_FTP_PORT}|g" \
+		-e "s|%%ZOPE_MONITOR_PORT%%|${ZOPE_MONITOR_PORT}|g" \
 		< ${FILESDIR}/zope.sh.in > ${PREFIX}/etc/rc.d/zope.sh
 	@${CHMOD} ug+x,o-rwx ${PREFIX}/etc/rc.d/zope.sh
 	@${ECHO} "===>  Done with ${PREFIX}/etc/rc.d/zope.sh."
diff --git a/www/zope/distinfo b/www/zope/distinfo
index e63c00d..ccc2d73 100644
--- a/www/zope/distinfo
+++ b/www/zope/distinfo
@@ -1 +1,2 @@
-MD5 (zope/Zope-2.4.2-src.tgz) = 9759b5609626308d1ae20047e6fed3cb
+MD5 (zope/Zope-2.5.0-src.tgz) = 105bb1f9d90478596cc929164ef385e3
+MD5 (zope/Zope-2.5.0-unix-security.patch) = 87f3dceb08aa3bcede5bf521c9cdd328
diff --git a/www/zope/files/zope.sh.in b/www/zope/files/zope.sh.in
index c8cb98f..6e46154 100644
--- a/www/zope/files/zope.sh.in
+++ b/www/zope/files/zope.sh.in
@@ -2,7 +2,13 @@
 
 case "$1" in
 start)
-	nohup %%ZOPEBASEDIR%%/start -w '' -f '' -m '' -p %%CGIBINDIR%%/Zope.cgi >> %%ZOPEBASEDIR%%/var/zope-output &
+	umask 077
+	nohup %%ZOPEBASEDIR%%/start \
+	       -w %%ZOPE_HTTP_PORT%% \
+	       -f %%ZOPE_FTP_PORT%% \
+	       -m %%ZOPE_MONITOR_PORT%% \
+	       -u %%ZOPE_USER%% \
+	       -p %%CGIBINDIR%%/Zope.cgi >> %%ZOPEBASEDIR%%/var/zope-output &
 	echo -n " Zope"
 	;;
 stop)
diff --git a/www/zope/pkg-plist b/www/zope/pkg-plist
index 0f7d75b..79b208d 100644
--- a/www/zope/pkg-plist
+++ b/www/zope/pkg-plist
@@ -1,5 +1,7 @@
-etc/apache/apache.conf.Zope-Changes
+%%APACHE_CONFDIR%%/apache.conf.Zope-Changes
 etc/rc.d/zope.sh
+%%ZOPEBASEDIR%%/var/Data.fs.in
+@exec if [ ! -f %B/Data.fs ]; then cp %B/%f %B/Data.fs; fi
 %%ZOPEBASEDIR%%/Extensions/README.txt
 %%ZOPEBASEDIR%%/LICENSE.txt
 %%ZOPEBASEDIR%%/README.txt
@@ -45,6 +47,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/medusa/__init__.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/asynchat.py
 %%ZOPEBASEDIR%%/ZServer/medusa/asynchat.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/asyncore.py
+%%ZOPEBASEDIR%%/ZServer/medusa/asyncore.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/auth_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/auth_handler.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/chat_server.py
@@ -139,19 +143,12 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/medusa/status_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/status_handler.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/test/__init__.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/__init__.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/test/asyn_http_bench.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/asyn_http_bench.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/test/max_sockets.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/max_sockets.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_11.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_11.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_lb.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_lb.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_medusa.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_medusa.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_single_11.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_single_11.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/test/tests.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/__init__.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/__init__.pyc
@@ -171,9 +168,11 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/medusa/virtual_handler.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/xmlrpc_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/xmlrpc_handler.pyc
+%%ZOPEBASEDIR%%/access
 %%ZOPEBASEDIR%%/doc/CHANGES.txt
 %%ZOPEBASEDIR%%/doc/CREDITS.txt
 %%ZOPEBASEDIR%%/doc/DEBUGGING.txt
+%%ZOPEBASEDIR%%/doc/ENVIRONMENT.txt
 %%ZOPEBASEDIR%%/doc/FAQ.txt
 %%ZOPEBASEDIR%%/doc/HELPSYS.txt
 %%ZOPEBASEDIR%%/doc/HISTORY.txt
@@ -190,6 +189,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/doc/changenotes/010529-2.4-exreg.stx
 %%ZOPEBASEDIR%%/doc/changenotes/010529-2.4-pluggableindex.stx
 %%ZOPEBASEDIR%%/doc/changenotes/010620-2.4-btreeconflict.stx
+%%ZOPEBASEDIR%%/import/Examples.zexp
 %%ZOPEBASEDIR%%/import/README.txt
 %%ZOPEBASEDIR%%/import/ZopeTutorialExamples.zexp
 %%ZOPEBASEDIR%%/inst/binary_install.py
@@ -204,6 +204,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/inst/default_content.pyc
 %%ZOPEBASEDIR%%/inst/do.py
 %%ZOPEBASEDIR%%/inst/do.pyc
+%%ZOPEBASEDIR%%/inst/make_instance.py
+%%ZOPEBASEDIR%%/inst/make_instance.pyc
 %%ZOPEBASEDIR%%/inst/make_resource.py
 %%ZOPEBASEDIR%%/inst/make_resource.pyc
 %%ZOPEBASEDIR%%/inst/make_start.py
@@ -217,6 +219,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/BTree/Setup
 %%ZOPEBASEDIR%%/lib/Components/BTree/intSet.c
 %%ZOPEBASEDIR%%/lib/Components/BTree/intSet.h
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/.cvsignore
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/COPYRIGHT.txt
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/README
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/Setup
@@ -237,6 +240,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/setup.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/setup.pyc
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/Acquisition.c
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/Acquisition.h
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/ComputedAttribute.c
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/ExtensionClass.c
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/ExtensionClass.h
@@ -258,25 +262,15 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_explicit_acquisition
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_method_hook
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/regrtest.py
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/regrtest.pyc
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_AqAlg.py
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_AqAlg.pyc
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_MultiMapping.py
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_MultiMapping.pyc
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_Sync.py
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_Sync.pyc
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_ThreadLock.py
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_ThreadLock.pyc
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_acquisition.py
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_acquisition.pyc
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_add.py
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_add.pyc
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_binding.py
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_binding.pyc
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_explicit_acquisition.py
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_explicit_acquisition.pyc
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_method_hook.py
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_method_hook.pyc
 %%ZOPEBASEDIR%%/lib/Components/cPickle/PyErr_Format.h
 %%ZOPEBASEDIR%%/lib/Components/cPickle/Setup
 %%ZOPEBASEDIR%%/lib/Components/cPickle/cPickle.c
@@ -287,6 +281,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/cPickle/copy_reg.pyc
 %%ZOPEBASEDIR%%/lib/Components/cPickle/release.fl
 %%ZOPEBASEDIR%%/lib/Components/cPickle/release.sh
+%%ZOPEBASEDIR%%/lib/Components/initgroups/initgroups.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/Setup
 %%ZOPEBASEDIR%%/lib/Components/zlib/adler32.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/compress.c
@@ -316,6 +311,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/zlib/zutil.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/zutil.h
 %%ZOPEBASEDIR%%/lib/python/.cvsignore
+%%ZOPEBASEDIR%%/lib/python/AccessControl/.cvsignore
 %%ZOPEBASEDIR%%/lib/python/AccessControl/AccessControl.txt
 %%ZOPEBASEDIR%%/lib/python/AccessControl/AuthEncoding.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/AuthEncoding.pyc
@@ -323,6 +319,9 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/AccessControl/DTML.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/IUserFolder.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/IUserFolder.pyc
+%%ZOPEBASEDIR%%/lib/python/AccessControl/Makefile
+%%ZOPEBASEDIR%%/lib/python/AccessControl/Makefile.pre
+%%ZOPEBASEDIR%%/lib/python/AccessControl/Makefile.pre.in
 %%ZOPEBASEDIR%%/lib/python/AccessControl/Owned.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/Owned.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/Permission.py
@@ -354,6 +353,9 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/AccessControl/ZopeSecurityPolicy.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/__init__.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/AccessControl/cAccessControl.c
+%%ZOPEBASEDIR%%/lib/python/AccessControl/cAccessControl.so
+%%ZOPEBASEDIR%%/lib/python/AccessControl/config.c
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/access.dtml
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/acquiredEdit.dtml
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/addUser.dtml
@@ -365,10 +367,33 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/owner.dtml
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/permissionEdit.dtml
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/roleEdit.dtml
-%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/framework.py
-%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/framework.pyc
+%%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/userFolderProps.dtml
+%%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite/README
+%%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite/ResultObject.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite/ResultObject.pyc
+%%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite/SecurityBase.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite/SecurityBase.pyc
+%%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite/framework.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite/framework.pyc
+%%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite/regressionSecurity.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite/regressionSecurity.pyc
+%%ZOPEBASEDIR%%/lib/python/AccessControl/sedscript
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/__init__.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/mixed_module/__init__.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/mixed_module/submodule/__init__.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/private_module/__init__.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/private_module/submodule/__init__.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/public_module/__init__.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/public_module/submodule/__init__.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testDeprecatedAPI.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testModuleSecurity.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testPasswordDigest.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testPermissionRole.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testSecurity.py
-%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testSecurity.pyc
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testUserFolder.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testZopeSecurityPolicy.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/unauthorized.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/unauthorized.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/www/AccessControl_icon.gif
 %%ZOPEBASEDIR%%/lib/python/AccessControl/www/User_icon.gif
 %%ZOPEBASEDIR%%/lib/python/Acquisition.so
@@ -390,6 +415,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/App/FactoryDispatcher.pyc
 %%ZOPEBASEDIR%%/lib/python/App/FindHomes.py
 %%ZOPEBASEDIR%%/lib/python/App/FindHomes.pyc
+%%ZOPEBASEDIR%%/lib/python/App/Hotfixes.py
+%%ZOPEBASEDIR%%/lib/python/App/Hotfixes.pyc
 %%ZOPEBASEDIR%%/lib/python/App/ImageFile.py
 %%ZOPEBASEDIR%%/lib/python/App/ImageFile.pyc
 %%ZOPEBASEDIR%%/lib/python/App/Management.py
@@ -518,11 +545,9 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/BTrees/objectvaluemacros.h
 %%ZOPEBASEDIR%%/lib/python/BTrees/sedscript
 %%ZOPEBASEDIR%%/lib/python/BTrees/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/BTrees/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/BTrees/tests/testBTrees.py
-%%ZOPEBASEDIR%%/lib/python/BTrees/tests/testBTrees.pyc
+%%ZOPEBASEDIR%%/lib/python/BTrees/tests/testBTreesUnicode.py
 %%ZOPEBASEDIR%%/lib/python/BTrees/tests/testConflict.py
-%%ZOPEBASEDIR%%/lib/python/BTrees/tests/testConflict.pyc
 %%ZOPEBASEDIR%%/lib/python/ComputedAttribute.so
 %%ZOPEBASEDIR%%/lib/python/DateTime/DateTime.html
 %%ZOPEBASEDIR%%/lib/python/DateTime/DateTime.py
@@ -533,7 +558,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/DateTime/__init__.py
 %%ZOPEBASEDIR%%/lib/python/DateTime/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/DateTime/tests/testDateTime.py
-%%ZOPEBASEDIR%%/lib/python/DateTime/tests/testDateTime.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/.cvsignore
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/DT_HTML.py
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/DT_HTML.pyc
@@ -588,20 +612,14 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/SortEx.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/__init__.py
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/framework.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/framework.pyc
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/results.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/results.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/testSequence.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/testSequence.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/ztestlib.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/ztestlib.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/dealers.dtml
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/dealers.out
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/testDTML.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/testDTML.pyc
 %%ZOPEBASEDIR%%/lib/python/ExtensionClass.so
 %%ZOPEBASEDIR%%/lib/python/Globals.py
 %%ZOPEBASEDIR%%/lib/python/Globals.pyc
@@ -775,12 +793,14 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/OFS/ndiff.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/rPickle.py
 %%ZOPEBASEDIR%%/lib/python/OFS/rPickle.pyc
+%%ZOPEBASEDIR%%/lib/python/OFS/standard/index_html.dtml
+%%ZOPEBASEDIR%%/lib/python/OFS/standard/standard_error_message.dtml
+%%ZOPEBASEDIR%%/lib/python/OFS/standard/standard_html_footer.dtml
+%%ZOPEBASEDIR%%/lib/python/OFS/standard/standard_html_header.dtml
+%%ZOPEBASEDIR%%/lib/python/OFS/standard/standard_template.pt
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/OFS/tests/framework.py
-%%ZOPEBASEDIR%%/lib/python/OFS/tests/framework.pyc
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupport.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testRanges.py
-%%ZOPEBASEDIR%%/lib/python/OFS/tests/testRanges.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/www/ControlPanel_icon.gif
 %%ZOPEBASEDIR%%/lib/python/OFS/www/Help_icon.gif
 %%ZOPEBASEDIR%%/lib/python/OFS/www/Properties_icon.gif
@@ -794,8 +814,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/OFS/www/properties.jpg
 %%ZOPEBASEDIR%%/lib/python/OFS/www/r_arrow.gif
 %%ZOPEBASEDIR%%/lib/python/OIBTree.so
-%%ZOPEBASEDIR%%/lib/python/Persistence.py
-%%ZOPEBASEDIR%%/lib/python/Persistence.pyc
+%%ZOPEBASEDIR%%/lib/python/Persistence/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Persistence/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/CHANGES.txt
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/ExternalMethod.py
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/ExternalMethod.pyc
@@ -823,7 +843,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/README.txt
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/SendMailTag.py
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/SendMailTag.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/MailHost/Setup
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/dtml/addMailHost_form.dtml
@@ -833,9 +852,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/Mail-Host_Edit.stx
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/MailHost.py
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/MailHost.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/MailHost/release/MailHost-1.0.1.rn
-%%ZOPEBASEDIR%%/lib/python/Products/MailHost/release/MailHost-1.1.0.rn
-%%ZOPEBASEDIR%%/lib/python/Products/MailHost/sample/Setup
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/version.txt
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/www/MailHost_icon.gif
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/Draft.py
@@ -854,6 +870,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/dtml/versionAdd.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/dtml/versionEdit.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/dtml/versionEnd.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/AccessControl.py
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/AccessControl.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/AuthenticatedUser.py
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/AuthenticatedUser.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/CacheManager-associate.stx
@@ -939,6 +957,9 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/User-Folder_Add-User.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/User-Folder_Contents.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/User-Folder_Edit-User.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/User-Folder_Properties.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/UserFolder.py
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/UserFolder.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/Version-Management.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/Version-Management_Version.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/Version.stx
@@ -968,22 +989,26 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-if.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-in.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-let.stx
-%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-math.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-mime.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-raise.stx
-%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-random.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-return.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sendmail.stx
-%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sequence.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sqlgroup.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sqltest.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sqlvar.stx
-%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-string.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-tree.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-try.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-unless.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-var.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-with.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/math.py
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/math.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/random.py
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/random.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/sequence.py
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/sequence.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/string.py
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/string.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/images/File_icon.gif
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/images/Folder_icon.gif
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/images/Image_icon.gif
@@ -993,6 +1018,101 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/images/dtmlmethod.gif
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/images/version.gif
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/version.txt
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/CHANGES.txt
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/Expressions.py
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/Expressions.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/HISTORY.txt
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/PageTemplate.py
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/PageTemplate.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/PageTemplateFile.py
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/PageTemplateFile.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/PathIterator.py
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/PathIterator.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/PythonExpr.py
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/PythonExpr.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/README.txt
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/TALES.py
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/TALES.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/ZPythonExpr.py
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/ZPythonExpr.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/ZRPythonExpr.py
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/ZRPythonExpr.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/ZopePageTemplate.py
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/ZopePageTemplate.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/examples/index.xml
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/examples/zpt_examples.zexp
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/help/PageTemplate_Edit.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/help/ZTUtils.py
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/help/ZTUtils.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/help/metal-define-macro.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/help/metal-define-slot.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/help/metal-fill-slot.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/help/metal-use-macro.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/help/metal.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/help/tal-attributes.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/help/tal-condition.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/help/tal-content.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/help/tal-define.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/help/tal-omit-tag.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/help/tal-on-error.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/help/tal-repeat.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/help/tal-replace.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/help/tal.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/help/tales-exists.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/help/tales-nocall.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/help/tales-not.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/help/tales-path.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/help/tales-python.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/help/tales-string.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/help/tales.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/batch.py
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/input/CheckBatchIteration.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/input/CheckNotExpression.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/input/CheckNothing.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/input/CheckPathAlt.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/input/CheckPathNothing.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/input/CheckWithXMLHeader.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/input/DTML1.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/input/DTML3.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/input/GlobalsShadowLocals.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/input/Loop1.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/input/Loop2.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/input/StringExpression.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/input/TeeShop1.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/input/TeeShop2.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/input/TeeShopLAF.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/output/CheckBatchIteration.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/output/CheckNotExpression.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/output/CheckNothing.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/output/CheckPathAlt.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/output/CheckPathNothing.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/output/CheckWithXMLHeader.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/output/DTML1a.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/output/DTML1b.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/output/DTML3.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/output/GlobalsShadowLocals.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/output/Loop1.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/output/Loop2.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/output/StringExpression.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/output/TeeShop1.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/output/TeeShop2.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/output/TeeShopLAF.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/run.py
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testDTMLTests.py
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testExpressions.py
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testHTMLTests.py
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testTALES.py
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/util.py
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/version.txt
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/www/default.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/www/exclamation.gif
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/www/ptAdd.zpt
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/www/ptEdit.zpt
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/www/zpt.gif
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/__init__.py
@@ -1000,6 +1120,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml/addFieldIndex.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml/manageFieldIndex.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/help/FieldIndex_searchResults.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/tests/testFieldIndex.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/__init__.py
@@ -1007,6 +1128,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml/addKeywordIndex.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml/manageKeywordIndex.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/help/KeywordIndex_searchResults.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/tests/testKeywordIndex.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.txt
@@ -1015,11 +1137,13 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml/addPathIndex.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml/managePathIndex.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/help/PathIndex_searchResults.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/tests/testPathIndex.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/README.txt
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Lexicon.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Lexicon.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/.cvsignore
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/ISO_8859_1_Splitter.so
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile.pre
@@ -1030,6 +1154,20 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/config.c
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/sedscript
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/src/ISO_8859_1_Splitter.c
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter/.cvsignore
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter/Makefile
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter/Makefile.pre
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter/Makefile.pre.in
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter/Setup
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter/UnicodeSplitter.so
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter/config.c
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter/sedscript
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter/src/UnicodeSplitter.c
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter/tests/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter/tests/testUnicodeSplitter.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/.cvsignore
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile.pre
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile.pre.in
@@ -1059,6 +1197,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/help/TextIndex_searchResults.stx
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/randid.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/randid.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/tests/testSplitter.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/tests/testTextIndex.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/PluggableIndex.py
@@ -1074,18 +1214,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/util.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/util.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/help/placeholder.txt
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/framework.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/framework.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testFieldIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testFieldIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testKeywordIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testKeywordIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testPathIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testPathIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testSplitter.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testSplitter.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testTextIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testTextIndex.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/www/index.gif
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/CHANGES.txt
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/Extensions/RemotePS.py
@@ -1105,14 +1233,14 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/help/PythonScript_test.stx
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/help/Script.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/help/Script.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/help/standard.py
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/help/standard.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/module_access_examples.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/module_access_examples.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/standard.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/standard.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/framework.py
-%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/framework.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/testPythonScript.py
-%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/testPythonScript.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/big_boolean.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/boolean_map.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/complex_print.ps
@@ -1130,6 +1258,34 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/www/pyScriptEdit.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/www/pyScriptProxy.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/www/pyscript.gif
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/BrowserIdManager.py
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/BrowserIdManager.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/SessionDataManager.py
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/SessionDataManager.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/SessionInterfaces.py
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/SessionInterfaces.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/SessionPermissions.py
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/SessionPermissions.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/common.py
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/common.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/dtml/addDataManager.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/dtml/addIdManager.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/dtml/manageDataManager.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/dtml/manageIdManager.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/help/SessionInterfaces.py
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/help/SessionInterfaces.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/help/browser-add.stx
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/help/browser-change.stx
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/help/session-add.stx
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/help/session-change.stx
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/stresstests/stresstestMultiThread.py
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/stresstests/stresstestMultiThread.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/tests/testBrowserIdManager.py
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/tests/testSessionDataManager.py
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/www/datamgr.gif
+%%ZOPEBASEDIR%%/lib/python/Products/Sessions/www/idmgr.gif
 %%ZOPEBASEDIR%%/lib/python/Products/SiteAccess/AccessRule.py
 %%ZOPEBASEDIR%%/lib/python/Products/SiteAccess/AccessRule.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/SiteAccess/CHANGES.txt
@@ -1158,6 +1314,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/SiteAccess/www/VirtualHostMonster.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/SiteAccess/www/VirtualHostMonster.gif
 %%ZOPEBASEDIR%%/lib/python/Products/SiteAccess/www/VirtualHostMonsterAdd.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/SiteAccess/www/manage_edit.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/StandardCacheManagers/AcceleratedHTTPCacheManager.py
 %%ZOPEBASEDIR%%/lib/python/Products/StandardCacheManagers/AcceleratedHTTPCacheManager.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/StandardCacheManagers/RAMCacheManager.py
@@ -1174,6 +1331,40 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/StandardCacheManagers/help/Accel.stx
 %%ZOPEBASEDIR%%/lib/python/Products/StandardCacheManagers/help/RAM.stx
 %%ZOPEBASEDIR%%/lib/python/Products/StandardCacheManagers/version.txt
+%%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/LowConflictConnection.py
+%%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/LowConflictConnection.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/TemporaryFolder.py
+%%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/TemporaryFolder.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/TemporaryStorage.py
+%%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/TemporaryStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/dtml/addTemporaryFolder.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/dtml/mountfail.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/help/TemporaryFolder.stx
+%%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/patchfs.py
+%%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/patchfs.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/tests/testTemporaryStorage.py
+%%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/www/tempfolder.gif
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/Transience.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/Transience.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransienceInterfaces.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransienceInterfaces.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransientObject.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransientObject.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/dtml/addTransientObjectContainer.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/dtml/manageTransientObjectContainer.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/help/Transience-add.stx
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/help/Transience-change.stx
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/help/TransienceInterfaces.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/help/TransienceInterfaces.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/fauxtime.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTimeoutRelated.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransientObject.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransientObjectContainer.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/www/datacontainer.gif
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/CHANGES.txt
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/Catalog.gif
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/Catalog.py
@@ -1242,12 +1433,13 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalog.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalogTiming.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalogTiming.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionUnicode.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionUnicode.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/unittest_patched.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/unittest_patched.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/.cvsignore
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/version.txt
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/www/Vocabulary.gif
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/www/ZCatalog.gif
@@ -1378,8 +1570,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Record.so
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Compilers.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Compilers.pyc
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.pyc
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/Guards.py
@@ -1390,45 +1580,49 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/MutatingWalker.pyc
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/PrintCollector.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/PrintCollector.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RCompile.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RCompile.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RCompile_2_1.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RCompile_2_1.pyc
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/RestrictionMutator.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/RestrictionMutator.pyc
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/SafeMapping.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/SafeMapping.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/SelectCompiler.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/SelectCompiler.pyc
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/Utilities.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/Utilities.pyc
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/__init__.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/__init__.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/ast.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/ast.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/astgen.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/astgen.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/consts.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/consts.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/future.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/future.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/misc.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/misc.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pyassem.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pyassem.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pycodegen.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pycodegen.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/symbols.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/symbols.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/transformer.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/transformer.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/visitor.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/visitor.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler_2_1/__init__.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler_2_1/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler_2_1/ast.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler_2_1/ast.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler_2_1/ast.txt
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler_2_1/astgen.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler_2_1/astgen.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler_2_1/consts.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler_2_1/consts.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler_2_1/future.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler_2_1/future.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler_2_1/misc.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler_2_1/misc.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler_2_1/pyassem.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler_2_1/pyassem.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler_2_1/pycodegen.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler_2_1/pycodegen.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler_2_1/symbols.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler_2_1/symbols.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler_2_1/transformer.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler_2_1/transformer.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler_2_1/visitor.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler_2_1/visitor.pyc
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/restricted_module.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/restricted_module.pyc
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/security_in_syntax.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/security_in_syntax.pyc
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/testRestrictions.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/testRestrictions.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/.cvsignore
+%%ZOPEBASEDIR%%/lib/python/SearchIndex/.testinfo
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/GlobbingLexicon.py
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/GlobbingLexicon.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/Index.py
@@ -1440,6 +1634,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/Makefile.pre.in
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/PluggableIndex.py
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/PluggableIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/SearchIndex/README.txt
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/ResultList.py
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/ResultList.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/Setup
@@ -1460,17 +1655,11 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/randid.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/sedscript
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/framework.py
-%%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/testSplitter.py
-%%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/testSplitter.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/testUnKeywordIndex.py
-%%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/testUnKeywordIndex.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/testUnTextIndex.py
-%%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/testUnTextIndex.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/test_UnIndex.py
-%%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/test_UnIndex.pyc
 %%ZOPEBASEDIR%%/lib/python/Setup
 %%ZOPEBASEDIR%%/lib/python/Setup15
 %%ZOPEBASEDIR%%/lib/python/Setup20
@@ -1512,6 +1701,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/dtml/connectionStatus.dtml
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/dtml/connectionTestForm.dtml
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/dtml/customDefaultReport.dtml
+%%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/dtml/customDefaultZPTReport.dtml
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/dtml/searchAdd.dtml
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/sqlgroup.py
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/sqlgroup.pyc
@@ -1604,10 +1794,14 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/Acquisition.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/ExtensionClass.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/ExtensionClass.stx
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/InnerLinks.ref
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/InnerLinks.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/Links.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/Links.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/MultiMapping.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/MultiMapping.stx
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/create_referencesfiles.py
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/create_referencesfiles.pyc
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples1.ref
@@ -1616,11 +1810,144 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/index.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/table.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/table.stx
-%%ZOPEBASEDIR%%/lib/python/StructuredText/tests/framework.py
-%%ZOPEBASEDIR%%/lib/python/StructuredText/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/StructuredText/tests/testStructuredText.py
-%%ZOPEBASEDIR%%/lib/python/StructuredText/tests/testStructuredText.pyc
 %%ZOPEBASEDIR%%/lib/python/Sync.so
+%%ZOPEBASEDIR%%/lib/python/TAL/.cvsignore
+%%ZOPEBASEDIR%%/lib/python/TAL/CHANGES.txt
+%%ZOPEBASEDIR%%/lib/python/TAL/DummyEngine.py
+%%ZOPEBASEDIR%%/lib/python/TAL/DummyEngine.pyc
+%%ZOPEBASEDIR%%/lib/python/TAL/HISTORY.txt
+%%ZOPEBASEDIR%%/lib/python/TAL/HTMLParser.py
+%%ZOPEBASEDIR%%/lib/python/TAL/HTMLParser.pyc
+%%ZOPEBASEDIR%%/lib/python/TAL/HTMLTALParser.py
+%%ZOPEBASEDIR%%/lib/python/TAL/HTMLTALParser.pyc
+%%ZOPEBASEDIR%%/lib/python/TAL/README.txt
+%%ZOPEBASEDIR%%/lib/python/TAL/TALDefs.py
+%%ZOPEBASEDIR%%/lib/python/TAL/TALDefs.pyc
+%%ZOPEBASEDIR%%/lib/python/TAL/TALGenerator.py
+%%ZOPEBASEDIR%%/lib/python/TAL/TALGenerator.pyc
+%%ZOPEBASEDIR%%/lib/python/TAL/TALInterpreter.py
+%%ZOPEBASEDIR%%/lib/python/TAL/TALInterpreter.pyc
+%%ZOPEBASEDIR%%/lib/python/TAL/TALParser.py
+%%ZOPEBASEDIR%%/lib/python/TAL/TALParser.pyc
+%%ZOPEBASEDIR%%/lib/python/TAL/XMLParser.py
+%%ZOPEBASEDIR%%/lib/python/TAL/XMLParser.pyc
+%%ZOPEBASEDIR%%/lib/python/TAL/__init__.py
+%%ZOPEBASEDIR%%/lib/python/TAL/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/TAL/benchmark/dtml01.html
+%%ZOPEBASEDIR%%/lib/python/TAL/benchmark/dtml02.html
+%%ZOPEBASEDIR%%/lib/python/TAL/benchmark/dtml03.html
+%%ZOPEBASEDIR%%/lib/python/TAL/benchmark/dtml04.html
+%%ZOPEBASEDIR%%/lib/python/TAL/benchmark/dtml05.html
+%%ZOPEBASEDIR%%/lib/python/TAL/benchmark/dtml06.html
+%%ZOPEBASEDIR%%/lib/python/TAL/benchmark/dtml07.html
+%%ZOPEBASEDIR%%/lib/python/TAL/benchmark/dtml08.html
+%%ZOPEBASEDIR%%/lib/python/TAL/benchmark/dtml09.html
+%%ZOPEBASEDIR%%/lib/python/TAL/benchmark/dtml10.html
+%%ZOPEBASEDIR%%/lib/python/TAL/benchmark/dtml11.html
+%%ZOPEBASEDIR%%/lib/python/TAL/benchmark/dtml12.html
+%%ZOPEBASEDIR%%/lib/python/TAL/benchmark/tal01.html
+%%ZOPEBASEDIR%%/lib/python/TAL/benchmark/tal02.html
+%%ZOPEBASEDIR%%/lib/python/TAL/benchmark/tal03.html
+%%ZOPEBASEDIR%%/lib/python/TAL/benchmark/tal04.html
+%%ZOPEBASEDIR%%/lib/python/TAL/benchmark/tal05.html
+%%ZOPEBASEDIR%%/lib/python/TAL/benchmark/tal06.html
+%%ZOPEBASEDIR%%/lib/python/TAL/benchmark/tal07.html
+%%ZOPEBASEDIR%%/lib/python/TAL/benchmark/tal08.html
+%%ZOPEBASEDIR%%/lib/python/TAL/benchmark/tal09.html
+%%ZOPEBASEDIR%%/lib/python/TAL/benchmark/tal10.html
+%%ZOPEBASEDIR%%/lib/python/TAL/benchmark/tal11.html
+%%ZOPEBASEDIR%%/lib/python/TAL/benchmark/tal12.html
+%%ZOPEBASEDIR%%/lib/python/TAL/driver.py
+%%ZOPEBASEDIR%%/lib/python/TAL/driver.pyc
+%%ZOPEBASEDIR%%/lib/python/TAL/markbench.py
+%%ZOPEBASEDIR%%/lib/python/TAL/markbench.pyc
+%%ZOPEBASEDIR%%/lib/python/TAL/markupbase.py
+%%ZOPEBASEDIR%%/lib/python/TAL/markupbase.pyc
+%%ZOPEBASEDIR%%/lib/python/TAL/ndiff.py
+%%ZOPEBASEDIR%%/lib/python/TAL/ndiff.pyc
+%%ZOPEBASEDIR%%/lib/python/TAL/runtest.py
+%%ZOPEBASEDIR%%/lib/python/TAL/runtest.pyc
+%%ZOPEBASEDIR%%/lib/python/TAL/setpath.py
+%%ZOPEBASEDIR%%/lib/python/TAL/setpath.pyc
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/__init__.py
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test01.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test01.xml
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test02.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test02.xml
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test03.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test03.xml
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test04.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test04.xml
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test05.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test05.xml
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test06.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test06.xml
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test07.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test07.xml
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test08.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test08.xml
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test09.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test09.xml
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test10.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test11.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test11.xml
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test12.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test13.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test14.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test14.xml
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test15.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test16.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test17.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test17.xml
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test18.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test18.xml
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test_metal1.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test_metal2.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test_metal3.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test01.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test01.xml
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test02.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test02.xml
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test03.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test03.xml
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test04.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test04.xml
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test05.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test05.xml
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test06.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test06.xml
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test07.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test07.xml
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test08.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test08.xml
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test09.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test09.xml
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test10.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test11.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test11.xml
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test12.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test13.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test14.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test14.xml
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test15.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test16.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test17.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test17.xml
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test18.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test18.xml
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test_metal1.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test_metal2.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test_metal3.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/run.py
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/test_files.py
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/test_htmlparser.py
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/test_htmltalparser.py
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/test_talinterpreter.py
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/test_xmlparser.py
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/utils.py
+%%ZOPEBASEDIR%%/lib/python/TAL/timer.py
+%%ZOPEBASEDIR%%/lib/python/TAL/timer.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/README.txt
 %%ZOPEBASEDIR%%/lib/python/Testing/ZODButil.py
 %%ZOPEBASEDIR%%/lib/python/Testing/ZODButil.pyc
@@ -1634,9 +1961,12 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Testing/dispatcher.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/makerequest.py
 %%ZOPEBASEDIR%%/lib/python/Testing/makerequest.pyc
+%%ZOPEBASEDIR%%/lib/python/Testing/var/README.txt
 %%ZOPEBASEDIR%%/lib/python/ThreadLock.so
-%%ZOPEBASEDIR%%/lib/python/ThreadedAsync.py
-%%ZOPEBASEDIR%%/lib/python/ThreadedAsync.pyc
+%%ZOPEBASEDIR%%/lib/python/ThreadedAsync/LoopCallback.py
+%%ZOPEBASEDIR%%/lib/python/ThreadedAsync/LoopCallback.pyc
+%%ZOPEBASEDIR%%/lib/python/ThreadedAsync/__init__.py
+%%ZOPEBASEDIR%%/lib/python/ThreadedAsync/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/TreeDisplay/TreeTag.py
 %%ZOPEBASEDIR%%/lib/python/TreeDisplay/TreeTag.pyc
 %%ZOPEBASEDIR%%/lib/python/TreeDisplay/__init__.py
@@ -1744,40 +2074,31 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZODB/referencesf.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/referencesf.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/sedscript
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/.cvsignore
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/BasicStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/BasicStorage.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/ConflictResolution.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/ConflictResolution.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/Corruption.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/HistoryStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/HistoryStorage.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/IteratorStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/IteratorStorage.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/LocalStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/LocalStorage.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/PackableStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/PackableStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/PersistentStorage.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/RevisionStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/StorageTestBase.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/StorageTestBase.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/Synchronization.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/Synchronization.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoStorage.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoVersionStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoVersionStorage.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/VersionStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/VersionStorage.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/speed.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/speed.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testDemoStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testFileStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testFileStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testMappingStorage.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testPersistentMapping.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTransaction.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTransaction.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testUtils.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testZODB.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testZODB.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/utils.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/utils.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/winlock.c
@@ -1815,11 +2136,26 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/maybe_lock.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/maybe_lock.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.py
-%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.pyc
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/Batch.py
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/Batch.pyc
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/CHANGES.txt
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/HISTORY.txt
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/Iterator.py
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/Iterator.pyc
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/SimpleTree.py
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/SimpleTree.pyc
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/Tree.py
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/Tree.pyc
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/Zope.py
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/Zope.pyc
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/__init__.py
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/run.py
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testBatch.py
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testIterator.py
 %%ZOPEBASEDIR%%/lib/python/Zope/ClassFactory.py
 %%ZOPEBASEDIR%%/lib/python/Zope/ClassFactory.pyc
 %%ZOPEBASEDIR%%/lib/python/Zope/__init__.py
@@ -1827,6 +2163,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/config.c
 %%ZOPEBASEDIR%%/lib/python/dcdb.py
 %%ZOPEBASEDIR%%/lib/python/dcdb.pyc
+%%ZOPEBASEDIR%%/lib/python/initgroups.so
 %%ZOPEBASEDIR%%/lib/python/intSet.so
 %%ZOPEBASEDIR%%/lib/python/sedscript
 %%ZOPEBASEDIR%%/lib/python/tempfile.py
@@ -1864,10 +2201,26 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/webdav/xmltools.pyc
 %%ZOPEBASEDIR%%/lib/python/xmlrpclib.py
 %%ZOPEBASEDIR%%/lib/python/xmlrpclib.pyc
-%%ZOPEBASEDIR%%/lib/python/zLOG.py
-%%ZOPEBASEDIR%%/lib/python/zLOG.pyc
-%%ZOPEBASEDIR%%/lib/python/zdaemon.py
-%%ZOPEBASEDIR%%/lib/python/zdaemon.pyc
+%%ZOPEBASEDIR%%/lib/python/zExceptions/__init__.py
+%%ZOPEBASEDIR%%/lib/python/zExceptions/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/zExceptions/unauthorized.py
+%%ZOPEBASEDIR%%/lib/python/zExceptions/unauthorized.pyc
+%%ZOPEBASEDIR%%/lib/python/zLOG/FormatException.py
+%%ZOPEBASEDIR%%/lib/python/zLOG/FormatException.pyc
+%%ZOPEBASEDIR%%/lib/python/zLOG/MinimalLogger.py
+%%ZOPEBASEDIR%%/lib/python/zLOG/MinimalLogger.pyc
+%%ZOPEBASEDIR%%/lib/python/zLOG/__init__.py
+%%ZOPEBASEDIR%%/lib/python/zLOG/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/zLOG/tests/__init__.py
+%%ZOPEBASEDIR%%/lib/python/zLOG/tests/testzLog.py
+%%ZOPEBASEDIR%%/lib/python/zdaemon/Daemon.py
+%%ZOPEBASEDIR%%/lib/python/zdaemon/Daemon.pyc
+%%ZOPEBASEDIR%%/lib/python/zdaemon/Heartbeat.py
+%%ZOPEBASEDIR%%/lib/python/zdaemon/Heartbeat.pyc
+%%ZOPEBASEDIR%%/lib/python/zdaemon/ZDaemonLogging.py
+%%ZOPEBASEDIR%%/lib/python/zdaemon/ZDaemonLogging.pyc
+%%ZOPEBASEDIR%%/lib/python/zdaemon/__init__.py
+%%ZOPEBASEDIR%%/lib/python/zdaemon/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/zlib.so
 %%ZOPEBASEDIR%%/pcgi/.cvsignore
 %%ZOPEBASEDIR%%/pcgi/Example/pcgitest
@@ -1913,8 +2266,14 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/utilities/FS.py
 %%ZOPEBASEDIR%%/utilities/FS.pyc
 %%ZOPEBASEDIR%%/utilities/README.txt
+%%ZOPEBASEDIR%%/utilities/ZODBTools/fstest.py
+%%ZOPEBASEDIR%%/utilities/ZODBTools/fstest.pyc
+%%ZOPEBASEDIR%%/utilities/ZODBTools/tests/test-checker.fs
+%%ZOPEBASEDIR%%/utilities/ZODBTools/tests/testfstest.py
 %%ZOPEBASEDIR%%/utilities/bbb.py
 %%ZOPEBASEDIR%%/utilities/bbb.pyc
+%%ZOPEBASEDIR%%/utilities/check_catalog.py
+%%ZOPEBASEDIR%%/utilities/check_catalog.pyc
 %%ZOPEBASEDIR%%/utilities/fixbbbts.py
 %%ZOPEBASEDIR%%/utilities/fixbbbts.pyc
 %%ZOPEBASEDIR%%/utilities/load_site.py
@@ -1923,8 +2282,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/utilities/requestprofiler.pyc
 %%ZOPEBASEDIR%%/utilities/testrunner.py
 %%ZOPEBASEDIR%%/utilities/testrunner.pyc
-%%ZOPEBASEDIR%%/var/Data.fs.in
-@exec if [ ! -f %B/Data.fs ]; then cp %B/%f %B/Data.fs; fi
 %%ZOPEBASEDIR%%/w_pcgi.py
 %%ZOPEBASEDIR%%/w_pcgi.pyc
 %%ZOPEBASEDIR%%/wo_pcgi.py
@@ -1942,6 +2299,8 @@ etc/rc.d/zope.sh
 @unexec rm -f %D/%%ZOPEBASEDIR%%/var/*.lock
 @unexec rmdir %D/%%CGIBINDIR%% 2>/dev/null || true
 @unexec rmdir %D/%%ZOPEBASEDIR%%/var 2>/dev/null || true
+@dirrm %%ZOPEBASEDIR%%/utilities/ZODBTools/tests
+@dirrm %%ZOPEBASEDIR%%/utilities/ZODBTools
 @dirrm %%ZOPEBASEDIR%%/utilities
 @dirrm %%ZOPEBASEDIR%%/pcgi/Win32
 @dirrm %%ZOPEBASEDIR%%/pcgi/Util
@@ -1949,10 +2308,16 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/pcgi/MrCreosote
 @dirrm %%ZOPEBASEDIR%%/pcgi/Example
 @dirrm %%ZOPEBASEDIR%%/pcgi
+@dirrm %%ZOPEBASEDIR%%/lib/python/zdaemon
+@dirrm %%ZOPEBASEDIR%%/lib/python/zLOG/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/zLOG
+@dirrm %%ZOPEBASEDIR%%/lib/python/zExceptions
 @dirrm %%ZOPEBASEDIR%%/lib/python/webdav/www
 @dirrm %%ZOPEBASEDIR%%/lib/python/webdav/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/webdav
 @dirrm %%ZOPEBASEDIR%%/lib/python/Zope
+@dirrm %%ZOPEBASEDIR%%/lib/python/ZTUtils/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/ZTUtils
 @dirrm %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/ZPublisher
 @dirrm %%ZOPEBASEDIR%%/lib/python/ZODB/tests
@@ -1962,7 +2327,14 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/ZClasses
 @dirrm %%ZOPEBASEDIR%%/lib/python/TreeDisplay/www
 @dirrm %%ZOPEBASEDIR%%/lib/python/TreeDisplay
+@dirrm %%ZOPEBASEDIR%%/lib/python/ThreadedAsync
+@dirrm %%ZOPEBASEDIR%%/lib/python/Testing/var
 @dirrm %%ZOPEBASEDIR%%/lib/python/Testing
+@dirrm %%ZOPEBASEDIR%%/lib/python/TAL/tests/output
+@dirrm %%ZOPEBASEDIR%%/lib/python/TAL/tests/input
+@dirrm %%ZOPEBASEDIR%%/lib/python/TAL/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/TAL/benchmark
+@dirrm %%ZOPEBASEDIR%%/lib/python/TAL
 @dirrm %%ZOPEBASEDIR%%/lib/python/StructuredText/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions
 @dirrm %%ZOPEBASEDIR%%/lib/python/StructuredText
@@ -1981,7 +2353,7 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/SearchIndex
 @dirrm %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests
-@dirrm %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler
+@dirrm %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler_2_1
 @dirrm %%ZOPEBASEDIR%%/lib/python/RestrictedPython
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZopeTutorial/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZopeTutorial
@@ -1998,6 +2370,16 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Transience/www
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Transience/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Transience/help
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Transience/dtml
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Transience
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/www
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/help
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/dtml
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/StandardCacheManagers/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/StandardCacheManagers/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/StandardCacheManagers
@@ -2006,6 +2388,12 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/SiteAccess/doc
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/SiteAccess/Extensions
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/SiteAccess
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Sessions/www
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Sessions/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Sessions/stresstests
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Sessions/help
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Sessions/dtml
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Sessions
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/www
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests
@@ -2013,34 +2401,45 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/Extensions
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/www
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/src
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter/src
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/src
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/www
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/output
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/input
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/help
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/examples
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/OFSP/images
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/OFSP/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/OFSP
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost/www
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost/sample
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost/release
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost
@@ -2050,8 +2449,10 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products
+@dirrm %%ZOPEBASEDIR%%/lib/python/Persistence
 @dirrm %%ZOPEBASEDIR%%/lib/python/OFS/www
 @dirrm %%ZOPEBASEDIR%%/lib/python/OFS/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/OFS/standard
 @dirrm %%ZOPEBASEDIR%%/lib/python/OFS/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/OFS
 @dirrm %%ZOPEBASEDIR%%/lib/python/Interface
@@ -2070,11 +2471,19 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/App/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/App
 @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl/www
+@dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/public_module/submodule
+@dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/public_module
+@dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/private_module/submodule
+@dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/private_module
+@dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/mixed_module/submodule
+@dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/mixed_module
 @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite
 @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl
 @dirrm %%ZOPEBASEDIR%%/lib/python
 @dirrm %%ZOPEBASEDIR%%/lib/Components/zlib
+@dirrm %%ZOPEBASEDIR%%/lib/Components/initgroups
 @dirrm %%ZOPEBASEDIR%%/lib/Components/cPickle
 @dirrm %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output
 @dirrm %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test