[pkg-kolab] r502 - in kolab-cyrus-imapd/trunk/debian: . examples
patches
Peter Eisentraut
petere at alioth.debian.org
Wed Nov 1 21:20:29 CET 2006
Author: petere
Date: 2006-11-01 21:20:28 +0100 (Wed, 01 Nov 2006)
New Revision: 502
Added:
kolab-cyrus-imapd/trunk/debian/examples/editsieve
kolab-cyrus-imapd/trunk/debian/logcheck.violations.ignore
kolab-cyrus-imapd/trunk/debian/patches/55-fix-db_err_callback.dpatch
Modified:
kolab-cyrus-imapd/trunk/debian/README.Debian
kolab-cyrus-imapd/trunk/debian/README.Debian.database
kolab-cyrus-imapd/trunk/debian/README.Debian.debug
kolab-cyrus-imapd/trunk/debian/README.postfix
kolab-cyrus-imapd/trunk/debian/changelog
kolab-cyrus-imapd/trunk/debian/control
kolab-cyrus-imapd/trunk/debian/copyright
kolab-cyrus-imapd/trunk/debian/cyrus-makedirs
kolab-cyrus-imapd/trunk/debian/cyrus-makedirs.8
kolab-cyrus-imapd/trunk/debian/cyrus.conf
kolab-cyrus-imapd/trunk/debian/executable.files
kolab-cyrus-imapd/trunk/debian/imapd.conf
kolab-cyrus-imapd/trunk/debian/kolab-cyrus-admin.README.Debian
kolab-cyrus-imapd/trunk/debian/kolab-cyrus-clients.README.Debian
kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.cron.daily
kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.kolab-cyrus.default
kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.kolab-cyrus.init
kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.postinst
kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.postrm
kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.prerm
kolab-cyrus-imapd/trunk/debian/license.html
kolab-cyrus-imapd/trunk/debian/logcheck.ignore
kolab-cyrus-imapd/trunk/debian/patches/00list
kolab-cyrus-imapd/trunk/debian/patches/20-drac_auth.dpatch
kolab-cyrus-imapd/trunk/debian/patches/61-64bit-quota.dpatch
kolab-cyrus-imapd/trunk/debian/rules
Log:
Sync with cyrus-imapd-2.2 2.2.12-5
Modified: kolab-cyrus-imapd/trunk/debian/README.Debian
===================================================================
--- kolab-cyrus-imapd/trunk/debian/README.Debian 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/README.Debian 2006-11-01 20:20:28 UTC (rev 502)
@@ -19,7 +19,7 @@
Cyrus IMAP for Debian
-$Id: README.Debian 229 2005-12-08 23:26:29Z astronut $
+$Id: README.Debian 356 2006-04-20 15:26:57Z sven $
---------------------
"All systems administrators have their horror stories. For me, it was
Modified: kolab-cyrus-imapd/trunk/debian/README.Debian.database
===================================================================
--- kolab-cyrus-imapd/trunk/debian/README.Debian.database 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/README.Debian.database 2006-11-01 20:20:28 UTC (rev 502)
@@ -1,5 +1,5 @@
Cyrus IMAP for Debian: Database backend conversion
-$Id: README.Debian.database 229 2005-12-08 23:26:29Z astronut $
+$Id: README.Debian.database 356 2006-04-20 15:26:57Z sven $
--------------------------------------------------
"All systems administrators have their horror stories. For me, it was
Modified: kolab-cyrus-imapd/trunk/debian/README.Debian.debug
===================================================================
--- kolab-cyrus-imapd/trunk/debian/README.Debian.debug 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/README.Debian.debug 2006-11-01 20:20:28 UTC (rev 502)
@@ -1,5 +1,5 @@
Cyrus IMAP for Debian, debugging procedures
-$Id: README.Debian.debug 229 2005-12-08 23:26:29Z astronut $
+$Id: README.Debian.debug 356 2006-04-20 15:26:57Z sven $
-------------------------------------------
For more information, please consult http://asg.web.cmu.edu/cyrus/imapd/.
Modified: kolab-cyrus-imapd/trunk/debian/README.postfix
===================================================================
--- kolab-cyrus-imapd/trunk/debian/README.postfix 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/README.postfix 2006-11-01 20:20:28 UTC (rev 502)
@@ -1,5 +1,5 @@
Setting up Cyrus IMAPd for Postfix (Debian)
-$Id: README.postfix 229 2005-12-08 23:26:29Z astronut $
+$Id: README.postfix 356 2006-04-20 15:26:57Z sven $
===========================================================
Cyrus works wonderfully well with Postfix, both in single-system stores (where
Modified: kolab-cyrus-imapd/trunk/debian/changelog
===================================================================
--- kolab-cyrus-imapd/trunk/debian/changelog 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/changelog 2006-11-01 20:20:28 UTC (rev 502)
@@ -7,6 +7,63 @@
-- Peter Eisentraut <petere at debian.org> Wed, 1 Nov 2006 12:48:56 +0100
+cyrus-imapd-2.2 (2.2.12-5) unstable; urgency=low
+
+ [ Sven Mueller ]
+ * Add example entries for squatter to cyrus.conf (Closes: #355303)
+ * Fix URLs in README.sendmail (Closes: #355771)
+ * Remove STDERR redirection from cyrus-common-2.2 postinst call to adduser
+ * Fix a spelling mistake in debian/control (Closes: #363329)
+
+ [ Benjamin Seidenberg ]
+ * Default to lmtp_downcase_rcpt: yes for compliance with RFC 2821
+ (Closes: #357040)
+
+ -- Sven Mueller <debian at incase.de> Tue, 18 Apr 2006 15:33:07 +0200
+
+cyrus-imapd-2.2 (2.2.12-4) unstable; urgency=low
+
+ [ Benjamin Seidenberg ]
+ * Change maintainer to mailing list
+ * Remove multiple provides: lines in cyrus-nntpd-2.2 (Closes: #352240)
+ * Add lintian override for CVS dirs in source tarball, we need to hit
+ upstream with a cluebat for this.
+ * Move all Build-Depends-Indep dependencies to Build-Depends because of the
+ way debian/rules invokes this target, they are not installed, fixes FTBFS.
+ (Closes: #352775, #352779)
+
+ [ Sven Mueller ]
+ * Disable DRAC authentication
+ * Fix reference in debian/po/POTFILES.in (Closes: #352948)
+
+ [ Ondřej Surý ]
+ * Upload to unstable.
+
+ -- Ondřej Surý <ondrej at debian.org> Wed, 15 Feb 2006 22:42:35 +0100
+
+cyrus-imapd-2.2 (2.2.12-3) unstable; urgency=low
+
+ [ Sven Mueller ]
+ * Add a script which helps downloading, editing and re-uploading
+ sieve scripts
+ * Add a patch to fix db_err callback prototype when building against
+ Berkeley DB 4.3 or newer
+
+ [ Henrique de Moraes Holschuh ]
+ * UPGRADE.Debian: warn of dangerous problem in cyrus-imapd from sarge,
+ which would cause data loss when UPGRADE.Debian instructions were
+ followed.
+
+ [ Benjamin Seidenberg ]
+ * Changed debian/control so that the doc package is in section doc to match
+ ftpmaster override.
+
+ [ Ondřej Surý ]
+ * Updated and renamed logcheck rules.
+ * Upload to unstable.
+
+ -- Ondřej Surý <ondrej at debian.org> Mon, 13 Feb 2006 14:16:44 +0100
+
cyrus-imapd-2.2 (2.2.12-2) experimental; urgency=low
[ Henrique de Moraes Holschuh ]
Modified: kolab-cyrus-imapd/trunk/debian/control
===================================================================
--- kolab-cyrus-imapd/trunk/debian/control 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/control 2006-11-01 20:20:28 UTC (rev 502)
@@ -3,12 +3,13 @@
Priority: extra
Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <steffen.joeris at skolelinux.de>, Peter Eisentraut <petere at debian.org>
+Standards-Version: 3.6.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, libldap2-dev, transfig, gs, groff
-Standards-Version: 3.6.2
XS-X-Vcs-Svn: svn://svn.debian.org/pkg-kolab/kolab-cyrus-imapd/
Package: kolab-cyrus-common
Architecture: any
+Section: mail
Depends: postfix | mail-transport-agent, adduser (>= 3.34), dpkg (>> 1.9.0), netbase (>= 4.07), gawk, ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}
Conflicts: suidmanager (<< 0.50), cyrus-common, cyrus-common-2.2, cyrus21-common
Replaces: cyrus21-common
@@ -37,6 +38,7 @@
Package: kolab-cyrus-imapd
Architecture: any
+Section: mail
Depends: kolab-cyrus-common (= ${Source-Version}), ${shlibs:Depends}
Provides: imap-server
Conflicts: imap-server, cyrus21-imapd, cyrus-imapd-2.2
@@ -50,6 +52,7 @@
Package: kolab-cyrus-pop3d
Architecture: any
+Section: mail
Depends: kolab-cyrus-common (= ${Source-Version}), ${shlibs:Depends}
Provides: pop3-server
Conflicts: pop3-server, cyrus21-pop3d, cyrus-pop3d-2.2
@@ -62,6 +65,7 @@
Package: kolab-cyrus-admin
Architecture: all
+Section: mail
Depends: kolab-libcyrus-imap-perl (>= ${Source-Version})
Suggests: sasl2-bin
Conflicts: cyrus-admin, cyrus21-admin, cyrus-admin-2.2
@@ -77,6 +81,7 @@
Package: kolab-cyrus-clients
Architecture: any
+Section: mail
Depends: ${shlibs:Depends}
Conflicts: cyrus21-clients, cyrus-clients-2.2
Provides: cyrus21-clients
@@ -84,7 +89,7 @@
Description: Cyrus mail system (test clients)
This package contains client tools to test the Cyrus IMAPd suite.
It contains the mupdatetest, sivtest, smtptest, lmtptest,
- imtest and pop3test tools which can be used to interactivily talk to
+ imtest and pop3test tools which can be used to interactively talk to
a mupdate, sieve, smtp, lmtp, imap or pop3 server.
The clients are fully SASL-enabled for authentication.
.
Modified: kolab-cyrus-imapd/trunk/debian/copyright
===================================================================
--- kolab-cyrus-imapd/trunk/debian/copyright 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/copyright 2006-11-01 20:20:28 UTC (rev 502)
@@ -20,7 +20,7 @@
used the original packaging (thanks to the Debian Cyrus Maintainers for their
help).
-$Id: copyright 210 2005-11-23 16:29:59Z astronut $
+$Id: copyright 356 2006-04-20 15:26:57Z sven $
This package was debianized by Henrique de Moraes Holschuh <hmh at debian.org> on
Wed Sep 12 09:35:30 BRT 2001, based on previous work by Michael-John Turner
Modified: kolab-cyrus-imapd/trunk/debian/cyrus-makedirs
===================================================================
--- kolab-cyrus-imapd/trunk/debian/cyrus-makedirs 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/cyrus-makedirs 2006-11-01 20:20:28 UTC (rev 502)
@@ -6,7 +6,7 @@
# 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 229 2005-12-08 23:26:29Z astronut $
+# $Id: cyrus-makedirs 356 2006-04-20 15:26:57Z sven $
# See lib/util.c, dir_hash_c for Cyrus' directory hashing
# for the new hash style
Modified: kolab-cyrus-imapd/trunk/debian/cyrus-makedirs.8
===================================================================
--- kolab-cyrus-imapd/trunk/debian/cyrus-makedirs.8 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/cyrus-makedirs.8 2006-11-01 20:20:28 UTC (rev 502)
@@ -1,5 +1,5 @@
.\" Hey, EMACS: -*- nroff -*-
-.\" $Id: cyrus-makedirs.8 229 2005-12-08 23:26:29Z astronut $
+.\" $Id: cyrus-makedirs.8 356 2006-04-20 15:26:57Z sven $
.\"
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
Modified: kolab-cyrus-imapd/trunk/debian/cyrus.conf
===================================================================
--- kolab-cyrus-imapd/trunk/debian/cyrus.conf 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/cyrus.conf 2006-11-01 20:20:28 UTC (rev 502)
@@ -2,7 +2,7 @@
# see cyrus.conf(5) for more information
#
# All the tcp services are tcpd-wrapped. see hosts_access(5)
-# $Id: cyrus.conf 120 2005-05-01 03:23:18Z sven $
+# $Id: cyrus.conf 356 2006-04-20 15:26:57Z sven $
START {
# do not delete this entry!
@@ -78,5 +78,13 @@
# this is only necessary if caching TLS sessions
tlsprune cmd="/usr/sbin/tls_prune" at=0401
+
+ # indexing of mailboxs for server side fulltext searches
+
+ # reindex changed mailboxes (fulltext) approximately every other hour
+ #squatter_1 cmd="/usr/bin/nice -n 19 /usr/sbin/squatter -s" period=120
+
+ # reindex all mailboxes (fulltext) daily
+ #squatter_a cmd="/usr/sbin/squatter" at=0517
}
Added: kolab-cyrus-imapd/trunk/debian/examples/editsieve
===================================================================
--- kolab-cyrus-imapd/trunk/debian/examples/editsieve 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/examples/editsieve 2006-11-01 20:20:28 UTC (rev 502)
@@ -0,0 +1,252 @@
+#!/bin/bash
+#
+# This script is copyright 2006 Sven Mueller <cyrus at incase.de>
+# Released under the terms of the GNU General public license
+# (GPL) version 2
+# Before distributing changed versions of the script, please ask
+# the original author to include your changes into the original
+# distribution files. Thanks.
+#
+umask 077
+
+# generic defaults
+
+DEFAULTDOMAIN=incase.de
+DEFAULTHOST=localhost
+DEFAULTCONFDIR="${HOME}/.editsieve"
+
+# report usage help
+function usage () {
+ echo "Usage: $0 -h"
+ echo " $0 --help"
+ echo " $0 [-c <confdir>] [-n <scriptname>] [-d <domain>|--domain <domain>] "
+ echo " [-p <password>] [-s <server>] <user>"
+ echo "Parameters:"
+ echo " -h|--help : Display this help"
+ echo " -c <dir> | --confdir <dir> : Directory to store configuration and other"
+ echo " data in (like the user's sieve script)."
+ echo " The directory will be created if necessary."
+ echo " Default: ${DEFAULTCONFDIR}"
+ echo " -d <domain>|--domain <domain> : Specify domain for the user."
+ echo " Default: ${DEFAULTDOMAIN}"
+ echo " -n <script>|--name <script> : Use <script> as the name of the script to"
+ if [ "$SCRIPTNAME" ]; then
+ echo " handle. Default: ${SCRIPTNAME}"
+ else
+ echo " handle. Default: <user>_<domain>"
+ fi
+ echo " -s <host> | --server <host> : Use <host> as the host to connect to."
+ echo " Default: ${DEFAULTHOST}"
+ echo " -p <pwd> | --password <pwd> : Deprecated: Define password to pass to"
+ echo " sieveshell (also on commandline). Using this"
+ echo " option might be convenient, but it is a"
+ echo " security risk. Default: Let sieveshell ask"
+ echo " <user> : User for which to edit the"
+ echo " sieve script. If specified as"
+ echo " user at do.main, use do.main as "
+ echo " the users domain."
+ echo "Note that a conflict between the domain specified with the"
+ echo "--domain parameter and a user specified in @do.main notation"
+ echo "will cause this script to abort."
+ echo
+}
+
+# Set initial values
+
+USER=""
+CONFDIR="${DEFAULTCONFDIR}"
+HOST="${DEFAULTHOST}"
+
+while [ $# -gt 0 ]; do
+ case "${1}" in
+ -d|--domain)
+ DOMAIN="${2}"
+ shift
+ shift
+ ;;
+ -c|--confdir)
+ CONFDIR="${2}"
+ shift
+ shift
+ ;;
+ -n|--script|--name)
+ SCRIPTNAME="${2}"
+ shift
+ shift
+ ;;
+ -p|--pass*)
+ PASSWORD="-p ${2}"
+ echo "WARNING: Passing passwords on the commandline is a potential security hazard."
+ shift
+ shift
+ ;;
+ -s|--server|--host)
+ HOST="$2"
+ shift
+ shift
+ ;;
+ -h|--help)
+ usage
+ exit 0
+ ;;
+ *)
+ # If USER had already been set, reaching this point
+ # means a second user was named. If so: report an error
+ # and show usage help.
+ if [ "${USER}" != "" ]; then
+ usage
+ echo ""
+ echo "ERROR: Multiple users specified" >&2
+ exit 1
+ fi
+ USER=$1
+ shift
+ ;;
+ esac
+done
+
+# check wether a username had been specified
+if [ "${USER}" = "" ]; then
+ echo "ERROR: No user specified" >&2
+ usage
+ exit 1
+fi
+
+# If we can't create files inside ${CONFDIR}, try to create a directory named ${CONFDIR}
+if ! touch "${CONFDIR}"/testfile; then
+ if [ -e "${CONFDIR}" ]; then
+ echo "ERROR: ${CONFDIR} exists, but is no directory or link to a directory"
+ exit 1
+ fi
+ if ! mkdir "${CONFDIR}" ; then
+ echo "ERROR: ${CONFDIR} doesn't exist and can't be created"
+ exit 1
+ fi
+else
+ rm -f "${CONFDIR}/testfile"
+fi
+
+# check wether the domain had been specified
+if [ "${DOMAIN}" = "" ]; then
+ # if the user was specified as user at domain, use the domainpart from there
+ if echo "${USER}" | grep -q "@" ; then
+ DOMAIN=`echo "${USER}" | sed -e 's/.*@//'`
+ USER=`echo "${USER}" | sed -e 's/@.*//'`
+ else
+ # if no domain was specified and the username didn't include the domain,
+ # use the default domain.
+ DOMAIN="${DEFAULTDOMAIN}"
+ fi
+else
+ # DOMAIN had been specified. Check for username in user at domain form
+ if echo "${USER}" | grep -q "@" ; then
+ # Yes, user was specified as user at domain
+ UDOMAIN=`echo "${USER}" | sed -e 's/.*@//'`
+ USER=`echo "${USER}" | sed -e 's/@.*//'`
+ # check wether the domain specified using the --domain switch
+ # conflicts with the one given using the user at domain notation
+ if [ "${UDOMAIN}" != "${DOMAIN}" ]; then
+ # yes they conflict: Abort with suitable error message
+ echo "ERROR: Domain part specified in username but conflicts with"\
+ "domain specified in -d parameter" >&2
+ exit 1
+ fi
+ fi
+fi
+
+# Set SCRIPTNAME to ${USER}_${DOMAIN} if not already set
+SCRIPTNAME="${SCRIPTNAME:-${USER}_${DOMAIN}}"
+
+echo "Trying to fetch script for ${USER}@${DOMAIN} from ${HOST}"
+if sieveshell -a "${USER}@${DOMAIN}" -u "${USER}@${DOMAIN}" \
+ ${PASSWOIRD} -e "get ${SCRIPTNAME} ${CONFDIR}/${SCRIPTNAME}" ${HOST}
+then
+ # fetch was successfull, keep a copy for later
+ cp -f "${CONFDIR}/${SCRIPTNAME}" "${CONFDIR}/${SCRIPTNAME}.orig"
+else
+ # an error occured while downloading.
+ echo WARNING: Unable to download script >&2
+ if [ ! -f "${CONFDIR}/${SCRIPTNAME}" ]; then
+ # there is no pre-existing script in $CONFDIR,
+ # create a default script
+ echo starting with a default script. >&2
+ # <<-EOF is like <<EOF except that it removes
+ # as much whitespace from the beginning of lines
+ # as there is in the first line
+ cat > "${CONFDIR}/${SCRIPTNAME}" <<-EOF
+ # Mail rules for ${USER}@${DOMAIN}
+ #
+ # load fileinto extension
+ require ["fileinto"];
+ #
+ # file spam into special folder
+ if header :contains "X-Spam-Flag" "YES"
+ {
+ fileinto "INBOX.Z_SPAM.suspected";
+ stop;
+ }
+ #
+ EOF
+ echo -n "" > "${CONFDIR}/${SCRIPTNAME}.orig"
+ else
+ echo "${CONFDIR}/${SCRIPTNAME}.orig exists, using it." >&2
+ fi
+fi
+SYNTAXOK=0
+# if $EDITOR is non-empty, use that to call the editor.
+# otherwise, use vi
+EDITOR="${EDITOR:-vi}"
+while [ "$SYNTAXOK" = "0" ]; do
+ "${EDITOR}" "${CONFDIR}/${SCRIPTNAME}"
+ echo "trying to compile rules file"
+ if /usr/lib/cyrus/bin/sievec -C /etc/imapd.conf "${CONFDIR}/${SCRIPTNAME}" "${CONFDIR}/${SCRIPTNAME}.bc" ; then
+ # all fine, sievec was able to compile the script, syntax is thus OK
+ rm "${CONFDIR}/${SCRIPTNAME}.bc"
+ SYNTAXOK=1
+ else
+ # There was some error compiling the script, askü user what to do
+ echo "ERROR: Compiling the script failed."
+ echo "Press 'e'+return (or just return) to edit the file again,"
+ echo "Press 's'+return for a shell (returns to editor after shell exits)"
+ echo "Predd 'a'+return or CTRL-C to abort."
+ echo "Press 'i'+return to ignore"
+ VALID=0
+ while [ "$VALID" = "0" ]; do
+ read a || exit 1
+ if [ "$a" = "i" ] || [ "$a" = "I" ]; then
+ # asume sievec had no problem
+ VALID=1
+ SYNTAXOK=1
+ elif [ "$a" = "s" ] || [ "$a" = "S" ]; then
+ VALID=1
+ echo "The edited file can be found in ${CONFDIR}/${SCRIPTNAME}"
+ echo "After the shell terminates, you will be returned to the editor"
+ bash
+ elif [ "$a" = "a" ] || [ "$a" = "A" ]; then
+ exit 1
+ elif [ "$a" = "e" ] || [ "$a" = "E" ] || [ "$a" = "" ]; then
+ VALID=1
+ else
+ echo "INVALID CHOICE, try again."
+ fi
+ done
+ fi
+done
+echo "copying file ${SCRIPTNAME} to ${SCRIPTNAME}.edited"
+cp "${CONFDIR}/${SCRIPTNAME}" "${CONFDIR}/${SCRIPTNAME}.edited"
+# check wether the file changed at all. If not, we can skip uploading
+echo trying diff
+if diff -q "${CONFDIR}/${SCRIPTNAME}.orig" "${CONFDIR}/${SCRIPTNAME}"; then
+ echo "Sieve rules unchanged, no upload needed."
+else
+ echo "Sieve rules changed, uploading and activating new file."
+ echo "${USER}@${DOMAIN}"
+ if sieveshell -a "${USER}@${DOMAIN}" -u "${USER}@${DOMAIN}" -e "put ${CONFDIR}/${SCRIPTNAME}
+activate ${SCRIPTNAME}" ${HOST} ; then
+ rm -f "${CONFDIR}/${SCRIPTNAME}.edited" ; echo "Upload OK"
+ else
+ echo "Upload failed! Leaving edited file in ${SCRIPTNAME}.edited"
+ fi
+ rm "${CONFDIR}/${SCRIPTNAME}.orig"
+fi
+
Modified: kolab-cyrus-imapd/trunk/debian/executable.files
===================================================================
--- kolab-cyrus-imapd/trunk/debian/executable.files 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/executable.files 2006-11-01 20:20:28 UTC (rev 502)
@@ -9,7 +9,7 @@
./contrib/notify_unix/simple_notify.pl
./contrib/notify_unix/sql_notify.pl
./debian/cyrus-makedirs
-./debian/kolab-cyrus-common.cyrus22.init
+./debian/kolab-cyrus-common.kolab-cyrus.init
./debian/kolab-cyrus-common.postinst
./debian/kolab-cyrus-common.postrm
./debian/kolab-cyrus-common.prerm
Modified: kolab-cyrus-imapd/trunk/debian/imapd.conf
===================================================================
--- kolab-cyrus-imapd/trunk/debian/imapd.conf 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/imapd.conf 2006-11-01 20:20:28 UTC (rev 502)
@@ -1,5 +1,5 @@
# Debian Cyrus imapd.conf
-# $Id: imapd.conf 229 2005-12-08 23:26:29Z astronut $
+# $Id: imapd.conf 356 2006-04-20 15:26:57Z sven $
# See imapd.conf(5) for more information and more options
# Configuration directory
@@ -43,8 +43,9 @@
# 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.
+# probably a very good idea to set lmtp_downcase_rcpt to true. This is set by
+# default, per RFC2821. This was not set by default in debian versions up to
+# and including 2.2.12-4.
lmtp_downcase_rcpt: yes
# Uncomment the following and add the space-separated users who
Modified: kolab-cyrus-imapd/trunk/debian/kolab-cyrus-admin.README.Debian
===================================================================
--- kolab-cyrus-imapd/trunk/debian/kolab-cyrus-admin.README.Debian 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-admin.README.Debian 2006-11-01 20:20:28 UTC (rev 502)
@@ -1,5 +1,5 @@
Cyrus IMAP for Debian, admin utilities
-$Id: cyrus-admin-2.2.README.Debian 229 2005-12-08 23:26:29Z astronut $
+$Id: cyrus-admin-2.2.README.Debian 356 2006-04-20 15:26:57Z sven $
---------------------
Refer to the cyrus22-doc package for more information. There is a lot
Modified: kolab-cyrus-imapd/trunk/debian/kolab-cyrus-clients.README.Debian
===================================================================
--- kolab-cyrus-imapd/trunk/debian/kolab-cyrus-clients.README.Debian 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-clients.README.Debian 2006-11-01 20:20:28 UTC (rev 502)
@@ -1,5 +1,5 @@
Cyrus IMAP for Debian, generic SASL-enabled protocol clients
-$Id: cyrus-clients-2.2.README.Debian 229 2005-12-08 23:26:29Z astronut $
+$Id: cyrus-clients-2.2.README.Debian 356 2006-04-20 15:26:57Z sven $
---------------------
Refer to the cyrus-doc-2.2 package for more information. There is a lot
Modified: kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.cron.daily
===================================================================
--- kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.cron.daily 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.cron.daily 2006-11-01 20:20:28 UTC (rev 502)
@@ -1,7 +1,7 @@
#!/bin/sh
# Cyrus IMAPd daily maintenance script
# Copyright (c) 2002,2003 by Henrique M. Holschuh
-# $Id: cyrus-common-2.2.cron.daily 229 2005-12-08 23:26:29Z astronut $
+# $Id: cyrus-common-2.2.cron.daily 356 2006-04-20 15:26:57Z sven $
# Distributed under the terms of the GNU General Public License version 2
#
# This script:
Modified: kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.kolab-cyrus.default
===================================================================
--- kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.kolab-cyrus.default 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.kolab-cyrus.default 2006-11-01 20:20:28 UTC (rev 502)
@@ -1,5 +1,5 @@
# Defaults for Cyrus IMAPd 2.2 scripts
-# $Id: cyrus-common-2.2.cyrus2.2.default 229 2005-12-08 23:26:29Z astronut $
+# $Id: cyrus-common-2.2.cyrus2.2.default 356 2006-04-20 15:26:57Z sven $
# sourced by /etc/init.d/kolab-cyrus, /usr/sbin/cyrus-makedirs
# installed at /etc/default/kolab-cyrus by the maintainer scripts
#
Modified: kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.kolab-cyrus.init
===================================================================
--- kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.kolab-cyrus.init 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.kolab-cyrus.init 2006-11-01 20:20:28 UTC (rev 502)
@@ -20,7 +20,7 @@
# Various modifications done by Sven Mueller <debian at incase.de>
# Distributed under the GPL version 2
#
-# $Id: cyrus-common-2.2.cyrus2.2.init 229 2005-12-08 23:26:29Z astronut $
+# $Id: cyrus-common-2.2.cyrus2.2.init 356 2006-04-20 15:26:57Z sven $
# Make sure we get sane results on borked locales
LC_ALL=C
@@ -44,7 +44,7 @@
set -e
-START="--start --quiet --pidfile /var/run/${NAME}.pid --exec ${DAEMON} -- ${OPTIONS}"
+START="--start --quiet --pidfile /var/run/${NAME}.pid --exec ${DAEMON} --name ${NAME} -- ${OPTIONS}"
verifydb() {
while read -r DBKEY DBVALUE ; do
@@ -93,7 +93,7 @@
return 0
fi
fi
- if [ -s /var/run/${NAME}.pid ] && kill -0 `cat /var/run/${NAME}.pid`; then
+ if [ -s /var/run/${NAME}.pid ] && kill -0 `cat /var/run/${NAME}.pid` > /dev/null 2>&1; then
return 0
else
# the PID file might simply not match the cyrmaster process.
@@ -159,7 +159,7 @@
stop)
echo -n "Stopping $DESC: "
if start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
- --quiet --startas $DAEMON >/dev/null 2>&1 ; then
+ --name ${NAME} --quiet --startas $DAEMON >/dev/null 2>&1 ; then
echo "$NAME."
rm -f /var/run/${NAME}.pid
exit 0
@@ -181,7 +181,7 @@
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
+ --name ${NAME} --pidfile /var/run/$NAME.pid >/dev/null 2>&1 ; then
exit 0
else
exit 1
Modified: kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.postinst
===================================================================
--- kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.postinst 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.postinst 2006-11-01 20:20:28 UTC (rev 502)
@@ -2,7 +2,7 @@
# postinst script for kolab-cyrus-common
# Copyright (c) 2002 by Henrique de Moraes Holschuh
# Distributed under the GNU General Public License version 2
-# $Id: cyrus-common-2.2.postinst 229 2005-12-08 23:26:29Z astronut $
+# $Id: cyrus-common-2.2.postinst 356 2006-04-20 15:26:57Z sven $
#
# see: dh_installdeb(1)
@@ -52,9 +52,9 @@
configure)
# Add the cyrus user (requires adduser >= 3.34)
echo "Creating/updating cyrus user account..."
- adduser --system --ingroup mail --home /var/spool/cyrus \
+ adduser --quiet --system --ingroup mail --home /var/spool/cyrus \
--shell /bin/sh --disabled-password \
- --gecos "Cyrus Mailsystem User" cyrus >/dev/null 2>&1 || {
+ --gecos "Cyrus Mailsystem User" cyrus >/dev/null || {
if getent passwd | grep -s -q -E '^cyrus:'; then
echo "Non-system user cyrus found. I will not overwrite a non-system" >&2
echo "user. Remove the user and reinstall kolab-cyrus-common." >&2
@@ -86,7 +86,7 @@
# DISABLED, since rehash seems busted
#[ -d /var/spool/cyrus/mail/A ] && {
# echo Converting spools to basic hash scheme...
- # #su - cyrus -c /usr/lib/cyrus/upgrade/rehash basic
+ # #su - cyrus -c "/usr/lib/cyrus/upgrade/rehash basic"
# start-stop-daemon --start --exec /usr/lib/cyrus/upgrade/rehash --chuid cyrus:mail --verbose -- basic
#}
Modified: kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.postrm
===================================================================
--- kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.postrm 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.postrm 2006-11-01 20:20:28 UTC (rev 502)
@@ -2,7 +2,7 @@
# postrm script for kolab-cyrus-common
# Copyright (c) 2002 by Henrique de Moraes Holschuh
# Distributed under the GNU General Public License version 2
-# $Id: cyrus-common-2.2.postrm 232 2005-12-10 22:18:01Z astronut $
+# $Id: cyrus-common-2.2.postrm 356 2006-04-20 15:26:57Z sven $
#
# see: dh_installdeb(1)
Modified: kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.prerm
===================================================================
--- kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.prerm 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.prerm 2006-11-01 20:20:28 UTC (rev 502)
@@ -2,7 +2,7 @@
# prerm script for kolab-cyrus-common
# Copyright (c) 2002 by Henrique de Moraes Holschuh
# Distributed under the GNU General Public License version 2
-# $Id: cyrus-common-2.2.prerm 229 2005-12-08 23:26:29Z astronut $
+# $Id: cyrus-common-2.2.prerm 356 2006-04-20 15:26:57Z sven $
#
# see: dh_installdeb(1)
Modified: kolab-cyrus-imapd/trunk/debian/license.html
===================================================================
--- kolab-cyrus-imapd/trunk/debian/license.html 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/license.html 2006-11-01 20:20:28 UTC (rev 502)
@@ -1,6 +1,6 @@
-<! $Id: license.html 5 2005-03-12 23:19:45Z sven $ >
+<! $Id: license.html 356 2006-04-20 15:26:57Z sven $ >
<HTML>
<TITLE>
Cyrus IMAP Licensing
Modified: kolab-cyrus-imapd/trunk/debian/logcheck.ignore
===================================================================
--- kolab-cyrus-imapd/trunk/debian/logcheck.ignore 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/logcheck.ignore 2006-11-01 20:20:28 UTC (rev 502)
@@ -51,3 +51,4 @@
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
+cyrus/lmtpunix\[[0-9]+\]: +IOERROR: fstating sieve script [/a-zA-Z^]/defaultbc: No such file or directory
Added: kolab-cyrus-imapd/trunk/debian/logcheck.violations.ignore
===================================================================
--- kolab-cyrus-imapd/trunk/debian/logcheck.violations.ignore 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/logcheck.violations.ignore 2006-11-01 20:20:28 UTC (rev 502)
@@ -0,0 +1,5 @@
+cyrus/lmtpunix\[[0-9]+\]: +IOERROR: fstating sieve script [/a-zA-Z^]/defaultbc: No such file or directory
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +(\[[a-z0-9]+\] )?STARTTLS( negotiation)? failed:
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +pop3s failed:
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +SQUAT failed
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +imaps TLS negotiation failed
Modified: kolab-cyrus-imapd/trunk/debian/patches/00list
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/00list 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/patches/00list 2006-11-01 20:20:28 UTC (rev 502)
@@ -18,7 +18,6 @@
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
@@ -27,6 +26,7 @@
40-rehash_fix_pathes.dpatch
45-kolab2-annotations.dpatch
50-FTBFS-gcc-4.0-fix.dpatch
+55-fix-db_err_callback.dpatch
51-multiple_mupdate_err.h-fix.dpatch
61-64bit-quota.dpatch
65-sieveshell-enhancements.dpatch
Modified: kolab-cyrus-imapd/trunk/debian/patches/20-drac_auth.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/20-drac_auth.dpatch 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/patches/20-drac_auth.dpatch 2006-11-01 20:20:28 UTC (rev 502)
@@ -5,9 +5,9 @@
## DP: Enable DRAC (pop-before-smtp) authentication
@DPATCH@
-diff -urNad cyrus-imapd-2.2.12/configure.in /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/configure.in
---- cyrus-imapd-2.2.12/configure.in 2005-11-17 04:23:45.000000000 +0100
-+++ /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/configure.in 2005-11-17 04:23:46.955948052 +0100
+diff -urNad cyrus-imapd-2.2.12/configure.in /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/configure.in
+--- cyrus-imapd-2.2.12/configure.in 2006-02-14 17:13:36.000000000 +0100
++++ /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/configure.in 2006-02-14 17:13:44.656438535 +0100
@@ -988,6 +988,19 @@
SNMP_SUBDIRS=""
AC_SUBST(SNMP_SUBDIRS)
@@ -28,9 +28,9 @@
CMU_LIBWRAP
CMU_UCDSNMP
-diff -urNad cyrus-imapd-2.2.12/imap/Makefile.in /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/Makefile.in
---- cyrus-imapd-2.2.12/imap/Makefile.in 2005-11-17 04:23:45.000000000 +0100
-+++ /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/Makefile.in 2005-11-17 04:23:46.955948052 +0100
+diff -urNad cyrus-imapd-2.2.12/imap/Makefile.in /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/imap/Makefile.in
+--- cyrus-imapd-2.2.12/imap/Makefile.in 2006-02-14 17:13:36.000000000 +0100
++++ /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/imap/Makefile.in 2006-02-14 17:13:44.657438437 +0100
@@ -69,6 +69,7 @@
SIEVE_LIBS = @SIEVE_LIBS@
IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
@@ -56,7 +56,7 @@
$(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \
$(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
- $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+ $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS) $(DRAC_LIBS)
++ $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
proxyd: $(PROXYDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
$(CC) $(LDFLAGS) -o proxyd \
@@ -69,9 +69,9 @@
nntpd: nntpd.o backend.o index.o smtpclient.o spool.o tls.o \
mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE)
-diff -urNad cyrus-imapd-2.2.12/imap/imapd.c /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/imapd.c
---- cyrus-imapd-2.2.12/imap/imapd.c 2005-11-17 04:23:45.000000000 +0100
-+++ /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/imapd.c 2005-11-17 04:23:46.958947759 +0100
+diff -urNad cyrus-imapd-2.2.12/imap/imapd.c /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/imap/imapd.c
+--- cyrus-imapd-2.2.12/imap/imapd.c 2006-02-14 17:13:36.000000000 +0100
++++ /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/imap/imapd.c 2006-02-14 17:13:44.660438143 +0100
@@ -137,6 +137,18 @@
1, 1, &imapd_authstate, &imapd_userisadmin, &imapd_userisproxyadmin
};
@@ -214,9 +214,9 @@
/* Create telemetry log */
imapd_logfd = telemetry_log(imapd_userid, imapd_in, imapd_out, 0);
-diff -urNad cyrus-imapd-2.2.12/imap/pop3d.c /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/pop3d.c
---- cyrus-imapd-2.2.12/imap/pop3d.c 2005-11-17 04:23:45.000000000 +0100
-+++ /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/pop3d.c 2005-11-17 04:23:46.960947563 +0100
+diff -urNad cyrus-imapd-2.2.12/imap/pop3d.c /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/imap/pop3d.c
+--- cyrus-imapd-2.2.12/imap/pop3d.c 2006-02-14 17:13:36.000000000 +0100
++++ /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/imap/pop3d.c 2006-02-14 17:13:44.661438045 +0100
@@ -44,6 +44,10 @@
*/
#include <config.h>
@@ -261,9 +261,9 @@
}
/* Create telemetry log */
-diff -urNad cyrus-imapd-2.2.12/imap/version.c /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/version.c
---- cyrus-imapd-2.2.12/imap/version.c 2005-11-17 04:21:25.000000000 +0100
-+++ /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/version.c 2005-11-17 04:23:46.960947563 +0100
+diff -urNad cyrus-imapd-2.2.12/imap/version.c /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/imap/version.c
+--- cyrus-imapd-2.2.12/imap/version.c 2006-02-11 23:57:19.000000000 +0100
++++ /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/imap/version.c 2006-02-14 17:13:44.662437947 +0100
@@ -151,6 +151,10 @@
snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
"; %s", SIEVE_VERSION);
@@ -275,9 +275,9 @@
#ifdef HAVE_LIBWRAP
snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
"; TCP Wrappers");
-diff -urNad cyrus-imapd-2.2.12/lib/imapoptions /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/lib/imapoptions
---- cyrus-imapd-2.2.12/lib/imapoptions 2005-11-17 04:23:45.000000000 +0100
-+++ /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/lib/imapoptions 2005-11-17 04:26:47.858267907 +0100
+diff -urNad cyrus-imapd-2.2.12/lib/imapoptions /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/lib/imapoptions
+--- cyrus-imapd-2.2.12/lib/imapoptions 2006-02-14 17:13:36.000000000 +0100
++++ /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/lib/imapoptions 2006-02-14 17:13:44.663437849 +0100
@@ -196,6 +196,15 @@
{ "deleteright", "c", STRING }
/* The right that a user needs to delete a mailbox. */
Added: kolab-cyrus-imapd/trunk/debian/patches/55-fix-db_err_callback.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/55-fix-db_err_callback.dpatch 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/patches/55-fix-db_err_callback.dpatch 2006-11-01 20:20:28 UTC (rev 502)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 55-fix-db_err_callback.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.12/lib/cyrusdb_berkeley.c /tmp/dpep.iwhsD7/cyrus-imapd-2.2.12/lib/cyrusdb_berkeley.c
+--- cyrus-imapd-2.2.12/lib/cyrusdb_berkeley.c 2005-03-12 23:09:22.000000000 +0100
++++ /tmp/dpep.iwhsD7/cyrus-imapd-2.2.12/lib/cyrusdb_berkeley.c 2006-01-14 19:39:43.150703236 +0100
+@@ -104,7 +104,11 @@
+ exit(EC_TEMPFAIL);
+ }
+
++#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 3
+ static void db_err(const char *db_prfx, char *buffer)
++#else
++static void db_err(const DB_ENV *dbenv, const char *db_prfx, const char *buffer)
++#endif
+ {
+ syslog(LOG_WARNING, "DBERROR %s: %s", db_prfx, buffer);
+ }
Modified: kolab-cyrus-imapd/trunk/debian/patches/61-64bit-quota.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/61-64bit-quota.dpatch 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/patches/61-64bit-quota.dpatch 2006-11-01 20:20:28 UTC (rev 502)
@@ -8,8 +8,8 @@
diff -urN cyrus-imapd-2.2.12~/configure.in cyrus-imapd-2.2.12/configure.in
--- cyrus-imapd-2.2.12~/configure.in 2005-01-19 00:46:00.000000000 +0100
+++ cyrus-imapd-2.2.12/configure.in 2005-08-30 12:09:28.000000000 +0200
-@@ -100,6 +100,15 @@
- fi
+@@ -107,6 +107,15 @@
+ dnl fi
AC_C_INLINE
+dnl Check if `long long int' is available
@@ -48,7 +48,7 @@
diff -urN cyrus-imapd-2.2.12~/imap/imapd.c cyrus-imapd-2.2.12/imap/imapd.c
--- cyrus-imapd-2.2.12~/imap/imapd.c 2005-02-14 07:39:55.000000000 +0100
+++ cyrus-imapd-2.2.12/imap/imapd.c 2005-08-30 12:09:28.000000000 +0200
-@@ -2626,10 +2626,10 @@
+@@ -2716,10 +2716,10 @@
*/
int warnsize = config_getint(IMAPOPT_QUOTAWARNKB);
if (warnsize <= 0 || warnsize >= imapd_mailbox->quota.limit ||
@@ -62,7 +62,7 @@
if (usage >= 100.0) {
prot_printf(imapd_out, "* NO [ALERT] %s\r\n",
error_message(IMAP_NO_OVERQUOTA));
-@@ -4626,7 +4626,7 @@
+@@ -4722,7 +4722,7 @@
printastring(name);
prot_printf(imapd_out, " (");
if (quota.limit >= 0) {
@@ -71,7 +71,7 @@
quota.used/QUOTA_UNITS, quota.limit);
}
prot_printf(imapd_out, ")\r\n");
-@@ -4688,7 +4688,7 @@
+@@ -4784,7 +4784,7 @@
printastring(mailboxname);
prot_printf(imapd_out, " (");
if (mailbox.quota.limit >= 0) {
Modified: kolab-cyrus-imapd/trunk/debian/rules
===================================================================
--- kolab-cyrus-imapd/trunk/debian/rules 2006-11-01 19:30:50 UTC (rev 501)
+++ kolab-cyrus-imapd/trunk/debian/rules 2006-11-01 20:20:28 UTC (rev 502)
@@ -223,7 +223,7 @@
# and logcheck files
install -m 644 debian/logcheck.ignore \
$(PKGDIR)/etc/logcheck/ignore.d.server/kolab-cyrus
- install -m 644 debian/logcheck.ignore \
+ install -m 644 debian/logcheck.violations.ignore \
$(PKGDIR)/etc/logcheck/violations.ignore.d/kolab-cyrus
# Install the stuff needed for upgrades
More information about the pkg-kolab-devel
mailing list