From dsh@vlink.ru  Thu Jan  5 23:05:41 2006
Return-Path: <dsh@vlink.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8178416A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  5 Jan 2006 23:05:41 +0000 (GMT)
	(envelope-from dsh@vlink.ru)
Received: from deliver.smtp.vlink.ru (vlink-1.avtlg.ru [83.239.142.33])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D0AC143D66
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  5 Jan 2006 23:05:38 +0000 (GMT)
	(envelope-from dsh@vlink.ru)
Received: from smtp.smtp.vlink.ru (clamav.smtp.vlink.ru [192.168.4.1])
	by deliver.smtp.vlink.ru (Postfix) with ESMTP id 6EDECFECDCB;
	Fri,  6 Jan 2006 02:05:36 +0300 (MSK)
Received: from localhost.my.domain (wizard.vlink.ru [217.107.252.67])
	by smtp.smtp.vlink.ru (Postfix) with ESMTP id 022AF1009AAA;
	Fri,  6 Jan 2006 02:05:35 +0300 (MSK)
Received: from localhost.my.domain (localhost [127.0.0.1])
	by localhost.my.domain (8.13.4/8.13.4) with ESMTP id k05N2lVg002378;
	Fri, 6 Jan 2006 02:02:47 +0300 (MSK)
	(envelope-from dsh@localhost.my.domain)
Received: (from dsh@localhost)
	by localhost.my.domain (8.13.4/8.13.4/Submit) id k05N2lXG002377;
	Fri, 6 Jan 2006 02:02:47 +0300 (MSK)
	(envelope-from dsh)
Message-Id: <200601052302.k05N2lXG002377@localhost.my.domain>
Date: Fri, 6 Jan 2006 02:02:47 +0300 (MSK)
From: Denis Shaposhnikov <dsh@vlink.ru>
Reply-To: Denis Shaposhnikov <dsh@vlink.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc: dsh@vlink.ru
Subject: Update port: www/zope28 (upgrade to the latest release)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         91365
>Category:       ports
>Synopsis:       Update port: www/zope28 (upgrade to the latest release)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 05 23:10:11 GMT 2006
>Closed-Date:    Thu Jan 05 23:40:46 GMT 2006
>Last-Modified:  Thu Jan 05 23:40:46 GMT 2006
>Originator:     Denis Shaposhnikov
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD localhost.my.domain 7.0-CURRENT FreeBSD 7.0-CURRENT #1: Sat Dec 10 20:23:36 MSK 2005 dsh@localhost.my.domain:/var/FreeBSD/obj/var/FreeBSD/src/sys/MYNERIC i386


	
>Description:

Upgrade to the latest release (2.8.5).

>How-To-Repeat:
	
>Fix:

diff -Nru zope28.orig/Makefile zope28/Makefile
--- zope28.orig/Makefile	Fri Jan  6 01:54:23 2006
+++ zope28/Makefile	Fri Jan  6 00:56:20 2006
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.8.4
+PORTVERSION=	2.8.5
 CATEGORIES=	www python zope
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-final
diff -Nru zope28.orig/distinfo zope28/distinfo
--- zope28.orig/distinfo	Fri Jan  6 01:54:23 2006
+++ zope28/distinfo	Fri Jan  6 00:56:52 2006
@@ -1,2 +1,3 @@
-MD5 (zope/Zope-2.8.4-final.tgz) = 08780f229397746527668cee1ddb6416
-SIZE (zope/Zope-2.8.4-final.tgz) = 5447275
+MD5 (zope/Zope-2.8.5-final.tgz) = ead959e36894c3c31367063bce018cfb
+SHA256 (zope/Zope-2.8.5-final.tgz) = 064fd23fb263acb54c13b4ee25d5d58a770f52df48efbbbbe3313b275959017e
+SIZE (zope/Zope-2.8.5-final.tgz) = 5377506
diff -Nru zope28.orig/files/zeo28.sh.in zope28/files/zeo28.sh.in
--- zope28.orig/files/zeo28.sh.in	Fri Jan  6 01:54:23 2006
+++ zope28/files/zeo28.sh.in	Fri Jan  6 01:40:01 2006
@@ -1,53 +1,66 @@
 #!/bin/sh
-
-# Start or stop zope
+#
+# Startup script for Zeo server.
+#
 # $FreeBSD: ports/www/zope28/files/zeo28.sh.in,v 1.1 2005/09/21 22:20:35 vsevolod Exp $
+#
 
 # PROVIDE: zeo28
 # REQUIRE: DAEMON
 # BEFORE: zope28
-# KEYWORD: FreeBSD shutdown
-#
-prefix=%%PREFIX%%
 
-# Define these zope28_* variables in one of these files:
+# Define these zeo28_* variables in one of these files:
 #       /etc/rc.conf
 #       /etc/rc.conf.local
 #       /etc/rc.conf.d/zeo28
 #
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
+# zeo28_enable : bool
+#   Enable Zeo ("YES") or not ("NO", the default).
+#
+# zeo28_instances : list
+#   List of dirs with Zeo's instances ("" by default).
 #
-zeo28_enable=${zeo28_enable:-"NO"} # Enable zeo server
-zeo28_instances=${zeo28_instances:-""} # List of instancehome dirs
 
 . %%RC_SUBR%%
 
 name="zeo28"
 rcvar=`set_rcvar`
