[pkg-kolab] r110 - in trunk/kolab-cyrus-imapd/debian: . examples
patches po
Steffen Joeris
white-guest at costa.debian.org
Thu Jan 5 14:27:31 UTC 2006
Author: white-guest
Date: 2006-01-05 14:27:15 +0000 (Thu, 05 Jan 2006)
New Revision: 110
Added:
trunk/kolab-cyrus-imapd/debian/README.Debian
trunk/kolab-cyrus-imapd/debian/README.Debian.database
trunk/kolab-cyrus-imapd/debian/README.Debian.debug
trunk/kolab-cyrus-imapd/debian/README.Debian.simpleinstall
trunk/kolab-cyrus-imapd/debian/README.exim
trunk/kolab-cyrus-imapd/debian/README.postfix
trunk/kolab-cyrus-imapd/debian/README.sendmail
trunk/kolab-cyrus-imapd/debian/TODO.Debian
trunk/kolab-cyrus-imapd/debian/UPGRADE.Debian
trunk/kolab-cyrus-imapd/debian/cyradm-16x16.xpm
trunk/kolab-cyrus-imapd/debian/cyradm-32x32.xpm
trunk/kolab-cyrus-imapd/debian/cyrus-db-types.upgrading_from_1.5.txt
trunk/kolab-cyrus-imapd/debian/cyrus-makedirs
trunk/kolab-cyrus-imapd/debian/cyrus-makedirs.8
trunk/kolab-cyrus-imapd/debian/examples/
trunk/kolab-cyrus-imapd/debian/examples/README
trunk/kolab-cyrus-imapd/debian/examples/README.imapcreate.pl
trunk/kolab-cyrus-imapd/debian/examples/README.kolab.postfix
trunk/kolab-cyrus-imapd/debian/examples/imapcreate.pl
trunk/kolab-cyrus-imapd/debian/examples/kolab.imapd.conf
trunk/kolab-cyrus-imapd/debian/examples/mboxtocyrus
trunk/kolab-cyrus-imapd/debian/examples/syncldap2cyrus.pl
trunk/kolab-cyrus-imapd/debian/get-backtrace.gdb
trunk/kolab-cyrus-imapd/debian/imap.pam
trunk/kolab-cyrus-imapd/debian/imapd.conf.backup
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.NEWS
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.docs
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.kolab-cyrus.default
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.kolab-cyrus.init
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.docs
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-nntpd.dirs
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-nntpd.files
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-nntpd.links
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-nntpd.manpages
trunk/kolab-cyrus-imapd/debian/kolab-libcyrus-imap-perl.files
trunk/kolab-cyrus-imapd/debian/kolab-libcyrus-imap-perl.lintian
trunk/kolab-cyrus-imapd/debian/kolab-libcyrus-imap-perl.manpages
trunk/kolab-cyrus-imapd/debian/license.html
trunk/kolab-cyrus-imapd/debian/lmtp.pam
trunk/kolab-cyrus-imapd/debian/logcheck.ignore
trunk/kolab-cyrus-imapd/debian/mupdate.pam
trunk/kolab-cyrus-imapd/debian/nntp.pam
trunk/kolab-cyrus-imapd/debian/po/
trunk/kolab-cyrus-imapd/debian/po/POTFILES.in
trunk/kolab-cyrus-imapd/debian/po/de.po
trunk/kolab-cyrus-imapd/debian/po/fr.po
trunk/kolab-cyrus-imapd/debian/po/it.po
trunk/kolab-cyrus-imapd/debian/po/ja.po
trunk/kolab-cyrus-imapd/debian/po/nl.po
trunk/kolab-cyrus-imapd/debian/po/pt_BR.po
trunk/kolab-cyrus-imapd/debian/po/templates.pot
trunk/kolab-cyrus-imapd/debian/pop.pam
trunk/kolab-cyrus-imapd/debian/sieve.pam
trunk/kolab-cyrus-imapd/debian/watch
Modified:
trunk/kolab-cyrus-imapd/debian/changelog
trunk/kolab-cyrus-imapd/debian/control
trunk/kolab-cyrus-imapd/debian/copyright
trunk/kolab-cyrus-imapd/debian/cyrdump.8
trunk/kolab-cyrus-imapd/debian/cyrus.conf
trunk/kolab-cyrus-imapd/debian/deletable.files
trunk/kolab-cyrus-imapd/debian/executable.files
trunk/kolab-cyrus-imapd/debian/imapd.conf
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.README.Debian
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.lintian
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.manpages
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.menu
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.README.Debian
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.cron.daily
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.files
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.lintian
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.manpages
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.postinst
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.postrm
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.prerm
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.templates
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-dev.links
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.doc-base
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.links
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-imapd.links
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-murder.links
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.links
trunk/kolab-cyrus-imapd/debian/patches/00list
trunk/kolab-cyrus-imapd/debian/rules
Log:
* modify files to bring them closer to debian cyrus
Added: trunk/kolab-cyrus-imapd/debian/README.Debian
===================================================================
--- trunk/kolab-cyrus-imapd/debian/README.Debian 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/README.Debian 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,330 @@
+Cyrus IMAP for Debian
+$Id: README.Debian 5 2005-03-12 23:19:45Z sven $
+---------------------
+
+ "All systems administrators have their horror stories. For me, it was
+ setting up a HP Color Bubblejet under Linux using ghostscript before
+ linuxprinting.org was alive. Well that was a piece of cake compared
+ to what I am about to describe in this document."
+ -- "Hosting email for virtual domains using Postfix and Cyrus"
+ Haim Dimermanas, 2001-08-01
+
+ "I warned you to read all the documentation first, didn't I?"
+ -- Henrique M. Holschuh, 2002-10-01
+
+IMPORTANT: Cyrus is a closed-box email system. Your system will access your
+email through LMTP, IMAP and POP3 *only*. No direct file access to the email
+store is supposed to take place.
+
+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/
+
+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
+at first, don't go around filling bugs against Cyrus IMAPd before you make damn
+sure it is not a SASL configuration error. Read the hint list later on this
+file as well. Start by reading README.Debian.simpleinstall.
+
+The Debian packaging of Cyrus has a few quirks which are important to know
+about:
+
+1. Renaming of some Cyrus IMAP utilities
+
+ The quota, reconstruct, master and deliver utilities have been renamed to
+ cyrquota, cyrreconstruct, cyrmaster and cyrdeliver, following the template
+ set by upstream with "cyradm". This was done because both Cyrus Debian
+ maintainers found the original names to be too generic and likely to cause
+ namespace collisions later.
+
+ Since documentation may refer to these utilities using their original
+ name, you must be aware of this fact. Also, installsieve is deprecated
+ and not included in the Debian package; use sieveshell instead.
+
+2. Relocation of many Cyrus IMAP files
+
+ The default Cyrus install scatters files all over the place. The Debian
+ package installs only a few files in /usr/bin (cyradm, sieveshell).
+ IMAP/email administrator utilities are installed in /usr/sbin (such as
+ cyrreconstruct). Programs that must be run by cyrmaster are installed in
+ /usr/lib/cyrus (such as imapd and pop3d). Sockets go into
+ /var/run/cyrus/socket, per FHS 2.2. Sieve files go in /var/spool/sieve, but
+ an /etc/sieve compatibility symlink is also installed just in case.
+
+ The imapd.conf and cyrus.conf configuration files are in /etc. The PAM
+ policy files are in /etc/pam.d.
+
+ 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
+ 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.
+
+ However, you will have to configure it yourself. No pre-packaged
+ configuration of Murder is available at this time... The documentation is
+ all there, and the Cyrus packages will happily preserve your Cyrus Murder
+ configuration. You do not have to install the cyrus22-imapd or
+ cyrus22-pop3d packages in hosts that only need the proxy daemons running,
+ but do note that the /etc/pam.d/imap and /etc/pam.d/pop files are in those
+ packages (and they are needed by the proxies), so you will have to create
+ the files manually.
+
+ 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.
+
+
+General notes and hints:
+------------------------
+
+ o *** ALWAYS READ /usr/share/doc/cyrus22-common/NEWS.Debian *** after
+ you upgrade the package.
+
+ 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
+
+ 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
+ logged in the DEBUG level before reading the source code.
+
+ 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
+ on randomness resources.
+
+ o One extremely important point to notice is that saslauthd works ONLY
+ with plaintext. APOP, CRAM-MD5, OTP, DIGEST-MD5 and any other "auxprop"
+ SASL mech will *not* work through saslauthd. This can and will cause
+ serious issues in Cyrus murder environments.
+
+ 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.
+
+ o nscd users: nscd is highly incompatible with ldap, and somewhat buggy
+ otherwise. If you use nscd and Cyrus segfaults on you, try restarting
+ nscd, or disabling it.
+
+ o "The Debian libldap2 and cyrus-imapd packages are both compiled using the
+ SASL library. If you use cyrus-imapd together with libnss-ldap, or
+ saslauthd together with libpam-ldap, the resulting double calls to SASL
+ library functions can trigger a double-free bug which may cause the calling
+ process to crash. To avoid such a crash, you must recompile the libldap2
+ package --without-cyrus-sasl." -- http://bugs.debian.org/145766 [!@#$%!!!
+ 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.
+
+ o The lmtp service will only allow Cyrus lmtp administrators to authenticate.
+ Set them in /etc/imapd.conf.
+
+ o Cyrus can now use two different namespaces (the standard one, where all
+ subfolders are children of INBOX, and one where they are all in the same
+ hierarchical level).
+
+ See /usr/share/doc/cyrus22-common/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
+ mode).
+
+ See /usr/share/doc/cyrus22-common/html/altnamespace.html for details.
+
+ o When using SASL, do keep in mind that cyrus runs under user cyrus, and not
+ root. It cannot read shadow files (unless you add the user cyrus to group
+ shadow), or perform any root-only operations directly. You need to use the
+ saslauthd (or, if available, auxpropd) mechanism to authenticate against
+ root-only data. And that also means user cyrus must be able to talk to the
+ unix socket saslauthd uses (which is controlled by SASL, not Cyrus IMAPd).
+
+ o Any of the SASL configure options can be inserted in imapd.conf, just
+ prefix it with "sasl_" (e.g.: sasl_mech_list: PLAIN). The list of SASL
+ options is in /usr/share/doc/libsasl2/options.html.
+
+ o The services are tcp-wrapped. Their hosts.allow/hosts.deny id is the
+ service name in /etc/cyrus.conf. See hosts_access(5).
+
+ o The PAM service names for use with SASL (via saslauthd) are:
+ "imap", "sieve", "lmtp", "pop", "mupdate".
+
+ 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
+ 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
+ support.
+
+ o Ext2 is slow on very large directories (right now), and sync medatada
+ 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.
+
+ o You may want to enable/disable synchronous metadata writes to your mail
+ store dirs (check /usr/share/doc/cyrus22-doc/html/install.html for more
+ info, in package cyrus22-docs). The cyrus-makedirs script tries to do the
+ right thing for ext2 and ext3 filesystems. Failure to correctly update the
+ metadata in the right order can completely screw up your Cyrus store on a
+ power-loss or another disk failure.
+
+ o Try mounting the store and cyrus database filesystems with noatime for
+ performance gains. Load-balance the store using multiple partitions on
+ different physical devices for even better performance gains.
+
+ o Cyrus IMAPd should be fed mail through LMTP. If at all possible, use
+ 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.
+ The UNIX socket is in /var/run/cyrus/socket/lmtp. Use dpkg-statoverride
+ if you need to change the permissions of the socket directory.
+
+ o You can use /usr/sbin/cyrus-makedirs to generate the needed directories
+ for cyrus partitions. It is run automatically by the package postinst,
+ and it knows to parse the /etc/imapd.conf file to verify if hash
+ subdirectories are needed or not. It cannot detect what kind of hashing
+ should be used yet. If you recompile the package with full hashing,
+ change it.
+
+ 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 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.:
+ cmd="/usr/sbin/squatter").
+
+ o Sieveshell is really lacking on auth capabilities, and timsieved is quite
+ strict on what auth capabilities it offers. So, pay attention to
+ sasl_minimum_layer, and see bug #151925 for more details
+ (http://bugs.debian.org/151925). Also, make sure you have the correct set
+ of SASL2 modules installed in in your system.
+
+ o uw-mailutils has some nice utilities to migrate mail stores from/to imap
+ servers. You might find it quite useful to migrate a site to Cyrus.
+
+Known bugs
+----------
+
+ o Group lookups in LDAP (through nss-ldap) will not work well. See Debian
+ bug #156671.
+
+
+SNMP logging
+------------
+
+cyrmaster is an agentx SNMP subagent, and it can interface to a agentx SNMP
+master. It will export data at OID .1.3.6.1.4.1.3.6.1 (cyrusMasterMIB).
+
+The ucd-snmp daemon (package snmpd) is NOT configured to work
+as agentx master agent by default -- you have to do that manually,
+by adding "master agentx" to the /etc/snmp/snmpd.conf file.
+
+cyrmaster will register with the snmp agentx master when it is started,
+so if the snmp master is restarted after cyrmaster, it will not forward
+the snmp requests to cyrmaster anymore. Check your system for any cron
+scripts that might be restarting the snmp process if that happens.
+
+See /usr/share/snmp/mib/CYRUS-MASTER-MIB.txt for more details.
+
+
+Backing up for rainy days
+------------------------
+
+Cyrus automatically checkpoints and backups some of its databases, using the
+ctl_cyrusdb(8) utility (EVENTS in /etc/cyrus.conf). It is supposed to be also
+capable of recovering automatically from these backups, and to attempt to do so
+at startup. However, ctl_cyrusdb -r is NOT FULLY IMPLEMENTED YET... you are on
+your own to recover from corrupt databases.
+
+This recovery can be done using the db3 utilities, and even by smart usage of
+cvt_cyrusdb(8) and ctl_mboxlist(8). The automatic backups are useful, too,
+even if they are not restored automatically.
+
+The database backups are stored at /var/lib/cyrus/db.backup*, you may want to
+copy the files there to backup media in a cronjob, or something like that. You
+can kill the TLS cache database, as long as Cyrus is stopped when you do it.
+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
+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
+some non-critical metadata when the restore is done.
+
+You can backup all Cyrus non-text databases to a flat text file format using the
+cvt_cyrusdb utility (and recover back from the flat text file format), but you
+should stop Cyrus first.
+
+If you ever need to recover the mail store from backup, you should run
+cyrreconstruct(8) to rebuild the mailbox indexes.
+
+A daily maintenance cronjob uses ctl_mboxlist(8) to dump the mailboxes database
+to /var/backup. That backup copy can be used as a last-resort copy if the hot
+backups become corrupted somehow.
+
+
+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.
+
+
+THANKS
+------
+
+Thanks go to the CMU crew for producing Cyrus IMAPd in the first place;
+Michael-John Turner <mj at debian.org> for maintaining the v1.5 branch and setting
+the groundstones for the v2.1 package; David Parker <david at neongoat.com> and
+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>
Added: trunk/kolab-cyrus-imapd/debian/README.Debian.database
===================================================================
--- trunk/kolab-cyrus-imapd/debian/README.Debian.database 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/README.Debian.database 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,122 @@
+Cyrus IMAP for Debian: Database backend conversion
+$Id: README.Debian.database 5 2005-03-12 23:19:45Z sven $
+--------------------------------------------------
+
+ "All systems administrators have their horror stories. For me, it was
+ setting up a HP Color Bubblejet under Linux using ghostscript before
+ linuxprinting.org was alive. Well that was a piece of cake compared
+ to what I am about to describe in this document."
+ -- "Hosting email for virtual domains using Postfix and Cyrus"
+ Haim Dimermanas, 2001-08-01
+
+ "I warned you to read all the documentation first, didn't I?"
+ -- Henrique M. Holschuh, 2002-10-01
+
+For more information, please consult http://asg.web.cmu.edu/cyrus/imapd/.
+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.
+
+
+Database backends
+-----------------
+
+Cyrus can be compiled to use different types of database backends for each of
+its databases. The package will warn you if you try to start Cyrus and the
+database backends seem to have changed since the last active version.
+
+After converting all the mail stores and /var/lib/cyrus to use the proper
+database backends using cvt_cyrusdb(8), remove
+/usr/lib/cyrus/cyrus-db-types.active and run "dpkg-reconfigure cyrus22-common"
+once to reset the error trigger, and start cyrmaster.
+
+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).
+
+Step-by-step conversion guide:
+
+1. Stop the Cyrus system
+ /etc/init.d/cyrus22 stop
+
+2. Find out which databases to convert:
+ diff -u /usr/lib/cyrus/cyrus-db-types.active \
+ /usr/lib/cyrus/cyrus-db-types.txt
+
+ The databases are these in the default install:
+ DUPLICATE /var/lib/cyrus/deliver.db
+ MBOX /var/lib/cyrus/mailboxes.db
+ TLS /var/lib/cyrus/tls_sessions.db
+
+ Don't bother upgrading the TLS database, just delete it: the information
+ there is not reused when you stop Cyrus.
+
+ 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.
+
+ 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
+ SUBS) and you need to convert every single one of them.
+
+ SUBS /var/lib/cyrus/...../*.subs
+ SEEN /var/lib/cyrus/...../*.seen
+
+ SUBS contains the subscribed folders, and SEEN contains the seen state
+ of every mail in a folder.
+
+ Types db3_nosync and db3 are the same for database conversion matters.
+
+2.1 Converting from DB* to SKIPLIST
+
+ As user cyrus, do the following:
+
+ cd /
+ /usr/sbin/cvt_cyrusdb <fullpath to database> db3 \
+ /var/lib/cyrus/temp.db flat
+ rm -f <fullpath to database>
+ /usr/sbin/cvt_cyrusdb /var/lib/cyrus/temp.db flat \
+ <fullpath to database> skiplist
+ chown cyrus:mail <fullpath to database>
+ rm -f /var/lib/cyrus/temp.db
+
+2.2 Converting from FLAT to SKIPLIST
+
+ As user cyrus, do the following:
+
+ cd /
+ mv <fullpath to database> <fullpath to database>.old
+ /usr/sbin/cvt_cyrusdb <fullpath to database>.old flat \
+ <fullpath to database> skiplist
+ chown cyrus:mail <fullpath to database>
+ rm -f <fullpath to database>.old
+
+2.3 SUBS and SEEN databases
+
+ I suggest using a small shell script and using "find" to mass-convert
+ 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"
+ inside your shell script.
+
+3. Reset the database backend change system
+ rm /usr/lib/cyrus/cyrus-db-types.active
+ dpkg-reconfigure cyrus22-common
+
+4. Start Cyrus, if not started by step 3
+ /etc/init.d/cyrus22 start
+
+WHY THERE IS NO AUTOMATED UPGRADE SCRIPT: Because I dislike people who do not
+read docs, and one Debian user asked me exactly the wrong thing (about
+cyrus21-imapd) while I was in the middle of writing said script AND I am quite
+short on time lately: it is much faster to write a doc than to write and test
+the script. So, now everyone will need to read the docs to get Cyrus working
+again. I am not holding back the skiplist change for that script anymore.
+
+Maybe someday I will finish the upgrade script. Maybe someone else will write
+one (I will certainly include it in the package, if it is good enough). Don't
+hold your breath, though.
+
+ -- Henrique de Moraes Holschuh <hmh at debian.org>
Added: trunk/kolab-cyrus-imapd/debian/README.Debian.debug
===================================================================
--- trunk/kolab-cyrus-imapd/debian/README.Debian.debug 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/README.Debian.debug 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,121 @@
+Cyrus IMAP for Debian, debugging procedures
+$Id: README.Debian.debug 5 2005-03-12 23:19:45Z sven $
+-------------------------------------------
+
+For more information, please consult http://asg.web.cmu.edu/cyrus/imapd/.
+
+Cyrus has various levels of debugging aid, which can and should be used to
+offer more information about any problems you are facing with Cyrus.
+
+First, edit /etc/default/cyrus22, and set CYRUS_VERBOSE to a number higher
+than zero. The higher the number, more debug information is provided. Numbers
+above 30 will cause Cyrus services to pause for 15s before executing (so that
+you can do something to it, such as attach strace or a debugger to the
+process).
+
+You can, and should use strace and ltrace to gather more information about what
+was happening to Cyrus when it malfunctioned. straces are useful when
+networking or signal problems appear to be the issue, and ltraces can give
+hints on what the problem might be.
+
+If a Cyrus service is crashing and cyrmaster logs that the service is being
+killed by a signal, please use the debugging hooks to provide a back-trace
+using gdb (see below). Back-traces are extremely useful when locating where
+Cyrus is dying, and why.
+
+Debugging information is sent to syslogd, using the DEBUG priority, facilities
+MAIL and DAEMON.
+
+You can also try to set MALLOC_CHECK_=2 in the environment, so that malloc()
+will cause Cyrus to dump core if it detects any sort of corruption.
+
+
+Telemetry logs
+--------------
+
+Cyrus will happily log all communications between the Cyrus store closed-box and
+the outside world. These logs are sometimes vital to understand exactly what
+is happening and to reproduce bugs.
+
+To enable telemetry logging, create a directory under /var/lib/cyrus/log with
+the same name as the username for which you want the communication sessions to
+be logged. Cyrus will log all imap, pop3, sieve and lmtp talks authenticated
+as that user (including proxied connections). Make sure the directory is owned
+by user cyrus.
+
+Watch out for sensitive information such as passwords when you submit the
+telemetry logs to a public bug-tracking system or mailinglist.
+
+
+Recompiling Cyrus with debugging information
+--------------------------------------------
+
+In order to produce useful back-traces, or to interactively debug Cyrus,
+you must rebuild the package with debugging information. It is quite
+easy to do so:
+
+1. Install all source dependencies to build the package (needs root):
+ apt-get install build-essential fakeroot
+ apt-get build-dep cyrus22-imapd
+
+2. Download and rebuild Cyrus with debug information:
+ apt-get source cyrus22-imapd
+ cd cyrus22-imapd-*
+ DEB_BUILD_OPTIONS=debug,noopt,nostrip dpkg-buildpackage -uc -us -rfakeroot
+
+3. Install the Cyrus packages with debug information (needs root):
+ cd ..
+ dpkg -i *deb (or something like that)
+
+Now Cyrus should be working fine, using binaries with full debug information
+for gdb. For interactive debugging, you may want to make sure there are no
+optimizations, in which case you should use "DEB_BUILD_OPTIONS=noopt,nostrip
+dpkg-buildpackage -uc -us -rfakeroot".
+
+Warning: the next time you run apt-get update, apt will probably download the
+non-debugging version of the Cyrus debs, and install them over the debugging
+packages.
+
+To install the non-debugging, optimized version of Cyrus over the debugging
+one, issue "apt-get --reinstall install (package)" commands for all the Cyrus
+packages you want replaced.
+
+
+Attaching debuggers to Cyrus, and getting traces
+------------------------------------------------
+
+You can tell Cyrus services to run a debugging command just before they
+start doing real work. This can be used to run strace, ltrace and gdb
+or ddd (for interactive debugging and back-tracing) quite easily.
+
+Set the shell command to be run in /etc/imapd.conf, option debug_command.
+Then, add the command line switch "-D" to the Cyrus services you want to
+run the debug_command in /etc/cyrus.conf, and restart cyrmaster using
+/etc/init.d/cyrus22 restart.
+
+The debugging command must be given as a single line in the configuration file.
+
+To get a back-trace using gdb:
+debug_command: /usr/bin/gdb -batch -cd=/tmp -x /usr/lib/cyrus/getbacktrace.gdb /usr/lib/cyrus/bin/%s %d >/tmp/gdb-backtrace.cyrus.%1$s.%2$d <&- 2>&1 &
+
+The above will produce a back-trace of every service run with -D that segfaults
+in the files /tmp/gdb-backtrace.cyrus.*; /usr/lib/cyrus/getbacktrace.gdb
+simply has the sequence of commands for gdb: c (to continue running the
+service), bt (to get the back-trace if the program didn't exit normally), quit
+(to quit gdb).
+
+For strace, you can use:
+debug_command: /usr/bin/strace -tt -o /tmp/strace.cyrus.%s.%d -p %2$d <&- 2>&1 &
+
+Which will produce straces in /tmp/strace.cyrus.*
+
+For ltrace, you can use:
+debug_command: /usr/bin/ltrace -tt -n 2 -o /tmp/ltrace.cyrus.%s.%d -p %2$d <&- 2>&1 &
+
+Which will produce ltraces in /tmp/ltrace.cyrus.*
+
+Be warned that sensitive information such as passwords may be disclosed in the
+strace and ltrace output, so mangle them before sending such traces to public
+bug-tracking systems or mailing lists.
+
+ -- Henrique de Moraes Holschuh <hmh at debian.org>
Added: trunk/kolab-cyrus-imapd/debian/README.Debian.simpleinstall
===================================================================
--- trunk/kolab-cyrus-imapd/debian/README.Debian.simpleinstall 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/README.Debian.simpleinstall 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,173 @@
+Cyrus IMAP for Debian, Simple Install Guide
+$Id: README.Debian.simpleinstall 5 2005-03-12 23:19:45Z sven $
+-------------------------------------------
+
+ "All systems administrators have their horror stories. For me, it was
+ setting up a HP Color Bubblejet under Linux using ghostscript before
+ linuxprinting.org was alive. Well that was a piece of cake compared
+ to what I am about to describe in this document."
+ -- "Hosting email for virtual domains using Postfix and Cyrus"
+ Haim Dimermanas, 2001-08-01
+
+ "I warned you to read all the documentation first, didn't I?"
+ -- Henrique M. Holschuh, 2002-10-01
+
+
+This document describes how to get Cyrus running with a simple configuration
+that you can then tweak to your real needs.
+
+READ README.Debian AS WELL. I MEAN IT! Cyrus is easy, all the trouble is
+in SASL, and even that becomes easy after you understand how SASL works.
+
+IMPORTANT: Cyrus is a closed-box email system. Your system will access your
+email through LMTP, IMAP and POP3 *only*. No direct file access to the email
+store is supposed to take place.
+
+
+To setup Cyrus so that you can administer it (i.e. create users),
+and get email inside it for those users:
+
+ 1. Make sure libsasl2-modules, libsasl2 and sasl2-bin are installed
+
+ 2. Make sure /etc/sasldb2 is readable by group sasl. Pay attention
+ to overrides (dpkg-statoverride)!
+
+ 3. Make sure user cyrus belongs to group sasl (cyrus22-common's install
+ tries to do this automatically for you).
+
+ 4. Edit /etc/cyrus.conf, and make sure the services you need are
+ enabled. These are most probably "imap", "pop3", "lmtpunix".
+
+ 5. Edit /etc/imapd.conf, and make sure you have some admin users
+ listed in the entry "admins:". I suggest using "cyrus" as your
+ admin.
+
+ I also suggest enabling plain text logins, and setting
+ sasl_minimum_layer: 0
+
+ If you have unixhierarchysep enabled in imapd.conf, change all
+ "." in mailbox names mentioned on this document to "/", since Cyrus
+ will use "/" as the hierarchy separator instead of the default ".".
+ I suggest you just leave unixhierarchysep set to false for now.
+
+ 6. Restart Cyrus (/etc/init.d/cyrus22 restart)
+
+ 7. Use saslpasswd2 -c to create an account for your admin:
+ saslpasswd2 -c cyrus
+
+ 8. Use sasldblistusers2 to make sure step 7 worked fine.
+
+ 9. Add other users to SASL likewise (saslpasswd2 -c).
+
+10. Log in cyrus as the administrator, and create the mailboxes:
+ cyradm --user cyrus localhost
+ cm user.bob
+ cm user.anna
+ cm user.clark...
+ ^D
+
+ (notice that there is an "user." in front of the mailbox name!)
+ You must use "user/bob", "user/anna" instead if you have the
+ unixhierarchysep option enabled in imapd.conf.
+
+ For this to work, you obviously need the cyrus22-admin package
+ installed.
+
+11. Try to login as a normal user, using imtest or a IMAP/POP3 client.
+ If you have trouble with mutt and CRAM-MD5 or DIGEST-MD5, edit
+ /etc/imapd.conf, and look for sasl_mech_list. Set it to:
+ sasl_mech_list: plain cram-md5
+ (this will disable digest-md5, which causes trouble with mutt).
+
+12. Setup your MTA to deliver email inside Cyrus. Basically that can
+ be done (easily) by:
+
+ a) running /usr/sbin/cyrdeliver (SLOW)
+ You need the lmtpunix service enabled in /etc/cyrus.conf for this
+ to work.
+ b) delivering using LMTP to /var/run/cyrus/socket/lmtp
+ You need the lmtpunix service enabled in /etc/cyrus.conf for this
+ to work.
+
+ Just make sure (and use dpkg-statoverride to do that) that your
+ MTA can get to /var/run/cyrus/socket/lmtp. It works just like any
+ file in a Unix system.
+
+ Cyrus REQUIRES a valid RFC2822 message, and will refuse messages with
+ bad headers (such as that From foobar header, notice the missing ':'),
+ embedded NULLs or any other crap.
+
+
+That's it. See /usr/share/doc/cyrus22-common/README.{postfix,exim,sendmail}
+for help on how to setup your MTA to correctly deliver to Cyrus.
+
+
+LDAP SETUP
+----------
+
+First, do the steps above and verify that your system is working fine.
+
+SASL is perfectly capable of trying various authentication methods one after
+another. We will change our Cyrus setup for SASL to use a LDAP server lookup
+through saslauthd.
+
+1. Create the configuration for saslauthd to know what it must do:
+
+ Write the following file to /etc/saslauthd.conf:
+----CUTHERE----
+ldap_servers: ldap://127.0.0.1/
+ldap_version: 3
+ldap_timeout: 10
+ldap_time_limit: 10
+ldap_cache_ttl: 30
+ldap_cache_mem: 32768
+ldap_scope: sub
+ldap_search_base: ou=mail,o=mydomain
+ldap_auth_method: bind
+ldap_filter: maildrop=%u
+----CUTHERE----
+ And of course, edit it to fit your LDAP setup.
+
+2. Now, configure saslauthd to use LDAP mode and our config file:
+
+ Modify /etc/default/saslauthd so that it reads:
+ MECHANISMS="ldap"
+ PARAMS="-O /etc/saslauthd.conf"
+
+ (MECHANISMS can be a space-separated list of authentication
+ mechanisms. If you wanted saslauthd to try LDAP, then PAM, you
+ could use MECHANISMS="ldap pam")
+
+3. Start saslauthd
+
+ /etc/init.d/saslauthd restart
+
+4. Make sure Cyrus will be able to talk to saslauthd
+
+ Set the following options in /etc/imapd.conf:
+ sasl_mech_list: PLAIN
+ allowapop: no
+ allowplaintext: yes
+ sasl_minimum_layer: 0
+ sasl_pwcheck_method: saslauthd
+
+ And restart Cyrus. You'd better understand that the above allows
+ plaintext logins over the network. There is a LDAP SASL auxprop
+ plugin being worked on that might fix this issue. As it stands
+ right now, you're better off by only accepting IMAPS (secure IMAP)
+ connections.
+
+ (sasl_pwcheck_method is a space separated list of SASL methods to
+ try. If you want to have some local users in /etc/sasldb2, for
+ example, you could have "sasl_pwcheck_method: auxprop saslauthd"
+ and also "sasl_auxprop_plugin: sasldb")
+
+ One *extremely* important point to notice is that saslauthd works
+ ONLY with plaintext. APOP, CRAM-MD5, OTP, DIGEST-MD5 and any other
+ "auxprop" SASL mech will *not* work through saslauthd.
+
+5. That's it. There is a LDAP auxprop module in the works which can deal
+ with APOP, CRAM-MD5, OTP, DIGEST-MD5 and so on, look for it in the SASL
+ docs and openldap's contrib stuff.
+
+ -- Henrique de Moraes Holschuh <hmh at debian.org>
Added: trunk/kolab-cyrus-imapd/debian/README.exim
===================================================================
--- trunk/kolab-cyrus-imapd/debian/README.exim 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/README.exim 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,66 @@
+Setting up Cyrus IMAPd for Exim
+$Id: README.exim 5 2005-03-12 23:19:45Z sven $
+===========================================================
+
+This is very incomplete information, if you are an exim user, please send
+in a more complete document.
+
+
+General configuration hints (configuration examples assume you are using
+the Debian Exim4 configuration scheme and paths are relative to
+/etc/exim4):
+
+1. Use Exim version 4. Exim version 3 just doesn't cut it in the lmtp
+ area, which is very important for performance when dealing with Cyrus
+ IMAPd.
+
+2. Use the LMTP transport to deliver using a unix socket (fastest), or
+ the SMTP transport in LMTP mode to deliver over a TCP/IP socket.
+
+ For local delivery over a unix socket, add a file into conf.d/transports
+ with the following:
+
+ cyrus_delivery:
+ driver = lmtp
+ socket = /var/run/cyrus/socket/lmtp
+ batch_max = 20
+ user = mail
+
+ (set batch_max to whatever is best for your setup, and make sure you
+ allow enough Cyrus lmtp processes to serve that many lmtp connections)
+
+ If that doesn't work, I suggest you create a group for lmtp delivery,
+ add whichever user exim is running as to it, and use dpkg-statoverride
+ to make /var/run/cyrus/socket/lmtp writeable by that group.
+
+ To then deliver to Cyrus, you will need to comment check_local_user in
+ conf.d/router/900_exim4-config_local_user, and change the LOCAL_DELIVERY
+ macro in conf.d/main/01_exim4-config_listmacrosdefs to
+ LOCAL_DELIVERY=cyrus_delivery.
+
+ If you still want to deliver some messages to a mail spool then create
+ conf.d/router/899_exim4-config_copy_to_mbox and put this in it, changing
+ the local_parts as necessary:
+
+ copy_to_mbox:
+ debug_print = "R: copy_to_mbox for $local_part@$domain"
+ driver = accept
+ unseen
+ local_parts = postmaster
+ transport = mail_spool
+
+ This will deliver postmaster mail to both cyrus and
+ /var/mail/postmaster. You can comment the unseen option to have it only
+ deliver once to the mail_spool. If you don't set check_local_user or
+ the user option the spool files will be owned by mail.
+
+3. Kill any NULs (ASCII 0x00) inside the message, if you don't want Cyrus
+ to bounce such malformed crap. Calling "tr -d '\000'" as a filter might
+ do the trick.
+
+4. Sieve often needs to set -f option on /usr/sbin/sendmail when doing
+ redirects. Exim allows only trusted_users to do this. It is recommended
+ that you make sure "cyrus" is in the list of trusted_users in
+ conf.d/main/02_exim4-config_options:
+ trusted_users = uucp:cyrus
+
Added: trunk/kolab-cyrus-imapd/debian/README.postfix
===================================================================
--- trunk/kolab-cyrus-imapd/debian/README.postfix 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/README.postfix 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,143 @@
+Setting up Cyrus IMAPd for Postfix (Debian)
+$Id: README.postfix 5 2005-03-12 23:19:45Z sven $
+===========================================================
+
+Cyrus works wonderfully well with Postfix, both in single-system stores (where
+Postfix runs in the same host as Cyrus IMAPd), and remote mail stores (where
+Cyrus IMAPd is in a different host than Postfix).
+
+Delivery to Cyrus should _always_ be done through direct LMTP from Postfix. It
+is far simpler and faster to do such delivery using Unix sockets, but Unix
+sockets are only an option for single-system stores. Cyrdeliver is just a
+stdio-to-LMTP proxy, and it slows down mail delivery greatly.
+
+Cyrus requires LMTP deliveries to be authenticated. It assumes that any
+deliveries done through an Unix socket are trustable, and pre-authenticates
+them as if coming from the "postman" (fictitious) user (but you _can_
+re-authenticate them as another lmtp admin user, if you wish).
+
+Deliveries done through TCP sockets are not limited to the same host, unlike
+the Unix socket ones, and can therefore be used in remote mail stores.
+However, Cyrus requires that the LMTP session be authenticated using one of the
+SASL mechs available to Cyrus (you can switch this off by giving a "-a"
+parameter to lmtpd in cyrus.conf, but that is unsafe since anyone can bypass
+any user authentication controls you might have on mail delivery, that way).
+
+TCP-socket LMTP sessions should be authenticated as one of the Cyrus LMTP
+admins, normal Cyrus users are not enough. This requires Postfix with SASL
+support.
+
+
+Setting up Postfix for LMTP delivery to Cyrus
+=============================================
+
+Just set up a transport (either using a transport map, or the default_transport
+configuration directive of Postfix). Do not use cyrdeliver.
+
+I suggest that the lmtp transport be duplicated and renamed to cyrus if you
+use it to talk to anything else (such as amavisd-new, or amavis-ng). That
+way, LMTP connection caching to the Cyrus store gets optimized, and you can
+use the lmtp-named LMTP transport for something else.
+
+WARNING: Postfix 2.0 does not downcase the recipient in LMTP deliveries, so if
+your users require it, you will have to set lmtp_downcase_rcpt: yes in
+imapd.conf.
+
+
+Unix sockets:
+-------------
+
+For Unix sockets, the Postfix transport is specified as
+"lmtp:unix:/var/run/cyrus/socket/lmtp", (we are using the default Cyrus unix
+socket location as an example, you can change it in /etc/cyrus.conf and
+/etc/imapd.conf).
+
+You need a Cyrus lmtpd service listening on that socket, of course, so make
+sure something like:
+
+lmtpunix cmd="lmtpd" listen="/var/run/cyrus/socket/lmtp"
+
+is in the SERVICES section of the /etc/cyrus.conf file. You also need to make
+sure both Cyrus and Postfix can talk through that socket. Unix sockets work
+just like files, so that translates to making sure both the user "cyrus" and
+the user Postfix is using for LMTP delivery can both read and write to that
+file.
+
+WARNING: Since Cyrus pre-auths anything coming through the Unix socket, anyone
+who can write to it will be able to inject email into Cyrus directly.
+
+Use dpkg-statoverride to make sure your configuration for the socket
+permissions will not be overwritten by the Cyrus packages. Do remember that
+Postfix usually runs the LMTP transport as user "postfix" (configurable in
+/etc/postfix/master.cf). Also, do not run the postfix lmtp transport chrooted
+if the socket is not inside the chroot.
+
+1. Create a lmtp group:
+ # addgroup lmtp
+
+2. Put user postfix in that group:
+ # adduser postfix lmtp
+
+3. Fix the socket directory permissions:
+ # dpkg-statoverride --force --update --add \
+ cyrus lmtp 750 /var/run/cyrus/socket
+
+4. Restart Postfix and Cyrus IMAPd
+ # /etc/init.d/postfix restart
+ # /etc/init.d/cyrus22 restart
+
+
+TCP sockets:
+------------
+
+TCP sockets are easier on the Cyrus side, and more complicated on the Postfix
+side. For Cyrus, it is enough to have an "lmtpd" service listening on the
+desired IP interface (or in all of them, if you leave the interface unspecified
+as in the example below), that means something like this in /etc/cyrus.conf
+SERVICES area:
+
+lmtp cmd="lmtpd" listen="lmtp"
+
+(do note that you MUST have an lmtp entry in /etc/services for this to work).
+
+Also, remember to set the tcpwrapper permissions up (/etc/hosts.allow and
+/etc/hosts.deny), or Cyrus might refuse the connections.
+
+To configure Postfix' lmtp transport to authenticate using SASL, do the
+following:
+
+1. Configure the lmtp transport SASL layer:
+ (add to /etc/postfix/main.cf):
+ lmtp_sasl_auth_enable = yes
+ lmtp_sasl_password_maps = hash:/etc/postfix/sasl_passwd
+ lmtp_sasl_security_options =
+ lmtp_destination_concurrency_limit = 100
+ lmtp_destination_recipient_limit = 0
+
+ The *_limit values should match whatever you configured as limits in
+ Cyrus. The above configuration will allow plain text logins.
+
+ Create the password map /etc/postfix/sasl_passwd to tell postfix
+ of a Cyrus LMTP administrator user and password to use.
+
+ e.g.:
+ echo "mycyrusspool.my.domain.org postman:foobar" >sasl_passwd
+ postmap sasl_passwd
+
+2. Configure Cyrus to accept that user as a lmtp administrator
+ (add to /etc/imapd.conf)
+ lmtp_admins: postman
+
+3. Tell postfix to use the lmtp transport to deliver email using
+ transport maps or something else. I suggest making a copy of the
+ postfix lmtp transport in master.cf, renaming it to "cyrus", and
+ using that.
+
+4. Note that to use the new feature of virtual domains in Cyrus v2.2,
+ you need to tell postfix to use the lmtp transport as the
+ virtual_transport. If you also want "local" mail recipients, i.e.
+ those that are addressed to hosts listed in mydestination, to
+ be delivered to Cyrus v2.2, you also need to use lmtp as the
+ mailbox_transport.
+
+ That's it!
Added: trunk/kolab-cyrus-imapd/debian/README.sendmail
===================================================================
--- trunk/kolab-cyrus-imapd/debian/README.sendmail 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/README.sendmail 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,69 @@
+Setting up Cyrus IMAPd for Sendmail (Debian)
+$Id: README.sendmail 5 2005-03-12 23:19:45Z sven $
+===========================================================
+
+[This is user-contributed, unverified information]
+
+First, do *not* use the old cyrus*.m4 macros, they won't work well. The one
+you can use is cyrusv2.m4. There are many methods of connecting Cyrus to
+sendmail, and replacing the local mailer with Cyrus lmtpd is just one of
+them.
+
+Andrzej Filip <anfi at priv.onet.pl> says:
+http://www.polbox.com/a/anfi/sendmail/localNalias.html
+ Cyrus Aliases
+ It allows to use user at CYRUS redirections in virtusertable,
+ aliases and .forward file e.g. I use the following ~anfi/.forward:
+ anfi at CYRUS
+
+http://www.polbox.com/a/anfi/sendmail/localtab.html
+ Local Table
+
+http://www.polbox.com/a/anfi/sendmail/rtcyrus.html
+ Real Time Cyrus Integration [requires sendmail patch]
+ It allows sendmail to check presence of cyrus mailbox in real time,
+ sendmail rejects message to non existing cyrus mailboxes in reply to
+ "RCPT TO:"
+
+
+I am not sure how well these will work with sieve. The one report I have
+for Cyrus + sendmail with working sieve is:
+
+"cyrus/sieve vacation seems to work only if you integrate cyrus via
+cyrusv2.m4 into sendmail (8.12.3-4)."
+
+Sample sendmail.mc that seems to work:
+--------
+[...]
+dnl define BIND_OPTS',`-DNSRCH -DEFNAMES')dnl
+define(`confLOCAL_MAILER', `cyrusv2')dnl
+MAILER(`local')dnl
+MAILER(`smtp')dnl
+MAILER(`cyrusv2')dnl
+dnl MODIFY_MAILER_FLAGS(`cyrus',`+w')dnl
+
+LOCAL_RULE_0
+Rbb + $+ < @ $=w . > $#cyrusbb $: $1
+[...]
+--------
+
+Here's a sieve test script you can try. Change it as needed for your
+site:
+
+require "fileinto";
+require "vacation";
+require "envelope";
+
+if header :contains "subject" "vactest" {
+ vacation :days 7 :addresses ["me at home.de"] "vactest!";
+}
+
+
+Pierre Gambarotto <pierre.gambarotto at enseeiht.fr> says:
+The minimum in order to make it work with sendmail is:
+
+define(`confLOCAL_MAILER', `cyrusv2')
+define(`CYRUSV2_MAILER_ARGS',`FILE /var/run/cyrus/socket/lmtp')
+MAILER(`cyrusv2')
+
+The CYRUSV2_MAILER_ARGS is the key.
Added: trunk/kolab-cyrus-imapd/debian/TODO.Debian
===================================================================
--- trunk/kolab-cyrus-imapd/debian/TODO.Debian 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/TODO.Debian 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,62 @@
+Todo list
+---------
+
+$Id: TODO.Debian 83 2005-03-22 15:35:48Z sven $
+
+EXTRA HIGH
+o --name for start-stop-daemon
+o master leaks memory when a service path is not null
+
+HIGH
+o Update copyright to my new template
+o Shout loudly if anything in .stage needs cleaning up
+o VERIFY SASL LEAKING CRAP TO prot_stream
+ [info-cyrus Re: Log messages going into imap/pop stream]
+o Revise rehash, it is busted...
+o Write nice shell wrapper for chk_cyrus and suggest a event to run it
+o Clean up script, that finds all crap over one day old in .stage
+ and delete it (after logging a warning). Add it as event.
+
+o https://bugzilla.andrew.cmu.edu/show_bug.cgi?id=1735
+
+MEDIUM
+o Verify kerberos build is still OK [gssapi]
+o Add switch to enable do-not-add-return-path-if-it-is-already-there to
+ deliver and LMTP input:
+ - Return-path: Override (default: drop old return-paths, add ours)
+ add (add if there isn't one in there already)
+ note that no return-path is NOT an option ;-)
+ Obs: - lmtpengine uses msg->return_path to know wether it got a mail from!
+ - dropping old return-paths is non-trivial
+o Reenable idled support (requires idled as a babysat service first)
+o Fulldir-hash detection using the same mech as db-backend
+o auth_ldap, and runtime-selection of auth backends. Add kerberos backend
+ and kerberos support while at it, as well. [ cyrus 2.2 only ]
+
+LOW
+o Verify alpha build logs, and fix the warnings
+o Better logcheck.ignore
+o verify section of libcyrus-*-perl, as well as the manpages'
+o Fix bogosity on perl manpages .TH
+o netsaint example of full monitoring (imap, pop, lmtp, master via snmp)
+o cyrus2-admin.menu
+o find and package snmp loggers for cyrus (as examples)
+o automated database backend conversion?
+o sanitize usernames and folders to lowercase, no spaces or ill. chars
+ [does this make any sense? shouldn't that be done by user name canon.?]
+
+WON'T DO
+o cyrus2-{pop3d,imapd} should deal with cyrus.conf
+ - not needed; cyrus deals gracefully with missing binaries
+o Debconf configuration
+ - too troublesome; lusers are not welcome to using cyrus
+ without reading docs anyway, and it is all SASL's fault.
+
+BACKBURNER IDEAS
+o master
+ - capabilities, so as to be able to bind to ports <1024
+ - jailing at user level (and what of shared mbx?)
+ - Better handling of fucked up children that refuse to start?
+ + requires 5th forked state in master
+o i18n (GNU gettext, with kerberos guard for logs, messages;
+ sanity-enforced txt files for return messages)
Added: trunk/kolab-cyrus-imapd/debian/UPGRADE.Debian
===================================================================
--- trunk/kolab-cyrus-imapd/debian/UPGRADE.Debian 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/UPGRADE.Debian 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,155 @@
+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/cyrus22-common/
+and the web page below, part of the cyrus-utils project at SourceForge:
+
+ http://cyrus-utils.sourceforge.net/faq
+
+Upgrading form cyrus 2.1
+========================
+
+If you upgrade from cyrus 2.1, all you need to do is to upgrade the
+database files from the old database backend to the new one. If you use
+sieve-scripts, you will also need to use sievec on them. The information
+how to do upgrade your database files is contained in the upgrade
+information from cyrus v1.6 below. In a later version of this package,
+we will give more detailed information on upgrades.
+
+NOTE: The default value of the dracinterval imapd.conf option changed from
+the old default value of 5 to 0 as it had been documented to be for ages.
+
+Upgrading sieve scripts
+-----------------------
+
+Cyrus IMAPD 2.2 uses bytecode for sieve scripts. This means that you need to
+compile all existing sieve scripts so that they will work with cyrus22. There
+is a small tool in /usr/lib/cyrus/upgrade, called masssievec which will
+automatically compile all installed scripts when called correctly. Please
+refer to the scripts usage information for details.
+The command line you will probably want to use is (as user cyrus):
+/usr/lib/cyrus/upgrade/masssievec /usr/lib/cyrus/bin/sievec /etc/imapd.conf
+
+Upgrading from cyrus 1.5.x
+==========================
+
+This document describes the procedure for upgrading from the old cyrus-imapd
+(v1.5.x) package to the new cyrus22-imapd (v2.2) package. While this is a
+manual process, it is very straightforward.
+
+The procedure for converting a v1.6 cyrus store to v2.2 is not explained here,
+but the tools to convert the sieve scripts are in /usr/lib/cyrus/upgrade.
+
+Your SASL installation may require further conversion steps, as Cyrus v2.2 uses
+SASL v2, while Cyrus v1.5 used SASL v1.5. /usr/share/doc/libsasl2 has more
+information on SASL v2. Do pay attention to your SASL v2 installation, such
+as permissions and such. When in doubt, read the README.simpleinstall
+document, as it describes an initial SASLv2 setup.
+
+NOTE: If you've already installed the cyrus22 packages, skip to step 5.
+
+ 1. Become the "root" user on your local system.
+
+ $ /bin/su -
+ #
+
+ 2. Look for any running cyrus daemons using the ps(1) command. Use
+ kill(1) to stop any processes that are found.
+
+ # /etc/init.d/pwcheck stop
+ # ps auwwx | grep cyr
+ # ps auwwx | grep pop3d
+ # ps auwwx | grep imapd
+ # ps auwwx | grep nntpd
+
+ 3. Remove the old cyrus packages.
+
+ # apt-get --purge remove cyrus-common cyrus-admin cyrus-imapd cyrus-pop3d \
+ cyrus-nntpd
+
+ or use dselect/aptitude/synaptic/your favorite deb management tool.
+
+ IMPORTANT: You must answer "n" to this question: "Do you want me to
+ remove the Cyrus mail and news spool (y/n) [n] ?"
+
+ NOTE: You could also copy -a the /var/spool/cyrus and /var/lib/cyrus
+ folders somewhere else, just in case.
+
+ 4. Install the new cyrus22-imapd packages. Make sure no user will try
+ to connect to imapd/pop3d and that no MTA will try to deliver to lmtpd
+ until you do step 5.
+
+ cyrus22-common [required]
+ cyrus22-admin [required]
+ cyrus22-imapd [optional; must have one of imapd or pop3d]
+ cyrus22-pop3d [optional; must have one of imapd or pop3d]
+ libcyrus-imap-perl22 [required]
+
+ # apt-get install PACKAGE-NAME [PACKAGE_NAME ...]
+
+ or use dselect.
+
+ 5. Stop the cyrmaster process.
+
+ # /etc/init.d/cyrus22 stop
+
+ 5a. Make sure Cyrus won't start until the upgrade process is over.
+
+ # cp -f /usr/lib/cyrus/upgrade/cyrus-db-types.upgrading_from_1.5.txt \
+ /usr/lib/cyrus/cyrus-db-types.active
+
+ 6. Change to the "cyrus" user.
+
+ # /bin/su - cyrus
+ $
+
+ 7. Run the rehash program.
+
+ $ /usr/lib/cyrus/upgrade/rehash basic
+
+ 8. Run ctl_mboxlist to update the "mailboxes" file.
+
+ $ cd /var/lib/cyrus
+ $ /usr/sbin/ctl_mboxlist -u < mailboxes
+
+ 9. Run the cyrreconstruct program from the /var/spool/cyrus directory
+ to reconstruct the mailboxes.
+
+ $ cd /var/spool/cyrus
+ $ /usr/sbin/cyrreconstruct -r user.*
+
+ (you may need to cyrreconstruct other mailboxes, if you have any
+ system mailboxes or shared mailboxes not in the user hierarchy)
+
+10. Exit the "cyrus" user, back to "root".
+
+ $ exit
+ #
+
+11. Upgrade all of the db2 files used by Cyrus from to db4.2.
+
+ # find /var/lib/cyrus -name \*.db -print -exec /usr/bin/db4.2_upgrade {} \;
+
+12. Convert the state databases to those used by new Cyrus 2.2
+
+ Read /usr/share/doc/cyrus22-common/README.Debian.database, and follow
+ whatever steps you need to change the backends from db3 to skiplist.
+
+ This step needs some work, if you can send your experiences with it
+ to hmh at debian.org, I will update this document accordingly.
+
+**** The upgrade of Cyrus' stores are now complete ****
+
+You may want to remove any left-over empty directories from the old version,
+and re-run /usr/sbin/cyrus-makedirs just in case you got one of them wrong.
+
+Now, you need to reconfigure the new Cyrus imapd to adequate it to your system
+and SASL requirements. The Cyrus config files are /etc/imapd.conf,
+/etc/cyrus.conf and /etc/default/cyrus22.
+
+Depending on your SASL configuration, you may also need to modify
+/etc/pam.d/{imap,pop,sieve,lmtp} and other SASL configuration files.
+
+Do not forget to edit /etc/imapd.conf to e.g. set the "admins: cyrus" line (if
+you use "cyrus" as the name for the administrator).
Modified: trunk/kolab-cyrus-imapd/debian/changelog
===================================================================
--- trunk/kolab-cyrus-imapd/debian/changelog 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/changelog 2006-01-05 14:27:15 UTC (rev 110)
@@ -1,23 +1,130 @@
kolab-cyrus-imapd (2.2.12-1) experimental; urgency=low
- * Initial Release
- part of the Kolab Groupware. See ITP #180634 or Kolab on alioth
- https://alioth.debian.org/projects/pkg-kolab/
+ * Build for kolab
- [ Changes for Kolab ]
- * renamed to kolab-cyrus-imapd
- * used orig.tar from kolab upstream (open package)
- * provide different cyrus.conf
- * changed some parts of debian/rules for different packaging
- * dropped nntp and snmp
- * fixed lib/Makefile with patch
- * applied additional kolab patches (provided by kolab upstream)
- * new build-depends against cdbs for simple-patchsys
- * conflicts with official cyrus
- * drop upgrade information for cyrus
- * uncomment lintian and linda overrides for now
- * change path for binary cyradm in debian/rules
- * modify pathes and stuff for init script
+ -- <steffen.joeris at skolelinux.de> Thu, 5 Jan 2006 12:11:51 +0000
- -- Steffen Joeris <steffen.joeris at skolelinux.de> Mon, 12 Dec 2005 09:23:02 +0000
+cyrus22-imapd (2.2.12-1) experimental; urgency=low
+ [ Benjamin Seidenberg ]
+ * Revised to build against pristine upstream sources.
+ [ Sven Mueller ]
+ * Fixed a discrepancy between documentation and actual behaviour of the
+ "dracinterval" imapd.conf option. Documentation always said the default
+ would be 0, while the default was actually 5.
+ [ Henrique de Moraes Holschuh ]
+ * Change build-dependency from libsnmp4.2-dev (ucd snmp) to libsnmp9-dev |
+ libsnmp5-dev (netsnmp), so that it works right in sid/etch and sarge
+ * Upload to experimental
+
+ -- Henrique de Moraes Holschuh <hmh at debian.org> Tue, 29 Nov 2005 02:10:21 -0200
+
+cyrus22-imapd (2.2.12-0.9) unstable; urgency=low
+
+ [ Sven Mueller ]
+ * Add patch to be compatible with BerkeleyDB 4.3
+ * Add patch to fix TLS/SSL shutdown in timsieved
+
+ -- Sven Mueller <debian at incase.de> Mon, 14 Nov 2005 14:56:20 +0100
+
+cyrus22-imapd (2.2.12-0.8) unstable; urgency=low
+
+ [ Sven Mueller ]
+ * Fix a problem in the init scripts new status check, found by Benjamin
+ Seidenberg.
+
+ -- Sven Mueller <debian at incase.de> Sun, 13 Nov 2005 20:14:05 +0100
+
+cyrus22-imapd (2.2.12-0.7) unstable; urgency=low
+
+ [ Sven Mueller ]
+ * Switch most deletions of autogenerated files to use debian/deletable.files
+ * Switch all remaining patches to dpatch so that the .diff.gz should now be
+ clean except for the files in debian/.
+
+ -- Sven Mueller <debian at incase.de> Thu, 10 Nov 2005 16:06:09 +0100
+
+cyrus22-imapd (2.2.12-0.6) unstable; urgency=low
+
+ [ Sven Mueller ]
+ * Added kolab2 annotation patch as proposed by Christoper Sacca
+ * Added a small patch to lower the minimum pop3 timeout to 1 minute.
+ The default is still at 10 minutes. I also added some documentation to make
+ it clear to admins that it is _not_ recommended to lower the value to less
+ than 10 minutes (because that is what the standard says it should be at).
+ I needed this change for use at my workplace though. The patch is disabled
+ by default.
+ * Patched init script to support everything LSB 3.0 asks for, including the
+ "right" return codes, as far as we can.
+ * Add patch to enhance sieveshell a bit:
+ - Add --execfile parameter to read commands from a file
+ - Add --password parameter to pass the users parameter on the commandline
+ - Add code to return with a non-zero exit code if the last command
+ executed failed for some reason.
+
+ [ Ondřej Surý ]
+ * Add 64bit quota dpatch.
+ * Rerun autoconf and add result as dpatch.
+
+ -- Sven Mueller <debian at incase.de> Fri, 23 Sep 2005 18:55:57 +0200
+
+cyrus22-imapd (2.2.12-0.5) unstable; urgency=low
+
+ * Update upgrading information
+ * Include masssievec in cyrus22-common
+ * Applied patch from Raphaël 'SurcouF' Bordet <surcouf at debianfr.net> to add
+ nntp support again.
+ * Eliminate an unused variable from tools/masssievec to get rid of perl
+ warning.
+ * Update Recommends and Suggests for cyrus22-common as suggested by HMH
+ * Move several patches from patching the source directly to patching through
+ the use of dpatch
+
+ -- Sven Mueller <debian at incase.de> Tue, 24 May 2005 23:13:18 +0200
+
+cyrus22-imapd (2.2.12-0.4) unstable; urgency=low
+
+ * Fix usage message in deliver.c to reflect Debian naming of (cyr)deliver,
+ (cyr)quota and (cyr)reconstruct
+ * Document the defaultdomain setting a bit better (hopefully)
+ * fix deletion of debian/cyrus-hardwired-config.txt during cleanup
+ * build both arch-dependend and arch-independend parts when debian/rules is
+ called for the build target
+ * Add Sven Mueller to the list of uploaders
+
+ -- Sven Mueller <debian at incase.de> Fri, 29 Apr 2005 00:14:04 +0200
+
+cyrus22-imapd (2.2.12-0.3) unstable; urgency=low
+
+ * Add a README which contains the configure options used to
+ compile the package. The README is auto-generated by debian/rules
+ * cyrus22-clients needs to conflict with cyrus21-clients
+ * cyrus22-common needs to conflict with cyrus21-common
+ * Add a guess of what the problem might be to the set_cert_stuff failure
+ message
+ * Update a few Replaces:, Provides: and Conflicts: lines in debian/control
+
+ -- Sven Mueller <debian at incase.de> Thu, 24 Mar 2005 12:26:27 +0100
+
+cyrus22-imapd (2.2.12-0.2) unstable; urgency=low
+
+ * Fix some more perl executable paths
+ * clean up debian directory a bit
+ * install sievec with cyrus22-common
+ * install mbexamine with cyrus22-common
+ * install smmapd with cyrus22-common
+ * install cyr_expire with cyrus22-common
+ * install installsieve with cyrus22-admin
+
+ -- Sven Mueller <debian at incase.de> Tue, 22 Mar 2005 14:48:33 +0100
+
+cyrus22-imapd (2.2.12-0.1) unstable; urgency=low
+
+ * Initial revision of cyrus22-imapd package
+ - debian packaging taken from cyrus21-imapd_2.1.18-1
+ * Add/fix imapd.conf info regarding virtual domains
+ * Add DRAC support (i.e. apply DRAC patch from /contrib)
+ * Add syncldap2cyrus.pl script from #260833 (a cyrus21 bug)
+
+ -- Sven Mueller <debian at incase.de> Fri, 18 Mar 2005 13:34:09 +0100
+
Modified: trunk/kolab-cyrus-imapd/debian/control
===================================================================
--- trunk/kolab-cyrus-imapd/debian/control 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/control 2006-01-05 14:27:15 UTC (rev 110)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
Uploaders: Noel Koethe <noel at debian.org>, Steffen Joeris <steffen.joeris at skolelinux.de>
-Build-Depends: debhelper (>= 4.1.0), tcl8.3-dev, libwrap0-dev, libpam0g-dev, libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, drac-dev (>= 1.11-7), libsnmp9-dev, perl (>= 5.6.0-16), xutils, flex, bison, autotools-dev, po-debconf, libsensors-dev, libdb4.4-dev, dpatch, cdbs (>= 0.4.0)
+Build-Depends: debhelper (>= 4.1.0), tcl8.3-dev, libwrap0-dev, libpam0g-dev, libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, drac-dev (>= 1.11-7), libsnmp9-dev | libsnmp5-dev, perl (>= 5.6.0-16), xutils, flex, bison, autotools-dev, po-debconf, libsensors-dev, libdb4.2-dev, dpatch, cdbs (>= 0.4.0)
Build-Depends-Indep: transfig, gs, groff
Standards-Version: 3.6.2
Modified: trunk/kolab-cyrus-imapd/debian/copyright
===================================================================
--- trunk/kolab-cyrus-imapd/debian/copyright 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/copyright 2006-01-05 14:27:15 UTC (rev 110)
@@ -10,14 +10,10 @@
Benjamin Seidenberg <astronut at dlgeek.net>
and distributed in the same license as the upstream source it applies to.
-Package modifications for Kolab by Noel Koethe <noel at debian.org>
- Steffen Joeris <steffen.joeris at skolelinux.de>
+Upstream sources are at: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/.
-Upstream sources are at: http://max.kde.org:8080/mirrors/ftp.kolab.org/server/release/
-
Upstream Author: Carnegie Mellon University <cyrus-bugs+ at andrew.cmu.edu>
Upstream bugs: http://bugzilla.andrew.cmu.edu/
-Kolab Changes: Kolab Developers
Patches:
The Debian version of Cyrus IMAP is heavily patched to adequate it to Debian,
Added: trunk/kolab-cyrus-imapd/debian/cyradm-16x16.xpm
===================================================================
--- trunk/kolab-cyrus-imapd/debian/cyradm-16x16.xpm 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/cyradm-16x16.xpm 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,45 @@
+/* XPM */
+static char *magick[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 23 1",
+" c Gray0",
+". c #191919",
+"X c Gray20",
+"o c #00007f",
+"O c #007f00",
+"+ c #007f7f",
+"@ c #7f0000",
+"# c #7f007f",
+"$ c #7f7f00",
+"% c #4c4c4c",
+"& c #666667",
+"* c Gray50",
+"= c Blue",
+"- c Green",
+"; c Cyan",
+": c Red",
+"> c Magenta",
+", c Yellow",
+"< c Gray60",
+"1 c #b2b2b2",
+"2 c Gray80",
+"3 c Gray90",
+"4 c Gray100",
+/* pixels */
+"22111;1212211111",
+"211221213<121221",
+"2111212232<11122",
+"121121221<231<11",
+"2112232<34334112",
+"1112222243213212",
+";2221<11*&<<*<<1",
+"1221233323232231",
+"2233223333332&1<",
+"2213123333233*1*",
+"123312121222233*",
+"1233212<<213223<",
+"12331<1<<11<123*",
+"123333322222223*",
+"123223322222323*",
+"2<&%%%X%%%%X%%X%"
+};
Added: trunk/kolab-cyrus-imapd/debian/cyradm-32x32.xpm
===================================================================
--- trunk/kolab-cyrus-imapd/debian/cyradm-32x32.xpm 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/cyradm-32x32.xpm 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,61 @@
+/* XPM */
+static char *magick[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 23 1",
+" c Gray0",
+". c #191919",
+"X c Gray20",
+"o c #00007f",
+"O c #007f00",
+"+ c #007f7f",
+"@ c #7f0000",
+"# c #7f007f",
+"$ c #7f7f00",
+"% c #4c4c4c",
+"& c #666667",
+"* c Gray50",
+"= c Blue",
+"- c Green",
+"; c Cyan",
+": c Red",
+"> c Magenta",
+", c Yellow",
+"< c Gray60",
+"1 c #b2b2b2",
+"2 c Gray80",
+"3 c Gray90",
+"4 c Gray100",
+/* pixels */
+"222111112;2112121222111112112121",
+"121112;2112211223+11212111121111",
+"221112222112111333+221121221112;",
+"2112111211222133333&12222;212222",
+"11111112212122333323$221+2121211",
+"212121112122333%3 332&41%1111121",
+";212112;22132233211%44443&112211",
+"2211222222233.3112344444442112;2",
+"11111211133321114444441444%22121",
+"1212222133311 444444*%4444%22212",
+"211112233111444444:4334%444%2111",
+";11222331 433223* 2332%322231112",
+"222213&&11&*&&%#%%# %&#% #%&221",
+"12233343434444434444344444443311",
+"113&2&&&3333333333333332222333+2",
+"2133333333333333332333232X**23%o",
+"22344333333333232233222221#*24.%",
+"124#&34#�:.#24.%",
+"223333333333333333322332332224.%",
+"214333333323333323322222322224.X",
+"11333333 &23X&2&&3223223222234.X",
+"123334433333333333222232223234.%",
+"12333333&2X12X& &13X2322322134.%",
+"123333333233333332333222222224.X",
+"21333332&&&1&X2 3&&3X&&X222234.X",
+"213333333333323222222222222134.%",
+"123333333333332223322322222134.X",
+"113333233233232332232222322324.X",
+"223334434434444444434434444444.%",
+"12 . . .X",
+"2112%%%%o%%X%%o%X%%%o%X%X%oXXo%%",
+"11121222122212122122122122222222"
+};
Modified: trunk/kolab-cyrus-imapd/debian/cyrdump.8
===================================================================
--- trunk/kolab-cyrus-imapd/debian/cyrdump.8 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/cyrdump.8 2006-01-05 14:27:15 UTC (rev 110)
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH CYRDUMP "1" "Project Cyrus" "CMU"
+.TH CYRDUMP "8" "Project Cyrus" "CMU"
.SH NAME
cyrdump \- dump mailboxes to stdout
.SH SYNOPSIS
Added: trunk/kolab-cyrus-imapd/debian/cyrus-db-types.upgrading_from_1.5.txt
===================================================================
--- trunk/kolab-cyrus-imapd/debian/cyrus-db-types.upgrading_from_1.5.txt 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/cyrus-db-types.upgrading_from_1.5.txt 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,6 @@
+DBENGINE BerkeleyDB3.2
+DUPLICATE db3_nosync
+MBOX db3
+SEEN db3
+SUBS flat
+TLS db3_nosync
Added: trunk/kolab-cyrus-imapd/debian/cyrus-makedirs
===================================================================
--- trunk/kolab-cyrus-imapd/debian/cyrus-makedirs 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/cyrus-makedirs 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,146 @@
+#!/bin/sh -e
+#
+# cyrus-makedirs - Parses a Cyrus imap.d configuration file, and creates
+# the correct directory trees for all partitions
+#
+# Copyright 2001,2002 by Henrique de Moraes Holschuh <hmh at debian.org.
+# Released under the terms of the GNU General Public License (GPL) version 2
+#
+# $Id: cyrus-makedirs 5 2005-03-12 23:19:45Z sven $
+
+# See lib/util.c, dir_hash_c for Cyrus' directory hashing
+# for the new hash style
+#HASHDIRS="A B C D E F G H I J K L M N O P Q R S T U V W"
+# for the old hash style
+HASHDIRS="a b c d e f g h i j k l m n o p q r s t u v w x y z"
+
+# Sane locale, please
+LC_ALL=C
+export LC_ALL
+
+CYRUSOPTFILESYS=1
+CONF=/etc/imapd.conf
+[ -r /etc/default/kolab-cyrus ] && . /etc/default/kolab-cyrus
+
+getconf () {
+ confvalue=`sed --silent -e "/^[[:blank:]]*$1:/ { \
+ s#^[[:blank:]]*$1:[[:blank:]]*## \
+ p
+ }" < "$CONF" | head -1`
+ result=${confvalue:-$2}
+}
+
+killsquat=0
+[ "$1" = "--cleansquat" ] && {
+ killsquat=1
+ shift
+}
+
+
+CONF="${1:-$CONF}"
+[ -r "$CONF" ] || {
+ echo $0: unable to read configuration file $CONF. Aborting...
+ exit 1
+}
+
+getconf configdirectory /var/lib/cyrus
+confdir="$result"
+[ -d "$confdir" ] || {
+ echo $0: $confdir is not an directory. Aborting...
+ exit 2
+}
+
+getconf sievedir /etc/sieve
+sievedir="$result"
+
+getconf sieveusehomedir 0
+case "$result" in
+ 1|t|true|yes|on) nosievedir=1
+ ;;
+ *) nosievedir=0
+ ;;
+esac
+
+getconf hashimapspool 0
+case "$result" in
+ 1|t|true|yes|on) hashspool=1
+ ;;
+ *) hashspool=0
+ ;;
+esac
+
+# Partitions list
+partitions=`sed --silent -e "/^[[:blank:]]*partition-[[:alnum:]]\+:/ { \
+ s#^[[:blank:]]*partition-[[:alnum:]]\+:[[:blank:]]*## \
+ p
+ } " < "$CONF" | sort | uniq | xargs`
+
+# First, fix up the entire confdir subtree
+echo "Creating cyrus control directories in ${confdir}..."
+[ -d "$confdir" ] || mkdir -p "$confdir"
+chmod 750 "$confdir"
+for i in db proc socket log msg user quota; do
+ [ -d "$confdir/$i" ] || mkdir -p "$confdir/$i"
+ chmod 700 "$confdir/$i"
+done
+chmod 750 $confdir/socket
+for i in user quota ; do
+ for j in $HASHDIRS ; do
+ [ -d "$confdir/$i/$j" ] || mkdir "$confdir/$i/$j"
+ done
+done
+chown -R cyrus:mail "$confdir"
+
+# Now, create the spool partitions
+for i in $partitions ; do
+ echo "Creating partition spool $i..."
+ [ -d "$i" ] || mkdir -p "$i"
+ chmod 750 "$i"
+ [ $hashspool -eq 1 ] && {
+ for j in $HASHDIRS ; do
+ [ -d "$i/$j" ] || mkdir "$i/$j"
+ done
+ }
+ [ -d "$i/stage." ] || mkdir "$i/stage."
+ chown -R cyrus:mail "$i"
+ # and kill any squatter indexes
+ [ $killsquat -ne 0 ] && find "$i" -name 'cyrus.squat' -type f -exec rm -f "{}" \;
+done
+
+# And the sieve directory structure
+[ $nosievedir -eq 0 ] && {
+ [ -d "$sievedir" ] || mkdir "$sievedir"
+ chmod 755 "$sievedir"
+ for j in $HASHDIRS ; do
+ [ -d "$sievedir/$j" ] || mkdir "$sievedir/$j"
+ chmod 755 "$sievedir/$j"
+ done
+ chown -R cyrus:mail "$sievedir"
+}
+
+[ "x${CYRUSOPTFILESYS}" != "x1" ] && exit 0
+#
+# Fix attributes for every partition
+#
+# ext2: Don't use ext2 for Cyrus spools. But if you must, enable Sync writes
+# ext3: Journal data too, since that improves access time a LOT
+# (maybe in the future, there's a bug in 2.4.18 ext3 w/ +j)
+#
+echo "Trying to optimize Cyrus partitions, edit /etc/default/cyrus22 to disable..."
+partsys="${confdir} ${partitions}"
+filesys=`df -P -T ${partsys} | sed -e "1 d" -e "s/ \+/ /g" | cut -d " " -f 2 | xargs`
+for i in ${filesys} ; do
+ case ${i} in
+ ext2)
+ echo "Setting attributes to +S for ${partsys%% *}..."
+ find "${partsys%% *}" -type d -exec chattr +S "{}" \;
+ ;;
+ ext3)
+ echo "Setting attributes to -S -j for ${partsys%% *}..."
+ find "${partsys%% *}" -type d -exec chattr -S -j "{}" \;
+ ;;
+ esac
+ partsys="${partsys#* }"
+done
+
+exit 0
Property changes on: trunk/kolab-cyrus-imapd/debian/cyrus-makedirs
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/debian/cyrus-makedirs.8
===================================================================
--- trunk/kolab-cyrus-imapd/debian/cyrus-makedirs.8 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/cyrus-makedirs.8 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,49 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" $Id: cyrus-makedirs.8 5 2005-03-12 23:19:45Z sven $
+.\"
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH CYRUS-MAKEDIRS 8 "2002-12-08"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp <n> insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+cyrus-makedirs \- Sets up the Cyrus IMAPd system directories (spools)
+.SH SYNOPSIS
+.B cyrus-makedirs
+.RI [ configfile ]
+.br
+.SH DESCRIPTION
+This manual page documents briefly the
+.B cyrus-makedirs
+command.
+Cyrus-makedirs is the Debian version of Cyrus upstream's mkimap program.
+.PP
+You
+.B should
+call /usr/sbin/cyrus-makedirs when you change any imapd.conf(5) options
+that create or rename Cyrus mail stores/spools/partitions. It will be called
+automatically on package upgrades.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" respectively.
+.SH OPTIONS
+You can optionally tell cyrus-makedirs the Cyrus imapd.conf config file
+to use. /etc/imapd.conf is assumed, if no parameters are given.
+.SH SEE ALSO
+.BR imapd.conf(5),
+.BR /etc/default/cyrus22
+.SH AUTHOR
+This manual page was written by Henrique de Moraes Holschuh <hmh at debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
Modified: trunk/kolab-cyrus-imapd/debian/cyrus.conf
===================================================================
--- trunk/kolab-cyrus-imapd/debian/cyrus.conf 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/cyrus.conf 2006-01-05 14:27:15 UTC (rev 110)
@@ -34,7 +34,7 @@
#imaps cmd="imapd -s -U 30" listen="imaps" prefork=0 maxchild=100
pop3 cmd="pop3d -U 30" listen="pop3" prefork=0 maxchild=50
#pop3s cmd="pop3d -s -U 30" listen="pop3s" prefork=0 maxchild=50
- #nntp cmd="nntpd -U 30" listen="nntp" prefork=0 maxchild=100
+ nntp cmd="nntpd -U 30" listen="nntp" prefork=0 maxchild=100
#nntps cmd="nntpd -s -U 30" listen="nntps" prefork=0 maxchild=100
# At least one form of LMTP is required for delivery
Modified: trunk/kolab-cyrus-imapd/debian/deletable.files
===================================================================
--- trunk/kolab-cyrus-imapd/debian/deletable.files 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/deletable.files 2006-01-05 14:27:15 UTC (rev 110)
@@ -1,3 +1,5 @@
+config.guess
+config.sub
doc/man/arbitron.8.html
doc/man/chk_cyrus.8.html
doc/man/ctl_cyrusdb.8.html
@@ -5,6 +7,7 @@
doc/man/ctl_mboxlist.8.html
doc/man/cvt_cyrusdb.8.html
doc/man/cyr_expire.8.html
+doc/man/cyradm.1.html
doc/man/cyrus.conf.5.html
doc/man/deliver.8.html
doc/man/fetchnews.8.html
@@ -31,6 +34,7 @@
doc/man/quota.8.html
doc/man/reconstruct.8.html
doc/man/rmnews.8.html
+doc/man/sieveshell.1.html
doc/man/sivtest.1.html
doc/man/smmapd.8.html
doc/man/smtptest.1.html
@@ -38,24 +42,59 @@
doc/man/syncnews.8.html
doc/man/timsieved.8.html
doc/man/tls_prune.8.html
-doc/man/cyradm.1.html
-doc/man/sieveshell.1.html
+doc/man/w
doc/murder.png
+doc/netnews.png
+doc/text/altnamespace
+doc/text/anoncvs
+doc/text/bugs
+doc/text/changes
+doc/text/faq
+doc/text/feedback
+doc/text/index
+doc/text/install
+doc/text/install-admin-mb
+doc/text/install-auth
+doc/text/install-compile
+doc/text/install-configure
+doc/text/install-murder
+doc/text/install-netnews
+doc/text/install-perf
+doc/text/install-prereq
+doc/text/install-sieve
+doc/text/install-snmpmon
+doc/text/install-testing
+doc/text/install-upgrade
+doc/text/install-virtdomains
+doc/text/mailing-list
+doc/text/man
+doc/text/notes
+doc/text/os
+doc/text/overview
+doc/text/questions
+doc/text/readme
+doc/text/sieve
+doc/text/sieve-protocol
+doc/text/specs
+imap/imap_err.c
imap/imap_err.h
-imap/imap_err.c
+imap/lmtpstats.c
imap/lmtpstats.h
-imap/lmtpstats.c
+imap/mupdate_err.c
+imap/mupdate_err.h
+imap/nntp_err.c
+imap/nntp_err.h
+imap/pushstats.c
imap/pushstats.h
-imap/pushstats.c
+lib/imapopts.c
+lib/imapopts.h
+man/imapd.conf.5
man/sieveshell.1
-sieve/addr.h
sieve/addr-lex.c
sieve/addr.c
-sieve/sieve.h
+sieve/addr.h
sieve/sieve-lex.c
sieve/sieve.c
+sieve/sieve.h
+sieve/sieve_err.c
sieve/sieve_err.h
-sieve/sieve_err.c
-autom4te.cache/requests
-autom4te.cache/output.0
-autom4te.cache/traces.0
Added: trunk/kolab-cyrus-imapd/debian/examples/README
===================================================================
--- trunk/kolab-cyrus-imapd/debian/examples/README 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/examples/README 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,14 @@
+This directory contains some sample files that may be of use with Cyrus.
+
+mboxtocyrus A script to import mbox format mailboxes into Cyrus
+ (by Michael-John Turner <mj at debian.org>
+
+syncldap2cyrus.pl retrieves a list of usernames from an LDAP server and
+ then tries to create a user mailbox in Cyrus, and then
+ any secondary mailboxes under that. The idea is that
+ you could run this via cron or manually every time you
+ add a user to your LDAP server, and they would then
+ have a Cyrus mailbox. This script also has a report
+ mode that shows you any users in LDAP that do not have
+ a Cyrus mailbox, and vice versa.
+ (by Stuart Young (aka Cef) <cef at optus.net>)
Added: trunk/kolab-cyrus-imapd/debian/examples/README.imapcreate.pl
===================================================================
--- trunk/kolab-cyrus-imapd/debian/examples/README.imapcreate.pl 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/examples/README.imapcreate.pl 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,23 @@
+Launching the script without any parameters will show a short help. It
+should be pretty self-explanatory.
+
+Here are some examples on how the script could be invoked:
+
+- this will read the file list.txt, and create the mailboxes listed in it
+ with a 50MB quota:
+
+ cat list.txt | ./imapcreate.pl -u cyradm -p 'cyrpass' -q 50M mail.example.com
+
+- this will create a mailbox for john, using the Unix Hierarchy separator,
+ no quota, in verbose mode:
+
+ ./imapcreate.pl -u cyradm -m john -s -v mail.example.com
+
+ the output would look like this:
+
+ Creating user.john on default
+
+This script is far from being perfect, but it works great for me. feel free
+to e-mail me about it, to report bugs, to send patches etc:
+
+clement.hermann at free.fr
Added: trunk/kolab-cyrus-imapd/debian/examples/README.kolab.postfix
===================================================================
--- trunk/kolab-cyrus-imapd/debian/examples/README.kolab.postfix 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/examples/README.kolab.postfix 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,21 @@
+Configuration of postfix for cyrusIMAP with Kolab
+
+Changed files:
+
+/etc/postfix/main.cf
+/etc/postfix/master.cf
+
+Add the line
+
+cyrus unix - n n - - pipe flags=R user=cyrus argv=/usr/sbin/cyrdeliver -a ${user} -m ${user}
+
+in the /etc/postfix/master.cf
+
+
+After this you edit the /etc/postfix/main.cf and add
+
+mailbox_transport = cyrus
+
+After this you restart your postfix.
+
+You must also make sure, that the user cyrus is in the group postfix.
Added: trunk/kolab-cyrus-imapd/debian/examples/imapcreate.pl
===================================================================
--- trunk/kolab-cyrus-imapd/debian/examples/imapcreate.pl 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/examples/imapcreate.pl 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,167 @@
+#!/usr/bin/perl -w
+#
+# imapcreate: create IMAP mailboxes with quotas
+# Reads user names from standard input.
+# originally found on http://cyrus-utils.sourceforge.net
+# © 2001 Garry Mills
+#
+# enhanced by Clément "nodens" Hermann <clement.hermann at free.fr>
+#
+# I'd like to consider this as GPL'd (cf www.gnu.org), but won't add any
+# copyright without the original author's consent.
+# last modification : 2004/11/23
+# Changes :
+# 2005/03/31 - Finally found out the original author's name.
+# 2004/11/23 - removed LOGIN as a default mech, now use cyrus' default
+# - Added --auth option to specify mech
+#
+# TODO : fix STDIN collision when reading password AND mailboxes name from STDIN
+#
+use Getopt::Long;
+use Cyrus::IMAP::Admin;
+use strict;
+
+# CLI options
+my ($debug,$user,$pass,$quota, at part,$useunixhierarchy, at mailboxes,$delete,$cyrus,$authmech);
+
+sub usage {
+ print "imapcreate - create IMAP mailboxes with quotas\n";
+ print " usage:\n";
+ print " imapcreate [-d] [-u user] [--auth mechanism] [-p pass] [-m mailbox1[,mailbox2][,mailbox<n>]] [-q quota] [-t partition:list]\n";
+ print " [-s] [-v] <server>\n";
+ print "\n";
+ print "if -s is set, we'll use the unix hierarchy separator (see imapd.conf(1))\n";
+ print "if -d is set, we'll delete mailboxes instead of creating them\n";
+ print "You can use M or ,m to specify quotas. e.g. 10M. By default,\n";
+ print "the quota is expressed in Kbytes.\n";
+ print "If no password is submitted with -p, we'll prompt for one.\n";
+ print "if no mailbox name is specified with -m, read user names from standard input\n";
+ print "if -v is set, we'll run in debug mode, and print information on stdout\n";
+ print "\n";
+ print "The default mechanism is used for authentication. If you need another\nmechanism, (try LOGIN), use --auth <mechanism> option\n";
+ print "\n";
+ print " example: \n";
+ print " imapcreate -u cyradm -m foo,bar,joe -q 50000 -t p1:p2 mail.testing.umanitoba.ca\n";
+ print "\n";
+ exit 0;
+}
+
+# Create a mailbox... usage : &CreateMailBox(user,partition[,quota]).
+# You have to be authentified already. We use "$cyrus" as the connection name.
+# partition can be 'default'
+sub CreateMailBox {
+ my $mbuser = $_[0];
+ my $mbpart = $_[1];
+ my $mbquota = $_[2];
+
+ print "Creating $mbuser on $mbpart\n" if $debug;
+ if ($mbpart eq 'default') {
+ $cyrus->createmailbox($mbuser);
+ }
+ else {
+ $cyrus->createmailbox($mbuser, $mbpart);
+ }
+ warn $cyrus->error if $cyrus->error;
+
+ # Set the quota
+ if ($mbquota) {
+ print "Setting quota for $mbuser to $mbquota\n" if $debug;
+ $cyrus->setquota($mbuser, 'STORAGE', $mbquota);
+ warn $cyrus->error if $cyrus->error;
+ }
+}
+
+# Delete a mailbox. Usage: $DeleteMailBox($user)
+# Assuming we use $user as the admin.
+sub DeleteMailBox {
+ my $mbuser = $_[0];
+ my $delacl = "c";
+
+ print "Deleting $mbuser\n" if $debug;
+ $cyrus->setaclmailbox($mbuser, $user, $delacl);
+ $cyrus->deletemailbox($mbuser);
+ warn $cyrus->error if $cyrus->error;
+}
+
+GetOptions( "d|delete" => \$delete,
+ "u|user=s" => \$user,
+ "auth=s" => \$authmech,
+ "p|pass=s" => \$pass,
+ "m|mailboxes=s" => \@mailboxes,
+ "q|quota=s" => \$quota,
+ "s|UnixHierarchy" => \$useunixhierarchy,
+ "t|part=s" => \@part,
+ "v|verbose" => \$debug );
+
+ at part = split(/:/, join(':', @part));
+push @part, 'default' unless @part;
+my $pn = 0;
+ at mailboxes = split(/,/, join(',', @mailboxes));
+
+my $server = shift(@ARGV) if (@ARGV);
+usage unless $server;
+
+# quotas formatting:
+if ($quota) {
+ if ($quota =~ /^(\d+)([mk]?)$/i) {
+ my $numb = $1;
+ my $letter = $2;
+ if ($letter =~ /^m$/i) {
+ $quota = $numb * 1024;
+ print "debug: quota=$quota\n" if $debug;
+ } elsif ($letter =~ /^k$/i) {
+ $quota = $numb;
+ print "debug: quota=$quota\n" if $debug;
+ } else {
+ die "malformed quota: $quota (must be at least one digit eventually followed by m, M, k or K\n";
+# $quota = $numb;
+# print "debug: quota=$quota\n" if $debug;
+ }
+ } else {
+ die "malformed quota: $quota (must be at least one digit eventually followed by m, M, k or K\n";
+ }
+}
+
+# Authenticate
+$cyrus = Cyrus::IMAP::Admin->new($server);
+
+if ($authmech) {
+ $cyrus->authenticate(-mechanism => $authmech,
+ -user => $user,
+ -password => $pass);
+} else {
+ $cyrus->authenticate(
+ -user => $user,
+ -password => $pass);
+}
+die $cyrus->error if $cyrus->error;
+
+# if there isn't any mailbox defined yet, get them from standard input
+if (! (defined $mailboxes[0])) {
+ # For all users
+ while (<>) {
+ chomp;
+ my $mbox = $_;
+ push @mailboxes, $mbox;
+ }
+}
+
+# create/delete mailboxes for each user
+foreach my $mailbox (@mailboxes) {
+ if ($useunixhierarchy) {
+ $mailbox = 'user/' . $mailbox;
+ } else {
+ $mailbox = 'user.' . $mailbox;
+ }
+
+ if ($delete) {
+ &DeleteMailBox($mailbox)
+ } else {
+ # Select the partition
+ my $pt = $part[$pn];
+ $pn += 1;
+ $pn = 0 unless $pn < @part;
+ &CreateMailBox($mailbox,$pt,$quota)
+ }
+}
+
Added: trunk/kolab-cyrus-imapd/debian/examples/kolab.imapd.conf
===================================================================
--- trunk/kolab-cyrus-imapd/debian/examples/kolab.imapd.conf 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/examples/kolab.imapd.conf 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,321 @@
+# Debian Cyrus imapd.conf
+# $Id: imapd.conf 95 2005-04-08 00:10:54Z sven $
+# See imapd.conf(5) for more information and more options
+
+# Configuration directory
+configdirectory: /var/lib/cyrus
+
+# Which partition to use for default mailboxes
+#defaultpartition: default
+partition-default: /var/spool/cyrus/mail
+
+# News setup
+#partition-news: /var/spool/cyrus/news
+#newsspool: /var/spool/news
+
+# Alternate namespace
+# If enabled, activate the alternate namespace as documented in
+# /usr/share/doc/cyrus22-doc/html/altnamespace.html, where an user's
+# subfolders are in the same level as the INBOX
+# See also userprefix and sharedprefix on imapd.conf(5)
+#altnamespace: no
+
+# UNIX Hierarchy Convention
+# Set to yes, and cyrus will accept dots in names, and use the forward
+# slash "/" to delimit levels of the hierarchy. This is done by converting
+# internally all dots to "^", and all "/" to dots. So the "rabbit.holes"
+# mailbox of user "helmer.fudd" is stored in "user.elmer^fud.rabbit^holes"
+unixhierarchysep: yes
+
+# Rejecting illegal characters in headers
+# Headers of RFC2882 messages must not have characters with the 8th bit
+# set. However, too many badly-written MUAs generate this, including most
+# spamware. Enable this to reject such messages.
+reject8bit: no
+
+# Munging illegal characters in headers
+# Headers of RFC2882 messages must not have characters with the 8th bit
+# set. However, too many badly-written MUAs generate this, including most
+# spamware. If you kept reject8bit disabled, you can choose to leave the
+# crappage untouched by disabling this (if you don't care that IMAP SEARCH
+# won't work right anymore.
+#munge8bit: no
+
+# Forcing recipient user to lowercase
+# Cyrus 2.2 is case-sensitive. If all your mail users are in lowercase, it is
+# probably a very good idea to set lmtp_downcase_rcpt to true. The default is
+# to assume the user knows what he is doing, and not downcase anything.
+#lmtp_downcase_rcpt: yes
+
+# Uncomment the following and add the space-separated users who
+# have admin rights for all services.
+admins: cyrus
+
+# Space-separated list of users that have lmtp "admin" status (i.e. that
+# can deliver email through TCP/IP lmtp) in addition to those in the
+# admins: entry above
+#lmtp_admins: postman
+
+# Space-separated list of users that have mupdate "admin" status, in
+# addition to those in the admins: entry above. Note that mupdate slaves and
+# backends in a Murder cluster need to autenticate against the mupdate master
+# as admin users.
+#mupdate_admins: mupdateman
+
+# Space-separated list of users that have imapd "admin" status, in
+# addition to those in the admins: entry above
+#imap_admins: cyrus
+
+# Space-separated list of users that have sieve "admin" status, in
+# addition to those in the admins: entry above
+#sieve_admins: cyrus
+
+# List of users and groups that are allowed to proxy for other users,
+# seperated by spaces. Any user listed in this will be allowed to login
+# for any other user. Like "admins:" above, you can have imap_proxyservers
+# and sieve_proxyservers.
+#proxyservers: cyrus
+
+# No anonymous logins
+allowanonymouslogin: no
+
+# Minimum time between POP mail fetches in minutes
+#popminpoll: 1
+
+# If nonzero, normal users may create their own IMAP accounts by creating
+# the mailbox INBOX. The user's quota is set to the value if it is positive,
+# otherwise the user has unlimited quota.
+autocreatequota: 10000
+quotawarn: 90
+timeout: 30
+allowusermoves: no
+
+# umask used by Cyrus programs
+#umask: 077
+
+# Sendmail binary location
+# DUE TO A BUG, Cyrus sends CRLF EOLs to this program. This breaks Exim 3.
+# For now, to work around the bug, set this to a wrapper that calls
+# /usr/sbin/sendmail -dropcr instead if you use Exim 3.
+#sendmail: /usr/sbin/sendmail
+
+#Settings for tempdir
+temp_path: /var/tmp
+
+# If enabled, cyrdeliver will look for Sieve scripts in user's home
+# directories: ~user/.sieve.
+#sieveusehomedir: false
+
+# If sieveusehomedir is false, this directory is searched for Sieve scripts.
+#sievedir: /var/spool/sieve
+
+# notifyd(8) method to use for "MAIL" notifications. If not set, "MAIL"
+# notifications are disabled. Valid methods are: null, log, zephyr
+#mailnotifier: zephyr
+
+# notifyd(8) method to use for "SIEVE" notifications. If not set, "SIEVE"
+# notifications are disabled. This method is only used when no method is
+# specified in the script. Valid methods are null, log, zephyr, mailto
+#sievenotifier: zephyr
+
+# DRAC (pop-before-smtp, imap-before-smtp) support
+# Set dracinterval to the time in minutes to call DRAC while a user is
+# connected to the imap/pop services. Set to 0 to disable DRAC (default)
+# Set drachost to the host where the rpc drac service is running
+#dracinterval: 0
+#drachost: localhost
+
+# If enabled, the partitions will also be hashed, in addition to the hashing
+# done on configuration directories. This is recommended if one partition has a
+# very bushy mailbox tree.
+#hashimapspool: true
+
+# Allow plaintext logins by default (SASL PLAIN)
+allowplaintext: yes
+
+# Force PLAIN/LOGIN authentication only
+# (you need to uncomment this if you are not using an auxprop-based SASL
+# mechanism. saslauthd users, that means you!). And pay attention to
+# sasl_minimum_layer and allowapop below, too.
+sasl_mech_list: PLAIN
+
+# Allow use of the POP3 APOP authentication command.
+# Note that this command requires that the plaintext passwords are
+# available in a SASL auxprop backend (eg. sasldb), and that the system
+# can provide enough entropy (eg. from /dev/urandom) to create a challenge
+# in the banner.
+#allowapop: no
+
+# The minimum SSF that the server will allow a client to negotiate. A
+# value of 1 requires integrity protection; any higher value requires some
+# amount of encryption.
+#sasl_minimum_layer: 0
+
+# The maximum SSF that the server will allow a client to negotiate. A
+# value of 1 requires integrity protection; any higher value requires some
+# amount of encryption.
+#sasl_maximum_layer: 256
+
+# List of remote realms whose users may log in using cross-realm
+# authentications. Seperate each realm name by a space. A cross-realm
+# identity is considered any identity returned by SASL with an "@" in it.
+# NOTE: To support multiple virtual domains on the same interface/IP,
+# you need to list them all as loginreals. If you don't list them here,
+# (most of) your users probably won't be able to log in.
+#loginrealms: example.com
+
+# Enable virtual domain support. If enabled, the user's domain will
+# be determined by splitting a fully qualified userid at the last '@'
+# or '%' symbol. If the userid is unqualified, and the virtdomains
+# option is set to "on", then the domain will be determined by doing
+# a reverse lookup on the IP address of the incoming network
+# interface, otherwise the user is assumed to be in the default
+# domain (if set).
+#virtdomains: userid
+
+# The default domain for virtual domain support
+# If the domain of a user can't be taken from its login and it can't
+# be determined by doing a reverse lookup on the interface IP, this
+# domain is used.
+#defaultdomain:
+
+#
+# SASL library options (these are handled directly by the SASL libraries,
+# refer to SASL documentation for an up-to-date list of these)
+#
+
+# The mechanism(s) used by the server to verify plaintext passwords. Possible
+# values are "saslauthd", "auxprop", "pwcheck" and "alwaystrue". They
+# are tried in order, you can specify more than one, separated by spaces.
+#
+# Do note that, since sasl will be run as user cyrus, you may have a lot of
+# trouble to set this up right.
+sasl_pwcheck_method: saslauthd
+
+# What auxpropd plugins to load, if using sasl_pwcheck_method: auxprop
+# by default, all plugins are tried (which is probably NOT what you want).
+#sasl_auxprop_plugin: sasldb
+
+# If enabled, the SASL library will automatically create authentication secrets
+# when given a plaintext password. Refer to SASL documentation
+#sasl_auto_transition: no
+
+#
+# SSL/TLS Options
+#
+
+# File containing the global certificate used for ALL services (imap, pop3,
+# lmtp, sieve)
+#tls_cert_file: /etc/ssl/certs/cyrus-global.pem
+
+# File containing the private key belonging to the global server certificate.
+#tls_key_file: /etc/ssl/private/cyrus-global.key
+
+# File containing the certificate used for imap. If not specified, the global
+# certificate is used. A value of "disabled" will disable SSL/TLS for imap.
+#tls_imap_cert_file: /etc/ssl/certs/cyrus-imap.pem
+
+# File containing the private key belonging to the imap-specific server
+# certificate. If not specified, the global private key is used. A value of
+# "disabled" will disable SSL/TLS for imap.
+#tls_imap_key_file: /etc/ssl/private/cyrus-imap.key
+
+# File containing the certificate used for pop3. If not specified, the global
+# certificate is used. A value of "disabled" will disable SSL/TLS for pop3.
+#tls_pop3_cert_file: /etc/ssl/certs/cyrus-pop3.pem
+
+# File containing the private key belonging to the pop3-specific server
+# certificate. If not specified, the global private key is used. A value of
+# "disabled" will disable SSL/TLS for pop3.
+#tls_pop3_key_file: /etc/ssl/private/cyrus-pop3.key
+
+# File containing the certificate used for lmtp. If not specified, the global
+# certificate is used. A value of "disabled" will disable SSL/TLS for lmtp.
+#tls_lmtp_cert_file: /etc/ssl/certs/cyrus-lmtp.pem
+
+# File containing the private key belonging to the lmtp-specific server
+# certificate. If not specified, the global private key is used. A value of
+# "disabled" will disable SSL/TLS for lmtp.
+#tls_lmtp_key_file: /etc/ssl/private/cyrus-lmtp.key
+
+# File containing the certificate used for sieve. If not specified, the global
+# certificate is used. A value of "disabled" will disable SSL/TLS for sieve.
+#tls_sieve_cert_file: /etc/ssl/certs/cyrus-sieve.pem
+
+# File containing the private key belonging to the sieve-specific server
+# certificate. If not specified, the global private key is used. A value of
+# "disabled" will disable SSL/TLS for sieve.
+#tls_sieve_key_file: /etc/ssl/private/cyrus-sieve.key
+
+# File containing one or more Certificate Authority (CA) certificates.
+#tls_ca_file: /etc/ssl/certs/cyrus-imapd-ca.pem
+
+# Path to directory with certificates of CAs.
+#tls_ca_path: /etc/ssl/certs
+
+# The length of time (in minutes) that a TLS session will be cached for later
+# reuse. The maximum value is 1440 (24 hours), the default. A value of 0 will
+# disable session caching.
+#tls_session_timeout: 1440
+
+# The list of SSL/TLS ciphers to allow. The format of the string is described
+# in ciphers(1). THIS DISABLES THE WEAK 'FOR EXPORT' CRAP!
+#tls_cipher_list: TLSv1:SSLv3:SSLv2:!NULL:!EXPORT:!DES:!LOW:@STRENGTH
+
+# Require a client certificate for ALL services (imap, pop3, lmtp, sieve).
+#tls_require_cert: false
+
+# Require a client certificate for imap ONLY.
+#tls_imap_require_cert: false
+
+# Require a client certificate for pop3 ONLY.
+#tls_pop3_require_cert: false
+
+# Require a client certificate for lmtp ONLY.
+#tls_lmtp_require_cert: false
+
+# Require a client certificate for sieve ONLY.
+#tls_sieve_require_cert: false
+
+#
+# Cyrus Murder cluster configuration
+#
+# Set the following options to the values needed for this server to
+# autenticate against the mupdate master server:
+# mupdate_server
+# mupdate_port
+# mupdate_username
+# mupdate_authname
+# mupdate_realm
+# mupdate_password
+# mupdate_retry_delay
+
+##
+## KEEP THESE IN SYNC WITH cyrus.conf
+##
+# Unix domain socket that lmtpd listens on.
+lmtpsocket: /var/run/cyrus/socket/lmtp
+
+# Unix domain socket that idled listens on.
+#idlesocket: /var/run/cyrus/socket/idle
+
+# Unix domain socket that the new mail notification daemon listens on.
+#notifysocket: /var/run/cyrus/socket/notify
+
+# Syslog prefix. Defaults to cyrus (so logging is done as cyrus/imap etc.)
+#syslog_prefix: cyrus
+
+##
+## DEBUGGING
+##
+# Debugging hook. See /usr/share/doc/cyrus22-common/README.Debian.debug
+# Keep the hook disabled when it is not in use
+#
+# gdb Back-traces
+#debug_command: /usr/bin/gdb -batch -cd=/tmp -x /usr/lib/cyrus/get-backtrace.gdb /usr/lib/cyrus/bin/%s %d >/tmp/gdb-backtrace.cyrus.%1$s.%2$d <&- 2>&1 &
+#
+# system-call traces
+#debug_command: /usr/bin/strace -tt -o /tmp/strace.cyrus.%s.%d -p %2$d <&- 2>&1 &
+#
+# library traces
+#debug_command: /usr/bin/ltrace -tt -n 2 -o /tmp/ltrace.cyrus.%s.%d -p %2$d <&- 2>&1 &
Added: trunk/kolab-cyrus-imapd/debian/examples/mboxtocyrus
===================================================================
--- trunk/kolab-cyrus-imapd/debian/examples/mboxtocyrus 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/examples/mboxtocyrus 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,69 @@
+#!/bin/sh
+#
+# Script to import mbox-format mailboxes to Cyrus folders
+# Requires formail (from procmail)
+#
+# Note: As this runs cyrdeliver directly, you'll need to be
+# a member of the mail group for it to work.
+#
+# Note2: Make sure the user 'postman' is listed as an lmtp_admin
+# that is allowed to proxy.
+#
+# Use this script at your own risk! I'm not responsible if
+# it trashes your mail system :)
+#
+# By Michael-John Turner <mj at debian.org>
+#
+# Changelog:
+# Fri Dec 1 21:19:19 SAST 2000
+# - Incorporate some modifications from Tomas Pospisek <tpo at spin.ch>
+#
+
+USER=$1
+MAILBOX=$2
+CYRUSFOLDER=$3
+CYRDELIVER=/usr/sbin/cyrdeliver
+FORMAIL=/usr/bin/formail
+
+if ! [ -x "$FORMAIL" ]; then
+ echo ""
+ echo "formail (from procmail) is required to run this script"
+ echo ""
+ exit 1
+fi
+
+
+# This assumes id prints group names within parentheses
+if ! `id | grep -q "(mail)"`; then
+ echo ""
+ echo "You must be a member of the mail group to run this script"
+ echo ""
+ exit 1
+fi
+
+
+if [ "$USER" = "" ]; then
+ echo ""
+ echo "syntax: $0 user [mbox] [cyrus folder]"
+ echo ""
+ echo "If no mbox is specified, the user and mbox name are taken to be the same"
+ echo "If no cyrus folder is specified, the INBOX is used"
+ echo ""
+ exit 2
+fi
+
+
+
+if [ "$MAILBOX" == "" ]; then
+ MAILBOX=$USER
+fi
+
+if [ "$CYRUSFOLDER" == "" ]; then
+ echo "Adding mailbox '$MAILBOX' to Cyrus INBOX of user '$USER'..."
+ $FORMAIL -I "From " < $MAILBOX -s $CYRDELIVER $USER
+ else
+ echo "Adding mailbox '$MAILBOX' to Cyrus folder '$CYRUSFOLDER' of user '$USER'..."
+ $FORMAIL -I "From " < $MAILBOX -s $CYRDELIVER -a postman -m $CYRUSFOLDER $USER
+fi
+
+
Property changes on: trunk/kolab-cyrus-imapd/debian/examples/mboxtocyrus
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/debian/examples/syncldap2cyrus.pl
===================================================================
--- trunk/kolab-cyrus-imapd/debian/examples/syncldap2cyrus.pl 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/examples/syncldap2cyrus.pl 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,324 @@
+#!/usr/bin/perl -w
+use strict;
+use vars qw($opt_a $opt_f $opt_n $opt_r);
+use Getopt::Std;
+use Net::LDAP;
+use Cyrus::IMAP::Admin;
+
+# Requires: Getopt::Std, Net::LDAP, Cyrus::IMAP::Admin
+# Debian pkgs: libnet-ldap-perl, libcyrus-imap-perl21
+
+# Script Title : syncldap2cyrus.pl
+# Written By : Stuart Young (aka Cef) <cef at optus.net>
+# Last Modified: Mon Mar 14 23:59:14 UTC 2005
+# Description:
+# syncldap2cyrus.pl retrieves a list of usernames from an LDAP server
+# and then tries to create a user mailbox in Cyrus, and then any
+# secondary mailboxes under that. The idea is that you could run this
+# via cron or manually every time you add a user to your LDAP server,
+# and they would then have a Cyrus mailbox. This script also has a
+# report mode that shows you any users in LDAP that do not have a
+# Cyrus mailbox, and vice versa.
+
+# Notes:
+# This script is FREE. There is no support. If it breaks, you get to
+# keep all the pieces.
+# Please do not complain about the quality or style of this script,
+# or you will be ignored.
+# If you want to add SSL/TLS and/or inbuilt SASL support, go for it!
+# Yes I know it will use a lot of memory if there are lots of users
+# and/or mailboxes. Live with it, or rewrite it - your call.
+
+sub Usage ()
+{
+ return <<END;
+usage: syncldap2cyrus.pl [-a|-f|-n|-r]
+
+ -a : Add all users from LDAP to Cyrus
+ -f : Force creation of mailboxes even if they have errors (implies -a)
+ -n : Do not add users to Cyrus, just display (implies -a)
+ -r : Report on differences between LDAP and Cyrus only (implies -n)
+END
+}
+
+# No options, give a Usage message
+(scalar(@ARGV)) or
+ die Usage();
+
+getopts('afnr');
+
+# Get options
+my $addcyrus = 1;
+my $forcecreate = 0;
+my $report = 0;
+my $go = 0;
+
+if (defined($opt_a))
+{
+ $go = 1;
+}
+if (defined($opt_f))
+{
+ $go = 1;
+ $forcecreate = 1;
+}
+if (defined($opt_n))
+{
+ $go = 1;
+ $addcyrus = 0;
+}
+if (defined($opt_r))
+{
+ $go = 1;
+ $report = 1;
+ $addcyrus = 0;
+}
+
+# No regognised options, give a usage message
+if ($go == 0)
+{
+ die Usage();
+}
+
+# Settings - should come from config file(s) at some point
+
+# Debug mode, normally 0
+my $debug = 0;
+# Cyrus Host to connect to
+my $cyrus_host = 'localhost';
+# Cyrus admin user & password
+my $cyrus_admin = 'cyrus';
+my $cyrus_pass = 'secret';
+# Cyrus Unix Seperator - allow .'s in names (unixhierarchysep in cyrus)
+my $cyrus_unix_sep = 0;
+# LDAP server uri
+my $ldap_uri = 'ldap://localhost/';
+# LDAP bind domain & password
+my $ldap_bind_domain = 'cn=Manager, dc=example, dc=com';
+my $ldap_bind_pass = 'secret';
+# LDAP search base
+my $ldap_search_base = 'ou=People, dc=example, dc=com';
+# LDAP search scope
+my $ldap_search_scope = 'sub';
+# LDAP user attribute to return.
+my $ldap_user_attr = 'uid';
+# LDAP search query. Where possible, use $ldap_attr here to avoid
+# problems when changing the query
+my $ldap_search_query = "($ldap_user_attr=*)";
+# List of mailboxes to create for each user
+my @mboxlist = ('Trash', 'Sent', 'Spam', 'Drafts');
+
+# General vars
+my $count = 0;
+my $realuser = '';
+my $done = 0;
+
+# Connect to LDAP and bind
+my $ldap = Net::LDAP->new($ldap_uri) or
+ die "Can't connect to LDAP server at " . $ldap_uri;
+my $mesg = $ldap->bind ($ldap_bind_domain, password => $ldap_bind_pass);
+
+$mesg = $ldap->search ( base => $ldap_search_base,
+ scope => $ldap_search_scope,
+ filter => $ldap_search_query,
+ attr => $ldap_user_attr );
+
+$mesg->code && die "LDAP error: " . $mesg->error;
+
+# Connect to Cyrus via IMAP
+my $client = 0;
+my $rc = 0;
+my $sepchar = '.';
+
+$client = Cyrus::IMAP::Admin->new("$cyrus_host");
+if ($debug == 1)
+{
+ print "Connecting to Cyrus using user: ". $cyrus_admin. "\n";
+}
+$rc = $client->authenticate(-user => $cyrus_admin, -password => $cyrus_pass) or
+ die "Can't authenticate to Cyrus on $cyrus_host as user: ". $cyrus_admin. "\n";
+if ($cyrus_unix_sep == 1)
+{
+ $sepchar = '/';
+}
+my $prefix = "user".$sepchar;
+
+# Populate the LDAP user list - Very messy but works
+my $ldaprawdata = '';
+my $ldapfieldattr = '';
+my $ldapfielddata = '';
+my $ldaphref = $mesg->as_struct;
+my @ldapuserlist = ();
+foreach (keys %$ldaphref)
+{
+ $ldaprawdata = $$ldaphref{$_};
+ my @ldapsortattr = sort keys %$ldaprawdata;
+ foreach $ldapfieldattr (@ldapsortattr)
+ {
+ next if ( $ldapfieldattr =~ /;binary$/ );
+ my $ldapfielddata = @$ldaprawdata{$ldapfieldattr};
+ if ($debug == 1)
+ {
+ print "$ldapfieldattr = @$ldapfielddata\n";
+ }
+ if ( $ldapfieldattr eq $ldap_user_attr )
+ {
+ $ldapuserlist[$count] = "@$ldapfielddata";
+ }
+ }
+ $count += 1;
+}
+
+my $maildata = '';
+my @mailboxes = $client->list('%', $prefix);
+my @cyrusmboxes = ();
+if ($debug == 1)
+{
+ print "\nThere are ". at ldapuserlist," LDAP users\n";
+ print "\nThere are ". at mailboxes," Cyrus mailboxes\n";
+}
+
+$count = 0;
+
+# Populate the Cyrus mailbox list
+foreach $maildata (@mailboxes)
+{
+ # Note: Element 0 = full mailbox name/path
+ if ($addcyrus == 0 && $report == 0)
+ {
+ print "Cyrus: @{$maildata}[0]\n";
+ }
+ # Remove the Cyrus user part
+ $cyrusmboxes[$count] = substr(@{$maildata}[0],length($prefix),length(@{$maildata}[0]));
+ $count += 1;
+}
+
+my $item = '';
+my %seen = ();
+my @answer = ();
+
+if ($report == 1)
+{
+ $item = '';
+ %seen = ();
+ @answer = ();
+ $count = 0;
+ # Which users are in Cyrus but not in LDAP?
+ @seen{@ldapuserlist} = ();
+ foreach $item (@cyrusmboxes)
+ {
+ push (@answer, $item) unless exists $seen{$item};
+ }
+ foreach $item (@answer)
+ {
+ print "In Cyrus but not LDAP: ". $item ."\n";
+ $count += 1;
+ }
+
+ $item = '';
+ %seen = ();
+ @answer = ();
+ # Which mailboxes are in LDAP, but not in Cyrus?
+ @seen{@cyrusmboxes} = ();
+ foreach $item (@ldapuserlist)
+ {
+ push (@answer, $item) unless exists $seen{$item};
+ }
+ foreach $item (@answer)
+ {
+ print "In LDAP but not Cyrus: ". $item ."\n";
+ $count += 1;
+ }
+ if ($count == 0 && $debug == 1)
+ {
+ print "No differences.\n";
+ }
+}
+else
+{
+ # Iterate over the LDAP user list
+ $count = 0;
+ foreach $realuser (@ldapuserlist)
+ {
+ if ($addcyrus == 0)
+ {
+ # Display matching ldap record
+ print "LDAP : $realuser\n";
+ }
+ elsif ($addcyrus == 1)
+ {
+ $done = 0;
+ # We check if the Cyrus mailbox exists first, and if not, create it
+ # We ALWAYS check each individual user mailbox too, in case the list
+ # in the var @mailboxes gets updated
+ if ($client->list("$prefix$realuser") && $forcecreate == 0)
+ {
+ if ($debug == 1)
+ {
+ print "Mailbox already exists for $realuser\n";
+ }
+ }
+ elsif ($client->create("$prefix$realuser"))
+ {
+ $done += 1;
+ if ($client->setacl("$prefix$realuser", ${cyrus_admin} => "cd"))
+ {
+ if ($debug == 1)
+ {
+ print "Admin permissions set on $prefix$realuser\n"
+ }
+ }
+ else
+ {
+ print STDERR "Couldn't set $cyrus_admin\'s ACL on mailbox $prefix$realuser\: " . $client->error . "\n";
+ if ($forcecreate == 0)
+ {
+ exit 1;
+ }
+ }
+ }
+ else
+ {
+ print STDERR "Couldn't create mailbox $prefix$realuser\: " . $client->error . "\n";
+ if ($forcecreate == 0)
+ {
+ exit 1;
+ }
+ }
+ foreach my $mailbox ( @mboxlist )
+ {
+ if ($client->list("$prefix$realuser$sepchar$mailbox"))
+ {
+ if ($debug)
+ {
+ print "Mailbox $mailbox already exists for $realuser\n";
+ }
+ }
+ elsif ($client->create("$prefix$realuser$sepchar" . ${mailbox}))
+ {
+ $done += 1;
+ }
+ else
+ {
+ print STDERR "Couldn't create mailbox $prefix$realuser$sepchar" . ${mailbox}.": " . $client->error . "\n";
+ if ($forcecreate == 0)
+ {
+ exit 1;
+ }
+ }
+ }
+ if ($done > 0)
+ {
+ print "User $realuser\'s mailboxes created successfully\n";
+ $count += 1;
+ }
+ }
+ }
+ if ($count > 0)
+ {
+ print "Created $count user mailboxes\n";
+ }
+}
+
+$mesg = $ldap->unbind;
+exit 0;
Modified: trunk/kolab-cyrus-imapd/debian/executable.files
===================================================================
--- trunk/kolab-cyrus-imapd/debian/executable.files 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/executable.files 2006-01-05 14:27:15 UTC (rev 110)
@@ -1,36 +1,42 @@
-./install-sh
+./autogen.sh
+./configure
./contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl
./contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl
./contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl
./contrib/cyrus-graphtools.1.0/script/cyrus.pl
./contrib/cyrus-graphtools.1.0/script/run
./contrib/mupdate-test.pl
+./contrib/notify_unix/simple_notify.pl
./contrib/notify_unix/sql_notify.pl
-./contrib/notify_unix/simple_notify.pl
+./debian/cyrus-makedirs
+./debian/cyrus22-common.cyrus22.init
+./debian/cyrus22-common.postinst
+./debian/cyrus22-common.postrm
+./debian/cyrus22-common.prerm
+./debian/examples/mboxtocyrus
+./debian/rules
./doc/internal/internationalization.html
+./et/compile_et.sh
+./et/config_script
./imap/xversion.sh
+./install-sh
./lib/test/run
./makedepend/configure
./makedepend/install-sh
+./mkinstalldirs
./netnews/inn.diffs
./perl/imap/examples/test-imsp.pl
./snmp/snmpgen
-./tools/mknewsgroups
-./tools/config2man
./tools/arbitronsort.pl
./tools/config2header
+./tools/config2man
./tools/dohash
./tools/masssievec
./tools/mkimap
-./tools/translatesieve
+./tools/mknewsgroups
+./tools/mupdate-loadgen.pl
./tools/not-mkdep
-./tools/mupdate-loadgen.pl
./tools/rehash
+./tools/translatesieve
+./tools/undohash
./tools/upgradesieve
-./tools/undohash
-./sieve/hmac-md5.h
-./configure.lineno
-./configure
-./debian/rules
-./autogen.sh
-./mkinstalldirs
Added: trunk/kolab-cyrus-imapd/debian/get-backtrace.gdb
===================================================================
--- trunk/kolab-cyrus-imapd/debian/get-backtrace.gdb 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/get-backtrace.gdb 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,4 @@
+c
+bt
+quit
+
Added: trunk/kolab-cyrus-imapd/debian/imap.pam
===================================================================
--- trunk/kolab-cyrus-imapd/debian/imap.pam 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/imap.pam 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,14 @@
+# PAM configuration file for Cyrus IMAP service
+# $Id: imap.pam 5 2005-03-12 23:19:45Z sven $
+#
+# If you want to use Cyrus in a setup where users don't have
+# accounts on the local machine, you'll need to make sure
+# you use something like pam_permit for account checking.
+#
+# Remember that SASL (and therefore Cyrus) accesses PAM
+# modules through saslauthd, and that SASL can only deal with
+# plaintext passwords if PAM is used.
+#
+
+ at include common-auth
+ at include common-account
Modified: trunk/kolab-cyrus-imapd/debian/imapd.conf
===================================================================
--- trunk/kolab-cyrus-imapd/debian/imapd.conf 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/imapd.conf 2006-01-05 14:27:15 UTC (rev 110)
@@ -1,28 +1,315 @@
+# Debian Cyrus imapd.conf
+# $Id: imapd.conf 95 2005-04-08 00:10:54Z sven $
+# See imapd.conf(5) for more information and more options
+
+# Configuration directory
+configdirectory: /var/lib/cyrus
+
+# Which partition to use for default mailboxes
+defaultpartition: default
+partition-default: /var/spool/cyrus/mail
+
+# News setup
+partition-news: /var/spool/cyrus/news
+newsspool: /var/spool/news
+
+# Alternate namespace
+# If enabled, activate the alternate namespace as documented in
+# /usr/share/doc/cyrus22-doc/html/altnamespace.html, where an user's
+# subfolders are in the same level as the INBOX
+# See also userprefix and sharedprefix on imapd.conf(5)
+altnamespace: no
+
+# UNIX Hierarchy Convention
+# Set to yes, and cyrus will accept dots in names, and use the forward
+# slash "/" to delimit levels of the hierarchy. This is done by converting
+# internally all dots to "^", and all "/" to dots. So the "rabbit.holes"
+# mailbox of user "helmer.fudd" is stored in "user.elmer^fud.rabbit^holes"
+unixhierarchysep: no
+
+# Rejecting illegal characters in headers
+# Headers of RFC2882 messages must not have characters with the 8th bit
+# set. However, too many badly-written MUAs generate this, including most
+# spamware. Enable this to reject such messages.
+#reject8bit: yes
+
+# Munging illegal characters in headers
+# Headers of RFC2882 messages must not have characters with the 8th bit
+# set. However, too many badly-written MUAs generate this, including most
+# spamware. If you kept reject8bit disabled, you can choose to leave the
+# crappage untouched by disabling this (if you don't care that IMAP SEARCH
+# won't work right anymore.
+#munge8bit: no
+
+# Forcing recipient user to lowercase
+# Cyrus 2.2 is case-sensitive. If all your mail users are in lowercase, it is
+# probably a very good idea to set lmtp_downcase_rcpt to true. The default is
+# to assume the user knows what he is doing, and not downcase anything.
+#lmtp_downcase_rcpt: yes
+
+# Uncomment the following and add the space-separated users who
+# have admin rights for all services.
+#admins: cyrus
+
+# Space-separated list of users that have lmtp "admin" status (i.e. that
+# can deliver email through TCP/IP lmtp) in addition to those in the
+# admins: entry above
+#lmtp_admins: postman
+
+# Space-separated list of users that have mupdate "admin" status, in
+# addition to those in the admins: entry above. Note that mupdate slaves and
+# backends in a Murder cluster need to autenticate against the mupdate master
+# as admin users.
+#mupdate_admins: mupdateman
+
+# Space-separated list of users that have imapd "admin" status, in
+# addition to those in the admins: entry above
+#imap_admins: cyrus
+
+# Space-separated list of users that have sieve "admin" status, in
+# addition to those in the admins: entry above
+#sieve_admins: cyrus
+
+# List of users and groups that are allowed to proxy for other users,
+# seperated by spaces. Any user listed in this will be allowed to login
+# for any other user. Like "admins:" above, you can have imap_proxyservers
+# and sieve_proxyservers.
+#proxyservers: cyrus
+
+# No anonymous logins
+allowanonymouslogin: no
+
+# Minimum time between POP mail fetches in minutes
+popminpoll: 1
+
+# If nonzero, normal users may create their own IMAP accounts by creating
+# the mailbox INBOX. The user's quota is set to the value if it is positive,
+# otherwise the user has unlimited quota.
+autocreatequota: 0
+
+# umask used by Cyrus programs
+umask: 077
+
+# Sendmail binary location
+# DUE TO A BUG, Cyrus sends CRLF EOLs to this program. This breaks Exim 3.
+# For now, to work around the bug, set this to a wrapper that calls
+# /usr/sbin/sendmail -dropcr instead if you use Exim 3.
+#sendmail: /usr/sbin/sendmail
+
+# If enabled, cyrdeliver will look for Sieve scripts in user's home
+# directories: ~user/.sieve.
+sieveusehomedir: false
+
+# If sieveusehomedir is false, this directory is searched for Sieve scripts.
+sievedir: /var/spool/sieve
+
+# notifyd(8) method to use for "MAIL" notifications. If not set, "MAIL"
+# notifications are disabled. Valid methods are: null, log, zephyr
+#mailnotifier: zephyr
+
+# notifyd(8) method to use for "SIEVE" notifications. If not set, "SIEVE"
+# notifications are disabled. This method is only used when no method is
+# specified in the script. Valid methods are null, log, zephyr, mailto
+#sievenotifier: zephyr
+
+# DRAC (pop-before-smtp, imap-before-smtp) support
+# Set dracinterval to the time in minutes to call DRAC while a user is
+# connected to the imap/pop services. Set to 0 to disable DRAC (default)
+# Set drachost to the host where the rpc drac service is running
+#dracinterval: 0
+#drachost: localhost
+
+# If enabled, the partitions will also be hashed, in addition to the hashing
+# done on configuration directories. This is recommended if one partition has a
+# very bushy mailbox tree.
+hashimapspool: true
+
+# Allow plaintext logins by default (SASL PLAIN)
+allowplaintext: yes
+
+# Force PLAIN/LOGIN authentication only
+# (you need to uncomment this if you are not using an auxprop-based SASL
+# mechanism. saslauthd users, that means you!). And pay attention to
+# sasl_minimum_layer and allowapop below, too.
+#sasl_mech_list: PLAIN
+
+# Allow use of the POP3 APOP authentication command.
+# Note that this command requires that the plaintext passwords are
+# available in a SASL auxprop backend (eg. sasldb), and that the system
+# can provide enough entropy (eg. from /dev/urandom) to create a challenge
+# in the banner.
+#allowapop: no
+
+# The minimum SSF that the server will allow a client to negotiate. A
+# value of 1 requires integrity protection; any higher value requires some
+# amount of encryption.
+#sasl_minimum_layer: 0
+
+# The maximum SSF that the server will allow a client to negotiate. A
+# value of 1 requires integrity protection; any higher value requires some
+# amount of encryption.
+#sasl_maximum_layer: 256
+
+# List of remote realms whose users may log in using cross-realm
+# authentications. Seperate each realm name by a space. A cross-realm
+# identity is considered any identity returned by SASL with an "@" in it.
+# NOTE: To support multiple virtual domains on the same interface/IP,
+# you need to list them all as loginreals. If you don't list them here,
+# (most of) your users probably won't be able to log in.
+#loginrealms: example.com
+
+# Enable virtual domain support. If enabled, the user's domain will
+# be determined by splitting a fully qualified userid at the last '@'
+# or '%' symbol. If the userid is unqualified, and the virtdomains
+# option is set to "on", then the domain will be determined by doing
+# a reverse lookup on the IP address of the incoming network
+# interface, otherwise the user is assumed to be in the default
+# domain (if set).
+#virtdomains: userid
+
+# The default domain for virtual domain support
+# If the domain of a user can't be taken from its login and it can't
+# be determined by doing a reverse lookup on the interface IP, this
+# domain is used.
+#defaultdomain:
+
+#
+# SASL library options (these are handled directly by the SASL libraries,
+# refer to SASL documentation for an up-to-date list of these)
+#
+
+# The mechanism(s) used by the server to verify plaintext passwords. Possible
+# values are "saslauthd", "auxprop", "pwcheck" and "alwaystrue". They
+# are tried in order, you can specify more than one, separated by spaces.
+#
+# Do note that, since sasl will be run as user cyrus, you may have a lot of
+# trouble to set this up right.
+sasl_pwcheck_method: auxprop
+
+# What auxpropd plugins to load, if using sasl_pwcheck_method: auxprop
+# by default, all plugins are tried (which is probably NOT what you want).
+#sasl_auxprop_plugin: sasldb
+
+# If enabled, the SASL library will automatically create authentication secrets
+# when given a plaintext password. Refer to SASL documentation
+sasl_auto_transition: no
+
+#
+# SSL/TLS Options
+#
+
+# File containing the global certificate used for ALL services (imap, pop3,
+# lmtp, sieve)
+#tls_cert_file: /etc/ssl/certs/cyrus-global.pem
+
+# File containing the private key belonging to the global server certificate.
+#tls_key_file: /etc/ssl/private/cyrus-global.key
+
+# File containing the certificate used for imap. If not specified, the global
+# certificate is used. A value of "disabled" will disable SSL/TLS for imap.
+#tls_imap_cert_file: /etc/ssl/certs/cyrus-imap.pem
+
+# File containing the private key belonging to the imap-specific server
+# certificate. If not specified, the global private key is used. A value of
+# "disabled" will disable SSL/TLS for imap.
+#tls_imap_key_file: /etc/ssl/private/cyrus-imap.key
+
+# File containing the certificate used for pop3. If not specified, the global
+# certificate is used. A value of "disabled" will disable SSL/TLS for pop3.
+#tls_pop3_cert_file: /etc/ssl/certs/cyrus-pop3.pem
+
+# File containing the private key belonging to the pop3-specific server
+# certificate. If not specified, the global private key is used. A value of
+# "disabled" will disable SSL/TLS for pop3.
+#tls_pop3_key_file: /etc/ssl/private/cyrus-pop3.key
+
+# File containing the certificate used for lmtp. If not specified, the global
+# certificate is used. A value of "disabled" will disable SSL/TLS for lmtp.
+#tls_lmtp_cert_file: /etc/ssl/certs/cyrus-lmtp.pem
+
+# File containing the private key belonging to the lmtp-specific server
+# certificate. If not specified, the global private key is used. A value of
+# "disabled" will disable SSL/TLS for lmtp.
+#tls_lmtp_key_file: /etc/ssl/private/cyrus-lmtp.key
+
+# File containing the certificate used for sieve. If not specified, the global
+# certificate is used. A value of "disabled" will disable SSL/TLS for sieve.
+#tls_sieve_cert_file: /etc/ssl/certs/cyrus-sieve.pem
+
+# File containing the private key belonging to the sieve-specific server
+# certificate. If not specified, the global private key is used. A value of
+# "disabled" will disable SSL/TLS for sieve.
+#tls_sieve_key_file: /etc/ssl/private/cyrus-sieve.key
+
+# File containing one or more Certificate Authority (CA) certificates.
+#tls_ca_file: /etc/ssl/certs/cyrus-imapd-ca.pem
+
+# Path to directory with certificates of CAs.
+tls_ca_path: /etc/ssl/certs
+
+# The length of time (in minutes) that a TLS session will be cached for later
+# reuse. The maximum value is 1440 (24 hours), the default. A value of 0 will
+# disable session caching.
+tls_session_timeout: 1440
+
+# The list of SSL/TLS ciphers to allow. The format of the string is described
+# in ciphers(1). THIS DISABLES THE WEAK 'FOR EXPORT' CRAP!
+tls_cipher_list: TLSv1:SSLv3:SSLv2:!NULL:!EXPORT:!DES:!LOW:@STRENGTH
+
+# Require a client certificate for ALL services (imap, pop3, lmtp, sieve).
+#tls_require_cert: false
+
+# Require a client certificate for imap ONLY.
+#tls_imap_require_cert: false
+
+# Require a client certificate for pop3 ONLY.
+#tls_pop3_require_cert: false
+
+# Require a client certificate for lmtp ONLY.
+#tls_lmtp_require_cert: false
+
+# Require a client certificate for sieve ONLY.
+#tls_sieve_require_cert: false
+
+#
+# Cyrus Murder cluster configuration
+#
+# Set the following options to the values needed for this server to
+# autenticate against the mupdate master server:
+# mupdate_server
+# mupdate_port
+# mupdate_username
+# mupdate_authname
+# mupdate_realm
+# mupdate_password
+# mupdate_retry_delay
+
##
-## imapd.conf -- IMAP daemon configuration
-## Copyright (c) 2002-2003 Ralf S. Engelschall <rse at engelschall.com>
+## KEEP THESE IN SYNC WITH cyrus.conf
##
+# Unix domain socket that lmtpd listens on.
+lmtpsocket: /var/run/cyrus/socket/lmtp
-# Warning: Do not use a trailing slash in paths!
-configdirectory: /var/lib/cyrus
-partition-default: /var/spool/cyrus/mail
-#admins: @l_rusr@
-#defaultacl: @l_rusr@ lrswipcda
-sasl_pwcheck_method: saslauthd
-sasl_mech_list: PLAIN
-#sendmail: /sbin/sendmail
-lmtpsocket: /var/run/cyrus/socket/lmtp
-temp_path: /var/tmp
-unixhierarchysep: yes
-#altnamespace: yes
-allowanonymouslogin: no
-allowplaintext: yes
-allowusermoves: no
-#servername: @l_hostname at .@l_domainname@
-autocreatequota: 10000
-reject8bit: no
-quotawarn: 90
-timeout: 30
-#defaultdomain:
-#virtdomains: on
+# Unix domain socket that idled listens on.
+idlesocket: /var/run/cyrus/socket/idle
+# Unix domain socket that the new mail notification daemon listens on.
+notifysocket: /var/run/cyrus/socket/notify
+
+# Syslog prefix. Defaults to cyrus (so logging is done as cyrus/imap etc.)
+syslog_prefix: cyrus
+
+##
+## DEBUGGING
+##
+# Debugging hook. See /usr/share/doc/cyrus22-common/README.Debian.debug
+# Keep the hook disabled when it is not in use
+#
+# gdb Back-traces
+#debug_command: /usr/bin/gdb -batch -cd=/tmp -x /usr/lib/cyrus/get-backtrace.gdb /usr/lib/cyrus/bin/%s %d >/tmp/gdb-backtrace.cyrus.%1$s.%2$d <&- 2>&1 &
+#
+# system-call traces
+#debug_command: /usr/bin/strace -tt -o /tmp/strace.cyrus.%s.%d -p %2$d <&- 2>&1 &
+#
+# library traces
+#debug_command: /usr/bin/ltrace -tt -n 2 -o /tmp/ltrace.cyrus.%s.%d -p %2$d <&- 2>&1 &
Added: trunk/kolab-cyrus-imapd/debian/imapd.conf.backup
===================================================================
--- trunk/kolab-cyrus-imapd/debian/imapd.conf.backup 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/imapd.conf.backup 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,315 @@
+# Debian Cyrus imapd.conf
+# $Id: imapd.conf 95 2005-04-08 00:10:54Z sven $
+# See imapd.conf(5) for more information and more options
+
+# Configuration directory
+configdirectory: /var/lib/cyrus
+
+# Which partition to use for default mailboxes
+defaultpartition: default
+partition-default: /var/spool/cyrus/mail
+
+# News setup
+partition-news: /var/spool/cyrus/news
+newsspool: /var/spool/news
+
+# Alternate namespace
+# If enabled, activate the alternate namespace as documented in
+# /usr/share/doc/cyrus22-doc/html/altnamespace.html, where an user's
+# subfolders are in the same level as the INBOX
+# See also userprefix and sharedprefix on imapd.conf(5)
+altnamespace: no
+
+# UNIX Hierarchy Convention
+# Set to yes, and cyrus will accept dots in names, and use the forward
+# slash "/" to delimit levels of the hierarchy. This is done by converting
+# internally all dots to "^", and all "/" to dots. So the "rabbit.holes"
+# mailbox of user "helmer.fudd" is stored in "user.elmer^fud.rabbit^holes"
+unixhierarchysep: no
+
+# Rejecting illegal characters in headers
+# Headers of RFC2882 messages must not have characters with the 8th bit
+# set. However, too many badly-written MUAs generate this, including most
+# spamware. Enable this to reject such messages.
+#reject8bit: yes
+
+# Munging illegal characters in headers
+# Headers of RFC2882 messages must not have characters with the 8th bit
+# set. However, too many badly-written MUAs generate this, including most
+# spamware. If you kept reject8bit disabled, you can choose to leave the
+# crappage untouched by disabling this (if you don't care that IMAP SEARCH
+# won't work right anymore.
+#munge8bit: no
+
+# Forcing recipient user to lowercase
+# Cyrus 2.2 is case-sensitive. If all your mail users are in lowercase, it is
+# probably a very good idea to set lmtp_downcase_rcpt to true. The default is
+# to assume the user knows what he is doing, and not downcase anything.
+#lmtp_downcase_rcpt: yes
+
+# Uncomment the following and add the space-separated users who
+# have admin rights for all services.
+#admins: cyrus
+
+# Space-separated list of users that have lmtp "admin" status (i.e. that
+# can deliver email through TCP/IP lmtp) in addition to those in the
+# admins: entry above
+#lmtp_admins: postman
+
+# Space-separated list of users that have mupdate "admin" status, in
+# addition to those in the admins: entry above. Note that mupdate slaves and
+# backends in a Murder cluster need to autenticate against the mupdate master
+# as admin users.
+#mupdate_admins: mupdateman
+
+# Space-separated list of users that have imapd "admin" status, in
+# addition to those in the admins: entry above
+#imap_admins: cyrus
+
+# Space-separated list of users that have sieve "admin" status, in
+# addition to those in the admins: entry above
+#sieve_admins: cyrus
+
+# List of users and groups that are allowed to proxy for other users,
+# seperated by spaces. Any user listed in this will be allowed to login
+# for any other user. Like "admins:" above, you can have imap_proxyservers
+# and sieve_proxyservers.
+#proxyservers: cyrus
+
+# No anonymous logins
+allowanonymouslogin: no
+
+# Minimum time between POP mail fetches in minutes
+popminpoll: 1
+
+# If nonzero, normal users may create their own IMAP accounts by creating
+# the mailbox INBOX. The user's quota is set to the value if it is positive,
+# otherwise the user has unlimited quota.
+autocreatequota: 0
+
+# umask used by Cyrus programs
+umask: 077
+
+# Sendmail binary location
+# DUE TO A BUG, Cyrus sends CRLF EOLs to this program. This breaks Exim 3.
+# For now, to work around the bug, set this to a wrapper that calls
+# /usr/sbin/sendmail -dropcr instead if you use Exim 3.
+#sendmail: /usr/sbin/sendmail
+
+# If enabled, cyrdeliver will look for Sieve scripts in user's home
+# directories: ~user/.sieve.
+sieveusehomedir: false
+
+# If sieveusehomedir is false, this directory is searched for Sieve scripts.
+sievedir: /var/spool/sieve
+
+# notifyd(8) method to use for "MAIL" notifications. If not set, "MAIL"
+# notifications are disabled. Valid methods are: null, log, zephyr
+#mailnotifier: zephyr
+
+# notifyd(8) method to use for "SIEVE" notifications. If not set, "SIEVE"
+# notifications are disabled. This method is only used when no method is
+# specified in the script. Valid methods are null, log, zephyr, mailto
+#sievenotifier: zephyr
+
+# DRAC (pop-before-smtp, imap-before-smtp) support
+# Set dracinterval to the time in minutes to call DRAC while a user is
+# connected to the imap/pop services. Set to 0 to disable DRAC (default)
+# Set drachost to the host where the rpc drac service is running
+#dracinterval: 0
+#drachost: localhost
+
+# If enabled, the partitions will also be hashed, in addition to the hashing
+# done on configuration directories. This is recommended if one partition has a
+# very bushy mailbox tree.
+hashimapspool: true
+
+# Allow plaintext logins by default (SASL PLAIN)
+allowplaintext: yes
+
+# Force PLAIN/LOGIN authentication only
+# (you need to uncomment this if you are not using an auxprop-based SASL
+# mechanism. saslauthd users, that means you!). And pay attention to
+# sasl_minimum_layer and allowapop below, too.
+#sasl_mech_list: PLAIN
+
+# Allow use of the POP3 APOP authentication command.
+# Note that this command requires that the plaintext passwords are
+# available in a SASL auxprop backend (eg. sasldb), and that the system
+# can provide enough entropy (eg. from /dev/urandom) to create a challenge
+# in the banner.
+#allowapop: no
+
+# The minimum SSF that the server will allow a client to negotiate. A
+# value of 1 requires integrity protection; any higher value requires some
+# amount of encryption.
+#sasl_minimum_layer: 0
+
+# The maximum SSF that the server will allow a client to negotiate. A
+# value of 1 requires integrity protection; any higher value requires some
+# amount of encryption.
+#sasl_maximum_layer: 256
+
+# List of remote realms whose users may log in using cross-realm
+# authentications. Seperate each realm name by a space. A cross-realm
+# identity is considered any identity returned by SASL with an "@" in it.
+# NOTE: To support multiple virtual domains on the same interface/IP,
+# you need to list them all as loginreals. If you don't list them here,
+# (most of) your users probably won't be able to log in.
+#loginrealms: example.com
+
+# Enable virtual domain support. If enabled, the user's domain will
+# be determined by splitting a fully qualified userid at the last '@'
+# or '%' symbol. If the userid is unqualified, and the virtdomains
+# option is set to "on", then the domain will be determined by doing
+# a reverse lookup on the IP address of the incoming network
+# interface, otherwise the user is assumed to be in the default
+# domain (if set).
+#virtdomains: userid
+
+# The default domain for virtual domain support
+# If the domain of a user can't be taken from its login and it can't
+# be determined by doing a reverse lookup on the interface IP, this
+# domain is used.
+#defaultdomain:
+
+#
+# SASL library options (these are handled directly by the SASL libraries,
+# refer to SASL documentation for an up-to-date list of these)
+#
+
+# The mechanism(s) used by the server to verify plaintext passwords. Possible
+# values are "saslauthd", "auxprop", "pwcheck" and "alwaystrue". They
+# are tried in order, you can specify more than one, separated by spaces.
+#
+# Do note that, since sasl will be run as user cyrus, you may have a lot of
+# trouble to set this up right.
+sasl_pwcheck_method: auxprop
+
+# What auxpropd plugins to load, if using sasl_pwcheck_method: auxprop
+# by default, all plugins are tried (which is probably NOT what you want).
+#sasl_auxprop_plugin: sasldb
+
+# If enabled, the SASL library will automatically create authentication secrets
+# when given a plaintext password. Refer to SASL documentation
+sasl_auto_transition: no
+
+#
+# SSL/TLS Options
+#
+
+# File containing the global certificate used for ALL services (imap, pop3,
+# lmtp, sieve)
+#tls_cert_file: /etc/ssl/certs/cyrus-global.pem
+
+# File containing the private key belonging to the global server certificate.
+#tls_key_file: /etc/ssl/private/cyrus-global.key
+
+# File containing the certificate used for imap. If not specified, the global
+# certificate is used. A value of "disabled" will disable SSL/TLS for imap.
+#tls_imap_cert_file: /etc/ssl/certs/cyrus-imap.pem
+
+# File containing the private key belonging to the imap-specific server
+# certificate. If not specified, the global private key is used. A value of
+# "disabled" will disable SSL/TLS for imap.
+#tls_imap_key_file: /etc/ssl/private/cyrus-imap.key
+
+# File containing the certificate used for pop3. If not specified, the global
+# certificate is used. A value of "disabled" will disable SSL/TLS for pop3.
+#tls_pop3_cert_file: /etc/ssl/certs/cyrus-pop3.pem
+
+# File containing the private key belonging to the pop3-specific server
+# certificate. If not specified, the global private key is used. A value of
+# "disabled" will disable SSL/TLS for pop3.
+#tls_pop3_key_file: /etc/ssl/private/cyrus-pop3.key
+
+# File containing the certificate used for lmtp. If not specified, the global
+# certificate is used. A value of "disabled" will disable SSL/TLS for lmtp.
+#tls_lmtp_cert_file: /etc/ssl/certs/cyrus-lmtp.pem
+
+# File containing the private key belonging to the lmtp-specific server
+# certificate. If not specified, the global private key is used. A value of
+# "disabled" will disable SSL/TLS for lmtp.
+#tls_lmtp_key_file: /etc/ssl/private/cyrus-lmtp.key
+
+# File containing the certificate used for sieve. If not specified, the global
+# certificate is used. A value of "disabled" will disable SSL/TLS for sieve.
+#tls_sieve_cert_file: /etc/ssl/certs/cyrus-sieve.pem
+
+# File containing the private key belonging to the sieve-specific server
+# certificate. If not specified, the global private key is used. A value of
+# "disabled" will disable SSL/TLS for sieve.
+#tls_sieve_key_file: /etc/ssl/private/cyrus-sieve.key
+
+# File containing one or more Certificate Authority (CA) certificates.
+#tls_ca_file: /etc/ssl/certs/cyrus-imapd-ca.pem
+
+# Path to directory with certificates of CAs.
+tls_ca_path: /etc/ssl/certs
+
+# The length of time (in minutes) that a TLS session will be cached for later
+# reuse. The maximum value is 1440 (24 hours), the default. A value of 0 will
+# disable session caching.
+tls_session_timeout: 1440
+
+# The list of SSL/TLS ciphers to allow. The format of the string is described
+# in ciphers(1). THIS DISABLES THE WEAK 'FOR EXPORT' CRAP!
+tls_cipher_list: TLSv1:SSLv3:SSLv2:!NULL:!EXPORT:!DES:!LOW:@STRENGTH
+
+# Require a client certificate for ALL services (imap, pop3, lmtp, sieve).
+#tls_require_cert: false
+
+# Require a client certificate for imap ONLY.
+#tls_imap_require_cert: false
+
+# Require a client certificate for pop3 ONLY.
+#tls_pop3_require_cert: false
+
+# Require a client certificate for lmtp ONLY.
+#tls_lmtp_require_cert: false
+
+# Require a client certificate for sieve ONLY.
+#tls_sieve_require_cert: false
+
+#
+# Cyrus Murder cluster configuration
+#
+# Set the following options to the values needed for this server to
+# autenticate against the mupdate master server:
+# mupdate_server
+# mupdate_port
+# mupdate_username
+# mupdate_authname
+# mupdate_realm
+# mupdate_password
+# mupdate_retry_delay
+
+##
+## KEEP THESE IN SYNC WITH cyrus.conf
+##
+# Unix domain socket that lmtpd listens on.
+lmtpsocket: /var/run/cyrus/socket/lmtp
+
+# Unix domain socket that idled listens on.
+idlesocket: /var/run/cyrus/socket/idle
+
+# Unix domain socket that the new mail notification daemon listens on.
+notifysocket: /var/run/cyrus/socket/notify
+
+# Syslog prefix. Defaults to cyrus (so logging is done as cyrus/imap etc.)
+syslog_prefix: cyrus
+
+##
+## DEBUGGING
+##
+# Debugging hook. See /usr/share/doc/cyrus22-common/README.Debian.debug
+# Keep the hook disabled when it is not in use
+#
+# gdb Back-traces
+#debug_command: /usr/bin/gdb -batch -cd=/tmp -x /usr/lib/cyrus/get-backtrace.gdb /usr/lib/cyrus/bin/%s %d >/tmp/gdb-backtrace.cyrus.%1$s.%2$d <&- 2>&1 &
+#
+# system-call traces
+#debug_command: /usr/bin/strace -tt -o /tmp/strace.cyrus.%s.%d -p %2$d <&- 2>&1 &
+#
+# library traces
+#debug_command: /usr/bin/ltrace -tt -n 2 -o /tmp/ltrace.cyrus.%s.%d -p %2$d <&- 2>&1 &
Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.README.Debian
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.README.Debian 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.README.Debian 2006-01-05 14:27:15 UTC (rev 110)
@@ -1,8 +1,8 @@
Cyrus IMAP for Debian, admin utilities
-$Id: cyrus21-admin.README.Debian,v 1.1 2003/03/04 13:13:29 hmh Exp $
+$Id: cyrus22-admin.README.Debian 5 2005-03-12 23:19:45Z sven $
---------------------
-Refer to the cyrus21-doc package for more information. There is a lot
+Refer to the cyrus22-doc package for more information. There is a lot
of it, and it will save you hours (or days) of frustating bug-hunting if
you read them first.
Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.lintian
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.lintian 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.lintian 2006-01-05 14:27:15 UTC (rev 110)
@@ -1 +1 @@
-kolab-cyrus-admin: shell-script-fails-syntax-check ./usr/bin/cyradm
+cyrus22-admin: shell-script-fails-syntax-check ./usr/bin/cyradm
Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.manpages
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.manpages 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.manpages 2006-01-05 14:27:15 UTC (rev 110)
@@ -1,2 +1,3 @@
man/sieveshell.1
perl/imap/blib/man1/cyradm.1p
+debian/tmp/usr/share/man/man1/installsieve.1
Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.menu
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.menu 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.menu 2006-01-05 14:27:15 UTC (rev 110)
@@ -1,6 +1,6 @@
?package(kolab-cyrus-admin):needs="text" section="Apps/System/Admin"\
hints="Mail,Admin,Cyrus"\
- title="Cyrus 2.1 cyradm (cyrus at localhost)"\
- longtitle="Administer local Cyrus IMAPd 2.1 accounts as user cyrus"\
- icon="/usr/share/icons/kolab-cyradm.xpm"\
+ title="Cyrus 2.2 cyradm (cyrus at localhost)"\
+ longtitle="Administer local Cyrus IMAPd 2.2 accounts as user cyrus"\
+ icon="/usr/share/icons/cyradm.xpm"\
command="/usr/bin/cyradm --user cyrus localhost"
Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.README.Debian
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.README.Debian 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.README.Debian 2006-01-05 14:27:15 UTC (rev 110)
@@ -1,8 +1,8 @@
Cyrus IMAP for Debian, generic SASL-enabled protocol clients
-$Id: cyrus21-clients.README.Debian,v 1.1 2003/03/04 13:13:29 hmh Exp $
+$Id: cyrus22-clients.README.Debian 5 2005-03-12 23:19:45Z sven $
---------------------
-Refer to the cyrus21-doc package for more information. There is a lot
+Refer to the cyrus22-doc package for more information. There is a lot
of it, and it will save you hours (or days) of frustating bug-hunting if
you read them first.
Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.NEWS
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.NEWS 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.NEWS 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,86 @@
+cyrus22-imapd (2.2.12-1) unstable; urgency=low
+
+ cyrus now supports realms by default and is therefor suitable for virtual
+ domains much better than it was before. However, this might break upgrades
+ from v2.1 installations, especially when the hostname might change during
+ operation (for example in hot-standby high-Availability setups).
+
+ This is the first cyrus22 package
+
+ -- Sven Mueller <debian at incase.de> Sun, 13 Feb 2005 00:49:12 -0100
+
+cyrus21-imapd (2.1.16-1) unstable; urgency=low
+
+ ipurge behaviour is now that of the patch accepted upstream. It uses the
+ date: header by default, and it can use the internal date of the message as
+ an alternative.
+
+ Cyrus 2.1 is officially in maintenance mode now, and the Debian packages will
+ follow suit. I will switch development efforts to the Cyrus 2.2 package, and
+ update 2.1 only to fix bugs, and apply anything that shows up on CVS.
+
+ -- Henrique de Moraes Holschuh <hmh at debian.org> Sun, 23 Nov 2003 11:59:12 -0200
+
+cyrus21-imapd (2.1.15-8) unstable; urgency=low
+
+ ipurge has been patched in a way that changes its default behaviour. Now, it
+ uses the internal date of the message (i.e. when it entered the mail store,
+ be it through lmtp or imap append) instead of the Date: header for date
+ comparasions.
+
+ The old behaviour is still available, refer to the ipurge manpage for more
+ information.
+
+ These changes have not been accepted upstream yet, so I don't promise they
+ will stay around forever.
+
+ -- Henrique de Moraes Holschuh <hmh at debian.org> Tue, 21 Oct 2003 13:18:30 -0200
+
+cyrus21-imapd (2.1.15-1) unstable; urgency=low
+
+ Cyrus has a big bug regarding EOL markers for /usr/sbin/sendmail. It sends
+ CRLF-terminated lines to the /usr/sbin/sendmail wrapper (or to whatever you
+ configure for sendmail: in /etc/imapd.conf), when it should be sending
+ LF-terminated lines only.
+
+ Postfix and sendmail are fine with CRLF EOLs. Exim 4 can be configured
+ to strip the CRs off all the time in its configuration file.
+
+ I am writing a patch to allow one to configure parameters for sendmail, but
+ while it is not ready and accepted upstream, users of Exim 3 should set
+ their sendmail: in imapd.conf to a shell wrapper that calls
+ /usr/sbin/sendmail -dropcr "$@" or something to that extent.
+
+ -- Henrique de Moraes Holschuh <hmh at debian.org> Tue, 19 Aug 2003 07:40:40 -0300
+
+cyrus21-imapd (2.1.14-1) unstable; urgency=low
+
+ Initial instance of NEWS.Debian support. This file will be used to note all
+ changes the local admin must do to a Cyrus system when upgrading.
+
+ Upgrading checklist for recent 2.1.x packages:
+
+ 1. timsieved was corrected to behave properly in the altnamespace
+ configuration. However, this means that it was previously looking for
+ sieve scripts in "user.name" format instead of the (correct) "user^name"
+ format. A sample script to do this (which should be run in the top level
+ of the sieve directories) is in /usr/lib/cyrus/upgrade/convert-sieve.pl.
+ Note that this is only needed if you are running with altnamespace turned
+ on.
+
+ 2. We are now more forgiving of MIME boundry headers generated by earlier
+ versions of eudora by default (you can switch to the more strict checks
+ that used to be the default using the rfc2046_strict imapd.conf(5)
+ option.
+
+ However, if you have messages already in the mailstore that you want to
+ fix you will need to reconstruct the affected mailboxes to regenerate
+ the cached bodystructure data to take this into account. Nothing needs
+ to be done for new messages to be treated in this way.
+
+
+ Upgrading checklist for old Cyrus 1.5 or 1.6:
+
+ Read /usr/share/doc/cyrus21-common/UPGRADE.Debian.gz
+
+ -- Henrique de Moraes Holschuh <hmh at debian.org> Fri, 4 Jul 2003 10:10:53 -0300
Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.cron.daily
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.cron.daily 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.cron.daily 2006-01-05 14:27:15 UTC (rev 110)
@@ -1,8 +1,8 @@
#!/bin/sh
# Cyrus IMAPd daily maintenance script
# Copyright (c) 2002,2003 by Henrique M. Holschuh
+# $Id: cyrus22-common.cron.daily 5 2005-03-12 23:19:45Z sven $
# Distributed under the terms of the GNU General Public License version 2
-# $Id: cyrus21-common.cron.daily,v 1.4 2004/08/10 15:09:38 hmh Exp $
#
# This script:
# 1. Backups the mailbox database to the portable text format,
@@ -25,7 +25,7 @@
bakfile=${bak}/cyrus-mboxlist.txt.gz
CONF=/etc/imapd.conf
CHKCYRUS=0
-[ -r /etc/default/kolab-cyrus ] && . /etc/default/kolab-cyrus
+[ -r /etc/default/cyrus22 ] && . /etc/default/cyrus22
umask 022
# 1. backup mailbox database
Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.docs
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.docs 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.docs 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,2 @@
+debian/UPGRADE.Debian
+debian/README.*
Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.files
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.files 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.files 2006-01-05 14:27:15 UTC (rev 110)
@@ -18,3 +18,4 @@
usr/lib/cyrus/bin/notifyd
usr/lib/cyrus/bin/fud
usr/lib/cyrus/get-backtrace.gdb
+usr/share/snmp
Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.kolab-cyrus.default
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.kolab-cyrus.default 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.kolab-cyrus.default 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,30 @@
+# Defaults for Cyrus IMAPd 2.2 scripts
+# $Id: cyrus22-common.cyrus22.default 5 2005-03-12 23:19:45Z sven $
+# sourced by /etc/init.d/cyrus22, /usr/sbin/cyrus-makedirs
+# installed at /etc/default/cyrus22 by the maintainer scripts
+#
+
+#
+# This is a POSIX shell fragment
+#
+
+# Set this to 1 or higher to enable debugging on cyrmaster
+#CYRUS_VERBOSE=1
+
+# Socket listen queue backlog size
+# See listen(2). Default is 32, you may want to increase
+# this number if you have a very high connection rate
+#LISTENQUEUE=32
+
+# Wether cyrus-makedirs should optimize filesystems
+# or not. Switch it off if you are going to do your
+# own optimizations. Set to 1 to enable, 0 to disable
+#CYRUSOPTFILESYS=1
+
+# The default Cyrus IMAP config file that the scripts should
+# use. You better know what you're doing if you change this
+#CONF=/etc/imapd.conf
+
+# Check spool condition with chk_cyrus on daily cronjob
+# Set to 1 to enable, default is disabled
+#CHKCYRUS=0
Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.kolab-cyrus.init
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.kolab-cyrus.init 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.kolab-cyrus.init 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,230 @@
+#! /bin/sh
+#
+### BEGIN INIT INFO
+# Provides: cyrus22-common
+# Required-Start: $syslog $network
+# Required-Stop: $syslog $network
+# Default-Start: 2 3 4 5
+# Default-Stop: S 0 1 6
+# Short-Description: common init system for cyrus22 IMAP/POP3 daemons.
+# Description: common init system for cyrus22 IMAP/POP3 daemons.
+# start central cyrus22 master process, which can
+# then start various services depending on configuration.
+# Typically starts IMAP and POP3 daemons, but might also
+# start an NNTP daemon and various helper daemons for
+# distributed mail/news storage systems (high-performance
+# and/or high-reliability setups).
+### END INIT INFO
+#
+# Copyright 2001-2005 by Henrique de Moraes Holschuh <hmh at debian.org>
+# Various modifications done by Sven Mueller <debian at incase.de>
+# Distributed under the GPL version 2
+#
+# $Id: cyrus22-common.cyrus22.init 181 2005-11-13 19:15:03Z sven $
+
+# Make sure we get sane results on borked locales
+LC_ALL=C
+export LC_ALL
+
+# Overridable defaults
+unset CYRUS_VERBOSE
+unset LISTENQUEUE
+[ -r /etc/default/kolab-cyrus ] && . /etc/default/kolab-cyrus
+
+[ "x${CYRUS_VERBOSE}" != "x" ] && export CYRUS_VERBOSE
+OPTIONS="-d"
+[ "x${LISTENQUEUE}" != "x" ] && OPTIONS="-l ${LISTENQUEUE} ${OPTIONS}"
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DAEMON=/usr/sbin/cyrmaster
+NAME=cyrmaster
+DESC="Cyrus IMAPd"
+
+test -x ${DAEMON} || exit 0
+
+set -e
+
+START="--start --quiet --pidfile /var/run/${NAME}.pid --exec ${DAEMON} -- ${OPTIONS}"
+
+verifydb() {
+ while read -r DBKEY DBVALUE ; do
+ match=`sort -u < $1 | gawk "/^${DBKEY}[[:blank:]]/ { print \\$2 }"`
+ [ "x${match}" != "x${DBVALUE}" ] && return 0
+ done
+ return 1
+}
+
+createdir() {
+# $1 = user
+# $2 = group
+# $3 = permissions (octal)
+# $4 = path to directory
+ [ -d "$4" ] || mkdir -p "$4"
+ chown -c -h "$1:$2" "$4"
+ chmod -c "$3" "$4"
+}
+
+missingstatoverride () {
+ echo "$0: You are missing a dpkg-statoverride on $1. Add it." >&2
+ exit 1
+}
+
+fixdirs () {
+ dir=`dpkg-statoverride --list /var/run/cyrus` \
+ || missingstatoverride /var/run/cyrus
+ [ -z "$dir" ] \
+ || createdir $dir
+ dir=`dpkg-statoverride --list /var/run/cyrus/socket` \
+ || missingstatoverride /var/run/cyrus/socket
+ [ -z "$dir" ] \
+ || createdir $dir
+}
+
+check_status () {
+ if [ ! -f /var/run/${NAME}.pid ]; then
+ # using [c] in the grep avoids catching the grep
+ # process itself
+ if ps auxww | grep -qE 'usr/sbin/[c]yrmaster' ; then
+ # Damn, PID file doesn't exist, but cyrmaster process
+ # exists. Though strictly speaking, we should not
+ # do this, reconstruct the PID file here.
+ pidof /usr/sbin/cyrmaster > /dev/null 2>&1 \
+ && pidof /usr/sbin/cyrmaster > /var/run/${NAME}.pid
+ return 0
+ fi
+ fi
+ if [ -s /var/run/${NAME}.pid ] && kill -0 `cat /var/run/${NAME}.pid`; then
+ return 0
+ else
+ # the PID file might simply not match the cyrmaster process.
+ if pidof /usr/sbin/cyrmaster > /dev/null 2>&1 ; then
+ # go ahead and fix it
+ pidof /usr/sbin/cyrmaster > /var/run/${NAME}.pid
+ return 0
+ else
+ # no process and/or no PID file, return failure
+ return 1
+ fi
+ fi
+ # this point should never be reached, return unknown status if it
+ # is anyway
+ return 4
+}
+
+case "$1" in
+ start)
+ # Verify if there are old Cyrus 1.5 spools that were not upgraded
+ [ -f /var/lib/cyrus/mailboxes -a -d /var/lib/cyrus/deliverdb -a \
+ -d /var/spool/cyrus/mail/user -a ! -d /var/spool/cyrus/mail/stage. ] && {
+ echo "$0: It appears that you still have an version 1.5 spool" 1>&2
+ echo "$0: that needs to be upgraded. Please refer to the guide" 1>&2
+ echo "$0: at /usr/share/doc/cyrus22-common/UPGRADE.Debian" 1>&2
+ echo
+ echo "$0: Cyrmaster not started."
+ exit 6
+ }
+ # Verify consistency of database backends
+ [ -f /usr/lib/cyrus/cyrus-db-types.active ] && {
+ # is it safe to start cyrmaster? compare "key value" pairs
+ # from the (old) active database types file with the new one
+ ( sort -u /usr/lib/cyrus/cyrus-db-types.active \
+ | grep DBENGINE \
+ | verifydb /usr/lib/cyrus/cyrus-db-types.txt \
+ ) && {
+ echo "$0: Database backends mismatch! You must manually" 1>&2
+ echo "$0: verify and update the Cyrus databases to the" 1>&2
+ echo "$0: new backends." 1>&2
+ echo "$0: Please refer to /usr/share/doc/cyrus22-common/README.Debian" 1>&2
+ echo "$0: for instructions." 1>&2
+ echo
+ echo "$0: Cyrmaster not started."
+ exit 6
+ }
+ }
+ echo -n "Starting ${DESC}: "
+ fixdirs
+ if check_status ; then
+ echo "${DAEMON} already running."
+ exit 0
+ fi
+ if start-stop-daemon ${START} >/dev/null 2>&1 ; then
+ echo "$NAME."
+ else
+ if !check_status ; then
+ echo "(failed)."
+ exit 1
+ fi
+ fi
+ ;;
+ stop)
+ echo -n "Stopping $DESC: "
+ if start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
+ --quiet --startas $DAEMON >/dev/null 2>&1 ; then
+ echo "$NAME."
+ rm -f /var/run/${NAME}.pid
+ exit 0
+ else
+ # process running?
+ if check_status; then
+ # Yes, report failure.
+ echo "(failed)."
+ exit 1
+ else
+ # No, return as if stopped a running process
+ # successfully.
+ echo "."
+ rm -f /var/run/${NAME}.pid
+ exit 0
+ fi
+ fi
+ ;;
+ reload|force-reload)
+ echo "Reloading $DESC configuration files."
+ if start-stop-daemon --stop --signal 1 --quiet \
+ --pidfile /var/run/$NAME.pid --exec $DAEMON >/dev/null 2>&1 ; then
+ exit 0
+ else
+ exit 1
+ fi
+ ;;
+ restart)
+ $0 stop && {
+ echo -n "Waiting for complete shutdown..."
+ i=5
+ while [ $i -gt 0 ] ; do
+ # exit look when server is not running
+ check_status || break
+ sleep 2s
+ i=$(($i - 1))
+ echo -n "."
+ done
+ [ $i -eq 0 ] && {
+ echo
+ echo "fatal: incomplete shutdown detected, aborting."
+ exit 1
+ }
+ echo
+ }
+ exec $0 start
+ ;;
+ status)
+ check_status
+ exit $?
+ ;;
+ try-restart)
+ check_status
+ if [ "$?" -eq 0 ]; then
+ exec $0 restart
+ else
+ # LSB says to return 0 in try-restart if the service is
+ # not running.
+ exit 0
+ fi
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart|reload|force-reload}" 1>&2
+ exit 1
+ ;;
+esac
+
+exit 0
Property changes on: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.kolab-cyrus.init
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.lintian
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.lintian 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.lintian 2006-01-05 14:27:15 UTC (rev 110)
@@ -1,2 +1,2 @@
-kolab-cyrus-common: no-debconf-config
-kolab-cyrus-common: postinst-uses-db-input
+cyrus22-common: no-debconf-config
+cyrus22-common: postinst-uses-db-input
Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.manpages
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.manpages 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.manpages 2006-01-05 14:27:15 UTC (rev 110)
@@ -1,7 +1,7 @@
debian/tmp/usr/share/man/man5/cyrus.conf.5
debian/tmp/usr/share/man/man5/imapd.conf.5
-debian/cyrdump.8
-debian/cyrus-makedirs.8
+debian/tmp/usr/share/man/man8/cyrus-makedirs.8
+debian/tmp/usr/share/man/man8/cyrdump.8
debian/tmp/usr/share/man/man8/mbpath.8
debian/tmp/usr/share/man/man8/arbitron.8
debian/tmp/usr/share/man/man8/arbitronsort.8
@@ -18,3 +18,6 @@
debian/tmp/usr/share/man/man8/cyrmaster.8
debian/tmp/usr/share/man/man8/cyrreconstruct.8
debian/tmp/usr/share/man/man8/cyrquota.8
+debian/tmp/usr/share/man/man8/mbexamine.8
+debian/tmp/usr/share/man/man8/smmapd.8
+debian/tmp/usr/share/man/man8/cyr_expire.8
Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.postinst
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.postinst 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.postinst 2006-01-05 14:27:15 UTC (rev 110)
@@ -1,8 +1,8 @@
#! /bin/sh
-# postinst script for cyrus21-common
+# postinst script for cyrus22-common
# Copyright (c) 2002 by Henrique de Moraes Holschuh
# Distributed under the GNU General Public License version 2
-# $Id: cyrus21-common.postinst,v 1.18 2004/08/10 15:20:08 hmh Exp $
+# $Id: cyrus22-common.postinst 5 2005-03-12 23:19:45Z sven $
#
# see: dh_installdeb(1)
@@ -57,7 +57,7 @@
--gecos "Cyrus Mailsystem User" cyrus >/dev/null 2>&1 || {
if getent passwd | grep -s -q -E '^cyrus:'; then
echo "Non-system user cyrus found. I will not overwrite a non-system" >&2
- echo "user. Remove the user and reinstall cyrus21-common." >&2
+ echo "user. Remove the user and reinstall cyrus22-common." >&2
exit 1
fi
# unknown adduser error, simply exit
@@ -100,16 +100,16 @@
# from the (old) active database types file with the new one
if verifydb /usr/lib/cyrus/cyrus-db-types.txt \
< /usr/lib/cyrus/cyrus-db-types.active ; then
- db_input high kolab-cyrus-common/warnbackendchange || true
+ db_input high cyrus22-common/warnbackendchange || true
db_go || true
else
cp -p /usr/lib/cyrus/cyrus-db-types.txt /usr/lib/cyrus/cyrus-db-types.active
- db_fset kolab-cyrus-common/warnbackendchange seen false || true
+ db_fset cyrus22-common/warnbackendchange seen false || true
fi
else
[ -f /usr/lib/cyrus/cyrus-db-types.txt ] && \
cp -p /usr/lib/cyrus/cyrus-db-types.txt /usr/lib/cyrus/cyrus-db-types.active
- db_fset kolab-cyrus-common/warnbackendchange seen false || true
+ db_fset cyrus22-common/warnbackendchange seen false || true
fi
# Deal with hardwired config changes
Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.postrm
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.postrm 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.postrm 2006-01-05 14:27:15 UTC (rev 110)
@@ -1,8 +1,8 @@
#! /bin/sh
-# postrm script for cyrus21-common
+# postrm script for cyrus22-common
# Copyright (c) 2002 by Henrique de Moraes Holschuh
# Distributed under the GNU General Public License version 2
-# $Id: cyrus21-common.postrm,v 1.12 2004/11/23 12:41:47 hmh Exp $
+# $Id: cyrus22-common.postrm 5 2005-03-12 23:19:45Z sven $
#
# see: dh_installdeb(1)
@@ -34,12 +34,12 @@
rm -rf /var/run/cyrus || true
# Should we remove our precious data?
- db_title "Cyrus IMAPd 2.1" || true
- db_fset cyrus21-common/removespools seen false || true
- db_input high cyrus21-common/removespools || true
+ db_title "Cyrus IMAPd 2.2" || true
+ db_fset cyrus22-common/removespools seen false || true
+ db_input high cyrus22-common/removespools || true
db_go || true
- db_get cyrus21-common/removespools
+ db_get cyrus22-common/removespools
[ "${RET}" = "true" ] && {
for i in /var/spool/cyrus /var/lib/cyrus \
/var/spool/sieve /etc/sieve ; do
@@ -50,7 +50,7 @@
rm -f /usr/lib/cyrus/cyrus-*.active
}
- update-rc.d cyrus21 remove >/dev/null
+ update-rc.d kolab-cyrus remove >/dev/null
;;
upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.prerm
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.prerm 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.prerm 2006-01-05 14:27:15 UTC (rev 110)
@@ -1,8 +1,8 @@
#! /bin/sh
-# prerm script for cyrus21-common
+# prerm script for cyrus22-common
# Copyright (c) 2002 by Henrique de Moraes Holschuh
# Distributed under the GNU General Public License version 2
-# $Id: cyrus21-common.prerm,v 1.3 2002/05/26 20:55:50 hmh Exp $
+# $Id: cyrus22-common.prerm 5 2005-03-12 23:19:45Z sven $
#
# see: dh_installdeb(1)
@@ -23,7 +23,7 @@
case "$1" in
remove|upgrade|deconfigure)
# Call initscript, if it is there to stop the daemon
- invoke-rc.d cyrus21 stop || true
+ invoke-rc.d cyrus22 stop || true
;;
failed-upgrade)
;;
Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.templates
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.templates 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.templates 2006-01-05 14:27:15 UTC (rev 110)
@@ -1,7 +1,7 @@
-Template: kolab-cyrus-common/warnbackendchange
+Template: cyrus22-common/warnbackendchange
Type: note
_Description: Database backends have changed!
- Comparison between /usr/lib/cyrus/cyrus-db-types.txt and
+ Comparation between /usr/lib/cyrus/cyrus-db-types.txt and
/usr/lib/cyrus/cyrus-db-types.active shows that database backends for
Cyrus IMAPd have been changed.
.
@@ -9,11 +9,11 @@
might need to be converted manually to the new format, using the
cvt_cyrusdb(8) utility.
.
- Please refer to /usr/share/doc/cyrus21-common/README.Debian.database
+ Please refer to /usr/share/doc/cyrus22-common/README.Debian.database
for more information. Do not start cyrmaster until you have converted
the databases to the new format.
-Template: kolab-cyrus-common/removespools
+Template: cyrus22-common/removespools
Type: boolean
Default: false
_Description: Remove the Cyrus spools, and user sieve scripts?
Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-dev.links
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-dev.links 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-dev.links 2006-01-05 14:27:15 UTC (rev 110)
@@ -1 +1 @@
-usr/share/doc/kolab-cyrus-common usr/share/doc/kolab-cyrus-dev
+usr/share/doc/cyrus22-common usr/share/doc/cyrus22-dev
Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.doc-base
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.doc-base 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.doc-base 2006-01-05 14:27:15 UTC (rev 110)
@@ -1,10 +1,10 @@
-Document: cyrus21-manual
-Title: CMU Cyrus 2.1 Manual
+Document: cyrus22-manual
+Title: CMU Cyrus 2.2 Manual
Author: Carnegie Mellon University
Abstract: This manual describes how to configure and administer
- the Cyrus POP/IMAP mail system, version 2.1
+ the Cyrus POP/IMAP mail system, version 2.2
Section: mail
Format: HTML
-Index: /usr/share/doc/kolab-cyrus-doc/html/index.html
-Files: /usr/share/doc/kolab-cyrus-doc/html/*.html
+Index: /usr/share/doc/cyrus22-doc/html/index.html
+Files: /usr/share/doc/cyrus22-doc/html/*.html
Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.docs
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.docs 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.docs 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,2 @@
+debian/UPGRADE.Debian
+debian/README.*
Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.links
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.links 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.links 2006-01-05 14:27:15 UTC (rev 110)
@@ -1 +1 @@
-usr/share/doc/kolab-cyrus-doc usr/share/doc/kolab-cyrus-common/docs
+usr/share/doc/cyrus22-doc usr/share/doc/cyrus22-common/docs
Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-imapd.links
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-imapd.links 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-imapd.links 2006-01-05 14:27:15 UTC (rev 110)
@@ -1 +1 @@
-usr/share/doc/kolab-cyrus-common usr/share/doc/kolab-cyrus-imapd
+usr/share/doc/cyrus22-common usr/share/doc/cyrus22-imapd
Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-murder.links
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-murder.links 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-murder.links 2006-01-05 14:27:15 UTC (rev 110)
@@ -1 +1 @@
-usr/share/doc/kolab-cyrus-common usr/share/doc/kolab-cyrus-murder
+usr/share/doc/cyrus22-common usr/share/doc/cyrus22-murder
Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-nntpd.dirs
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-nntpd.dirs 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-nntpd.dirs 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,2 @@
+usr/sbin
+usr/lib/cyrus
Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-nntpd.files
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-nntpd.files 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-nntpd.files 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,3 @@
+etc/pam.d/nntp
+usr/lib/cyrus/bin/fetchnews
+usr/lib/cyrus/bin/nntpd
Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-nntpd.links
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-nntpd.links 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-nntpd.links 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1 @@
+usr/share/doc/cyrus22-common usr/share/doc/cyrus22-nntpd
Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-nntpd.manpages
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-nntpd.manpages 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-nntpd.manpages 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,2 @@
+man/fetchnews.8
+man/nntpd.8
Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.links
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.links 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.links 2006-01-05 14:27:15 UTC (rev 110)
@@ -1 +1 @@
-usr/share/doc/kolab-cyrus-common usr/share/doc/kolab-cyrus-pop3d
+usr/share/doc/cyrus22-common usr/share/doc/cyrus22-pop3d
Added: trunk/kolab-cyrus-imapd/debian/kolab-libcyrus-imap-perl.files
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-libcyrus-imap-perl.files 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-libcyrus-imap-perl.files 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,2 @@
+usr/lib/perl*
+usr/share/perl*
Added: trunk/kolab-cyrus-imapd/debian/kolab-libcyrus-imap-perl.lintian
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-libcyrus-imap-perl.lintian 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-libcyrus-imap-perl.lintian 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1 @@
+libcyrus-imap-perl21: package-installs-nonbinary-perl-in-usr-lib-perl5
Added: trunk/kolab-cyrus-imapd/debian/kolab-libcyrus-imap-perl.manpages
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-libcyrus-imap-perl.manpages 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/kolab-libcyrus-imap-perl.manpages 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,5 @@
+perl/imap/blib/man3/Cyrus::IMAP.3pm
+perl/imap/blib/man3/Cyrus::IMAP::Admin.3pm
+perl/imap/blib/man3/Cyrus::IMAP::IMSP.3pm
+perl/imap/blib/man3/Cyrus::IMAP::Shell.3pm
+perl/sieve/managesieve/blib/man3/Cyrus::SIEVE::managesieve.3pm
Added: trunk/kolab-cyrus-imapd/debian/license.html
===================================================================
--- trunk/kolab-cyrus-imapd/debian/license.html 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/license.html 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,161 @@
+
+
+<! $Id: license.html 5 2005-03-12 23:19:45Z sven $ >
+<HTML>
+<TITLE>
+Cyrus IMAP Licensing
+</TITLE>
+
+</HEAD>
+<BODY BGCOLOR="#ffffff">
+<P><MAP NAME="masthead">
+ <AREA SHAPE="rect" COORDS="0,0,125,22" HREF="http://www.cmu.edu/computing/">
+ <AREA SHAPE="rect" COORDS="429,2,539,27" HREF="http://www.cmu.edu/">
+</MAP><IMG SRC="/images/masthead.jpg" ALT="Masthead"
+ALIGN="BOTTOM" NATURALSIZEFLAG="3" ISMAP BORDER="0" USEMAP="#masthead"><BR>
+<TABLE WIDTH="575" BORDER="0" CELLSPACING="0" CELLPADDING="0">
+<TR>
+<TD WIDTH="50%" VALIGN="TOP"><B><BIG><FONT FACE="geneva,
+ arial,helvetica, times" SIZE=+3>
+Cyrus IMAP Licensing
+</FONT></BIG></B><BR>
+<IMG SRC="/images/w.jpg" WIDTH="270" HEIGHT="1" ALIGN="BOTTOM" NATURALSIZEFLAG=
+"0"></TD>
+<TD WIDTH="50%" VALIGN="TOP" ALIGN="RIGHT">
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-2>
+<A HREF="/">
+ASG Home</a></FONT>
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-2>
+<A HREF="/whatsnew.html">
+What's New</a></FONT>
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-2>
+<A HREF="/jobs.html">
+Jobs</a></FONT>
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-2>
+<A HREF="/search.html">
+Search</a></FONT>
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-2>
+<A HREF="mailto:andrew2-webmaster+ at andrew.cmu.edu">
+Contact Us</a></FONT> <BR>
+
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-1>
+<A HREF="/cyrus/download">
+<b>Download Software</b></a></FONT>
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-1>
+<A HREF="/cyrus/mailing-list.html">
+<b>Mailing lists</b></a></FONT>
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-1>
+<A HREF="/cyrus">
+Project Cyrus Home</a></FONT>
+<br>
+
+
+
+<br>
+<IMG SRC="/images/w.jpg" WIDTH="250" HEIGHT="1" ALIGN="BOTTOM"
+NATURALSIZEFLAG= "0"></TD></TR>
+ </TABLE>
+<p>
+
+
+Please direct technical questions or issues to <tt><a
+href="mailto:cyrus-bugs+ at andrew.cmu.edu">cyrus-bugs at andrew.cmu.edu</a></tt>.
+<br>
+Please direct any licensing issues to <tt><a
+ href="mailto:tech-transfer+ at andrew.cmu.edu">tech-transfer at andrew.cmu.edu</a></tt>.
+<hr>
+
+<b>ALL</b> versions of the Cyrus IMAP server are now covered by the
+following copyright message. However, please note that in
+ distributions before 2.0, there may still be files that have the old
+ copyright text.
+
+<blockquote>
+<xmp>
+ * Copyright (c) 1994-2000 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Office of Technology Transfer
+ * Carnegie Mellon University
+ * 5000 Forbes Avenue
+ * Pittsburgh, PA 15213-3890
+ * (412) 268-4387, fax: (412) 268-7395
+ * tech-transfer at andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+</xmp>
+</blockquote>
+
+<p>
+If you find this software useful and valuable in your work, we welcome
+any support you can offer toward continuing this work.
+
+<p>We gratefully accept contributions, whether intellectual or
+monetary. Intellectual contributions in the form of code or
+constructive collaboration can be directed to <a
+href="mailto:cyrus-bugs+ at andrew.cmu.edu"><tt>cyrus-bugs+ at andrew.cmu.edu</tt></a>
+(even if it is not a bug).
+
+<p>If you wish to provide financial support to the Cyrus Project, send a
+check payable to <b>Carnegie Mellon University</b> to
+
+<blockquote>
+<xmp>
+ Project Cyrus
+ Computing Services
+ Carnegie Mellon University
+ 5000 Forbes Ave
+ Pittsburgh, PA 15213
+ USA
+</xmp>
+</blockquote>
+<hr>
+<p>
+Please direct technical questions or issues to <tt><a
+href="mailto:cyrus-bugs+ at andrew.cmu.edu">cyrus-bugs at andrew.cmu.edu</a></tt>.
+<br>
+Please direct any licensing issues to <tt><a
+ href="mailto:tech-transfer+ at andrew.cmu.edu">tech-transfer at andrew.cmu.edu</a></tt>.
+
+<p>
+ <hr>
+ <address><! (c) 1999 Carnegie Mellon University. All Rights Reserved.</address>
+<font size="-2">
+Last Updated: Thursday, 12-Oct-2000 16:38:41 EDT
+</font>
+ </body>
+</html>
+
Added: trunk/kolab-cyrus-imapd/debian/lmtp.pam
===================================================================
--- trunk/kolab-cyrus-imapd/debian/lmtp.pam 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/lmtp.pam 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,14 @@
+# PAM configuration file for Cyrus LMTP service
+# $Id: lmtp.pam 5 2005-03-12 23:19:45Z sven $
+#
+# If you want to use Cyrus in a setup where users don't have
+# accounts on the local machine, you'll need to make sure
+# you use something like pam_permit for account checking.
+#
+# Remember that SASL (and therefore Cyrus) accesses PAM
+# modules through saslauthd, and that SASL can only deal with
+# plaintext passwords if PAM is used.
+#
+
+ at include common-auth
+ at include common-account
Added: trunk/kolab-cyrus-imapd/debian/logcheck.ignore
===================================================================
--- trunk/kolab-cyrus-imapd/debian/logcheck.ignore 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/logcheck.ignore 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,53 @@
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +skiplist: recovered
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +skiplist: checkpointed
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +duplicate_prune: pruning
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +duplicate_prune: purged
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +executed
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +accepted connection
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +telling master
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mydelete:
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +(bad)?login:
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +starttls: [[:alnum:]]+ with cipher
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +(\[[a-z0-9]+\] )?STARTTLS( negotiation)? failed:
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +DIGEST-MD5 server step
+cyrus/ctl_cyrusdb\[[0-9]+\]: +(done +)?recovering cyrus databases
+cyrus/ctl_cyrusdb\[[0-9]+\]: +archiving
+cyrus/ctl_cyrusdb\[[0-9]+\]: +checkpointing
+cyrus/ctl_cyrusdb\[[0-9]+\]: +done checkpointing
+cyrus/ctl_deliver\[[0-9]+\]: +duplicate_prune: pruning back
+cyrus/ctl_deliver\[[0-9]+\]: +duplicate_prune: purged
+cyrus/tls_prune\[[0-9]+\]: +(tls_prune: )?purged
+cyrus/master\[[0-9]+\]: +ready for work
+cyrus/master\[[0-9]+\]: +about to exec
+cyrus/master\[[0-9]+\]: +process started
+cyrus/master\[[0-9]+\]: +process [0-9]+ exited, status 0$
+cyrus/master\[[0-9]+\]: +service [a-zA-Z0-9]+ now has [0-9]+ workers
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +pop3s failed:
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +lmtp connection preauth'd as postman
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +dupelim: eliminated duplicate message to
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +duplicate_check:
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +duplicate_mark:
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mystore: committing txn
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mystore: starting txn
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +sieve parse error
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +sieve: discarded
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +abort_txn: aborting txn
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +delete: starting txn
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +open: user .* opened
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mycommit: committing txn
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +myfetch: reusing txn
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +myfetch: starting txn
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mystore: reusing txn
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +seen_db: user .* opened
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +Connection reset by peer, closing connection
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +SQUAT failed
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +SQUAT returned [0-9]+ messages
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +idle for too long, closing connection
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +annotatemore_store
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +created stage directory
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +imaps TLS negotiation failed
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +synchronizing mailbox
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mailbox list synchronization
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +unready for connections
+cyrus/squatter\[[0-9]+\]: +(done )?(indexing|skipping) mailbox
+cyrus/notifyd\[[0-9]+\]: do_notify using method
Added: trunk/kolab-cyrus-imapd/debian/mupdate.pam
===================================================================
--- trunk/kolab-cyrus-imapd/debian/mupdate.pam 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/mupdate.pam 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,14 @@
+# PAM configuration file for Cyrus Murder mupdate service
+# $Id: mupdate.pam 5 2005-03-12 23:19:45Z sven $
+#
+# If you want to use Cyrus in a setup where users don't have
+# accounts on the local machine, you'll need to make sure
+# you use something like pam_permit for account checking.
+#
+# Remember that SASL (and therefore Cyrus) accesses PAM
+# modules through saslauthd, and that SASL can only deal with
+# plaintext passwords if PAM is used.
+#
+
+ at include common-auth
+ at include common-account
Added: trunk/kolab-cyrus-imapd/debian/nntp.pam
===================================================================
--- trunk/kolab-cyrus-imapd/debian/nntp.pam 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/nntp.pam 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,13 @@
+# PAM configuration file for Cyrus NNTP service
+#
+# If you want to use Cyrus in a setup where users don't have
+# accounts on the local machine, you'll need to make sure
+# you use something like pam_permit for account checking.
+#
+# Remember that SASL (and therefore Cyrus) accesses PAM
+# modules through saslauthd, and that SASL can only deal with
+# plaintext passwords if PAM is used.
+#
+
+ at include common-auth
+ at include common-account
Modified: trunk/kolab-cyrus-imapd/debian/patches/00list
===================================================================
--- trunk/kolab-cyrus-imapd/debian/patches/00list 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/patches/00list 2006-01-05 14:27:15 UTC (rev 110)
@@ -1 +1,40 @@
-10-lib-Makefile.in
+01-fix_Makefile.in.dpatch
+02-add_mkinstalldirs.dpatch
+03-fix_docs.dpatch
+04-add_autogen.sh.dpatch
+05-fix_programnames.dpatch
+06-disable_runpath.dpatch
+07-update_aclocal_and_configure.in.dpatch
+08-clean_socket_closes.dpatch
+09-kerberos-ipv4-ipv6-kludge-removal.dpatch
+10-fix_potential_overflows.dpatch
+11-fix_syslog_prefix.dpatch
+12-fix_timeout_handling.dpatch
+13-master_process_handling.dpatch
+14-xmalloc.dpatch
+15-munge_8bit.dpatch
+16-fix_mib.dpatch
+17-fix_tail_syntax_in_xversion.h.dpatch
+18-fix_strlen_return_type.dpatch
+19-fix_tls_ssl.dpatch
+20-drac_auth.dpatch
+21-fix_config-parsing.dpatch
+22-imapd_index_check.dpatch
+25-update_install-sh.dpatch
+30-update_perlcalling.sh.dpatch
+35-masssievec_remove_unused_variable.dpatch
+40-rehash_fix_pathes.dpatch
+45-kolab2-annotations.dpatch
+50-FTBFS-gcc-4.0-fix.dpatch
+51-multiple_mupdate_err.h-fix.dpatch
+61-64bit-quota.dpatch
+65-sieveshell-enhancements.dpatch
+98-use_Debian_config.guess_config.sub.dpatch
+99-update-autoconf.dpatch
+100-kolab-imapd.dpatch
+101-fix_Makefile.in.dpatch
+105-cyradm.sh.dpatch
+110-Admin.pm.dpatch
+120-kolab-Shell.pm.dpatch
+130-kolab-imapd.c.dpatch
+140-kolab-mbox.dpatch
Added: trunk/kolab-cyrus-imapd/debian/po/POTFILES.in
===================================================================
--- trunk/kolab-cyrus-imapd/debian/po/POTFILES.in 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/po/POTFILES.in 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] cyrus22-common.templates
Added: trunk/kolab-cyrus-imapd/debian/po/de.po
===================================================================
--- trunk/kolab-cyrus-imapd/debian/po/de.po 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/po/de.po 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,95 @@
+# translation of cyrus22-imapd_2.1.16-6_de.po to German
+# translation of cyrus22-imapd_2.1.16-6_templates.po to German
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans#
+# Developers do not need to manually edit POT or PO files.
+# Erik Schanze <mail at erikschanze.de>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus22-imapd_2.2.12-1_de\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-05-20 00:16+0200\n"
+"PO-Revision-Date: 2004-05-29 22:44+0200\n"
+"Last-Translator: Erik Schanze <mail at erikschanze.de>\n"
+"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.0.2\n"
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid "Database backends have changed!"
+msgstr "Datenbankanbindung hat sich geändert!"
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Comparation between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"Wenn Sie die Dateien /usr/lib/cyrus/cyrus-db-types.txt und /usr/lib/cyrus/"
+"cyrus-db-types.active vergleichen, sehen Sie, dass die Datenbankanbindung "
+"des Cyrus IMAPd geändert wurde."
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Die Datenbanken, für die sich die Anbindung geändert hat, müssenmit dem "
+"Hilfsprogramm cvt_cyrusdb(8) manuell in das neue Format überführt werden."
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Please refer to /usr/share/doc/cyrus22-common/README.Debian.database for "
+"more information. Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Mehr Informationen finden Sie in der Datei /usr/share/doc/cyrus22-common/"
+"README.Debian.database. Starten Sie keinesfalls cyrmaster, bevor Sie die "
+"Datenbank in das neue Format überführt haben."
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+msgid "Remove the Cyrus spools, and user sieve scripts?"
+msgstr "Cyrus-Spool und Filterskripte der Benutzer löschen?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+msgid ""
+"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
+"scripts, when the package is purged ?"
+msgstr ""
+"Sollen die Cyrus Email- bzw. News-Spools und die Filterskripte der Benutzer "
+"gelöscht werden, wenn das Paket restlos entfernt wird (purge)?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var. If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Diese Frage betrifft nur die Standard-Spools und -Filterskriptverzeichnisse "
+"in /var. Wenn Sie deren Ort in der Datei imapd.conf geändert haben, werden "
+"sie an der neuen Stelle nicht gelöscht, nur die alten im Verzeichnis /var."
Added: trunk/kolab-cyrus-imapd/debian/po/fr.po
===================================================================
--- trunk/kolab-cyrus-imapd/debian/po/fr.po 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/po/fr.po 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,82 @@
+# PO-DEBCONF TEMPLATE FOR cyrus22-imapd.
+# Copyright (C) 2002 Henrique de Moraes Holschuh <hmh at debian.org>
+# This file is distributed under the same license as the cyrus22-imapd package.
+# $Id: fr.po 142 2005-05-19 22:22:28Z sven $
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus22-imapd 2.2.12-1\n"
+"POT-Creation-Date: 2003-03-03 10:24-0300\n"
+"PO-Revision-Date: 2002-10-22 10:33+0200\n"
+"Last-Translator: Philippe Batailler <pbatailler at teaser.fr>\n"
+"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../cyrus22-common.templates:3
+msgid "Database backends have changed!"
+msgstr "L'interfaçage avec les bases de données a changé !"
+
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Comparation between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"Une comparaison entre /usr/lib/cyrus/cyrus-db-types.txt et /usr/lib/cyrus/"
+"cyrus-db-types.active montre que l'interfaçage de Cyrus IMAPd avec les bases "
+"de données a changé."
+
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Cela signifie que les bases de données pour lesquelles l'interfaçage a "
+"changé peuvent nécessiter une conversion manuelle au nouveau format. On peut "
+"se servir de l'utilitaire cvt_cyrusdb (8)."
+
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Please refer to /usr/share/doc/cyrus22-common/README.Debian.database for "
+"more information. Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Veuillez-vous reporter à /usr/share/doc/cyrus22-common/README.Debian.database pour "
+"des informations supplémentaires. Ne lancez pas cyrmaster avant d'avoir mis "
+"les bases de données au nouveau format."
+
+#. Description
+#: ../cyrus22-common.templates:19
+msgid "Remove the Cyrus spools, and user sieve scripts?"
+msgstr ""
+"Faut-il supprimer les répertoires de spool propres à Cyrus, ainsi que les "
+"filtres des utilisateurs ?"
+
+#. Description
+#: ../cyrus22-common.templates:19
+msgid ""
+"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
+"scripts, when the package is purged ?"
+msgstr ""
+"Dois-je supprimer les répertoires de spool pour le courrier et les "
+"nouvelles, ainsi que les filtres des utilisateurs, quand le système est "
+"purgé du paquet ?"
+
+#. Description
+#: ../cyrus22-common.templates:19
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var. If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Cette question concerne uniquement les répertoires par défaut situés dans /"
+"var et contenant le spool et les filtres. Si vous aviez modifié leurs "
+"emplacements grâce au fichier imapd.conf, ces emplacements ne seront pas "
+"supprimés ; seuls les anciens, dans /var, le seront."
Added: trunk/kolab-cyrus-imapd/debian/po/it.po
===================================================================
--- trunk/kolab-cyrus-imapd/debian/po/it.po 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/po/it.po 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,82 @@
+# Traduzione italiana di cyrus22-imapd
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# Cristian Rigamonti <cri at linux.it>, 2004.
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus22-imapd 2.2.12-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-05-20 00:16+0200\n"
+"PO-Revision-Date: 2004-03-28 20:17+0200\n"
+"Last-Translator: Cristian Rigamonti <cri at linux.it>\n"
+"Language-Team: Italian <tp at lists.linux.it>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid "Database backends have changed!"
+msgstr "I backend del database sono cambiati!"
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Comparation between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"Il confronto tra /usr/lib/cyrus/cyrus-db-types.txt e /usr/lib/cyrus/cyrus-db-"
+"types.active mostra che i backend di database per Cyrus IMAPd sono cambiati."
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Ciò significa che i database per cui sono cambiati i backend devono essere "
+"convertiti manualmente al nuovo formato, usando l'utilità cvt_cyrusdb(8)."
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Please refer to /usr/share/doc/cyrus22-common/README.Debian.database for "
+"more information. Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Si veda /usr/share/doc/cyrus22-common/README.Debian.database per maggiori "
+"informazioni. Non avviare cyrmaster prima di aver convertito i database al "
+"nuovo formato."
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+msgid "Remove the Cyrus spools, and user sieve scripts?"
+msgstr "Rimuovere gli spool di Cyrus e gli script sieve degli utenti?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+msgid ""
+"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
+"scripts, when the package is purged ?"
+msgstr ""
+"Si desidera rimuovere gli spool di posta e news di Cyrus, oltre agli script "
+"sieve degli utenti, quando il pacchetto sarà rimosso?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var. If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Questa domanda si riferisce solo agli spool predefiniti e alle directory "
+"degli script sieve in /var. Se la loro posizione è stata modificata in "
+"imapd.conf, non saranno rimosse le nuove posizioni, ma solo quelle in /var."
Added: trunk/kolab-cyrus-imapd/debian/po/ja.po
===================================================================
--- trunk/kolab-cyrus-imapd/debian/po/ja.po 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/po/ja.po 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,93 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus22-imapd 2.2.12-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-05-20 00:16+0200\n"
+"PO-Revision-Date: 2004-03-01 03:04+0900\n"
+"Last-Translator: Hideki Yamane <henrich at samba.gr.jp>\n"
+"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=EUC-JP\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid "Database backends have changed!"
+msgstr "¥Ð¥Ã¥¯¥¨¥ó¥É¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿!"
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Comparation between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"/usr/lib/cyrus/cyrus-db-types.txt ¤È /usr/lib/cyrus/cyrus-db-types.active ¤ò"
+"Èæ³Ó¤·¤¿¤È¤³¤í Cyrus IMAPd ¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬Êѹ¹¤µ¤ì¤Æ¤¤¤Þ¤¹¡£"
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"¤³¤ì¤é¤Î¥Ð¥Ã¥¯¥¨¥ó¥É¤¬Êѹ¹¤µ¤ì¤¿¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ï cvt_cyrusdb(8) ¥æ¡¼¥Æ¥£¥ê¥Æ¥£"
+"¤ò»È¤Ã¤Æ¼êÆ°¤Ç¿·¤·¤¤·Á¼°¤ËÊÑ´¹¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£"
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Please refer to /usr/share/doc/cyrus22-common/README.Debian.database for "
+"more information. Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"¤è¤ê¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï /usr/share/doc/cyrus22-common/README.Debian.database ¤ò»²"
+"¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤·Á¼°¤ËÊÑ´¹¤¹¤ë¤Þ¤Ç cyrmaster ¤òµ¯Æ°¤·¤Ê¤¤"
+"¤Ç¤¯¤À¤µ¤¤¡£"
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+msgid "Remove the Cyrus spools, and user sieve scripts?"
+msgstr "Cyrus ¥¹¥×¡¼¥ë¤È¡¢¥æ¡¼¥¶¤Î sieve ¥¹¥¯¥ê¥×¥È¤òºï½ü¤·¤Þ¤¹¤«?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+msgid ""
+"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
+"scripts, when the package is purged ?"
+msgstr ""
+"¥Ñ¥Ã¥±¡¼¥¸¤¬´°Á´¤Ëºï½ü¤µ¤ì¤¿ºÝ¡¢sieve ¥¹¥¯¥ê¥×¥È¤ÈƱÍÍ¤Ë Cyrus ¥á¡¼¥ë¡¦¥Ë¥å¡¼"
+"¥¹¥¹¥×¡¼¥ë¤òºï½ü¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¤«?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var. If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"¤³¤Î¼ÁÌä¤Ï /var ¤Ë¤¢¤ëɸ½à¤Î¥¹¥×¡¼¥ë¤È sieve ¥¹¥¯¥ê¥×¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Î¤ßŬÍÑ"
+"¤µ¤ì¤Þ¤¹¡£imapd.conf ¤Ç¥Ç¥£¥ì¥¯¥È¥ê¤òÊѹ¹¤·¤Æ¤¤¤ë¾ì¹ç¡¢Êѹ¹¸å¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë"
+"¤¢¤ë¤â¤Î¤Ïºï½ü¤µ¤ì¤Þ¤»¤ó¡£/var ¤Ë¤¢¤ë¸Å¤¤¤â¤Î¤À¤±¤Ç¤¹¡£"
Added: trunk/kolab-cyrus-imapd/debian/po/nl.po
===================================================================
--- trunk/kolab-cyrus-imapd/debian/po/nl.po 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/po/nl.po 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,94 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus22-imapd 2.2.12-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-05-20 00:16+0200\n"
+"PO-Revision-Date: 2004-03-29 10:57+0100\n"
+"Last-Translator: Luk Claes <luk.claes at ugent.be>\n"
+"Language-Team: Debian l10n Dutch <debian-l10n-dutch at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid "Database backends have changed!"
+msgstr "Databank-backends zijn gewijzigd!"
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Comparation between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"Vergelijking tussen /usr/lib/cyrus/cyrus-db-types.txt en /usr/lib/cyrus/"
+"cyrus-db-types.active leert ons dat de databank-backends voor Cyrus IMAPd "
+"gewijzigd zijn."
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Dit betekent dat deze databanken, waarvan de databank-backends gewijzigd "
+"zijn, mogelijk handmatig geconverteerd moeten worden naar het nieuwe "
+"formaat, gebruik makend van het cvt_cyrusdb(8)-hulpmiddel."
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Please refer to /usr/share/doc/cyrus22-common/README.Debian.database for "
+"more information. Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Raadpleeg /usr/share/doc/cyrus22-common/README.Debian.database voor meer "
+"informatie. Start cyrmaster niet vooraleer u de databanken naar het nieuwe "
+"formaat geconverteerd hebt."
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+msgid "Remove the Cyrus spools, and user sieve scripts?"
+msgstr "De Cyrus-spools, en gebruikers-sieve-scripts verwijderen?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+msgid ""
+"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
+"scripts, when the package is purged ?"
+msgstr ""
+"Moeten de Cyrus-mail- en -nieuws-spools verwijderd worden, alsook de "
+"gebruikers-sieve-scripts, wanneer het pakket wordt gewist (purged)?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var. If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Deze vraag heeft enkel betrekking op de standaard spools en de sieve-"
+"scriptmappen in /var. Als u deze locatie heeft gewijzigd in imapd.conf, dan "
+"zal de nieuwe locatie niet verwijderd worden; enkel de oude in /var."
Added: trunk/kolab-cyrus-imapd/debian/po/pt_BR.po
===================================================================
--- trunk/kolab-cyrus-imapd/debian/po/pt_BR.po 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/po/pt_BR.po 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,87 @@
+# PO-DEBCONF TEMPLATE FOR cyrus22-imapd.
+# Copyright (C) 2002 Henrique de Moraes Holschuh <hmh at debian.org>
+# This file is distributed under the same license as the cyrus22-imapd package.
+# $Id: pt_BR.po 142 2005-05-19 22:22:28Z sven $
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus22-imapd 2.1.12-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-05-20 00:16+0200\n"
+"PO-Revision-Date: 2003-03-03 10:45-0300\n"
+"Last-Translator: Henrique de Moraes Holschuh <hmh at debian.org>\n"
+"Language-Team: pt_BR <pt_BR at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid "Database backends have changed!"
+msgstr "Mudança de sistema nas bases de dados!"
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Comparation between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"Comparação entre /usr/lib/cyrus/cyrus-db-types.txt e /usr/lib/cyrus/cyrus-db-"
+"types.active levam a crer que o sistema de base de dados do Cyrus IMAPd foi "
+"mudado."
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Isso significa que as bases de dados cujo sistema mudou precisam ser "
+"migradas para o novo sistema manualmente, através do utilitário cvt_cyrusdb"
+"(8)."
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Please refer to /usr/share/doc/cyrus22-common/README.Debian.database for "
+"more information. Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Maiores informações estão disponíveis em /usr/share/doc/cyrus22-common/"
+"README.Debian.database. Não inicie cyrmaster até ter convertido o "
+"formatodas bases de dados."
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+msgid "Remove the Cyrus spools, and user sieve scripts?"
+msgstr "Removo as spools do Cyrus e os scripts sieve?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+msgid ""
+"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
+"scripts, when the package is purged ?"
+msgstr ""
+"Devo remover as áreas de armazenagem (spools) usadas pelo Cyrus, assim como "
+"as áreas usadas para armazenar os scripts sieve dos usuários quando o pacote "
+"for eliminado (purge) do sistema ?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var. If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Apenas as áreas padrão em /var serão removidas. Caso você tenha configurado "
+"outras áreas em imapd.conf, elas não serão removidas."
Added: trunk/kolab-cyrus-imapd/debian/po/templates.pot
===================================================================
--- trunk/kolab-cyrus-imapd/debian/po/templates.pot 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/po/templates.pot 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,73 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2003-03-03 10:24-0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../cyrus22-common.templates:3
+msgid "Database backends have changed!"
+msgstr ""
+
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Comparation between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Please refer to /usr/share/doc/cyrus22-common/README.Debian.database for "
+"more information. Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+
+#. Description
+#: ../cyrus22-common.templates:19
+msgid "Remove the Cyrus spools, and user sieve scripts?"
+msgstr ""
+
+#. Description
+#: ../cyrus22-common.templates:19
+msgid ""
+"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
+"scripts, when the package is purged ?"
+msgstr ""
+
+#. Description
+#: ../cyrus22-common.templates:19
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var. If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
Added: trunk/kolab-cyrus-imapd/debian/pop.pam
===================================================================
--- trunk/kolab-cyrus-imapd/debian/pop.pam 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/pop.pam 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,14 @@
+# PAM configuration file for Cyrus POP3 service
+# $Id: pop.pam 5 2005-03-12 23:19:45Z sven $
+#
+# If you want to use Cyrus in a setup where users don't have
+# accounts on the local machine, you'll need to make sure
+# you use something like pam_permit for account checking.
+#
+# Remember that SASL (and therefore Cyrus) accesses PAM
+# modules through saslauthd, and that SASL can only deal with
+# plaintext passwords if PAM is used.
+#
+
+ at include common-auth
+ at include common-account
Modified: trunk/kolab-cyrus-imapd/debian/rules
===================================================================
--- trunk/kolab-cyrus-imapd/debian/rules 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/rules 2006-01-05 14:27:15 UTC (rev 110)
@@ -1,16 +1,12 @@
#!/usr/bin/make -f
-# debian/rules for CMU Cyrus IMAP version 2.1
+# debian/rules for CMU Cyrus IMAP version 2.2
# GNU copyright 1997 by Joey Hess.
# Copyright (c) 2001 by Henrique de Moraes Holschuh
# Published under the GNU GPL license
# Based on previous work by Michael-John Turner <mj at debian.org>,
# David Parker <david at neongoat.com>
#
-# $Id: rules,v 1.85 2005/03/03 13:42:48 hmh Exp $
-# Include Kolab patches
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
# DebHelper control
export DH_ALWAYS_EXCLUDE=CVS
@@ -23,12 +19,15 @@
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+# enable dpatch usage
+include /usr/share/dpatch/dpatch.make
+
# Extra version information to add to Cyrus IMAPd ID
DEBVERSION:=$(shell LCALL=C dpkg-parsechangelog | sed -ne 's/^Version: \(.*-\)/\1/p')
EXTRA_IDENT:="Debian-$(DEBVERSION)"
# DB engine version
-DBENGINE=BerkeleyDB3.2
+DBENGINE=BerkeleyDB4.2
DEBUGFLAGS=-g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -54,57 +53,39 @@
# configure ; make distclean ; cd intl; make distclean ).
# This is done to make sure the build daemon's source tree is the
# same as the one I am using to produce the i386 debs.
-clean:: configure
+clean: clean-patched unpatch
+clean-patched: configure
dh_testdir
dh_testroot
-xargs -t -r chmod +x < debian/executable.files
-rm -f build-indep-stamp build-arch-stamp configure-stamp install-arch-stamp install-indep-stamp build-stamp
-$(MAKE) -i distclean
- dpatch deapply-all
- rm -rf debian/patched
-rm -f config.h config.cache config.status config.log stamp-config confdefs.h
- -rm -f netnews/Makefile perl/imap/Makefile.old perl/sieve/acap/Makefile.old perl/sieve/managesieve/Makefile.old snmp/Makefile Makefile et/Makefile
- -rm -f doc/pod2htmd.x~~ doc/pod2htmi.x~~ imap/imap_err.[ch] imap/pushstats.[ch] imap/lmtpstats.[ch] master/makedepend.log
-# Uncomment this for Kolab ...
-# -rm -f sieve/addr.[ch] sieve/addr-lex.[ch] sieve/sieve.[ch] sieve/sieve-lex.c sieve/sieve_err.[ch]
- -rm -f man/sieveshell.1 doc/murder.png
+ -rm -f netnews/Makefile perl/imap/Makefile.old perl/sieve/managesieve/Makefile.old snmp/Makefile Makefile et/Makefile
+ -rm -f doc/pod2htm*
+ -rm -f master/makedepend.log
-rm -rf doc/man
- -rm -f debian/cyrus-db-types.txt debian/cyrus-hardwired-config.txt
-
-# Changes during Kolabisation
-#ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-# cp -f /usr/share/misc/config.sub config.sub
-#endif
-#ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-# cp -f /usr/share/misc/config.guess config.guess
-#endif
- rm -f sieve/sievec
- rm -f sieve/sieved
-
- -rm -f config.sub config.guess
-# Uncomment this for Kolab ...
-# -rm -rf et/
-# Uncomment this for Kolab
-# Beta build don't need this
-# -xargs -t -r rm -f < debian/deletable.files
+ -rm -f debian/cyrus-db-types.txt debian/cyrus-hardwired-config.txt debian/README.configure-options
+ # -rm -rf et/
+ rm -rf autom4te.cache
+ -xargs -t -r rm -f < debian/deletable.files
dh_clean
configure:
- ./autogen.sh
+ # ./autogen.sh
-build:
- @echo Use the build-arch or build-indep targets to build...
+build: build-arch build-indep
-configure-stamp:
+configure-stamp: patch
dh_testdir
-rm -f config.sub config.guess
- ln -s /usr/share/misc/config.sub config.sub
- ln -s /usr/share/misc/config.guess config.guess
+ cp /usr/share/misc/config.sub config.sub
+ cp /usr/share/misc/config.guess config.guess
touch configure.in && touch aclocal.m4 && touch configure
- dpatch apply-all
+
# IF YOU CHANGE BERKELEY DB VERSION, MAKE SURE TO UPDATE
# DBENGINE AT THE TOP OF THIS MAKEFILE!
- ./configure CFLAGS="-fno-strict-aliasing -Wall -pipe $(DEBUGFLAGS)" $(CONFFLAGS) \
+ ./configure CFLAGS="-fno-strict-aliasing -fPIC -Wall -pipe $(DEBUGFLAGS)" $(CONFFLAGS) \
--with-extraident=$(EXTRA_IDENT) \
--prefix=/usr/share --exec-prefix=/usr --libexecdir=/usr/sbin \
--bindir=/usr/sbin --sbindir=/usr/sbin \
@@ -115,7 +96,8 @@
--localstatedir=/var/lib/cyrus \
--with-cyrus-prefix=/usr/lib/cyrus --with-lock=fcntl \
--with-perl=/usr/bin/perl \
- --with-openssl=/usr --with-auth=unix --enable-murder \
+ --with-openssl=/usr --with-auth=unix \
+ --enable-murder --enable-nntp \
--disable-listext --enable-annotatemore --with-sasl=/usr \
--with-idle=poll --with-drac=/usr \
--with-cyrus-user=cyrus --with-cyrus-group=mail \
@@ -123,8 +105,12 @@
--with-pidfile=/var/run/cyrmaster.pid \
--with-syslogfacility=MAIL \
--with-seen-db=skiplist --with-mboxlist-db=skiplist \
- --with-ucdsnmp=/usr
-
+ --with-ucdsnmp=/usr
+ echo 'To build this package, configure was called as follows:' \
+ > debian/README.configure-options
+ grep with\ options config.status \
+ | sed -e 's/^.*options \\"/configure /;s/\\"$///' \
+ >> debian/README.configure-options
touch configure-stamp
build-arch: build-arch-stamp
@@ -138,6 +124,10 @@
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
+ 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
+
# store some useful state about the current package
echo "PACKAGE_VERSION $(DEBVERSION)" >debian/cyrus-hardwired-config.txt
if grep -q -s -n -E '^[[:space:]]*#define[[:space:]]+USE_DIR_FULL[[:space:]]+1' config.h ; then \
@@ -201,14 +191,11 @@
mkdir -p $(TMPPKG)/usr/share/perl5
#mv $(TMPPKG)/lib/perl5/Cyrus $(TMPPKG)/usr/share/perl5/Cyrus
#mv $(TMPPKG)/lib/* $(TMPPKG)/usr/lib
-
- # modification for kolab, move perl stuff
- mv $(TMPPKG)/usr/share/lib/perl5 $(TMPPKG)/usr/lib/perl5
- # for stuff in /etc, small modification (really install the file under /etc)
+ # for stuff in /etc
mkdir -p $(TMPPKG)/etc/cyrus $(TMPPKG)/etc/pam.d
- install -D -m 644 debian/imapd.conf $(TMPPKG)/etc/imapd.conf
- install -D -m 644 debian/cyrus.conf $(TMPPKG)/etc/cyrus.conf
+ install -m 644 debian/imapd.conf $(TMPPKG)/etc
+ install -m 644 debian/cyrus.conf $(TMPPKG)/etc
(cd debian ; for i in *.pam ;\
do install -m 644 $$i $(TMPPKG)/etc/pam.d/$${i%.pam} ;\
done)
@@ -220,53 +207,41 @@
# And add our own manpages
mkdir -p $(TMPPKG)/usr/share/man/man8
-
- # Uncomment it for Kolab
install -m 644 debian/cyrdump.8 $(TMPPKG)/usr/share/man/man8/cyrdump.8
+ install -m 644 debian/cyrus-makedirs.8 $(TMPPKG)/usr/share/man/man8/cyrus-makedirs.8
install -m 644 debian/arbitronsort.8 $(TMPPKG)/usr/share/man/man8/arbitronsort.8
- # Uncomment the following because kolab uses procmail
# SNMP files
- #mkdir -p $(TMPPKG)/usr/share/snmp/mibs
- #install -m 644 master/CYRUS-MASTER.mib $(TMPPKG)/usr/share/snmp/mibs/CYRUS-MASTER-MIB.txt
+ mkdir -p $(TMPPKG)/usr/share/snmp/mibs
+ install -m 644 master/CYRUS-MASTER.mib $(TMPPKG)/usr/share/snmp/mibs/CYRUS-MASTER-MIB.txt
# Install cyradm icons
mkdir -p $(TMPPKG)/usr/share/icons/mini
+ install -m 644 debian/cyradm-32x32.xpm $(TMPPKG)/usr/share/icons/cyradm.xpm
+ install -m 644 debian/cyradm-16x16.xpm $(TMPPKG)/usr/share/icons/mini/cyradm.xpm
- # Modify it for Kolab
- install -m 644 debian/kolab-cyradm-32x32.xpm $(TMPPKG)/usr/share/icons/kolab-cyradm.xpm
- install -m 644 debian/kolab-cyradm-16x16.xpm $(TMPPKG)/usr/share/icons/mini/kolab-cyradm.xpm
-
- # Uncomment this for Kolab.
- # First we have to look at them and decide wether we include them or not.
# Install debian-provided scripts
install debian/cyrus-makedirs $(TMPPKG)/usr/sbin/cyrus-makedirs
install -m 644 debian/get-backtrace.gdb $(TMPPKG)/usr/lib/cyrus/get-backtrace.gdb
- # Uncomment this for Kolab.
- # First check ...
# and logcheck files
-# install -m 644 debian/logcheck.ignore \
-# $(PKGDIR)/etc/logcheck/ignore.d.server/cyrus21
-# install -m 644 debian/logcheck.ignore \
-# $(PKGDIR)/etc/logcheck/violations.ignore.d/cyrus21
+ install -m 644 debian/logcheck.ignore \
+ $(PKGDIR)/etc/logcheck/ignore.d.server/kolab-cyrus
+ install -m 644 debian/logcheck.ignore \
+ $(PKGDIR)/etc/logcheck/violations.ignore.d/kolab-cyrus
# Install the stuff needed for upgrades
for i in convert-sieve.pl dohash rehash undohash translatesieve \
- upgradesieve ; do \
+ upgradesieve masssievec; do \
install -m 755 tools/$$i $(PKGDIR)/usr/lib/cyrus/upgrade ;\
done
-
- # Uncomment this for Kolab.
- # First check ...
-# install -m 644 debian/cyrus-db-types.upgrading_from_1.5.txt $(PKGDIR)/usr/lib/cyrus/upgrade
+ install -m 644 debian/cyrus-db-types.upgrading_from_1.5.txt $(PKGDIR)/usr/lib/cyrus/upgrade
# And other upgrade helpers
-# install -m 644 debian/cyrus-db-types.txt debian/cyrus-hardwired-config.txt \
+ install -m 644 debian/cyrus-db-types.txt debian/cyrus-hardwired-config.txt \
$(PKGDIR)/usr/lib/cyrus
# And other misc useful tools
install -m 755 tools/arbitronsort.pl $(TMPPKG)/usr/sbin/arbitronsort
- # Modify for Kolab
# Install imtest and its symlinks
mv $(TMPPKG)/usr/bin/imtest $(CURDIR)/debian/kolab-cyrus-clients/usr/bin
for i in $(TMPPKG)/usr/bin/*test ; do \
@@ -275,19 +250,17 @@
ln -s imtest `basename $$i`) ;\
done
- # Let's uncomment this for Kolab and
- # at first see what Linda and Lintian say ...
# Lintian and Linda overrides
-# cd debian ; \
-# for i in *.linda ; do \
-# mkdir -p "$${i%%.linda}/usr/share/linda/overrides" ;\
-# install -m 644 "$$i" "$${i%%.linda}/usr/share/linda/overrides/$${i%%.linda}" ;\
-# done ;\
-# for i in *.lintian ; do \
-# mkdir -p "$${i%%.lintian}/usr/share/lintian/overrides" ;\
-# install -m 644 "$$i" "$${i%%.lintian}/usr/share/lintian/overrides/$${i%%.lintian}" ;\
-# done
-#
+ cd debian ; \
+ for i in *.linda ; do \
+ mkdir -p "$${i%%.linda}/usr/share/linda/overrides" ;\
+ install -m 644 "$$i" "$${i%%.linda}/usr/share/linda/overrides/$${i%%.linda}" ;\
+ done ;\
+ for i in *.lintian ; do \
+ mkdir -p "$${i%%.lintian}/usr/share/lintian/overrides" ;\
+ install -m 644 "$$i" "$${i%%.lintian}/usr/share/lintian/overrides/$${i%%.lintian}" ;\
+ done
+
dh_movefiles -a
touch install-arch-stamp
@@ -309,30 +282,19 @@
mkdir -p $(DOCDIR)/html
install -m 644 doc/*.html doc/murder.png $(DOCDIR)/html
cp -a doc/man $(DOCDIR)/html
-
- # Uncomment this for Kolab, first check ...
-# cp -a debian/examples $(DOCDIR)
+ cp -a debian/examples $(DOCDIR)
install -m 644 doc/cyrusv2.mc $(DOCDIR)/examples
# Install contrib/ files
- # small modify for Kolab
mkdir -p $(DOCDIR)/contrib
xargs < debian/kolab-cyrus-common.contrib -rti cp -r '{}' $(DOCDIR)/contrib
- # Modifications for Kolab
- # We want a binary in /usr/bin not in /usr/share/bin
- mv debian/tmp/usr/share/bin/cyradm debian/tmp/usr/bin/cyradm
-
dh_movefiles -i
-# Modification for Kolab, we need an install target ;(
-install: install-indep
-
binary-indep: install-indep
dh_testdir -i
dh_testroot -i
# dh_installdebconf -i
-# Modify for Kolab
dh_installdocs -p kolab-cyrus-admin -p kolab-cyrus-doc
dh_installexamples -p kolab-cyrus-admin
dh_installmenu -i
@@ -365,12 +327,10 @@
# dh_installlogrotate -a
# dh_installpam -a
# dh_installmime -a
-# Modify for Kolab (check if it is right ;)
dh_installinit -p $(MAINPKG) --noscripts --name=kolab-cyrus
dh_installcron -a
dh_installman -a
# dh_installinfo -a
-# Modify for Kolab
dh_installchangelogs -p $(MAINPKG) -p kolab-cyrus-clients doc/changes.html
dh_installchangelogs -p kolab-libcyrus-imap-perl perl/imap/Changes
dh_fixperms -a
@@ -387,4 +347,4 @@
dh_builddeb -a
binary: binary-indep binary-arch
-.PHONY: build build-indep build-arch clean binary-indep binary-arch binary install-arch install-indep
+.PHONY: build build-indep build-arch clean binary-indep binary-arch binary install-arch install-indep clean-patched
Added: trunk/kolab-cyrus-imapd/debian/sieve.pam
===================================================================
--- trunk/kolab-cyrus-imapd/debian/sieve.pam 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/sieve.pam 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,14 @@
+# PAM configuration file for Cyrus SIEVE timsieved service
+# $Id: sieve.pam 5 2005-03-12 23:19:45Z sven $
+#
+# If you want to use Cyrus in a setup where users don't have
+# accounts on the local machine, you'll need to make sure
+# you use something like pam_permit for account checking.
+#
+# Remember that SASL (and therefore Cyrus) accesses PAM
+# modules through saslauthd, and that SASL can only deal with
+# plaintext passwords if PAM is used.
+#
+
+ at include common-auth
+ at include common-account
Added: trunk/kolab-cyrus-imapd/debian/watch
===================================================================
--- trunk/kolab-cyrus-imapd/debian/watch 2006-01-05 14:15:04 UTC (rev 109)
+++ trunk/kolab-cyrus-imapd/debian/watch 2006-01-05 14:27:15 UTC (rev 110)
@@ -0,0 +1,2 @@
+version=2
+ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-(2\.2\..*).tar.(?:gz|bz2)
More information about the pkg-kolab-devel
mailing list