[SVN] r554 - in /branches/sarge-2.2.13/debian: ./ patches/
debian at incase.de
debian at incase.de
Thu Aug 10 01:36:51 UTC 2006
Author: sven
Date: Thu Aug 10 03:36:33 2006
New Revision: 554
URL: https://mail.incase.de/viewcvs?rev=554&root=cyrus22&view=rev
Log:
Bring sarge branch in sync with 2.2.13-5 release from trunk
Added:
branches/sarge-2.2.13/debian/cyrus-admin-2.2.install
- copied unchanged from r552, trunk/cyrus-imapd-2.2.13/debian/cyrus-admin-2.2.install
branches/sarge-2.2.13/debian/cyrus-common-2.2.cyrus22.cron.daily
- copied unchanged from r552, trunk/cyrus-imapd-2.2.13/debian/cyrus-common-2.2.cyrus22.cron.daily
branches/sarge-2.2.13/debian/cyrus-common-2.2.preinst
- copied unchanged from r552, trunk/cyrus-imapd-2.2.13/debian/cyrus-common-2.2.preinst
branches/sarge-2.2.13/debian/cyrus-dev-2.2.install
- copied unchanged from r552, trunk/cyrus-imapd-2.2.13/debian/cyrus-dev-2.2.install
branches/sarge-2.2.13/debian/cyrus-imapd-2.2.install
- copied unchanged from r552, trunk/cyrus-imapd-2.2.13/debian/cyrus-imapd-2.2.install
branches/sarge-2.2.13/debian/cyrus-murder-2.2.install
- copied unchanged from r552, trunk/cyrus-imapd-2.2.13/debian/cyrus-murder-2.2.install
branches/sarge-2.2.13/debian/cyrus-nntpd-2.2.install
- copied unchanged from r552, trunk/cyrus-imapd-2.2.13/debian/cyrus-nntpd-2.2.install
branches/sarge-2.2.13/debian/cyrus-pop3d-2.2.install
- copied unchanged from r552, trunk/cyrus-imapd-2.2.13/debian/cyrus-pop3d-2.2.install
branches/sarge-2.2.13/debian/libcyrus-imap-perl22.install
- copied unchanged from r552, trunk/cyrus-imapd-2.2.13/debian/libcyrus-imap-perl22.install
branches/sarge-2.2.13/debian/patches/0006-upstream-free-backend-fix.dpatch
- copied unchanged from r552, trunk/cyrus-imapd-2.2.13/debian/patches/0006-upstream-free-backend-fix.dpatch
branches/sarge-2.2.13/debian/patches/0007-upstream-remove-undump-size-limit.dpatch
- copied unchanged from r552, trunk/cyrus-imapd-2.2.13/debian/patches/0007-upstream-remove-undump-size-limit.dpatch
branches/sarge-2.2.13/debian/patches/0008-upstream-better-message-track-logging.dpatch
- copied unchanged from r552, trunk/cyrus-imapd-2.2.13/debian/patches/0008-upstream-better-message-track-logging.dpatch
branches/sarge-2.2.13/debian/patches/0009-upstream-remove-redundant-wildcard-check.dpatch
- copied unchanged from r552, trunk/cyrus-imapd-2.2.13/debian/patches/0009-upstream-remove-redundant-wildcard-check.dpatch
branches/sarge-2.2.13/debian/patches/23-configurable_idled.dpatch
- copied unchanged from r552, trunk/cyrus-imapd-2.2.13/debian/patches/23-configurable_idled.dpatch
Removed:
branches/sarge-2.2.13/debian/cyrus-admin-2.2.files
branches/sarge-2.2.13/debian/cyrus-common-2.2.cron.daily
branches/sarge-2.2.13/debian/cyrus-common-2.2.files
branches/sarge-2.2.13/debian/cyrus-dev-2.2.files
branches/sarge-2.2.13/debian/cyrus-imapd-2.2.files
branches/sarge-2.2.13/debian/cyrus-murder-2.2.files
branches/sarge-2.2.13/debian/cyrus-nntpd-2.2.files
branches/sarge-2.2.13/debian/cyrus-pop3d-2.2.files
branches/sarge-2.2.13/debian/libcyrus-imap-perl22.files
Modified:
branches/sarge-2.2.13/debian/README.Debian
branches/sarge-2.2.13/debian/changelog
branches/sarge-2.2.13/debian/control
branches/sarge-2.2.13/debian/copyright
branches/sarge-2.2.13/debian/cyrus-common-2.2.cyrus2.2.default
branches/sarge-2.2.13/debian/cyrus-common-2.2.cyrus2.2.init
branches/sarge-2.2.13/debian/cyrus-common-2.2.postrm
branches/sarge-2.2.13/debian/imapd.conf
branches/sarge-2.2.13/debian/patches/0001-upstream-fix-segfault.dpatch
branches/sarge-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch
branches/sarge-2.2.13/debian/patches/00list
branches/sarge-2.2.13/debian/patches/08-clean_socket_closes.dpatch
branches/sarge-2.2.13/debian/patches/99-update-autoconf.dpatch
Modified: branches/sarge-2.2.13/debian/README.Debian
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/README.Debian?rev=554&root=cyrus22&r1=553&r2=554&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/README.Debian (original)
+++ branches/sarge-2.2.13/debian/README.Debian Thu Aug 10 03:36:33 2006
@@ -80,6 +80,15 @@
use plaintext authentication methods. The easiest thing to do is to put
an entry for your mupdate user in sasldb2 and use DIGEST-MD5.
+4. Configurable idled support.
+
+ Cyrus IMAPd supports three options of using IDLE in IMAP sessions. The first
+ option is not to support IDLE at all. The second is to use internal polling
+ in the IMAP daemon. The third option is to use an external daemon, idled.
+ Upstream only supports configuration of this during compilation, Debian
+ however includes a patch which makes this runtime-configurable. Please
+ set the 'idlemethod' imapd.conf option according to your needs and enable
+ idled in cyrus.conf if you want to use it.
General notes and hints:
------------------------
Modified: branches/sarge-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/changelog?rev=554&root=cyrus22&r1=553&r2=554&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/changelog (original)
+++ branches/sarge-2.2.13/debian/changelog Thu Aug 10 03:36:33 2006
@@ -2,9 +2,9 @@
* Backport of 2.2.13-5 to sarge
- -- Sven Mueller <sven at debian.org> Wed, 28 Jun 2006 23:18:39 +0200
-
-cyrus-imapd-2.2 (2.2.13-5) UNRELEASED; urgency=low
+ -- Sven Mueller <sven at debian.org> Thu, 10 Aug 2006 03:34:53 +0200
+
+cyrus-imapd-2.2 (2.2.13-5) unstable; urgency=low
* The "Need to clean the Windows" release
@@ -18,6 +18,8 @@
* 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)
+ * Rename cron script to cyrus22 since dots aren't allowed
+ (Closes: #382069)
[ Sven Mueller ]
* Remove outdated entry about netnews removal from README.Debian
@@ -35,8 +37,15 @@
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
+ * Use configurable idle patch from OndÃ
~Yej Surý
+ * Add some more options to /etc/default/cyrus2.2 and use them in the init
+ script, including a generic OPTIONS variable to allow setting of any
+ commandline option for cyrmaster. (Closes: #382061)
+ * Add logic in cyrus-common-2.2 preinst/postrm scripts to rename the
+ cron.daily script. Supplements change by Benjamin Seidenberg, closing
+ #382069.
+
+ -- Sven Mueller <sven at debian.org> Thu, 10 Aug 2006 03:17:27 +0200
cyrus-imapd-2.2 (2.2.13-4) unstable; urgency=low
Modified: branches/sarge-2.2.13/debian/control
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/control?rev=554&root=cyrus22&r1=553&r2=554&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/control (original)
+++ branches/sarge-2.2.13/debian/control Thu Aug 10 03:36:33 2006
@@ -2,7 +2,7 @@
Section: mail
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 <debian at incase.de>, Benjamin Seidenberg <astronut at dlgeek.net>, Ondřej Surý <ondrej at 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.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]
@@ -39,6 +39,8 @@
components. The cyrus22-imapd and/or cyrus22-pop3d packages are needed
to enable IMAP and POP3 support respectively. cyrus22-murder can be
used to enable IMAP, POP3 and LMTP proxying.
+ .
+ Homepage: http://cyrusimap.web.cmu.edu/
Package: cyrus-doc-2.2
Architecture: all
Modified: branches/sarge-2.2.13/debian/copyright
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/copyright?rev=554&root=cyrus22&r1=553&r2=554&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/copyright (original)
+++ branches/sarge-2.2.13/debian/copyright Thu Aug 10 03:36:33 2006
@@ -9,6 +9,9 @@
Sven Mueller <debian at incase.de>,
Benjamin Seidenberg <astronut at dlgeek.net>
and distributed in the same license as the upstream source it applies to.
+
+The debian packages are maintained in a subversion repository at:
+ https://mail.incase.de/svn/cyrus22/
Upstream sources are at: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/.
Modified: branches/sarge-2.2.13/debian/cyrus-common-2.2.cyrus2.2.default
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/cyrus-common-2.2.cyrus2.2.default?rev=554&root=cyrus22&r1=553&r2=554&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/cyrus-common-2.2.cyrus2.2.default (original)
+++ branches/sarge-2.2.13/debian/cyrus-common-2.2.cyrus2.2.default Thu Aug 10 03:36:33 2006
@@ -22,9 +22,19 @@
#CYRUSOPTFILESYS=1
# The default Cyrus IMAP config file that the scripts should
-# use. You better know what you're doing if you change this
+# use. You better know what you're doing if you change this
#CONF=/etc/imapd.conf
+
+# The default cyrus master config file that the scripts shoud
+# use. You better know what you're doing if you change this.
+#MASTERCONF=/etc/cyrus.conf
# Check spool condition with chk_cyrus on daily cronjob
# Set to 1 to enable, default is disabled
#CHKCYRUS=0
+
+# Set the path to the PID file
+#PIDFILE=/var/run/cyrmaster.pid
+
+# Set other Options here.
+OPTIONS=""
Modified: branches/sarge-2.2.13/debian/cyrus-common-2.2.cyrus2.2.init
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/cyrus-common-2.2.cyrus2.2.init?rev=554&root=cyrus22&r1=553&r2=554&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/cyrus-common-2.2.cyrus2.2.init (original)
+++ branches/sarge-2.2.13/debian/cyrus-common-2.2.cyrus2.2.init Thu Aug 10 03:36:33 2006
@@ -29,22 +29,28 @@
# Overridable defaults
unset CYRUS_VERBOSE
unset LISTENQUEUE
+unset CONF
+unset MASTERCONF
[ -r /etc/default/cyrus2.2 ] && . /etc/default/cyrus2.2
[ "x${CYRUS_VERBOSE}" != "x" ] && export CYRUS_VERBOSE
-OPTIONS="-d"
+# Make sure the master process is daemonized
+OPTIONS="${OPTIONS} -d"
+[ "x${CONF}" != "x" ] && OPTIONS="-C ${CONF} ${OPTIONS}"
+[ "x${MASTERCONF}" != "x" ] && OPTIONS="-M ${MASTERCONF} ${OPTIONS}"
[ "x${LISTENQUEUE}" != "x" ] && OPTIONS="-l ${LISTENQUEUE} ${OPTIONS}"
PATH=/sbin:/usr/sbin:/bin:/usr/bin
DAEMON=/usr/sbin/cyrmaster
NAME=cyrmaster
+[ "x${PIDFILE}" = "x" ] && PIDFILE="/var/run/${NAME}.pid"
DESC="Cyrus IMAPd"
test -x ${DAEMON} || exit 0
set -e
-START="--start --quiet --pidfile /var/run/${NAME}.pid --exec ${DAEMON} --name ${NAME} -- ${OPTIONS}"
+START="--start --quiet --pidfile ${PIDFILE} --exec ${DAEMON} --name ${NAME} -- ${OPTIONS}"
verifydb() {
while read -r DBKEY DBVALUE ; do
@@ -81,7 +87,12 @@
}
check_status () {
- if [ ! -f /var/run/${NAME}.pid ]; then
+ if [ "$1" = "verbose" ]; then
+ PRINTIT=echo
+ else
+ PRINTIT=true
+ fi
+ if [ ! -f ${PIDFILE} ]; then
# using [c] in the grep avoids catching the grep
# process itself
if ps auxww | grep -qE 'usr/sbin/[c]yrmaster' ; then
@@ -89,20 +100,24 @@
# 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
+ && pidof /usr/sbin/cyrmaster > ${PIDFILE}
+ ${PRINTIT} "cyrmaster running with PID `cat ${PIDFILE}`"
return 0
fi
fi
- if [ -s /var/run/${NAME}.pid ] && kill -0 `cat /var/run/${NAME}.pid` > /dev/null 2>&1; then
+ if [ -s ${PIDFILE} ] && kill -0 `cat ${PIDFILE}` > /dev/null 2>&1; then
+ ${PRINTIT} "cyrmaster running with PID `cat ${PIDFILE}`"
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
+ pidof /usr/sbin/cyrmaster > ${PIDFILE}
+ ${PRINTIT} "cyrmaster running with PID `cat ${PIDFILE}`"
return 0
else
# no process and/or no PID file, return failure
+ ${PRINTIT} "cyrmaster not running with"
return 1
fi
fi
@@ -161,7 +176,7 @@
if start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
--name ${NAME} --quiet --startas $DAEMON >/dev/null 2>&1 ; then
echo "$NAME."
- rm -f /var/run/${NAME}.pid
+ rm -f ${PIDFILE}
exit 0
else
# process running?
@@ -173,7 +188,7 @@
# No, return as if stopped a running process
# successfully.
echo "."
- rm -f /var/run/${NAME}.pid
+ rm -f ${PIDFILE}
exit 0
fi
fi
@@ -208,7 +223,7 @@
exec $0 start
;;
status)
- check_status
+ check_status verbose
exit $?
;;
try-restart)
Modified: branches/sarge-2.2.13/debian/cyrus-common-2.2.postrm
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/cyrus-common-2.2.postrm?rev=554&root=cyrus22&r1=553&r2=554&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/cyrus-common-2.2.postrm (original)
+++ branches/sarge-2.2.13/debian/cyrus-common-2.2.postrm Thu Aug 10 03:36:33 2006
@@ -55,10 +55,27 @@
update-rc.d cyrus2.2 remove >/dev/null
;;
- upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
+ upgrade|failed-upgrade|disappear)
;;
-
+ abort-upgrade)
+ # old version was in "configuration files only" state,
+ # installation of new package failed before or after unpack
+ if dpkg --compare-versions "$2" lt "2.2.13-4bpo1" ; then
+ if [ -f /etc/cron.daily/cyrus22 ] \
+ && [ ! -f /etc/cron.daily/cyrus-common-2.2 ]; then
+ mv -f /etc/cron.daily/cyrus22 /etc/cron.daily/cyrus-common-2.2
+ fi
+ fi
+ ;;
+ abort-install)
+ # old version was fully installed, but upgrade failed
+ if dpkg --compare-versions "$2" lt "2.2.13-4bpo1" ; then
+ if [ -f /etc/cron.daily/cyrus22 ] \
+ && [ ! -f /etc/cron.daily/cyrus-common-2.2 ]; then
+ mv -f /etc/cron.daily/cyrus22 /etc/cron.daily/cyrus-common-2.2
+ fi
+ fi
+ ;;
*)
echo "postrm called with unknown argument \`$1'" >&2
exit 0
Modified: branches/sarge-2.2.13/debian/imapd.conf
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/imapd.conf?rev=554&root=cyrus22&r1=553&r2=554&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/imapd.conf (original)
+++ branches/sarge-2.2.13/debian/imapd.conf Thu Aug 10 03:36:33 2006
@@ -294,6 +294,13 @@
# Unix domain socket that lmtpd listens on.
lmtpsocket: /var/run/cyrus/socket/lmtp
+# The idle backend to use for IDLE command.
+# Options: poll (default), idled, no
+# poll doesn't need the idled daemon and is supposed to be more robust.
+# however it doesn't update as quickly as the idled backend does. "no"
+# turns off IDLE support
+idlemethod: poll
+
# Unix domain socket that idled listens on.
idlesocket: /var/run/cyrus/socket/idle
Modified: branches/sarge-2.2.13/debian/patches/0001-upstream-fix-segfault.dpatch
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/patches/0001-upstream-fix-segfault.dpatch?rev=554&root=cyrus22&r1=553&r2=554&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/patches/0001-upstream-fix-segfault.dpatch (original)
+++ branches/sarge-2.2.13/debian/patches/0001-upstream-fix-segfault.dpatch Thu Aug 10 03:36:33 2006
@@ -1,5 +1,5 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## fileZZS7sd.dpatch by Sven Mueller <debian at incase.de>
+## 0001-upstream-fix-segfault.dpatch by Sven Mueller <debian at incase.de>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix for imap/backend.c, upstream CVS edition 1.40
Modified: branches/sarge-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch?rev=554&root=cyrus22&r1=553&r2=554&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch (original)
+++ branches/sarge-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch Thu Aug 10 03:36:33 2006
@@ -5,12 +5,12 @@
## DP: Upstream: don't lock/unlock_pop when reconstructing
@DPATCH@
-diff -urNad sarge-2.2.13/imap/mailbox.c /tmp/dpep.1nD74m/sarge-2.2.13/imap/mailbox.c
---- sarge-2.2.13/imap/mailbox.c 2006-06-29 00:01:37.000000000 +0200
-+++ /tmp/dpep.1nD74m/sarge-2.2.13/imap/mailbox.c 2006-06-29 00:02:00.484346849 +0200
+diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c /tmp/dpep.ifqqjz/cyrus-imapd-2.2.13/imap/mailbox.c
+--- cyrus-imapd-2.2.13/imap/mailbox.c 2006-06-08 12:59:59.000000000 +0200
++++ /tmp/dpep.ifqqjz/cyrus-imapd-2.2.13/imap/mailbox.c 2006-06-08 13:00:01.083767966 +0200
@@ -1,5 +1,5 @@
/* mailbox.c -- Mailbox manipulation routines
-- * $Id: mailbox.c,v 1.159 2005/04/07 00:25:52 shadow Exp $
+- * $Id: mailbox.c,v 1.160 2006/05/10 16:27:18 murch Exp $
+ * $Id: mailbox.c,v 1.161 2006/06/02 18:56:52 murch Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
Modified: branches/sarge-2.2.13/debian/patches/00list
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/patches/00list?rev=554&root=cyrus22&r1=553&r2=554&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/patches/00list (original)
+++ branches/sarge-2.2.13/debian/patches/00list Thu Aug 10 03:36:33 2006
@@ -3,12 +3,17 @@
0003-upstream_disallow_userprobes.dpatch
0004-upstream-fetchnews-timezone-dst-fix.dpatch
0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch
+0006-upstream-free-backend-fix.dpatch
+0007-upstream-remove-undump-size-limit.dpatch
+0008-upstream-better-message-track-logging.dpatch
+0009-upstream-remove-redundant-wildcard-check.dpatch
0010-upstream-fix-libRSAglue-linkage.dpatch
0011-upstream-allow-compile-with-krb5-1.4.3.dpatch
0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch
0013-upstream-allow-report-above-4GB-mboxsize.dpatch
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
@@ -33,6 +38,7 @@
19-fix_tls_ssl.dpatch
21-fix_config-parsing.dpatch
22-imapd_index_check.dpatch
+23-configurable_idled.dpatch
25-update_install-sh.dpatch
30-update_perlcalling.sh.dpatch
35-masssievec_remove_unused_variable.dpatch
Modified: branches/sarge-2.2.13/debian/patches/08-clean_socket_closes.dpatch
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/patches/08-clean_socket_closes.dpatch?rev=554&root=cyrus22&r1=553&r2=554&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/patches/08-clean_socket_closes.dpatch (original)
+++ branches/sarge-2.2.13/debian/patches/08-clean_socket_closes.dpatch Thu Aug 10 03:36:33 2006
@@ -5,14 +5,14 @@
## DP: Cleanly close sockets
@DPATCH@
-diff -urNad complete.dpatch/imap/backend.c /tmp/dpep.FbBq2t/complete.dpatch/imap/backend.c
---- complete.dpatch/imap/backend.c 2005-02-14 07:39:55.000000000 +0100
-+++ /tmp/dpep.FbBq2t/complete.dpatch/imap/backend.c 2005-11-11 00:01:15.843304837 +0100
-@@ -382,6 +382,7 @@
+diff -urNad cyrus-imapd-2.2.13/imap/backend.c /tmp/dpep.L25TQ6/cyrus-imapd-2.2.13/imap/backend.c
+--- cyrus-imapd-2.2.13/imap/backend.c 2006-05-12 12:20:40.000000000 +0200
++++ /tmp/dpep.L25TQ6/cyrus-imapd-2.2.13/imap/backend.c 2006-05-12 12:22:01.565116257 +0200
+@@ -400,6 +400,7 @@
syslog(LOG_ERR, "couldn't authenticate to backend server: %s",
sasl_errstring(r, NULL, NULL));
- free(ret);
-+ shutdown(sock, SHUT_RDWR);
+ if (!ret_backend) free(ret);
++ shutdown(sock, SHUT_RDWR);
close(sock);
ret = NULL;
}
@@ -38,7 +38,7 @@
diff -urNad complete.dpatch/imap/imapd.c /tmp/dpep.FbBq2t/complete.dpatch/imap/imapd.c
--- complete.dpatch/imap/imapd.c 2005-11-10 21:12:04.000000000 +0100
+++ /tmp/dpep.FbBq2t/complete.dpatch/imap/imapd.c 2005-11-11 00:04:47.146591300 +0100
-@@ -765,6 +765,10 @@
+@@ -767,6 +767,10 @@
#ifdef HAVE_SSL
tls_shutdown_serverengine();
#endif
@@ -52,7 +52,7 @@
diff -urNad complete.dpatch/imap/lmtpd.c /tmp/dpep.FbBq2t/complete.dpatch/imap/lmtpd.c
--- complete.dpatch/imap/lmtpd.c 2004-12-17 17:32:15.000000000 +0100
+++ /tmp/dpep.FbBq2t/complete.dpatch/imap/lmtpd.c 2005-11-11 00:02:48.172254190 +0100
-@@ -501,6 +501,9 @@
+@@ -553,6 +553,9 @@
cyrus_done();
@@ -78,7 +78,7 @@
diff -urNad complete.dpatch/imap/proxyd.c /tmp/dpep.FbBq2t/complete.dpatch/imap/proxyd.c
--- complete.dpatch/imap/proxyd.c 2005-11-10 21:12:04.000000000 +0100
+++ /tmp/dpep.FbBq2t/complete.dpatch/imap/proxyd.c 2005-11-11 00:04:04.761746266 +0100
-@@ -1443,6 +1443,9 @@
+@@ -1382,6 +1382,9 @@
#endif
cyrus_done();
Modified: branches/sarge-2.2.13/debian/patches/99-update-autoconf.dpatch
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/patches/99-update-autoconf.dpatch?rev=554&root=cyrus22&r1=553&r2=554&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/patches/99-update-autoconf.dpatch (original)
+++ branches/sarge-2.2.13/debian/patches/99-update-autoconf.dpatch Thu Aug 10 03:36:33 2006
@@ -6,18 +6,18 @@
## DP: (64bit-quota and potentially DRAC)
@DPATCH@
-diff -urNad sarge-2.2.13/aclocal.m4 /tmp/dpep.FYPeej/sarge-2.2.13/aclocal.m4
---- sarge-2.2.13/aclocal.m4 2006-04-23 21:11:53.000000000 +0200
-+++ /tmp/dpep.FYPeej/sarge-2.2.13/aclocal.m4 2006-05-19 15:53:28.706175088 +0200
+diff -urNad cyrus-imapd-2.2.13/aclocal.m4 /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/aclocal.m4
+--- cyrus-imapd-2.2.13/aclocal.m4 2006-04-22 15:13:25.000000000 +0200
++++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/aclocal.m4 2006-05-19 15:21:21.043759469 +0200
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005 Free Software Foundation, Inc.
-diff -urNad sarge-2.2.13/autom4te.cache/output.0 /tmp/dpep.FYPeej/sarge-2.2.13/autom4te.cache/output.0
---- sarge-2.2.13/autom4te.cache/output.0 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.FYPeej/sarge-2.2.13/autom4te.cache/output.0 2006-05-19 15:53:28.736172289 +0200
+diff -urNad cyrus-imapd-2.2.13/autom4te.cache/output.0 /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/output.0
+--- cyrus-imapd-2.2.13/autom4te.cache/output.0 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/output.0 2006-05-19 15:21:21.104753736 +0200
@@ -0,0 +1,18639 @@
+@%:@! /bin/sh
+@%:@ Guess values for system-dependent variables and create Makefiles.
@@ -18658,9 +18658,9 @@
+ $ac_cs_success || { (exit 1); exit 1; }
+fi
+
-diff -urNad sarge-2.2.13/autom4te.cache/output.1 /tmp/dpep.FYPeej/sarge-2.2.13/autom4te.cache/output.1
---- sarge-2.2.13/autom4te.cache/output.1 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.FYPeej/sarge-2.2.13/autom4te.cache/output.1 2006-05-19 15:53:28.765169584 +0200
+diff -urNad cyrus-imapd-2.2.13/autom4te.cache/output.1 /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/output.1
+--- cyrus-imapd-2.2.13/autom4te.cache/output.1 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/output.1 2006-05-19 15:21:21.133751010 +0200
@@ -0,0 +1,18693 @@
+@%:@! /bin/sh
+@%:@ Guess values for system-dependent variables and create Makefiles.
@@ -37355,9 +37355,9 @@
+ $ac_cs_success || { (exit 1); exit 1; }
+fi
+
-diff -urNad sarge-2.2.13/autom4te.cache/requests /tmp/dpep.FYPeej/sarge-2.2.13/autom4te.cache/requests
---- sarge-2.2.13/autom4te.cache/requests 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.FYPeej/sarge-2.2.13/autom4te.cache/requests 2006-05-19 15:53:57.522486346 +0200
+diff -urNad cyrus-imapd-2.2.13/autom4te.cache/requests /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/requests
+--- cyrus-imapd-2.2.13/autom4te.cache/requests 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/requests 2006-05-19 15:21:36.435312657 +0200
@@ -0,0 +1,293 @@
+# This file was generated by Autom4te Sat Jan 8 16:59:54 PST 2005.
+# It contains the lists of macros which have been traced.
@@ -37652,9 +37652,9 @@
+ ], 'Autom4te::Request' )
+ );
+
-diff -urNad sarge-2.2.13/autom4te.cache/traces.0 /tmp/dpep.FYPeej/sarge-2.2.13/autom4te.cache/traces.0
---- sarge-2.2.13/autom4te.cache/traces.0 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.FYPeej/sarge-2.2.13/autom4te.cache/traces.0 2006-05-19 15:53:28.772168931 +0200
+diff -urNad cyrus-imapd-2.2.13/autom4te.cache/traces.0 /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/traces.0
+--- cyrus-imapd-2.2.13/autom4te.cache/traces.0 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/traces.0 2006-05-19 15:21:21.140750352 +0200
@@ -0,0 +1,2900 @@
+m4trace:/usr/share/aclocal/isc-posix.m4:24: -1- AC_DEFUN([AC_ISC_POSIX], [
+ dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
@@ -40556,9 +40556,9 @@
+You should run autoupdate.], [])
+m4trace:configure.in:1232: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
+m4trace:configure.in:1232: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-diff -urNad sarge-2.2.13/autom4te.cache/traces.1 /tmp/dpep.FYPeej/sarge-2.2.13/autom4te.cache/traces.1
---- sarge-2.2.13/autom4te.cache/traces.1 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.FYPeej/sarge-2.2.13/autom4te.cache/traces.1 2006-05-19 15:53:28.775168651 +0200
+diff -urNad cyrus-imapd-2.2.13/autom4te.cache/traces.1 /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/traces.1
+--- cyrus-imapd-2.2.13/autom4te.cache/traces.1 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/traces.1 2006-05-19 15:21:21.143750070 +0200
@@ -0,0 +1,1152 @@
+m4trace:aclocal.m4:14: -1- m4_include([cmulocal/berkdb.m4])
+m4trace:aclocal.m4:15: -1- m4_include([cmulocal/bsd_sockets.m4])
@@ -41712,9 +41712,9 @@
+You should run autoupdate.], [])
+m4trace:configure.in:1232: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
+m4trace:configure.in:1232: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-diff -urNad sarge-2.2.13/config.guess /tmp/dpep.FYPeej/sarge-2.2.13/config.guess
---- sarge-2.2.13/config.guess 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.FYPeej/sarge-2.2.13/config.guess 2006-05-19 15:53:57.531485506 +0200
+diff -urNad cyrus-imapd-2.2.13/config.guess /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/config.guess
+--- cyrus-imapd-2.2.13/config.guess 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/config.guess 2006-05-19 15:21:36.444311811 +0200
@@ -0,0 +1,1465 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
@@ -43181,9 +43181,9 @@
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
-diff -urNad sarge-2.2.13/config.h.in /tmp/dpep.FYPeej/sarge-2.2.13/config.h.in
---- sarge-2.2.13/config.h.in 2006-04-23 21:11:53.000000000 +0200
-+++ /tmp/dpep.FYPeej/sarge-2.2.13/config.h.in 2006-05-19 15:53:28.780168184 +0200
+diff -urNad cyrus-imapd-2.2.13/config.h.in /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/config.h.in
+--- cyrus-imapd-2.2.13/config.h.in 2006-05-12 12:23:20.000000000 +0200
++++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/config.h.in 2006-05-19 15:21:21.149749506 +0200
@@ -153,8 +153,8 @@
/* Do we have TCP wrappers? */
#undef HAVE_LIBWRAP
@@ -43232,9 +43232,9 @@
};
#endif /* _CYRUS_IMAPD_CONFIG_H_ */
-diff -urNad sarge-2.2.13/config.sub /tmp/dpep.FYPeej/sarge-2.2.13/config.sub
---- sarge-2.2.13/config.sub 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.FYPeej/sarge-2.2.13/config.sub 2006-05-19 15:53:57.529485693 +0200
+diff -urNad cyrus-imapd-2.2.13/config.sub /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/config.sub
+--- cyrus-imapd-2.2.13/config.sub 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/config.sub 2006-05-19 15:21:36.442311999 +0200
@@ -0,0 +1,1569 @@
+#! /bin/sh
+# Configuration validation subroutine script.
@@ -44805,9 +44805,9 @@
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
-diff -urNad sarge-2.2.13/configure /tmp/dpep.FYPeej/sarge-2.2.13/configure
---- sarge-2.2.13/configure 2006-04-23 21:11:53.000000000 +0200
-+++ /tmp/dpep.FYPeej/sarge-2.2.13/configure 2006-05-19 15:53:28.796166692 +0200
+diff -urNad cyrus-imapd-2.2.13/configure /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/configure
+--- cyrus-imapd-2.2.13/configure 2006-05-12 12:23:20.000000000 +0200
++++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/configure 2006-05-19 15:21:21.165748002 +0200
@@ -309,7 +309,7 @@
# include <unistd.h>
#endif"
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list