Revbump, #283596

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

5 files changed, 94 insertions, 274 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index e6eddded0967..1ba6ef2536d8 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.141 2009/07/19 18:16:20 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.142 2009/09/03 17:53:46 dertobi123 Exp $
+
+*cyrus-imapd-2.3.14-r3 (03 Sep 2009)
+
+  03 Sep 2009; Tobias Scherbaum <dertobi123@gentoo.org>
+  -cyrus-imapd-2.3.13.ebuild, -cyrus-imapd-2.3.14-r2.ebuild,
+  +cyrus-imapd-2.3.14-r3.ebuild, +files/cyrus-imapd-2.3.14-bug283596.patch:
+  Revbump, #283596
 
   19 Jul 2009; nixnut <nixnut@gentoo.org> cyrus-imapd-2.3.14.ebuild:
   ppc stable #271800
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 1187285588d8..8ae3984788c2 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,5 +1,6 @@
 AUX cyrus-imapd-2.2-libwrap.patch 390 RMD160 4ed2b14f549ccfab487cff66e5f2cb8ebdd39427 SHA1 0075421585a73f2673e3daff9a4c140d9cc5046e SHA256 2bddad2045130090ea23f5ad65d797cfa1f6083446bd00411cb1540cb56d4e0e
 AUX cyrus-imapd-2.3.14-add-db47-support.patch 805 RMD160 18acd706ecdb14e8dc8713e1b66140fa13c65927 SHA1 e0008e89c924edb0f66587f2a312a06385a9a335 SHA256 09b275e21999355fea14ee173c9360658c02854b492c532b4bc58d301c387132
+AUX cyrus-imapd-2.3.14-bug283596.patch 2948 RMD160 4e404b1739f865edbc8358498a5899d3326f459e SHA1 0210e98a90420b2c0972890d64828a902a9bd6a5 SHA256 ea40b59dd2e644151bff03799ec9fd2ef76c40b89b5def74193cc0f4859919a1
 AUX cyrus-imapd-2.3.14-fix-db-rpath.patch 3212 RMD160 f594023539f679df4f3eecbce20a65a73c460798 SHA1 bace3014a88b0d2b2daad2b3c7580196f9db953b SHA256 74b4cef7ecc2fe58bc448b88f0ed8e138c77a8870aa64bddca66a5ce96680486
 AUX cyrus-imapd-parallel.patch 256 RMD160 fa7c53c847c4af9a7c218943be46b136b69f911c SHA1 8f4a7cbf91652354681e81e5c31f53728273a1c9 SHA256 adc6d031f2e9f547b192b36685d7873fdb5c5cb690e951b173fdcd55163cc68c
 AUX cyrus-imapd-strip.patch 527 RMD160 83dda22c91798715c7790c3964705b60edeab904 SHA1 624635c7a3dd17e0d3ed84c2c7b07fe042d54cc0 SHA256 4edf438766a291c18847efbcf0596e5c7fc848a1c04b851b20074a195c1b2f18
@@ -22,10 +23,8 @@ AUX kolab/2.3.14/Groups2.patch 6832 RMD160 e83ca372109e26a2b2f7101cd222bb79ed0e2
 AUX kolab/2.3.14/Logging.patch 1880 RMD160 a69ccc5fba3e200c5cf4bd91c22b5a7e9713038e SHA1 79ddbb6b9af2f0c93b8f9ee732ca2639c9567943 SHA256 76a4eb6cd59564f55bb541a35b4e7f5fbd8beabf8072580c0bc514d710c3879b
 AUX kolab/2.3.14/UID.patch 4328 RMD160 24a8e27218923e4284815439c889c208fbfc8be0 SHA1 e8a532d5f0462b07a90ff55f750ed313ec50141c SHA256 725a753fe877fb0bf257ef6968e64f15ad8758fbe9993dab310c0bbfb0b2c1b9
 AUX kolab/2.3.14/timsieved_starttls-sendcaps.patch 849 RMD160 88fd0aff780cd21f61b7e1ffd8dcc7321fd1f6cd SHA1 f543dbaae4af33913f5247fadfdcd5cc34f3c96b SHA256 f4706fd7a09a95371b62ffe6651d2ac4d1c4105f4d66c5d4eb7b44593cec5814
