[SVN] r695 - in /branches/sarge-2.2.13/debian: UPGRADE.Debian changelog cyrus-common-2.2.postrm patches/00list

Tue Feb 20 18:05:37 CET 2007

Author: sven
Date: Tue Feb 20 18:05:32 2007
New Revision: 695

URL: https://mail.incase.de/viewcvs?rev=695&root=cyrus22&view=rev
Log:
Bring sarge branch into sync with /trunk again

Modified:
    branches/sarge-2.2.13/debian/UPGRADE.Debian
    branches/sarge-2.2.13/debian/changelog
    branches/sarge-2.2.13/debian/cyrus-common-2.2.postrm
    branches/sarge-2.2.13/debian/patches/00list

Modified: branches/sarge-2.2.13/debian/UPGRADE.Debian
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/UPGRADE.Debian?rev=695&root=cyrus22&r1=694&r2=695&view=diff
==============================================================================

--- branches/sarge-2.2.13/debian/UPGRADE.Debian (original)
+++ branches/sarge-2.2.13/debian/UPGRADE.Debian Tue Feb 20 18:05:32 2007
@@ -25,6 +25,9 @@
 information from cyrus v1.5 below and in more detail in
 /usr/share/doc/cyrus-common-2.2/README.Debian.database. 
 
+The configuration option lmtp_overquota_perm_failure has been renamed 
+lmtp_over_quota_perm_failure. Please update your configuration accordingly.
+
 Please note that the 2.1 packages in Debian use a different format 
 from upstream, thus the upgrade is easier.
 
@@ -160,7 +163,7 @@
     $ exit
     #
 
-11. Upgrade all of the db2 files used by Cyrus from to db4.2.
+11. Upgrade all of the BerkleyDB files used by Cyrus from their current format to db4.2. You need db4.2-util installed.
 
     # find /var/lib/cyrus -name \*.db -print -exec /usr/bin/db4.2_upgrade {} \;
 

Modified: branches/sarge-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/changelog?rev=695&root=cyrus22&r1=694&r2=695&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/changelog (original)
+++ branches/sarge-2.2.13/debian/changelog Tue Feb 20 18:05:32 2007
@@ -1,15 +1,33 @@
-cyrus-imapd-2.2 (2.2.13-10~bpo1) sarge-backports; urgency=high
+cyrus-imapd-2.2 (2.2.13-11~bpo1) sarge-backports; urgency=high
 
   * backport to sarge 
 
  -- Sven Mueller <sven at debian.org>  Wed, 13 Sep 2006 14:35:54 +0200
 
-cyrus-imapd-2.2 (2.2.13-10) unstable; urgency=low
-
+cyrus-imapd-2.2 (2.2.13-11) UNRELEASED; urgency=low
+
+  * Fix a bug in cyrus-common-2.2 postrm script:
+    Even when a package Depends on debconf, it is not guaranteed to be there
+    when postrm is called.
+    Assume removal of spools is not desired if debconf isn't available (least
+    surprise / least chance of data loss principle).
+
+ -- Sven Mueller <sven at debian.org>  Tue, 20 Feb 2007 17:51:37 +0100
+
+cyrus-imapd-2.2 (2.2.13-10) unstable; urgency=high
+
+  * High urgency due to #400747
+  
+  [ Sven Mueller ]
   * Update README.Debian.simpleinstall (Closes: #395250)
   * Upstream change: applied RFC4314 READ-ONLY logic
 
- -- Sven Mueller <sven at debian.org>  Mon, 13 Nov 2006 19:01:21 +0100
+  [ Benjamin Seidenberg ]
+  * Add notice about lmtp overquota configuration option rename to
+    UPGRADE.Debian (Closes: #400645)
+  * Disable upstream patch 0019 due to bad sasl interactions (Closes: #400747) 
+
+ -- Benjamin Seidenberg <benjamin at debian.org>  Sat,  9 Dec 2006 10:03:38 -0500
 
 cyrus-imapd-2.2 (2.2.13-9) unstable; urgency=high
 

Modified: branches/sarge-2.2.13/debian/cyrus-common-2.2.postrm
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/cyrus-common-2.2.postrm?rev=695&root=cyrus22&r1=694&r2=695&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/cyrus-common-2.2.postrm (original)
+++ branches/sarge-2.2.13/debian/cyrus-common-2.2.postrm Tue Feb 20 18:05:32 2007
@@ -9,7 +9,14 @@
 set -e
 
 # debconf hook
-. /usr/share/debconf/confmodule
+if [ -e /usr/share/debconf/confmodule ]; then
+	. /usr/share/debconf/confmodule
+	DEBCONFEXISTS="true"
+	export DEBCONFEXISTS
+else
+	DEBCONFEXISTS="false"
+	export DEBCONFEXISTS
+fi
 
 # summary of how this script can be called:
 #        * <postrm> `remove'
@@ -36,12 +43,16 @@
 			rm usr/lib/cyrus/cyrus-hardwired-config.active || true
 
 			# Should we remove our precious data?
-			db_title "Cyrus IMAPd 2.2" || true
-			db_fset cyrus-common-2.2/removespools seen false || true
-			db_input high cyrus-common-2.2/removespools || true
-			db_go || true
+			if [ "$DEBCONFEXISTS" = "true" ]; then
+				db_title "Cyrus IMAPd 2.2" || true
+				db_fset cyrus-common-2.2/removespools seen false || true
+				db_input high cyrus-common-2.2/removespools || true
+				db_go || true
 
-			db_get cyrus-common-2.2/removespools
+				db_get cyrus-common-2.2/removespools
+			else
+				RET="false"
+			fi
 			[ "${RET}" = "true" ] && {
 				for i in /var/spool/cyrus /var/lib/cyrus \
 				         /var/spool/sieve /etc/sieve ; do

Modified: branches/sarge-2.2.13/debian/patches/00list
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/patches/00list?rev=695&root=cyrus22&r1=694&r2=695&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/patches/00list (original)
+++ branches/sarge-2.2.13/debian/patches/00list Tue Feb 20 18:05:32 2007
@@ -16,7 +16,8 @@
 0016-upstream-fix-typos.dpatch
 0017-upstream-no-body-empty-string-instead-of-null.dpatch
 0018-upstream-ntohl-instead-of-htonl.dpatch
-0019-upstream-sieve_allowreferrals.dpatch
+# Disabled for bug #400747
+# 0019-upstream-sieve_allowreferrals.dpatch
 0020-upstream-client-literal-prefix.dpatch
 0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch
 0090-fix-casts.dpatch


