[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/

["Dirkjan Ochtman" <djc@gentoo.org>]

commit:     80f530d3306caa1346f09605c99b37ce8515eb1a
Author:     Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 13 19:51:12 2017 +0000
Commit:     Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 19:52:32 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80f530d3

mail-filter/rspamd: version bump to 1.6.0

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 mail-filter/rspamd/Manifest                        |  1 +
 mail-filter/rspamd/files/rspamd.init-r3            | 50 ---------------
 .../files/{rspamd.init-r4 => rspamd.init-r5}       |  2 +-
 mail-filter/rspamd/rspamd-1.6.0.ebuild             | 75 ++++++++++++++++++++++
 4 files changed, 77 insertions(+), 51 deletions(-)

diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 315aae6f2cb..3423488ed6c 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -3,3 +3,4 @@ DIST rspamd-1.5.3.tar.xz 1854812 SHA256 a692f7eab27321924c5326efeae809ab2703fdf6
 DIST rspamd-1.5.6.tar.xz 1853052 SHA256 cda2a5b93f0e57b890767514ce00a2660baf9d48627f7367a36fe938ade14f31 SHA512 3735052817ecd12d46505e4657456a01cde6aac25d7bdffaf0c8722458c674edbe89aeb589f338ec9ed22b5455314511fe1f55b5a0be3532761579b4f7b44cfa WHIRLPOOL 2e5acd5a92c0453a4575ad3717809d287b8c7552b9927d2245b451a57b9f722b19e6820f9c5c188cbbdd414a38b95c9e001901438bd4c2796071f5501af1e0c4
 DIST rspamd-1.5.7.tar.gz 2384051 SHA256 73d18b129a072e35c74c9a440abdd0985fa15696d308a5e23736ec007432fd70 SHA512 362f8615795c739d1c869dd48426dadee38924287d82ad725baf0d3f80aa4571db29501d95d1497d3dfef61af39c2c7254f2c9437ee46f453e380f595b5873ca WHIRLPOOL cec77680fd767badf2b8a302372543e4c34a215dbc7e5e3389b7721a1aac82dd2ba7c0d1ee407f61ad2660ccb6917a366a6613af63d7e2d7922693a7ab9af53d
 DIST rspamd-1.5.9.tar.gz 2386813 SHA256 864705c09733257449ffc52740f380c1edeb56bb4be6e0ad0a8ab8c0cdf6cbe6 SHA512 258e266bca592e2f52760019ffa8c319a84c23a53fec984dc803f5ac12f902f2d0978dbc5e35b623eb02ff8e2e7dc00e2cb8efcc0ea9a06b67f7210ae8f42bc3 WHIRLPOOL 667c46268d547c20e5868ae649fb81fb6a6dfb2d92b4a261d479ca74aa6393453037e0557a68d5eb5c1307a28568f2a9cee5af8fe3f8e653c518859043c07f0b
+DIST rspamd-1.6.0.tar.gz 2461626 SHA256 8a4df7115193fce8c8147495ef6b25961acd0f9758a12c6c5f6617f227f7153e SHA512 af6b362fa77e7153285a47d663afcf0a6c5f344a3888eb2d65abbdbc45c6d1745f5af30cc51df472f1da9a8d10b48712e67966be8632dfbcc9e02f2a589182f1 WHIRLPOOL e4e0fce3f02c1cd12b81724fb5a37ede4d6f30673ed639eb6fca7d2ea2922812af8f2bf266cfb1a96db2bd04003c8dd05fe14135cda59c6ec4a9b48e5f5da844

diff --git a/mail-filter/rspamd/files/rspamd.init-r3 b/mail-filter/rspamd/files/rspamd.init-r3
deleted file mode 100644
index 974696b76f5..00000000000
--- 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
similarity index 92%
rename from mail-filter/rspamd/files/rspamd.init-r4
rename to mail-filter/rspamd/files/rspamd.init-r5
index cb4520f37c4..6d249f3f905 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
 }
 

diff --git a/mail-filter/rspamd/rspamd-1.6.0.ebuild b/mail-filter/rspamd/rspamd-1.6.0.ebuild
new file mode 100644
index 00000000000..e00de6280f1
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-1.6.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils pax-utils user systemd
+
+DESCRIPTION="Rapid spam filtering system"
+SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/vstakhov/rspamd"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_ssse3 fann gd jemalloc +jit libressl pcre2"
+
+RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	fann? ( sci-mathematics/fann )
+	pcre2? ( dev-libs/libpcre2[jit=] )
+	!pcre2? ( dev-libs/libpcre[jit=] )
+	jit? ( dev-lang/luajit:2 )
+	jemalloc? ( dev-libs/jemalloc )
+	dev-libs/libevent
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	<dev-util/ragel-7.0
+	sys-apps/file
+	gd? ( media-libs/gd[jpeg] )
+	dev-libs/icu
+	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )"
+DEPEND="dev-util/ragel
+	${RDEPEND}"
+
+QA_MULTILIB_PATHS="usr/lib/rspamd/.*"
+
+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)
+		-DENABLE_PCRE2=$(usex pcre2 ON OFF)
+		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
+		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR}/rspamd.init-r5" rspamd
+
+	# Remove mprotect for JIT support
+	if use jit; then
+		pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* || die
+	fi
+
+	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
+}