From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-921061-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 4F292139085
	for <garchives@archives.gentoo.org>; Tue,  3 Jan 2017 19:01:02 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 8F323E0CE6;
	Tue,  3 Jan 2017 19:01:00 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 5811EE0CE6
	for <gentoo-commits@lists.gentoo.org>; Tue,  3 Jan 2017 19:01:00 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 0889234121E
	for <gentoo-commits@lists.gentoo.org>; Tue,  3 Jan 2017 19:00:59 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 37B5224E8
	for <gentoo-commits@lists.gentoo.org>; Tue,  3 Jan 2017 19:00:57 +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: <1483470051.0dce7fbc4dc9fb16a13056da4902cd120ec9be4e.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-r4 mail-filter/rspamd/rspamd-1.4.1-r1.ebuild
X-VCS-Directories: mail-filter/rspamd/ mail-filter/rspamd/files/
X-VCS-Committer: djc
X-VCS-Committer-Name: Dirkjan Ochtman
X-VCS-Revision: 0dce7fbc4dc9fb16a13056da4902cd120ec9be4e
X-VCS-Branch: master
Date: Tue,  3 Jan 2017 19:00:57 +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: 16f14974-0645-4302-86c5-91736f4e5837
X-Archives-Hash: fa8ccf8dc605c08fa648749055a68dc8

commit:     0dce7fbc4dc9fb16a13056da4902cd120ec9be4e
Author:     Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 18:56:37 2017 +0000
Commit:     Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 19:00:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dce7fbc

mail-filter/rspamd: use checkpath in init script (fixes bug 603248)

Package-Manager: portage-2.3.0

 mail-filter/rspamd/files/rspamd.init-r4   | 48 +++++++++++++++++++++
 mail-filter/rspamd/rspamd-1.4.1-r1.ebuild | 71 +++++++++++++++++++++++++++++++
 2 files changed, 119 insertions(+)

diff --git a/mail-filter/rspamd/files/rspamd.init-r4 b/mail-filter/rspamd/files/rspamd.init-r4
new file mode 100644
index 00000000..cb4520f
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd.init-r4
@@ -0,0 +1,48 @@
+#!/sbin/openrc-run
+# Copyright 2015-2017 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}"
+
+	checkpath -d $RUNDIR -m 2750 -o rspamd:rspamd
+	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/rspamd-1.4.1-r1.ebuild b/mail-filter/rspamd/rspamd-1.4.1-r1.ebuild
new file mode 100644
index 00000000..978a2bd
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-1.4.1-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils pax-utils user systemd
+
+DESCRIPTION="Rapid spam filtering system"
+SRC_URI="https://rspamd.com/downloads/${P}.tar.xz"
+HOMEPAGE="https://github.com/vstakhov/rspamd"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+fann +jit libressl"
+
+RDEPEND="!libressl? ( dev-libs/openssl:0[-bindist] )
+		libressl? ( dev-libs/libressl:0 )
+		fann? ( sci-mathematics/fann )
+		jit? (
+			dev-libs/libpcre[jit]
+			dev-lang/luajit:2
+		)
+		!jit? (
+			dev-libs/libpcre[-jit]
+			>=dev-lang/lua-5.1:0
+		)
+		dev-libs/libevent
+		dev-db/sqlite:3
+		dev-libs/glib:2
+		dev-libs/gmime
+		dev-util/ragel
+		sys-apps/file
+		virtual/libiconv"
+DEPEND="dev-util/ragel
+		${RDEPEND}"
+
+pkg_setup() {
+	enewgroup rspamd
+	enewuser rspamd -1 -1 /var/lib/rspamd rspamd
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFDIR=/etc/rspamd
+		-DRUNDIR=/var/run/rspamd
+		-DDBDIR=/var/lib/rspamd
+		-DLOGDIR=/var/log/rspamd
+		-DENABLE_LUAJIT=$(usex jit ON OFF)
+		-DENABLE_FANN=$(usex fann ON OFF)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	pax-mark m "${ED}"/usr/bin/rspamadm-*
+	pax-mark m "${ED}"/usr/bin/rspamd-*
+	newinitd "${FILESDIR}/rspamd.init-r3" rspamd
+
+	dodir /var/lib/rspamd
+	dodir /var/log/rspamd
+
+	fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/rspamd.logrotate" rspamd
+
+	systemd_newunit rspamd.service rspamd.service
+}