mail-filter/rspamd: version bump to 1.6.0

Package-Manager: Portage-2.3.5, Repoman-2.3.1

2 files changed, 1 insertions, 51 deletions

diff --git a/mail-filter/rspamd/files/rspamd.init-r3 b/mail-filter/rspamd/files/rspamd.init-r3
deleted file mode 100644
index 974696b76f58..000000000000
--- a/mail-filter/rspamd/files/rspamd.init-r3
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2015-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-RUNDIR=/var/run/rspamd
-PIDFILE=$RUNDIR/rspamd.pid
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	/usr/bin/rspamadm configtest -c /etc/rspamd/rspamd.sysvinit.conf > /dev/null \
-		|| return 1
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting ${SVCNAME}"
-
-	mkdir -m0750 -p $RUNDIR
-	chown rspamd:rspamd $RUNDIR
-	chmod g+s $RUNDIR
-	rm -f $RUNDIR/$SVCNAME.sock
-
-	start-stop-daemon --start --quiet --pidfile $PIDFILE -u rspamd -g rspamd \
-						--exec /usr/bin/rspamd
-	eend $?
-}
-
-stop() {
-	if [ "${RC_CMD}" = "restart" ] ; then
-		checkconfig || return 1
-	fi
-
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE \
-						--exec /usr/bin/rspamd
-	eend $?
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --signal HUP --quiet --pidfile $PIDFILE
-	eend $?
-}
diff --git a/mail-filter/rspamd/files/rspamd.init-r4 b/mail-filter/rspamd/files/rspamd.init-r5
index cb4520f37c43..6d249f3f9051 100644
--- a/mail-filter/rspamd/files/rspamd.init-r4
+++ b/mail-filter/rspamd/files/rspamd.init-r5
@@ -13,7 +13,7 @@ depend() {
 }
 
 checkconfig() {
-	/usr/bin/rspamadm configtest -c /etc/rspamd/rspamd.sysvinit.conf > /dev/null \
+	/usr/bin/rspamadm configtest -c /etc/rspamd/rspamd.conf > /dev/null \
 		|| return 1
 }