+
+zeo28ctl () {
+    for instance in $zeo28_instances; do
+	if [ -d ${instance} ]; then
+	    echo -n "  Zeo instance ${instance} -> "
+	    ${instance}/bin/zeoctl "$1"
+	fi
+    done
+}
+
+zeo28_start () {
+    echo "Starting Zeo 2.8:"
+    zeo28ctl "start"
+}
+
+zeo28_stop () {
+    echo "Stopping Zeo 2.8:"
+    zeo28ctl "stop"
+}
+
+zeo28_restart () {
+    echo "Restarting Zeo 2.8:"
+    zeo28ctl "restart"
+}
+
+  start_cmd="zeo28_start"
+   stop_cmd="zeo28_stop"
+restart_cmd="zeo28_restart"
+
 load_rc_config $name
 
-if checkyesno zeo28_enable; then
+: ${zeo28_enable="NO"}
+: ${zeo28_instances=""}
+
+cmd="$1"
+[ $# -gt 0 ] && shift
+[ -n  "$*" ] && zeo28_instances="$*"
 
-	case "$1" in
-		start)
-			echo "Starting Zeo 2.8"
-		;;
-		stop)
-			echo "Stopping Zeo 2.8"
-		;;
-		restart)
-			echo "Restarting Zeo 2.8"
-		;;
-		*)
-			echo "Unknown action \"$1\""
-		;;
-	esac
-
-	for instance in $zeo28_instances
-	do
-		if [ -r ${instance}/etc/zeo.conf -a -x ${instance}/bin/zeoctl ]; then
-			echo -n "       Instance ${instance} -> "
-			${instance}/bin/zeoctl $1
-		fi
-	done
-fi
+run_rc_command "${cmd}"
diff -Nru zope28.orig/files/zope28.sh.in zope28/files/zope28.sh.in
--- zope28.orig/files/zope28.sh.in	Fri Jan  6 01:54:23 2006
+++ zope28/files/zope28.sh.in	Fri Jan  6 01:39:14 2006
@@ -1,53 +1,65 @@
 #!/bin/sh
-
-# Start or stop zope
+#
+# Startup script for Zope server.
+#
 # $FreeBSD: ports/www/zope28/files/zope28.sh.in,v 1.1 2005/09/21 22:20:35 vsevolod Exp $
+#
 
 # PROVIDE: zope28
 # REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
-#
-prefix=%%PREFIX%%
 
 # Define these zope28_* variables in one of these files:
 #       /etc/rc.conf
 #       /etc/rc.conf.local
 #       /etc/rc.conf.d/zope28
 #
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
+# zope28_enable : bool
+#   Enable Zope ("YES") or not ("NO", the default).
+#
+# zope28_instances : list
+#   List of dirs with Zope's instances ("" by default).
 #
-zope28_enable=${zope28_enable:-"NO"} # Enable zope
-zope28_instances=${zope28_instances:-""} # List of instancehome dirs
 
 . %%RC_SUBR%%
 
 name="zope28"
 rcvar=`set_rcvar`
+
+zope28ctl () {
+    for instance in $zope28_instances; do
+	if [ -d ${instance} ]; then
+	    echo -n "  Zope instance ${instance} -> "
+	    ${instance}/bin/zopectl "$1"
+	fi
+    done
+}
+
+zope28_start () {
+    echo "Starting Zope 2.8:"
+    zope28ctl "start"
+}
+
+zope28_stop () {
+    echo "Stopping Zope 2.8:"
+    zope28ctl "stop"
+}
+
+zope28_restart () {
+    echo "Restarting Zope 2.8:"
+    zope28ctl "restart"
+}
+
+  start_cmd="zope28_start"
+   stop_cmd="zope28_stop"
+restart_cmd="zope28_restart"
+
 load_rc_config $name
 
-if checkyesno zope28_enable; then
+: ${zope28_enable="NO"}
+: ${zope28_instances=""}
+
+cmd="$1"
+[ $# -gt 0 ] && shift
+[ -n  "$*" ] && zope28_instances="$*"
 
-	case "$1" in
-		start)
-			echo "Starting Zope 2.8"
-		;;
-		stop)
-			echo "Stopping Zope 2.8"
-		;;
-		restart)
-			echo "Restarting Zope 2.8"
-		;;
-		*)
-			echo "Unknown action \"$1\""
-		;;
-	esac
-
-	for instance in $zope28_instances
-	do
-		if [ -r ${instance}/etc/zope.conf -a -x ${instance}/bin/zopectl ]; then
-			echo -n "       Instance ${instance} -> "
-			${instance}/bin/zopectl $1
-		fi
-	done
-fi
+run_rc_command "${cmd}"
diff -Nru zope28.orig/pkg-plist zope28/pkg-plist
--- zope28.orig/pkg-plist	Fri Jan  6 01:54:23 2006
+++ zope28/pkg-plist	Fri Jan  6 01:19:15 2006
@@ -107,6 +107,8 @@
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/permissionEdit.dtml
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/roleEdit.dtml
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/userFolderProps.dtml
+%%ZOPEBASEDIR%%/lib/python/AccessControl/interfaces.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/interfaces.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite/README
 %%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite/ResultObject.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite/ResultObject.pyc
@@ -152,6 +154,8 @@
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testPermissionRole.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testSecurity.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testSecurity.pyc
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testSecurityManager.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testSecurityManager.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testUserFolder.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testUserFolder.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testZopeGuards.py
@@ -2865,6 +2869,8 @@
 %%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/generate_conflicts.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/generate_conflicts.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testBaseRequest.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testBaseRequest.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.py
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pav 
Responsible-Changed-By: pav 
Responsible-Changed-When: Thu Jan 5 23:24:27 UTC 2006 
Responsible-Changed-Why:  
Take 

http://www.freebsd.org/cgi/query-pr.cgi?pr=91365 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Thu Jan 5 23:40:38 UTC 2006 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=91365 
>Unformatted:
