[SVN] r277 - in branches/sarge/cyrus-imapd-2.2.12/debian:
UPGRADE.Debian changelog control patches/61-64bit-quota.dpatch
debian at incase.de
debian at incase.de
Sat Jan 21 22:38:54 UTC 2006
Author: sven
Date: Sat Jan 21 23:38:46 2006
New Revision: 277
URL: https://mail.incase.de/viewcvs?root=cyrus22?view=rev&rev=277
Log:
Merge r271, r272, r275 and r276 into sarge branch
Modified:
branches/sarge/cyrus-imapd-2.2.12/debian/UPGRADE.Debian
branches/sarge/cyrus-imapd-2.2.12/debian/changelog
branches/sarge/cyrus-imapd-2.2.12/debian/control
branches/sarge/cyrus-imapd-2.2.12/debian/patches/61-64bit-quota.dpatch
Modified: branches/sarge/cyrus-imapd-2.2.12/debian/UPGRADE.Debian
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/sarge/cyrus-imapd-2.2.12/debian/UPGRADE.Debian?view=diff&rev=277&p1=branches/sarge/cyrus-imapd-2.2.12/debian/UPGRADE.Debian&r1=276&p2=branches/sarge/cyrus-imapd-2.2.12/debian/UPGRADE.Debian&r2=277
==============================================================================
--- branches/sarge/cyrus-imapd-2.2.12/debian/UPGRADE.Debian (original)
+++ branches/sarge/cyrus-imapd-2.2.12/debian/UPGRADE.Debian Sat Jan 21 23:38:46 2006
@@ -65,8 +65,29 @@
3. Remove the old cyrus packages.
+ ######################################################################
+ WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+ ######################################################################
+
+ Some versions of the cyrus-imapd packages, with versions 1.5.19-9.10
+ up to 1.5.19-20 (shipped in Debian Sarge 3.1r1) will entirely erase
+ the mail spool when purged with no questions asked.
+
+ You must NOT purge these packages before moving /var/lib/cyrus and
+ /var/spool/cyrus to somewhere safe. Failure to do so will cause data
+ loss.
+
+ # mv /var/lib/cyrus /var/lib/old-cyrus
+ # mv /var/spool/cyrus /var/spool/old-cyrus
+
+ The cyrus-imapd packages in Woody (1.5.19-9.2) are safe, as well as
+ the fixed cyrus-imapd packages 1.5.19-20.1 which should make it to
+ Debian Sarge 3.1r2.
+
+ ######################################################################
+
# apt-get --purge remove cyrus-common cyrus-admin cyrus-imapd cyrus-pop3d \
- cyrus-nntpd
+ cyrus-nntpd [BUT SEE THE ABOVE WARNING FIRST!!!]
or use dselect/aptitude/synaptic/your favorite deb management tool.
Modified: branches/sarge/cyrus-imapd-2.2.12/debian/changelog
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/sarge/cyrus-imapd-2.2.12/debian/changelog?view=diff&rev=277&p1=branches/sarge/cyrus-imapd-2.2.12/debian/changelog&r1=276&p2=branches/sarge/cyrus-imapd-2.2.12/debian/changelog&r2=277
==============================================================================
--- branches/sarge/cyrus-imapd-2.2.12/debian/changelog (original)
+++ branches/sarge/cyrus-imapd-2.2.12/debian/changelog Sat Jan 21 23:38:46 2006
@@ -6,7 +6,16 @@
* Add a patch to fix db_err callback prototype when building against
Berkeley DB 4.3 or newer
- -- Sven Mueller <debian at incase.de> Sat, 14 Jan 2006 23:24:14 +0100
+ [ Henrique de Moraes Holschuh ]
+ * UPGRADE.Debian: warn of dangerous problem in cyrus-imapd from sarge,
+ which would cause data loss when UPGRADE.Debian instructions were
+ followed.
+
+ [ Benjamin Seidenberg ]
+ * Changed debian/control so that the doc package is in section doc to match
+ ftpmaster override.
+
+ -- Benjamin Seidenberg <astronut at dlgeek.net> Sat, 21 Jan 2006 17:28:08 -0500
cyrus-imapd-2.2 (2.2.12-2) experimental; urgency=low
Modified: branches/sarge/cyrus-imapd-2.2.12/debian/control
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/sarge/cyrus-imapd-2.2.12/debian/control?view=diff&rev=277&p1=branches/sarge/cyrus-imapd-2.2.12/debian/control&r1=276&p2=branches/sarge/cyrus-imapd-2.2.12/debian/control&r2=277
==============================================================================
--- branches/sarge/cyrus-imapd-2.2.12/debian/control (original)
+++ branches/sarge/cyrus-imapd-2.2.12/debian/control Sat Jan 21 23:38:46 2006
@@ -9,6 +9,7 @@
Package: cyrus-common-2.2
Architecture: any
+Section: mail
Depends: postfix | mail-transport-agent, adduser (>= 3.34), dpkg (>> 1.9.0), netbase (>= 4.07), gawk, ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}
Recommends: cyrus-imapd-2.2 | cyrus-pop3d-2.2 | cyrus-murder-2.2 | cyrus-nntpd-2.2 | cyrus-admin-2.2
Suggests: cyrus-clients-2.2, cyrus-admin-2.2, cyrus-imapd-2.2, cyrus-pop3d-2.2, cyrus-murder-2.2, cyrus-nntpd-2.2, cyrus-doc-2.2, sasl2-bin, apt-listchanges (>= 2.35)
@@ -42,6 +43,7 @@
Package: cyrus-doc-2.2
Architecture: all
+Section: doc
Provides: cyrus21-doc, cyrus22-doc
Replaces: cyrus21-doc, cyrus22-doc
Conflicts: cyrus21-doc, cyrus22-doc
@@ -52,6 +54,7 @@
Package: cyrus-imapd-2.2
Architecture: any
+Section: mail
Depends: cyrus-common-2.2 (= ${Source-Version}), ${shlibs:Depends}
Provides: imap-server, cyrus21-imapd, cyrus22-imapd
Conflicts: imap-server, cyrus21-imapd, cyrus22-imapd
@@ -65,6 +68,7 @@
Package: cyrus-pop3d-2.2
Architecture: any
+Section: mail
Depends: cyrus-common-2.2 (= ${Source-Version}), ${shlibs:Depends}
Provides: cyrus21-pop3d, cyrus22-pop3d, pop3-server
Conflicts: cyrus21-pop3d, cyrus22-pop3d, pop3-server
@@ -77,6 +81,7 @@
Package: cyrus-admin-2.2
Architecture: all
+Section: mail
Depends: libcyrus-imap-perl22 (>= ${Source-Version})
Suggests: sasl2-bin
Conflicts: cyrus-admin, cyrus21-admin, cyrus22-admin
@@ -92,6 +97,7 @@
For more information, please see the cyrus-common-2.2 package.
Package: cyrus-murder-2.2
+Section: mail
Architecture: any
Depends: cyrus-common-2.2 (= ${Source-Version}), ${shlibs:Depends}
Recommends: cyrus-imapd-2.2 (= ${Source-Version}), cyrus-pop3d-2.2 (= ${Source-Version})
@@ -109,6 +115,7 @@
Package: cyrus-nntpd-2.2
Architecture: any
+Section: mail
Depends: cyrus-common-2.2 (= ${Source-Version}), ${shlibs:Depends}
Provides: news-transport-system
Conflicts: news-transport-system
@@ -122,6 +129,7 @@
Package: cyrus-clients-2.2
Architecture: any
+Section: mail
Depends: ${shlibs:Depends}
Conflicts: cyrus21-clients, cyrus22-clients
Provides: cyrus21-clients, cyrus22-clients
Modified: branches/sarge/cyrus-imapd-2.2.12/debian/patches/61-64bit-quota.dpatch
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/sarge/cyrus-imapd-2.2.12/debian/patches/61-64bit-quota.dpatch?view=diff&rev=277&p1=branches/sarge/cyrus-imapd-2.2.12/debian/patches/61-64bit-quota.dpatch&r1=276&p2=branches/sarge/cyrus-imapd-2.2.12/debian/patches/61-64bit-quota.dpatch&r2=277
==============================================================================
--- branches/sarge/cyrus-imapd-2.2.12/debian/patches/61-64bit-quota.dpatch (original)
+++ branches/sarge/cyrus-imapd-2.2.12/debian/patches/61-64bit-quota.dpatch Sat Jan 21 23:38:46 2006
@@ -8,8 +8,8 @@
diff -urN cyrus-imapd-2.2.12~/configure.in cyrus-imapd-2.2.12/configure.in
--- cyrus-imapd-2.2.12~/configure.in 2005-01-19 00:46:00.000000000 +0100
+++ cyrus-imapd-2.2.12/configure.in 2005-08-30 12:09:28.000000000 +0200
-@@ -100,6 +100,15 @@
- fi
+@@ -107,6 +107,15 @@
+ dnl fi
AC_C_INLINE
+dnl Check if `long long int' is available
@@ -48,7 +48,7 @@
diff -urN cyrus-imapd-2.2.12~/imap/imapd.c cyrus-imapd-2.2.12/imap/imapd.c
--- cyrus-imapd-2.2.12~/imap/imapd.c 2005-02-14 07:39:55.000000000 +0100
+++ cyrus-imapd-2.2.12/imap/imapd.c 2005-08-30 12:09:28.000000000 +0200
-@@ -2626,10 +2626,10 @@
+@@ -2716,10 +2716,10 @@
*/
int warnsize = config_getint(IMAPOPT_QUOTAWARNKB);
if (warnsize <= 0 || warnsize >= imapd_mailbox->quota.limit ||
@@ -62,7 +62,7 @@
if (usage >= 100.0) {
prot_printf(imapd_out, "* NO [ALERT] %s\r\n",
error_message(IMAP_NO_OVERQUOTA));
-@@ -4626,7 +4626,7 @@
+@@ -4722,7 +4722,7 @@
printastring(name);
prot_printf(imapd_out, " (");
if (quota.limit >= 0) {
@@ -71,7 +71,7 @@
quota.used/QUOTA_UNITS, quota.limit);
}
prot_printf(imapd_out, ")\r\n");
-@@ -4688,7 +4688,7 @@
+@@ -4784,7 +4784,7 @@
printastring(mailboxname);
prot_printf(imapd_out, " (");
if (mailbox.quota.limit >= 0) {
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list