pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/zope29 Update zope29 to 2.9.8 (Zope 2.9.8) with ne...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2115a9f3418a
branches:  trunk
changeset: 536627:2115a9f3418a
user:      taca <taca%pkgsrc.org@localhost>
date:      Tue Dec 18 15:31:11 2007 +0000

description:
Update zope29 to 2.9.8 (Zope 2.9.8) with new framework.

  Zope 2.9.8 (2007/07/05)

   Bugs fixed

      - updated to ZODB 3.6.3

      - updated to Zope 3.2.3 codebase

      - Collector #1306: Missing acquisition context on local roles screen.

      - The REQUEST no longer accepts holds after it has been closed.

      - Collector #2153: Supporting unquoted cookies with spaces.

      - Collector #2295: Comments in PythonScripts could lead to syntax
        errors

      - Collector #2307: ObjectCopiedEvent not dispatched to sublocations.

      - Fixed ZClass test breakage due to non-pickleability of
        'zope.interface.Implements'

        N.B.: updated 'zope.interface' package to Zope 3.2 branch;
              should be pinned to a tag or a release before releasing
              2.9.8).

      - Collector #2260: fixed a bug in Examples.zexp

      - Collector #2321: Skip trusted proxies when extracting the client IP
        address from the request.

      - Collector #2318: Allow override of zopectl's control socket in
        zope.conf

      - Collector #2316: correctly unpack DateTimeIndex dates when browsing the
        index.

      - Collector #1866: a 304 HTTP status should not have a content length.

      - Collector #2300: delimit *all* HTTP Response headers with CRLF.

  Zope 2.9.7 (2007/03/25)

   Bugs fixed

      - Protected various security mutators with a new postonly decorator.
        The decorator limits method publishing to POST requests only, and
        is a backport from Zope 2.11's requestmethod decorator factory.

      - Collector #2298: webdav.Resource.COPY and webdav.Resource.MOVE did
        not send the expected copy/move events.

      - Collector #2296: Fixed import of ZClass products, broken by removal
        of BBB support for pasting objects whose meta_type info was
        permission-free.

      - Collector #2294: Protected DOS-able ControlPanel methods with the
        same 'requestmethod' wrapper.

      - Collector #2294: Protected various security mutators with a new
        'postonly' decorator.  The decorator limits method publishing to
        POST requests only, and is a backport from Zope 2.11's requestmethod
        decorator factory.

      - Collector #2288: @ and + should not be quoted when forming
        request URLs in BaseRequest and HTTPRequest

      - Undeprectated 'zLOG' package, which is going to remain a
        backward-compatibility shim for the Python logger.

      - Collector #2263: 'field2ulines' did not convert empty string
        correctly.

      - Reverted backward-incompatible fix for Collector #2191.

      - added Python 2.4.4 as optimal Python version to 'configure'


  Zope 2.9.6 (2006-11-22)

   Bugs fixed

      - Collector #2191: extended DateTime parser for better support
        to the ISO8601 specification.

      - Reworking of _cached_result in Shared.DC.ZRDB.DA.DA:

        - fixed KeyError reported in Collector #2212

        - fixed two memory leaks that occurred under high load

        - fixed broken cache keys for people using the obscure
          Shared.DC.ZRDB.DA.DA.connection_hook

        - fixed incorrect cache ordering resulting in newer results
          being dumped when the cache became too large.

      - Collector #2237: 'make' doesn't tell you to run 'make inplace'
        before running 'make instance'.

      - Collector #2235: A number of ZCatalog methods were doing boolean
        evaluation of objects that implemented __len__ instead of checking
        them against None. Replaced a number of "if not obj" with
        "if obj is None".

      - Collector #2218: fixed wrong logger argument in OFS/Cache.py

      - Collector #2205: fixed wrong logger argument in ZRDB/Connection.py

      - Collector #2208: rewriting/setting the 'charset' part of the
        content-type HTTP header will be done only for 'text/*'

      - Collector #2206: Set PYTHONPATH to include existing PYTHONPATH
        in skel/bin/zopectl.in and skel/bin/runzope.in

  Zope 2.9.5 (2006/10/03)

   Bugs fixed

      - Call setDefaultSkin on new requests created as the result of
        ConflictError retries.

      - Collector #2189: Fix logging of errors during product refresh.

      - Collector #2185: Log username for FCGI requests.

      - Collector #2152: Fixed MailHost documentation; simple_send does not
        process or validate its arguments in any way.

      - Collector #2175: ZTUtils.make_hidden_input did not escape double-quotes.

      - Collector #1907: Moved 'alt' property from File to Image.

      - Collector #1983: Specifying session-resolution-seconds >= 1200 caused
        Zope startup to fail.

      - Collector #2169: webdav.Resource.COPY did not send ObjectClonedEvent.

      - Updated Five to bugfix release 1.3.7.

      - Collector #2157: Expose name of broken class in SystemError raised
        from '__getstate__' of a broken instance.

      - Usage of 'urljoin' in 'webdav.davcmds' could lead to wrongly
        constructed urls.

      - Collector #2155: Fix wrong parameter being passed to
        logger's error() method, with tests.

      - Collector #2178: Fix ZopeTestCase doctest support for layers

      - included Zope 3.2.2