-DIST cyrus-imapd-2.3.13.tar.gz 2328467 RMD160 dfcc8efaf5f3495b8fc83834541c92b6481e28de SHA1 95877dc1e1da5d268b1c248357fbd05749fac72e SHA256 f651c3f5112d3aefa5ab5250f9cb9bb012046a0c3bd72eabb82da9dde1150fba
 DIST cyrus-imapd-2.3.14.tar.gz 2348808 RMD160 03fd8bdef669786f58ddf8b3fa0e0a57b2ee6b69 SHA1 cf046e2399b5ae84c654c6ab04eb047341d93002 SHA256 fd840403c1f25adda8f003ea59169e2c87210c4e60ca47c498bda7060ed097a0
-EBUILD cyrus-imapd-2.3.13.ebuild 7942 RMD160 a1682fe55570144fe0fb493d3a9fcd9308b23237 SHA1 7e73f0811fc1dfce96453b5e823723a21f1f2cfb SHA256 71e67f23e3409173de8ce9d530d719c154e2115071b166cd1b19ad1a41a065a2
-EBUILD cyrus-imapd-2.3.14-r2.ebuild 8117 RMD160 5f0f2cf3f039740fd265499ddaf1b48cbf55f093 SHA1 c792faa2d5ed0df37b805a09edbd0cd21bceab9b SHA256 ed5f6d56d2f20ee53d31c2ab32fa5f1c8920775562b9b5643d6e69ff29a3de4c
+EBUILD cyrus-imapd-2.3.14-r3.ebuild 8161 RMD160 d94c721c1237ffb00bea7e4b6bf2c9dbaebaaf23 SHA1 a34dcd624330e6d8c25ccdbbbc5582712e0db45d SHA256 be536d525f5d33658b66bf03e5523bdac3c4fac0c1ef0709185bffc3217023f2
 EBUILD cyrus-imapd-2.3.14.ebuild 7396 RMD160 aa8db8f452f048e9db056062e524f6afcc09059b SHA1 20f2d7ef78caf7a883473780d07049b089d6bdf6 SHA256 088d29ea46912afc31bf06f213fcdd8fb585423e45e64b42f3d0ef697337c12f
