[SVN] r673 - in /trunk/cyrus-imapd-2.2.13/debian: changelog cyrus-common-2.2.cyrus2.2.init cyrus-common-2.2.cyrus22.cron.daily

[debian at incase.de]

Author: sven
Date: Wed Oct 25 15:24:13 2006
New Revision: 673

URL: https://mail.incase.de/viewcvs?rev=673&root=cyrus22&view=rev
Log:
Exit cronjob/init-script cleanly if cyrus-common-2.2 is removed but not purged, even if another version of Cyrus IMAPd is installed (Fix by HMH)

Modified:
    trunk/cyrus-imapd-2.2.13/debian/changelog
    trunk/cyrus-imapd-2.2.13/debian/cyrus-common-2.2.cyrus2.2.init
    trunk/cyrus-imapd-2.2.13/debian/cyrus-common-2.2.cyrus22.cron.daily

Modified: trunk/cyrus-imapd-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/changelog?rev=673&root=cyrus22&r1=672&r2=673&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.13/debian/changelog Wed Oct 25 15:24:13 2006
@@ -1,3 +1,14 @@
+cyrus-imapd-2.2 (2.2.13-9) UNRELEASED; urgency=low
+
+  * High urgency upload with simple fixes for Etch
+
+  [ Henrique de Moraes Holschuh ]
+  * Prevent cronjobs and initscript from working when another version
+    of Cyrus IMAPD is installed and 2.1 is in removed but not purged
+    state
+
+ -- Sven Mueller <sven at debian.org>  Wed, 25 Oct 2006 15:20:34 +0200
+
 cyrus-imapd-2.2 (2.2.13-8) unstable; urgency=medium
 
   [ Sven Mueller ]

Modified: trunk/cyrus-imapd-2.2.13/debian/cyrus-common-2.2.cyrus2.2.init
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/cyrus-common-2.2.cyrus2.2.init?rev=673&root=cyrus22&r1=672&r2=673&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/cyrus-common-2.2.cyrus2.2.init (original)
+++ trunk/cyrus-imapd-2.2.13/debian/cyrus-common-2.2.cyrus2.2.init Wed Oct 25 15:24:13 2006
@@ -46,7 +46,10 @@
 [ "x${PIDFILE}" = "x" ] && PIDFILE="/var/run/${NAME}.pid"
 DESC="Cyrus IMAPd"
 
+#äCheck if Cyrus 2.2 is installed
 test -x ${DAEMON} || exit 0
+grep -qE '^PACKAGE_VERSION[[:blank:]]+2[.]2' \
+	/usr/lib/cyrus/cyrus-hardwired-config.txt >/dev/null 2>&1 || exit 0
 
 set -e
 

Modified: trunk/cyrus-imapd-2.2.13/debian/cyrus-common-2.2.cyrus22.cron.daily
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/cyrus-common-2.2.cyrus22.cron.daily?rev=673&root=cyrus22&r1=672&r2=673&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/cyrus-common-2.2.cyrus22.cron.daily (original)
+++ trunk/cyrus-imapd-2.2.13/debian/cyrus-common-2.2.cyrus22.cron.daily Wed Oct 25 15:24:13 2006
@@ -28,13 +28,20 @@
 [ -r /etc/default/cyrus2.2 ] && . /etc/default/cyrus2.2
 umask 022
 
+# check wether ctl_mboxlist  and cyrus-hardwired-config.txt exist
+# exit cleanly if they don't
+[ -x /usr/sbin/ctl_mboxlist ] \
+&& [ -f /usr/lib/cyrus/cyrus-hardwired-config.txt ] \
+|| exit 0
+# Check if Cyrus 2.2 is installed (vs. removed but not purged)
+grep -qE '^PACKAGE_VERSION[[:blank:]]+2[.]2' \
+	/usr/lib/cyrus/cyrus-hardwired-config.txt >/dev/null 2>&1 || exit 0
+
 # 1. backup mailbox database
-[ -x /usr/sbin/ctl_mboxlist ] && {
-	[ -d $bak ] || ( mkdir -p $bak ; chmod 600 $bak )
-	[ -f $bakfile ] && mv ${bakfile} ${bakfile}.bak
+[ -d $bak ] || ( mkdir -p $bak ; chmod 600 $bak )
+[ -f $bakfile ] && mv ${bakfile} ${bakfile}.bak
 #	su "--command=/usr/sbin/ctl_mboxlist -d" - cyrus | ...
-	start-stop-daemon --start --exec /usr/sbin/ctl_mboxlist --quiet --chuid cyrus -- -d | gzip -9 >${bakfile}
-}
+start-stop-daemon --start --exec /usr/sbin/ctl_mboxlist --quiet --chuid cyrus -- -d | gzip -9 >${bakfile}
 
 # 2. clean up all leftover .stage directories in all spools listed in
 #    the default config file