diffstat:

 www/zope29/DESCR                  |      2 -
 www/zope29/MESSAGE                |     40 +-
 www/zope29/Makefile               |    108 +-
 www/zope29/PLIST                  |  19112 ++++++++++++++++++-----------------
 www/zope29/distinfo               |     16 +-
 www/zope29/files/sitecustomize.py |     15 +
 www/zope29/files/zeo29.sh         |     49 +-
 www/zope29/files/zope29.sh        |     60 +-
 www/zope29/patches/patch-af       |     13 +
 www/zope29/patches/patch-ag       |     12 +
 www/zope29/patches/patch-ah       |     21 +
 www/zope29/patches/patch-ai       |     38 +
 www/zope29/patches/patch-aj       |      9 +
 13 files changed, 9866 insertions(+), 9629 deletions(-)

diffs (truncated from 19691 to 300 lines):

diff -r 768e023b6bfa -r 2115a9f3418a www/zope29/DESCR
--- a/www/zope29/DESCR  Tue Dec 18 15:27:23 2007 +0000
+++ b/www/zope29/DESCR  Tue Dec 18 15:31:11 2007 +0000
@@ -15,5 +15,3 @@
 Application Development                        Integrated Object Database
        DTML Scripting                          Managed Through the Web
        External Methods                        Direct URL Access to Objects
-
-WWW: http://www.zope.org/
diff -r 768e023b6bfa -r 2115a9f3418a www/zope29/MESSAGE
--- a/www/zope29/MESSAGE        Tue Dec 18 15:27:23 2007 +0000
+++ b/www/zope29/MESSAGE        Tue Dec 18 15:31:11 2007 +0000
@@ -1,13 +1,14 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2006/08/17 11:57:24 darcy Exp $
+$NetBSD: MESSAGE,v 1.2 2007/12/18 15:31:11 taca Exp $
 
 Zope Successfull installed.
 
 To create an instance of Zope please run
-${ZOPEBASEDIR}/bin/mkzopeinstance.py -d <INSTANCEDIR>
+${ZOPE_DIR}/bin/mkzopeinstance.py -d <INSTANCEDIR>
 
 <INSTANCEDIR> is the directory where the instance files should
-              be installed. This can be ${ZOPEBASEDIR}
+be installed. This can be ${ZOPE_DIR}
+but not recommended.
 
 Command-line options to 'mkzopeinstance' are available, and can be
 investigated by running 'mkzopeinstance.py --help'.
@@ -16,37 +17,32 @@
 when the package is deinstalled. You`ll have to delete them yourself.
 
 If Zope should get started automatically when the system starts,
-please add the following lines to /etc/rc.conf
+please add the following lines to /etc/rc.conf:
 
-zope_enable="YES"
-zope_instances="<INSTANCEDIR>"
+zope${ZOPE_VERSION}${RCVAR_SUFFIX}="YES"
+zope${ZOPE_VERSION}_instances="<INSTANCEDIR>"
+zope${ZOPE_VERSION}_encoding="<ENCODING>"
 
-Additional zope Instances have to be added to zope_instances
+You can optionally specify default character encoding for python
+as <ENCODING> (default is utf-8).
+
+Additional zope Instances have to be added to zope${ZOPE_VERSION}_instances
 seperated by a space.
 
 ** ZEO Instances ** (Optional)
 ** Please refere to http://zope.org/Products/ZEO/ZEOFactSheet
 
 If you want to run a ZEO server please create a ZEO instancen by
-calling ${ZOPEBASEDIR}/bin/mkzopeinstance.py <ZEODIR>
+calling ${ZOPE_DIR}/bin/mkzopeinstance.py <ZEODIR>
 
 To start the ZEO Server at System startup add the following lines to
 /etc/rc.conf
 
-zeo_enable="YES"
-zeo_instances="<ZEODIR>"
-
-Additional zeo Instances have to be added to zeo_instances seperated
-by a space.
-
-**********************************************************************
-****** ATTENTION ***** ATTENTION ***** ATTENTION ***** ATTENTION *****
+zeo${ZOPE_VERSION}${RCVAR_SUFFIX}="YES"
+zeo${ZOPE_VERSION}_instances="<ZEODIR>"
+zeo${ZOPE_VERSION}_encoding="<ENCODING>"
 
-The default installation directory for Zope Products has changed from
-${ZOPEBASEDIR}/lib/python/Products
-to ${ZOPEBASEDIR}/Products.
+Additional zeo Instances have to be added to zeo${ZOPE_VERSION}_instances
+seperated by a space.
 
-You might have to add the following lines to your zope.conf
-products ${ZOPEBASEDIR}/Products
-products $INSTANCE/Products
 ===========================================================================
diff -r 768e023b6bfa -r 2115a9f3418a www/zope29/Makefile
--- a/www/zope29/Makefile       Tue Dec 18 15:27:23 2007 +0000
+++ b/www/zope29/Makefile       Tue Dec 18 15:31:11 2007 +0000
@@ -1,75 +1,79 @@
-# $NetBSD: Makefile,v 1.12 2007/07/04 20:55:06 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/12/18 15:31:12 taca Exp $
 # FreeBSD Id: ports/www/zope29/Makefile,v 1.86 2006/08/03 15:53:04 garga Exp
 
-DISTNAME=      Zope-${VER}-final
-PKGNAME=       zope-${VER}
-PKGREVISION=   4
+DISTNAME=      Zope-${ZOPE29_VERSION}-final
+PKGNAME=       ${ZOPE_PKG_PREFIX}-${ZOPE29_VERSION}
 CATEGORIES=    www python
-MASTER_SITES=  http://www.zope.org/Products/Zope/${VER}/
+MASTER_SITES=  http://www.zope.org/Products/Zope/${ZOPE29_VERSION}/
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.zope.org/
 COMMENT=       Zope, the Z Object Publishing Environment
 
-DEPENDS+=      ${PYPKGPREFIX}-xml-[0-9]*:../../textproc/py-xml
-
-PYTHON_VERSIONS_ACCEPTED=   24
-RCD_SCRIPTS=   ${PKGBASE}29 zeo29
-
-VER=           2.9.4
-DIST_SUBDIR=   ${PKGBASE}29-20070321
-HOTFIXES=      Hotfix_20070320
+PYTHON_VERSIONS_ACCEPTED=      24
+ZOPE_VERSION=                  29
 
-DISTFILES=     ${DISTNAME}${EXTRACT_SUFX}
-.for f in ${HOTFIXES}
-DISTFILES+=            ${f}.tgz
-SITES.${f}.tgz= \
-       http://www.zope.org/Products/Zope/Hotfix-2007-03-20/Hotfix-20070320/
-.endfor
+HAS_CONFIGURE= yes
+CONFIGURE_ARGS=        --prefix=${ZOPE_DIR} --with-python=${PYTHONBIN} --quiet
+BUILD_TARGET=  build version_txt
+MAKE_FILE=     makefile
+PRIVILEGED_STAGES+=    clean
 
-# Change these, if you like, via the environment.
-ZOPE_USER?=            www
-WEBBASEDIR?=           www
-SZOPEBASEDIR?=         ${WEBBASEDIR}/Zope29
-
-# Do not change anything below this line.
-
+PKG_GROUPS_VARS+=      ZOPE_GROUP
 PKG_USERS_VARS+=       ZOPE_USER
 
-.if defined(INSTANCENAME)
-ZOPEINSTANCENAME=      ${INSTANCENAME}
+PKG_GROUPS=    ${ZOPE_GROUP}
+PKG_USERS=     ${ZOPE_USER}:${ZOPE_GROUP}
+RCD_SCRIPTS=   zope${ZOPE_VERSION} zeo${ZOPE_VERSION}
+
+FILES_SUBST+=  RCVAR_SUFFIX=${RCVAR_SUFFIX} VER=${ZOPE29_VERSION}
+MESSAGE_SUBST+=        RCVAR_SUFFIX=${RCVAR_SUFFIX} ZOPE_VERSION=${ZOPE_VERSION}
+
+SUBST_CLASSES+=                param
+SUBST_STAGE.param=     pre-configure
+SUBST_FILES.param+=    skel/etc/zope.conf.in utilities/mkzopeinstance.py
+SUBST_SED.param+=  -e "s|@ZOPE_PRODUCTS_DIR@|${ZOPE_PRODUCTS_DIR}|g"
+SUBST_SED.param+=      -e "s|@ZOPE_USER@|${ZOPE_USER}|g"
+SUBST_SED.param+=      -e "s|@ZOPE_GROUP@|${ZOPE_GROUP}|g"
+SUBST_MESSAGE.param=   Fixing some parameters in files.
+
+REPLACE_PYTHON+=       test.py lib/python/Zope2/Startup/zopectl.py \
+                       lib/python/zdaemon/zdctl.py lib/python/zdaemon/zdrun.py
+REPLACE_PYTHON_DIRS+=  ${WRKSRC}/lib/python/ZConfig/scripts ${WRKSRC}/utilities
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "FreeBSD"
+RCVAR_SUFFIX=  _enable
+.else
+RCVAR_SUFFIX=  # empty
 .endif
 
-ZOPEBASEDIR=           ${PREFIX}/${SZOPEBASEDIR}
-ZOPEINSTANCEBASE?=     ${PREFIX}/${SZOPEBASEDIR}
-ZOPEINSTANCEDIR?=      ${ZOPEINSTANCEBASE}/${ZOPEINSTANCENAME}
-
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS=        --prefix=${ZOPEBASEDIR} --with-python=${PYTHONBIN}
-
-BUILD_TARGET=  build
-MAKE_FILE=     makefile
-
-PLIST_SUBST=   ZOPEBASEDIR=${SZOPEBASEDIR}
-MESSAGE_SUBST+=        ZOPEBASEDIR=${ZOPEBASEDIR}
-MESSAGE_SUBST+=        ZOPE_USER=${ZOPE_USER}
-MESSAGE_SUBST+=        ZOPEINSTANCEDIR=${ZOPEINSTANCEDIR}
+OWN_DIRS+=     ${ZOPE_PRODUCTS_DIR}
 
 post-patch:
+       ${CP} ${FILESDIR}/sitecustomize.py ${WRKSRC}/lib/python
+       ${FIND} ${WRKSRC}/doc ${WRKSRC}/lib ${WRKSRC}/skel/import \
+               -type f -print0 | ${XARGS} -0 -- ${CHMOD} -x
+
+post-build:
+       cd ${WRKSRC}; ${PY_COMPILE_ALL} .
+
+pre-install:
        ${FIND} ${WRKSRC} -name '*.orig' -print0 | ${XARGS} -0 -- ${RM}
 
 post-install:
-       ${MV} ${ZOPEBASEDIR}/skel/etc/zope.conf.in \
-               ${ZOPEBASEDIR}/skel/etc/zope.conf.sample.in
-       ${MKDIR} ${ZOPEBASEDIR}/Products
-.for d in ${HOTFIXES}
-       cd ${WRKDIR}; ${PAX} -rw ${d} ${ZOPEBASEDIR}/lib/python/Products
-.endfor
-       ${FIND} ${ZOPEBASEDIR} -type f -print0 | ${XARGS} -0 -- ${CHMOD} a-w
+       ${INSTALL_DATA_DIR} ${ZOPE_DOC_DIR}/zeo
+       ${INSTALL_DATA_DIR} ${ZOPE_DOC_DIR}/zope
+       cd ${WRKSRC}/doc/ZEO; ${PAX} -rw *.txt ${ZOPE_DOC_DIR}/zeo
+       cd ${WRKSRC}/doc; ${PAX} -rw *.txt ${ZOPE_DOC_DIR}/zope
+       ${FIND} ${ZOPE_DIR} ${ZOPE_DOC_DIR} -type f -print0 \
+               | ${XARGS} -0 -- ${CHMOD} a-w+r
+       ${FIND} ${ZOPE_DIR} -type f -name '*.pyc' -print0 | \
+               ${XARGS} -0 -- ${CHMOD} a-x
 
-pre-package:
-       ${CP} ${WRKDIR}/package-pkg-message ${PKGMESSAGE}
-
+.include "../../www/zope/replace.mk"
+.include "../../www/zope/zopeversion.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 768e023b6bfa -r 2115a9f3418a www/zope29/PLIST
--- a/www/zope29/PLIST  Tue Dec 18 15:27:23 2007 +0000
+++ b/www/zope29/PLIST  Tue Dec 18 15:31:11 2007 +0000
@@ -1,9511 +1,9601 @@
-@comment $NetBSD: PLIST,v 1.3 2007/03/21 14:26:26 taca Exp $
-${ZOPEBASEDIR}/bin/README.txt
-${ZOPEBASEDIR}/bin/analyze.py
-${ZOPEBASEDIR}/bin/check_catalog.py
-${ZOPEBASEDIR}/bin/checkbtrees.py
-${ZOPEBASEDIR}/bin/compilezpy.py
-${ZOPEBASEDIR}/bin/copyzopeskel.py
-${ZOPEBASEDIR}/bin/decompilezpy.py
-${ZOPEBASEDIR}/bin/fsdump.py
-${ZOPEBASEDIR}/bin/fsrefs.py
-${ZOPEBASEDIR}/bin/fstail.py
-${ZOPEBASEDIR}/bin/fstest.py
-${ZOPEBASEDIR}/bin/load_site.py
-${ZOPEBASEDIR}/bin/migrate.py
-${ZOPEBASEDIR}/bin/mkzeoinstance.py
-${ZOPEBASEDIR}/bin/mkzopeinstance.py
-${ZOPEBASEDIR}/bin/netspace.py
-${ZOPEBASEDIR}/bin/parsezeolog.py
-${ZOPEBASEDIR}/bin/python
-${ZOPEBASEDIR}/bin/reindex_catalog.py
-${ZOPEBASEDIR}/bin/repozo.py
-${ZOPEBASEDIR}/bin/requestprofiler.py
-${ZOPEBASEDIR}/bin/space.py
-${ZOPEBASEDIR}/bin/test.py
-${ZOPEBASEDIR}/bin/timeout.py
-${ZOPEBASEDIR}/bin/zeopack.py
-${ZOPEBASEDIR}/bin/zeoqueue.py
-${ZOPEBASEDIR}/bin/zeoreplay.py
-${ZOPEBASEDIR}/bin/zeoserverlog.py
-${ZOPEBASEDIR}/bin/zeoup.py
-${ZOPEBASEDIR}/bin/zodbload.py
-${ZOPEBASEDIR}/bin/zpasswd.py
-${ZOPEBASEDIR}/doc/CHANGES.txt
-${ZOPEBASEDIR}/doc/CREDITS.txt
-${ZOPEBASEDIR}/doc/DEBUGGING.txt
-${ZOPEBASEDIR}/doc/FAQ.txt
-${ZOPEBASEDIR}/doc/HELPSYS.txt
-${ZOPEBASEDIR}/doc/HISTORY.txt
-${ZOPEBASEDIR}/doc/INSTALL.txt
-${ZOPEBASEDIR}/doc/RESTRUCTUREDSTEXT.txt
-${ZOPEBASEDIR}/doc/SECURITY.txt
-${ZOPEBASEDIR}/doc/SETUID.txt
-${ZOPEBASEDIR}/doc/SIGNALS.txt
-${ZOPEBASEDIR}/doc/TODO.txt
-${ZOPEBASEDIR}/doc/UNITTEST.txt
-${ZOPEBASEDIR}/doc/WEBSERVER.txt
-${ZOPEBASEDIR}/doc/WINDOWS.txt
-${ZOPEBASEDIR}/doc/ZODB.txt
-${ZOPEBASEDIR}/doc/ZOPE3.txt
-${ZOPEBASEDIR}/lib/python/AccessControl/AccessControl.txt
-${ZOPEBASEDIR}/lib/python/AccessControl/AuthEncoding.py
-${ZOPEBASEDIR}/lib/python/AccessControl/AuthEncoding.pyc
-${ZOPEBASEDIR}/lib/python/AccessControl/DTML.py
-${ZOPEBASEDIR}/lib/python/AccessControl/DTML.pyc
-${ZOPEBASEDIR}/lib/python/AccessControl/ImplC.py
-${ZOPEBASEDIR}/lib/python/AccessControl/ImplC.pyc
-${ZOPEBASEDIR}/lib/python/AccessControl/ImplPython.py
-${ZOPEBASEDIR}/lib/python/AccessControl/ImplPython.pyc
-${ZOPEBASEDIR}/lib/python/AccessControl/Implementation.py
-${ZOPEBASEDIR}/lib/python/AccessControl/Implementation.pyc
-${ZOPEBASEDIR}/lib/python/AccessControl/Owned.py
-${ZOPEBASEDIR}/lib/python/AccessControl/Owned.pyc
-${ZOPEBASEDIR}/lib/python/AccessControl/Permission.py
-${ZOPEBASEDIR}/lib/python/AccessControl/Permission.pyc
-${ZOPEBASEDIR}/lib/python/AccessControl/PermissionMapping.py
-${ZOPEBASEDIR}/lib/python/AccessControl/PermissionMapping.pyc
-${ZOPEBASEDIR}/lib/python/AccessControl/PermissionRole.py
-${ZOPEBASEDIR}/lib/python/AccessControl/PermissionRole.pyc
-${ZOPEBASEDIR}/lib/python/AccessControl/Permissions.py
-${ZOPEBASEDIR}/lib/python/AccessControl/Permissions.pyc
-${ZOPEBASEDIR}/lib/python/AccessControl/Role.py
-${ZOPEBASEDIR}/lib/python/AccessControl/Role.pyc
-${ZOPEBASEDIR}/lib/python/AccessControl/SecurityInfo.py
-${ZOPEBASEDIR}/lib/python/AccessControl/SecurityInfo.pyc
-${ZOPEBASEDIR}/lib/python/AccessControl/SecurityManagement.py
-${ZOPEBASEDIR}/lib/python/AccessControl/SecurityManagement.pyc
-${ZOPEBASEDIR}/lib/python/AccessControl/SecurityManager.py
-${ZOPEBASEDIR}/lib/python/AccessControl/SecurityManager.pyc
-${ZOPEBASEDIR}/lib/python/AccessControl/SimpleObjectPolicies.py



Home | Main Index | Thread Index | Old Index