-MISC ChangeLog 28025 RMD160 5f110f5f41eebe16bc4f97e473e8a8902133adfc SHA1 91bc10f0d8ffc3cb6a3a276795dbf62c75676abf SHA256 78e1740e8b86a019c3e23aa3c4b7f1402537963d5eba1d397fa6bb5da6e3e3a8
+MISC ChangeLog 28280 RMD160 5b2ef743fb732b6bfdf223a75af77c0d2eb4c6d7 SHA1 05b87f7a5a9ca5fe67e85ff817cd92c4f23a6bd4 SHA256 65d44bdb92586b942fba41e796d72bd3fd6fdd5f546f84e8f71313830c50ed10
 MISC metadata.xml 530 RMD160 4b85a3b38cdb914534cfcaa71ca2f4fae9008877 SHA1 c2c1e1fbd96b1cef19f8726df8be134be0486d1e SHA256 1fc6c39dad8d48c120738b017aab2e874f5c774169082e555a60c0f82b31ee02
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.3.13.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.3.13.ebuild
deleted file mode 100644
index 6295be73d8a6..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.3.13.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.13.ebuild,v 1.6 2009/02/16 18:52:34 dertobi123 Exp $
-
-inherit autotools eutils ssl-cert fixheadtails pam
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Cyrus IMAP Server."
-HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${MY_P}.tar.gz"
-LIBWRAP_PATCH_VER="2.2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
-IUSE="drac idled kerberos kolab nntp pam replication snmp ssl tcpd"
-
-PROVIDE="virtual/imapd"
-RDEPEND=">=sys-libs/db-3.2
-	>=dev-libs/cyrus-sasl-2.1.13
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	kerberos? ( virtual/krb5 )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	drac? ( >=mail-client/drac-1.12-r1 )
-	nntp? ( !net-nntp/leafnode )
-	kolab? ( net-nds/openldap )"
-
-DEPEND="$RDEPEND
-	sys-devel/libtool
-	>=sys-devel/autoconf-2.58
-	sys-devel/automake"
-
-RDEPEND="$RDEPEND
-	!virtual/imapd"
-
-new_net-snmp_check() {
-	# tcpd USE flag check. Bug #68254.
-	if use tcpd ; then
-		if has_version net-analyzer/net-snmp && ! built_with_use net-analyzer/net-snmp tcpd ; then
-			eerror "You are emerging this package with USE=\"tcpd\""
-			eerror "but \"net-analyzer/net-snmp\" has been emerged with USE=\"-tcpd\""
-			fail_msg
-		fi
-	else
-		if has_version net-analyzer/net-snmp && built_with_use net-analyzer/net-snmp tcpd ; then
-			eerror "You are emerging this package with USE=\"-tcpd\""
-			eerror "but \"net-analyzer/net-snmp\" has been emerged with USE=\"tcpd\""
-			fail_msg
-		fi
-	fi
-	# DynaLoader check. Bug #67411
-
-	if [ -x "$(type -p net-snmp-config)" ]; then
-		einfo "$(type -p net-snmp-config) is found and executable."
-		NSC_AGENTLIBS="$(net-snmp-config --agent-libs)"
-		einfo "NSC_AGENTLIBS=\""${NSC_AGENTLIBS}"\""
-		if [ -z "$NSC_AGENTLIBS" ]; then
-			eerror "NSC_AGENTLIBS is null"
-			einfo "please report this to bugs.gentoo.org"
-		fi
-		for i in ${NSC_AGENTLIBS}; do
-			# check for the DynaLoader path.
-			if [ "$(expr "$i" : '.*\(DynaLoader\)')" == "DynaLoader" ] ; then
-				DYNALOADER_PATH="$i"
-				einfo "DYNALOADER_PATH=\""${DYNALOADER_PATH}"\""
-				if [[ ! -f "${DYNALOADER_PATH}" ]]; then
-					eerror "\""${DYNALOADER_PATH}"\" is not found."
-					einfo "Have you upgraded \"perl\" after"
-					einfo "you emerged \"net-snmp\". Please re-emerge"
-					einfo "\"net-snmp\" then try again. Bug #67411."
-					die "\""${DYNALOADER_PATH}"\" is not found."
-				fi
-			fi
-		done
-	else
-		eerror "\"net-snmp-config\" not found or not executable!"
-		die "You have \"net-snmp\" installed but \"net-snmp-config\" is not found or not executable. Please re-emerge \"net-snmp\" and try again!"
-	fi
-}
-
-fail_msg() {
-	eerror "enable "snmp" USE flag for this package requires"
-	eerror "that net-analyzer/net-snmp and this package both build with"
-	eerror "\"tcpd\" or \"-tcpd\". Bug #68254"
-	die "sanity check failed."
-}
-
-pkg_setup() {
-	use snmp && new_net-snmp_check
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	ht_fix_file "${S}"/imap/xversion.sh
-
-	# Fix prestripped binaries
-	epatch "${FILESDIR}/${PN}-strip.patch"
-
-	if use drac ; then
-			 epatch "${S}/contrib/drac_auth.patch"
-	fi
-
-	# KOLAB support
-	if use kolab ; then
-		EPATCH_SOURCE="${FILESDIR}/kolab/${PV}" EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" epatch
-		# These files are being created automatically and need to be updated
-		# # after the patches used above
-		rm -f lib/imapopts.h lib/imapopts.c
-	fi
-
-	# Add libwrap defines as we don't have a dynamicly linked library.
-	use tcpd && epatch "${FILESDIR}/${PN}-${LIBWRAP_PATCH_VER}-libwrap.patch"
-
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# Recreate configure.
-	WANT_AUTOCONF="2.5"
-	AT_M4DIR="cmulocal" eautoreconf
-
-	# When linking with rpm, you need to link with more libraries.
-	sed -i -e "s:lrpm:lrpm -lrpmio -lrpmdb:" configure || die "sed failed"
-
-	if use kolab ; then
-		sed -i -e "s/{LIB_SASL}/{LIB_SASL} -lldap -llber /" configure || die "sed failed"
-	fi
-}
-
-src_compile() {
-	local myconf
-	myconf="${myconf} $(use_with ssl openssl)"
-	myconf="${myconf} $(use_with snmp ucdsnmp)"
-	myconf="${myconf} $(use_with tcpd libwrap)"
-	myconf="${myconf} $(use_enable kerberos gssapi) $(use_enable kerberos krb5afspts)"
-	myconf="${myconf} $(use_enable idled)"
-	myconf="${myconf} $(use_enable nntp nntp)"
-	myconf="${myconf} $(use_enable replication)"
-
-	if use drac; then
-		myconf="${myconf} --with-drac=/usr/$(get_libdir)"
-	else
-		myconf="${myconf} --without-drac"
-	fi
-
-	if use kerberos; then
-		myconf="${myconf} --with-auth=krb5"
-	else
-		myconf="${myconf} --with-auth=unix"
-	fi
-
-	econf \
-		--enable-murder \
-		--enable-listext \
-		--enable-netscapehack \
-		--with-extraident=Gentoo \
-		--with-service-path=/usr/lib/cyrus \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
-		--without-perl \
-		--disable-cyradm \
-		${myconf} || die "econf failed"
-
-	# needed for parallel make. Bug #72352.
-	cd "${S}"/imap
-	emake xversion.h || die "emake xversion.h failed"
-
-	# -j1 for #222529
-	cd "${S}"
-	emake -j1 || die "compile problem"
-}
-
-src_install() {
-	dodir /usr/bin /usr/lib
-	for subdir in master imap imtest timsieved notifyd sieve; do
-		make -C "${subdir}" DESTDIR="${D}" install || die "make install failed"
-	done
-
-	# Link master to cyrusmaster (postfix has a master too)
-	dosym /usr/lib/cyrus/master /usr/lib/cyrus/cyrusmaster
-
-	if ! use nntp ; then
-		rm man/fetchnews.8 man/syncnews.8 man/nntpd.8 man/nntptest.1
-		rm "${D}"/usr/bin/nntptest
-	fi
-
-	doman man/*.[0-8]
-	dodoc COPYRIGHT README*
-	dohtml doc/*.html doc/murder.png
-	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	find "${D}/usr/share/doc" -name CVS -print0 | xargs -0 rm -rf
-
-	insinto /etc
-	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
-
-	newinitd "${FILESDIR}/cyrus.rc6" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they are exist.
-	use ssl && {
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-	fi
-	}
-
-	if df -T /var/imap | grep -q ' ext2 ' ; then
-		ebegin "Making /var/imap/user/* and /var/imap/quota/* synchronous."
-		chattr +S /var/imap/{user,quota}{,/*}
-		eend $?
-	fi
-
-	if df -T /var/spool/imap | grep -q ' ext2 ' ; then
-		ebegin "Making /var/spool/imap/* synchronous."
-		chattr +S /var/spool/imap{,/*}
-		eend $?
-	fi
-
-	ewarn "If the queue directory of the mail daemon resides on an ext2"
-	ewarn "filesystem you need to set it manually to update"
-	ewarn "synchronously. E.g. 'chattr +S /var/spool/mqueue'."
-	echo
-
-	elog "For correct logging add the following to /etc/syslog.conf:"
-	elog "    local6.*         /var/log/imapd.log"
-	elog "    auth.debug       /var/log/auth.log"
-	echo
-
-	elog "You have to add user cyrus to the sasldb2. Do this with:"
-	elog "    saslpasswd2 cyrus"
-}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.3.14-r2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.3.14-r3.ebuild
index fc459b2836f3..67ed343f20e4 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.3.14-r2.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.3.14-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.14-r2.ebuild,v 1.1 2009/07/09 19:05:02 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.14-r3.ebuild,v 1.1 2009/09/03 17:53:46 dertobi123 Exp $
 
 EAPI=1
 
@@ -107,6 +107,8 @@ src_unpack() {
 	# Fix prestripped binaries
 	epatch "${FILESDIR}/${PN}-strip.patch"
 
+	epatch "${FILESDIR}/${P}-bug283596.patch"
+
 	if use kolab ; then
 		EPATCH_SOURCE="${FILESDIR}/kolab/${PV}" EPATCH_SUFFIX="patch" \
 		EPATCH_FORCE="yes" epatch
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.14-bug283596.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.14-bug283596.patch
new file mode 100644
index 000000000000..12beb841cf01
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.14-bug283596.patch
@@ -0,0 +1,80 @@
+--- src/sieve/script.c	2008/03/24 20:08:46	1.67
++++ src/sieve/script.c	2009/09/02 13:56:18	1.68
+@@ -40,7 +40,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: cyrus-imapd-2.3.14-bug283596.patch,v 1.1 2009/09/03 17:53:46 dertobi123 Exp $
++ * $Id: cyrus-imapd-2.3.14-bug283596.patch,v 1.1 2009/09/03 17:53:46 dertobi123 Exp $
+  */
+ 
+ #ifdef HAVE_CONFIG_H
+@@ -688,7 +688,7 @@ static int do_sieve_error(int ret,
+ 	ret |= keep_ret;
+         if (keep_ret == SIEVE_OK)
+             snprintf(actions_string+strlen(actions_string),
+-		     sizeof(actions_string)-strlen(actions_string),
++		     ACTIONS_STRING_LEN-strlen(actions_string),
+ 		     "Kept\n");
+ 	else {
+ 	    implicit_keep = 0;	/* don't try an implicit keep again */
+@@ -742,7 +742,7 @@ static int do_action_list(sieve_interp_t
+ 	    
+ 	    if (ret == SIEVE_OK)
+ 		snprintf(actions_string+strlen(actions_string),
+-			 sizeof(actions_string)-strlen(actions_string), 
++			 ACTIONS_STRING_LEN-strlen(actions_string), 
+ 			 "Rejected with: %s\n", a->u.rej.msg);
+ 
+ 	    break;
+@@ -757,7 +757,7 @@ static int do_action_list(sieve_interp_t
+ 
+ 	    if (ret == SIEVE_OK)
+ 		snprintf(actions_string+strlen(actions_string),
+-			 sizeof(actions_string)-strlen(actions_string),
++			 ACTIONS_STRING_LEN-strlen(actions_string),
+ 			 "Filed into: %s\n",a->u.fil.mailbox);
+ 	    break;
+ 	case ACTION_KEEP:
+@@ -770,7 +770,7 @@ static int do_action_list(sieve_interp_t
+ 			       &errmsg);
+ 	    if (ret == SIEVE_OK)
+ 		snprintf(actions_string+strlen(actions_string),
+-			 sizeof(actions_string)-strlen(actions_string),
++			 ACTIONS_STRING_LEN-strlen(actions_string),
+ 			 "Kept\n");
+ 	    break;
+ 	case ACTION_REDIRECT:
+@@ -783,7 +783,7 @@ static int do_action_list(sieve_interp_t
+ 				   &errmsg);
+ 	    if (ret == SIEVE_OK)
+ 		snprintf(actions_string+strlen(actions_string),
+-			 sizeof(actions_string)-strlen(actions_string),
++			 ACTIONS_STRING_LEN-strlen(actions_string),
+ 			 "Redirected to %s\n", a->u.red.addr);
+ 	    break;
+ 	case ACTION_DISCARD:
+@@ -794,7 +794,7 @@ static int do_action_list(sieve_interp_t
+ 				      &errmsg);
+ 	    if (ret == SIEVE_OK)
+ 		snprintf(actions_string+strlen(actions_string),
+-			 sizeof(actions_string)-strlen(actions_string),
++			 ACTIONS_STRING_LEN-strlen(actions_string),
+ 			 "Discarded\n");
+ 	    break;
+ 
+@@ -820,12 +820,12 @@ static int do_action_list(sieve_interp_t
+ 
+ 		    if (ret == SIEVE_OK)
+ 			snprintf(actions_string+strlen(actions_string),
+-				 sizeof(actions_string)-strlen(actions_string),
++				 ACTIONS_STRING_LEN-strlen(actions_string),
+ 				 "Sent vacation reply\n");
+ 
+ 		} else if (ret == SIEVE_DONE) {
+ 		    snprintf(actions_string+strlen(actions_string),
+-			     sizeof(actions_string)-strlen(actions_string),
++			     ACTIONS_STRING_LEN-strlen(actions_string),
+ 			     "Vacation reply suppressed\n");
+ 
+ 		    ret = SIEVE_OK;