[SVN] r540 - in /branches/idled/debian: ./ patches/
debian at incase.de
debian at incase.de
Sun Aug 6 18:34:16 UTC 2006
Author: sven
Date: Sun Aug 6 20:34:14 2006
New Revision: 540
URL: https://mail.incase.de/viewcvs?rev=540&root=cyrus22&view=rev
Log:
Merge changes up to r539 from trunk
Added:
branches/idled/debian/cyrus-common-2.2.install
- copied unchanged from r529, trunk/cyrus-imapd-2.2.13/debian/cyrus-common-2.2.install
branches/idled/debian/patches/0017-upstream-no-body-empty-string-instead-of-null.dpatch
- copied unchanged from r539, trunk/cyrus-imapd-2.2.13/debian/patches/0017-upstream-no-body-empty-string-instead-of-null.dpatch
branches/idled/debian/patches/0018-upstream-ntohl-instead-of-htonl.dpatch
- copied unchanged from r539, trunk/cyrus-imapd-2.2.13/debian/patches/0018-upstream-ntohl-instead-of-htonl.dpatch
branches/idled/debian/patches/75-update-imapd.conf-documentation.dpatch
- copied unchanged from r539, trunk/cyrus-imapd-2.2.13/debian/patches/75-update-imapd.conf-documentation.dpatch
Modified:
branches/idled/debian/README.Debian.database
branches/idled/debian/README.Debian.debug
branches/idled/debian/README.postfix
branches/idled/debian/TODO.Debian
branches/idled/debian/UPGRADE.Debian
branches/idled/debian/changelog
branches/idled/debian/control
branches/idled/debian/imapd.conf
branches/idled/debian/patches/0016-upstream-fix-typos.dpatch
branches/idled/debian/patches/00list
branches/idled/debian/rules
Modified: branches/idled/debian/README.Debian.database
URL: https://mail.incase.de/viewcvs/branches/idled/debian/README.Debian.database?rev=540&root=cyrus22&r1=539&r2=540&view=diff
==============================================================================
--- branches/idled/debian/README.Debian.database (original)
+++ branches/idled/debian/README.Debian.database Sun Aug 6 20:34:14 2006
@@ -35,6 +35,11 @@
might be locked. Unlock them (i.e. REALLY stop Cyrus if it is still running,
use the db* utilities (from the older Berkeley DB version) to clean any stray
locks, or try a reboot).
+
+IMPORTANT: If you changed the type of any of the databases through imapd.conf,
+ cyrus-db-types.txt isn't updated to match those. Be sure to cross-check
+ imapd.conf if you did that.
+
Step-by-step conversion guide:
@@ -60,10 +65,7 @@
You should look for lines with 'berkeley' or 'berkeley_nosync' on
the right side. You can safely ignore lines with 'flat', 'skiplist' or
'quotalegacy'.
- NOTE: If you changed the type of any of the databases through imapd.conf,
- cyrus-db-types.txt isn't updated to match those. Be sure to cross-check
- imapd.conf if you did that.
-
+
The SUBS and SEEN databases are different: there are many of them (one
for every mail folder of every user for SEEN; one for every user for
SUBS) and you need to convert every single one of them.
Modified: branches/idled/debian/README.Debian.debug
URL: https://mail.incase.de/viewcvs/branches/idled/debian/README.Debian.debug?rev=540&root=cyrus22&r1=539&r2=540&view=diff
==============================================================================
--- branches/idled/debian/README.Debian.debug (original)
+++ branches/idled/debian/README.Debian.debug Sun Aug 6 20:34:14 2006
@@ -42,7 +42,8 @@
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.
-
+
+IMPORTANT:
Watch out for sensitive information such as passwords when you submit the
telemetry logs to a public bug-tracking system or mailinglist.
@@ -72,8 +73,8 @@
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
+Warning: the next time a new version of cyrus is released, apt will 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
Modified: branches/idled/debian/README.postfix
URL: https://mail.incase.de/viewcvs/branches/idled/debian/README.postfix?rev=540&root=cyrus22&r1=539&r2=540&view=diff
==============================================================================
--- branches/idled/debian/README.postfix (original)
+++ branches/idled/debian/README.postfix Sun Aug 6 20:34:14 2006
@@ -98,13 +98,17 @@
lmtp cmd="lmtpd" listen="lmtp"
-(do note that you MUST have an lmtp entry in /etc/services for this to work).
+(do note that you MUST have an lmtp entry in /etc/services for this to work.
+This can be any available port, for historical reasons, 2003 is most often used).
-Also, remember to set the tcpwrapper permissions up (/etc/hosts.allow and
-/etc/hosts.deny), or Cyrus might refuse the connections.
+Also, remember that Cyrus observes tcpwrapper permissions (/etc/hosts.allow and
+/etc/hosts.deny), make sure they're set up correctly or Cyrus might refuse the
+connections.
To configure Postfix' lmtp transport to authenticate using SASL, do the
-following:
+following:
+Note: On Sarge systems, you will also need the postfix-tls package for SASL
+support. On etch and above, the support is included in the postfix package.
1. Configure the lmtp transport SASL layer:
(add to /etc/postfix/main.cf):
Modified: branches/idled/debian/TODO.Debian
URL: https://mail.incase.de/viewcvs/branches/idled/debian/TODO.Debian?rev=540&root=cyrus22&r1=539&r2=540&view=diff
==============================================================================
--- branches/idled/debian/TODO.Debian (original)
+++ branches/idled/debian/TODO.Debian Sun Aug 6 20:34:14 2006
@@ -34,7 +34,6 @@
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 ]
Modified: branches/idled/debian/UPGRADE.Debian
URL: https://mail.incase.de/viewcvs/branches/idled/debian/UPGRADE.Debian?rev=540&root=cyrus22&r1=539&r2=540&view=diff
==============================================================================
--- branches/idled/debian/UPGRADE.Debian (original)
+++ branches/idled/debian/UPGRADE.Debian Sun Aug 6 20:34:14 2006
@@ -13,7 +13,7 @@
of cyrus-imapd version 2.2 (either the old experimental cyrus22-imapd
or the newer cyrus-imapd-2.2 packages). If you do, please remove
/usr/lib/cyrus/cyrus-db-types.active and run
-dpkg --reconfigure cyrus-common-2.2
+dpkg-reconfigure cyrus-common-2.2
Upgrading from cyrus 2.1
========================
@@ -22,8 +22,11 @@
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.5 below. In a later version of this package,
-we will give more detailed information on upgrades.
+information from cyrus v1.5 below and in more detail in
+/usr/share/doc/cyrus-common-2.2/README.Debian.database.
+
+Please note that the 2.1 packages in Debian use a different format
+from upstream, thus the upgrade is easier.
Upgrading sieve scripts
-----------------------
@@ -32,7 +35,7 @@
compile all existing sieve scripts so that they will work with cyrus 2.2. 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.
+refer to the script's 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
Modified: branches/idled/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/idled/debian/changelog?rev=540&root=cyrus22&r1=539&r2=540&view=diff
==============================================================================
--- branches/idled/debian/changelog (original)
+++ branches/idled/debian/changelog Sun Aug 6 20:34:14 2006
@@ -10,14 +10,37 @@
cyrus-imapd-2.2 (2.2.13-5) UNRELEASED; urgency=low
+ * The "Need to clean the Windows" release
+
+ [ Benjamin Seidenberg ]
+ * Update the following documentation:
+ - README.Debian
+ - README.Debian.database
+ - README.Debian.postfix
+ - README.Debian.
+ (Closes: #378520, #369882)
+ * Bump debian policy to version 3.7.2 (No changes required)
+ * Move cyr_expire to /usr/sbin as this is used in cyrus.conf.
+ Thanks to Alexander Turic <alexander at turcic.com>. (Closes: #380595)
+
+ [ Sven Mueller ]
* Remove outdated entry about netnews removal from README.Debian
(Closes: #378519)
* Add --no-create-home to adduser arguments in cyrus-common2.2's
postinst script. (Closes: #378518)
* Modify debian/rules to once again create a meaningful
cyrus-db-types.txt file (Closes: #366957)
-
- -- Sven Mueller <sven at debian.org> Wed, 19 Jul 2006 23:01:58 +0200
+ * Improve imapd.conf documentation to show how service specific options can
+ be given. Also update packaged imapd.conf to reflect 2.2 syntax and
+ behaviour. (Closes: #379881)
+ * Use ssl-cert and reference system-wide ssl certificates in imapd.conf,
+ leaving the service specific ssl certs as-is.
+ * Update imapd.conf documentation to clarify behaviour of allowplaintext in
+ combination with sasl_mech_list.
+ * Sync with 2.2 CVS tree from upstream, including a few documentation fixes
+ and a fix returning empty strings for empty message parts instead of NULL
+
+ -- Sven Mueller <sven at debian.org> Sun, 6 Aug 2006 20:19:49 +0200
cyrus-imapd-2.2 (2.2.13-4) unstable; urgency=low
Modified: branches/idled/debian/control
URL: https://mail.incase.de/viewcvs/branches/idled/debian/control?rev=540&root=cyrus22&r1=539&r2=540&view=diff
==============================================================================
--- branches/idled/debian/control (original)
+++ branches/idled/debian/control Sun Aug 6 20:34:14 2006
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian Cyrus Team <pkg-cyrus-imapd-debian-devel at lists.alioth.debian.org>
Uploaders: Henrique de Moraes Holschuh <hmh at debian.org>, Sven Mueller <sven at debian.org>, Benjamin Seidenberg <astronut at dlgeek.net>, Ondřej Surý <ondrej at debian.org>
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
Build-Depends: debhelper (>= 4.1.68), tcl8.3-dev, libwrap0-dev, libpam0g-dev, libdb4.2-dev (>= 4.2.52), 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, dpatch, transfig, gs, groff, libkvm-dev [kfreebsd-i386], libkvm-dev [kfreebsd-amd64]
Package: cyrus-common-2.2
Modified: branches/idled/debian/imapd.conf
URL: https://mail.incase.de/viewcvs/branches/idled/debian/imapd.conf?rev=540&root=cyrus22&r1=539&r2=540&view=diff
==============================================================================
--- branches/idled/debian/imapd.conf (original)
+++ branches/idled/debian/imapd.conf Sun Aug 6 20:34:14 2006
@@ -53,8 +53,8 @@
#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
+# can deliver email through TCP/IP lmtp). If specified, this parameter
+# overrides the "admins" parameter above
#lmtp_admins: postman
# Space-separated list of users that have mupdate "admin" status, in
@@ -201,46 +201,46 @@
# File containing the global certificate used for ALL services (imap, pop3,
# lmtp, sieve)
-#tls_cert_file: /etc/ssl/certs/cyrus-global.pem
+#tls_cert_file: /etc/ssl/certs/ssl-cert-snakeoil.pem
# File containing the private key belonging to the global server certificate.
-#tls_key_file: /etc/ssl/private/cyrus-global.key
+#tls_key_file: /etc/ssl/private/ssl-cert-snakeoil.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
+#imap_tls_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
+#imap_tls_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
+#pop3_tls_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
+#pop3_tls_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
+#lmtp_tls_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
+#lmtp_tls_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
+#sieve_tls_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
+#sieve_tls_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
@@ -264,16 +264,16 @@
#tls_require_cert: false
# Require a client certificate for imap ONLY.
-#tls_imap_require_cert: false
+#imap_tls_require_cert: false
# Require a client certificate for pop3 ONLY.
-#tls_pop3_require_cert: false
+#pop3_tls_require_cert: false
# Require a client certificate for lmtp ONLY.
-#tls_lmtp_require_cert: false
+#lmtp_tls_require_cert: false
# Require a client certificate for sieve ONLY.
-#tls_sieve_require_cert: false
+#sieve_tls_require_cert: false
#
# Cyrus Murder cluster configuration
Modified: branches/idled/debian/patches/0016-upstream-fix-typos.dpatch
URL: https://mail.incase.de/viewcvs/branches/idled/debian/patches/0016-upstream-fix-typos.dpatch?rev=540&root=cyrus22&r1=539&r2=540&view=diff
==============================================================================
--- branches/idled/debian/patches/0016-upstream-fix-typos.dpatch (original)
+++ branches/idled/debian/patches/0016-upstream-fix-typos.dpatch Sun Aug 6 20:34:14 2006
@@ -6,9 +6,9 @@
## DP: And https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/man/chk_cyrus.8.diff?r1=1.3&r2=1.4
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/man/chk_cyrus.8 /tmp/dpep.52qXsO/cyrus-imapd-2.2.13/man/chk_cyrus.8
---- cyrus-imapd-2.2.13/man/chk_cyrus.8 2006-06-04 21:47:19.000000000 +0200
-+++ /tmp/dpep.52qXsO/cyrus-imapd-2.2.13/man/chk_cyrus.8 2006-06-19 16:11:13.870518758 +0200
+diff -urNad cyrus-imapd-2.2.13/man/chk_cyrus.8 /tmp/dpep.IOS55O/cyrus-imapd-2.2.13/man/chk_cyrus.8
+--- cyrus-imapd-2.2.13/man/chk_cyrus.8 2006-08-06 20:04:29.000000000 +0200
++++ /tmp/dpep.IOS55O/cyrus-imapd-2.2.13/man/chk_cyrus.8 2006-08-06 20:08:15.026586061 +0200
@@ -40,7 +40,7 @@
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
@@ -40,14 +40,25 @@
May not be specified with -P.
.SH FILES
.TP
-diff -urNad cyrus-imapd-2.2.13/man/reconstruct.8 /tmp/dpep.52qXsO/cyrus-imapd-2.2.13/man/reconstruct.8
---- cyrus-imapd-2.2.13/man/reconstruct.8 2006-06-04 21:47:19.000000000 +0200
-+++ /tmp/dpep.52qXsO/cyrus-imapd-2.2.13/man/reconstruct.8 2006-06-19 16:10:34.583199793 +0200
-@@ -119,7 +119,7 @@
+diff -urNad cyrus-imapd-2.2.13/man/reconstruct.8 /tmp/dpep.IOS55O/cyrus-imapd-2.2.13/man/reconstruct.8
+--- cyrus-imapd-2.2.13/man/reconstruct.8 2006-08-06 20:04:29.000000000 +0200
++++ /tmp/dpep.IOS55O/cyrus-imapd-2.2.13/man/reconstruct.8 2006-08-06 20:10:35.754646314 +0200
+@@ -39,7 +39,7 @@
+ .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ .\"
+-.\" $Id: reconstruct.8,v 1.19 2004/10/13 18:07:49 shadow Exp $
++.\" $Id: reconstruct.8,v 1.20 2006/06/19 13:01:19 murch Exp $
+ .SH NAME
+ reconstruct \- reconstruct mailboxes
+ .SH SYNOPSIS
+@@ -118,8 +118,8 @@
+ .B \-x
When processing a mailbox which is not in the mailbox list (e.g. via
the -p or -f options), do not import the metadata from the mailbox,
- instead create it anew (this specifically affects atleast the mailbox's seen
+-instead create it anew (this specifically affects atleast the mailbox's seen
-stat unique identifier, user flags, and ACL).
++instead create it anew (this specifically affects at least the mailbox's seen
+state unique identifier, user flags, and ACL).
.TP
.B \-r
Modified: branches/idled/debian/patches/00list
URL: https://mail.incase.de/viewcvs/branches/idled/debian/patches/00list?rev=540&root=cyrus22&r1=539&r2=540&view=diff
==============================================================================
--- branches/idled/debian/patches/00list (original)
+++ branches/idled/debian/patches/00list Sun Aug 6 20:34:14 2006
@@ -10,6 +10,8 @@
0014-upstream-fix-locks-during-reconstruction.dpatch
0015-upstream-fix-logic-error-in-imapoptions.dpatch
0016-upstream-fix-typos.dpatch
+0017-upstream-no-body-empty-string-instead-of-null.dpatch
+0018-upstream-ntohl-instead-of-htonl.dpatch
0090-fix-casts.dpatch
01-fix_Makefile.in.dpatch
02-add_mkinstalldirs.dpatch
@@ -42,4 +44,5 @@
65-sieveshell-enhancements.dpatch
70-allow-larger-buffers.dpatch
72-faster-isdigit.dpatch
+75-update-imapd.conf-documentation.dpatch
99-update-autoconf.dpatch
Modified: branches/idled/debian/rules
URL: https://mail.incase.de/viewcvs/branches/idled/debian/rules?rev=540&root=cyrus22&r1=539&r2=540&view=diff
==============================================================================
--- branches/idled/debian/rules (original)
+++ branches/idled/debian/rules Sun Aug 6 20:34:14 2006
@@ -182,7 +182,8 @@
mv $(TMPPKG)/usr/lib/cyrus/bin/$$i $(TMPPKG)/usr/sbin/cyr$$i ;\
done
for i in mbpath ctl_mboxlist ctl_deliver ctl_cyrusdb squatter \
- tls_prune ipurge cyrdump cvt_cyrusdb chk_cyrus arbitron; do \
+ tls_prune ipurge cyrdump cvt_cyrusdb chk_cyrus arbitron \
+ cyr_expire; do \
mv $(TMPPKG)/usr/lib/cyrus/bin/$$i $(TMPPKG)/usr/sbin/$$i ;\
done
mkdir -p $(TMPPKG)/usr/include
@@ -264,7 +265,7 @@
install -m 644 "$$i" "$${i%%.lintian}/usr/share/lintian/overrides/$${i%%.lintian}" ;\
done
- dh_movefiles -a
+ dh_install -a --sourcedir=$(TMPPKG)
touch install-arch-stamp
# We aren't actually able to install arch-indep independently from
@@ -292,7 +293,7 @@
mkdir -p $(DOCDIR)/contrib
xargs < debian/cyrus-common-2.2.contrib -rti cp -r '{}' $(DOCDIR)/contrib
- dh_movefiles -i
+ dh_install -i --sourcedir=$(TMPPKG)
binary-indep: install-indep
dh_testdir -i
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list