[SVN] r510 - in /branches/sarge-2.2.13/debian: README.Debian
README.Debian.database UPGRADE.Debian changelog cyrus-common-2.2.postinst
rules
debian at incase.de
debian at incase.de
Fri Jul 21 14:01:57 UTC 2006
Author: sven
Date: Fri Jul 21 16:01:43 2006
New Revision: 510
URL: https://mail.incase.de/viewcvs?rev=510&root=cyrus22&view=rev
Log:
Bring sarge branch in sync with /trunk r509
Modified:
branches/sarge-2.2.13/debian/README.Debian
branches/sarge-2.2.13/debian/README.Debian.database
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.postinst
branches/sarge-2.2.13/debian/rules
Modified: branches/sarge-2.2.13/debian/README.Debian
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/README.Debian?rev=510&root=cyrus22&r1=509&r2=510&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/README.Debian (original)
+++ branches/sarge-2.2.13/debian/README.Debian Fri Jul 21 16:01:43 2006
@@ -19,13 +19,12 @@
For more information, please consult http://asg.web.cmu.edu/cyrus/imapd/ and
http://asg.web.cmu.edu/twiki/bin/view/Cyrus/WebHome (Cyrus WiKi). There is
also Cyrus-HOWTO (Cyrus-IMAP.txt) available as part of the LDP HOWTO
-collection. Upgrade hints are in UPGRADE.Debian. Outdated documentation will
-cause you much grief, so beware of that when hunting anywhere else than the
-Cyrus mailinglist for information.
-
-Information about updated packages for Debian stable (i.e. of updates that
-are not necessarily security updates) is available at
-http://people.debian.org/~hmh/
+collection. Upgrade hints are in UPGRADE.Debian.gz Outdated documentation
+will cause you much grief, so beware of that when hunting anywhere else than
+the Cyrus mailinglist for information.
+
+Backports of the latest packages for Debian Stable are available from
+http://www.backports.org
WARNING: For one to get Cyrus IMAPd to work correctly, one must first get the
SASL layer to work correctly. This is far from trivial, so if you don't manage
@@ -63,21 +62,10 @@
Feel free to use dpkg-statoverride to change the permission of
/var/run/cyrus/socket, the cyrus packages will not override your
- configuration if dpkg-statoverride is used. In fact, you will most probably
+ configuration if dpkg-statoverride is used. In fact, you will most likely
have to do so for postfix to deliver to Cyrus, for example.
-3. Removal of netnews support
-
- Netnews support as it were is dead. Cyrus 2.2 has a brand new approach,
- and the stuff in Cyrus 2.2 is not functional, and thus removed from this
- package.
-
-4. Debian Cyrus IMAPd logs with facility MAIL instead of LOCAL6. Also, it
- prefixes *all* log output with "cyrus/" (e.g.: imapd logs appear as
- "cyrus/imapd[#####]" instead of "imapd[#####]"). This last change was
- accepted upstream for Cyrus 2.2.
-
-5. Cyrus Murder, the Cyrus IMAPd/POP3 aggregator is available.
+3. Cyrus Murder, the Cyrus IMAPd/POP3 aggregator is available.
However, you will have to configure it yourself. No pre-packaged
configuration of Murder is available at this time... The documentation is
@@ -90,20 +78,23 @@
One important note: MUPDATE doesn't support TLS, so you won't be able to
use plaintext authentication methods. The easiest thing to do is to put
- an entry for your mupdate user in sasldb2 and use DIGEST-MD5.
+ an entry for your mupdate user in sasldb2 and use DIGEST-MD5.
General notes and hints:
------------------------
o *** ALWAYS READ /usr/share/doc/cyrus-common-2.2/NEWS.Debian *** after
- you upgrade the package.
+ you upgrade the package. This, and every other NEWS.Debian can automatically
+ be shown to you before the upgrade, see the apt-listchanges package for more
+ information.
o QUOTAS ARE LIMITIED TO 2GB on some platforms.
Be careful to not set quotas over that ammount if your platform doesn't
support the C datatype "long long". Things will break in very bad ways.
Yes, it is a big glitch, and no, there are no easy workarounds.
see https://bugzilla.andrew.cmu.edu/show_bug.cgi?id=1212
+ This has been fixed for the upcoming Cyrus 2.3.
o Either turn off logging of the DEBUG level, or don't complain about cyrus
verbosity on the logs. Don't ever ask in the mailing lists about messages
@@ -112,7 +103,7 @@
o Watch out for your /dev/random bitbucket! SASL may use it, and if it
empties, it will hang the processes wrapped up by SASL. This means
just about every Cyrus service (lmtp, imap, pop3, sieve)... Disable
- APOP in /etc/imapd.conf if you don't need it, as it is a serious draw
+ APOP in /etc/imapd.conf if you don't need it, as it is a serious draw
on randomness resources.
o One extremely important point to notice is that saslauthd works ONLY
@@ -123,6 +114,10 @@
o When using ext3, Cyrus really wants data=journal. However, up to
kernel 2.4.20 there are dangerous bugs in that option, so you're better
off not using that. xfs is faster and better for Cyrus, anyway.
+ Please note that sarge was shipped with 2.4.27, and etch will not ship
+ any 2.4 kernels anymore."
+
+ 2.4 kernels are NOT shipped with Debian Etch.
o nscd users: nscd is highly incompatible with ldap, and somewhat buggy
otherwise. If you use nscd and Cyrus segfaults on you, try restarting
@@ -137,11 +132,11 @@
I didn't expect SASL 2.1 to still have this annoying problem]
o The lmtp service (allocated in Debian Woody to port 2003, and non-existent
- on Debian Sarge) is non-standard. It has no port officially allocated
- anywhere; it is usually run bound to the localhost interface, unless one
- needs it for clustering and high-availability scenarios. If you need it
- elsewhere, by all means move it -- you only need to edit /etc/services, or
- change the port for the lmtp service in /etc/cyrus.conf.
+ on Debian Sarge and Etch) is non-standard. It has no port officially
+ allocated anywhere; it is usually run bound to the localhost interface,
+ unless one needs it for clustering and high-availability scenarios. If you
+ need it elsewhere, by all means move it -- you only need to edit
+ /etc/services, or change the port for the lmtp service in /etc/cyrus.conf.
o The lmtp service will only allow Cyrus lmtp administrators to authenticate.
Set them in /etc/imapd.conf.
@@ -150,14 +145,14 @@
subfolders are children of INBOX, and one where they are all in the same
hierarchical level).
- See /usr/share/doc/cyrus-common-2.2/html/altnamespace.html for details. If
+ See /usr/share/doc/cyrus-doc-2.2/html/altnamespace.html for details. If
you deal with a large population of winboze users, this option can save
you some headaches.
o One can also chose between netnews-style notation for folders
(INBOX.subfolder), where the "." character is reserved to separate folders;
or UNIX-style notation (INBOX/subfolder), where dots are allowed in names,
- and the slash separate folders (the "^" character is reserved in this
+ and the slash separate folders (the "^" character is reserved in this
mode).
See /usr/share/doc/cyrus-common-2.2/html/altnamespace.html for details.
@@ -181,23 +176,22 @@
o You need to specify your admin users in /etc/imapd.conf before you can
add mailboxes, or deliver through authenticated lmtp. Do NOT use root.
- We suggest user cyrus, which is already used by the system for all
+ We suggest user cyrus, which is already used by the system for all
things Cyrus IMAPd... but it need not be an existing user. As long as
SASL will authenticate against it, it will work.
o Do NOT read your admin user's email via IMAP (see the FAQ for details).
-
+
o Don't export your mail store over NFS or AFS (read the FAQ for more info).
You have been warned. You really want a journaled (as in journaling for the
metadata), local filesystem for the store. Failing that, you need
- something with very strict and correct lock semanthics, and full mmap
+ something with very strict and correct lock semantics, and full mmap
support.
- o Ext2 is slow on very large directories (right now), and sync medatada
+ o Ext2 is slow on very large directories (right now), and sync metadata
writes enabled are a huge performance hit. If you need high IO throughput
- from Cyrus, you will need to use ext3, reiserfs, xfs or something like
- that. xfs is probably the best one.
-
+ from Cyrus, you will need to use ext3, reiserfs, xfs or something similar.
+
o You may want to enable/disable synchronous metadata writes to your mail
store dirs (check /usr/share/doc/cyrus-doc-2.2/html/install.html for more
info, in package cyrus-docs-2.2). The cyrus-makedirs script tries to do the
@@ -213,7 +207,7 @@
the Unix socket for that -- it automatically authenticates as user
postman and that will help wonders. cyrdeliver can also be used to
inject mail, but it will simply open an LMTP socket to cyrus and
- deliver through that -- this is much slower than using LMTP directly.
+ deliver through that -- this is much slower than using LMTP directly.
The UNIX socket is in /var/run/cyrus/socket/lmtp. Use dpkg-statoverride
if you need to change the permissions of the socket directory.
@@ -227,12 +221,12 @@
o Refer to cyrus-utils.sourceforge.net and the info-cyrus mailinglist
for mailbox/imap to cyrus conversion scripts.
- o If you don't use pop3, or something else enabled by default in cyrus.conf,
- disable it. Otherwise, Cyrus master will log warnings that the service
- could not be started.
+ o If you don't have pop3 or something else enabled by default in cyrus.conf,
+ installed, disable it. Otherwise, Cyrus master will log warnings that the
+ service could not be started.
o If you want to run something that is not in /usr/lib/cyrus/bin in
- cyrus.conf, just use the full path in cyrus.conf (e.g.:
+ cyrus.conf, just use the full path in cyrus.conf (e.g.:
cmd="/usr/sbin/squatter").
o Sieveshell is really lacking on auth capabilities, and timsieved is quite
@@ -247,8 +241,10 @@
Known bugs
----------
- o Group lookups in LDAP (through nss-ldap) will not work well. See Debian
- bug #156671.
+ Please see
+http://bugs.debian.org/cgi-bin/pkgreport.cgi?which=src&data=cyrus-imapd-2.2&
+archive=no&version=
+ for a list of any known bugs.
SNMP logging
@@ -288,7 +284,7 @@
Loss of the delivery database is not very bad, it just means some users might
get duplicated messages.
-Cyrus does NOT backup the mail store automatically. To backup the mail store
+Cyrus does NOT backup the mail store automatically. To backup the mail store
partitions, you must stop Cyrus and dump the entire partition to your backup
media. The MH-like structure of the Cyrus store do make them suitable for
incremental backups. Hot-backups of the store can be made, but you risk losing
@@ -309,10 +305,7 @@
Debian source package quirks
----------------------------
-There aren't many. Patchset numbers as provided by the cvsps utility in its
-default configuration are used to denote patches taken from upstream CVS in the
-changelog. Less important patches from upstream CVS (such as documentation
-updates) are applied without adding a changelog entry.
+Patching is done using dpatch. Patches from upstream CVS are marked as such.
THANKS
@@ -324,7 +317,8 @@
David D. Kilzer <ddkilzer at theracingworld.com> for their huge help in getting
the v2.1 packages out-of-the-door, and the upgrade from v1.5 guide; Fabian
Fagerholm <fabbe at paniq.net> for stress testing the daemons, and useful
-feedback; and Gilles Bouthenot <gilles.bouthenot at fcomte.iufm.fr> for good
-feedback.
-
- -- Henrique de Moraes Holschuh <hmh at debian.org>
+feedback; Gilles Bouthenot <gilles.bouthenot at fcomte.iufm.fr> for good
+feedback; and Henrique de Moraes Holschuh for maintaining the 2.1 branch.
+
+ -- The Debian Cyrus Team <pkg-cyrus-imapd-debian-devel at lists.alioth.debian.org>
+
Modified: branches/sarge-2.2.13/debian/README.Debian.database
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/README.Debian.database?rev=510&root=cyrus22&r1=509&r2=510&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/README.Debian.database (original)
+++ branches/sarge-2.2.13/debian/README.Debian.database Fri Jul 21 16:01:43 2006
@@ -33,7 +33,8 @@
If cvt-cyrusdb locks up just at the beginning of the conversion, your databases
might be locked. Unlock them (i.e. REALLY stop Cyrus if it is still running,
-use the db3* utilities to clean any stray locks, or try a reboot).
+use the db* utilities (from the older Berkeley DB version) to clean any stray
+locks, or try a reboot).
Step-by-step conversion guide:
@@ -54,7 +55,14 @@
If the BerkeleyDB version is what was changed, you need to use the
Berkeley DB upgrade utility in all db* databases. See the manpages for
- db*_upgrade.
+ db*_upgrade. Note that you need to use the db*_upgrade utility with the
+ same version as given on the DBENGINE line of cyrus-db-types.txt.
+ You should look for lines with 'berkeley' or 'berkeley_nosync' on
+ the right side. You can safely ignore lines with 'flat', 'skiplist' or
+ 'quotalegacy'.
+ NOTE: If you changed the type of any of the databases through imapd.conf,
+ cyrus-db-types.txt isn't updated to match those. Be sure to cross-check
+ imapd.conf if you did that.
The SUBS and SEEN databases are different: there are many of them (one
for every mail folder of every user for SEEN; one for every user for
@@ -98,7 +106,7 @@
the SEEN databases:
find /var/lib/cyrus -type f -name '*.seen' -exec myshellscript {} \;
- The "find" command above you give you the name of the database as "$1"
+ The "find" command above gives you the name of the database as "$1"
inside your shell script.
3. Reset the database backend change system
Modified: branches/sarge-2.2.13/debian/UPGRADE.Debian
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/UPGRADE.Debian?rev=510&root=cyrus22&r1=509&r2=510&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/UPGRADE.Debian (original)
+++ branches/sarge-2.2.13/debian/UPGRADE.Debian Fri Jul 21 16:01:43 2006
@@ -1,11 +1,19 @@
-Upgrading cyrus-imapd to cyrus2-imapd on Debian
-(thanks to David D. Kilzer <ddkilzer at theracingworld.com> for this document)
------------------------------------------------
-
For more information, see README.Debian[.gz] in /usr/share/doc/cyrus-common-2.2/
and the web page below, part of the cyrus-utils project at SourceForge:
http://cyrus-utils.sourceforge.net/faq
+
+Upgrading from 2.2.12 or 2.2.13 versions prior to 2.2.13-5
+==========================================================
+
+In 2.2.13-5, a bug in debian/rules regarding the generation of
+cyrus-db-types.txt was fixed. As a result, the cyrus2.2 init script
+might complain about a database types mismatch. If this happens,
+please make sure that you are really upgrading from a Debian package
+of cyrus-imapd version 2.2 (either the old experimental cyrus22-imapd
+or the newer cyrus-imapd-2.2 packages). If you do, please remove
+/usr/lib/cyrus/cyrus-db-types.active and run
+dpkg --reconfigure cyrus-common-2.2
Upgrading from cyrus 2.1
========================
@@ -30,6 +38,10 @@
Upgrading from cyrus 1.5.x
==========================
+
+Upgrading cyrus-imapd to cyrus-imapd-2.2 on Debian
+(thanks to David D. Kilzer <ddkilzer at theracingworld.com> for this document)
+-----------------------------------------------
This document describes the procedure for upgrading from the old cyrus-imapd
(v1.5.x) package to the new cyrus-imapd-2.2 (v2.2) package. While this is a
Modified: branches/sarge-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/changelog?rev=510&root=cyrus22&r1=509&r2=510&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/changelog (original)
+++ branches/sarge-2.2.13/debian/changelog Fri Jul 21 16:01:43 2006
@@ -1,8 +1,19 @@
-cyrus-imapd-2.2 (2.2.13-3bpo1) sarge-backports; urgency=low
-
- * Backport of 2.2.13-4 to sarge
+cyrus-imapd-2.2 (2.2.13-4bpo1) sarge-backports; urgency=low
+
+ * Backport of 2.2.13-5 to sarge
-- Sven Mueller <sven at debian.org> Wed, 28 Jun 2006 23:18:39 +0200
+
+cyrus-imapd-2.2 (2.2.13-5) UNRELEASED; urgency=low
+
+ * Remove outdated entry about netnews removal from README.Debian
+ (Closes: #378519)
+ * Add --no-create-home to adduser arguments in cyrus-common2.2's
+ postinst script. (Closes: #378518)
+ * Modify debian/rules to once again create a meaningful
+ cyrus-db-types.txt file (Closes: #366957)
+
+ -- Sven Mueller <sven at debian.org> Wed, 19 Jul 2006 23:01:58 +0200
cyrus-imapd-2.2 (2.2.13-4) unstable; urgency=low
Modified: branches/sarge-2.2.13/debian/cyrus-common-2.2.postinst
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/cyrus-common-2.2.postinst?rev=510&root=cyrus22&r1=509&r2=510&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/cyrus-common-2.2.postinst (original)
+++ branches/sarge-2.2.13/debian/cyrus-common-2.2.postinst Fri Jul 21 16:01:43 2006
@@ -53,7 +53,7 @@
# Add the cyrus user (requires adduser >= 3.34)
echo "Creating/updating cyrus user account..."
adduser --quiet --system --ingroup mail --home /var/spool/cyrus \
- --shell /bin/sh --disabled-password \
+ --shell /bin/sh --no-create-home --disabled-password \
--gecos "Cyrus Mailsystem User" cyrus >/dev/null || {
if getent passwd | grep -s -q -E '^cyrus:'; then
echo "Non-system user cyrus found. I will not overwrite a non-system" >&2
Modified: branches/sarge-2.2.13/debian/rules
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/rules?rev=510&root=cyrus22&r1=509&r2=510&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/rules (original)
+++ branches/sarge-2.2.13/debian/rules Fri Jul 21 16:01:43 2006
@@ -122,9 +122,11 @@
# store database configuration for possible automatic
# upgrading later
echo "DBENGINE $(DBENGINE)" >>debian/cyrus-db-types.txt
- grep -E 'CONFIG_DB_[A-Z]+[[:space:]]+[(]' config.h |\
- sed -e 's/&cyrusdb_//' -e 's/.*CONFIG_DB_//' -e 's/(//' -e 's/)//' \
- >>debian/cyrus-db-types.txt
+ grep _db lib/imapoptions \
+ | cut -d, -f1-2 | sed -e 's/{ "//;s/_db", "/ /;s/"$//' \
+ | sed -e 's/^tls.* /TLS /;s/^subs.* /SUBS /;s/^seen.* /SEEN /;s/^pts.* /PTS /;s/^mbox.* /MBOX /'\
+ | awk '{printf("%s %s\n",toupper($1),$2);}' \
+ >>debian/cyrus-db-types.txt
mv debian/cyrus-db-types.txt debian/cyrus-db-types.txt.old \
&& sort -u < debian/cyrus-db-types.txt.old > debian/cyrus-db-types.txt \
&& rm debian/cyrus-db-types.txt.old
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list