5 files changed, 57 insertions, 33 deletions
diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index b70a09b81dba..3cff460bb8c0 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-mta/exim
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.310 2015/03/21 21:18:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.311 2015/05/05 12:55:34 grobian Exp $
+
+  05 May 2015; Fabian Groffen <grobian@gentoo.org> +files/exim.rc9,
+  -files/exim.rc7, exim-4.85.ebuild, files/exim.confd:
+  Include tidying up Exim's hint databases, bug #262819.  Doesn't warrant a
+  revbump since we've been doing without for ages
 
   21 Mar 2015; Justin Lecher <jlec@gentoo.org> exim-4.84.ebuild,
   exim-4.85.ebuild:
diff --git a/mail-mta/exim/exim-4.85.ebuild b/mail-mta/exim/exim-4.85.ebuild
index 142c962bf472..22d2c93f0e21 100644
--- a/mail-mta/exim/exim-4.85.ebuild
+++ b/mail-mta/exim/exim-4.85.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.85.ebuild,v 1.2 2015/03/21 21:18:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.85.ebuild,v 1.3 2015/05/05 12:55:34 grobian Exp $
 
 EAPI="5"
 
@@ -464,7 +464,7 @@ src_install () {
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/exim.logrotate" exim
 
-	newinitd "${FILESDIR}"/exim.rc8 exim
+	newinitd "${FILESDIR}"/exim.rc9 exim
 	newconfd "${FILESDIR}"/exim.confd exim
 
 	systemd_dounit "${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket}
diff --git a/mail-mta/exim/files/exim.confd b/mail-mta/exim/files/exim.confd
index a3974d33b406..1534d9dfaf08 100644
--- a/mail-mta/exim/files/exim.confd
+++ b/mail-mta/exim/files/exim.confd
@@ -1,2 +1,5 @@
 # Command-line options for running exim
 EXIM_OPTS="-bd -q15m"
+
+# Additional flags passed to exim_tidydb upon start (e.g. -t 7d)
+TIDY_OPTS=""
diff --git a/mail-mta/exim/files/exim.rc7 b/mail-mta/exim/files/exim.rc7
deleted file mode 100644
index 399de1d021d1..000000000000
--- a/mail-mta/exim/files/exim.rc7
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/files/exim.rc7,v 1.4 2012/02/28 04:03:55 idl0r Exp $
-
-extra_started_commands="reload"
-
-depend() {
-	need logger
-	use antivirus net
-	provide mta
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec /usr/sbin/exim --pidfile /var/run/${SVCNAME}.pid -- -C /etc/exim/${SVCNAME}.conf ${EXIM_OPTS:--bd -q15m}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile /var/run/${SVCNAME}.pid --name exim
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --signal HUP --pidfile /var/run/${SVCNAME}.pid --name exim
-	eend $?
-}
diff --git a/mail-mta/exim/files/exim.rc9 b/mail-mta/exim/files/exim.rc9
new file mode 100644
index 000000000000..c88f6533d850
--- /dev/null
+++ b/mail-mta/exim/files/exim.rc9
@@ -0,0 +1,46 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/files/exim.rc9,v 1.1 2015/05/05 12:55:34 grobian Exp $
+
+extra_started_commands="reload"
+
+depend() {
+	need logger
+	use antivirus net
+	provide mta
+}
+
+tidy_dbs() {
+	local spooldir=$(/usr/sbin/exim -C /etc/exim/${SVCNAME}.conf -bP -n spool_directory)
+	local db
+	local ret=0
+	ebegin "Tidying hints databases in ${spooldir}/db"
+	for db in "${spooldir}"/db/* ; do
+		[[ ${db} == *".lockfile" || ${db} == *"*" ]] && continue
+		/usr/sbin/exim_tidydb ${TIDY_OPTS} "${spooldir}" ${db##*/} > /dev/null
+		: $((ret += $?))
+	done
+	eend ${ret}
+}
+
+start() {
+	# if you use multiple instances, make sure you set spool_directory
+	# in the configfile
+	tidy_dbs
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --exec /usr/sbin/exim --pidfile /run/${SVCNAME}.pid -- -C /etc/exim/${SVCNAME}.conf ${EXIM_OPTS:--bd -q15m}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --pidfile /run/${SVCNAME}.pid --name exim
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading ${SVCNAME}"
+	start-stop-daemon --signal HUP --pidfile /run/${SVCNAME}.pid --name exim
+	eend $?
+}