r1686 - in zope2.10/trunk/debian (4 files)

[Jonas Meurer]

    Date: Sunday, August 9, 2009 @ 14:07:41
  Author: mejo
Revision: 1686

add support to start particular instance|zeoserver to initscript, bump (build|pre)-depends on zope-debhelper and zope-common

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

Modified: zope2.10/trunk/debian/changelog
===================================================================
--- zope2.10/trunk/debian/changelog	2009-08-09 14:00:13 UTC (rev 1685)
+++ zope2.10/trunk/debian/changelog	2009-08-09 14:07:41 UTC (rev 1686)
@@ -1,11 +1,13 @@
 zope2.10 (2.10.9-1) unstable; urgency=high
 
-  * New upstraem release:
-    - Fixes two vulnerabilities: CVE-2009-0668 and CVE-2009-0669
-      (closes: #540464)
-  * set urgency=high for that reason.
+  * New upstraem release, fixes two vulnerabilities in the ZEO network
+    protocol: CVE-2009-0668 and CVE-2009-0669. (closes: #540464)
+  * Add support to start a particular instance to initscript.
+  * Bump pre-depends on zope-common to 0.5.49 and build-depends on debhelper
+    to 0.3.14 to use invoke-rc.d in maintainer scripts. (closes: #540159)
+  * Set urgency=high as this upload fixes two serious bugs.
 
- -- Jonas Meurer <mejo at debian.org>  Sat, 08 Aug 2009 12:33:15 +0200
+ -- Jonas Meurer <mejo at debian.org>  Sun, 09 Aug 2009 15:58:49 +0200
 
 zope2.10 (2.10.8-2) unstable; urgency=low
 

Modified: zope2.10/trunk/debian/control
===================================================================
--- zope2.10/trunk/debian/control	2009-08-09 14:00:13 UTC (rev 1685)
+++ zope2.10/trunk/debian/control	2009-08-09 14:07:41 UTC (rev 1686)
@@ -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-central (>= 0.5.6), python2.4-dev (>= 2.4.3), python2.4, python, zope-debhelper (>= 0.3.6), lsb-release, dpatch
+Build-Depends: debhelper (>= 5.0.0), python-central (>= 0.5.6), 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/
@@ -12,7 +12,7 @@
 
 Package: zope2.10
 Architecture: any
-Pre-Depends: zope-common (>= 0.5.21)
+Pre-Depends: zope-common (>= 0.5.49)
 Depends: python2.4 (>= 2.4.3), python-tz, lsb-base, ${shlibs:Depends}, ${misc:Depends}, debconf | debconf-2.0
 Provides: zope
 Suggests: python-unit, zope-book, zope-devguide

Modified: zope2.10/trunk/debian/zopeZVER.default.in
===================================================================
--- zope2.10/trunk/debian/zopeZVER.default.in	2009-08-09 14:00:13 UTC (rev 1685)
+++ zope2.10/trunk/debian/zopeZVER.default.in	2009-08-09 14:07:41 UTC (rev 1686)
@@ -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.10/trunk/debian/zopeZVER.init.in
===================================================================
--- zope2.10/trunk/debian/zopeZVER.init.in	2009-08-09 14:00:13 UTC (rev 1685)
+++ zope2.10/trunk/debian/zopeZVER.init.in	2009-08-09 14:07:41 UTC (rev 1686)
@@ -21,14 +21,18 @@
 	. /etc/default/zope$ZVER
 fi
 
-if [ "$ZEOSERVERS" = "NONE" -o "$ZEOSERVERS" = "" ]; then
+if [ -n "$2" -a "${2%ZEOSERVER=}" != "$2" ]; then
+    ZEOSERVERS="${2#ZEOSERVER=}"
+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" -a "${2#INSTANCE=}" != "$2" ]; then
+    INSTANCES="${2#INSTANCE=}"
+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