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

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

commit:     ddd3d83f783a7ea13b44a28fd3f8dce0ec39f6d4
Author:     Christian Roessner <c <AT> roessner-network-solutions <DOT> com>
AuthorDate: Wed May  3 05:35:19 2017 +0000
Commit:     Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
CommitDate: Fri May  5 09:40:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddd3d83f

mail-filter/rspamd: Bump to version 1.5.7

 mail-filter/rspamd/Manifest                     |  1 +
 mail-filter/rspamd/files/rspamd-1.5.7-map.patch | 11 ++++
 mail-filter/rspamd/rspamd-1.5.7.ebuild          | 77 +++++++++++++++++++++++++
 3 files changed, 89 insertions(+)

diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index aa7c4506b60..c0630fb5cb1 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,3 +1,4 @@
+DIST 1.5.7.tar.gz 2384051 SHA256 73d18b129a072e35c74c9a440abdd0985fa15696d308a5e23736ec007432fd70 SHA512 362f8615795c739d1c869dd48426dadee38924287d82ad725baf0d3f80aa4571db29501d95d1497d3dfef61af39c2c7254f2c9437ee46f453e380f595b5873ca WHIRLPOOL cec77680fd767badf2b8a302372543e4c34a215dbc7e5e3389b7721a1aac82dd2ba7c0d1ee407f61ad2660ccb6917a366a6613af63d7e2d7922693a7ab9af53d
 DIST rspamd-1.4.4.tar.xz 1780816 SHA256 51342639dd1e50b235ae7fb2e877dee1d5b90c8102ce7ff817545fa0fb6ebc6d SHA512 df2260de6585699a5b6692aa210647270b7132372ae6a2437f8532265018fe4db8270a8989ce0c0664cad17cbc281ae92f935c4f0974dc2f8da309e54c234b14 WHIRLPOOL 1f5f19b57c571fe07a843ae738f5cc60411040dbabb965163e6ed25668cd590f0da99256f83165d6cd14a1715914a16a6cd5a99125093a294fbfa2bc89ce155c
 DIST rspamd-1.5.3.tar.xz 1854812 SHA256 a692f7eab27321924c5326efeae809ab2703fdf60b652446e9a232312d8a1e35 SHA512 68bdd593b03c299285d2cd56e945dbd38f823fbf7e9300318e7b05a3084eb751cb48134e69c13705e462838d814dd29bdca4631933eb23c0febf4d2fd223a153 WHIRLPOOL 5aa7aacafa44f3ebf6baf9f15a7461dc1e6d1a483f1794c0e66adbdfa83e22c77ad991e8925b7cfa11ab8e86cfbcef252fcd47b1e3954321449fd58911d15ee4
 DIST rspamd-1.5.6.tar.xz 1853052 SHA256 cda2a5b93f0e57b890767514ce00a2660baf9d48627f7367a36fe938ade14f31 SHA512 3735052817ecd12d46505e4657456a01cde6aac25d7bdffaf0c8722458c674edbe89aeb589f338ec9ed22b5455314511fe1f55b5a0be3532761579b4f7b44cfa WHIRLPOOL 2e5acd5a92c0453a4575ad3717809d287b8c7552b9927d2245b451a57b9f722b19e6820f9c5c188cbbdd414a38b95c9e001901438bd4c2796071f5501af1e0c4

diff --git a/mail-filter/rspamd/files/rspamd-1.5.7-map.patch b/mail-filter/rspamd/files/rspamd-1.5.7-map.patch
new file mode 100644
index 00000000000..1477b13eee7
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-1.5.7-map.patch
@@ -0,0 +1,11 @@
+--- rspamd-1.5.7/src/libutil/map.c	2017-05-02 15:26:54.000000000 +0200
++++ b/src/libutil/map.c	2017-05-02 16:22:37.695254699 +0200
+@@ -2290,7 +2290,7 @@
+ 	}
+ #else
+ 	if (pcre_flags & PCRE_FLAG(UTF)) {
+-		re_map->map_flags |= RSPAMD_REGEXP_FLAG_UTF;
++		re_map->has_utf = TRUE;
+ 	}
+ #endif
+ 

diff --git a/mail-filter/rspamd/rspamd-1.5.7.ebuild b/mail-filter/rspamd/rspamd-1.5.7.ebuild
new file mode 100644
index 00000000000..20a5bdba36b
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-1.5.7.ebuild
@@ -0,0 +1,77 @@
+# 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"
+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/.*"
+
+PATCHES=( "${FILESDIR}"/${P}-map.patch )
+
+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-r2" 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
+}