commit:     b738a5b5fb44be3e4ef584c256f3e37b9a055c7e
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Mon Aug 31 13:48:36 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Oct  2 07:21:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b738a5b5

mail-filter/rspamd: clean old and buggy versions

- Version 2.3 does not work with libressl, however, the bug was resolved
  in 2.4 and later
- Version 2.4 contains bugs in plugins/lua/neural.lua and
  plugins/lua/phishing.lua and users should not use it.

Closes: https://bugs.gentoo.org/708620
Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 mail-filter/rspamd/Manifest          |  2 -
 mail-filter/rspamd/rspamd-2.3.ebuild | 94 ------------------------------------
 mail-filter/rspamd/rspamd-2.4.ebuild | 94 ------------------------------------
 3 files changed, 190 deletions(-)

diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index c1caf263ac8..31a2bd1b901 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,3 +1 @@
-DIST rspamd-2.3.tar.gz 4409924 BLAKE2B 
825326c8c92b9937be1aed8640acc1c94762bf8de564642e4d1d429025eb9cc7ba943217b35c881c92b888cff0bec68ffae737bfc77ccb02bfc2ebd9d5948bcc
 SHA512 
20fae1b088acafaaaa406980dc10da5efa66680f10ca8f0d262ddc735a0498f2026091806206995430d28ae27a7d348556eb1586a9217a02c39dfcf0f7c6eb95
-DIST rspamd-2.4.tar.gz 4462119 BLAKE2B 
073a27dc8ca76ede3928a2bbc1c3908d442e2d70e0cb51fea73f23fea55536f84e8154b7b6423af13002c0bd5cda60ae9948b3c6321a73d365c7fbd6541c3dca
 SHA512 
47d64fdadc1c61642efebe4772add48848a45c8106bf431dacb458d85cdd9bf996ca46bcb75d60cedb15ae72518089e9b3e63a0716d22843f5b9f38d7d86be08
 DIST rspamd-2.5.tar.gz 4490310 BLAKE2B 
8d117b1b03e8092d0c724a4da4de23dd145f5b22696aa6b4ef1c208ade28f0d143dd783c9173b6987514b2aef9327ff8fd29eeae5e3da3039d2568384e50a697
 SHA512 
6068309da98eeb75f95188414b12ce9443aef31200853f820646e70e1dbf2d9d1e2c661a86df2183c175cc01cfb09f6a5c7b8ba358901a56ec6cdb9d9fef4540

diff --git a/mail-filter/rspamd/rspamd-2.3.ebuild 
b/mail-filter/rspamd/rspamd-2.3.ebuild
deleted file mode 100644
index 38a8793ea03..00000000000
--- a/mail-filter/rspamd/rspamd-2.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake pax-utils systemd tmpfiles
-
-if [[ ${PV} == *9999 ]] ; then
-       EGIT_REPO_URI="https://github.com/rspamd/rspamd.git";
-       inherit git-r3
-else
-       SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-       KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Rapid spam filtering system"
-HOMEPAGE="https://rspamd.com/ https://github.com/rspamd/rspamd";
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain 
unicode ZLIB"
-SLOT="0"
-IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
-
-RDEPEND="
-       acct-group/rspamd
-       acct-user/rspamd
-       dev-db/sqlite:3
-       dev-libs/glib:2
-       dev-libs/icu:=
-       dev-libs/libev
-       dev-libs/libsodium
-       dev-util/ragel
-       net-libs/libnsl
-       sys-apps/file
-       blas? ( sci-libs/openblas )
-       cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
-       jemalloc? ( dev-libs/jemalloc )
-       jit? ( dev-lang/luajit:2 )
-       !jit? ( dev-lang/lua:* )
-       !libressl? ( dev-libs/openssl:0=[-bindist] )
-       libressl? ( dev-libs/libressl:0= )
-       pcre2? ( dev-libs/libpcre2[jit=] )
-       !pcre2? ( dev-libs/libpcre[jit=] )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-       cmake_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_BLAS=$(usex blas ON OFF)
-               -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
-               -DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
-               -DENABLE_LUAJIT=$(usex jit ON OFF)
-               -DENABLE_PCRE2=$(usex pcre2 ON OFF)
-       )
-       cmake_src_configure
-}
-
-src_test() {
-       cmake_src_test
-}
-
-src_install() {
-       cmake_src_install
-
-       newconfd "${FILESDIR}"/rspamd.conf rspamd
-       newinitd "${FILESDIR}/rspamd-r7.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-2.4.ebuild 
b/mail-filter/rspamd/rspamd-2.4.ebuild
deleted file mode 100644
index 38a8793ea03..00000000000
--- a/mail-filter/rspamd/rspamd-2.4.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake pax-utils systemd tmpfiles
-
-if [[ ${PV} == *9999 ]] ; then
-       EGIT_REPO_URI="https://github.com/rspamd/rspamd.git";
-       inherit git-r3
-else
-       SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-       KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Rapid spam filtering system"
-HOMEPAGE="https://rspamd.com/ https://github.com/rspamd/rspamd";
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain 
unicode ZLIB"
-SLOT="0"
-IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
-
-RDEPEND="
-       acct-group/rspamd
-       acct-user/rspamd
-       dev-db/sqlite:3
-       dev-libs/glib:2
-       dev-libs/icu:=
-       dev-libs/libev
-       dev-libs/libsodium
-       dev-util/ragel
-       net-libs/libnsl
-       sys-apps/file
-       blas? ( sci-libs/openblas )
-       cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
-       jemalloc? ( dev-libs/jemalloc )
-       jit? ( dev-lang/luajit:2 )
-       !jit? ( dev-lang/lua:* )
-       !libressl? ( dev-libs/openssl:0=[-bindist] )
-       libressl? ( dev-libs/libressl:0= )
-       pcre2? ( dev-libs/libpcre2[jit=] )
-       !pcre2? ( dev-libs/libpcre[jit=] )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-       cmake_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_BLAS=$(usex blas ON OFF)
-               -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
-               -DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
-               -DENABLE_LUAJIT=$(usex jit ON OFF)
-               -DENABLE_PCRE2=$(usex pcre2 ON OFF)
-       )
-       cmake_src_configure
-}
-
-src_test() {
-       cmake_src_test
-}
-
-src_install() {
-       cmake_src_install
-
-       newconfd "${FILESDIR}"/rspamd.conf rspamd
-       newinitd "${FILESDIR}/rspamd-r7.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"
-}

Reply via email to