update to zope-2.7.2!!!

new MAINTAINER timeout ...
some input from Aleksander Piotrowski;
This commit is contained in:
xsa 2004-08-03 10:16:36 +00:00
parent 3f814c97f4
commit db1072e6d9
16 changed files with 1468 additions and 1656 deletions

View File

@ -1,94 +1,62 @@
# $OpenBSD: Makefile,v 1.17 2003/06/21 07:49:24 pvalchev Exp $
# $OpenBSD: Makefile,v 1.18 2004/08/03 10:16:36 xsa Exp $
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
COMMENT= "object-oriented web application server"
VERSION= 2.6.1
PORT_VERSION= ${VERSION}
DISTNAME= Zope-${VERSION}-src
PKGNAME= zope-${PORT_VERSION}
VERSION= 2.7.2
DISTNAME= Zope-${VERSION}-0
PKGNAME= ${DISTNAME:S/-0//g:L}
CATEGORIES= www
HOMEPAGE= http://www.zope.org/
# Zope Public License (ZPL) 2.0 <http://www.zope.org/Resources/ZPL>
MAINTAINER= Marc Balmer <marc@msys.ch>
# Zope Public License
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MAINTAINER= Maurice Nonnekes <maurice@amaze.nl>
MASTER_SITES= http://www.zope.org/Products/Zope/${VERSION}/
MASTER_SITES= ${HOMEPAGE}Products/Zope/${VERSION}/
EXTRACT_SUFX= .tgz
DIST_SUBDIR= zope
PYTHON_VER= 2.3
PYTHON_BIN= ${LOCALBASE}/bin/python${PYTHON_VER}
#MASTER_SITES0= http://www.zope.org/Members/zigg/UnixSecurityPatch/
#PATCHFILES= Zope-${VERSION}-unix-security.patch:0
#PATCH_DIST_STRIP=-p1
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= ::lang/python/${PYTHON_VER} \
::lang/python/${PYTHON_VER},-expat
#HOTFIX_DATE1= 2002-06-14
#MASTER_SITES1= http://www.zope.org/Products/Zope/Hotfix_${HOTFIX_DATE1}/
CONFIGURE_STYLE=simple
CONFIGURE_ARGS= --with-python=${LOCALBASE}/bin/python${PYTHON_VER} \
--prefix=${WRKINST}/${ZOPEHOME} \
--build-base=${WRKSRC}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
BUILD_DEPENDS= :python->=2.1.3,<2.2:lang/python/2.1
RUN_DEPENDS= :python->=2.1.3,<2.2:lang/python/2.1
# Note that the configure script is really just for pcgi, but it's
# the only one in the package.
CONFIGURE_STYLE=gnu
WRKBUILD= ${WRKSRC}/pcgi
MODGNU_CONFIG_GUESS_DIRS= ${WRKBUILD}
MAKE_FILE= makefile
ALL_TARGET= build
ZOPEHOME= ${PREFIX}/lib/zope
PRODUCTSDIR= ${ZOPEHOME}/lib/python/Products
ZOPELIBDIR= ${ZOPEHOME}/lib/python
ZOPEPRODUCTSDIR=${ZOPELIBDIR}/Products
ZOPEUSER= _zope
ZOPEGROUP= _zope
do-build:
cd ${WRKSRC} && \
ZDIR=${ZOPEHOME} ${LOCALBASE}/bin/python2.1 w_pcgi.py && \
ZDIR=${ZOPEHOME} ${LOCALBASE}/bin/python2.1 \
-O inst/compilezpy.py
sed -e "s%@@PREFIX@@%${PREFIX}%g" \
-e "s%@@LOCALBASE@@%${LOCALBASE}%g" \
< ${FILESDIR}/zope-instance > ${WRKSRC}/zope-instance
SUBST_VARS+= PYTHON_VER ZOPEHOME ZOPEUSER ZOPEGROUP
# All this should give us what closely resembles a zope.org binary
# installation and allow us to rely as much as possible on make
# plist to update to newer versions.
pre-configure:
@perl -pi -e 's,%%ZOPEPRODUCTSDIR%%,${ZOPEPRODUCTSDIR},g;' \
-e 's,%%ZOPEUSER%%,${ZOPEUSER},g' \
${WRKSRC}/skel/etc/zope.conf.in
@sed -e 's,%%ZOPEHOME%%,${ZOPEHOME},g' \
< ${FILESDIR}/README.OpenBSD > ${WRKSRC}/README.OpenBSD
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/zope-instance ${PREFIX}/bin
${INSTALL_PROGRAM_DIR} ${ZOPEHOME}
cp -Rp ${WRKSRC}/* ${ZOPEHOME}
chown -R ${BINOWN}:${BINGRP} ${ZOPEHOME}
cd ${ZOPEHOME}/lib && ln -fs ../../python2.1
rm -r ${ZOPEHOME}/*.txt ${ZOPEHOME}/doc ${ZOPEHOME}/lib/Components \
${ZOPEHOME}/pcgi/Win32
find ${ZOPEHOME} -name \*.orig -or -name \*.o -or -name .cvsignore \
-or -name sedscript -or -name \*.old | xargs rm
find ${ZOPEHOME}/lib/python -name config.c -or -name Makefile \
-or -name Makefile.pre -or -name Makefile.pre.in | xargs rm
rm ${ZOPEHOME}/pcgi/Makefile \
${ZOPEHOME}/pcgi/config.log ${ZOPEHOME}/pcgi/config.status \
${ZOPEHOME}/pcgi/config.cache ${ZOPEHOME}/zope-instance \
${ZOPEHOME}/w*_pcgi.py*
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/zope/changenotes
${INSTALL_DATA} ${WRKSRC}/*.txt ${WRKSRC}/doc/*.txt \
${PREFIX}/share/doc/zope
${INSTALL_DATA} ${WRKSRC}/doc/changenotes/* \
${PREFIX}/share/doc/zope/changenotes
echo "Zope ${VERSION} (OpenBSD package zope-${PORT_VERSION})" \
> ${PREFIX}/lib/zope/lib/python/version.txt
# ${INSTALL_DATA_DIR} ${PRODUCTSDIR}/Hotfix_${HOTFIX_DATE1}
# ${INSTALL_DATA} \
# ${WRKDIR}/lib/python/Products/Hotfix_${HOTFIX_DATE1}/* \
# ${PRODUCTSDIR}/Hotfix_${HOTFIX_DATE1}
post-install:
${INSTALL_DATA} ${WRKSRC}/README.OpenBSD ${ZOPEHOME}/doc
do-regress:
cd ${WRKSRC} && ${LOCALBASE}/bin/python2.1 utilities/testrunner.py -a
do-regress: fake
${PYTHON_BIN} ${WRKINST}/${ZOPEHOME}/bin/test.py \
--all -vv -p --libdir ${WRKINST}/${ZOPELIBDIR}
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (zope/Zope-2.6.1-src.tgz) = a17f36b86b6e489797d8e52f1ba48efe
RMD160 (zope/Zope-2.6.1-src.tgz) = c6a66ea2e0f449af7c6e01a02473c168a5578a01
SHA1 (zope/Zope-2.6.1-src.tgz) = 9eddfc8a0e173bd80f655ed1dda102b4256a3cc9
MD5 (Zope-2.7.2-0.tgz) = 08b3c4a119aa1ded2e7b1b3d5bc45425
RMD160 (Zope-2.7.2-0.tgz) = 36cc744612e222228b8f6c705ff292ba379fcebe
SHA1 (Zope-2.7.2-0.tgz) = 8a38d8566874075b42057ff16eab74a80df268f0

View File

@ -0,0 +1,39 @@
$OpenBSD: README.OpenBSD,v 1.1 2004/08/03 10:16:36 xsa Exp $
In this document we'll see how to create a zope instance and have it
start at boot time. Throughout this document, we will assume that the
instance you want will be located in /var/www under the name of 'zope'.
Our instance will thus be /var/www/zope.
1) Creating your instance
- run %%ZOPEHOME%%/bin/mkzopeinstance.py to create your instance:
# %%ZOPEHOME%%/bin/mkzopeinstance.py
Please choose a directory in which you'd like to install
Zope "instance home" files such as database files, configuration
files, etc.
Directory: /var/www/zope
Please choose a username and password for the initial user.
These will be the credentials you use to initially manage
your new Zope instance.
Username: zopeadmin
Password:
Verify password:
- as we want to run our instance(s) with the _zope user, we should
grant him the rights on the log/ and var/ directories.
# chown _zope /var/www/zope/{log,var}
2) Have your instance start at boot time:
- to have your instance start at boot time, add the following to your
/etc/rc.local.
if [ -r /var/www/zope/etc/zope.conf -a -x /var/www/zope/bin/zopectl ]; then
echo -n ' zope'
/var/www/zope/bin/zopectl start
fi

View File

@ -1,65 +0,0 @@
#!@@LOCALBASE@@/bin/python2.1
#
# $OpenBSD: zope-instance,v 1.3 2001/11/02 03:35:11 matt Exp $
#
# Build a Zope INSTANCE_HOME in the specified directory.
#
# Run this script as the user who will be owning this Zope installation.
# The instance directory must already exist, and be empty.
#
# Matt Behrens <matt@openbsd.org>
#
zopehome="@@PREFIX@@/lib/zope"
import os, shutil, sys
if len(sys.argv) != 2:
print "usage: %s instance-directory" % sys.argv[0]
sys.exit(0)
instancehome=os.path.abspath(sys.argv[1])
for directory in ("import", "var", "Extensions", "Products"):
os.mkdir(os.path.join(instancehome, directory))
# Copy the initial Data.fs
datafs = "%s/var/Data.fs" % instancehome
shutil.copyfile("%s/var/Data.fs.in" % zopehome, datafs)
os.chmod(datafs, 0600)
# Import installation modules
sys.path.insert(0, zopehome)
sys.path.insert(0, "%s/inst" % zopehome)
import make_start, zpasswd
python=sys.executable
# Create Zope.cgi
open("%s/Zope.cgi" % instancehome, "w").write(
"""#!%(zopehome)s/pcgi/pcgi-wrapper
PCGI_NAME=Zope
PCGI_MODULE_PATH=%(zopehome)s/lib/python/Zope
PCGI_PUBLISHER=%(zopehome)s/pcgi/pcgi_publisher.py
PCGI_EXE=%(python)s
PCGI_SOCKET_FILE=%(instancehome)s/var/pcgi.soc
PCGI_PID_FILE=%(instancehome)s/var/pcgi.pid
PCGI_ERROR_LOG=%(instancehome)s/var/pcgi.log
PCGI_DISPLAY_ERRORS=1
BOBO_REALM=%(instancehome)s/Zope.cgi
BOBO_DEBUG_MODE=1
INSTANCE_HOME=%(instancehome)s
""" % vars())
os.chmod("%s/Zope.cgi" % instancehome, 04750)
# Create start and stop scripts
make_start.sh(instancehome, '', '')
open("%s/start" % instancehome, "w").write(
"""#!/bin/sh
export INSTANCE_HOME=%(instancehome)s
export PYTHONHOME=%(zopehome)s
exec %(python)s -O $PYTHONHOME/z2.py -D "$@" -p %(instancehome)s/Zope.cgi
""" % vars())
# Create the admin user
zpasswd.write_inituser(instancehome, '', '')

View File

@ -1,11 +1,11 @@
# $OpenBSD: zope.port.mk,v 1.2 2003/07/31 07:01:22 jolan Exp $
# $OpenBSD: zope.port.mk,v 1.3 2004/08/03 10:16:36 xsa Exp $
#
# zope.port.mk - Xavier Santolaria <xavier@santolaria.net>
# This file is in the public domain.
MODZOPE_PYTHON_VERSION= 2.1
MODZOPE_PYTHON_VERSION= 2.3
BUILD_DEPENDS+= :python->=${MODZOPE_PYTHON_VERSION},<2.2:lang/python/${MODZOPE_PYTHON_VERSION}
BUILD_DEPENDS+= ::lang/python/${MODZOPE_PYTHON_VERSION}
RUN_DEPENDS+= ::www/zope
MODZOPE_HOME= ${PREFIX}/lib/zope
@ -17,8 +17,11 @@ PYTHON_INCLUDEDIR= ${LOCALBASE}/include/python${MODZOPE_PYTHON_VERSION}
NO_REGRESS= Yes
# dirty way to do it with no modifications in bsd.port.mk
.if !target(do-build)
do-build:
${PYTHON_BIN} ${PYTHON_LIBDIR}/compileall.py ${WRKDIST}
.endif
post-install:
${CHOWN} -R ${LIBOWN}:${LIBGRP} ${MODZOPE_PRODUCTSDIR}

View File

@ -1,29 +0,0 @@
$OpenBSD: patch-inst_build_pcgi_py,v 1.2 2002/04/25 15:38:55 matt Exp $
This patch overrides pcgi's configure script, since the
port already runs configure.
--- inst/build_pcgi.py.orig Wed Nov 28 10:50:50 2001
+++ inst/build_pcgi.py Thu Apr 25 10:42:09 2002
@@ -10,6 +10,14 @@
# FOR A PARTICULAR PURPOSE
#
##############################################################################
+
+# NOTICE AS REQUIRED BY LICENSE
+#
+# August 5, 2001
+#
+# This file has been modified to remove the call to the configure script,
+# since the OpenBSD package build process already takes care of this.
+
"""Build a PCGI
You must be in the directory containing this script.
@@ -21,6 +29,5 @@ print "Building the PCGI wrapper"
from do import *
os.chdir('pcgi')
-do('./configure')
do('make')
os.chdir('..')

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib_Components_initgroups_initgroups_c,v 1.1 2004/08/03 10:16:36 xsa Exp $
--- lib/Components/initgroups/initgroups.c.orig 2002-07-25 23:54:02.000000000 +0200
+++ lib/Components/initgroups/initgroups.c 2004-06-19 08:52:13.000000000 +0200
@@ -25,7 +25,7 @@ initgroups_initgroups(PyObject *self, Py
char *username;
gid_t gid;
- if (!PyArg_ParseTuple(args, "sl:initgroups", &username, &gid))
+ if (!PyArg_ParseTuple(args, "si:initgroups", &username, &gid))
return NULL;
if (initgroups(username, gid) == -1)

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-skel_etc_zope_conf_in,v 1.1 2004/08/03 10:16:36 xsa Exp $
--- skel/etc/zope.conf.in.orig 2004-01-09 00:34:08.000000000 +0100
+++ skel/etc/zope.conf.in 2004-04-28 16:43:24.000000000 +0200
@@ -80,6 +80,8 @@ instancehome $INSTANCE
#
# products /home/chrism/projects/myproducts
+products %%ZOPEPRODUCTSDIR%%
+products $INSTANCE/Products
# Directive: environment
#
@@ -138,6 +140,7 @@ instancehome $INSTANCE
#
# effective-user chrism
+effective-user %%ZOPEUSER%%
# Directive: enable-product-installation
#

View File

@ -1,32 +0,0 @@
$OpenBSD: patch-w_pcgi_py,v 1.2 2002/04/25 15:38:55 matt Exp $
We don't need to make a resource file; that's handled by
zope-instance.
--- w_pcgi.py.orig Wed Nov 28 10:50:49 2001
+++ w_pcgi.py Thu Apr 25 10:43:13 2002
@@ -10,6 +10,14 @@
# FOR A PARTICULAR PURPOSE
#
##############################################################################
+
+# NOTICE AS REQUIRED BY LICENSE
+#
+# August 5, 2001
+#
+# Remove the make_resource steps, as this is handled by our zope-instance
+# script.
+
"""Try to do all of the installation steps.
This must be run from the top-level directory of the installation.
@@ -30,9 +38,6 @@ def main(me):
home=setup(me)
import build_pcgi
- user=group=''
- pcgi=os.path.join(home, 'Zope.cgi')
- import make_resource; make_resource.main(home, pcgi, user, group)
os.chdir(home) # Just making sure
import wo_pcgi; wo_pcgi.main(me)

View File

@ -1,35 +0,0 @@
$OpenBSD: patch-wo_pcgi_py,v 1.3 2003/05/14 21:35:52 krw Exp $
We don't need to build Data.fs, start/stop, or inituser;
these are handled by zope-instance.
--- wo_pcgi.py.orig Wed Aug 14 17:11:39 2002
+++ wo_pcgi.py Wed Apr 16 20:33:59 2003
@@ -10,6 +10,14 @@
# FOR A PARTICULAR PURPOSE
#
##############################################################################
+
+# NOTICE AS REQUIRED BY LICENSE
+#
+# August 5, 2001
+#
+# Removed building of Data.fs, start/stop, and inituser; these are handled
+# by our zope-instance script.
+
"""Try to do all of the installation steps.
This must be run from the top-level directory of the installation.
@@ -31,12 +39,6 @@
walkandscrub.walkandscrub(home)
import compilezpy
import build_extensions
- user=group=''
- import default_content; default_content.main(home, user, group)
-
- pcgi=os.path.join(home, 'Zope.cgi')
- import make_start; make_start.sh(home, user, group)
- import zpasswd; zpasswd.write_inituser(home, user, group)
print '-'*78
print

27
www/zope/pkg/DEINSTALL Normal file
View File

@ -0,0 +1,27 @@
#!/bin/sh
# $OpenBSD: DEINSTALL,v 1.1 2004/08/03 10:16:37 xsa Exp $
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
ZOPEUSER=${ZOPEUSER}
ZOPEGROUP=${ZOPEGROUP}
if [ ${PKG_DELETE_EXTRA} != Yes ]; then
echo
echo "+---------------"
echo "| To completely deinstall the $1 package you need to perform"
echo "| these steps as root:"
echo "|"
if userinfo -e $ZOPEUSER; then
echo "| userdel $ZOPEUSER"
fi
if groupinfo -e $ZOPEGROUP; then
echo "| groupdel $ZOPEGROUP"
fi
echo "|"
echo "| Do not do this if you plan on re-installing"
echo "| $1 at some future time."
echo "+---------------"
echo
fi
exit 0

View File

@ -6,6 +6,6 @@ personalization, and e-commerce into your web applications.
Zope consists of a number of components which work together to
provide a complete yet flexible application server package. Zope
includes an internet server, a transactional object database, a
includes an Internet server, a transactional object database, a
search engine, a web page templating system, a through the web
development and management tool, and comprehensive extension support.

51
www/zope/pkg/INSTALL Normal file
View File

@ -0,0 +1,51 @@
#!/bin/sh
# $OpenBSD: INSTALL,v 1.1 2004/08/03 10:16:37 xsa Exp $
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
ZOPEUSER=${ZOPEUSER}
ZOPEGROUP=${ZOPEGROUP}
ID=534
do_usergroup_install()
{
if groupinfo -e $ZOPEGROUP; then
echo "===> Using $ZOPEGROUP group for Zope"
else
echo "===> Creating $ZOPEGROUP group for Zope"
groupadd -g $ID $ZOPEGROUP
fi
if userinfo -e $ZOPEUSER; then
echo "===> Using $ZOPEUSER user for Zope"
else
echo "===> Creating $ZOPEUSER user for Zope"
useradd -g $ZOPEGROUP \
-d /nonexistent \
-L daemon \
-c 'Zope Account' \
-s /sbin/nologin \
-u $ID $ZOPEUSER
fi
}
# verify proper execution
#
if [ $# -ne 2 ]; then
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
exit 1
fi
# Verify/process the command
#
case $2 in
PRE-INSTALL)
do_usergroup_install
;;
POST-INSTALL)
;;
*)
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
exit 1
;;
esac
exit 0

View File

@ -4,11 +4,6 @@
| to install the Zope package once and create as many sites as you
| want without changing your core Zope installation.
|
| To create a Zope site, create a user and group to own it, create a
| directory for the site, and run
|
| ${PREFIX}/bin/zope-instance /path/to/site
|
| as the user who will own the site.
| Have a look at ${ZOPEHOME}/doc/README.OpenBSD
| to see how to create your instance and have it start at boot time.
+---------------

47
www/zope/pkg/PFRAG.shared Normal file
View File

@ -0,0 +1,47 @@
@comment $OpenBSD: PFRAG.shared,v 1.1 2004/08/03 10:16:37 xsa Exp $
lib/zope/lib/python/AccessControl/cAccessControl.so
lib/zope/lib/python/Acquisition.so
lib/zope/lib/python/BDBStorage/_helper.so
lib/zope/lib/python/BTree.so
lib/zope/lib/python/BTrees/_IIBTree.so
lib/zope/lib/python/BTrees/_IOBTree.so
lib/zope/lib/python/BTrees/_OIBTree.so
lib/zope/lib/python/BTrees/_OOBTree.so
lib/zope/lib/python/BTrees/_fsBTree.so
lib/zope/lib/python/ComputedAttribute.so
lib/zope/lib/python/DocumentTemplate/cDocumentTemplate.so
lib/zope/lib/python/ExtensionClass.so
lib/zope/lib/python/IIBTree.so
lib/zope/lib/python/IOBTree.so
lib/zope/lib/python/MethodObject.so
lib/zope/lib/python/Missing.so
lib/zope/lib/python/MultiMapping.so
lib/zope/lib/python/OIBTree.so
lib/zope/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/ISO_8859_1_Splitter.so
lib/zope/lib/python/Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter/UnicodeSplitter.so
lib/zope/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/ZopeSplitter.so
lib/zope/lib/python/Products/ZCTextIndex/okascore.so
lib/zope/lib/python/Products/ZCTextIndex/stopper.so
lib/zope/lib/python/Record.so
lib/zope/lib/python/SearchIndex/Splitter.so
lib/zope/lib/python/Shared/DC/xml/pyexpat/dcpyexpat.so
lib/zope/lib/python/ThreadLock.so
lib/zope/lib/python/ZODB/TimeStamp.so
lib/zope/lib/python/ZODB/cPersistence.so
lib/zope/lib/python/ZODB/cPickleCache.so
lib/zope/lib/python/ZODB/coptimizations.so
lib/zope/lib/python/ZODB/winlock.so
lib/zope/lib/python/initgroups.so
lib/zope/lib/python/intSet.so
@comment NEWDYNLIBDIR(%D/lib/zope/lib/python)
@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/AccessControl)
@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/BDBStorage)
@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/BTrees)
@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/DocumentTemplate)
@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter)
@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter)
@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter)
@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/Products/ZCTextIndex)
@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/SearchIndex)
@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/Shared/DC/xml/pyexpat)
@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/ZODB)

File diff suppressed because it is too large Load Diff