mail-filter/rspamd: version bump to 1.9.0

* Remove fann support

Closes: https://github.com/gentoo/gentoo/pull/11355
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index d45c6ec491acc20522f17b884c9883f595e38808..d7a8953f6a3ab2d475a93650cdab08e4852eefa9 100644 (file)
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -8,3 +8,4 @@ DIST rspamd-1.7.8.tar.gz 4542955 BLAKE2B 78fbb01c51d290f8d88f4c512df248fcbc8e28e
 DIST rspamd-1.7.9.tar.gz 4557492 BLAKE2B f42775ba8157ef4815331c304e3030c522e9ae5e10ef0194da0c7dde105b40fed2ae84b063d78aed37992146311aecc1ac77f64dacdaf3ff11bb85076e8aef7c SHA512 d11d8c03668b85feae665ed491cd156c7430fbad30f42fe44103ea3c3a8bc988e5f8981e784e8f31aa35ba1ff9f7abd23605638e4ee3086a056b22fb3109563e
 DIST rspamd-1.8.1.tar.gz 4286637 BLAKE2B dd202a2f3dab4ef459d978e06231f8fcef3724ea5912c7455d553dc04e2744322b9144ba05a2f6f22a7eb58cd0a967f213bfc76fb273b5425036a5042975ed89 SHA512 98c2d909b7dc19f1c431d4e64444968092a10630ef238d3c8cc2825e7b2d92bee893bc7f9c431f3a6337ef2af4d2a157f0584e7b13fba0540660d7c853bc25cc
 DIST rspamd-1.8.3.tar.gz 4319623 BLAKE2B b7fdd6791df5899710bb1d696a9b94d1840335b6a34d6cdeebc2b5eebe9f4e5b6da3e90ed9ab5e3945aab7ef33f54f048024b51c3de37db1a083ad89c656b456 SHA512 5e20255466fe2cd4842196fb2138732b59911de655e73d9cc13009b5179b84e5a2060083961b35fe40b9f550f8e18067056415a1d803fac54fac000070024c01
+DIST rspamd-1.9.0.tar.gz 4402395 BLAKE2B 11f90fc232496b493296ef0fb9ff4118ac11863528cd6a52bcae6adbdc09ce86453bb39df35714702fcd5c6a535007ec402a580bd735abbddeeb154ff8807219 SHA512 fee2a60c10fbab087b12d9188974a0c47417a9894308f66980eb6311496b16661194d858d1e522d2d524b3e359f2f3ad88535421d1dc05be26414b5a346afec6

diff --git a/mail-filter/rspamd/rspamd-1.9.0.ebuild b/mail-filter/rspamd/rspamd-1.9.0.ebuild
new file mode 100644 (file)
index 0000000..2000be8
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-1.9.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils pax-utils systemd tmpfiles user
+
+if [[ ${PV} == *9999 ]] ; then
+       EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
+       inherit git-r3
+else
+       SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+       KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Rapid spam filtering system"
+HOMEPAGE="https://github.com/vstakhov/rspamd"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cpu_flags_x86_ssse3 gd jemalloc +jit libressl pcre2 +torch"
+REQUIRED_USE="torch? ( jit )"
+
+RDEPEND="dev-db/sqlite:3
+       dev-libs/glib:2
+       dev-libs/icu:=
+       dev-libs/libevent:=
+       net-libs/libnsl
+       sys-apps/file
+       dev-util/ragel
+       cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
+       gd? ( media-libs/gd[jpeg] )
+       jemalloc? ( dev-libs/jemalloc )
+       jit? ( dev-lang/luajit:2 )
+       !libressl? ( dev-libs/openssl:0=[-bindist] )
+       libressl? ( dev-libs/libressl:0= )
+       pcre2? ( dev-libs/libpcre2[jit=] )
+       !pcre2? ( dev-libs/libpcre[jit=] )"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+       enewgroup rspamd
+       enewuser rspamd -1 -1 /var/lib/rspamd rspamd
+}
+
+src_prepare() {
+       cmake-utils_src_prepare
+
+       sed -i -e 's/User=_rspamd/User=rspamd/g' \
+               rspamd.service \
+               || die
+}
+
+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_GD=$(usex gd ON OFF)
+               -DENABLE_PCRE2=$(usex pcre2 ON OFF)
+               -DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
+               -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
+               -DENABLE_TORCH=$(usex torch ON OFF)
+       )
+       cmake-utils_src_configure
+}
+
+src_test() {
+       cmake-utils_src_test
+}
+
+src_install() {
+       cmake-utils_src_install
+
+       newconfd "${FILESDIR}"/rspamd.conf rspamd
+       newinitd "${FILESDIR}/rspamd-r6.init" rspamd
+       systemd_newunit rspamd.service rspamd.service
+
+       newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+
+       # Remove mprotect for JIT support
+       if use jit; then
+               pax-mark m "${ED%/}"/usr/bin/rspamd-* "${ED%/}"/usr/bin/rspamadm-*
+       fi
+
+       insinto /etc/logrotate.d
+       newins "${FILESDIR}"/rspamd-r1.logrotate rspamd
+
+       diropts -o rspamd -g rspamd
+       keepdir /var/{lib,log}/rspamd
+}
+
+pkg_postinst() {
+       tmpfiles_process "${PN}.conf"
+}

diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index 64cb537424f351902c42190cb4e3ac6016559375..2000be8f5492ab47c4d01b065ebf16be17c760a9 100644 (file)
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Rapid spam filtering system"
 HOMEPAGE="https://github.com/vstakhov/rspamd"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="cpu_flags_x86_ssse3 fann gd jemalloc +jit libressl pcre2 +torch"
+IUSE="cpu_flags_x86_ssse3 gd jemalloc +jit libressl pcre2 +torch"
 REQUIRED_USE="torch? ( jit )"
 
 RDEPEND="dev-db/sqlite:3
@@ -28,7 +28,6 @@ RDEPEND="dev-db/sqlite:3
        sys-apps/file
        dev-util/ragel
        cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
-       fann? ( sci-mathematics/fann )
        gd? ( media-libs/gd[jpeg] )
        jemalloc? ( dev-libs/jemalloc )
        jit? ( dev-lang/luajit:2 )
@@ -58,7 +57,6 @@ src_configure() {
                -DDBDIR=/var/lib/rspamd
                -DLOGDIR=/var/log/rspamd
                -DENABLE_LUAJIT=$(usex jit ON OFF)
-               -DENABLE_FANN=$(usex fann ON OFF)
                -DENABLE_GD=$(usex gd ON OFF)
                -DENABLE_PCRE2=$(usex pcre2 ON OFF)
                -DENABLE_JEMALLOC=$(usex jemalloc ON OFF)