From 3f22627f4454ae8e01eb1731b24b0b4fe6e82dd3 Mon Sep 17 00:00:00 2001 From: tsarna Date: Tue, 15 Feb 2000 02:48:39 +0000 Subject: Update to 2.1.4. Besides the changes listed below, the pkg was also fractured into two more pieces: py-extclass and py-dtml, which are independantly useful. Highlights of changes from 2.0.1 to 2.1.4: - Performance improvements - Switch to new dtml syntax by default. - Many ZCatalog improvements - try/except, try/except/else in DTML (py-dtml package) - FastCGI support (not on NetBSD yet -- no threads) - Two security fixes (mostly for sites that allow untrusted people to write DTML) - Two object database fixes when working with versions and doing a pack - Other minor bugs See full changes at http://www.zope.org/Products/Zope/2.1.4/CHANGES.txt --- www/zope/Makefile | 14 +++++++++----- www/zope/files/Makefile.in | 14 +++----------- www/zope/files/md5 | 4 ++-- www/zope/files/zope-install.py | 5 +++-- www/zope/patches/patch-aa | 31 +++++++++++++++++++++++++------ www/zope/pkg/DESCR | 10 ---------- 6 files changed, 42 insertions(+), 36 deletions(-) (limited to 'www/zope') diff --git a/www/zope/Makefile b/www/zope/Makefile index 37a6c956502..9d072b154de 100644 --- a/www/zope/Makefile +++ b/www/zope/Makefile @@ -1,16 +1,18 @@ -# $NetBSD: Makefile,v 1.10 2000/02/05 14:12:23 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2000/02/15 02:48:39 tsarna Exp $ # -DISTNAME= Zope-2.0.1-src -PKGNAME= zope-2.0.1 +DISTNAME= Zope-2.1.4-src +PKGNAME= zope-2.1.4 CATEGORIES= www -MASTER_SITES= http://www.zope.org/Products/Zope/2.0.1/ +MASTER_SITES= http://www.zope.org/Products/Zope/2.1.4/ EXTRACT_SUFX= .tgz MAINTAINER= tsarna@netbsd.org HOMEPAGE= http://www.zope.org/ DEPENDS+= python-1.5.2:../../lang/python +DEPENDS+= py-extclass-2.1.4:../../lang/py-extclass +DEPENDS+= py-dtml-2.1.4:../../textproc/py-dtml PLIST_SRC= ${WRKDIR}/.PLIST_SRC @@ -19,7 +21,9 @@ ZOPEDIR= ${PREFIX}/lib/zope do-configure: ${SED} -e "s,@PREFIX@,${PREFIX}," \ <${FILESDIR}/Makefile.in > ${WRKSRC}/Makefile - (cd ${WRKSRC}; ${RM} -rf lib/Components/zlib) + (cd ${WRKSRC}/lib; ${RM} -rf Components/zlib \ + Components/ExtensionClass python/DocumentTemplate \ + python/StructuredText) (cd ${WRKSRC}; make configure) do-install: diff --git a/www/zope/files/Makefile.in b/www/zope/files/Makefile.in index 2bca3765660..fbb6506dbdd 100644 --- a/www/zope/files/Makefile.in +++ b/www/zope/files/Makefile.in @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.in,v 1.4 1999/09/23 17:42:59 tsarna Exp $ +# $NetBSD: Makefile.in,v 1.5 2000/02/15 02:48:40 tsarna Exp $ -all: all-pcgi all-lib all-dt all-zodb all-search all-expat link-cpickle -configure: config-pcgi config-lib config-dt config-zodb config-search \ +all: all-pcgi all-lib all-zodb all-search all-expat link-cpickle +configure: config-pcgi config-lib config-zodb config-search \ config-expat config-pcgi: @@ -18,14 +18,6 @@ config-lib: all-lib: (cd lib/python; make) -config-dt: - (cd lib/python/DocumentTemplate; \ - cp @PREFIX@/lib/python1.5/config/Makefile.pre.in . ; \ - make -f Makefile.pre.in boot PYTHON=python) - -all-dt: - (cd lib/python/DocumentTemplate; make) - config-zodb: (cd lib/python/ZODB; \ cp @PREFIX@/lib/python1.5/config/Makefile.pre.in . ; \ diff --git a/www/zope/files/md5 b/www/zope/files/md5 index acaf09dfe33..c328238dd51 100644 --- a/www/zope/files/md5 +++ b/www/zope/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.6 1999/09/23 17:42:59 tsarna Exp $ +$NetBSD: md5,v 1.7 2000/02/15 02:48:40 tsarna Exp $ -MD5 (Zope-2.0.1-src.tgz) = 72010bdc62585201dc5ef658422de42a +MD5 (Zope-2.1.4-src.tgz) = 1260517dbf159869c594d3ba464fff9a diff --git a/www/zope/files/zope-install.py b/www/zope/files/zope-install.py index 2866be5ac3c..5ca3d60fe91 100755 --- a/www/zope/files/zope-install.py +++ b/www/zope/files/zope-install.py @@ -1,6 +1,6 @@ #!/usr/pkg/bin/python # -# $NetBSD: zope-install.py,v 1.4 1999/09/23 17:42:59 tsarna Exp $ +# $NetBSD: zope-install.py,v 1.5 2000/02/15 02:48:40 tsarna Exp $ # # Copyright (c) 1998,1999 Endicor Technologies, Inc. # All rights reserved. Written by Ty Sarna @@ -177,5 +177,6 @@ RewriteEngine on RewriteCond %%{HTTP:Authorization} ^(.*) RewriteRule ^/%(instance)s($|/)(.*) %(cgidir)s/%(instance)s.cgi/$2 [e=HTTP_CGI_AUTHORIZATION:%%1,t=application/x-httpd-cgi,l] -You may need to add Options ExecCGI on "" for this to work. +You may need to add Options ExecCGI on "" and your cgi-bin +directory for this to work. """ % vars()) diff --git a/www/zope/patches/patch-aa b/www/zope/patches/patch-aa index 758de50c2b2..0661c9ec2f8 100644 --- a/www/zope/patches/patch-aa +++ b/www/zope/patches/patch-aa @@ -1,10 +1,29 @@ -$NetBSD: patch-aa,v 1.3 1999/12/08 07:27:55 rh Exp $ +$NetBSD: patch-aa,v 1.4 2000/02/15 02:48:40 tsarna Exp $ ---- lib/python/Setup.orig Tue Jul 20 00:55:11 1999 -+++ lib/python/Setup Wed Dec 8 08:25:10 1999 -@@ -20,4 +20,4 @@ - intSet ../Components/BTree/intSet.c -I../Components/ExtensionClass -I../Components/BTree -I./ZODB +Remove stuff built by other packages (py-extclass, zlib incl. in python) + +--- lib/python/Setup.orig Mon Jul 19 18:55:11 1999 ++++ lib/python/Setup Mon Feb 14 20:37:57 2000 +@@ -1,15 +1,5 @@ + *shared* +-ExtensionClass ../Components/ExtensionClass/ExtensionClass.c -I../Components/ExtensionClass +-Acquisition ../Components/ExtensionClass/Acquisition.c -I../Components/ExtensionClass +-MethodObject ../Components/ExtensionClass/MethodObject.c -I../Components/ExtensionClass +-MultiMapping ../Components/ExtensionClass/MultiMapping.c -I../Components/ExtensionClass +-ThreadLock ../Components/ExtensionClass/ThreadLock.c -I../Components/ExtensionClass +-Missing ../Components/ExtensionClass/Missing.c -I../Components/ExtensionClass +-Sync ../Components/ExtensionClass/Sync.c -I../Components/ExtensionClass +-Record ../Components/ExtensionClass/Record.c -I../Components/ExtensionClass +-ComputedAttribute ../Components/ExtensionClass/ComputedAttribute.c -I../Components/ExtensionClass +- + cStringIO ../Components/cPickle/cStringIO.c + cPickle ../Components/cPickle/cPickle.c +@@ -18,6 +8,3 @@ + IOBTree ../Components/BTree/IOBTree.c -I../Components/ExtensionClass -I../Components/BTree -I./ZODB + OIBTree ../Components/BTree/OIBTree.c -I../Components/ExtensionClass -I../Components/BTree -I./ZODB + intSet ../Components/BTree/intSet.c -I../Components/ExtensionClass -I../Components/BTree -I./ZODB +- +- -zlib ../Components/zlib/zlib.c -I../Components/zlib ../Components/zlib/adler32.c ../Components/zlib/compress.c ../Components/zlib/crc32.c ../Components/zlib/gzio.c ../Components/zlib/uncompr.c ../Components/zlib/deflate.c ../Components/zlib/trees.c ../Components/zlib/zutil.c ../Components/zlib/inflate.c ../Components/zlib/infblock.c ../Components/zlib/inftrees.c ../Components/zlib/infcodes.c ../Components/zlib/infutil.c ../Components/zlib/inffast.c -+#zlib ../Components/zlib/zlib.c -I../Components/zlib ../Components/zlib/adler32.c ../Components/zlib/compress.c ../Components/zlib/crc32.c ../Components/zlib/gzio.c ../Components/zlib/uncompr.c ../Components/zlib/deflate.c ../Components/zlib/trees.c ../Components/zlib/zutil.c ../Components/zlib/inflate.c ../Components/zlib/infblock.c ../Components/zlib/inftrees.c ../Components/zlib/infcodes.c ../Components/zlib/infutil.c ../Components/zlib/inffast.c diff --git a/www/zope/pkg/DESCR b/www/zope/pkg/DESCR index e2a02660136..2d65ceefd41 100644 --- a/www/zope/pkg/DESCR +++ b/www/zope/pkg/DESCR @@ -7,13 +7,3 @@ Server, and the like. These products are aimed at systems programmers and relational databases. Zope, however, contains a powerful and simple scripting object model and high-performance, integrated object database. Thus the term "platform". - -Zope is divided into a number of systems, each described below. First, -the Z Publisher provides object publishing that integrates with common -web servers using a number of protocols, such as Zope's Persistent CGI. -The Z Framework contains the foundation for the environment and builtin -objects such as folders, documents, and images. The Z Template system -provides dynamic page generation. The Z Object Database gives an -advanced storage system that integrates tightly with Zope's web object -model. Finally, Z SQL Methods and Z Database Adapters provide -object-relational integration of data in popular SQL servers -- cgit v1.2.3