From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-860513-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 0D2A858973
for <garchives@archives.gentoo.org>; Sat, 30 Jan 2016 15:29:49 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7304721C002;
Sat, 30 Jan 2016 15:29:47 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 1AC7421C002
for <gentoo-commits@lists.gentoo.org>; Sat, 30 Jan 2016 15:29:47 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 0746A340CCB
for <gentoo-commits@lists.gentoo.org>; Sat, 30 Jan 2016 15:29:46 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 0712CC0
for <gentoo-commits@lists.gentoo.org>; Sat, 30 Jan 2016 15:29:44 +0000 (UTC)
From: "Dirkjan Ochtman" <djc@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Dirkjan Ochtman" <djc@gentoo.org>
Message-ID: <1454167767.c40a1c9edc75e2c5be3d3ff7a2c360e938a2bf91.djc@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/
X-VCS-Repository: repo/gentoo
X-VCS-Files: mail-filter/rspamd/files/rspamd.init-r1 mail-filter/rspamd/rspamd-1.1.2.ebuild
X-VCS-Directories: mail-filter/rspamd/files/ mail-filter/rspamd/
X-VCS-Committer: djc
X-VCS-Committer-Name: Dirkjan Ochtman
X-VCS-Revision: c40a1c9edc75e2c5be3d3ff7a2c360e938a2bf91
X-VCS-Branch: master
Date: Sat, 30 Jan 2016 15:29:44 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 554d7e6c-7b69-40cd-88f3-58e31d6b3eb6
X-Archives-Hash: 436913ec35eddbee3e37a98c4320c965
commit: c40a1c9edc75e2c5be3d3ff7a2c360e938a2bf91
Author: Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 15:28:57 2016 +0000
Commit: Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 15:29:27 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c40a1c9e
mail-filter/rspamd: remove reload from init script for 1.1.2
Package-Manager: portage-2.2.26
mail-filter/rspamd/files/rspamd.init-r1 | 43 +++++++++++++++++++++++++++++++++
mail-filter/rspamd/rspamd-1.1.2.ebuild | 2 +-
2 files changed, 44 insertions(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/files/rspamd.init-r1 b/mail-filter/rspamd/files/rspamd.init-r1
new file mode 100644
index 0000000..d26c41d
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd.init-r1
@@ -0,0 +1,43 @@
+#!/sbin/runscript
+# Copyright 2015 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 $?
+}
diff --git a/mail-filter/rspamd/rspamd-1.1.2.ebuild b/mail-filter/rspamd/rspamd-1.1.2.ebuild
index c5ecabb..fead741 100644
--- a/mail-filter/rspamd/rspamd-1.1.2.ebuild
+++ b/mail-filter/rspamd/rspamd-1.1.2.ebuild
@@ -50,7 +50,7 @@ src_configure() {
src_install() {
cmake-utils_src_install
- newinitd "${FILESDIR}/rspamd.init" rspamd
+ newinitd "${FILESDIR}/rspamd.init-r1" rspamd
dodir /var/lib/rspamd
dodir /var/log/rspamd