r1682 - in zope2.11/trunk/debian (5 files)

[Jonas Meurer]

    Date: Saturday, August 8, 2009 @ 11:52:55
  Author: mejo
Revision: 1682

build-depend on new zope-debhelper

Modified:
  zope2.11/trunk/debian/changelog
  zope2.11/trunk/debian/control
  zope2.11/trunk/debian/rules
  zope2.11/trunk/debian/zopeZVER.default.in
  zope2.11/trunk/debian/zopeZVER.init.in

Modified: zope2.11/trunk/debian/changelog
===================================================================
--- zope2.11/trunk/debian/changelog	2009-08-08 11:50:08 UTC (rev 1681)
+++ zope2.11/trunk/debian/changelog	2009-08-08 11:52:55 UTC (rev 1682)
@@ -1,3 +1,15 @@
+zope2.11 (2.11.4-1) unstable; urgency=high
+
+  * New upstream release, fixes two vulnerabilities in the ZEO network
+    protocol: CVE-2009-0668 and CVE-2009-0669. (closes: #540463)
+  * set urgency=high for that reason.
+  * Add support to start a particular instance to initscript.
+  * Build-Depend on zope-debhelper (>= 0.3.14) to use that new feature.
+    (closes: #540158)
+  * 
+
+ -- Jonas Meurer <mejo at debian.org>  Sat, 08 Aug 2009 13:51:45 +0200
+
 zope2.11 (2.11.3-1) unstable; urgency=low
 
   * New upstream release 

Modified: zope2.11/trunk/debian/control
===================================================================
--- zope2.11/trunk/debian/control	2009-08-08 11:50:08 UTC (rev 1681)
+++ zope2.11/trunk/debian/control	2009-08-08 11:52:55 UTC (rev 1682)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
 Uploaders: Fabio Tranchitella <kobold at debian.org>, Jonas Meurer <mejo at debian.org>, Bernd Zeimetz <bzed at debian.org>
-Build-Depends: debhelper (>= 5.0.0), python-support (>= 0.5.3), python2.4-dev (>= 2.4.3), python2.4, python, zope-debhelper (>= 0.3.6), lsb-release, dpatch
+Build-Depends: debhelper (>= 5.0.0), python-support (>= 0.5.3), python2.4-dev (>= 2.4.3), python2.4, python, zope-debhelper (>= 0.3.14), lsb-release, dpatch
 Standards-Version: 3.8.2
 XS-Python-Version: 2.4
 Homepage: http://www.zope.org/

Modified: zope2.11/trunk/debian/rules
===================================================================
--- zope2.11/trunk/debian/rules	2009-08-08 11:50:08 UTC (rev 1681)
+++ zope2.11/trunk/debian/rules	2009-08-08 11:52:55 UTC (rev 1682)
@@ -43,7 +43,7 @@
 DEBIAN    := $(shell pwd)/debian/$(PACKAGE)
 PYTHONVER := 2.4
 PYTHONBIN := /usr/bin/python$(PYTHONVER)
-ZBASE     := Zope-2.11.3-final
+ZBASE     := Zope-2.11.4-final
 
 distribution := $(shell lsb_release -is)
 

Modified: zope2.11/trunk/debian/zopeZVER.default.in
===================================================================
--- zope2.11/trunk/debian/zopeZVER.default.in	2009-08-08 11:50:08 UTC (rev 1681)
+++ zope2.11/trunk/debian/zopeZVER.default.in	2009-08-08 11:52:55 UTC (rev 1682)
@@ -15,6 +15,11 @@
 #
 # ALL means that you would like to start all servers/instances, NONE (or an 
 # empty value) means, well, none.
+#
+# The init script support to start particular servers/instances in case that
+# either ZEOSERVER=<zeoserver> or INSTANCE=<instance> is given to the init
+# script as second argument. That feature works even if either of the
+# ZEOSERVER/INSTANCES variable is set to NONE here.
 
 # ZEO servers
 ZEOSERVERS="ALL"

Modified: zope2.11/trunk/debian/zopeZVER.init.in
===================================================================
--- zope2.11/trunk/debian/zopeZVER.init.in	2009-08-08 11:50:08 UTC (rev 1681)
+++ zope2.11/trunk/debian/zopeZVER.init.in	2009-08-08 11:52:55 UTC (rev 1682)
@@ -21,14 +21,18 @@
 	. /etc/default/zope$ZVER
 fi
 
-if [ "$ZEOSERVERS" = "NONE" -o "$ZEOSERVERS" = "" ]; then
+if [ -n "$2" ]; then
+    ZEOSERVERS="$2"
+elif [ "$ZEOSERVERS" = "NONE" -o "$ZEOSERVERS" = "" ]; then
     ZEOSERVERS=''
     log_warning_msg "Zope$ZVER: ZEO servers have been disabled, edit /etc/default/zope$ZVER to enable them."
 elif [ "$ZEOSERVERS" = "ALL" ]; then
     ZEOSERVERS='*'
 fi
 
-if [ "$INSTANCES" = "NONE" -o "$INSTANCES" = "" ]; then
+if [ -n "$2" ]; then
+    INSTANCES="$2"
+elif [ "$INSTANCES" = "NONE" -o "$INSTANCES" = "" ]; then
     INSTANCES=''
     log_warning_msg "Zope$ZVER: instances have been disabled, edit /etc/default/zope$ZVER to enable them."
 elif [ "$INSTANCES" = "ALL" ]; then
@@ -85,7 +89,7 @@
         ;;
 		
     *)
-        echo "Usage: /etc/init.d/zope$ZVER {start|stop|restart|force-reload}"
+        echo "Usage: /etc/init.d/zope$ZVER {start|stop|restart|force-reload} [ZEOSERVER=<zeoserver>|INSTANCE=<instance>]"
         exit 1
         ;;
 esac