Zope-2.7.1 had a security bug in Page Templates. ( See http://zope.org/Products/Zope/Hotfix_2004-07-14/security_alert ) Zope-2.7.2 fixes this problem. And this version will solve a problem that some files (.dtml, .gif ?) in ${ZOPEBASEDIR}/lib/python are installed with false permissions. ( PR ports/68408 which I met, and ports/68716 )
I Have added a different pkg-message for package users to give them instructions how to create an instance without the Makefile. Here the updated patch diff -urN www/zope.old/Makefile www/zope/Makefile --- www/zope.old/Makefile Fri Jul 2 22:41:00 2004 +++ www/zope/Makefile Fri Jul 23 16:17:59 2004 @@ -6,10 +6,10 @@ # PORTNAME= zope -PORTVERSION= 2.7.1 +PORTVERSION= 2.7.2 CATEGORIES= www python zope -MASTER_SITES= http://www.zope.org/Products/Zope/${PORTVERSION}/${PORTVERSION}/ -DISTNAME= Zope-${PORTVERSION} +MASTER_SITES= http://www.zope.org/Products/Zope/${PORTVERSION}/ +DISTNAME= Zope-${PORTVERSION}-0 EXTRACT_SUFX= .tgz MAINTAINER= estartu@augusta.de @@ -21,7 +21,6 @@ USE_RC_SUBR= yes USE_REINPLACE= yes DIST_SUBDIR= zope -WRKSRC= ${WRKDIR}/${DISTNAME}-0 # Note: the notes that follow reflect the decisions of prior maintainers # of this port. IOW, don't blame me if you don't like the way it's done. @@ -75,6 +74,7 @@ ${FILESDIR}/zope.sh > ${PREFIX}/etc/rc.d/zope.sh @${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/zope.sh @${MKDIR} ${ZOPEBASEDIR}/Products + @${CP} ${FILESDIR}/Products_00readme-freebsd.txt ${ZOPEBASEDIR}/Products/00readme-freebsd.txt @${CAT} ${PKGMESSAGE} @${ECHO_MSG} @@ -86,5 +86,10 @@ @${CHOWN} ${ZOPE_USER} ${ZOPEINSTANCEDIR}/var @${CHOWN} ${ZOPE_USER} ${ZOPEINSTANCEDIR}/log @${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${FILESDIR}/instance_message + @${RM} -f ${ZOPEBASEDIR}/bin/copyzopeskel.pyc + +pre-package: + @${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} < ${FILESDIR}/pkg-message.package.in \ + > ${PKGMESSAGE} .include <bsd.port.mk> diff -urN www/zope.old/distinfo zope/distinfo --- www/zope.old/distinfo Fri Jul 2 22:41:00 2004 +++ www/zope/distinfo Fri Jul 23 15:26:42 2004 @@ -1,2 +1,2 @@ -MD5 (zope/Zope-2.7.1.tgz) = ae9d4bb3f7220dfffb6e91b42503b16c -SIZE (zope/Zope-2.7.1.tgz) = 2754949 +MD5 (zope/Zope-2.7.2-0.tgz) = 08b3c4a119aa1ded2e7b1b3d5bc45425 +SIZE (zope/Zope-2.7.2-0.tgz) = 2754459 diff -urN www/zope.old/files/Products_00readme-freebsd.txt zope/files/Products_00readme-freebsd.txt --- www/zope.old/files/Products_00readme-freebsd.txt Thu Jan 1 01:00:00 1970 +++ www/zope/files/Products_00readme-freebsd.txt Fri Jul 23 15:26:42 2004 @@ -0,0 +1,2 @@ +This directory is used for install Zope products via ports/package. +All products in here are enabled on all Zope instances. diff -urN www/zope.old/files/pkg-message.in zope/files/pkg-message.in --- www/zope.old/files/pkg-message.in Fri Jul 2 22:41:00 2004 +++ www/zope/files/pkg-message.in Fri Jul 23 16:22:08 2004 @@ -15,6 +15,9 @@ If you want have multiple Zope you should run make instance INSTANCENAME=<somename> +The Instancefiles created by make instance will not be remove when the +port is deinstalled. You'll have to delete them yourself. + ********************************************************************** ****** ATTENTION ***** ATTENTION ***** ATTENTION ***** ATTENTION ***** diff -urN www/zope.old/files/pkg-message.package.in zope/files/pkg-message.package.in --- www/zope.old/files/pkg-message.package.in Thu Jan 1 01:00:00 1970 +++ www/zope/files/pkg-message.package.in Fri Jul 23 16:22:06 2004 @@ -0,0 +1,36 @@ +********************************************************************** + +Zope 2.7 Successfull installed. + +To create an instance of Zope please run +%%ZOPEBASEDIR%%/bin/mkzopeinstance.py -d <INSTANCEDIR> + +<INSTANCEDIR> is the directory where the instance files should + be installed. This can be %%ZOPEBASEDIR%% + +Command-line options to 'mkzopeinstance' are available, and can be +investigated by running 'mkzopeinstance.py --help'. + +The Instancefiles created by mkzopeinstance.py will not be remove +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 + +zope_enable="YES" +zope_instances="<INSTANCEDIR>" + +If there is already a zope_instances entry please add +<INSTANCEDIR> separated by a space. + + +********************************************************************** +****** ATTENTION ***** ATTENTION ***** ATTENTION ***** ATTENTION ***** + +The default installation directory for Zope Products has changed from +%%ZOPEBASEDIR%%/lib/python/Products +to %%ZOPEBASEDIR%%/Products. + +You might have to add the following lines to your zope.conf +products %%ZOPEBASEDIR%%/Products +products $INSTANCE/Products diff -urN www/zope.old/pkg-plist zope/pkg-plist --- www/zope.old/pkg-plist Fri Jul 2 22:41:00 2004 +++ www/zope/pkg-plist Fri Jul 23 16:23:59 2004 @@ -1,9 +1,9 @@ etc/rc.d/zope.sh +%%ZOPEBASEDIR%%/Products/00readme-freebsd.txt %%ZOPEBASEDIR%%/bin/README.txt %%ZOPEBASEDIR%%/bin/check_catalog.py %%ZOPEBASEDIR%%/bin/compilezpy.py %%ZOPEBASEDIR%%/bin/copyzopeskel.py -@exec rm -f %%ZOPEBASEDIR%%/bin/copyzopeskel.pyc %%ZOPEBASEDIR%%/bin/decompilezpy.py %%ZOPEBASEDIR%%/bin/load_site.py %%ZOPEBASEDIR%%/bin/mkzeoinstance.py @@ -1432,6 +1432,8 @@ %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testBrains.pyc %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.py %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.pyc +%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testLazySequences.py +%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testLazySequences.pyc %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/version.txt %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/www/Vocabulary.gif %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/www/ZCatalog.gif @@ -1786,8 +1788,6 @@ %%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/ITALES.py @@ -1883,6 +1883,7 @@ %%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test20.html %%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test29.html %%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test34.html +%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test36.html %%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test_failed_attr_translation.html %%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test_metal1.html %%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test_metal2.html @@ -1927,6 +1928,7 @@ %%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test20.html %%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test29.html %%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test34.html +%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test36.html %%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test_failed_attr_translation.html %%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test_metal1.html %%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test_metal2.html @@ -1939,8 +1941,6 @@ %%ZOPEBASEDIR%%/lib/python/TAL/tests/run.pyc %%ZOPEBASEDIR%%/lib/python/TAL/tests/test_files.py %%ZOPEBASEDIR%%/lib/python/TAL/tests/test_files.pyc -%%ZOPEBASEDIR%%/lib/python/TAL/tests/test_htmlparser.py -%%ZOPEBASEDIR%%/lib/python/TAL/tests/test_htmlparser.pyc %%ZOPEBASEDIR%%/lib/python/TAL/tests/test_htmltalparser.py %%ZOPEBASEDIR%%/lib/python/TAL/tests/test_htmltalparser.pyc %%ZOPEBASEDIR%%/lib/python/TAL/tests/test_sourcepos.py @@ -2670,6 +2670,8 @@ %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/sv.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/roles.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/roles.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/roman.py +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/roman.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/states.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/states.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/tableparser.py @@ -2680,8 +2682,6 @@ %%ZOPEBASEDIR%%/lib/python/docutils/readers/pep.pyc %%ZOPEBASEDIR%%/lib/python/docutils/readers/standalone.py %%ZOPEBASEDIR%%/lib/python/docutils/readers/standalone.pyc -%%ZOPEBASEDIR%%/lib/python/docutils/roman.py -%%ZOPEBASEDIR%%/lib/python/docutils/roman.pyc %%ZOPEBASEDIR%%/lib/python/docutils/statemachine.py %%ZOPEBASEDIR%%/lib/python/docutils/statemachine.pyc %%ZOPEBASEDIR%%/lib/python/docutils/transforms/__init__.py
State Changed From-To: open->closed Maintainer's version committed.