[SVN] r675 - in /branches:
cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/
cyrus23/cyrus-imapd-2.3-2.3.7/debian/ sarge-2.2.13/debian/
debian at incase.de
debian at incase.de
Wed Oct 25 13:31:47 UTC 2006
Author: sven
Date: Wed Oct 25 15:31:45 2006
New Revision: 675
URL: https://mail.incase.de/viewcvs?rev=675&root=cyrus22&view=rev
Log:
Merge fix from trunk r673 to all relevant branches
Modified:
branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/changelog
branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/cyrus-common-2.3.cyrus2.3.init
branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/cyrus-common-2.3.cyrus23.cron.daily
branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/changelog
branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/cyrus-common-2.3.cyrus2.3.init
branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/cyrus-common-2.3.cyrus23.cron.daily
branches/sarge-2.2.13/debian/changelog
branches/sarge-2.2.13/debian/cyrus-common-2.2.cyrus2.2.init
branches/sarge-2.2.13/debian/cyrus-common-2.2.cyrus22.cron.daily
Modified: branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/changelog?rev=675&root=cyrus22&r1=674&r2=675&view=diff
==============================================================================
--- branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/changelog (original)
+++ branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/changelog Wed Oct 25 15:31:45 2006
@@ -47,6 +47,17 @@
applied to configure.in
-- Benjamin Seidenberg <astronut at dlgeek.net> Mon, 18 Sep 2006 22:39:43 -0400
+
+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.2 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
Modified: branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/cyrus-common-2.3.cyrus2.3.init
URL: https://mail.incase.de/viewcvs/branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/cyrus-common-2.3.cyrus2.3.init?rev=675&root=cyrus22&r1=674&r2=675&view=diff
==============================================================================
--- branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/cyrus-common-2.3.cyrus2.3.init (original)
+++ branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/cyrus-common-2.3.cyrus2.3.init Wed Oct 25 15:31:45 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[.]3' \
+ /usr/lib/cyrus/cyrus-hardwired-config.txt >/dev/null 2>&1 || exit 0
set -e
Modified: branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/cyrus-common-2.3.cyrus23.cron.daily
URL: https://mail.incase.de/viewcvs/branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/cyrus-common-2.3.cyrus23.cron.daily?rev=675&root=cyrus22&r1=674&r2=675&view=diff
==============================================================================
--- branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/cyrus-common-2.3.cyrus23.cron.daily (original)
+++ branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/cyrus-common-2.3.cyrus23.cron.daily Wed Oct 25 15:31:45 2006
@@ -28,13 +28,20 @@
[ -r /etc/default/cyrus2.3 ] && . /etc/default/cyrus2.3
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[.]3' \
+ /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
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/changelog?rev=675&root=cyrus22&r1=674&r2=675&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/changelog (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/changelog Wed Oct 25 15:31:45 2006
@@ -36,6 +36,17 @@
applied to configure.in
-- Benjamin Seidenberg <astronut at dlgeek.net> Mon, 18 Sep 2006 22:39:43 -0400
+
+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.2 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
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/cyrus-common-2.3.cyrus2.3.init
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/cyrus-common-2.3.cyrus2.3.init?rev=675&root=cyrus22&r1=674&r2=675&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/cyrus-common-2.3.cyrus2.3.init (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/cyrus-common-2.3.cyrus2.3.init Wed Oct 25 15:31:45 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[.]3' \
+ /usr/lib/cyrus/cyrus-hardwired-config.txt >/dev/null 2>&1 || exit 0
set -e
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/cyrus-common-2.3.cyrus23.cron.daily
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/cyrus-common-2.3.cyrus23.cron.daily?rev=675&root=cyrus22&r1=674&r2=675&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/cyrus-common-2.3.cyrus23.cron.daily (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/cyrus-common-2.3.cyrus23.cron.daily Wed Oct 25 15:31:45 2006
@@ -28,13 +28,20 @@
[ -r /etc/default/cyrus2.3 ] && . /etc/default/cyrus2.3
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[.]3' \
+ /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
Modified: branches/sarge-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/changelog?rev=675&root=cyrus22&r1=674&r2=675&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/changelog (original)
+++ branches/sarge-2.2.13/debian/changelog Wed Oct 25 15:31:45 2006
@@ -1,8 +1,19 @@
-cyrus-imapd-2.2 (2.2.13-8~bpo1) sarge-backports; urgency=low
+cyrus-imapd-2.2 (2.2.13-9~bpo1) sarge-backports; urgency=low
* backport to sarge
-- Sven Mueller <sven at debian.org> Wed, 13 Sep 2006 14:35:54 +0200
+
+cyrus-imapd-2.2 (2.2.13-9) unstable; 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.2 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
Modified: branches/sarge-2.2.13/debian/cyrus-common-2.2.cyrus2.2.init
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/cyrus-common-2.2.cyrus2.2.init?rev=675&root=cyrus22&r1=674&r2=675&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/cyrus-common-2.2.cyrus2.2.init (original)
+++ branches/sarge-2.2.13/debian/cyrus-common-2.2.cyrus2.2.init Wed Oct 25 15:31:45 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: branches/sarge-2.2.13/debian/cyrus-common-2.2.cyrus22.cron.daily
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/cyrus-common-2.2.cyrus22.cron.daily?rev=675&root=cyrus22&r1=674&r2=675&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/cyrus-common-2.2.cyrus22.cron.daily (original)
+++ branches/sarge-2.2.13/debian/cyrus-common-2.2.cyrus22.cron.daily Wed Oct 25 15:31:45 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
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list