[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 6503d050fcb4d7d5829738c20ff33e4f2f3d08ec
Author: Petr Vaněk gentoo org>
AuthorDate: Tue Jul 23 21:03:04 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Tue Jul 23 21:03:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6503d050
mail-filter/rspamd: add 3.9.1
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest| 1 +
mail-filter/rspamd/rspamd-3.9.1.ebuild | 155 +
2 files changed, 156 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 89a5f23e7ef2..61c37d67e748 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,2 +1,3 @@
DIST rspamd-3.8.4.tar.gz 5915680 BLAKE2B
a6674c5175a10dffa440b9f4227fc4f2e7c497bf8a5a6c87c9f042ca870380a61be63405f4d2714103f49679edd5a28c4eb30807b8acb22998c7dbba72f19cb3
SHA512
dda099dd9a17699d143fc8018b89fbecfa9659eccc26b5fb88bc3f40c47e935993dfc81f1f93bb69880d17af40870e6ea20edbeed7e3f4c12c278f5c12b56a51
DIST rspamd-3.9.0.tar.gz 5955138 BLAKE2B
52eea9b11c3780bdd54d24a4ae49d7f1c598fa2748cf1d1b4e4cd19fff50fcfcfafe5140038efa437104ba71e6e968a39613e86b642df7be84553c96123a90fa
SHA512
7e75df264de5c778e92aac72be5d701724896ef60dc7f7e41f91a89193b812896dff56f6434233eaa91b5cdf8e6aa863f39129a154520a08b52bcb04c61b965e
+DIST rspamd-3.9.1.tar.gz 5980094 BLAKE2B
bb02cecdd686c85ef8340f122255f36c2cd5f6823da05370abce1e059466d053f543998945172be43c631f9d1fce0837a62fc047ca8aa76f3ea87680ee3e2a17
SHA512
b8d60448b8174a05f9dcfb17181e0e2908828923491fadb0f07b8debf97923f6967f3e5dfd27ca3c1a24671abd65c144139b02d1698a8a8a2e5b0672f9012d1f
diff --git a/mail-filter/rspamd/rspamd-3.9.1.ebuild
b/mail-filter/rspamd/rspamd-3.9.1.ebuild
new file mode 100644
index ..45df6738554b
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.9.1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit cmake lua-single pax-utils systemd tmpfiles
+
+if [[ ${PV} == * ]] ; 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 +hyperscan jemalloc +jit selinux test"
+RESTRICT="!test? ( test )"
+
+# A part of tests use ffi luajit extension
+REQUIRED_USE="${LUA_REQUIRED_USE}
+ test? ( lua_single_target_luajit )"
+
+RDEPEND="
+ ${LUA_DEPS}
+ $(lua_gen_cond_dep '
+ dev-lua/LuaBitOp[${LUA_USEDEP}]
+ dev-lua/lua-argparse[${LUA_USEDEP}]
+ ')
+ acct-group/rspamd
+ acct-user/rspamd
+ app-arch/libarchive:=
+ app-arch/zstd:=
+ dev-db/sqlite:3
+ dev-libs/glib:2
+ dev-libs/icu:=
+ dev-libs/libpcre2:=[jit=]
+ dev-libs/libsodium:=
+ dev-libs/openssl:0=[-bindist(-)]
+ dev-libs/snowball-stemmer:=
+ sys-libs/zlib
+ blas? (
+ virtual/blas
+ virtual/lapack
+ )
+ hyperscan? ( dev-libs/vectorscan:= )
+ jemalloc? ( dev-libs/jemalloc:= )
+ selinux? ( sec-policy/selinux-spamassassin )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/doctest
+ dev-libs/libfmt:=
+ >=dev-libs/xxhash-0.8.0
+"
+BDEPEND="
+ dev-lang/perl
+ dev-util/ragel
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.6-cmake-lua-version.patch"
+ "${FILESDIR}/${PN}-3.6-unbundle-lua.patch"
+ "${FILESDIR}/${PN}-3.6-unbundle-snowball.patch"
+
+ # backward compatibility with cmake/Toolset.cmake || die #827550
+
+ 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
+ -DLIBDIR="/usr/$(get_libdir)/rspamd"
+
+ -DSYSTEM_DOCTEST=ON
+ -DSYSTEM_FMT=ON
+ -DSYSTEM_XXHASH=ON
+ -DSYSTEM_ZSTD=ON
+
+ # For bundled https://github.com/bombela/backward-cpp
+ # Bundled backward library uses execinfo.h in current setting,
which is
+ # available in glibc, but not in musl. Let's enable it for
glibc only.
+ -DENABLE_BACKWARD=$(usex elibc_glibc ON OFF) # bug 917643
+ -DSTACK_DETAILS_AUTO_DETECT=OFF
+
+ -DENABLE_BLAS=$(usex blas ON OFF)
+ -DENABLE_HYPERSCAN=$(usex hyperscan ON OFF)
+ -DENABLE_JEMALLOC=$(usex
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/
commit: 868baf98108d1975cc049a622e90485f74ee9082
Author: Petr Vaněk gentoo org>
AuthorDate: Sat Jul 13 20:40:25 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Sat Jul 13 20:42:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=868baf98
mail-filter/rspamd: add 3.9.0
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest| 1 +
.../rspamd/files/rspamd-3.9.0-older-libfmt.patch | 184 +
mail-filter/rspamd/rspamd-3.9.0.ebuild | 155 +
3 files changed, 340 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index dd2b12eb7b18..89a5f23e7ef2 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1 +1,2 @@
DIST rspamd-3.8.4.tar.gz 5915680 BLAKE2B
a6674c5175a10dffa440b9f4227fc4f2e7c497bf8a5a6c87c9f042ca870380a61be63405f4d2714103f49679edd5a28c4eb30807b8acb22998c7dbba72f19cb3
SHA512
dda099dd9a17699d143fc8018b89fbecfa9659eccc26b5fb88bc3f40c47e935993dfc81f1f93bb69880d17af40870e6ea20edbeed7e3f4c12c278f5c12b56a51
+DIST rspamd-3.9.0.tar.gz 5955138 BLAKE2B
52eea9b11c3780bdd54d24a4ae49d7f1c598fa2748cf1d1b4e4cd19fff50fcfcfafe5140038efa437104ba71e6e968a39613e86b642df7be84553c96123a90fa
SHA512
7e75df264de5c778e92aac72be5d701724896ef60dc7f7e41f91a89193b812896dff56f6434233eaa91b5cdf8e6aa863f39129a154520a08b52bcb04c61b965e
diff --git a/mail-filter/rspamd/files/rspamd-3.9.0-older-libfmt.patch
b/mail-filter/rspamd/files/rspamd-3.9.0-older-libfmt.patch
new file mode 100644
index ..0b6de27f5689
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.9.0-older-libfmt.patch
@@ -0,0 +1,184 @@
+From 0826efdadc36a7f1f4251f0450101fb5cbb1c94f Mon Sep 17 00:00:00 2001
+From: Petr Vaněk
+Date: Sat, 13 Jul 2024 15:53:28 +0200
+Subject: [PATCH] backward compatibility with https://github.com/rspamd/rspamd/commit/19299911dc7b951fa9649b918a661026a5d0e450
+[2]
https://github.com/fmtlib/fmt/commit/79f1506fe3a7fae7c22c55d3cd7cdc33bc536dae
+[3]
https://github.com/fmtlib/fmt/commit/58a6bd48a8dc7ea74bb9fd900c60fd333a85725f
+
+diff --git a/src/libmime/lang_detection_fasttext.cxx
b/src/libmime/lang_detection_fasttext.cxx
+index 89916151f..5c3549c8e 100644
+--- a/src/libmime/lang_detection_fasttext.cxx
b/src/libmime/lang_detection_fasttext.cxx
+@@ -20,7 +20,7 @@
+ #include "fasttext/fasttext.h"
+ #include "libserver/cfg_file.h"
+ #include "libserver/logger.h"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+ #include "stat_api.h"
+ #include
+ #include
+diff --git a/src/libserver/backtrace.cxx b/src/libserver/backtrace.cxx
+index c24e61936..330c829b0 100644
+--- a/src/libserver/backtrace.cxx
b/src/libserver/backtrace.cxx
+@@ -19,7 +19,7 @@
+ #ifdef BACKWARD_ENABLE
+
+ #include "contrib/backward-cpp/backward.hpp"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+ #include "logger.h"
+
+ namespace rspamd {
+diff --git a/src/libserver/cfg_rcl.cxx b/src/libserver/cfg_rcl.cxx
+index ce3df4010..f0c9db64d 100644
+--- a/src/libserver/cfg_rcl.cxx
b/src/libserver/cfg_rcl.cxx
+@@ -34,7 +34,7 @@
+ #include // for std::transform
+ #include
+ #include "contrib/ankerl/unordered_dense.h"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+ #include "libutil/cxx/util.hxx"
+ #include "libutil/cxx/file_util.hxx"
+ #include "frozen/unordered_set.h"
+diff --git a/src/libserver/cfg_utils.cxx b/src/libserver/cfg_utils.cxx
+index 1344bc4f9..adc23f590 100644
+--- a/src/libserver/cfg_utils.cxx
b/src/libserver/cfg_utils.cxx
+@@ -65,7 +65,7 @@
+ #include
+ #include
+ #include
+-#include "fmt/base.h"
++#include "fmt/core.h"
+ #include "cxx/util.hxx"
+ #include "frozen/unordered_map.h"
+ #include "frozen/string.h"
+diff --git a/src/libserver/css/css_parser.cxx
b/src/libserver/css/css_parser.cxx
+index 11fa830f0..c016b9d9d 100644
+--- a/src/libserver/css/css_parser.cxx
b/src/libserver/css/css_parser.cxx
+@@ -20,7 +20,7 @@
+ #include "css_rule.hxx"
+ #include "css_util.hxx"
+ #include "css.hxx"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+
+ #include
+ #include
+diff --git a/src/libserver/css/css_selector.cxx
b/src/libserver/css/css_selector.cxx
+index d2ae093cb..61bd8750f 100644
+--- a/src/libserver/css/css_selector.cxx
b/src/libserver/css/css_selector.cxx
+@@ -17,7 +17,7 @@
+ #include "css_selector.hxx"
+ #include "css.hxx"
+ #include "libserver/html/html.hxx"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+ #define DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL
+ #include "doctest/doctest.h"
+
+diff --git a/src/libserver/css/css_value.cxx b/src/libserver/css/css_value.cxx
+index f2ff55363..64ebc536f 100644
+--- a/src/libserver/css/css_value.cxx
b/src/libserver/css/css_value.cxx
+@@ -20,7 +20,7 @@
+ #include "frozen/string.h"
+ #include "libutil/util.h"
+ #include "contrib/ankerl/unordered_dense.h"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+
+ #define DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL
+ #include "doctest/doctest.h"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 0458788cf9450674af6ec828adf2db041e265c3d
Author: Petr Vaněk gentoo org>
AuthorDate: Tue Apr 23 09:53:06 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Tue Apr 23 10:41:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0458788c
mail-filter/rspamd: drop 3.8.1
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest| 1 -
mail-filter/rspamd/rspamd-3.8.1.ebuild | 155 -
2 files changed, 156 deletions(-)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index f5a68e3e11cc..dd2b12eb7b18 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,2 +1 @@
-DIST rspamd-3.8.1.tar.gz 5910993 BLAKE2B
c3c29cb380fa09a33173bb6f51ff76eaf88cf459eda0c6f19f890148eb97703a8f43f34443a6d4b28cb1cbcf2c6f47321203556d265a0b2f0b0050b5575c5851
SHA512
b87c1cba11faca278db85426ed527832c34d1beff56e0993543a05fcc2d5d72675cf31bbc4241f52da9122787d24f8b955218988a198a3c29dee5db3be2c7e99
DIST rspamd-3.8.4.tar.gz 5915680 BLAKE2B
a6674c5175a10dffa440b9f4227fc4f2e7c497bf8a5a6c87c9f042ca870380a61be63405f4d2714103f49679edd5a28c4eb30807b8acb22998c7dbba72f19cb3
SHA512
dda099dd9a17699d143fc8018b89fbecfa9659eccc26b5fb88bc3f40c47e935993dfc81f1f93bb69880d17af40870e6ea20edbeed7e3f4c12c278f5c12b56a51
diff --git a/mail-filter/rspamd/rspamd-3.8.1.ebuild
b/mail-filter/rspamd/rspamd-3.8.1.ebuild
deleted file mode 100644
index f2a11e4ecfa4..
--- a/mail-filter/rspamd/rspamd-3.8.1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit cmake lua-single pax-utils systemd tmpfiles
-
-if [[ ${PV} == * ]] ; 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 +hyperscan jemalloc +jit selinux test"
-RESTRICT="!test? ( test )"
-
-# A part of tests use ffi luajit extension
-REQUIRED_USE="${LUA_REQUIRED_USE}
- test? ( lua_single_target_luajit )"
-
-RDEPEND="
- ${LUA_DEPS}
- $(lua_gen_cond_dep '
- dev-lua/LuaBitOp[${LUA_USEDEP}]
- dev-lua/lua-argparse[${LUA_USEDEP}]
- ')
- acct-group/rspamd
- acct-user/rspamd
- app-arch/zstd:=
- dev-db/sqlite:3
- dev-libs/glib:2
- dev-libs/icu:=
- dev-libs/libpcre2:=[jit=]
- dev-libs/libsodium:=
- dev-libs/openssl:0=[-bindist(-)]
- dev-libs/snowball-stemmer:=
- sys-libs/zlib
- blas? (
- virtual/blas
- virtual/lapack
- )
- hyperscan? ( dev-libs/vectorscan:= )
- jemalloc? ( dev-libs/jemalloc:= )
- selinux? ( sec-policy/selinux-spamassassin )
-"
-DEPEND="
- ${RDEPEND}
- dev-cpp/doctest
- dev-libs/libfmt:=
- >=dev-libs/xxhash-0.8.0
-"
-BDEPEND="
- dev-lang/perl
- dev-util/ragel
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/rspamd-3.6-cmake-lua-version.patch"
- "${FILESDIR}/rspamd-3.6-unbundle-lua.patch"
- "${FILESDIR}/rspamd-3.6-unbundle-snowball.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
-
- rm -vrf contrib/{doctest,fmt,lua-{argparse,bit},snowball,xxhash,zstd}
|| die
-
- > cmake/Toolset.cmake || die #827550
-
- 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
- -DLIBDIR="/usr/$(get_libdir)/rspamd"
-
- -DSYSTEM_DOCTEST=ON
- -DSYSTEM_FMT=ON
- -DSYSTEM_XXHASH=ON
- -DSYSTEM_ZSTD=ON
-
- # For bundled https://github.com/bombela/backward-cpp
- # Bundled backward library uses execinfo.h in current setting,
which is
- # available in glibc, but not in musl. Let's enable it for
glibc only.
- -DENABLE_BACKWARD=$(usex elibc_glibc ON OFF) # bug 917643
- -DSTACK_DETAILS_AUTO_DETECT=OFF
-
- -DENABLE_BLAS=$(usex blas ON OFF)
- -DENABLE_HYPERSCAN=$(usex hyperscan ON OFF)
- -DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
- -DENABLE_LUAJIT=$(usex lua_single_target_luajit ON OFF)
- -DENABLE_PCRE2=ON
- )
- cmake_src_configure
-}
-
-src_test() {
- cmake_build run-test
-}
-
-src_install() {
-
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 56d0c91c35b0578120989465c89395eafa373368
Author: Matoro Mahri matoro tk>
AuthorDate: Thu Apr 18 18:27:31 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Apr 19 06:37:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56d0c91c
mail-filter/rspamd: Stabilize 3.8.4 amd64, #928004
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Ionen Wolkens gentoo.org>
mail-filter/rspamd/rspamd-3.8.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.8.4.ebuild
b/mail-filter/rspamd/rspamd-3.8.4.ebuild
index d1d6da7bf192..3eea4b377db7 100644
--- a/mail-filter/rspamd/rspamd-3.8.4.ebuild
+++ b/mail-filter/rspamd/rspamd-3.8.4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 2829d4451012f2eaf37dd039b96fbe2d85805f74
Author: Matoro Mahri matoro tk>
AuthorDate: Thu Apr 18 20:19:01 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Apr 19 06:37:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2829d445
mail-filter/rspamd: Stabilize 3.8.4 x86, #928004
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Ionen Wolkens gentoo.org>
mail-filter/rspamd/rspamd-3.8.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.8.4.ebuild
b/mail-filter/rspamd/rspamd-3.8.4.ebuild
index 3eea4b377db7..1ba2cca28359 100644
--- a/mail-filter/rspamd/rspamd-3.8.4.ebuild
+++ b/mail-filter/rspamd/rspamd-3.8.4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/
commit: 8a31789b8e900a225947a82e98f27576b03fb19e
Author: Petr Vaněk gentoo org>
AuthorDate: Wed Mar 13 08:18:46 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Wed Mar 13 17:30:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a31789b
mail-filter/rspamd: drop 3.6-r1, 3.7.4, 3.7.4-r1, 3.7.5
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest| 3 -
.../rspamd/files/rspamd-3.6-fix-tests.patch| 23 ---
.../rspamd/files/rspamd-3.6-memleak-fix.patch | 36 -
.../rspamd/files/rspamd-3.7.4-no-hyperscan.patch | 38 -
mail-filter/rspamd/rspamd-3.6-r1.ebuild| 153
mail-filter/rspamd/rspamd-3.7.4-r1.ebuild | 157 -
mail-filter/rspamd/rspamd-3.7.4.ebuild | 157 -
mail-filter/rspamd/rspamd-3.7.5.ebuild | 155
8 files changed, 722 deletions(-)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 8929872819e4..f5a68e3e11cc 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,5 +1,2 @@
-DIST rspamd-3.6.tar.gz 5843907 BLAKE2B
2ccb3e65a14624d48540bd3e2d034fec0dd89cd75032ade3ca74ded09cee6ed67f670c31035b18583b850cc4efeb21b44f97ec2c35d518a49b0c4e6f0eb8c90f
SHA512
d99e2a60eec94eb39902454a8041eeb76f673c9f784849128766323a218d6c419755e0f8819e2a6921ca08c6a7d63660dc87bc911f808fb4a67d29e8fbfc571b
-DIST rspamd-3.7.4.tar.gz 5903754 BLAKE2B
d13b3451b4a6a7c5e8644ba57196190065edda2fc48e7245ef7e0094cb90838760cc124a2cf8d0b4b7519c7583284f6883fbcd4bf3a6489496b5e52234a36c21
SHA512
a82696957417f7197b59e614012176626b4fdf1464ed38ce57552c8a02fe2e426504e0b0780ab4f36d208a11ae4d1921bacee52341c8a906b4ab19c1719fd116
-DIST rspamd-3.7.5.tar.gz 5903689 BLAKE2B
29fecbc3a813fbc898360289aef2a8634fc15df38b28c47279eefa0afd836b2d3e95d83076190d9c1f0123402ea95f7c9b94fe2322996e37a529841cc55def8f
SHA512
d8d25cda2dee80e0c1e627c96e56ade97fc44ca0cf9410d21bd3a82fc2a4004e09c0bbb8c89eb81e835c0be5cd748f468910c3be67f5e4cdb50d56d9f8cda672
DIST rspamd-3.8.1.tar.gz 5910993 BLAKE2B
c3c29cb380fa09a33173bb6f51ff76eaf88cf459eda0c6f19f890148eb97703a8f43f34443a6d4b28cb1cbcf2c6f47321203556d265a0b2f0b0050b5575c5851
SHA512
b87c1cba11faca278db85426ed527832c34d1beff56e0993543a05fcc2d5d72675cf31bbc4241f52da9122787d24f8b955218988a198a3c29dee5db3be2c7e99
DIST rspamd-3.8.4.tar.gz 5915680 BLAKE2B
a6674c5175a10dffa440b9f4227fc4f2e7c497bf8a5a6c87c9f042ca870380a61be63405f4d2714103f49679edd5a28c4eb30807b8acb22998c7dbba72f19cb3
SHA512
dda099dd9a17699d143fc8018b89fbecfa9659eccc26b5fb88bc3f40c47e935993dfc81f1f93bb69880d17af40870e6ea20edbeed7e3f4c12c278f5c12b56a51
diff --git a/mail-filter/rspamd/files/rspamd-3.6-fix-tests.patch
b/mail-filter/rspamd/files/rspamd-3.6-fix-tests.patch
deleted file mode 100644
index 33e851261f46..
--- a/mail-filter/rspamd/files/rspamd-3.6-fix-tests.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Duncan Bellamy
-Date: Thu, 3 Aug 2023 22:08:06 +
-Subject: [PATCH] [Fix] CMakeLists.txt remove whitespace added by linter as it
- makes tests fail
-
-Upstream-PR: https://github.com/rspamd/rspamd/pull/4560
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5402c4806..efda209ca 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -777,7 +777,7 @@ IF (NOT DEBIAN_BUILD)
- ADD_CUSTOM_TARGET(check DEPENDS rspamd-test-cxx rspamd-test)
- ADD_CUSTOM_TARGET(run-test DEPENDS check
- COMMAND test/rspamd-test-cxx
--COMMAND sh -c 'LUA_PATH=
"${CMAKE_SOURCE_DIR}/lualib/?.lua\;${CMAKE_SOURCE_DIR}/lualib/?/?.lua\;${CMAKE_SOURCE_DIR}/lualib/?/init.lua\;${CMAKE_SOURCE_DIR}/contrib/lua-?/?.lua"
-+COMMAND sh -c
'LUA_PATH="${CMAKE_SOURCE_DIR}/lualib/?.lua\;${CMAKE_SOURCE_DIR}/lualib/?/?.lua\;${CMAKE_SOURCE_DIR}/lualib/?/init.lua\;${CMAKE_SOURCE_DIR}/contrib/lua-?/?.lua"
- test/rspamd-test -p /rspamd/lua')
- ENDIF (NOT DEBIAN_BUILD)
-
---
-2.41.0
-
diff --git a/mail-filter/rspamd/files/rspamd-3.6-memleak-fix.patch
b/mail-filter/rspamd/files/rspamd-3.6-memleak-fix.patch
deleted file mode 100644
index f372b79de7c7..
--- a/mail-filter/rspamd/files/rspamd-3.6-memleak-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From ffbab4fbf218514845b8e5209aec044621b1f460 Mon Sep 17 00:00:00 2001
-From: Vsevolod Stakhov
-Date: Sun, 6 Aug 2023 18:33:37 +0100
-Subject: [PATCH] [CritFix] Fix leak in `gzip` function
-
-Upstream-Issue: https://github.com/rspamd/rspamd/issues/4564
-
-diff --git a/src/libutil/util.c b/src/libutil/util.c
-index 4be7cc620..deba3e807 100644
a/src/libutil/util.c
-+++ b/src/libutil/util.c
-@@ -2231,6 +2231,7 @@ rspamd_fstring_gzip(rspamd_fstring_t **in)
- strm.avail_out = sizeof(temp) > buf->allocated ? buf->allocated :
sizeof(temp);
- ret = deflate(, Z_FINISH);
- if (ret == Z_STREAM_ERROR) {
-+ deflateEnd();
- return FALSE;
- }
-
-@@
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: bf6a4fee21b57c6781540fddc0c35e0471a1def1
Author: Matoro Mahri matoro tk>
AuthorDate: Sun Mar 10 22:28:25 2024 +
Commit: Viorel Munteanu gentoo org>
CommitDate: Mon Mar 11 16:11:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf6a4fee
mail-filter/rspamd: Stabilize 3.8.1 x86, #925489
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Viorel Munteanu gentoo.org>
mail-filter/rspamd/rspamd-3.8.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.8.1.ebuild
b/mail-filter/rspamd/rspamd-3.8.1.ebuild
index 2c4184dcd20b..f2a11e4ecfa4 100644
--- a/mail-filter/rspamd/rspamd-3.8.1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.8.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 5e20534d60d9e1c113975c14eef63bbfc7a14ea7
Author: Matoro Mahri matoro tk>
AuthorDate: Sun Mar 10 22:17:59 2024 +
Commit: Viorel Munteanu gentoo org>
CommitDate: Mon Mar 11 16:11:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e20534d
mail-filter/rspamd: Stabilize 3.8.1 amd64, #925489
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Viorel Munteanu gentoo.org>
mail-filter/rspamd/rspamd-3.8.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.8.1.ebuild
b/mail-filter/rspamd/rspamd-3.8.1.ebuild
index 4cbd73d5bd4e..2c4184dcd20b 100644
--- a/mail-filter/rspamd/rspamd-3.8.1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.8.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 29e1cdf39be0abeb24c8facdbd54bfc3eb4d66d8 Author: Petr Vaněk gentoo org> AuthorDate: Wed Feb 28 21:24:52 2024 + Commit: Petr Vaněk gentoo org> CommitDate: Wed Feb 28 21:32:17 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29e1cdf3 mail-filter/rspamd: add libarchive dep to live ebuild Signed-off-by: Petr Vaněk gentoo.org> mail-filter/rspamd/rspamd-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/mail-filter/rspamd/rspamd-.ebuild b/mail-filter/rspamd/rspamd-.ebuild index 7763299004ae..16b59dbaef8d 100644 --- a/mail-filter/rspamd/rspamd-.ebuild +++ b/mail-filter/rspamd/rspamd-.ebuild @@ -38,6 +38,7 @@ RDEPEND=" ') acct-group/rspamd acct-user/rspamd + app-arch/libarchive:= app-arch/zstd:= dev-db/sqlite:3 dev-libs/glib:2
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: f5c90a7a7e87a2629c20b05cfb5f0847fb706a22
Author: Petr Vaněk gentoo org>
AuthorDate: Wed Feb 28 21:29:10 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Wed Feb 28 21:32:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5c90a7a
mail-filter/rspamd: drop 3.8.2, 3.8.3
Both versions has known bugs, which were addressed promptly in 3.8.4.
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest| 2 -
mail-filter/rspamd/rspamd-3.8.2.ebuild | 163 -
mail-filter/rspamd/rspamd-3.8.3.ebuild | 163 -
3 files changed, 328 deletions(-)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 75fb4e5bf878..8929872819e4 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -2,6 +2,4 @@ DIST rspamd-3.6.tar.gz 5843907 BLAKE2B
2ccb3e65a14624d48540bd3e2d034fec0dd89cd75
DIST rspamd-3.7.4.tar.gz 5903754 BLAKE2B
d13b3451b4a6a7c5e8644ba57196190065edda2fc48e7245ef7e0094cb90838760cc124a2cf8d0b4b7519c7583284f6883fbcd4bf3a6489496b5e52234a36c21
SHA512
a82696957417f7197b59e614012176626b4fdf1464ed38ce57552c8a02fe2e426504e0b0780ab4f36d208a11ae4d1921bacee52341c8a906b4ab19c1719fd116
DIST rspamd-3.7.5.tar.gz 5903689 BLAKE2B
29fecbc3a813fbc898360289aef2a8634fc15df38b28c47279eefa0afd836b2d3e95d83076190d9c1f0123402ea95f7c9b94fe2322996e37a529841cc55def8f
SHA512
d8d25cda2dee80e0c1e627c96e56ade97fc44ca0cf9410d21bd3a82fc2a4004e09c0bbb8c89eb81e835c0be5cd748f468910c3be67f5e4cdb50d56d9f8cda672
DIST rspamd-3.8.1.tar.gz 5910993 BLAKE2B
c3c29cb380fa09a33173bb6f51ff76eaf88cf459eda0c6f19f890148eb97703a8f43f34443a6d4b28cb1cbcf2c6f47321203556d265a0b2f0b0050b5575c5851
SHA512
b87c1cba11faca278db85426ed527832c34d1beff56e0993543a05fcc2d5d72675cf31bbc4241f52da9122787d24f8b955218988a198a3c29dee5db3be2c7e99
-DIST rspamd-3.8.2.tar.gz 5915793 BLAKE2B
df375fd2d3272a43bf5e9bfe3cec7352a92e5df319d973a59299317a5e199e8e2936d1e81fbb2b8f669d23a0fac2d51830a06f577d4d5751eb93404e6f08b0cd
SHA512
75d46197720c556ae04de2898a788e704385195785cf6c505dfdadcdb837dc7abbb2a4285acf8d19575f01ccb5c83b5c9847424d4cabf3a645799ad1f35c7f2a
-DIST rspamd-3.8.3.tar.gz 5915102 BLAKE2B
7c8a8055ffa190ea7f0d34cdb504e3d70fd526f546d39fdb118f8c151d5ac21fc1c2bfb9c226454f39a5c4f3e5bb73de7b9f8612fb390c5a49de48bd1593bada
SHA512
f325f533f333b50799699532dbc22e183c4f76ade14e5b47c1e3234ee8c3bde9304a9f28f26c23ccff99c7a82ea1253d15c5687d07f0682a2a4d61d6fbba665c
DIST rspamd-3.8.4.tar.gz 5915680 BLAKE2B
a6674c5175a10dffa440b9f4227fc4f2e7c497bf8a5a6c87c9f042ca870380a61be63405f4d2714103f49679edd5a28c4eb30807b8acb22998c7dbba72f19cb3
SHA512
dda099dd9a17699d143fc8018b89fbecfa9659eccc26b5fb88bc3f40c47e935993dfc81f1f93bb69880d17af40870e6ea20edbeed7e3f4c12c278f5c12b56a51
diff --git a/mail-filter/rspamd/rspamd-3.8.2.ebuild
b/mail-filter/rspamd/rspamd-3.8.2.ebuild
deleted file mode 100644
index d1d6da7bf192..
--- a/mail-filter/rspamd/rspamd-3.8.2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit cmake lua-single pax-utils systemd tmpfiles
-
-if [[ ${PV} == * ]] ; 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 +hyperscan jemalloc +jit selinux test"
-RESTRICT="!test? ( test )"
-
-# A part of tests use ffi luajit extension
-REQUIRED_USE="${LUA_REQUIRED_USE}
- test? ( lua_single_target_luajit )"
-
-RDEPEND="
- ${LUA_DEPS}
- $(lua_gen_cond_dep '
- dev-lua/LuaBitOp[${LUA_USEDEP}]
- dev-lua/lua-argparse[${LUA_USEDEP}]
- ')
- acct-group/rspamd
- acct-user/rspamd
- app-arch/zstd:=
- dev-db/sqlite:3
- dev-libs/glib:2
- dev-libs/icu:=
- dev-libs/libpcre2:=[jit=]
- dev-libs/libsodium:=
- dev-libs/openssl:0=[-bindist(-)]
- dev-libs/snowball-stemmer:=
- sys-libs/zlib
- blas? (
- virtual/blas
- virtual/lapack
- )
- hyperscan? ( dev-libs/vectorscan:= )
- jemalloc? ( dev-libs/jemalloc:= )
- selinux? ( sec-policy/selinux-spamassassin )
-"
-DEPEND="
- ${RDEPEND}
- dev-cpp/doctest
- dev-libs/libfmt:=
- >=dev-libs/xxhash-0.8.0
-"
-BDEPEND="
- dev-lang/perl
- dev-util/ragel
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/rspamd-3.6-cmake-lua-version.patch"
- "${FILESDIR}/rspamd-3.6-unbundle-lua.patch"
-
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: c13f39be6f5f2b8d6e777cf6eb99d3a1b0ae629a
Author: Petr Vaněk gentoo org>
AuthorDate: Tue Feb 20 22:13:08 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Tue Feb 20 22:16:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c13f39be
mail-filter/rspamd: sync live
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/rspamd-.ebuild | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index d8e37a79ac0c..7763299004ae 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -109,12 +109,20 @@ src_configure() {
-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
-DENABLE_LUAJIT=$(usex lua_single_target_luajit ON OFF)
-DENABLE_PCRE2=ON
+
+ -DBUILD_TESTING=$(usex test ON OFF)
)
cmake_src_configure
}
src_test() {
- cmake_build run-test
+ # These variables ensure tests use Lua scripts from this package rather
+ # than the installed version. However, rspamd always first attempts to
load
+ # from /etc/rspamd/lua, with no method to override this behavior.
+ LUA_PATH="${S}/contrib/lua-?/?.lua" \
+ LUALIBDIR="${S}/lualib" \
+ RULESDIR="${S}/lualib" \
+ cmake_src_test
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 5258085b1e5239d5dfcc60970f3acaf3ea9ccb6c
Author: Matoro Mahri matoro tk>
AuthorDate: Mon Jan 29 18:22:43 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Jan 30 03:53:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5258085b
mail-filter/rspamd: Stabilize 3.7.5 amd64, #921014
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Ionen Wolkens gentoo.org>
mail-filter/rspamd/rspamd-3.7.5.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-3.7.5.ebuild
b/mail-filter/rspamd/rspamd-3.7.5.ebuild
index 476878d10a51..e4daeebbe16d 100644
--- a/mail-filter/rspamd/rspamd-3.7.5.ebuild
+++ b/mail-filter/rspamd/rspamd-3.7.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64"
+ KEYWORDS="amd64"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: a2e961efcd3c4333c31d9248b5b6e0dcef5f1e93
Author: Petr Vaněk gentoo org>
AuthorDate: Fri Jan 26 09:01:43 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Fri Jan 26 09:15:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2e961ef
mail-filter/rspamd: add 3.8.1
This version fixes Lua 5.1 issue, see bug 922522.
Bug: https://bugs.gentoo.org/922522
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest| 1 +
mail-filter/rspamd/rspamd-3.8.1.ebuild | 155 +
2 files changed, 156 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 89c5db99091a..cae72b6d8a43 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -2,3 +2,4 @@ DIST rspamd-3.6.tar.gz 5843907 BLAKE2B
2ccb3e65a14624d48540bd3e2d034fec0dd89cd75
DIST rspamd-3.7.4.tar.gz 5903754 BLAKE2B
d13b3451b4a6a7c5e8644ba57196190065edda2fc48e7245ef7e0094cb90838760cc124a2cf8d0b4b7519c7583284f6883fbcd4bf3a6489496b5e52234a36c21
SHA512
a82696957417f7197b59e614012176626b4fdf1464ed38ce57552c8a02fe2e426504e0b0780ab4f36d208a11ae4d1921bacee52341c8a906b4ab19c1719fd116
DIST rspamd-3.7.5.tar.gz 5903689 BLAKE2B
29fecbc3a813fbc898360289aef2a8634fc15df38b28c47279eefa0afd836b2d3e95d83076190d9c1f0123402ea95f7c9b94fe2322996e37a529841cc55def8f
SHA512
d8d25cda2dee80e0c1e627c96e56ade97fc44ca0cf9410d21bd3a82fc2a4004e09c0bbb8c89eb81e835c0be5cd748f468910c3be67f5e4cdb50d56d9f8cda672
DIST rspamd-3.8.0.tar.gz 5911065 BLAKE2B
6698051599f6d014229c3cdc3f005469b2a55841aea737a181c6f1aeee6bfde22478de23aa614bd4900be9746409648089baeb0f8a9033a531b362d783b63efa
SHA512
8c0d673be64df95aa84cdef20a09b4cfd501c39006a6dea58a925f737823fe5ec92ccdf86a38b78e5ab6ba8c7dd16b837a49dbc744ae479362979b6427e05e55
+DIST rspamd-3.8.1.tar.gz 5910993 BLAKE2B
c3c29cb380fa09a33173bb6f51ff76eaf88cf459eda0c6f19f890148eb97703a8f43f34443a6d4b28cb1cbcf2c6f47321203556d265a0b2f0b0050b5575c5851
SHA512
b87c1cba11faca278db85426ed527832c34d1beff56e0993543a05fcc2d5d72675cf31bbc4241f52da9122787d24f8b955218988a198a3c29dee5db3be2c7e99
diff --git a/mail-filter/rspamd/rspamd-3.8.1.ebuild
b/mail-filter/rspamd/rspamd-3.8.1.ebuild
new file mode 100644
index ..4cbd73d5bd4e
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.8.1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit cmake lua-single pax-utils systemd tmpfiles
+
+if [[ ${PV} == * ]] ; 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 +hyperscan jemalloc +jit selinux test"
+RESTRICT="!test? ( test )"
+
+# A part of tests use ffi luajit extension
+REQUIRED_USE="${LUA_REQUIRED_USE}
+ test? ( lua_single_target_luajit )"
+
+RDEPEND="
+ ${LUA_DEPS}
+ $(lua_gen_cond_dep '
+ dev-lua/LuaBitOp[${LUA_USEDEP}]
+ dev-lua/lua-argparse[${LUA_USEDEP}]
+ ')
+ acct-group/rspamd
+ acct-user/rspamd
+ app-arch/zstd:=
+ dev-db/sqlite:3
+ dev-libs/glib:2
+ dev-libs/icu:=
+ dev-libs/libpcre2:=[jit=]
+ dev-libs/libsodium:=
+ dev-libs/openssl:0=[-bindist(-)]
+ dev-libs/snowball-stemmer:=
+ sys-libs/zlib
+ blas? (
+ virtual/blas
+ virtual/lapack
+ )
+ hyperscan? ( dev-libs/vectorscan:= )
+ jemalloc? ( dev-libs/jemalloc:= )
+ selinux? ( sec-policy/selinux-spamassassin )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/doctest
+ dev-libs/libfmt:=
+ >=dev-libs/xxhash-0.8.0
+"
+BDEPEND="
+ dev-lang/perl
+ dev-util/ragel
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/rspamd-3.6-cmake-lua-version.patch"
+ "${FILESDIR}/rspamd-3.6-unbundle-lua.patch"
+ "${FILESDIR}/rspamd-3.6-unbundle-snowball.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ rm -vrf contrib/{doctest,fmt,lua-{argparse,bit},snowball,xxhash,zstd}
|| die
+
+ > cmake/Toolset.cmake || die #827550
+
+ 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
+ -DLIBDIR="/usr/$(get_libdir)/rspamd"
+
+ -DSYSTEM_DOCTEST=ON
+ -DSYSTEM_FMT=ON
+ -DSYSTEM_XXHASH=ON
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 9a31d97af4910925784bfd609199347030336516
Author: Petr Vaněk gentoo org>
AuthorDate: Fri Jan 26 09:03:02 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Fri Jan 26 09:15:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a31d97a
mail-filter/rspamd: drop 3.8.0
Closes: https://bugs.gentoo.org/922522
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest| 1 -
mail-filter/rspamd/rspamd-3.8.0.ebuild | 155 -
2 files changed, 156 deletions(-)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index cae72b6d8a43..279d1b04dcca 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,5 +1,4 @@
DIST rspamd-3.6.tar.gz 5843907 BLAKE2B
2ccb3e65a14624d48540bd3e2d034fec0dd89cd75032ade3ca74ded09cee6ed67f670c31035b18583b850cc4efeb21b44f97ec2c35d518a49b0c4e6f0eb8c90f
SHA512
d99e2a60eec94eb39902454a8041eeb76f673c9f784849128766323a218d6c419755e0f8819e2a6921ca08c6a7d63660dc87bc911f808fb4a67d29e8fbfc571b
DIST rspamd-3.7.4.tar.gz 5903754 BLAKE2B
d13b3451b4a6a7c5e8644ba57196190065edda2fc48e7245ef7e0094cb90838760cc124a2cf8d0b4b7519c7583284f6883fbcd4bf3a6489496b5e52234a36c21
SHA512
a82696957417f7197b59e614012176626b4fdf1464ed38ce57552c8a02fe2e426504e0b0780ab4f36d208a11ae4d1921bacee52341c8a906b4ab19c1719fd116
DIST rspamd-3.7.5.tar.gz 5903689 BLAKE2B
29fecbc3a813fbc898360289aef2a8634fc15df38b28c47279eefa0afd836b2d3e95d83076190d9c1f0123402ea95f7c9b94fe2322996e37a529841cc55def8f
SHA512
d8d25cda2dee80e0c1e627c96e56ade97fc44ca0cf9410d21bd3a82fc2a4004e09c0bbb8c89eb81e835c0be5cd748f468910c3be67f5e4cdb50d56d9f8cda672
-DIST rspamd-3.8.0.tar.gz 5911065 BLAKE2B
6698051599f6d014229c3cdc3f005469b2a55841aea737a181c6f1aeee6bfde22478de23aa614bd4900be9746409648089baeb0f8a9033a531b362d783b63efa
SHA512
8c0d673be64df95aa84cdef20a09b4cfd501c39006a6dea58a925f737823fe5ec92ccdf86a38b78e5ab6ba8c7dd16b837a49dbc744ae479362979b6427e05e55
DIST rspamd-3.8.1.tar.gz 5910993 BLAKE2B
c3c29cb380fa09a33173bb6f51ff76eaf88cf459eda0c6f19f890148eb97703a8f43f34443a6d4b28cb1cbcf2c6f47321203556d265a0b2f0b0050b5575c5851
SHA512
b87c1cba11faca278db85426ed527832c34d1beff56e0993543a05fcc2d5d72675cf31bbc4241f52da9122787d24f8b955218988a198a3c29dee5db3be2c7e99
diff --git a/mail-filter/rspamd/rspamd-3.8.0.ebuild
b/mail-filter/rspamd/rspamd-3.8.0.ebuild
deleted file mode 100644
index 4cbd73d5bd4e..
--- a/mail-filter/rspamd/rspamd-3.8.0.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit cmake lua-single pax-utils systemd tmpfiles
-
-if [[ ${PV} == * ]] ; 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 +hyperscan jemalloc +jit selinux test"
-RESTRICT="!test? ( test )"
-
-# A part of tests use ffi luajit extension
-REQUIRED_USE="${LUA_REQUIRED_USE}
- test? ( lua_single_target_luajit )"
-
-RDEPEND="
- ${LUA_DEPS}
- $(lua_gen_cond_dep '
- dev-lua/LuaBitOp[${LUA_USEDEP}]
- dev-lua/lua-argparse[${LUA_USEDEP}]
- ')
- acct-group/rspamd
- acct-user/rspamd
- app-arch/zstd:=
- dev-db/sqlite:3
- dev-libs/glib:2
- dev-libs/icu:=
- dev-libs/libpcre2:=[jit=]
- dev-libs/libsodium:=
- dev-libs/openssl:0=[-bindist(-)]
- dev-libs/snowball-stemmer:=
- sys-libs/zlib
- blas? (
- virtual/blas
- virtual/lapack
- )
- hyperscan? ( dev-libs/vectorscan:= )
- jemalloc? ( dev-libs/jemalloc:= )
- selinux? ( sec-policy/selinux-spamassassin )
-"
-DEPEND="
- ${RDEPEND}
- dev-cpp/doctest
- dev-libs/libfmt:=
- >=dev-libs/xxhash-0.8.0
-"
-BDEPEND="
- dev-lang/perl
- dev-util/ragel
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/rspamd-3.6-cmake-lua-version.patch"
- "${FILESDIR}/rspamd-3.6-unbundle-lua.patch"
- "${FILESDIR}/rspamd-3.6-unbundle-snowball.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
-
- rm -vrf contrib/{doctest,fmt,lua-{argparse,bit},snowball,xxhash,zstd}
|| die
-
- > cmake/Toolset.cmake || die #827550
-
- 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
-
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: d65837bcfffec57193ccd4e3a8d6a80610530248
Author: Matoro Mahri matoro tk>
AuthorDate: Mon Jan 22 17:39:40 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Jan 23 05:04:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d65837bc
mail-filter/rspamd: Keyword 3.8.0 x86, #918871
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Ionen Wolkens gentoo.org>
mail-filter/rspamd/rspamd-3.8.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.8.0.ebuild
b/mail-filter/rspamd/rspamd-3.8.0.ebuild
index f50bb6bf2ff5..4cbd73d5bd4e 100644
--- a/mail-filter/rspamd/rspamd-3.8.0.ebuild
+++ b/mail-filter/rspamd/rspamd-3.8.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 99c9c25f85f05787970d89e51867cdeed1c00040
Author: Petr Vaněk gentoo org>
AuthorDate: Fri Jan 19 18:59:35 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Fri Jan 19 19:05:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99c9c25f
mail-filter/rspamd: add 3.8.0
The y2038 test is commented out, see bug 922250 and [1].
[1]
https://github.com/rspamd/rspamd/commit/4704a4a26948f1127c66c03c94e7752ee52805c6
Closes: https://bugs.gentoo.org/922250
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest| 1 +
mail-filter/rspamd/rspamd-3.8.0.ebuild | 155 +
2 files changed, 156 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 4ebcc556ab04..89c5db99091a 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,3 +1,4 @@
DIST rspamd-3.6.tar.gz 5843907 BLAKE2B
2ccb3e65a14624d48540bd3e2d034fec0dd89cd75032ade3ca74ded09cee6ed67f670c31035b18583b850cc4efeb21b44f97ec2c35d518a49b0c4e6f0eb8c90f
SHA512
d99e2a60eec94eb39902454a8041eeb76f673c9f784849128766323a218d6c419755e0f8819e2a6921ca08c6a7d63660dc87bc911f808fb4a67d29e8fbfc571b
DIST rspamd-3.7.4.tar.gz 5903754 BLAKE2B
d13b3451b4a6a7c5e8644ba57196190065edda2fc48e7245ef7e0094cb90838760cc124a2cf8d0b4b7519c7583284f6883fbcd4bf3a6489496b5e52234a36c21
SHA512
a82696957417f7197b59e614012176626b4fdf1464ed38ce57552c8a02fe2e426504e0b0780ab4f36d208a11ae4d1921bacee52341c8a906b4ab19c1719fd116
DIST rspamd-3.7.5.tar.gz 5903689 BLAKE2B
29fecbc3a813fbc898360289aef2a8634fc15df38b28c47279eefa0afd836b2d3e95d83076190d9c1f0123402ea95f7c9b94fe2322996e37a529841cc55def8f
SHA512
d8d25cda2dee80e0c1e627c96e56ade97fc44ca0cf9410d21bd3a82fc2a4004e09c0bbb8c89eb81e835c0be5cd748f468910c3be67f5e4cdb50d56d9f8cda672
+DIST rspamd-3.8.0.tar.gz 5911065 BLAKE2B
6698051599f6d014229c3cdc3f005469b2a55841aea737a181c6f1aeee6bfde22478de23aa614bd4900be9746409648089baeb0f8a9033a531b362d783b63efa
SHA512
8c0d673be64df95aa84cdef20a09b4cfd501c39006a6dea58a925f737823fe5ec92ccdf86a38b78e5ab6ba8c7dd16b837a49dbc744ae479362979b6427e05e55
diff --git a/mail-filter/rspamd/rspamd-3.8.0.ebuild
b/mail-filter/rspamd/rspamd-3.8.0.ebuild
new file mode 100644
index ..f50bb6bf2ff5
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.8.0.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit cmake lua-single pax-utils systemd tmpfiles
+
+if [[ ${PV} == * ]] ; 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"
+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 +hyperscan jemalloc +jit selinux test"
+RESTRICT="!test? ( test )"
+
+# A part of tests use ffi luajit extension
+REQUIRED_USE="${LUA_REQUIRED_USE}
+ test? ( lua_single_target_luajit )"
+
+RDEPEND="
+ ${LUA_DEPS}
+ $(lua_gen_cond_dep '
+ dev-lua/LuaBitOp[${LUA_USEDEP}]
+ dev-lua/lua-argparse[${LUA_USEDEP}]
+ ')
+ acct-group/rspamd
+ acct-user/rspamd
+ app-arch/zstd:=
+ dev-db/sqlite:3
+ dev-libs/glib:2
+ dev-libs/icu:=
+ dev-libs/libpcre2:=[jit=]
+ dev-libs/libsodium:=
+ dev-libs/openssl:0=[-bindist(-)]
+ dev-libs/snowball-stemmer:=
+ sys-libs/zlib
+ blas? (
+ virtual/blas
+ virtual/lapack
+ )
+ hyperscan? ( dev-libs/vectorscan:= )
+ jemalloc? ( dev-libs/jemalloc:= )
+ selinux? ( sec-policy/selinux-spamassassin )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/doctest
+ dev-libs/libfmt:=
+ >=dev-libs/xxhash-0.8.0
+"
+BDEPEND="
+ dev-lang/perl
+ dev-util/ragel
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/rspamd-3.6-cmake-lua-version.patch"
+ "${FILESDIR}/rspamd-3.6-unbundle-lua.patch"
+ "${FILESDIR}/rspamd-3.6-unbundle-snowball.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ rm -vrf contrib/{doctest,fmt,lua-{argparse,bit},snowball,xxhash,zstd}
|| die
+
+ > cmake/Toolset.cmake || die #827550
+
+ 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
+ -DLIBDIR="/usr/$(get_libdir)/rspamd"
+
+ -DSYSTEM_DOCTEST=ON
+ -DSYSTEM_FMT=ON
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 910702f42a4b56f347e4192534af7dc9cda25463
Author: Petr Vaněk gentoo org>
AuthorDate: Fri Dec 15 16:17:36 2023 +
Commit: Petr Vaněk gentoo org>
CommitDate: Fri Dec 15 16:22:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=910702f4
mail-filter/rspamd: add 3.7.5
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest| 1 +
mail-filter/rspamd/rspamd-3.7.5.ebuild | 155 +
2 files changed, 156 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index f6e905e71447..4ebcc556ab04 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,2 +1,3 @@
DIST rspamd-3.6.tar.gz 5843907 BLAKE2B
2ccb3e65a14624d48540bd3e2d034fec0dd89cd75032ade3ca74ded09cee6ed67f670c31035b18583b850cc4efeb21b44f97ec2c35d518a49b0c4e6f0eb8c90f
SHA512
d99e2a60eec94eb39902454a8041eeb76f673c9f784849128766323a218d6c419755e0f8819e2a6921ca08c6a7d63660dc87bc911f808fb4a67d29e8fbfc571b
DIST rspamd-3.7.4.tar.gz 5903754 BLAKE2B
d13b3451b4a6a7c5e8644ba57196190065edda2fc48e7245ef7e0094cb90838760cc124a2cf8d0b4b7519c7583284f6883fbcd4bf3a6489496b5e52234a36c21
SHA512
a82696957417f7197b59e614012176626b4fdf1464ed38ce57552c8a02fe2e426504e0b0780ab4f36d208a11ae4d1921bacee52341c8a906b4ab19c1719fd116
+DIST rspamd-3.7.5.tar.gz 5903689 BLAKE2B
29fecbc3a813fbc898360289aef2a8634fc15df38b28c47279eefa0afd836b2d3e95d83076190d9c1f0123402ea95f7c9b94fe2322996e37a529841cc55def8f
SHA512
d8d25cda2dee80e0c1e627c96e56ade97fc44ca0cf9410d21bd3a82fc2a4004e09c0bbb8c89eb81e835c0be5cd748f468910c3be67f5e4cdb50d56d9f8cda672
diff --git a/mail-filter/rspamd/rspamd-3.7.5.ebuild
b/mail-filter/rspamd/rspamd-3.7.5.ebuild
new file mode 100644
index ..476878d10a51
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.7.5.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit cmake lua-single pax-utils systemd tmpfiles
+
+if [[ ${PV} == * ]] ; 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"
+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 +hyperscan jemalloc +jit selinux test"
+RESTRICT="!test? ( test )"
+
+# A part of tests use ffi luajit extension
+REQUIRED_USE="${LUA_REQUIRED_USE}
+ test? ( lua_single_target_luajit )"
+
+RDEPEND="
+ ${LUA_DEPS}
+ $(lua_gen_cond_dep '
+ dev-lua/LuaBitOp[${LUA_USEDEP}]
+ dev-lua/lua-argparse[${LUA_USEDEP}]
+ ')
+ acct-group/rspamd
+ acct-user/rspamd
+ app-arch/zstd:=
+ dev-db/sqlite:3
+ dev-libs/glib:2
+ dev-libs/icu:=
+ dev-libs/libpcre2:=[jit=]
+ dev-libs/libsodium:=
+ dev-libs/openssl:0=[-bindist(-)]
+ dev-libs/snowball-stemmer:=
+ sys-libs/zlib
+ blas? (
+ virtual/blas
+ virtual/lapack
+ )
+ hyperscan? ( dev-libs/vectorscan:= )
+ jemalloc? ( dev-libs/jemalloc:= )
+ selinux? ( sec-policy/selinux-spamassassin )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/doctest
+ dev-libs/libfmt:=
+ >=dev-libs/xxhash-0.8.0
+"
+BDEPEND="
+ dev-lang/perl
+ dev-util/ragel
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/rspamd-3.6-cmake-lua-version.patch"
+ "${FILESDIR}/rspamd-3.6-unbundle-lua.patch"
+ "${FILESDIR}/rspamd-3.6-unbundle-snowball.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ rm -vrf contrib/{doctest,fmt,lua-{argparse,bit},snowball,xxhash,zstd}
|| die
+
+ > cmake/Toolset.cmake || die #827550
+
+ 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
+ -DLIBDIR="/usr/$(get_libdir)/rspamd"
+
+ -DSYSTEM_DOCTEST=ON
+ -DSYSTEM_FMT=ON
+ -DSYSTEM_XXHASH=ON
+ -DSYSTEM_ZSTD=ON
+
+ # For bundled https://github.com/bombela/backward-cpp
+ # Bundled backward library uses execinfo.h in current setting,
which is
+ # available in glibc, but not in musl. Let's enable it for
glibc only.
+ -DENABLE_BACKWARD=$(usex elibc_glibc ON OFF) # bug 917643
+ -DSTACK_DETAILS_AUTO_DETECT=OFF
+
+ -DENABLE_BLAS=$(usex blas ON OFF)
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: eb1389896b76a06f13f4a5a0d29f177640bf84c0 Author: Petr Vaněk gentoo org> AuthorDate: Wed Nov 29 21:45:12 2023 + Commit: Petr Vaněk gentoo org> CommitDate: Wed Nov 29 21:45:24 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb138989 mail-filter/rspamd: update my email Signed-off-by: Petr Vaněk gentoo.org> mail-filter/rspamd/metadata.xml | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml index 234502a13abb..6044b0bb7bec 100644 --- a/mail-filter/rspamd/metadata.xml +++ b/mail-filter/rspamd/metadata.xml @@ -1,14 +1,10 @@ https://www.gentoo.org/dtd/metadata.dtd;> - -arka...@atlas.cz + +arka...@gentoo.org Petr Vaněk - -proxy-ma...@gentoo.org -Proxy Maintainers - rspamd/rspamd
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: e207a3b1d64bc0cbc0bbf7d5c0a8a0d534c2129f
Author: Petr Vaněk gentoo org>
AuthorDate: Wed Nov 29 09:23:31 2023 +
Commit: Petr Vaněk gentoo org>
CommitDate: Wed Nov 29 21:12:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e207a3b1
mail-filter/rspamd: switch to dev-libs/vctorscan
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/metadata.xml | 1 +
mail-filter/rspamd/rspamd-3.7.4-r1.ebuild | 155 ++
2 files changed, 156 insertions(+)
diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml
index 09b8498d3eb3..234502a13abb 100644
--- a/mail-filter/rspamd/metadata.xml
+++ b/mail-filter/rspamd/metadata.xml
@@ -13,6 +13,7 @@
rspamd/rspamd
+Enable hyperscan for fast regexp processing
Enable PCRE JIT support
diff --git a/mail-filter/rspamd/rspamd-3.7.4-r1.ebuild
b/mail-filter/rspamd/rspamd-3.7.4-r1.ebuild
new file mode 100644
index ..476878d10a51
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.7.4-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit cmake lua-single pax-utils systemd tmpfiles
+
+if [[ ${PV} == * ]] ; 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"
+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 +hyperscan jemalloc +jit selinux test"
+RESTRICT="!test? ( test )"
+
+# A part of tests use ffi luajit extension
+REQUIRED_USE="${LUA_REQUIRED_USE}
+ test? ( lua_single_target_luajit )"
+
+RDEPEND="
+ ${LUA_DEPS}
+ $(lua_gen_cond_dep '
+ dev-lua/LuaBitOp[${LUA_USEDEP}]
+ dev-lua/lua-argparse[${LUA_USEDEP}]
+ ')
+ acct-group/rspamd
+ acct-user/rspamd
+ app-arch/zstd:=
+ dev-db/sqlite:3
+ dev-libs/glib:2
+ dev-libs/icu:=
+ dev-libs/libpcre2:=[jit=]
+ dev-libs/libsodium:=
+ dev-libs/openssl:0=[-bindist(-)]
+ dev-libs/snowball-stemmer:=
+ sys-libs/zlib
+ blas? (
+ virtual/blas
+ virtual/lapack
+ )
+ hyperscan? ( dev-libs/vectorscan:= )
+ jemalloc? ( dev-libs/jemalloc:= )
+ selinux? ( sec-policy/selinux-spamassassin )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/doctest
+ dev-libs/libfmt:=
+ >=dev-libs/xxhash-0.8.0
+"
+BDEPEND="
+ dev-lang/perl
+ dev-util/ragel
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/rspamd-3.6-cmake-lua-version.patch"
+ "${FILESDIR}/rspamd-3.6-unbundle-lua.patch"
+ "${FILESDIR}/rspamd-3.6-unbundle-snowball.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ rm -vrf contrib/{doctest,fmt,lua-{argparse,bit},snowball,xxhash,zstd}
|| die
+
+ > cmake/Toolset.cmake || die #827550
+
+ 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
+ -DLIBDIR="/usr/$(get_libdir)/rspamd"
+
+ -DSYSTEM_DOCTEST=ON
+ -DSYSTEM_FMT=ON
+ -DSYSTEM_XXHASH=ON
+ -DSYSTEM_ZSTD=ON
+
+ # For bundled https://github.com/bombela/backward-cpp
+ # Bundled backward library uses execinfo.h in current setting,
which is
+ # available in glibc, but not in musl. Let's enable it for
glibc only.
+ -DENABLE_BACKWARD=$(usex elibc_glibc ON OFF) # bug 917643
+ -DSTACK_DETAILS_AUTO_DETECT=OFF
+
+ -DENABLE_BLAS=$(usex blas ON OFF)
+ -DENABLE_HYPERSCAN=$(usex hyperscan ON OFF)
+ -DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
+ -DENABLE_LUAJIT=$(usex lua_single_target_luajit ON OFF)
+ -DENABLE_PCRE2=ON
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ cmake_build run-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 lua_single_target_luajit; then
+ pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-*
+ fi
+
+ insinto /etc/logrotate.d
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 49cb28937ceb21fcbee9b14a36bc92cc3f371772
Author: Petr Vaněk gentoo org>
AuthorDate: Wed Nov 29 09:23:31 2023 +
Commit: Petr Vaněk gentoo org>
CommitDate: Wed Nov 29 21:12:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49cb2893
mail-filter/rspamd: sync live
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/rspamd-.ebuild | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index 8a3804be1663..d8e37a79ac0c 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="
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 selinux test"
+IUSE="blas +hyperscan jemalloc +jit selinux test"
RESTRICT="!test? ( test )"
# A part of tests use ffi luajit extension
@@ -51,7 +51,7 @@ RDEPEND="
virtual/blas
virtual/lapack
)
- cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
+ hyperscan? ( dev-libs/vectorscan:= )
jemalloc? ( dev-libs/jemalloc:= )
selinux? ( sec-policy/selinux-spamassassin )
"
@@ -99,10 +99,13 @@ src_configure() {
-DSYSTEM_ZSTD=ON
# For bundled https://github.com/bombela/backward-cpp
+ # Bundled backward library uses execinfo.h in current setting,
which is
+ # available in glibc, but not in musl. Let's enable it for
glibc only.
+ -DENABLE_BACKWARD=$(usex elibc_glibc ON OFF) # bug 917643
-DSTACK_DETAILS_AUTO_DETECT=OFF
-DENABLE_BLAS=$(usex blas ON OFF)
- -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
+ -DENABLE_HYPERSCAN=$(usex hyperscan ON OFF)
-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
-DENABLE_LUAJIT=$(usex lua_single_target_luajit ON OFF)
-DENABLE_PCRE2=ON
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: dc601d53907c786e9db7250f5cacbaf8d977af47
Author: Petr Vaněk atlas cz>
AuthorDate: Mon Nov 20 21:14:04 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Nov 22 11:32:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc601d53
mail-filter/rspamd: enable Backward for glibc only
Enabling Backward for glibc only solves the problem for other libcs like
musl, which does not provide execinfo.h.
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://bugs.gentoo.org/917643
Closes: https://github.com/gentoo/gentoo/pull/33925
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-3.7.4.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/mail-filter/rspamd/rspamd-3.7.4.ebuild
b/mail-filter/rspamd/rspamd-3.7.4.ebuild
index 7f70037f8cbe..ad8d2656579e 100644
--- a/mail-filter/rspamd/rspamd-3.7.4.ebuild
+++ b/mail-filter/rspamd/rspamd-3.7.4.ebuild
@@ -99,6 +99,9 @@ src_configure() {
-DSYSTEM_ZSTD=ON
# For bundled https://github.com/bombela/backward-cpp
+ # Bundled backward library uses execinfo.h in current setting,
which is
+ # available in glibc, but not in musl. Let's enable it for
glibc only.
+ -DENABLE_BACKWARD=$(usex elibc_glibc ON OFF) # bug 917643
-DSTACK_DETAILS_AUTO_DETECT=OFF
-DENABLE_BLAS=$(usex blas ON OFF)
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: efdd36c388997dbb8065bbc4eba588ace7c9568c
Author: Joonas Niilola gentoo org>
AuthorDate: Fri Sep 8 07:16:59 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Fri Sep 8 07:16:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efdd36c3
mail-filter/rspamd: Stabilize 3.6-r1 x86, #913753
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/rspamd-3.6-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.6-r1.ebuild
b/mail-filter/rspamd/rspamd-3.6-r1.ebuild
index 2bc8880da051..3e711833e3a8 100644
--- a/mail-filter/rspamd/rspamd-3.6-r1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.6-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 9d478492c3dc83996e069c64bc464808427e54a0
Author: Arthur Zamarin gentoo org>
AuthorDate: Thu Sep 7 18:38:40 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Thu Sep 7 18:38:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d478492
mail-filter/rspamd: Stabilize 3.6-r1 amd64, #913753
Signed-off-by: Arthur Zamarin gentoo.org>
mail-filter/rspamd/rspamd-3.6-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.6-r1.ebuild
b/mail-filter/rspamd/rspamd-3.6-r1.ebuild
index dba607175345..2bc8880da051 100644
--- a/mail-filter/rspamd/rspamd-3.6-r1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.6-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 753c2d194c68c2c83c4b9d2bd6875e4b97a2e621
Author: Petr Vaněk atlas cz>
AuthorDate: Sat Aug 5 07:59:37 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Aug 7 05:35:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=753c2d19
mail-filter/rspamd: sync live
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/32183
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index b60d7d586587..8d0f80ea85ed 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -68,9 +68,9 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/rspamd-3.0-cmake-lua-version.patch"
- "${FILESDIR}/rspamd-3.2-unbundle-lua.patch"
- "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
+ "${FILESDIR}/rspamd-3.6-cmake-lua-version.patch"
+ "${FILESDIR}/rspamd-3.6-unbundle-lua.patch"
+ "${FILESDIR}/rspamd-3.6-unbundle-snowball.patch"
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/
commit: d0e615e314d69085bf006960ed4ac714d58f02b4
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun May 28 19:04:32 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon May 29 10:58:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0e615e3
mail-filter/rspamd: drop 3.4-r3
Bug: https://bugs.gentoo.org/905345
Signed-off-by: Andreas Sturmlechner gentoo.org>
mail-filter/rspamd/Manifest| 1 -
.../rspamd/files/rspamd-3.3-remove-test-case.patch | 20 ---
mail-filter/rspamd/files/rspamd-3.4-gcc-13.patch | 30
.../rspamd-3.4-hyperscan-page-alignment.patch | 28
mail-filter/rspamd/rspamd-3.4-r3.ebuild| 153 -
5 files changed, 232 deletions(-)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index bcee383412e4..1b42f54a09d7 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,2 +1 @@
-DIST rspamd-3.4.tar.gz 5689732 BLAKE2B
8d1b98205f51cfe834db3ed53b8be72ada834980380cba06c4470689d16ef4a6396190ae27044ae76a7b35df6afd3cdf551f9469d878ac69ec61ef6b86b46104
SHA512
fec8cb7b845bf25d02f1c32c82bf35ad9c65f3301a73f3ea611b6fcfa0ac1b75f75561c4c42f142f876ac3a78f96fd91d22d30c5b3600e4001e25f06bc693ccf
DIST rspamd-3.5.tar.gz 5806722 BLAKE2B
547cd9bb26942dc584d1f4b164e61bdb15505a56399fa19b358b7d7525ee983acc8d5ae1fdb3de340e3461a03aedbb48266fd81404c1f4a2e8fc5bd6735d9a62
SHA512
39c87d5dfd9ae1fc7709e19967eac5e7c7dc83fa070dfebbb7ab5411d7d50d6e6f10248ada717cf1cb3f6ff6c5bfb4d31fd87e1a7e1b2e5f876f6be7b5705623
diff --git a/mail-filter/rspamd/files/rspamd-3.3-remove-test-case.patch
b/mail-filter/rspamd/files/rspamd-3.3-remove-test-case.patch
deleted file mode 100644
index 0cad11382b21..
--- a/mail-filter/rspamd/files/rspamd-3.3-remove-test-case.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Remove test case which does not work with luajit-2.1 anymore as it
-depends on internal behavior of lujait-2.0.
-
-Upstream-PR: https://github.com/rspamd/rspamd/pull/4323
-
-diff --git a/test/lua/unit/lua_util.extract_specific_urls.lua
b/test/lua/unit/lua_util.extract_specific_urls.lua
-index 05ffeb7b0..a7e2f9f48 100644
a/test/lua/unit/lua_util.extract_specific_urls.lua
-+++ b/test/lua/unit/lua_util.extract_specific_urls.lua
-@@ -108,7 +108,6 @@ context("Lua util - extract_specific_urls plain",
function()
- local cases = {
- {expect = url_list, filter = nil, limit = , need_emails = true,
prefix = 'p'},
- {expect = {}, filter = (function() return false end), limit = ,
need_emails = true, prefix = 'p'},
--{expect = {"domain4.co.net", "test.com"}, filter = nil, limit = 2,
need_emails = true, prefix = 'p'},
- {expect = {"domain4.co.net", "test.com", "domain3.org"}, filter = nil,
limit = 3, need_emails = true, prefix = 'p'},
- {
- expect = {"gov.co.net", "tesco.co.net", "domain1.co.net",
"domain2.co.net", "domain3.co.net", "domain4.co.net"},
---
-2.37.4
-
diff --git a/mail-filter/rspamd/files/rspamd-3.4-gcc-13.patch
b/mail-filter/rspamd/files/rspamd-3.4-gcc-13.patch
deleted file mode 100644
index f660b353fec7..
--- a/mail-filter/rspamd/files/rspamd-3.4-gcc-13.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://github.com/rspamd/rspamd/commit/0a916c632e18e6686e1a2256d5ef2fe1a1cc239f
-
-From 0a916c632e18e6686e1a2256d5ef2fe1a1cc239f Mon Sep 17 00:00:00 2001
-From: Heiko Becker
-Date: Wed, 18 Jan 2023 23:54:24 +0100
-Subject: [PATCH] Fix build with gcc 13 by including
-
-Like other versions before, gcc 13 moved some includes around and as a
-result is no longer transitively included. Explicitly include
-it for uint8_t.
a/src/libserver/css/css_tokeniser.hxx
-+++ b/src/libserver/css/css_tokeniser.hxx
-@@ -24,6 +24,7 @@
- #include
- #include
- #include
-+#include
- #include "mem_pool.h"
-
- namespace rspamd::css {
a/src/libserver/html/html_tag.hxx
-+++ b/src/libserver/html/html_tag.hxx
-@@ -23,6 +23,7 @@
- #include
- #include
- #include
-+#include
-
- #include "html_tags.h"
-
diff --git a/mail-filter/rspamd/files/rspamd-3.4-hyperscan-page-alignment.patch
b/mail-filter/rspamd/files/rspamd-3.4-hyperscan-page-alignment.patch
deleted file mode 100644
index 913f1f7ecd4d..
--- a/mail-filter/rspamd/files/rspamd-3.4-hyperscan-page-alignment.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fix for hyperscan page alignment issues.
-
-Upstream-Issue: https://github.com/rspamd/rspamd/issues/4329
-
-diff --git a/src/libserver/hyperscan_tools.cxx
b/src/libserver/hyperscan_tools.cxx
-index 6187208a9..96366067d 100644
a/src/libserver/hyperscan_tools.cxx
-+++ b/src/libserver/hyperscan_tools.cxx
-@@ -306,7 +306,15 @@ auto load_cached_hs_file(const char *fname, std::int64_t
offset = 0) -> tl::expe
-
msg_debug_hyperscan_lambda("multipattern: create new database in %s; %Hz size",
-
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 4b4703ef2b9188dfdd9ff0ea50cae35367318404
Author: Joonas Niilola gentoo org>
AuthorDate: Sat May 27 06:39:42 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sat May 27 06:42:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b4703ef
mail-filter/rspamd: Stabilize 3.5-r1 amd64, #905345
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/rspamd-3.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.5-r1.ebuild
b/mail-filter/rspamd/rspamd-3.5-r1.ebuild
index 836c73d46150..e3d6bbc2e688 100644
--- a/mail-filter/rspamd/rspamd-3.5-r1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.5-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 61921027bdde1d418b66fe4000454e138a595a10
Author: Joonas Niilola gentoo org>
AuthorDate: Sat May 27 06:42:19 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sat May 27 06:42:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61921027
mail-filter/rspamd: Stabilize 3.5-r1 x86, #905345
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/rspamd-3.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.5-r1.ebuild
b/mail-filter/rspamd/rspamd-3.5-r1.ebuild
index e3d6bbc2e688..eaa2b34643f9 100644
--- a/mail-filter/rspamd/rspamd-3.5-r1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.5-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 23ab69bb2f0a819c26f9559d28a40aa97f8c7510
Author: Petr Vaněk atlas cz>
AuthorDate: Thu May 25 08:40:14 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri May 26 10:58:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23ab69bb
mail-filter/rspamd: disable lua5-3, lua5-4
The support for lua5-{3,4} is being temporarily disabled in this
version, as the bug fix patch is too large for backporting.
Closes: https://bugs.gentoo.org/903577
Upstream-issue: https://github.com/rspamd/rspamd/issues/4455
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/31156
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-3.5-r1.ebuild | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.5-r1.ebuild
b/mail-filter/rspamd/rspamd-3.5-r1.ebuild
index 979310e1d722..836c73d46150 100644
--- a/mail-filter/rspamd/rspamd-3.5-r1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.5-r1.ebuild
@@ -3,7 +3,10 @@
EAPI=8
-LUA_COMPAT=( lua5-{1..4} luajit )
+# lua5-{3,4} were dropped due to bug #903577. This issue has been resolved
+# upstream, see https://github.com/rspamd/rspamd/issues/4455. They will be
+# restored with the next version bump.
+LUA_COMPAT=( lua5-1 luajit )
inherit cmake lua-single pax-utils systemd tmpfiles
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 45db47d0b8b97d082d8ba4566817737dab5795c6
Author: Petr Vaněk atlas cz>
AuthorDate: Wed May 17 10:48:53 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri May 26 10:58:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45db47d0
mail-filter/rspamd: limit deps to https://github.com/rspamd/rspamd/issues/4482
Closes: https://bugs.gentoo.org/906068
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/{rspamd-3.4-r2.ebuild => rspamd-3.4-r3.ebuild} | 3 ++-
mail-filter/rspamd/{rspamd-3.5.ebuild => rspamd-3.5-r1.ebuild}| 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-3.4-r2.ebuild
b/mail-filter/rspamd/rspamd-3.4-r3.ebuild
similarity index 97%
rename from mail-filter/rspamd/rspamd-3.4-r2.ebuild
rename to mail-filter/rspamd/rspamd-3.4-r3.ebuild
index d81ac12ae142..a58ca9510131 100644
--- a/mail-filter/rspamd/rspamd-3.4-r2.ebuild
+++ b/mail-filter/rspamd/rspamd-3.4-r3.ebuild
@@ -30,6 +30,7 @@ RESTRICT="!test? ( test )"
REQUIRED_USE="${LUA_REQUIRED_USE}
test? ( lua_single_target_luajit )"
+# for https://github.com/rspamd/rspamd/issues/4482
RDEPEND="${LUA_DEPS}
$(lua_gen_cond_dep '
dev-lua/LuaBitOp[${LUA_USEDEP}]
@@ -42,7 +43,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/glib:2
dev-libs/icu:=
dev-libs/libev
- dev-libs/libfmt:=
+ https://github.com/rspamd/rspamd/issues/4482
RDEPEND="${LUA_DEPS}
$(lua_gen_cond_dep '
dev-lua/LuaBitOp[${LUA_USEDEP}]
@@ -42,7 +43,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/glib:2
dev-libs/icu:=
dev-libs/libev
- dev-libs/libfmt:=
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 1dcd29c56c2c8237e0a9adc39237a33ae52bea7b
Author: Petr Vaněk atlas cz>
AuthorDate: Sun Mar 19 17:17:15 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Mar 19 21:20:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dcd29c5
mail-filter/rspamd: sync live
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index 5e7014163c32..b60d7d586587 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -91,6 +91,7 @@ src_configure() {
-DRUNDIR=/var/run/rspamd
-DDBDIR=/var/lib/rspamd
-DLOGDIR=/var/log/rspamd
+ -DLIBDIR="/usr/$(get_libdir)/rspamd"
-DSYSTEM_DOCTEST=ON
-DSYSTEM_FMT=ON
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: fc55387362b98251f1b04a8253439fe6653bb86d
Author: Petr Vaněk atlas cz>
AuthorDate: Sun Mar 19 17:16:26 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Mar 19 21:20:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc553873
mail-filter/rspamd: add 3.5
Closes: https://bugs.gentoo.org/902137
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/Manifest | 1 +
mail-filter/rspamd/rspamd-3.5.ebuild | 149 +++
2 files changed, 150 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index d10d234b142a..bcee383412e4 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1 +1,2 @@
DIST rspamd-3.4.tar.gz 5689732 BLAKE2B
8d1b98205f51cfe834db3ed53b8be72ada834980380cba06c4470689d16ef4a6396190ae27044ae76a7b35df6afd3cdf551f9469d878ac69ec61ef6b86b46104
SHA512
fec8cb7b845bf25d02f1c32c82bf35ad9c65f3301a73f3ea611b6fcfa0ac1b75f75561c4c42f142f876ac3a78f96fd91d22d30c5b3600e4001e25f06bc693ccf
+DIST rspamd-3.5.tar.gz 5806722 BLAKE2B
547cd9bb26942dc584d1f4b164e61bdb15505a56399fa19b358b7d7525ee983acc8d5ae1fdb3de340e3461a03aedbb48266fd81404c1f4a2e8fc5bd6735d9a62
SHA512
39c87d5dfd9ae1fc7709e19967eac5e7c7dc83fa070dfebbb7ab5411d7d50d6e6f10248ada717cf1cb3f6ff6c5bfb4d31fd87e1a7e1b2e5f876f6be7b5705623
diff --git a/mail-filter/rspamd/rspamd-3.5.ebuild
b/mail-filter/rspamd/rspamd-3.5.ebuild
new file mode 100644
index ..bf4fc1bf5f86
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.5.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit cmake lua-single pax-utils systemd tmpfiles
+
+if [[ ${PV} == * ]] ; 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 selinux test"
+RESTRICT="!test? ( test )"
+
+# A part of tests use ffi luajit extension
+REQUIRED_USE="${LUA_REQUIRED_USE}
+ test? ( lua_single_target_luajit )"
+
+RDEPEND="${LUA_DEPS}
+ $(lua_gen_cond_dep '
+ dev-lua/LuaBitOp[${LUA_USEDEP}]
+ dev-lua/lua-argparse[${LUA_USEDEP}]
+ ')
+ acct-group/rspamd
+ acct-user/rspamd
+ app-arch/zstd:=
+ dev-db/sqlite:3
+ dev-libs/glib:2
+ dev-libs/icu:=
+ dev-libs/libev
+ dev-libs/libfmt:=
+ dev-libs/libpcre2:=[jit=]
+ dev-libs/libsodium:=
+ dev-libs/openssl:0=[-bindist(-)]
+ dev-libs/snowball-stemmer:=
+ >=dev-libs/xxhash-0.8.0
+ sys-apps/file
+ sys-libs/zlib
+ blas? (
+ virtual/blas
+ virtual/lapack
+ )
+ cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
+ jemalloc? ( dev-libs/jemalloc:= )
+ selinux? ( sec-policy/selinux-spamassassin )
+"
+DEPEND="${RDEPEND}
+ dev-cpp/doctest
+"
+BDEPEND="
+ dev-lang/perl
+ dev-util/ragel
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/rspamd-3.0-cmake-lua-version.patch"
+ "${FILESDIR}/rspamd-3.2-unbundle-lua.patch"
+ "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ rm -vrf contrib/{doctest,fmt,lua-{argparse,bit},snowball,xxhash,zstd}
|| die
+
+ > cmake/Toolset.cmake || die #827550
+
+ 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
+ -DLIBDIR="/usr/$(get_libdir)/rspamd"
+
+ -DSYSTEM_DOCTEST=ON
+ -DSYSTEM_FMT=ON
+ -DSYSTEM_XXHASH=ON
+ -DSYSTEM_ZSTD=ON
+
+ -DENABLE_BLAS=$(usex blas ON OFF)
+ -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
+ -DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
+ -DENABLE_LUAJIT=$(usex lua_single_target_luajit ON OFF)
+ -DENABLE_PCRE2=ON
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ cmake_build run-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
+
+ #
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 33b433a59dc9b5a04680b65e9e88dfc5b4ea22ae
Author: Petr Vaněk atlas cz>
AuthorDate: Sun Mar 19 16:37:00 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Mar 19 21:20:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33b433a5
mail-filter/rspamd: update warning message
This improves wording for new revision.
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-3.4-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-3.4-r2.ebuild
b/mail-filter/rspamd/rspamd-3.4-r2.ebuild
index 0a63b92b87b8..d81ac12ae142 100644
--- a/mail-filter/rspamd/rspamd-3.4-r2.ebuild
+++ b/mail-filter/rspamd/rspamd-3.4-r2.ebuild
@@ -141,8 +141,8 @@ pkg_postinst() {
for ver in ${REPLACING_VERSIONS}; do
if ver_test "${ver}" -eq "3.4"; then
elog "rspamd-3.4 is known to segfault when it is
updated from older version due"
- elog "to a page-alignment of hyperscan .unser files.
The issue is patched in this"
- elog "ebuild revision rspamd-3.4-r1. All possibly
broken .unser files will be"
+ elog "to a page-alignment of hyperscan .unser files.
The issue was patched in"
+ elog "rspamd-3.4-r1 ebuild revision. All possibly
broken .unser files will be"
elog "automaticaly removed. See
https://github.com/rspamd/rspamd/issues/4329 for"
elog "more information."
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 98b37bd96e336bbf1f6f02f9979e6d0aaa5f2f69
Author: Petr Vaněk atlas cz>
AuthorDate: Mon Jan 30 08:45:37 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu Feb 9 16:11:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98b37bd9
mail-filter/rspamd: drop 3.3
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/29337
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/Manifest | 1 -
mail-filter/rspamd/rspamd-3.3.ebuild | 136 ---
2 files changed, 137 deletions(-)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 8892d1cbf45b..d10d234b142a 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,2 +1 @@
-DIST rspamd-3.3.tar.gz 5680874 BLAKE2B
2fbafabc0a59ca4ad1bbdc1b7ceb5b5bc281dc75d2997ac50c080cdf5ced2582409e3f98b63239bab64fafbcc63016d857967fe00c371a6d5b896d170f5da4a9
SHA512
02c5e62cb9ce32cdd6da859c4afe2bf03fcaff456d79f68ab7c3c288a0b36f11a701825c3cb7f0ecaccd419f84ce693961c1ed955ce4dbcfe291a8e978e2e69c
DIST rspamd-3.4.tar.gz 5689732 BLAKE2B
8d1b98205f51cfe834db3ed53b8be72ada834980380cba06c4470689d16ef4a6396190ae27044ae76a7b35df6afd3cdf551f9469d878ac69ec61ef6b86b46104
SHA512
fec8cb7b845bf25d02f1c32c82bf35ad9c65f3301a73f3ea611b6fcfa0ac1b75f75561c4c42f142f876ac3a78f96fd91d22d30c5b3600e4001e25f06bc693ccf
diff --git a/mail-filter/rspamd/rspamd-3.3.ebuild
b/mail-filter/rspamd/rspamd-3.3.ebuild
deleted file mode 100644
index 6fb46e9d9b6b..
--- a/mail-filter/rspamd/rspamd-3.3.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit cmake lua-single pax-utils systemd tmpfiles
-
-if [[ ${PV} == * ]] ; 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 selinux test"
-RESTRICT="!test? ( test )"
-
-# A part of tests use ffi luajit extension
-REQUIRED_USE="${LUA_REQUIRED_USE}
- test? ( lua_single_target_luajit )"
-
-RDEPEND="${LUA_DEPS}
- $(lua_gen_cond_dep '
- dev-lua/LuaBitOp[${LUA_USEDEP}]
- dev-lua/lua-argparse[${LUA_USEDEP}]
- ')
- acct-group/rspamd
- acct-user/rspamd
- app-arch/zstd:=
- dev-db/sqlite:3
- dev-libs/glib:2
- dev-libs/icu:=
- dev-libs/libev
- dev-libs/libfmt:=
- dev-libs/libpcre2:=[jit=]
- dev-libs/libsodium:=
- dev-libs/openssl:0=[-bindist(-)]
- dev-libs/snowball-stemmer:=
- >=dev-libs/xxhash-0.8.0
- sys-apps/file
- sys-libs/zlib
- blas? (
- virtual/blas
- virtual/lapack
- )
- cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
- jemalloc? ( dev-libs/jemalloc:= )
- selinux? ( sec-policy/selinux-spamassassin )
-"
-DEPEND="${RDEPEND}
- dev-cpp/doctest
-"
-BDEPEND="
- dev-util/ragel
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/rspamd-3.0-cmake-lua-version.patch"
- "${FILESDIR}/rspamd-3.2-unbundle-lua.patch"
- "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
- "${FILESDIR}/rspamd-3.3-remove-test-case.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
-
- rm -vrf contrib/{doctest,fmt,lua-{argparse,bit},snowball,xxhash,zstd}
|| die
-
- > cmake/Toolset.cmake || die #827550
-
- 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
-
- -DSYSTEM_DOCTEST=ON
- -DSYSTEM_FMT=ON
- -DSYSTEM_XXHASH=ON
- -DSYSTEM_ZSTD=ON
-
- -DENABLE_BLAS=$(usex blas ON OFF)
- -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
- -DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
- -DENABLE_LUAJIT=$(usex lua_single_target_luajit ON OFF)
- -DENABLE_PCRE2=ON
- )
- cmake_src_configure
-}
-
-src_test() {
- cmake_build run-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
-
- #
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/
commit: 8bf21588a1ff873679440c9b751aedec9ae783fa
Author: Sam James gentoo org>
AuthorDate: Thu Jan 26 07:21:40 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Jan 26 07:21:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bf21588
mail-filter/rspamd: fix build w/ gcc 13
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/files/rspamd-3.4-gcc-13.patch | 30
mail-filter/rspamd/rspamd-3.4-r2.ebuild | 1 +
2 files changed, 31 insertions(+)
diff --git a/mail-filter/rspamd/files/rspamd-3.4-gcc-13.patch
b/mail-filter/rspamd/files/rspamd-3.4-gcc-13.patch
new file mode 100644
index ..f660b353fec7
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.4-gcc-13.patch
@@ -0,0 +1,30 @@
+https://github.com/rspamd/rspamd/commit/0a916c632e18e6686e1a2256d5ef2fe1a1cc239f
+
+From 0a916c632e18e6686e1a2256d5ef2fe1a1cc239f Mon Sep 17 00:00:00 2001
+From: Heiko Becker
+Date: Wed, 18 Jan 2023 23:54:24 +0100
+Subject: [PATCH] Fix build with gcc 13 by including
+
+Like other versions before, gcc 13 moved some includes around and as a
+result is no longer transitively included. Explicitly include
+it for uint8_t.
+--- a/src/libserver/css/css_tokeniser.hxx
b/src/libserver/css/css_tokeniser.hxx
+@@ -24,6 +24,7 @@
+ #include
+ #include
+ #include
++#include
+ #include "mem_pool.h"
+
+ namespace rspamd::css {
+--- a/src/libserver/html/html_tag.hxx
b/src/libserver/html/html_tag.hxx
+@@ -23,6 +23,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include "html_tags.h"
+
diff --git a/mail-filter/rspamd/rspamd-3.4-r2.ebuild
b/mail-filter/rspamd/rspamd-3.4-r2.ebuild
index 67c7e30c3e00..0a63b92b87b8 100644
--- a/mail-filter/rspamd/rspamd-3.4-r2.ebuild
+++ b/mail-filter/rspamd/rspamd-3.4-r2.ebuild
@@ -73,6 +73,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.5-unbundle-snowball.patch"
"${FILESDIR}/${PN}-3.3-remove-test-case.patch"
"${FILESDIR}/${PN}-3.4-hyperscan-page-alignment.patch"
+ "${FILESDIR}/${P}-gcc-13.patch"
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 7976366883e23b128abf6135a486d6312ffe9f57
Author: Joonas Niilola gentoo org>
AuthorDate: Tue Jan 17 04:13:15 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Tue Jan 17 04:13:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79763668
mail-filter/rspamd: Stabilize 3.4-r2 amd64, #89
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/rspamd-3.4-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.4-r2.ebuild
b/mail-filter/rspamd/rspamd-3.4-r2.ebuild
index 800551b3a1f5..67c7e30c3e00 100644
--- a/mail-filter/rspamd/rspamd-3.4-r2.ebuild
+++ b/mail-filter/rspamd/rspamd-3.4-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 x86"
+ KEYWORDS="amd64 x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 351a7b20d051b416cf460536e87a664259dff4c0
Author: Joonas Niilola gentoo org>
AuthorDate: Tue Jan 17 04:12:06 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Tue Jan 17 04:13:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=351a7b20
mail-filter/rspamd: add missing perl BDEPEND
CMake Error at /usr/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:230
(message):
Could NOT find Perl (missing: PERL_EXECUTABLE)
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/rspamd-3.4-r2.ebuild | 1 +
mail-filter/rspamd/rspamd-.ebuild | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.4-r2.ebuild
b/mail-filter/rspamd/rspamd-3.4-r2.ebuild
index 5f557fe50711..a828bc41c8af 100644
--- a/mail-filter/rspamd/rspamd-3.4-r2.ebuild
+++ b/mail-filter/rspamd/rspamd-3.4-r2.ebuild
@@ -62,6 +62,7 @@ DEPEND="${RDEPEND}
dev-cpp/doctest
"
BDEPEND="
+ dev-lang/perl
dev-util/ragel
virtual/pkgconfig
"
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index b6932290133a..5e7014163c32 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -62,6 +62,7 @@ DEPEND="${RDEPEND}
dev-cpp/doctest
"
BDEPEND="
+ dev-lang/perl
dev-util/ragel
virtual/pkgconfig
"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 766886f3e2f45684b9445406c267e7cb2e6ea297
Author: Joonas Niilola gentoo org>
AuthorDate: Tue Jan 17 04:12:54 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Tue Jan 17 04:13:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=766886f3
mail-filter/rspamd: Stabilize 3.4-r2 x86, #89
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/rspamd-3.4-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.4-r2.ebuild
b/mail-filter/rspamd/rspamd-3.4-r2.ebuild
index a828bc41c8af..800551b3a1f5 100644
--- a/mail-filter/rspamd/rspamd-3.4-r2.ebuild
+++ b/mail-filter/rspamd/rspamd-3.4-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: a3f9e9a6627cc9c176498cee7226155633ba735d
Author: Petr Vaněk atlas cz>
AuthorDate: Mon Jan 2 08:57:06 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Jan 4 05:48:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3f9e9a6
mail-filter/rspamd: respect libdir
Closes: https://bugs.gentoo.org/887591
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/28933
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/{rspamd-3.4-r1.ebuild => rspamd-3.4-r2.ebuild} | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.4-r1.ebuild
b/mail-filter/rspamd/rspamd-3.4-r2.ebuild
similarity index 97%
rename from mail-filter/rspamd/rspamd-3.4-r1.ebuild
rename to mail-filter/rspamd/rspamd-3.4-r2.ebuild
index fc1664f05a6d..5f557fe50711 100644
--- a/mail-filter/rspamd/rspamd-3.4-r1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -92,6 +92,7 @@ src_configure() {
-DRUNDIR=/var/run/rspamd
-DDBDIR=/var/lib/rspamd
-DLOGDIR=/var/log/rspamd
+ -DLIBDIR="/usr/$(get_libdir)/rspamd"
-DSYSTEM_DOCTEST=ON
-DSYSTEM_FMT=ON
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/
commit: 7c78c5f223626fb3bb688cce6e50068e90cb1704
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Dec 20 21:14:40 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 24 08:58:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c78c5f2
mail-filter/rspamd: drop 2.7-r104
Signed-off-by: Andreas Sturmlechner gentoo.org>
mail-filter/rspamd/Manifest| 1 -
.../rspamd/files/rspamd-2.6-unbundle-lua.patch | 53 -
.../files/rspamd-2.7-cmake-lua-version.patch | 49
.../rspamd/files/rspamd-2.7-unbundle-zstd.patch| 125 -
mail-filter/rspamd/metadata.xml| 1 -
mail-filter/rspamd/rspamd-2.7-r104.ebuild | 116 ---
6 files changed, 345 deletions(-)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index bca781f9d3ef..8892d1cbf45b 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,3 +1,2 @@
-DIST rspamd-2.7.tar.gz 5126227 BLAKE2B
70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930
SHA512
8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7
DIST rspamd-3.3.tar.gz 5680874 BLAKE2B
2fbafabc0a59ca4ad1bbdc1b7ceb5b5bc281dc75d2997ac50c080cdf5ced2582409e3f98b63239bab64fafbcc63016d857967fe00c371a6d5b896d170f5da4a9
SHA512
02c5e62cb9ce32cdd6da859c4afe2bf03fcaff456d79f68ab7c3c288a0b36f11a701825c3cb7f0ecaccd419f84ce693961c1ed955ce4dbcfe291a8e978e2e69c
DIST rspamd-3.4.tar.gz 5689732 BLAKE2B
8d1b98205f51cfe834db3ed53b8be72ada834980380cba06c4470689d16ef4a6396190ae27044ae76a7b35df6afd3cdf551f9469d878ac69ec61ef6b86b46104
SHA512
fec8cb7b845bf25d02f1c32c82bf35ad9c65f3301a73f3ea611b6fcfa0ac1b75f75561c4c42f142f876ac3a78f96fd91d22d30c5b3600e4001e25f06bc693ccf
diff --git a/mail-filter/rspamd/files/rspamd-2.6-unbundle-lua.patch
b/mail-filter/rspamd/files/rspamd-2.6-unbundle-lua.patch
deleted file mode 100644
index 9278fa8608d7..
--- a/mail-filter/rspamd/files/rspamd-2.6-unbundle-lua.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b794b9dbd..1ba5c085e 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -632,10 +632,6 @@ ADD_SUBDIRECTORY(contrib/fastutf8)
- ADD_SUBDIRECTORY(contrib/google-ced)
-
-
--IF (NOT WITH_LUAJIT)
-- ADD_SUBDIRECTORY(contrib/lua-bit)
--ENDIF()
--
- IF (ENABLE_LUA_REPL MATCHES "ON")
- ADD_SUBDIRECTORY(contrib/replxx)
- SET(WITH_LUA_REPL 1)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9a34d2ac4..59bab5c15 100644
a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -189,10 +189,6 @@ IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
- ADD_DEPENDENCIES(rspamd-server rspamd-clang)
- ENDIF()
-
--IF (NOT WITH_LUAJIT)
-- TARGET_LINK_LIBRARIES(rspamd-server rspamd-bit)
--ENDIF()
--
- IF (ENABLE_SNOWBALL MATCHES "ON")
- TARGET_LINK_LIBRARIES(rspamd-server stemmer)
- ENDIF()
-diff --git a/src/lua/lua_common.c b/src/lua/lua_common.c
-index b7fcc2034..1d86464da 100644
a/src/lua/lua_common.c
-+++ b/src/lua/lua_common.c
-@@ -922,10 +922,6 @@ rspamd_lua_wipe_realloc (void *ud,
- return NULL;
- }
-
--#ifndef WITH_LUAJIT
--extern int luaopen_bit(lua_State *L);
--#endif
--
- lua_State *
- rspamd_lua_init (bool wipe_mem)
- {
-@@ -981,7 +977,6 @@ rspamd_lua_init (bool wipe_mem)
- luaopen_spf (L);
- luaopen_tensor (L);
- #ifndef WITH_LUAJIT
-- rspamd_lua_add_preload (L, "bit", luaopen_bit);
- lua_settop (L, 0);
- #endif
-
diff --git a/mail-filter/rspamd/files/rspamd-2.7-cmake-lua-version.patch
b/mail-filter/rspamd/files/rspamd-2.7-cmake-lua-version.patch
deleted file mode 100644
index c8254f1ce95e..
--- a/mail-filter/rspamd/files/rspamd-2.7-cmake-lua-version.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 72382acb6..2335ae4bc 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -141,42 +141,8 @@ IF(ENABLE_LUAJIT MATCHES "ON")
- ELSE(ENABLE_LUAJIT MATCHES "ON")
-
- ProcessPackage(LIBLUA LIBRARY "lua"
-- "lua-5.3"
-- LIB_SUFFIXES"lua5.3"
-- INCLUDE lua.h INCLUDE_SUFFIXES
-- "include/lua-5.3"
-- "include/lua5.3"
-- "include/lua53"
-- "include/lua"
- ROOT ${LUA_ROOT}
-- MODULES lua53
-- OPTIONAL)
--
-- IF (NOT WITH_LIBLUA)
-- ProcessPackage(LIBLUA LIBRARY "lua"
-- "lua-5.2"
-- LIB_SUFFIXES"lua5.2"
-- INCLUDE lua.h INCLUDE_SUFFIXES
-- "include/lua-5.2"
--
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/
commit: 1d2bf9e530d455d9d2e4b318d33c411ffb9e36f5
Author: Petr Vaněk atlas cz>
AuthorDate: Mon Nov 14 14:05:09 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Nov 15 00:56:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d2bf9e5
mail-filter/rspamd: fix page-alignment of .unser files
This revision applies patch taken from upstream [1] which fixes
page-alignment issue of .unser files causing segfaults. The issue
affects only those who already started rspamd-3.4. All .unser files will
be automatically removed in postinstall phase for those who are updating
from 3.4 to 3.4-r1.
[1] https://github.com/rspamd/rspamd/issues/4329
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/28263
Signed-off-by: Sam James gentoo.org>
.../rspamd-3.4-hyperscan-page-alignment.patch | 28 ++
.../{rspamd-3.4.ebuild => rspamd-3.4-r1.ebuild}| 13 ++
2 files changed, 41 insertions(+)
diff --git a/mail-filter/rspamd/files/rspamd-3.4-hyperscan-page-alignment.patch
b/mail-filter/rspamd/files/rspamd-3.4-hyperscan-page-alignment.patch
new file mode 100644
index ..913f1f7ecd4d
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.4-hyperscan-page-alignment.patch
@@ -0,0 +1,28 @@
+Fix for hyperscan page alignment issues.
+
+Upstream-Issue: https://github.com/rspamd/rspamd/issues/4329
+
+diff --git a/src/libserver/hyperscan_tools.cxx
b/src/libserver/hyperscan_tools.cxx
+index 6187208a9..96366067d 100644
+--- a/src/libserver/hyperscan_tools.cxx
b/src/libserver/hyperscan_tools.cxx
+@@ -306,7 +306,15 @@ auto load_cached_hs_file(const char *fname, std::int64_t
offset = 0) -> tl::expe
+
msg_debug_hyperscan_lambda("multipattern: create new database in %s; %Hz size",
+ tmpfile_pattern.data(),
unserialized_size);
+ void *buf;
+- posix_memalign(, 16,
unserialized_size);
++#ifdef HAVE_GETPAGESIZE
++ auto page_size = getpagesize();
++#else
++ auto page_size =
sysconf(_SC_PAGESIZE);
++#endif
++ if (page_size == -1) {
++ page_size = 4096;
++ }
++ posix_memalign(, page_size,
unserialized_size);
+ if (buf == nullptr) {
+ return
tl::make_unexpected(error {"Cannot allocate memory", errno,
error_category::CRITICAL });
+ }
+--
+2.37.4
+
diff --git a/mail-filter/rspamd/rspamd-3.4.ebuild
b/mail-filter/rspamd/rspamd-3.4-r1.ebuild
similarity index 83%
rename from mail-filter/rspamd/rspamd-3.4.ebuild
rename to mail-filter/rspamd/rspamd-3.4-r1.ebuild
index cb1d4e71df63..fc1664f05a6d 100644
--- a/mail-filter/rspamd/rspamd-3.4.ebuild
+++ b/mail-filter/rspamd/rspamd-3.4-r1.ebuild
@@ -71,6 +71,7 @@ PATCHES=(
"${FILESDIR}/${PN}-3.2-unbundle-lua.patch"
"${FILESDIR}/${PN}-2.5-unbundle-snowball.patch"
"${FILESDIR}/${PN}-3.3-remove-test-case.patch"
+ "${FILESDIR}/${PN}-3.4-hyperscan-page-alignment.patch"
)
src_prepare() {
@@ -133,4 +134,16 @@ src_install() {
pkg_postinst() {
tmpfiles_process "${PN}.conf"
+
+ for ver in ${REPLACING_VERSIONS}; do
+ if ver_test "${ver}" -eq "3.4"; then
+ elog "rspamd-3.4 is known to segfault when it is
updated from older version due"
+ elog "to a page-alignment of hyperscan .unser files.
The issue is patched in this"
+ elog "ebuild revision rspamd-3.4-r1. All possibly
broken .unser files will be"
+ elog "automaticaly removed. See
https://github.com/rspamd/rspamd/issues/4329 for"
+ elog "more information."
+
+ find "${EROOT}/var/lib/rspamd" -type f -name '*.unser'
-delete
+ fi
+ done
}
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: dd069115f096e59c45e566693a9f0f3f8fcd43a8
Author: Joonas Niilola gentoo org>
AuthorDate: Sat Nov 12 06:20:46 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sat Nov 12 06:23:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd069115
mail-filter/rspamd: Stabilize 3.3 amd64, #880887
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/rspamd-3.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.3.ebuild
b/mail-filter/rspamd/rspamd-3.3.ebuild
index 7231e72c2f72..3bdc6e00e3aa 100644
--- a/mail-filter/rspamd/rspamd-3.3.ebuild
+++ b/mail-filter/rspamd/rspamd-3.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: d735af02bda6f48c0305acf7c45136d88388379d
Author: Joonas Niilola gentoo org>
AuthorDate: Sat Nov 12 06:22:45 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sat Nov 12 06:23:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d735af02
mail-filter/rspamd: Stabilize 3.3 x86, #880887
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/rspamd-3.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.3.ebuild
b/mail-filter/rspamd/rspamd-3.3.ebuild
index 3bdc6e00e3aa..6fb46e9d9b6b 100644
--- a/mail-filter/rspamd/rspamd-3.3.ebuild
+++ b/mail-filter/rspamd/rspamd-3.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/
commit: e22b9e780258d9aede2b057cff5e7ab8b9c6af2f
Author: Petr Vaněk atlas cz>
AuthorDate: Sat Nov 5 19:20:21 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Nov 6 06:16:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e22b9e78
mail-filter/rspamd: drop 3.0-r4, 3.1-r2, 3.2
Issues from two bugs bellow seems to be fixed in more recent versions.
Closes: https://bugs.gentoo.org/817866
Closes: https://bugs.gentoo.org/828584
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/Manifest| 3 -
.../files/rspamd-3.0-fix-null-dereference.patch| 46
.../rspamd/files/rspamd-3.0-system-doctest.patch | 72
.../rspamd/files/rspamd-3.0-system-libfmt.patch| 48
mail-filter/rspamd/rspamd-3.0-r4.ebuild| 128
mail-filter/rspamd/rspamd-3.1-r2.ebuild| 128
mail-filter/rspamd/rspamd-3.2.ebuild | 129 -
7 files changed, 554 deletions(-)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index e0065dc95ea1..cfddb0fa2c14 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,5 +1,2 @@
DIST rspamd-2.7.tar.gz 5126227 BLAKE2B
70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930
SHA512
8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7
-DIST rspamd-3.0.tar.gz 5535659 BLAKE2B
605ac59b947b49efb026e04d153df5fc0d56c65712def3f2c54a949db32b8534e634d172a1899cc08e98e0a9da839fc00f0f569dc8c52a743f38bd71b8abaeaa
SHA512
1ea6f9ffe58b7f280dbd31e39db6412ebeddda634ca8a669fa5bff2951d17123a5d4a09ec0f366c6b0c0b585f868e646fd49e4d45bd451408675b927ec2557c4
-DIST rspamd-3.1.tar.gz 5566920 BLAKE2B
dfb31534e7dbce303729e89537f83eea90d6524a0ccf81633e0d55840f21936985ba5991f2a2ed9ca5594a4a3938f9366f7a1879fc553f41ab52bb89460b87dc
SHA512
3c3c06c10d3dfc90e4bc92c7ebaff4bd4854d3b0e56d6476f0223918c4a52f4cc7a8b381b1f867164199ee18ea00eda77ae0315925f3fd71596d610200667178
-DIST rspamd-3.2.tar.gz 5637835 BLAKE2B
8d42b34dacdc818689fd8602abf8c4d5ff2431eb30b2d8fae6e78642ce4361d39a54cb4b981c58cd31205b0f2013978896081e0d7364620312db3fa855d14b1e
SHA512
fd3570da24d7f09f48ba6e98c210789b85006c51adaf37336c83a570ef5b9239d4a09491b647464254d3600fbea7c662ec271e9a77ee4108236962490c677a79
DIST rspamd-3.3.tar.gz 5680874 BLAKE2B
2fbafabc0a59ca4ad1bbdc1b7ceb5b5bc281dc75d2997ac50c080cdf5ced2582409e3f98b63239bab64fafbcc63016d857967fe00c371a6d5b896d170f5da4a9
SHA512
02c5e62cb9ce32cdd6da859c4afe2bf03fcaff456d79f68ab7c3c288a0b36f11a701825c3cb7f0ecaccd419f84ce693961c1ed955ce4dbcfe291a8e978e2e69c
diff --git a/mail-filter/rspamd/files/rspamd-3.0-fix-null-dereference.patch
b/mail-filter/rspamd/files/rspamd-3.0-fix-null-dereference.patch
deleted file mode 100644
index d355f701a273..
--- a/mail-filter/rspamd/files/rspamd-3.0-fix-null-dereference.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From abea3ac21f764658a966dad475fc99e4b79530d7 Mon Sep 17 00:00:00 2001
-From: Jan Smutny
-Date: Tue, 31 Aug 2021 14:25:23 +0200
-Subject: [PATCH] [Fix] src/lua/lua_mimepart.c: fix null dereference
-
-
-This patch is taken from upstream. It fixes possible runtime segfaults.
-
-PR: https://github.com/rspamd/rspamd/pull/3873
-
-diff --git a/src/lua/lua_mimepart.c b/src/lua/lua_mimepart.c
-index 66b588e3a..21a46d496 100644
a/src/lua/lua_mimepart.c
-+++ b/src/lua/lua_mimepart.c
-@@ -1240,7 +1240,16 @@ lua_textpart_get_fuzzy_hashes (lua_State * L)
- rspamd_stat_token_t *word;
- struct lua_shingle_filter_cbdata cbd;
-
-- if (part && pool) {
-+
-+ if (part == NULL || pool == NULL) {
-+ return luaL_error (L, "invalid arguments");
-+ }
-+
-+ if (IS_TEXT_PART_EMPTY (part) || part->utf_words == NULL) {
-+ lua_pushnil (L);
-+ lua_pushnil (L);
-+ }
-+ else {
- /* TODO: add keys and algorithms support */
- rspamd_cryptobox_hash (key, "rspamd", strlen ("rspamd"), NULL,
0);
-
-@@ -1294,9 +1303,6 @@ lua_textpart_get_fuzzy_hashes (lua_State * L)
- }
- }
- }
-- else {
-- return luaL_error (L, "invalid arguments");
-- }
-
- return 2;
- }
---
-2.31.1
-
diff --git a/mail-filter/rspamd/files/rspamd-3.0-system-doctest.patch
b/mail-filter/rspamd/files/rspamd-3.0-system-doctest.patch
deleted file mode 100644
index bb315ee7a459..
--- a/mail-filter/rspamd/files/rspamd-3.0-system-doctest.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From d37a3764e9889e6de0a7341ba3195ee8a314de23 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Van=C4=9Bk?=
-Date: Wed, 1 Sep 2021 13:30:56 +0200
-Subject: [PATCH] Add SYSTEM_DOCTEST cmake option
-
-This gives packagers option to use
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/
commit: b022bb84a1fa213ed074ae78e01717683305ec75
Author: Petr Vaněk atlas cz>
AuthorDate: Sat Nov 5 19:27:38 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Nov 6 06:16:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b022bb84
mail-filter/rspamd: remove broken test case
Recent stabilization of luajit-2.1 triggered test phase failures related
to improperly designed test case. It was already removed from upstream,
see linked PR.
Upstream-PR: https://github.com/rspamd/rspamd/pull/4323
Bug: https://bugs.gentoo.org/879575
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
.../rspamd/files/rspamd-3.3-remove-test-case.patch | 20
mail-filter/rspamd/rspamd-3.3.ebuild | 1 +
2 files changed, 21 insertions(+)
diff --git a/mail-filter/rspamd/files/rspamd-3.3-remove-test-case.patch
b/mail-filter/rspamd/files/rspamd-3.3-remove-test-case.patch
new file mode 100644
index ..0cad11382b21
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.3-remove-test-case.patch
@@ -0,0 +1,20 @@
+Remove test case which does not work with luajit-2.1 anymore as it
+depends on internal behavior of lujait-2.0.
+
+Upstream-PR: https://github.com/rspamd/rspamd/pull/4323
+
+diff --git a/test/lua/unit/lua_util.extract_specific_urls.lua
b/test/lua/unit/lua_util.extract_specific_urls.lua
+index 05ffeb7b0..a7e2f9f48 100644
+--- a/test/lua/unit/lua_util.extract_specific_urls.lua
b/test/lua/unit/lua_util.extract_specific_urls.lua
+@@ -108,7 +108,6 @@ context("Lua util - extract_specific_urls plain",
function()
+ local cases = {
+ {expect = url_list, filter = nil, limit = , need_emails = true,
prefix = 'p'},
+ {expect = {}, filter = (function() return false end), limit = ,
need_emails = true, prefix = 'p'},
+-{expect = {"domain4.co.net", "test.com"}, filter = nil, limit = 2,
need_emails = true, prefix = 'p'},
+ {expect = {"domain4.co.net", "test.com", "domain3.org"}, filter = nil,
limit = 3, need_emails = true, prefix = 'p'},
+ {
+ expect = {"gov.co.net", "tesco.co.net", "domain1.co.net",
"domain2.co.net", "domain3.co.net", "domain4.co.net"},
+--
+2.37.4
+
diff --git a/mail-filter/rspamd/rspamd-3.3.ebuild
b/mail-filter/rspamd/rspamd-3.3.ebuild
index b6932290133a..7231e72c2f72 100644
--- a/mail-filter/rspamd/rspamd-3.3.ebuild
+++ b/mail-filter/rspamd/rspamd-3.3.ebuild
@@ -70,6 +70,7 @@ PATCHES=(
"${FILESDIR}/rspamd-3.0-cmake-lua-version.patch"
"${FILESDIR}/rspamd-3.2-unbundle-lua.patch"
"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
+ "${FILESDIR}/rspamd-3.3-remove-test-case.patch"
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 5272058e6d1b40f22550ce775c6cc75b7dfe9c2a
Author: Petr Vaněk atlas cz>
AuthorDate: Wed Nov 2 12:25:03 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Nov 6 06:16:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5272058e
mail-filter/rspamd: add 3.4
This version still suffers with jemalloc issue, see bug 810337.
Bug: https://bugs.gentoo.org/810337
Closes: https://bugs.gentoo.org/879575
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/28150
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/Manifest | 1 +
mail-filter/rspamd/rspamd-3.4.ebuild | 136 +++
2 files changed, 137 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index cfddb0fa2c14..bca781f9d3ef 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,2 +1,3 @@
DIST rspamd-2.7.tar.gz 5126227 BLAKE2B
70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930
SHA512
8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7
DIST rspamd-3.3.tar.gz 5680874 BLAKE2B
2fbafabc0a59ca4ad1bbdc1b7ceb5b5bc281dc75d2997ac50c080cdf5ced2582409e3f98b63239bab64fafbcc63016d857967fe00c371a6d5b896d170f5da4a9
SHA512
02c5e62cb9ce32cdd6da859c4afe2bf03fcaff456d79f68ab7c3c288a0b36f11a701825c3cb7f0ecaccd419f84ce693961c1ed955ce4dbcfe291a8e978e2e69c
+DIST rspamd-3.4.tar.gz 5689732 BLAKE2B
8d1b98205f51cfe834db3ed53b8be72ada834980380cba06c4470689d16ef4a6396190ae27044ae76a7b35df6afd3cdf551f9469d878ac69ec61ef6b86b46104
SHA512
fec8cb7b845bf25d02f1c32c82bf35ad9c65f3301a73f3ea611b6fcfa0ac1b75f75561c4c42f142f876ac3a78f96fd91d22d30c5b3600e4001e25f06bc693ccf
diff --git a/mail-filter/rspamd/rspamd-3.4.ebuild
b/mail-filter/rspamd/rspamd-3.4.ebuild
new file mode 100644
index ..cb1d4e71df63
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.4.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit cmake lua-single pax-utils systemd tmpfiles
+
+if [[ ${PV} == * ]] ; 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 selinux test"
+RESTRICT="!test? ( test )"
+
+# A part of tests use ffi luajit extension
+REQUIRED_USE="${LUA_REQUIRED_USE}
+ test? ( lua_single_target_luajit )"
+
+RDEPEND="${LUA_DEPS}
+ $(lua_gen_cond_dep '
+ dev-lua/LuaBitOp[${LUA_USEDEP}]
+ dev-lua/lua-argparse[${LUA_USEDEP}]
+ ')
+ acct-group/rspamd
+ acct-user/rspamd
+ app-arch/zstd:=
+ dev-db/sqlite:3
+ dev-libs/glib:2
+ dev-libs/icu:=
+ dev-libs/libev
+ dev-libs/libfmt:=
+ dev-libs/libpcre2:=[jit=]
+ dev-libs/libsodium:=
+ dev-libs/openssl:0=[-bindist(-)]
+ dev-libs/snowball-stemmer:=
+ >=dev-libs/xxhash-0.8.0
+ sys-apps/file
+ sys-libs/zlib
+ blas? (
+ virtual/blas
+ virtual/lapack
+ )
+ cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
+ jemalloc? ( dev-libs/jemalloc:= )
+ selinux? ( sec-policy/selinux-spamassassin )
+"
+DEPEND="${RDEPEND}
+ dev-cpp/doctest
+"
+BDEPEND="
+ dev-util/ragel
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.0-cmake-lua-version.patch"
+ "${FILESDIR}/${PN}-3.2-unbundle-lua.patch"
+ "${FILESDIR}/${PN}-2.5-unbundle-snowball.patch"
+ "${FILESDIR}/${PN}-3.3-remove-test-case.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ rm -vrf contrib/{doctest,fmt,lua-{argparse,bit},snowball,xxhash,zstd}
|| die
+
+ > cmake/Toolset.cmake || die #827550
+
+ 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
+
+ -DSYSTEM_DOCTEST=ON
+ -DSYSTEM_FMT=ON
+ -DSYSTEM_XXHASH=ON
+ -DSYSTEM_ZSTD=ON
+
+ -DENABLE_BLAS=$(usex blas ON OFF)
+ -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
+ -DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 0a184eedb8250cae3db9758440f9d47ede89467c Author: Petr Vaněk atlas cz> AuthorDate: Tue Oct 4 13:49:34 2022 + Commit: Sam James gentoo org> CommitDate: Fri Oct 7 11:28:36 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a184eed mail-filter/rspamd: update upstream metadata Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Sam James gentoo.org> mail-filter/rspamd/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml index d9a2c3be0222..ebd97898f0a6 100644 --- a/mail-filter/rspamd/metadata.xml +++ b/mail-filter/rspamd/metadata.xml @@ -10,7 +10,7 @@ Proxy Maintainers -vstakhov/rspamd +rspamd/rspamd Use dev-libs/libpcre2
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 4a424df747d23d5151e70495fce5e97521479e90
Author: Petr Vaněk atlas cz>
AuthorDate: Tue Oct 4 08:55:10 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Oct 7 11:28:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a424df7
mail-filter/rspamd: add 3.3
This version contains a fix for Clang-16 (error: implicit declaration of
function ZSTD_resetDStream) reported in bug 870448. It still suffers
with a bug 810337.
Bug: https://bugs.gentoo.org/810337
Closes: https://bugs.gentoo.org/870448
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/Manifest | 1 +
mail-filter/rspamd/rspamd-3.3.ebuild | 135 +++
2 files changed, 136 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 4875b2720023..e0065dc95ea1 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -2,3 +2,4 @@ DIST rspamd-2.7.tar.gz 5126227 BLAKE2B
70f57dba6ac9abe93d735d42e84bd17a179703532
DIST rspamd-3.0.tar.gz 5535659 BLAKE2B
605ac59b947b49efb026e04d153df5fc0d56c65712def3f2c54a949db32b8534e634d172a1899cc08e98e0a9da839fc00f0f569dc8c52a743f38bd71b8abaeaa
SHA512
1ea6f9ffe58b7f280dbd31e39db6412ebeddda634ca8a669fa5bff2951d17123a5d4a09ec0f366c6b0c0b585f868e646fd49e4d45bd451408675b927ec2557c4
DIST rspamd-3.1.tar.gz 5566920 BLAKE2B
dfb31534e7dbce303729e89537f83eea90d6524a0ccf81633e0d55840f21936985ba5991f2a2ed9ca5594a4a3938f9366f7a1879fc553f41ab52bb89460b87dc
SHA512
3c3c06c10d3dfc90e4bc92c7ebaff4bd4854d3b0e56d6476f0223918c4a52f4cc7a8b381b1f867164199ee18ea00eda77ae0315925f3fd71596d610200667178
DIST rspamd-3.2.tar.gz 5637835 BLAKE2B
8d42b34dacdc818689fd8602abf8c4d5ff2431eb30b2d8fae6e78642ce4361d39a54cb4b981c58cd31205b0f2013978896081e0d7364620312db3fa855d14b1e
SHA512
fd3570da24d7f09f48ba6e98c210789b85006c51adaf37336c83a570ef5b9239d4a09491b647464254d3600fbea7c662ec271e9a77ee4108236962490c677a79
+DIST rspamd-3.3.tar.gz 5680874 BLAKE2B
2fbafabc0a59ca4ad1bbdc1b7ceb5b5bc281dc75d2997ac50c080cdf5ced2582409e3f98b63239bab64fafbcc63016d857967fe00c371a6d5b896d170f5da4a9
SHA512
02c5e62cb9ce32cdd6da859c4afe2bf03fcaff456d79f68ab7c3c288a0b36f11a701825c3cb7f0ecaccd419f84ce693961c1ed955ce4dbcfe291a8e978e2e69c
diff --git a/mail-filter/rspamd/rspamd-3.3.ebuild
b/mail-filter/rspamd/rspamd-3.3.ebuild
new file mode 100644
index ..b6932290133a
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.3.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit cmake lua-single pax-utils systemd tmpfiles
+
+if [[ ${PV} == * ]] ; 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 selinux test"
+RESTRICT="!test? ( test )"
+
+# A part of tests use ffi luajit extension
+REQUIRED_USE="${LUA_REQUIRED_USE}
+ test? ( lua_single_target_luajit )"
+
+RDEPEND="${LUA_DEPS}
+ $(lua_gen_cond_dep '
+ dev-lua/LuaBitOp[${LUA_USEDEP}]
+ dev-lua/lua-argparse[${LUA_USEDEP}]
+ ')
+ acct-group/rspamd
+ acct-user/rspamd
+ app-arch/zstd:=
+ dev-db/sqlite:3
+ dev-libs/glib:2
+ dev-libs/icu:=
+ dev-libs/libev
+ dev-libs/libfmt:=
+ dev-libs/libpcre2:=[jit=]
+ dev-libs/libsodium:=
+ dev-libs/openssl:0=[-bindist(-)]
+ dev-libs/snowball-stemmer:=
+ >=dev-libs/xxhash-0.8.0
+ sys-apps/file
+ sys-libs/zlib
+ blas? (
+ virtual/blas
+ virtual/lapack
+ )
+ cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
+ jemalloc? ( dev-libs/jemalloc:= )
+ selinux? ( sec-policy/selinux-spamassassin )
+"
+DEPEND="${RDEPEND}
+ dev-cpp/doctest
+"
+BDEPEND="
+ dev-util/ragel
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/rspamd-3.0-cmake-lua-version.patch"
+ "${FILESDIR}/rspamd-3.2-unbundle-lua.patch"
+ "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ rm -vrf contrib/{doctest,fmt,lua-{argparse,bit},snowball,xxhash,zstd}
|| die
+
+ > cmake/Toolset.cmake || die #827550
+
+ 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
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: aabcda2ede89b4563c3c992df876a4f108dc1cca Author: Petr Vaněk atlas cz> AuthorDate: Tue Oct 4 13:50:17 2022 + Commit: Sam James gentoo org> CommitDate: Fri Oct 7 11:28:36 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aabcda2e mail-filter/rspamd: update HOMEPAGE Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/27613 Signed-off-by: Sam James gentoo.org> mail-filter/rspamd/rspamd-.ebuild | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mail-filter/rspamd/rspamd-.ebuild b/mail-filter/rspamd/rspamd-.ebuild index 7874f481a0d1..b6932290133a 100644 --- a/mail-filter/rspamd/rspamd-.ebuild +++ b/mail-filter/rspamd/rspamd-.ebuild @@ -16,7 +16,11 @@ else fi DESCRIPTION="Rapid spam filtering system" -HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd; +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 selinux test"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 53d6b83e6ea9e7d7bcf761400fd966a70078bb95
Author: Petr Vaněk atlas cz>
AuthorDate: Thu May 26 20:05:02 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sun Jun 12 07:18:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53d6b83e
mail-filter/rspamd: remove dev-cpp/doctest version restriction
This was a bug in dev-cpp/doctest which was fixed in 2.4.8-r1 revbump in
previous commit.
Closes: https://bugs.gentoo.org/830624
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/25657
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/rspamd-3.1-r2.ebuild | 2 +-
mail-filter/rspamd/rspamd-3.2.ebuild| 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-3.1-r2.ebuild
b/mail-filter/rspamd/rspamd-3.1-r2.ebuild
index 2b6e79c7bad0..ac8b9e2b716a 100644
--- a/mail-filter/rspamd/rspamd-3.1-r2.ebuild
+++ b/mail-filter/rspamd/rspamd-3.1-r2.ebuild
@@ -54,7 +54,7 @@ RDEPEND="${LUA_DEPS}
selinux? ( sec-policy/selinux-spamassassin )"
DEPEND="
${RDEPEND}
-
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: f618ee3531b93d54ac2857075f309712c14bbfa8
Author: Kenton Groombridge gentoo org>
AuthorDate: Sun May 22 02:09:18 2022 +
Commit: Kenton Groombridge gentoo org>
CommitDate: Sun May 22 02:13:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f618ee35
mail-filter/rspamd: add selinux USE flag
Signed-off-by: Kenton Groombridge gentoo.org>
mail-filter/rspamd/rspamd-2.7-r104.ebuild | 5 +++--
mail-filter/rspamd/rspamd-3.0-r4.ebuild | 5 +++--
mail-filter/rspamd/rspamd-3.1-r2.ebuild | 5 +++--
mail-filter/rspamd/rspamd-3.2.ebuild | 3 ++-
mail-filter/rspamd/rspamd-.ebuild | 3 ++-
5 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-2.7-r104.ebuild
b/mail-filter/rspamd/rspamd-2.7-r104.ebuild
index 8c015b8220b0..12fd017ebb51 100644
--- a/mail-filter/rspamd/rspamd-2.7-r104.ebuild
+++ b/mail-filter/rspamd/rspamd-2.7-r104.ebuild
@@ -19,7 +19,7 @@ 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 pcre2"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 selinux"
REQUIRED_USE="${LUA_REQUIRED_USE}"
@@ -46,7 +46,8 @@ RDEPEND="${LUA_DEPS}
jemalloc? ( dev-libs/jemalloc:= )
dev-libs/openssl:0=[-bindist(-)]
pcre2? ( dev-libs/libpcre2:=[jit=] )
- !pcre2? ( dev-libs/libpcre[jit=] )"
+ !pcre2? ( dev-libs/libpcre[jit=] )
+ selinux? ( sec-policy/selinux-spamassassin )"
DEPEND="${RDEPEND}"
BDEPEND="
dev-util/ragel
diff --git a/mail-filter/rspamd/rspamd-3.0-r4.ebuild
b/mail-filter/rspamd/rspamd-3.0-r4.ebuild
index e8f4e0ccb5a0..ad3bcaa4ff19 100644
--- a/mail-filter/rspamd/rspamd-3.0-r4.ebuild
+++ b/mail-filter/rspamd/rspamd-3.0-r4.ebuild
@@ -19,7 +19,7 @@ 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 pcre2 test"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 selinux test"
RESTRICT="!test? ( test )"
# A part of tests use ffi luajit extension
@@ -51,7 +51,8 @@ RDEPEND="${LUA_DEPS}
jemalloc? ( dev-libs/jemalloc:= )
dev-libs/openssl:0=[-bindist(-)]
pcre2? ( dev-libs/libpcre2:=[jit=] )
- !pcre2? ( dev-libs/libpcre[jit=] )"
+ !pcre2? ( dev-libs/libpcre[jit=] )
+ selinux? ( sec-policy/selinux-spamassassin )"
DEPEND="${RDEPEND}"
BDEPEND="
dev-util/ragel
diff --git a/mail-filter/rspamd/rspamd-3.1-r2.ebuild
b/mail-filter/rspamd/rspamd-3.1-r2.ebuild
index 9e9406415871..2b6e79c7bad0 100644
--- a/mail-filter/rspamd/rspamd-3.1-r2.ebuild
+++ b/mail-filter/rspamd/rspamd-3.1-r2.ebuild
@@ -19,7 +19,7 @@ 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 pcre2 test"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 selinux test"
RESTRICT="!test? ( test )"
# A part of tests use ffi luajit extension
@@ -50,7 +50,8 @@ RDEPEND="${LUA_DEPS}
jemalloc? ( dev-libs/jemalloc:= )
dev-libs/openssl:0=[-bindist(-)]
pcre2? ( dev-libs/libpcre2:=[jit=] )
- !pcre2? ( dev-libs/libpcre[jit=] )"
+ !pcre2? ( dev-libs/libpcre[jit=] )
+ selinux? ( sec-policy/selinux-spamassassin )"
DEPEND="
${RDEPEND}
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 test"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit selinux test"
RESTRICT="!test? ( test )"
# A part of tests use ffi luajit extension
@@ -51,6 +51,7 @@ RDEPEND="${LUA_DEPS}
)
cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
jemalloc? ( dev-libs/jemalloc:= )
+ selinux? ( sec-policy/selinux-spamassassin )
"
# This version is also affected with bug #830624
DEPEND="${RDEPEND}
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index bbae6a310243..7874f481a0d1 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -19,7 +19,7 @@ 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 test"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit selinux test"
RESTRICT="!test? ( test )"
# A part of tests use ffi luajit extension
@@ -52,6 +52,7 @@ RDEPEND="${LUA_DEPS}
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: c367ce8e3bda32773dceadb810afc7245454682e
Author: Petr Vaněk atlas cz>
AuthorDate: Tue Apr 12 12:36:23 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Apr 13 06:32:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c367ce8e
mail-filter/rspamd: add missing zlib dependency
This follows a change from commit 8bf75c7b9949 ("mail-filter/rspamd: add
missing zlib dependency"). The zlib was integrated to rspamd-1.7.0, this
dependency is missing for quite some time.
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/25008
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/{rspamd-2.7-r103.ebuild => rspamd-2.7-r104.ebuild} | 3 ++-
mail-filter/rspamd/{rspamd-3.0-r3.ebuild => rspamd-3.0-r4.ebuild} | 3 ++-
mail-filter/rspamd/{rspamd-3.1-r1.ebuild => rspamd-3.1-r2.ebuild} | 1 +
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-2.7-r103.ebuild
b/mail-filter/rspamd/rspamd-2.7-r104.ebuild
similarity index 98%
rename from mail-filter/rspamd/rspamd-2.7-r103.ebuild
rename to mail-filter/rspamd/rspamd-2.7-r104.ebuild
index e3e4d0e59f1e..8c015b8220b0 100644
--- a/mail-filter/rspamd/rspamd-2.7-r103.ebuild
+++ b/mail-filter/rspamd/rspamd-2.7-r104.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -37,6 +37,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/libsodium:=
dev-libs/snowball-stemmer:=
sys-apps/file
+ sys-libs/zlib
blas? (
virtual/blas
virtual/lapack
diff --git a/mail-filter/rspamd/rspamd-3.0-r3.ebuild
b/mail-filter/rspamd/rspamd-3.0-r4.ebuild
similarity index 98%
rename from mail-filter/rspamd/rspamd-3.0-r3.ebuild
rename to mail-filter/rspamd/rspamd-3.0-r4.ebuild
index 54434e12ad55..e8f4e0ccb5a0 100644
--- a/mail-filter/rspamd/rspamd-3.0-r3.ebuild
+++ b/mail-filter/rspamd/rspamd-3.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -42,6 +42,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/libsodium:=
dev-libs/snowball-stemmer:=
sys-apps/file
+ sys-libs/zlib
blas? (
virtual/blas
virtual/lapack
diff --git a/mail-filter/rspamd/rspamd-3.1-r1.ebuild
b/mail-filter/rspamd/rspamd-3.1-r2.ebuild
similarity index 99%
rename from mail-filter/rspamd/rspamd-3.1-r1.ebuild
rename to mail-filter/rspamd/rspamd-3.1-r2.ebuild
index d1cc32c3e7bb..9e9406415871 100644
--- a/mail-filter/rspamd/rspamd-3.1-r1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.1-r2.ebuild
@@ -41,6 +41,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/libsodium:=
dev-libs/snowball-stemmer:=
sys-apps/file
+ sys-libs/zlib
blas? (
virtual/blas
virtual/lapack
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/
commit: eac08ceb58e0fe52a1932960c290e31d3b0638e3
Author: Petr Vaněk atlas cz>
AuthorDate: Wed Apr 6 21:07:02 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Apr 12 08:20:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eac08ceb
mail-filter/rspamd: add 3.2
- move dev-cpp/doctest from RDEPEND to DEPEND only
- unbundle dev-lua/lua-argparse
- doctest bug #830624 affects this version as well
- use dev-libs/libpcre2 only, it is upstream default and
dev-libs/libpcre is eol
Closes: https://bugs.gentoo.org/836673
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/Manifest| 1 +
.../rspamd/files/rspamd-3.2-unbundle-lua.patch | 61 ++
mail-filter/rspamd/rspamd-3.2.ebuild | 128 +
3 files changed, 190 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 78c40cf829a4..4875b2720023 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,3 +1,4 @@
DIST rspamd-2.7.tar.gz 5126227 BLAKE2B
70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930
SHA512
8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7
DIST rspamd-3.0.tar.gz 5535659 BLAKE2B
605ac59b947b49efb026e04d153df5fc0d56c65712def3f2c54a949db32b8534e634d172a1899cc08e98e0a9da839fc00f0f569dc8c52a743f38bd71b8abaeaa
SHA512
1ea6f9ffe58b7f280dbd31e39db6412ebeddda634ca8a669fa5bff2951d17123a5d4a09ec0f366c6b0c0b585f868e646fd49e4d45bd451408675b927ec2557c4
DIST rspamd-3.1.tar.gz 5566920 BLAKE2B
dfb31534e7dbce303729e89537f83eea90d6524a0ccf81633e0d55840f21936985ba5991f2a2ed9ca5594a4a3938f9366f7a1879fc553f41ab52bb89460b87dc
SHA512
3c3c06c10d3dfc90e4bc92c7ebaff4bd4854d3b0e56d6476f0223918c4a52f4cc7a8b381b1f867164199ee18ea00eda77ae0315925f3fd71596d610200667178
+DIST rspamd-3.2.tar.gz 5637835 BLAKE2B
8d42b34dacdc818689fd8602abf8c4d5ff2431eb30b2d8fae6e78642ce4361d39a54cb4b981c58cd31205b0f2013978896081e0d7364620312db3fa855d14b1e
SHA512
fd3570da24d7f09f48ba6e98c210789b85006c51adaf37336c83a570ef5b9239d4a09491b647464254d3600fbea7c662ec271e9a77ee4108236962490c677a79
diff --git a/mail-filter/rspamd/files/rspamd-3.2-unbundle-lua.patch
b/mail-filter/rspamd/files/rspamd-3.2-unbundle-lua.patch
new file mode 100644
index ..36aed009c6c8
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.2-unbundle-lua.patch
@@ -0,0 +1,61 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 096c2e79e..f323bfd40 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -620,10 +620,6 @@ ELSE()
+ find_package(doctest)
+ ENDIF()
+
+-IF (NOT WITH_LUAJIT)
+- ADD_SUBDIRECTORY(contrib/lua-bit)
+-ENDIF()
+-
+ IF (ENABLE_LUA_REPL MATCHES "ON")
+ ADD_SUBDIRECTORY(contrib/replxx)
+ SET(WITH_LUA_REPL 1)
+@@ -721,7 +717,6 @@ ENDFOREACH(LUA_LIB)
+
+ # Install lua fun library
+ INSTALL(FILES "contrib/lua-fun/fun.lua" DESTINATION ${LUALIBDIR})
+-INSTALL(FILES "contrib/lua-argparse/argparse.lua" DESTINATION ${LUALIBDIR})
+ INSTALL(FILES "contrib/lua-tableshape/tableshape.lua" DESTINATION
${LUALIBDIR})
+ INSTALL(FILES "contrib/lua-lupa/lupa.lua" DESTINATION ${LUALIBDIR})
+ INSTALL(FILES "contrib/lua-lpeg/lpegre.lua" DESTINATION ${LUALIBDIR})
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 77c8756af..e0476bdc1 100644
+--- a/src/CMakeLists.txt
b/src/CMakeLists.txt
+@@ -206,10 +206,6 @@ IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
+ ADD_DEPENDENCIES(rspamd-server rspamd-clang)
+ ENDIF()
+
+-IF (NOT WITH_LUAJIT)
+- TARGET_LINK_LIBRARIES(rspamd-server rspamd-bit)
+-ENDIF()
+-
+ IF (ENABLE_SNOWBALL MATCHES "ON")
+ TARGET_LINK_LIBRARIES(rspamd-server stemmer)
+ ENDIF()
+diff --git a/src/lua/lua_common.c b/src/lua/lua_common.c
+index ab411fa66..85787b31e 100644
+--- a/src/lua/lua_common.c
b/src/lua/lua_common.c
+@@ -923,10 +923,6 @@ rspamd_lua_wipe_realloc (void *ud,
+ return NULL;
+ }
+
+-#ifndef WITH_LUAJIT
+-extern int luaopen_bit(lua_State *L);
+-#endif
+-
+ lua_State *
+ rspamd_lua_init (bool wipe_mem)
+ {
+@@ -984,7 +980,6 @@ rspamd_lua_init (bool wipe_mem)
+ luaopen_parsers (L);
+ luaopen_compress (L);
+ #ifndef WITH_LUAJIT
+- rspamd_lua_add_preload (L, "bit", luaopen_bit);
+ lua_settop (L, 0);
+ #endif
+
diff --git a/mail-filter/rspamd/rspamd-3.2.ebuild
b/mail-filter/rspamd/rspamd-3.2.ebuild
new file mode 100644
index ..fe5f08fba5e9
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit cmake lua-single pax-utils systemd tmpfiles
+
+if [[ ${PV} == * ]] ; then
+ EGIT_REPO_URI="https://github.com/rspamd/rspamd.git;
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 8bf75c7b9949a658c80bcb334b9cffe041d2dd86
Author: Sam James gentoo org>
AuthorDate: Tue Apr 12 08:20:01 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Apr 12 08:20:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bf75c7b
mail-filter/rspamd: add missing zlib dependency
Noticed by iwdevtools.
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-3.2.ebuild | 1 +
mail-filter/rspamd/rspamd-.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/mail-filter/rspamd/rspamd-3.2.ebuild
b/mail-filter/rspamd/rspamd-3.2.ebuild
index fe5f08fba5e9..4446b30d950e 100644
--- a/mail-filter/rspamd/rspamd-3.2.ebuild
+++ b/mail-filter/rspamd/rspamd-3.2.ebuild
@@ -44,6 +44,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/openssl:0=[-bindist(-)]
dev-libs/snowball-stemmer:=
sys-apps/file
+ sys-libs/zlib
blas? (
virtual/blas
virtual/lapack
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index 5ca54eb0e85c..bbae6a310243 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -45,6 +45,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/snowball-stemmer:=
>=dev-libs/xxhash-0.8.0
sys-apps/file
+ sys-libs/zlib
blas? (
virtual/blas
virtual/lapack
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 92406fdceebaaa26eb55713857256ebd69ef7279
Author: Petr Vaněk atlas cz>
AuthorDate: Fri Apr 8 14:52:09 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Apr 12 08:20:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92406fdc
mail-filter/rspamd: use system dev-libs/xxhash
New SYSTEM_XXHASH was recently accepted by upstream.
Upstream-PR: https://github.com/rspamd/rspamd/pull/4138
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/24945
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index f04832d56b59..5ca54eb0e85c 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -43,6 +43,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/libsodium:=
dev-libs/openssl:0=[-bindist(-)]
dev-libs/snowball-stemmer:=
+ >=dev-libs/xxhash-0.8.0
sys-apps/file
blas? (
virtual/blas
@@ -68,7 +69,7 @@ PATCHES=(
src_prepare() {
cmake_src_prepare
- rm -vrf contrib/{doctest,fmt,lua-{argparse,bit},snowball,zstd} || die
+ rm -vrf contrib/{doctest,fmt,lua-{argparse,bit},snowball,xxhash,zstd}
|| die
> cmake/Toolset.cmake || die #827550
@@ -86,6 +87,7 @@ src_configure() {
-DSYSTEM_DOCTEST=ON
-DSYSTEM_FMT=ON
+ -DSYSTEM_XXHASH=ON
-DSYSTEM_ZSTD=ON
-DENABLE_BLAS=$(usex blas ON OFF)
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: a0be7a6a1a96b4df87446f3e514a4af5818e83c3
Author: Petr Vaněk atlas cz>
AuthorDate: Wed Apr 6 09:51:21 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Apr 12 08:20:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0be7a6a
mail-filter/rspamd: sync live
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-.ebuild | 24 +---
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index b4d4c6d23bae..f04832d56b59 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
LUA_COMPAT=( lua5-{1..4} luajit )
@@ -19,7 +19,7 @@ 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 pcre2 test"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit test"
RESTRICT="!test? ( test )"
# A part of tests use ffi luajit extension
@@ -29,17 +29,19 @@ REQUIRED_USE="${LUA_REQUIRED_USE}
RDEPEND="${LUA_DEPS}
$(lua_gen_cond_dep '
dev-lua/LuaBitOp[${LUA_USEDEP}]
+ dev-lua/lua-argparse[${LUA_USEDEP}]
')
acct-group/rspamd
acct-user/rspamd
app-arch/zstd:=
dev-db/sqlite:3
- dev-cpp/doctest
dev-libs/glib:2
dev-libs/icu:=
dev-libs/libev
dev-libs/libfmt:=
+ dev-libs/libpcre2:=[jit=]
dev-libs/libsodium:=
+ dev-libs/openssl:0=[-bindist(-)]
dev-libs/snowball-stemmer:=
sys-apps/file
blas? (
@@ -48,10 +50,10 @@ RDEPEND="${LUA_DEPS}
)
cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
jemalloc? ( dev-libs/jemalloc:= )
- dev-libs/openssl:0=[-bindist(-)]
- pcre2? ( dev-libs/libpcre2:=[jit=] )
- !pcre2? ( dev-libs/libpcre[jit=] )"
-DEPEND="${RDEPEND}"
+"
+DEPEND="${RDEPEND}
+ dev-cpp/doctest
+"
BDEPEND="
dev-util/ragel
virtual/pkgconfig
@@ -59,14 +61,14 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/rspamd-3.0-cmake-lua-version.patch"
- "${FILESDIR}/rspamd-2.6-unbundle-lua.patch"
+ "${FILESDIR}/rspamd-3.2-unbundle-lua.patch"
"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
)
src_prepare() {
cmake_src_prepare
- rm -vrf contrib/{doctest,fmt,lua-bit,snowball,zstd} || die
+ rm -vrf contrib/{doctest,fmt,lua-{argparse,bit},snowball,zstd} || die
> cmake/Toolset.cmake || die #827550
@@ -90,7 +92,7 @@ src_configure() {
-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
-DENABLE_LUAJIT=$(usex lua_single_target_luajit ON OFF)
- -DENABLE_PCRE2=$(usex pcre2 ON OFF)
+ -DENABLE_PCRE2=ON
)
cmake_src_configure
}
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: fe00d0ea297eaad95f779216527cb4bd85f515df Author: Jonas Stein gentoo org> AuthorDate: Thu Feb 10 20:11:34 2022 + Commit: Jonas Stein gentoo org> CommitDate: Thu Feb 10 20:11:43 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe00d0ea mail-filter/rspamd: Maintainer retired Proxied maintainer retired due to inactivity. Closes: https://bugs.gentoo.org/633254 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Jonas Stein gentoo.org> mail-filter/rspamd/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml index b1f97d1434d0..d9a2c3be0222 100644 --- a/mail-filter/rspamd/metadata.xml +++ b/mail-filter/rspamd/metadata.xml @@ -1,10 +1,6 @@ https://www.gentoo.org/dtd/metadata.dtd;> - -c...@roessner.co -Christian Roessner - arka...@atlas.cz Petr Vaněk
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 6dbfcb026c30a8cadde714830a967310ecdfeac8
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Jan 10 17:35:48 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Jan 10 17:41:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dbfcb02
mail-filter/rspamd: require https://bugs.gentoo.org/830624
Signed-off-by: Ionen Wolkens gentoo.org>
mail-filter/rspamd/{rspamd-3.1.ebuild => rspamd-3.1-r1.ebuild} | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-3.1.ebuild
b/mail-filter/rspamd/rspamd-3.1-r1.ebuild
similarity index 97%
rename from mail-filter/rspamd/rspamd-3.1.ebuild
rename to mail-filter/rspamd/rspamd-3.1-r1.ebuild
index b4d4c6d23bae..d1cc32c3e7bb 100644
--- a/mail-filter/rspamd/rspamd-3.1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -34,7 +34,6 @@ RDEPEND="${LUA_DEPS}
acct-user/rspamd
app-arch/zstd:=
dev-db/sqlite:3
- dev-cpp/doctest
dev-libs/glib:2
dev-libs/icu:=
dev-libs/libev
@@ -51,7 +50,9 @@ RDEPEND="${LUA_DEPS}
dev-libs/openssl:0=[-bindist(-)]
pcre2? ( dev-libs/libpcre2:=[jit=] )
!pcre2? ( dev-libs/libpcre[jit=] )"
-DEPEND="${RDEPEND}"
+DEPEND="
+ ${RDEPEND}
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 45c18da33fe7f9ec1d9eb61d8c60406a867c63bb
Author: Petr Vaněk atlas cz>
AuthorDate: Mon Nov 29 18:37:39 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Dec 1 20:02:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c18da3
mail-filter/rspamd: respect user compiler flags choice
The Toolset.cmake file seems to be unnecessary, it tries to control
flags which in Gentoo should be controlled by user. This applies a
change suggested in [1].
[1] https://bugs.gentoo.org/827550#c1
Closes: https://bugs.gentoo.org/827550
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/23127
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-3.1.ebuild | 2 ++
mail-filter/rspamd/rspamd-.ebuild | 2 ++
2 files changed, 4 insertions(+)
diff --git a/mail-filter/rspamd/rspamd-3.1.ebuild
b/mail-filter/rspamd/rspamd-3.1.ebuild
index 3d43ffe54025..b4d4c6d23bae 100644
--- a/mail-filter/rspamd/rspamd-3.1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.1.ebuild
@@ -68,6 +68,8 @@ src_prepare() {
rm -vrf contrib/{doctest,fmt,lua-bit,snowball,zstd} || die
+ > cmake/Toolset.cmake || die #827550
+
sed -i -e 's/User=_rspamd/User=rspamd/g' \
rspamd.service \
|| die
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index 3d43ffe54025..b4d4c6d23bae 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -68,6 +68,8 @@ src_prepare() {
rm -vrf contrib/{doctest,fmt,lua-bit,snowball,zstd} || die
+ > cmake/Toolset.cmake || die #827550
+
sed -i -e 's/User=_rspamd/User=rspamd/g' \
rspamd.service \
|| die
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 0bbf63dde755e16cffe896f15efe3328978e44b8 Author: Sam James gentoo org> AuthorDate: Mon Nov 22 11:12:28 2021 + Commit: Sam James gentoo org> CommitDate: Mon Nov 22 11:12:28 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bbf63dd mail-filter/rspamd: use tag in metadata.xml Signed-off-by: Sam James gentoo.org> mail-filter/rspamd/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml index 78a3ccc54c80..b1f97d1434d0 100644 --- a/mail-filter/rspamd/metadata.xml +++ b/mail-filter/rspamd/metadata.xml @@ -17,7 +17,7 @@ vstakhov/rspamd -Use dev-libs/libpcre2 +Use dev-libs/libpcre2 Enable PCRE JIT support
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: ce8c5ced6f2dd5150bbfb248015f92bbffb1959f
Author: Petr Vaněk atlas cz>
AuthorDate: Fri Nov 12 08:33:57 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Nov 22 10:08:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce8c5ced
mail-filter/rspamd: make USE=jit to control only PCRE JIT support
It is valid configuration to use JIT enabled PCRE with non-JIT Lua and
vice versa, as it was pointed out in a bug report. Therefore, this
change removes
jit? ( lua_single_target_luajit )
restriction from all available ebuilds.
Closes: https://bugs.gentoo.org/822765
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/22915
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/metadata.xml | 1 +
mail-filter/rspamd/rspamd-2.7-r103.ebuild | 3 +--
mail-filter/rspamd/rspamd-3.0-r3.ebuild | 1 -
mail-filter/rspamd/rspamd-3.1.ebuild | 1 -
mail-filter/rspamd/rspamd-.ebuild | 1 -
5 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml
index a183078256ab..78a3ccc54c80 100644
--- a/mail-filter/rspamd/metadata.xml
+++ b/mail-filter/rspamd/metadata.xml
@@ -18,5 +18,6 @@
Use dev-libs/libpcre2
+Enable PCRE JIT support
diff --git a/mail-filter/rspamd/rspamd-2.7-r103.ebuild
b/mail-filter/rspamd/rspamd-2.7-r103.ebuild
index 8a361f82f03e..e3e4d0e59f1e 100644
--- a/mail-filter/rspamd/rspamd-2.7-r103.ebuild
+++ b/mail-filter/rspamd/rspamd-2.7-r103.ebuild
@@ -21,8 +21,7 @@ LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3
MIT public-domain u
SLOT="0"
IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2"
-REQUIRED_USE="${LUA_REQUIRED_USE}
- jit? ( lua_single_target_luajit )"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
RDEPEND="${LUA_DEPS}
$(lua_gen_cond_dep '
diff --git a/mail-filter/rspamd/rspamd-3.0-r3.ebuild
b/mail-filter/rspamd/rspamd-3.0-r3.ebuild
index 1ff4af0796ec..54434e12ad55 100644
--- a/mail-filter/rspamd/rspamd-3.0-r3.ebuild
+++ b/mail-filter/rspamd/rspamd-3.0-r3.ebuild
@@ -24,7 +24,6 @@ RESTRICT="!test? ( test )"
# A part of tests use ffi luajit extension
REQUIRED_USE="${LUA_REQUIRED_USE}
- jit? ( lua_single_target_luajit )
test? ( lua_single_target_luajit )"
RDEPEND="${LUA_DEPS}
diff --git a/mail-filter/rspamd/rspamd-3.1.ebuild
b/mail-filter/rspamd/rspamd-3.1.ebuild
index df5d75abfd0e..3d43ffe54025 100644
--- a/mail-filter/rspamd/rspamd-3.1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.1.ebuild
@@ -24,7 +24,6 @@ RESTRICT="!test? ( test )"
# A part of tests use ffi luajit extension
REQUIRED_USE="${LUA_REQUIRED_USE}
- jit? ( lua_single_target_luajit )
test? ( lua_single_target_luajit )"
RDEPEND="${LUA_DEPS}
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index df5d75abfd0e..3d43ffe54025 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -24,7 +24,6 @@ RESTRICT="!test? ( test )"
# A part of tests use ffi luajit extension
REQUIRED_USE="${LUA_REQUIRED_USE}
- jit? ( lua_single_target_luajit )
test? ( lua_single_target_luajit )"
RDEPEND="${LUA_DEPS}
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 5a751a73ab82422e63f50a7350f4789fc7780c06
Author: Petr Vaněk atlas cz>
AuthorDate: Sun Nov 7 21:21:00 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Nov 7 23:28:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a751a73
mail-filter/rspamd: add 3.1
Closes: https://bugs.gentoo.org/822207
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/Manifest | 1 +
mail-filter/rspamd/rspamd-3.1.ebuild | 124 +++
2 files changed, 125 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index fa7fefdafd2..78c40cf829a 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,2 +1,3 @@
DIST rspamd-2.7.tar.gz 5126227 BLAKE2B
70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930
SHA512
8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7
DIST rspamd-3.0.tar.gz 5535659 BLAKE2B
605ac59b947b49efb026e04d153df5fc0d56c65712def3f2c54a949db32b8534e634d172a1899cc08e98e0a9da839fc00f0f569dc8c52a743f38bd71b8abaeaa
SHA512
1ea6f9ffe58b7f280dbd31e39db6412ebeddda634ca8a669fa5bff2951d17123a5d4a09ec0f366c6b0c0b585f868e646fd49e4d45bd451408675b927ec2557c4
+DIST rspamd-3.1.tar.gz 5566920 BLAKE2B
dfb31534e7dbce303729e89537f83eea90d6524a0ccf81633e0d55840f21936985ba5991f2a2ed9ca5594a4a3938f9366f7a1879fc553f41ab52bb89460b87dc
SHA512
3c3c06c10d3dfc90e4bc92c7ebaff4bd4854d3b0e56d6476f0223918c4a52f4cc7a8b381b1f867164199ee18ea00eda77ae0315925f3fd71596d610200667178
diff --git a/mail-filter/rspamd/rspamd-3.1.ebuild
b/mail-filter/rspamd/rspamd-3.1.ebuild
new file mode 100644
index 000..df5d75abfd0
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit cmake lua-single pax-utils systemd tmpfiles
+
+if [[ ${PV} == * ]] ; 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 pcre2 test"
+RESTRICT="!test? ( test )"
+
+# A part of tests use ffi luajit extension
+REQUIRED_USE="${LUA_REQUIRED_USE}
+ jit? ( lua_single_target_luajit )
+ test? ( lua_single_target_luajit )"
+
+RDEPEND="${LUA_DEPS}
+ $(lua_gen_cond_dep '
+ dev-lua/LuaBitOp[${LUA_USEDEP}]
+ ')
+ acct-group/rspamd
+ acct-user/rspamd
+ app-arch/zstd:=
+ dev-db/sqlite:3
+ dev-cpp/doctest
+ dev-libs/glib:2
+ dev-libs/icu:=
+ dev-libs/libev
+ dev-libs/libfmt:=
+ dev-libs/libsodium:=
+ dev-libs/snowball-stemmer:=
+ sys-apps/file
+ blas? (
+ virtual/blas
+ virtual/lapack
+ )
+ cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
+ jemalloc? ( dev-libs/jemalloc:= )
+ dev-libs/openssl:0=[-bindist(-)]
+ pcre2? ( dev-libs/libpcre2:=[jit=] )
+ !pcre2? ( dev-libs/libpcre[jit=] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/ragel
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/rspamd-3.0-cmake-lua-version.patch"
+ "${FILESDIR}/rspamd-2.6-unbundle-lua.patch"
+ "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ rm -vrf contrib/{doctest,fmt,lua-bit,snowball,zstd} || die
+
+ 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
+
+ -DSYSTEM_DOCTEST=ON
+ -DSYSTEM_FMT=ON
+ -DSYSTEM_ZSTD=ON
+
+ -DENABLE_BLAS=$(usex blas ON OFF)
+ -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
+ -DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
+ -DENABLE_LUAJIT=$(usex lua_single_target_luajit ON OFF)
+ -DENABLE_PCRE2=$(usex pcre2 ON OFF)
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ cmake_build run-test
+}
+
+src_install() {
+ cmake_src_install
+
+ newconfd "${FILESDIR}"/rspamd.conf rspamd
+ newinitd "${FILESDIR}/rspamd-r7.init" rspamd
+ systemd_newunit rspamd.service rspamd.service
+
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 75c8f0d717c51684737bdb121161c39e09a51048
Author: Petr Vaněk atlas cz>
AuthorDate: Mon Sep 6 06:24:00 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Sep 7 20:25:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75c8f0d7
mail-filter/rspamd: sync live
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/22230
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index 7bcf4740c47..df5d75abfd0 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -35,6 +35,7 @@ RDEPEND="${LUA_DEPS}
acct-user/rspamd
app-arch/zstd:=
dev-db/sqlite:3
+ dev-cpp/doctest
dev-libs/glib:2
dev-libs/icu:=
dev-libs/libev
@@ -66,7 +67,7 @@ PATCHES=(
src_prepare() {
cmake_src_prepare
- rm -vrf contrib/{fmt,lua-bit,snowball,zstd} || die
+ rm -vrf contrib/{doctest,fmt,lua-bit,snowball,zstd} || die
sed -i -e 's/User=_rspamd/User=rspamd/g' \
rspamd.service \
@@ -80,6 +81,7 @@ src_configure() {
-DDBDIR=/var/lib/rspamd
-DLOGDIR=/var/log/rspamd
+ -DSYSTEM_DOCTEST=ON
-DSYSTEM_FMT=ON
-DSYSTEM_ZSTD=ON
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/
commit: b097209aecec050012ffa8b6f80f5e4d56308abd
Author: Petr Vaněk atlas cz>
AuthorDate: Mon Sep 6 06:15:55 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Sep 7 20:25:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b097209a
mail-filter/rspamd: use system dev-cpp/doctest
This backports patch already merged to upstream, which allows us to use
system dev-cpp/doctest library rather than bundled one. Rspamd bundles
doctest-2.4.5 which fails to build with glibc-2.34.
Closes: https://bugs.gentoo.org/811318
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
.../rspamd/files/rspamd-3.0-system-doctest.patch | 72 ++
.../{rspamd-3.0-r2.ebuild => rspamd-3.0-r3.ebuild} | 5 +-
2 files changed, 76 insertions(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/files/rspamd-3.0-system-doctest.patch
b/mail-filter/rspamd/files/rspamd-3.0-system-doctest.patch
new file mode 100644
index 000..bb315ee7a45
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.0-system-doctest.patch
@@ -0,0 +1,72 @@
+From d37a3764e9889e6de0a7341ba3195ee8a314de23 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?=
+Date: Wed, 1 Sep 2021 13:30:56 +0200
+Subject: [PATCH] Add SYSTEM_DOCTEST cmake option
+
+This gives packagers option to use system version of doctest rather than
+bundled one. It is disabled by default. Additionally, there is no need
+to link rspamd-test-cxx with doctest as it is is single header library.
+
+Main reason for this change is that currently bundled version of
+doctest-2.4.5 can't compile with glibc-2.34 [1]. However, this issue was
+already fixed in upstream doctest-2.4.6 [2] in commit [3]. With this,
+packagers can just bump doctest to fixed version.
+
+[1] https://github.com/onqtam/doctest/issues/473
+[2] https://github.com/onqtam/doctest/blob/master/CHANGELOG.md#246-2021-03-22
+[3]
https://github.com/onqtam/doctest/commit/099d5414e97244ec44cf46b14cd176b3a3dc52e3
+---
+
+Merged-to-upstream: https://github.com/rspamd/rspamd/pull/3875
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fc4175677..ced49730d 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -59,6 +59,7 @@ OPTION(ENABLE_LUA_TRACE"Trace all Lua C API invocations
[default: OFF]" OFF)
+ OPTION(ENABLE_LUA_REPL "Enables Lua repl (requires C++11 compiler)
[default: ON]" ON)
+ OPTION(SYSTEM_ZSTD "Use system zstd instead of bundled one [default:
OFF]" OFF)
+ OPTION(SYSTEM_FMT "Use system fmt instead of bundled one [defalut:
OFF]" OFF)
++OPTION(SYSTEM_DOCTEST "Use system doctest instead of bundled one
[default: OFF]" OFF)
+
+ # INCLUDE SECTION
#
+
+@@ -118,7 +119,6 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/"
+ "${CMAKE_SOURCE_DIR}/contrib/lc-btrie"
+ "${CMAKE_SOURCE_DIR}/contrib/lua-lpeg"
+ "${CMAKE_SOURCE_DIR}/contrib/frozen/include"
+- "${CMAKE_SOURCE_DIR}/contrib/doctest"
+ "${CMAKE_SOURCE_DIR}/contrib/fu2/include"
+ "${CMAKE_BINARY_DIR}/src" #Stored in the binary dir
+ "${CMAKE_BINARY_DIR}/src/libcryptobox")
+@@ -656,7 +656,12 @@ IF(SYSTEM_FMT MATCHES "OFF")
+ ELSE()
+ find_package(fmt)
+ ENDIF()
+-ADD_SUBDIRECTORY(contrib/doctest)
++IF(SYSTEM_DOCTEST MATCHES "OFF")
++ ADD_SUBDIRECTORY(contrib/doctest)
++ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/contrib/doctest")
++ELSE()
++ find_package(doctest)
++ENDIF()
+
+ IF (NOT WITH_LUAJIT)
+ ADD_SUBDIRECTORY(contrib/lua-bit)
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 9e56cbad7..08e9556f3 100644
+--- a/test/CMakeLists.txt
b/test/CMakeLists.txt
+@@ -24,9 +24,7 @@ SET(CXXTESTSSRC rspamd_cxx_unit.cxx)
+ ADD_EXECUTABLE(rspamd-test-cxx EXCLUDE_FROM_ALL ${CXXTESTSSRC})
+ SET_TARGET_PROPERTIES(rspamd-test-cxx PROPERTIES LINKER_LANGUAGE CXX)
+ ADD_DEPENDENCIES(rspamd-test-cxx rspamd-server)
+-ADD_DEPENDENCIES(rspamd-test-cxx doctest)
+ TARGET_LINK_LIBRARIES(rspamd-test-cxx PRIVATE rspamd-server)
+-TARGET_LINK_LIBRARIES(rspamd-test-cxx PRIVATE doctest)
+ SET_TARGET_PROPERTIES(rspamd-test-cxx PROPERTIES LINKER_LANGUAGE CXX)
+
+ IF(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+--
+2.31.1
+
diff --git a/mail-filter/rspamd/rspamd-3.0-r2.ebuild
b/mail-filter/rspamd/rspamd-3.0-r3.ebuild
similarity index 95%
rename from mail-filter/rspamd/rspamd-3.0-r2.ebuild
rename to mail-filter/rspamd/rspamd-3.0-r3.ebuild
index 30065ff095b..1ff4af0796e 100644
--- a/mail-filter/rspamd/rspamd-3.0-r2.ebuild
+++ b/mail-filter/rspamd/rspamd-3.0-r3.ebuild
@@ -35,6 +35,7 @@ RDEPEND="${LUA_DEPS}
acct-user/rspamd
app-arch/zstd:=
dev-db/sqlite:3
+ dev-cpp/doctest
dev-libs/glib:2
dev-libs/icu:=
dev-libs/libev
@@ -60,6 +61,7 @@ BDEPEND="
PATCHES=(
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/
commit: 066a3f86023d2329d692558e9f869fc892071d96
Author: Petr Vaněk atlas cz>
AuthorDate: Mon Sep 6 06:42:00 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Sep 7 20:23:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=066a3f86
mail-filter/rspamd: backport null dereference fix
This Backports patch which fixes possible runtime segfaults caused by
null pointer dereference.
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
.../files/rspamd-3.0-fix-null-dereference.patch| 46 ++
mail-filter/rspamd/rspamd-3.0-r2.ebuild| 1 +
2 files changed, 47 insertions(+)
diff --git a/mail-filter/rspamd/files/rspamd-3.0-fix-null-dereference.patch
b/mail-filter/rspamd/files/rspamd-3.0-fix-null-dereference.patch
new file mode 100644
index 000..d355f701a27
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.0-fix-null-dereference.patch
@@ -0,0 +1,46 @@
+From abea3ac21f764658a966dad475fc99e4b79530d7 Mon Sep 17 00:00:00 2001
+From: Jan Smutny
+Date: Tue, 31 Aug 2021 14:25:23 +0200
+Subject: [PATCH] [Fix] src/lua/lua_mimepart.c: fix null dereference
+
+---
+
+This patch is taken from upstream. It fixes possible runtime segfaults.
+
+PR: https://github.com/rspamd/rspamd/pull/3873
+
+diff --git a/src/lua/lua_mimepart.c b/src/lua/lua_mimepart.c
+index 66b588e3a..21a46d496 100644
+--- a/src/lua/lua_mimepart.c
b/src/lua/lua_mimepart.c
+@@ -1240,7 +1240,16 @@ lua_textpart_get_fuzzy_hashes (lua_State * L)
+ rspamd_stat_token_t *word;
+ struct lua_shingle_filter_cbdata cbd;
+
+- if (part && pool) {
++
++ if (part == NULL || pool == NULL) {
++ return luaL_error (L, "invalid arguments");
++ }
++
++ if (IS_TEXT_PART_EMPTY (part) || part->utf_words == NULL) {
++ lua_pushnil (L);
++ lua_pushnil (L);
++ }
++ else {
+ /* TODO: add keys and algorithms support */
+ rspamd_cryptobox_hash (key, "rspamd", strlen ("rspamd"), NULL,
0);
+
+@@ -1294,9 +1303,6 @@ lua_textpart_get_fuzzy_hashes (lua_State * L)
+ }
+ }
+ }
+- else {
+- return luaL_error (L, "invalid arguments");
+- }
+
+ return 2;
+ }
+--
+2.31.1
+
diff --git a/mail-filter/rspamd/rspamd-3.0-r2.ebuild
b/mail-filter/rspamd/rspamd-3.0-r2.ebuild
index efe18dc57b0..30065ff095b 100644
--- a/mail-filter/rspamd/rspamd-3.0-r2.ebuild
+++ b/mail-filter/rspamd/rspamd-3.0-r2.ebuild
@@ -60,6 +60,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${P}-cmake-lua-version.patch"
"${FILESDIR}/${P}-system-libfmt.patch"
+ "${FILESDIR}/${P}-fix-null-dereference.patch"
"${FILESDIR}/${PN}-2.6-unbundle-lua.patch"
"${FILESDIR}/${PN}-2.5-unbundle-snowball.patch"
)
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: d94e39e32f48c8066282a86c43671e126c5c05b0
Author: Petr Vaněk atlas cz>
AuthorDate: Sat Aug 28 11:45:59 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Aug 28 18:20:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d94e39e3
mail-filter/rspamd: disable lua5-3
This version does not work with lua5-3, because currently required
stable revision of LuaBitOp does not support lua5-3.
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/22140
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-2.7-r103.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-2.7-r103.ebuild
b/mail-filter/rspamd/rspamd-2.7-r103.ebuild
index e6150736669..8a361f82f03 100644
--- a/mail-filter/rspamd/rspamd-2.7-r103.ebuild
+++ b/mail-filter/rspamd/rspamd-2.7-r103.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_COMPAT=( lua5-{1..2} luajit )
inherit cmake lua-single pax-utils systemd tmpfiles
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 81b9814009e0fa412a018d8687a9784dc6f39671
Author: Petr Vaněk atlas cz>
AuthorDate: Sat Aug 28 10:48:15 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Aug 28 18:20:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81b98140
mail-filter/rspamd: correct LuaBitOp dependency rule
Rspamd requires LuaBitOp dependency for all lua targets.
Closes: https://bugs.gentoo.org/810335
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/{rspamd-3.0-r1.ebuild => rspamd-3.0-r2.ebuild} | 2 +-
mail-filter/rspamd/rspamd-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-3.0-r1.ebuild
b/mail-filter/rspamd/rspamd-3.0-r2.ebuild
similarity index 99%
rename from mail-filter/rspamd/rspamd-3.0-r1.ebuild
rename to mail-filter/rspamd/rspamd-3.0-r2.ebuild
index 837a118c05f..efe18dc57b0 100644
--- a/mail-filter/rspamd/rspamd-3.0-r1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.0-r2.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="${LUA_REQUIRED_USE}
RDEPEND="${LUA_DEPS}
$(lua_gen_cond_dep '
dev-lua/LuaBitOp[${LUA_USEDEP}]
- ' lua5-{1,2})
+ ')
acct-group/rspamd
acct-user/rspamd
app-arch/zstd:=
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index 5ea66f60100..7bcf4740c47 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="${LUA_REQUIRED_USE}
RDEPEND="${LUA_DEPS}
$(lua_gen_cond_dep '
dev-lua/LuaBitOp[${LUA_USEDEP}]
- ' lua5-{1,2})
+ ')
acct-group/rspamd
acct-user/rspamd
app-arch/zstd:=
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: ec5fa6b5611d76f428f4807705b3bebe3f6db3bd
Author: Sam James gentoo org>
AuthorDate: Fri Aug 27 20:36:34 2021 +
Commit: Sam James gentoo org>
CommitDate: Fri Aug 27 20:45:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec5fa6b5
mail-filter/rspamd: subscribe to snowball-stemmer subslot
We need to be rebuilt when snowball-stemmer changes ABI.
Bug: https://bugs.gentoo.org/719402
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/{rspamd-2.7-r102.ebuild => rspamd-2.7-r103.ebuild} | 2 +-
mail-filter/rspamd/{rspamd-3.0.ebuild => rspamd-3.0-r1.ebuild}| 2 +-
mail-filter/rspamd/rspamd-.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-2.7-r102.ebuild
b/mail-filter/rspamd/rspamd-2.7-r103.ebuild
similarity index 98%
rename from mail-filter/rspamd/rspamd-2.7-r102.ebuild
rename to mail-filter/rspamd/rspamd-2.7-r103.ebuild
index 3bb3d9202b2..e6150736669 100644
--- a/mail-filter/rspamd/rspamd-2.7-r102.ebuild
+++ b/mail-filter/rspamd/rspamd-2.7-r103.ebuild
@@ -36,7 +36,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/icu:=
dev-libs/libev
dev-libs/libsodium:=
- dev-libs/snowball-stemmer
+ dev-libs/snowball-stemmer:=
sys-apps/file
blas? (
virtual/blas
diff --git a/mail-filter/rspamd/rspamd-3.0.ebuild
b/mail-filter/rspamd/rspamd-3.0-r1.ebuild
similarity index 98%
rename from mail-filter/rspamd/rspamd-3.0.ebuild
rename to mail-filter/rspamd/rspamd-3.0-r1.ebuild
index 1a472d6db57..837a118c05f 100644
--- a/mail-filter/rspamd/rspamd-3.0.ebuild
+++ b/mail-filter/rspamd/rspamd-3.0-r1.ebuild
@@ -40,7 +40,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/libev
dev-libs/libfmt:=
dev-libs/libsodium:=
- dev-libs/snowball-stemmer
+ dev-libs/snowball-stemmer:=
sys-apps/file
blas? (
virtual/blas
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index ebf109b74cd..5ea66f60100 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -40,7 +40,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/libev
dev-libs/libfmt:=
dev-libs/libsodium:=
- dev-libs/snowball-stemmer
+ dev-libs/snowball-stemmer:=
sys-apps/file
blas? (
virtual/blas
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/
commit: 74663b22b297f2f0e61d5bfb6da20258969a5f83
Author: Petr Vaněk atlas cz>
AuthorDate: Sat Aug 21 21:41:17 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Aug 22 02:49:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74663b22
mail-filter/rspamd: drop 2.6-r102
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/22070
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/Manifest| 1 -
.../files/rspamd-2.6-cmake-lua-version.patch | 44 ---
.../rspamd/files/rspamd-2.6-unbundle-zstd.patch| 128 -
mail-filter/rspamd/rspamd-2.6-r102.ebuild | 115 --
4 files changed, 288 deletions(-)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 48c11b72f36..fa7fefdafd2 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,3 +1,2 @@
-DIST rspamd-2.6.tar.gz 5079444 BLAKE2B
acb9d9471d0bb457da33b4d23e3c75ef87ea26a47e6c731bfd5fbbfe28567244e2bc72fd25ca3408db0928dab4e4ab66596e38cf3eff7cb9690eec59d3b62372
SHA512
79e4c1aa763aef753c8d7b2a941ed92b384e96c25e6d1b3bd1321c5acc0ecb934d033a3bf19cb94c89809fd92edec25192cffe97de9e5251681e1a71216b734a
DIST rspamd-2.7.tar.gz 5126227 BLAKE2B
70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930
SHA512
8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7
DIST rspamd-3.0.tar.gz 5535659 BLAKE2B
605ac59b947b49efb026e04d153df5fc0d56c65712def3f2c54a949db32b8534e634d172a1899cc08e98e0a9da839fc00f0f569dc8c52a743f38bd71b8abaeaa
SHA512
1ea6f9ffe58b7f280dbd31e39db6412ebeddda634ca8a669fa5bff2951d17123a5d4a09ec0f366c6b0c0b585f868e646fd49e4d45bd451408675b927ec2557c4
diff --git a/mail-filter/rspamd/files/rspamd-2.6-cmake-lua-version.patch
b/mail-filter/rspamd/files/rspamd-2.6-cmake-lua-version.patch
deleted file mode 100644
index 141b13dfa8a..000
--- a/mail-filter/rspamd/files/rspamd-2.6-cmake-lua-version.patch
+++ /dev/null
@@ -1,44 +0,0 @@
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -139,40 +139,8 @@
- ELSE(ENABLE_LUAJIT MATCHES "ON")
-
- ProcessPackage(LIBLUA LIBRARY "lua"
-- "lua-5.3"
-- INCLUDE lua.h INCLUDE_SUFFIXES
-- "include/lua-5.3"
-- "include/lua5.3"
-- "include/lua53"
-- "include/lua"
- ROOT ${LUA_ROOT}
-- MODULES lua53
-- OPTIONAL)
--
-- IF (NOT WITH_LIBLUA)
-- ProcessPackage(LIBLUA LIBRARY "lua"
-- "lua-5.2"
-- INCLUDE lua.h INCLUDE_SUFFIXES
-- "include/lua-5.2"
-- "include/lua5.2"
-- "include/lua52"
-- "include/lua"
-- ROOT ${LUA_ROOT}
-- MODULES lua52
-- OPTIONAL)
--
-- IF (NOT WITH_LIBLUA)
-- ProcessPackage(LIBLUA LIBRARY "lua"
-- "lua-5.1"
-- INCLUDE lua.h INCLUDE_SUFFIXES
-- "include/lua-5.1"
-- "include/lua5.1"
-- "include/lua51"
-- "include/lua"
-- ROOT ${LUA_ROOT}
-- MODULES lua51)
-- ENDIF()
-- ENDIF()
-+ MODULES lua)
- ENDIF(ENABLE_LUAJIT MATCHES "ON")
-
- IF(ENABLE_JEMALLOC MATCHES "ON" AND NOT SANITIZE)
diff --git a/mail-filter/rspamd/files/rspamd-2.6-unbundle-zstd.patch
b/mail-filter/rspamd/files/rspamd-2.6-unbundle-zstd.patch
deleted file mode 100644
index 1a7f4453c86..000
--- a/mail-filter/rspamd/files/rspamd-2.6-unbundle-zstd.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 90caf4048..e2e5d182c 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -198,6 +198,8 @@ ELSE()
- ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3)
- ENDIF()
-
-+ProcessPackage(ZSTD LIBRARY zstd INCLUDE zstd.h
-+ ROOT ${ZSTD_ROOT_DIR} MODULES libzstd)
- ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES
include/sqlite3 include/sqlite
- ROOT ${SQLITE3_ROOT_DIR} MODULES sqlite3 sqlite)
- ProcessPackage(ICUDATA LIBRARY icudata INCLUDE unicode/ucnv.h
-@@ -615,7 +617,6 @@ ADD_SUBDIRECTORY(contrib/http-parser)
- ADD_SUBDIRECTORY(contrib/fpconv)
- ADD_SUBDIRECTORY(contrib/lc-btrie)
- ADD_SUBDIRECTORY(contrib/libottery)
--ADD_SUBDIRECTORY(contrib/zstd)
-
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/
commit: 9545e21cc8b4178834e21537b9ff74f9c1032412
Author: Petr Vaněk atlas cz>
AuthorDate: Sat Aug 21 20:50:40 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Aug 22 02:49:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9545e21c
mail-filter/rspamd: add 3.0
- Use new -DSYSTEM_ZSTD=ON instead of unbundle patch
- Apply patch for -DSYSTEM_FMT=ON, it is already merged in upstream
- Make the src_test work
Closes: https://bugs.gentoo.org/809308
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/Manifest| 1 +
.../files/rspamd-3.0-cmake-lua-version.patch | 64 +++
.../rspamd/files/rspamd-3.0-system-libfmt.patch| 48
mail-filter/rspamd/rspamd-3.0.ebuild | 123 +
4 files changed, 236 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index df4f86e665d..48c11b72f36 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,2 +1,3 @@
DIST rspamd-2.6.tar.gz 5079444 BLAKE2B
acb9d9471d0bb457da33b4d23e3c75ef87ea26a47e6c731bfd5fbbfe28567244e2bc72fd25ca3408db0928dab4e4ab66596e38cf3eff7cb9690eec59d3b62372
SHA512
79e4c1aa763aef753c8d7b2a941ed92b384e96c25e6d1b3bd1321c5acc0ecb934d033a3bf19cb94c89809fd92edec25192cffe97de9e5251681e1a71216b734a
DIST rspamd-2.7.tar.gz 5126227 BLAKE2B
70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930
SHA512
8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7
+DIST rspamd-3.0.tar.gz 5535659 BLAKE2B
605ac59b947b49efb026e04d153df5fc0d56c65712def3f2c54a949db32b8534e634d172a1899cc08e98e0a9da839fc00f0f569dc8c52a743f38bd71b8abaeaa
SHA512
1ea6f9ffe58b7f280dbd31e39db6412ebeddda634ca8a669fa5bff2951d17123a5d4a09ec0f366c6b0c0b585f868e646fd49e4d45bd451408675b927ec2557c4
diff --git a/mail-filter/rspamd/files/rspamd-3.0-cmake-lua-version.patch
b/mail-filter/rspamd/files/rspamd-3.0-cmake-lua-version.patch
new file mode 100644
index 000..55665b887c3
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.0-cmake-lua-version.patch
@@ -0,0 +1,64 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b53793008..5d092d654 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -147,55 +147,8 @@ IF(ENABLE_LUAJIT MATCHES "ON")
+ ELSE(ENABLE_LUAJIT MATCHES "ON")
+
+ ProcessPackage(LIBLUA LIBRARY "lua"
+- "lua-5.3"
+- LIB_SUFFIXES"lua5.3"
+- INCLUDE lua.h INCLUDE_SUFFIXES
+- "include/lua-5.3"
+- "include/lua5.3"
+- "include/lua53"
+- "include/lua"
+ ROOT ${LUA_ROOT}
+- MODULES lua53
+- OPTIONAL)
+-
+- IF (NOT WITH_LIBLUA)
+- ProcessPackage(LIBLUA LIBRARY "lua"
+- "lua-5.4"
+- LIB_SUFFIXES"lua5.4"
+- INCLUDE lua.h INCLUDE_SUFFIXES
+- "include/lua-5.4"
+- "include/lua5.4"
+- "include/lua54"
+- "include/lua"
+- ROOT ${LUA_ROOT}
+- MODULES lua54
+- OPTIONAL)
+- IF (NOT WITH_LIBLUA)
+- ProcessPackage(LIBLUA LIBRARY "lua"
+- "lua-5.2"
+- LIB_SUFFIXES"lua5.2"
+- INCLUDE lua.h INCLUDE_SUFFIXES
+- "include/lua-5.2"
+- "include/lua5.2"
+- "include/lua52"
+- "include/lua"
+- ROOT ${LUA_ROOT}
+- MODULES lua52
+- OPTIONAL)
+-
+- IF (NOT WITH_LIBLUA)
+- ProcessPackage(LIBLUA LIBRARY "lua"
+- "lua-5.1"
+- INCLUDE lua.h INCLUDE_SUFFIXES
+- "include/lua-5.1"
+- "include/lua5.1"
+- "include/lua51"
+- "include/lua"
+- ROOT ${LUA_ROOT}
+- MODULES lua51)
+- ENDIF()
+- ENDIF()
+- ENDIF()
++ MODULES lua)
+ ENDIF(ENABLE_LUAJIT MATCHES
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: fd0e7ad32ff1064db8cd4ba4149cf33e2ffdeb5a
Author: Petr Vaněk atlas cz>
AuthorDate: Sat Aug 21 20:53:20 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Aug 22 02:49:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd0e7ad3
mail-filter/rspamd: sync live
Closes: https://bugs.gentoo.org/784335
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-.ebuild | 21 ++---
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index a78a8bfb768..ebf109b74cd 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
inherit cmake lua-single pax-utils systemd tmpfiles
@@ -19,10 +19,13 @@ 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 pcre2"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 test"
+RESTRICT="!test? ( test )"
+# A part of tests use ffi luajit extension
REQUIRED_USE="${LUA_REQUIRED_USE}
- jit? ( lua_single_target_luajit )"
+ jit? ( lua_single_target_luajit )
+ test? ( lua_single_target_luajit )"
RDEPEND="${LUA_DEPS}
$(lua_gen_cond_dep '
@@ -35,6 +38,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/glib:2
dev-libs/icu:=
dev-libs/libev
+ dev-libs/libfmt:=
dev-libs/libsodium:=
dev-libs/snowball-stemmer
sys-apps/file
@@ -54,16 +58,15 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/rspamd-2.7-cmake-lua-version.patch"
+ "${FILESDIR}/rspamd-3.0-cmake-lua-version.patch"
"${FILESDIR}/rspamd-2.6-unbundle-lua.patch"
- "${FILESDIR}/rspamd-2.7-unbundle-zstd.patch"
"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
)
src_prepare() {
cmake_src_prepare
- rm -vrf contrib/{lua-bit,snowball,zstd} || die
+ rm -vrf contrib/{fmt,lua-bit,snowball,zstd} || die
sed -i -e 's/User=_rspamd/User=rspamd/g' \
rspamd.service \
@@ -76,6 +79,10 @@ src_configure() {
-DRUNDIR=/var/run/rspamd
-DDBDIR=/var/lib/rspamd
-DLOGDIR=/var/log/rspamd
+
+ -DSYSTEM_FMT=ON
+ -DSYSTEM_ZSTD=ON
+
-DENABLE_BLAS=$(usex blas ON OFF)
-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
@@ -86,7 +93,7 @@ src_configure() {
}
src_test() {
- cmake_src_test
+ cmake_build run-test
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: e70e5bc09e53f571b7b20a586f8a26f160c3f44a
Author: Sam James gentoo org>
AuthorDate: Wed Aug 18 13:22:33 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Aug 18 14:27:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e70e5bc0
mail-filter/rspamd: drop removed libnsl dependency
See:
https://github.com/rspamd/rspamd/commit/55d667d387bdbc89347aee4187efcdf6c86863b8
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/{rspamd-2.6-r101.ebuild => rspamd-2.6-r102.ebuild} | 1 -
mail-filter/rspamd/{rspamd-2.7-r101.ebuild => rspamd-2.7-r102.ebuild} | 1 -
mail-filter/rspamd/rspamd-.ebuild | 1 -
3 files changed, 3 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-2.6-r101.ebuild
b/mail-filter/rspamd/rspamd-2.6-r102.ebuild
similarity index 99%
rename from mail-filter/rspamd/rspamd-2.6-r101.ebuild
rename to mail-filter/rspamd/rspamd-2.6-r102.ebuild
index f8403e2a44d..78ee3682bad 100644
--- a/mail-filter/rspamd/rspamd-2.6-r101.ebuild
+++ b/mail-filter/rspamd/rspamd-2.6-r102.ebuild
@@ -37,7 +37,6 @@ RDEPEND="${LUA_DEPS}
dev-libs/libev
dev-libs/libsodium
dev-libs/snowball-stemmer
- net-libs/libnsl
sys-apps/file
blas? (
virtual/blas
diff --git a/mail-filter/rspamd/rspamd-2.7-r101.ebuild
b/mail-filter/rspamd/rspamd-2.7-r102.ebuild
similarity index 99%
rename from mail-filter/rspamd/rspamd-2.7-r101.ebuild
rename to mail-filter/rspamd/rspamd-2.7-r102.ebuild
index ad93afe587a..05127cc2e2d 100644
--- a/mail-filter/rspamd/rspamd-2.7-r101.ebuild
+++ b/mail-filter/rspamd/rspamd-2.7-r102.ebuild
@@ -37,7 +37,6 @@ RDEPEND="${LUA_DEPS}
dev-libs/libev
dev-libs/libsodium
dev-libs/snowball-stemmer
- net-libs/libnsl
sys-apps/file
blas? (
virtual/blas
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index f5aecd99630..5a2ffccacfa 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -37,7 +37,6 @@ RDEPEND="${LUA_DEPS}
dev-libs/libev
dev-libs/libsodium
dev-libs/snowball-stemmer
- net-libs/libnsl
sys-apps/file
blas? (
virtual/blas
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: ca428f4457c09bc1ef79a1d8d275fbe846470eb0
Author: Sam James gentoo org>
AuthorDate: Wed Aug 18 13:25:11 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Aug 18 14:27:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca428f44
mail-filter/rspamd: add missing subslot dependencies
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-2.6-r102.ebuild | 8
mail-filter/rspamd/rspamd-2.7-r102.ebuild | 8
mail-filter/rspamd/rspamd-.ebuild | 8
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-2.6-r102.ebuild
b/mail-filter/rspamd/rspamd-2.6-r102.ebuild
index 78ee3682bad..fc005db11e8 100644
--- a/mail-filter/rspamd/rspamd-2.6-r102.ebuild
+++ b/mail-filter/rspamd/rspamd-2.6-r102.ebuild
@@ -30,12 +30,12 @@ RDEPEND="${LUA_DEPS}
' lua5-{1,2})
acct-group/rspamd
acct-user/rspamd
- app-arch/zstd
+ app-arch/zstd:=
dev-db/sqlite:3
dev-libs/glib:2
dev-libs/icu:=
dev-libs/libev
- dev-libs/libsodium
+ dev-libs/libsodium:=
dev-libs/snowball-stemmer
sys-apps/file
blas? (
@@ -43,9 +43,9 @@ RDEPEND="${LUA_DEPS}
virtual/lapack
)
cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
- jemalloc? ( dev-libs/jemalloc )
+ jemalloc? ( dev-libs/jemalloc:= )
dev-libs/openssl:0=[-bindist(-)]
- pcre2? ( dev-libs/libpcre2[jit=] )
+ pcre2? ( dev-libs/libpcre2:=[jit=] )
!pcre2? ( dev-libs/libpcre[jit=] )"
DEPEND="${RDEPEND}"
BDEPEND="
diff --git a/mail-filter/rspamd/rspamd-2.7-r102.ebuild
b/mail-filter/rspamd/rspamd-2.7-r102.ebuild
index 05127cc2e2d..3bb3d9202b2 100644
--- a/mail-filter/rspamd/rspamd-2.7-r102.ebuild
+++ b/mail-filter/rspamd/rspamd-2.7-r102.ebuild
@@ -30,12 +30,12 @@ RDEPEND="${LUA_DEPS}
' lua5-{1,2})
acct-group/rspamd
acct-user/rspamd
- app-arch/zstd
+ app-arch/zstd:=
dev-db/sqlite:3
dev-libs/glib:2
dev-libs/icu:=
dev-libs/libev
- dev-libs/libsodium
+ dev-libs/libsodium:=
dev-libs/snowball-stemmer
sys-apps/file
blas? (
@@ -43,9 +43,9 @@ RDEPEND="${LUA_DEPS}
virtual/lapack
)
cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
- jemalloc? ( dev-libs/jemalloc )
+ jemalloc? ( dev-libs/jemalloc:= )
dev-libs/openssl:0=[-bindist(-)]
- pcre2? ( dev-libs/libpcre2[jit=] )
+ pcre2? ( dev-libs/libpcre2:=[jit=] )
!pcre2? ( dev-libs/libpcre[jit=] )"
DEPEND="${RDEPEND}"
BDEPEND="
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index 5a2ffccacfa..a78a8bfb768 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -30,12 +30,12 @@ RDEPEND="${LUA_DEPS}
' lua5-{1,2})
acct-group/rspamd
acct-user/rspamd
- app-arch/zstd
+ app-arch/zstd:=
dev-db/sqlite:3
dev-libs/glib:2
dev-libs/icu:=
dev-libs/libev
- dev-libs/libsodium
+ dev-libs/libsodium:=
dev-libs/snowball-stemmer
sys-apps/file
blas? (
@@ -43,9 +43,9 @@ RDEPEND="${LUA_DEPS}
virtual/lapack
)
cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
- jemalloc? ( dev-libs/jemalloc )
+ jemalloc? ( dev-libs/jemalloc:= )
dev-libs/openssl:0=[-bindist(-)]
- pcre2? ( dev-libs/libpcre2[jit=] )
+ pcre2? ( dev-libs/libpcre2:=[jit=] )
!pcre2? ( dev-libs/libpcre[jit=] )"
DEPEND="${RDEPEND}"
BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: faf5d937c6dbaf2dfda32a2159d939894a62b8f7
Author: Mikle Kolyada gentoo org>
AuthorDate: Sun May 2 18:22:25 2021 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sun May 2 18:26:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faf5d937
mail-filter/rspamd: remove libressl support
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada gentoo.org>
mail-filter/rspamd/rspamd-2.6-r100.ebuild | 5 ++---
mail-filter/rspamd/rspamd-2.7-r100.ebuild | 5 ++---
mail-filter/rspamd/rspamd-.ebuild | 5 ++---
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-2.6-r100.ebuild
b/mail-filter/rspamd/rspamd-2.6-r100.ebuild
index d6a966d66b7..707adc9a3f4 100644
--- a/mail-filter/rspamd/rspamd-2.6-r100.ebuild
+++ b/mail-filter/rspamd/rspamd-2.6-r100.ebuild
@@ -19,7 +19,7 @@ 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"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2"
REQUIRED_USE="${LUA_REQUIRED_USE}
jit? ( lua_single_target_luajit )"
@@ -45,8 +45,7 @@ RDEPEND="${LUA_DEPS}
)
cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
jemalloc? ( dev-libs/jemalloc )
- !libressl? ( dev-libs/openssl:0=[-bindist] )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=[-bindist]
pcre2? ( dev-libs/libpcre2[jit=] )
!pcre2? ( dev-libs/libpcre[jit=] )"
DEPEND="${RDEPEND}"
diff --git a/mail-filter/rspamd/rspamd-2.7-r100.ebuild
b/mail-filter/rspamd/rspamd-2.7-r100.ebuild
index f6efcf40a61..80a28df9ec2 100644
--- a/mail-filter/rspamd/rspamd-2.7-r100.ebuild
+++ b/mail-filter/rspamd/rspamd-2.7-r100.ebuild
@@ -19,7 +19,7 @@ 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"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2"
REQUIRED_USE="${LUA_REQUIRED_USE}
jit? ( lua_single_target_luajit )"
@@ -45,8 +45,7 @@ RDEPEND="${LUA_DEPS}
)
cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
jemalloc? ( dev-libs/jemalloc )
- !libressl? ( dev-libs/openssl:0=[-bindist] )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=[-bindist]
pcre2? ( dev-libs/libpcre2[jit=] )
!pcre2? ( dev-libs/libpcre[jit=] )"
DEPEND="${RDEPEND}"
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index 0ba25019331..5ff19a2efa7 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -19,7 +19,7 @@ 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"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2"
REQUIRED_USE="${LUA_REQUIRED_USE}
jit? ( lua_single_target_luajit )"
@@ -45,8 +45,7 @@ RDEPEND="${LUA_DEPS}
)
cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
jemalloc? ( dev-libs/jemalloc )
- !libressl? ( dev-libs/openssl:0=[-bindist] )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=[-bindist]
pcre2? ( dev-libs/libpcre2[jit=] )
!pcre2? ( dev-libs/libpcre[jit=] )"
DEPEND="${RDEPEND}"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: b5cf8ec65ff05ce7f408dc677a7aa59523cadc85
Author: Sam James gentoo org>
AuthorDate: Thu Feb 25 11:33:31 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Feb 25 11:33:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5cf8ec6
mail-filter/rspamd: Stabilize 2.7-r100 amd64, #770037
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-2.7-r100.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-2.7-r100.ebuild
b/mail-filter/rspamd/rspamd-2.7-r100.ebuild
index 49699e232f9..f6efcf40a61 100644
--- a/mail-filter/rspamd/rspamd-2.7-r100.ebuild
+++ b/mail-filter/rspamd/rspamd-2.7-r100.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 x86"
+ KEYWORDS="amd64 x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: be431ee6f5ddf67afdabdad2f4678b7e8e2dd14f
Author: Thomas Deutschmann gentoo org>
AuthorDate: Fri Feb 19 19:31:49 2021 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri Feb 19 19:32:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be431ee6
mail-filter/rspamd: x86 stable (bug #770037)
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann gentoo.org>
mail-filter/rspamd/rspamd-2.7-r100.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-2.7-r100.ebuild
b/mail-filter/rspamd/rspamd-2.7-r100.ebuild
index 0ba25019331..49699e232f9 100644
--- a/mail-filter/rspamd/rspamd-2.7-r100.ebuild
+++ b/mail-filter/rspamd/rspamd-2.7-r100.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: ce929849e274dd10572ff4b82565bdd4fd79d7b2
Author: Conrad Kostecki gentoo org>
AuthorDate: Wed Jan 27 18:42:18 2021 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Wed Jan 27 18:42:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce929849
mail-filter/rspamd: drop old version
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
mail-filter/rspamd/rspamd-2.6-r2.ebuild | 115
mail-filter/rspamd/rspamd-2.7.ebuild| 115
2 files changed, 230 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-2.6-r2.ebuild
b/mail-filter/rspamd/rspamd-2.6-r2.ebuild
deleted file mode 100644
index d4589355928..000
--- a/mail-filter/rspamd/rspamd-2.6-r2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake pax-utils systemd tmpfiles
-
-if [[ ${PV} == * ]] ; 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
- app-arch/zstd
- dev-db/sqlite:3
- dev-libs/glib:2
- dev-libs/icu:=
- dev-libs/libev
- dev-libs/libsodium
- dev-libs/snowball-stemmer
- net-libs/libnsl
- sys-apps/file
- blas? (
- virtual/blas
- virtual/lapack
- )
- cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
- jemalloc? ( dev-libs/jemalloc )
- jit? (
- dev-lang/luajit:2
- )
- !jit? (
- dev-lang/lua:0=
- dev-lua/LuaBitOp
- )
- !libressl? ( dev-libs/openssl:0=[-bindist] )
- libressl? ( dev-libs/libressl:0= )
- pcre2? ( dev-libs/libpcre2[jit=] )
- !pcre2? ( dev-libs/libpcre[jit=] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/ragel
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/rspamd-2.6-unbundle-lua.patch"
- "${FILESDIR}/rspamd-2.6-unbundle-zstd.patch"
- "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
-
- rm -vrf contrib/{lua-bit,snowball,zstd} || die
-
- 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.7.ebuild
b/mail-filter/rspamd/rspamd-2.7.ebuild
deleted file mode 100644
index 86ced7662db..000
--- a/mail-filter/rspamd/rspamd-2.7.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake pax-utils systemd tmpfiles
-
-if [[ ${PV} == * ]] ; 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
-
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/
commit: 84ba790757559589325dbaccde894d92c558a72a
Author: Petr Vaněk atlas cz>
AuthorDate: Sat Jan 9 10:49:17 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Jan 9 12:33:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84ba7907
mail-filter/rspamd: sync live
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
.../rspamd/files/rspamd--unbundle-zstd.patch | 125 -
mail-filter/rspamd/rspamd-.ebuild | 6 +-
2 files changed, 3 insertions(+), 128 deletions(-)
diff --git a/mail-filter/rspamd/files/rspamd--unbundle-zstd.patch
b/mail-filter/rspamd/files/rspamd--unbundle-zstd.patch
deleted file mode 100644
index c42bb8f5d6f..000
--- a/mail-filter/rspamd/files/rspamd--unbundle-zstd.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3b4bd8469..75582513e 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -199,6 +199,8 @@ ELSE()
- ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3)
- ENDIF()
-
-+ProcessPackage(ZSTD LIBRARY zstd INCLUDE zstd.h
-+ ROOT ${ZSTD_ROOT_DIR} MODULES libzstd)
- ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES
include/sqlite3 include/sqlite
- ROOT ${SQLITE3_ROOT_DIR} MODULES sqlite3 sqlite)
- ProcessPackage(ICUDATA LIBRARY icudata INCLUDE unicode/ucnv.h
-@@ -616,7 +618,6 @@ ADD_SUBDIRECTORY(contrib/http-parser)
- ADD_SUBDIRECTORY(contrib/fpconv)
- ADD_SUBDIRECTORY(contrib/lc-btrie)
- ADD_SUBDIRECTORY(contrib/libottery)
--ADD_SUBDIRECTORY(contrib/zstd)
- IF(ENABLE_SNOWBALL MATCHES "ON")
- ADD_SUBDIRECTORY(contrib/snowball)
- SET(WITH_SNOWBALL 1)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 59bab5c15..098329991 100644
a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -182,7 +182,6 @@ TARGET_LINK_LIBRARIES(rspamd-server rspamd-fpconv)
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb)
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-lpeg)
- TARGET_LINK_LIBRARIES(rspamd-server lcbtrie)
--TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd)
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8)
-
- IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
-diff --git a/src/client/rspamdclient.c b/src/client/rspamdclient.c
-index bcb25672e..48ca58e94 100644
a/src/client/rspamdclient.c
-+++ b/src/client/rspamdclient.c
-@@ -19,7 +19,7 @@
- #include "libserver/http/http_private.h"
- #include "libserver/protocol_internal.h"
- #include "unix-std.h"
--#include "contrib/zstd/zstd.h"
-+#include
-
- #ifdef HAVE_FETCH_H
- #include
-diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
-index e2f886aa6..5b214c09c 100644
a/src/libserver/cfg_utils.c
-+++ b/src/libserver/cfg_utils.c
-@@ -36,8 +36,7 @@
- #include "contrib/libottery/ottery.h"
- #include "contrib/fastutf8/fastutf8.h"
-
--#define ZSTD_STATIC_LINKING_ONLY
--#include "contrib/zstd/zstd.h"
-+#include
-
- #ifdef HAVE_OPENSSL
- #include
-diff --git a/src/libserver/maps/map.c b/src/libserver/maps/map.c
-index 14792753a..20ca8416e 100644
a/src/libserver/maps/map.c
-+++ b/src/libserver/maps/map.c
-@@ -23,7 +23,7 @@
- #include "libserver/http/http_connection.h"
- #include "libserver/http/http_private.h"
- #include "rspamd.h"
--#include "contrib/zstd/zstd.h"
-+#include
- #include "contrib/libev/ev.h"
- #include "contrib/uthash/utlist.h"
-
-diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
-index 31b0308cb..62ba3d833 100644
a/src/libserver/protocol.c
-+++ b/src/libserver/protocol.c
-@@ -21,7 +21,7 @@
- #include "worker_private.h"
- #include "libserver/cfg_file_private.h"
- #include "libmime/scan_result_private.h"
--#include "contrib/zstd/zstd.h"
-+#include
- #include "lua/lua_common.h"
- #include "unix-std.h"
- #include "protocol_internal.h"
-diff --git a/src/libserver/task.c b/src/libserver/task.c
-index e7a83a603..c613fffcc 100644
a/src/libserver/task.c
-+++ b/src/libserver/task.c
-@@ -25,7 +25,7 @@
- #include "stat_api.h"
- #include "unix-std.h"
- #include "utlist.h"
--#include "contrib/zstd/zstd.h"
-+#include
- #include "libserver/mempool_vars_internal.h"
- #include "libserver/cfg_file_private.h"
- #include "libmime/lang_detection.h"
-diff --git a/src/lua/lua_util.c b/src/lua/lua_util.c
-index e879d37af..88451e222 100644
a/src/lua/lua_util.c
-+++ b/src/lua/lua_util.c
-@@ -15,7 +15,7 @@
- */
- #include "lua_common.h"
- #include "unix-std.h"
--#include "contrib/zstd/zstd.h"
-+#include
- #include "libmime/email_addr.h"
- #include "libmime/content_type.h"
- #include "libmime/mime_headers.h"
-diff --git a/src/rspamd_proxy.c b/src/rspamd_proxy.c
-index 3fa5da390..c641fb263 100644
a/src/rspamd_proxy.c
-+++ b/src/rspamd_proxy.c
-@@ -36,7 +36,7 @@
- #include "libserver/milter.h"
- #include "libserver/milter_internal.h"
- #include "libmime/lang_detection.h"
--#include "contrib/zstd/zstd.h"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/
commit: 4cc1b0ce6be1561a2f4e331c06fc4dbb7dd6671e
Author: Petr Vaněk atlas cz>
AuthorDate: Sat Jan 9 10:36:58 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Jan 9 12:33:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cc1b0ce
mail-filter/rspamd: bump to 2.7
Closes: https://bugs.gentoo.org/764572
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/Manifest| 1 +
.../files/rspamd-2.7-cmake-lua-version.patch | 49
.../rspamd/files/rspamd-2.7-unbundle-zstd.patch| 125 +
mail-filter/rspamd/rspamd-2.7-r100.ebuild | 117 +++
mail-filter/rspamd/rspamd-2.7.ebuild | 115 +++
5 files changed, 407 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 7b2fbeee713..166cfe25a14 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,2 +1,3 @@
DIST rspamd-2.5.tar.gz 4490310 BLAKE2B
8d117b1b03e8092d0c724a4da4de23dd145f5b22696aa6b4ef1c208ade28f0d143dd783c9173b6987514b2aef9327ff8fd29eeae5e3da3039d2568384e50a697
SHA512
6068309da98eeb75f95188414b12ce9443aef31200853f820646e70e1dbf2d9d1e2c661a86df2183c175cc01cfb09f6a5c7b8ba358901a56ec6cdb9d9fef4540
DIST rspamd-2.6.tar.gz 5079444 BLAKE2B
acb9d9471d0bb457da33b4d23e3c75ef87ea26a47e6c731bfd5fbbfe28567244e2bc72fd25ca3408db0928dab4e4ab66596e38cf3eff7cb9690eec59d3b62372
SHA512
79e4c1aa763aef753c8d7b2a941ed92b384e96c25e6d1b3bd1321c5acc0ecb934d033a3bf19cb94c89809fd92edec25192cffe97de9e5251681e1a71216b734a
+DIST rspamd-2.7.tar.gz 5126227 BLAKE2B
70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930
SHA512
8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7
diff --git a/mail-filter/rspamd/files/rspamd-2.7-cmake-lua-version.patch
b/mail-filter/rspamd/files/rspamd-2.7-cmake-lua-version.patch
new file mode 100644
index 000..c8254f1ce95
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-2.7-cmake-lua-version.patch
@@ -0,0 +1,49 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 72382acb6..2335ae4bc 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -141,42 +141,8 @@ IF(ENABLE_LUAJIT MATCHES "ON")
+ ELSE(ENABLE_LUAJIT MATCHES "ON")
+
+ ProcessPackage(LIBLUA LIBRARY "lua"
+- "lua-5.3"
+- LIB_SUFFIXES"lua5.3"
+- INCLUDE lua.h INCLUDE_SUFFIXES
+- "include/lua-5.3"
+- "include/lua5.3"
+- "include/lua53"
+- "include/lua"
+ ROOT ${LUA_ROOT}
+- MODULES lua53
+- OPTIONAL)
+-
+- IF (NOT WITH_LIBLUA)
+- ProcessPackage(LIBLUA LIBRARY "lua"
+- "lua-5.2"
+- LIB_SUFFIXES"lua5.2"
+- INCLUDE lua.h INCLUDE_SUFFIXES
+- "include/lua-5.2"
+- "include/lua5.2"
+- "include/lua52"
+- "include/lua"
+- ROOT ${LUA_ROOT}
+- MODULES lua52
+- OPTIONAL)
+-
+- IF (NOT WITH_LIBLUA)
+- ProcessPackage(LIBLUA LIBRARY "lua"
+- "lua-5.1"
+- INCLUDE lua.h INCLUDE_SUFFIXES
+- "include/lua-5.1"
+- "include/lua5.1"
+- "include/lua51"
+- "include/lua"
+- ROOT ${LUA_ROOT}
+- MODULES lua51)
+- ENDIF()
+- ENDIF()
++ MODULES lua)
+ ENDIF(ENABLE_LUAJIT MATCHES "ON")
+
+ IF(ENABLE_JEMALLOC MATCHES "ON" AND NOT SANITIZE)
+--
diff --git a/mail-filter/rspamd/files/rspamd-2.7-unbundle-zstd.patch
b/mail-filter/rspamd/files/rspamd-2.7-unbundle-zstd.patch
new file mode 100644
index 000..f0fc9f8352b
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-2.7-unbundle-zstd.patch
@@ -0,0 +1,125 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 77ad86785..56246807e 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -202,6 +202,8 @@ ELSE()
+ ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3)
+ ENDIF()
+
++ProcessPackage(ZSTD LIBRARY zstd INCLUDE zstd.h
++ ROOT ${ZSTD_ROOT_DIR} MODULES libzstd)
+ ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES
include/sqlite3 include/sqlite
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/
commit: e300b4dadd2faf5ce2cdb268b368ad403204c847
Author: Petr Vaněk atlas cz>
AuthorDate: Sat Jan 9 10:54:54 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Jan 9 12:33:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e300b4da
mail-filter/rspamd: clean old
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/19001
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/Manifest| 1 -
.../rspamd/files/rspamd-2.5-replxx-gcc10.patch | 12 --
.../rspamd/files/rspamd-2.5-unbundle-lua.patch | 53 -
.../rspamd/files/rspamd-2.5-unbundle-zstd.patch| 132 -
mail-filter/rspamd/rspamd-2.5-r1.ebuild| 113 --
5 files changed, 311 deletions(-)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 166cfe25a14..df4f86e665d 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,3 +1,2 @@
-DIST rspamd-2.5.tar.gz 4490310 BLAKE2B
8d117b1b03e8092d0c724a4da4de23dd145f5b22696aa6b4ef1c208ade28f0d143dd783c9173b6987514b2aef9327ff8fd29eeae5e3da3039d2568384e50a697
SHA512
6068309da98eeb75f95188414b12ce9443aef31200853f820646e70e1dbf2d9d1e2c661a86df2183c175cc01cfb09f6a5c7b8ba358901a56ec6cdb9d9fef4540
DIST rspamd-2.6.tar.gz 5079444 BLAKE2B
acb9d9471d0bb457da33b4d23e3c75ef87ea26a47e6c731bfd5fbbfe28567244e2bc72fd25ca3408db0928dab4e4ab66596e38cf3eff7cb9690eec59d3b62372
SHA512
79e4c1aa763aef753c8d7b2a941ed92b384e96c25e6d1b3bd1321c5acc0ecb934d033a3bf19cb94c89809fd92edec25192cffe97de9e5251681e1a71216b734a
DIST rspamd-2.7.tar.gz 5126227 BLAKE2B
70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930
SHA512
8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7
diff --git a/mail-filter/rspamd/files/rspamd-2.5-replxx-gcc10.patch
b/mail-filter/rspamd/files/rspamd-2.5-replxx-gcc10.patch
deleted file mode 100644
index 81d7f3de295..000
--- a/mail-filter/rspamd/files/rspamd-2.5-replxx-gcc10.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/contrib/replxx/src/io.cxx b/contrib/replxx/src/io.cxx
-index a09886701..8df176d1c 100644
a/contrib/replxx/src/io.cxx
-+++ b/contrib/replxx/src/io.cxx
-@@ -3,6 +3,7 @@
- #include
- #include
- #include
-+#include
-
- #ifdef _WIN32
-
diff --git a/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch
b/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch
deleted file mode 100644
index 4a20c8f19d3..000
--- a/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bbc141170..7fbb1b485 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -598,10 +598,6 @@ ADD_SUBDIRECTORY(contrib/libev)
- ADD_SUBDIRECTORY(contrib/kann)
- ADD_SUBDIRECTORY(contrib/fastutf8)
-
--IF (NOT WITH_LUAJIT)
-- ADD_SUBDIRECTORY(contrib/lua-bit)
--ENDIF()
--
- IF (ENABLE_LUA_REPL MATCHES "ON")
- ADD_SUBDIRECTORY(contrib/replxx)
- SET(WITH_LUA_REPL 1)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9a34d2ac4..59bab5c15 100644
a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -189,10 +189,6 @@ IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
- ADD_DEPENDENCIES(rspamd-server rspamd-clang)
- ENDIF()
-
--IF (NOT WITH_LUAJIT)
-- TARGET_LINK_LIBRARIES(rspamd-server rspamd-bit)
--ENDIF()
--
- IF (ENABLE_SNOWBALL MATCHES "ON")
- TARGET_LINK_LIBRARIES(rspamd-server stemmer)
- ENDIF()
-diff --git a/src/lua/lua_common.c b/src/lua/lua_common.c
-index ce5fff6c5..bea6dc389 100644
a/src/lua/lua_common.c
-+++ b/src/lua/lua_common.c
-@@ -903,10 +903,6 @@ rspamd_lua_wipe_realloc (void *ud,
- return NULL;
- }
-
--#ifndef WITH_LUAJIT
--extern int luaopen_bit(lua_State *L);
--#endif
--
- lua_State *
- rspamd_lua_init (bool wipe_mem)
- {
-@@ -961,7 +957,6 @@ rspamd_lua_init (bool wipe_mem)
- luaopen_kann (L);
- luaopen_spf (L);
- #ifndef WITH_LUAJIT
-- rspamd_lua_add_preload (L, "bit", luaopen_bit);
- lua_settop (L, 0);
- #endif
-
diff --git a/mail-filter/rspamd/files/rspamd-2.5-unbundle-zstd.patch
b/mail-filter/rspamd/files/rspamd-2.5-unbundle-zstd.patch
deleted file mode 100644
index e86d70173c6..000
--- a/mail-filter/rspamd/files/rspamd-2.5-unbundle-zstd.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8e3665c18..ad989f7f2 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -171,6 +171,8 @@ ELSE()
- ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3)
- ENDIF()
-
-+ProcessPackage(ZSTD LIBRARY zstd INCLUDE zstd.h
-+ ROOT ${ZSTD_ROOT_DIR} MODULES libzstd)
- ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES
include/sqlite3 include/sqlite
-
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 448e4138dc5f7453a3cfa0884888edd5999488cd
Author: Sam James gentoo org>
AuthorDate: Mon Jan 4 15:31:08 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Jan 4 15:31:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=448e4138
mail-filter/rspamd: Stabilize 2.6-r2 x86, #760726
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-2.6-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-2.6-r2.ebuild
b/mail-filter/rspamd/rspamd-2.6-r2.ebuild
index d22ac2c67f3..d4589355928 100644
--- a/mail-filter/rspamd/rspamd-2.6-r2.ebuild
+++ b/mail-filter/rspamd/rspamd-2.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 641832ee163f117d36425d796a97ef6b312030f1
Author: Sam James gentoo org>
AuthorDate: Sun Dec 20 03:02:11 2020 +
Commit: Sam James gentoo org>
CommitDate: Sun Dec 20 03:02:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=641832ee
mail-filter/rspamd: Stabilize 2.6-r2 amd64, #760726
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-2.6-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-2.6-r2.ebuild
b/mail-filter/rspamd/rspamd-2.6-r2.ebuild
index a31a0897fc9..d22ac2c67f3 100644
--- a/mail-filter/rspamd/rspamd-2.6-r2.ebuild
+++ b/mail-filter/rspamd/rspamd-2.6-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 91819bc0c66dd69b67784bd3241531d5b785eb4b Author: Marek Szuba gentoo org> AuthorDate: Wed Dec 9 21:44:09 2020 + Commit: Marek Szuba gentoo org> CommitDate: Wed Dec 9 22:57:09 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91819bc0 mail-filter/rspamd: limit unmigrated ebuilds to dev-lang/lua:0 Signed-off-by: Marek Szuba gentoo.org> mail-filter/rspamd/rspamd-2.5-r1.ebuild | 2 +- mail-filter/rspamd/rspamd-2.6-r2.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mail-filter/rspamd/rspamd-2.5-r1.ebuild b/mail-filter/rspamd/rspamd-2.5-r1.ebuild index eb97eb1d040..c1020d552c7 100644 --- a/mail-filter/rspamd/rspamd-2.5-r1.ebuild +++ b/mail-filter/rspamd/rspamd-2.5-r1.ebuild @@ -38,7 +38,7 @@ RDEPEND=" dev-lang/luajit:2 ) !jit? ( - dev-lang/lua:* + dev-lang/lua:0= dev-lua/LuaBitOp ) !libressl? ( dev-libs/openssl:0=[-bindist] ) diff --git a/mail-filter/rspamd/rspamd-2.6-r2.ebuild b/mail-filter/rspamd/rspamd-2.6-r2.ebuild index 380080e13fb..a31a0897fc9 100644 --- a/mail-filter/rspamd/rspamd-2.6-r2.ebuild +++ b/mail-filter/rspamd/rspamd-2.6-r2.ebuild @@ -41,7 +41,7 @@ RDEPEND=" dev-lang/luajit:2 ) !jit? ( - dev-lang/lua:* + dev-lang/lua:0= dev-lua/LuaBitOp ) !libressl? ( dev-libs/openssl:0=[-bindist] )
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/
commit: 71ff0f85c11853a25b7c5814f10b7339b922cc7f
Author: Petr Vaněk atlas cz>
AuthorDate: Thu Nov 12 13:17:44 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Fri Nov 20 10:01:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71ff0f85
mail-filter/rspamd: sync live
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/18231
Signed-off-by: Joonas Niilola gentoo.org>
.../rspamd/files/rspamd--unbundle-zstd.patch | 125 +
mail-filter/rspamd/rspamd-.ebuild | 6 +-
2 files changed, 127 insertions(+), 4 deletions(-)
diff --git a/mail-filter/rspamd/files/rspamd--unbundle-zstd.patch
b/mail-filter/rspamd/files/rspamd--unbundle-zstd.patch
new file mode 100644
index 000..c42bb8f5d6f
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd--unbundle-zstd.patch
@@ -0,0 +1,125 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3b4bd8469..75582513e 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -199,6 +199,8 @@ ELSE()
+ ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3)
+ ENDIF()
+
++ProcessPackage(ZSTD LIBRARY zstd INCLUDE zstd.h
++ ROOT ${ZSTD_ROOT_DIR} MODULES libzstd)
+ ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES
include/sqlite3 include/sqlite
+ ROOT ${SQLITE3_ROOT_DIR} MODULES sqlite3 sqlite)
+ ProcessPackage(ICUDATA LIBRARY icudata INCLUDE unicode/ucnv.h
+@@ -616,7 +618,6 @@ ADD_SUBDIRECTORY(contrib/http-parser)
+ ADD_SUBDIRECTORY(contrib/fpconv)
+ ADD_SUBDIRECTORY(contrib/lc-btrie)
+ ADD_SUBDIRECTORY(contrib/libottery)
+-ADD_SUBDIRECTORY(contrib/zstd)
+ IF(ENABLE_SNOWBALL MATCHES "ON")
+ ADD_SUBDIRECTORY(contrib/snowball)
+ SET(WITH_SNOWBALL 1)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 59bab5c15..098329991 100644
+--- a/src/CMakeLists.txt
b/src/CMakeLists.txt
+@@ -182,7 +182,6 @@ TARGET_LINK_LIBRARIES(rspamd-server rspamd-fpconv)
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb)
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-lpeg)
+ TARGET_LINK_LIBRARIES(rspamd-server lcbtrie)
+-TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd)
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8)
+
+ IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
+diff --git a/src/client/rspamdclient.c b/src/client/rspamdclient.c
+index bcb25672e..48ca58e94 100644
+--- a/src/client/rspamdclient.c
b/src/client/rspamdclient.c
+@@ -19,7 +19,7 @@
+ #include "libserver/http/http_private.h"
+ #include "libserver/protocol_internal.h"
+ #include "unix-std.h"
+-#include "contrib/zstd/zstd.h"
++#include
+
+ #ifdef HAVE_FETCH_H
+ #include
+diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
+index e2f886aa6..5b214c09c 100644
+--- a/src/libserver/cfg_utils.c
b/src/libserver/cfg_utils.c
+@@ -36,8 +36,7 @@
+ #include "contrib/libottery/ottery.h"
+ #include "contrib/fastutf8/fastutf8.h"
+
+-#define ZSTD_STATIC_LINKING_ONLY
+-#include "contrib/zstd/zstd.h"
++#include
+
+ #ifdef HAVE_OPENSSL
+ #include
+diff --git a/src/libserver/maps/map.c b/src/libserver/maps/map.c
+index 14792753a..20ca8416e 100644
+--- a/src/libserver/maps/map.c
b/src/libserver/maps/map.c
+@@ -23,7 +23,7 @@
+ #include "libserver/http/http_connection.h"
+ #include "libserver/http/http_private.h"
+ #include "rspamd.h"
+-#include "contrib/zstd/zstd.h"
++#include
+ #include "contrib/libev/ev.h"
+ #include "contrib/uthash/utlist.h"
+
+diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
+index 31b0308cb..62ba3d833 100644
+--- a/src/libserver/protocol.c
b/src/libserver/protocol.c
+@@ -21,7 +21,7 @@
+ #include "worker_private.h"
+ #include "libserver/cfg_file_private.h"
+ #include "libmime/scan_result_private.h"
+-#include "contrib/zstd/zstd.h"
++#include
+ #include "lua/lua_common.h"
+ #include "unix-std.h"
+ #include "protocol_internal.h"
+diff --git a/src/libserver/task.c b/src/libserver/task.c
+index e7a83a603..c613fffcc 100644
+--- a/src/libserver/task.c
b/src/libserver/task.c
+@@ -25,7 +25,7 @@
+ #include "stat_api.h"
+ #include "unix-std.h"
+ #include "utlist.h"
+-#include "contrib/zstd/zstd.h"
++#include
+ #include "libserver/mempool_vars_internal.h"
+ #include "libserver/cfg_file_private.h"
+ #include "libmime/lang_detection.h"
+diff --git a/src/lua/lua_util.c b/src/lua/lua_util.c
+index e879d37af..88451e222 100644
+--- a/src/lua/lua_util.c
b/src/lua/lua_util.c
+@@ -15,7 +15,7 @@
+ */
+ #include "lua_common.h"
+ #include "unix-std.h"
+-#include "contrib/zstd/zstd.h"
++#include
+ #include "libmime/email_addr.h"
+ #include "libmime/content_type.h"
+ #include "libmime/mime_headers.h"
+diff --git a/src/rspamd_proxy.c b/src/rspamd_proxy.c
+index 3fa5da390..c641fb263 100644
+--- a/src/rspamd_proxy.c
b/src/rspamd_proxy.c
+@@ -36,7 +36,7 @@
+ #include "libserver/milter.h"
+ #include "libserver/milter_internal.h"
+ #include
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/
commit: 4c876bf9fc2573be36d6ebd504df3cc3535dc7d2
Author: Petr Vaněk atlas cz>
AuthorDate: Thu Nov 12 13:12:58 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Fri Nov 20 10:01:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c876bf9
mail-filter/rspamd: use bundled lua-lpeg, bug #753830
Closes: https://bugs.gentoo.org/753830
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Joonas Niilola gentoo.org>
.../rspamd/files/rspamd-2.5-unbundle-lua.patch | 60 +++--
.../rspamd/files/rspamd-2.6-unbundle-lua.patch | 62 +++---
.../{rspamd-2.5.ebuild => rspamd-2.5-r1.ebuild}| 4 +-
.../{rspamd-2.6-r1.ebuild => rspamd-2.6-r2.ebuild} | 4 +-
4 files changed, 16 insertions(+), 114 deletions(-)
diff --git a/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch
b/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch
index b8deb2d6903..4a20c8f19d3 100644
--- a/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch
+++ b/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch
@@ -1,22 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bbc141170..8e3665c18 100644
+index bbc141170..7fbb1b485 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -112,7 +112,6 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/"
- "${CMAKE_SOURCE_DIR}/contrib/librdns"
- "${CMAKE_SOURCE_DIR}/contrib/aho-corasick"
- "${CMAKE_SOURCE_DIR}/contrib/lc-btrie"
-- "${CMAKE_SOURCE_DIR}/contrib/lua-lpeg"
- "${CMAKE_BINARY_DIR}/src" #Stored in the binary dir
- "${CMAKE_BINARY_DIR}/src/libcryptobox")
-
-@@ -592,16 +591,11 @@ ENDIF()
- ADD_SUBDIRECTORY(contrib/libucl)
- ADD_SUBDIRECTORY(contrib/librdns)
- ADD_SUBDIRECTORY(contrib/aho-corasick)
--ADD_SUBDIRECTORY(contrib/lua-lpeg)
- ADD_SUBDIRECTORY(contrib/t1ha)
- ADD_SUBDIRECTORY(contrib/libev)
+@@ -598,10 +598,6 @@ ADD_SUBDIRECTORY(contrib/libev)
ADD_SUBDIRECTORY(contrib/kann)
ADD_SUBDIRECTORY(contrib/fastutf8)
@@ -27,27 +13,11 @@ index bbc141170..8e3665c18 100644
IF (ENABLE_LUA_REPL MATCHES "ON")
ADD_SUBDIRECTORY(contrib/replxx)
SET(WITH_LUA_REPL 1)
-@@ -700,7 +694,6 @@ INSTALL(FILES "contrib/lua-fun/fun.lua" DESTINATION
${LUALIBDIR})
- INSTALL(FILES "contrib/lua-argparse/argparse.lua" DESTINATION ${LUALIBDIR})
- INSTALL(FILES "contrib/lua-tableshape/tableshape.lua" DESTINATION
${LUALIBDIR})
- INSTALL(FILES "contrib/lua-lupa/lupa.lua" DESTINATION ${LUALIBDIR})
--INSTALL(FILES "contrib/lua-lpeg/lpegre.lua" DESTINATION ${LUALIBDIR})
-
- # systemd unit
- IF(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND WANT_SYSTEMD_UNITS MATCHES "ON")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9a34d2ac4..54b2e4083 100644
+index 9a34d2ac4..59bab5c15 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
-@@ -180,7 +180,6 @@ ENDIF()
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-http-parser)
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-fpconv)
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb)
--TARGET_LINK_LIBRARIES(rspamd-server rspamd-lpeg)
- TARGET_LINK_LIBRARIES(rspamd-server lcbtrie)
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd)
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8)
-@@ -189,10 +188,6 @@ IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
+@@ -189,10 +189,6 @@ IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
ADD_DEPENDENCIES(rspamd-server rspamd-clang)
ENDIF()
@@ -59,18 +29,10 @@ index 9a34d2ac4..54b2e4083 100644
TARGET_LINK_LIBRARIES(rspamd-server stemmer)
ENDIF()
diff --git a/src/lua/lua_common.c b/src/lua/lua_common.c
-index ce5fff6c5..509ceeb44 100644
+index ce5fff6c5..bea6dc389 100644
--- a/src/lua/lua_common.c
+++ b/src/lua/lua_common.c
-@@ -14,7 +14,6 @@
- * limitations under the License.
- */
- #include "lua_common.h"
--#include "lptree.h"
- #include "utlist.h"
- #include "unix-std.h"
- #include "ottery.h"
-@@ -903,10 +902,6 @@ rspamd_lua_wipe_realloc (void *ud,
+@@ -903,10 +903,6 @@ rspamd_lua_wipe_realloc (void *ud,
return NULL;
}
@@ -81,7 +43,7 @@ index ce5fff6c5..509ceeb44 100644
lua_State *
rspamd_lua_init (bool wipe_mem)
{
-@@ -961,7 +956,6 @@ rspamd_lua_init (bool wipe_mem)
+@@ -961,7 +957,6 @@ rspamd_lua_init (bool wipe_mem)
luaopen_kann (L);
luaopen_spf (L);
#ifndef WITH_LUAJIT
@@ -89,11 +51,3 @@ index ce5fff6c5..509ceeb44 100644
lua_settop (L, 0);
#endif
-@@ -971,7 +965,6 @@ rspamd_lua_init (bool wipe_mem)
- rspamd_lua_new_class (L, "rspamd{session}", NULL);
- lua_pop (L, 1);
-
-- rspamd_lua_add_preload (L, "lpeg", luaopen_lpeg);
- luaopen_ucl (L);
- rspamd_lua_add_preload (L, "ucl", luaopen_ucl);
-
diff --git a/mail-filter/rspamd/files/rspamd-2.6-unbundle-lua.patch
b/mail-filter/rspamd/files/rspamd-2.6-unbundle-lua.patch
index c6f6324befc..9278fa8608d 100644
---
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: b78980579e132224507c70b07a92d1582034c4d9 Author: Dirkjan Ochtman gentoo org> AuthorDate: Thu Nov 5 10:42:42 2020 + Commit: Dirkjan Ochtman gentoo org> CommitDate: Thu Nov 5 14:04:24 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7898057 mail-filter/rspamd: remove myself as maintainer Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Dirkjan Ochtman gentoo.org> mail-filter/rspamd/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml index c14373f9b6e..f0f82f46abd 100644 --- a/mail-filter/rspamd/metadata.xml +++ b/mail-filter/rspamd/metadata.xml @@ -5,10 +5,6 @@ c...@roessner.co Christian Roessner - -d...@gentoo.org -Dirkjan Ochtman - arka...@atlas.cz Petr Vaněk
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/
commit: 6323b87561e9cea97fa219c349485e4e2fc8a9b3
Author: Petr Vaněk atlas cz>
AuthorDate: Thu Oct 8 18:34:52 2020 +
Commit: Sam James gentoo org>
CommitDate: Thu Oct 8 19:39:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6323b875
mail-filter/rspamd: use bundled hiredis, bug #747274
System hiredis makes the rspamd subprocesses segfault periodically.
Closes: https://bugs.gentoo.org/747274
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/17852
Signed-off-by: Sam James gentoo.org>
.../rspamd/files/rspamd-2.6-unbundle-hiredis.patch | 93 --
.../{rspamd-2.6.ebuild => rspamd-2.6-r1.ebuild}| 4 +-
mail-filter/rspamd/rspamd-.ebuild | 4 +-
3 files changed, 2 insertions(+), 99 deletions(-)
diff --git a/mail-filter/rspamd/files/rspamd-2.6-unbundle-hiredis.patch
b/mail-filter/rspamd/files/rspamd-2.6-unbundle-hiredis.patch
deleted file mode 100644
index 875009da41a..000
--- a/mail-filter/rspamd/files/rspamd-2.6-unbundle-hiredis.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0afb5feff..966173075 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -170,6 +170,8 @@ ELSE()
- ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3)
- ENDIF()
-
-+ProcessPackage(HIREDIS LIBRARY hiredis INCLUDE hiredis.h
-+ ROOT ${HIREDIS_ROOT_DIR} MODULES hiredis)
- ProcessPackage(ZSTD LIBRARY zstd INCLUDE zstd.h
- ROOT ${ZSTD_ROOT_DIR} MODULES libzstd)
- ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES
include/sqlite3 include/sqlite
-@@ -555,9 +557,7 @@ ENDIF(NOT DESTDIR)
-
-
- SUBDIRS SECTION ###
--ADD_SUBDIRECTORY(contrib/hiredis)
- SET(WITH_HIREDIS 1)
--INCLUDE_DIRECTORIES(BEFORE "${CMAKE_SOURCE_DIR}/contrib/hiredis")
-
- LIST(APPEND RSPAMD_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
- IF(HAVE_FETCH_H)
-@@ -604,7 +604,6 @@ ENDIF()
- IF (ENABLE_SNOWBALL MATCHES "ON")
- LIST(APPEND RSPAMD_REQUIRED_LIBRARIES stemmer)
- ENDIF()
--LIST(APPEND RSPAMD_REQUIRED_LIBRARIES rspamd-hiredis)
-
- LIST(APPEND RSPAMD_REQUIRED_LIBRARIES rspamd-actrie)
- LIST(APPEND RSPAMD_REQUIRED_LIBRARIES rspamd-t1ha)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index e0e2edd58..4908013da 100644
a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -190,7 +190,6 @@ ENDIF()
- IF (ENABLE_SNOWBALL MATCHES "ON")
- TARGET_LINK_LIBRARIES(rspamd-server stemmer)
- ENDIF()
--TARGET_LINK_LIBRARIES(rspamd-server rspamd-hiredis)
-
- IF (ENABLE_FANN MATCHES "ON")
- TARGET_LINK_LIBRARIES(rspamd-server fann)
-diff --git a/src/libserver/fuzzy_backend/fuzzy_backend_redis.c
b/src/libserver/fuzzy_backend/fuzzy_backend_redis.c
-index d1e3e7532..882acdf6a 100644
a/src/libserver/fuzzy_backend/fuzzy_backend_redis.c
-+++ b/src/libserver/fuzzy_backend/fuzzy_backend_redis.c
-@@ -22,8 +22,8 @@
- #include "cryptobox.h"
- #include "str_util.h"
- #include "upstream.h"
--#include "contrib/hiredis/hiredis.h"
--#include "contrib/hiredis/async.h"
-+#include
-+#include
- #include "lua/lua_common.h"
-
- #define REDIS_DEFAULT_PORT 6379
-diff --git a/src/libserver/redis_pool.c b/src/libserver/redis_pool.c
-index 7e835013c..fccf189e1 100644
a/src/libserver/redis_pool.c
-+++ b/src/libserver/redis_pool.c
-@@ -18,9 +18,9 @@
- #include "contrib/libev/ev.h"
- #include "redis_pool.h"
- #include "cfg_file.h"
--#include "contrib/hiredis/hiredis.h"
--#include "contrib/hiredis/async.h"
--#include "contrib/hiredis/adapters/libev.h"
-+#include
-+#include
-+#include
- #include "cryptobox.h"
- #include "logger.h"
-
-diff --git a/src/lua/lua_redis.c b/src/lua/lua_redis.c
-index f9dbbdd13..b885a8b61 100644
a/src/lua/lua_redis.c
-+++ b/src/lua/lua_redis.c
-@@ -17,8 +17,8 @@
- #include "lua_thread_pool.h"
- #include "utlist.h"
-
--#include "contrib/hiredis/hiredis.h"
--#include "contrib/hiredis/async.h"
-+#include
-+#include
-
- #define REDIS_DEFAULT_TIMEOUT 1.0
-
---
-2.25.3
-
diff --git a/mail-filter/rspamd/rspamd-2.6.ebuild
b/mail-filter/rspamd/rspamd-2.6-r1.ebuild
similarity index 95%
rename from mail-filter/rspamd/rspamd-2.6.ebuild
rename to mail-filter/rspamd/rspamd-2.6-r1.ebuild
index 4c166ee4b01..1488b0696d2 100644
--- a/mail-filter/rspamd/rspamd-2.6.ebuild
+++ b/mail-filter/rspamd/rspamd-2.6-r1.ebuild
@@ -25,7 +25,6 @@ RDEPEND="
app-arch/zstd
dev-db/sqlite:3
dev-libs/glib:2
- dev-libs/hiredis:=
dev-libs/icu:=
dev-libs/libev
dev-libs/libsodium
@@ -61,13 +60,12 @@ PATCHES=(
"${FILESDIR}/rspamd-2.6-unbundle-lua.patch"
"${FILESDIR}/rspamd-2.6-unbundle-zstd.patch"
"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
- "${FILESDIR}/rspamd-2.6-unbundle-hiredis.patch"
)
src_prepare() {
cmake_src_prepare
- rm
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/
commit: e0cc7f032415b7c681e75ea79bd2e62d25d4118b
Author: Petr Vaněk atlas cz>
AuthorDate: Wed Oct 7 15:58:16 2020 +
Commit: Sam James gentoo org>
CommitDate: Wed Oct 7 15:58:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0cc7f03
mail-filter/rspamd: bump to 2.6
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/17834
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/Manifest | 1 +
...999-unbundle-hiredis.patch => rspamd-2.6-unbundle-hiredis.patch} | 0
...rspamd--unbundle-lua.patch => rspamd-2.6-unbundle-lua.patch} | 0
...pamd--unbundle-zstd.patch => rspamd-2.6-unbundle-zstd.patch} | 0
mail-filter/rspamd/{rspamd-.ebuild => rspamd-2.6.ebuild}| 6 +++---
mail-filter/rspamd/rspamd-.ebuild | 6 +++---
6 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 31a2bd1b901..7b2fbeee713 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1 +1,2 @@
DIST rspamd-2.5.tar.gz 4490310 BLAKE2B
8d117b1b03e8092d0c724a4da4de23dd145f5b22696aa6b4ef1c208ade28f0d143dd783c9173b6987514b2aef9327ff8fd29eeae5e3da3039d2568384e50a697
SHA512
6068309da98eeb75f95188414b12ce9443aef31200853f820646e70e1dbf2d9d1e2c661a86df2183c175cc01cfb09f6a5c7b8ba358901a56ec6cdb9d9fef4540
+DIST rspamd-2.6.tar.gz 5079444 BLAKE2B
acb9d9471d0bb457da33b4d23e3c75ef87ea26a47e6c731bfd5fbbfe28567244e2bc72fd25ca3408db0928dab4e4ab66596e38cf3eff7cb9690eec59d3b62372
SHA512
79e4c1aa763aef753c8d7b2a941ed92b384e96c25e6d1b3bd1321c5acc0ecb934d033a3bf19cb94c89809fd92edec25192cffe97de9e5251681e1a71216b734a
diff --git a/mail-filter/rspamd/files/rspamd--unbundle-hiredis.patch
b/mail-filter/rspamd/files/rspamd-2.6-unbundle-hiredis.patch
similarity index 100%
rename from mail-filter/rspamd/files/rspamd--unbundle-hiredis.patch
rename to mail-filter/rspamd/files/rspamd-2.6-unbundle-hiredis.patch
diff --git a/mail-filter/rspamd/files/rspamd--unbundle-lua.patch
b/mail-filter/rspamd/files/rspamd-2.6-unbundle-lua.patch
similarity index 100%
rename from mail-filter/rspamd/files/rspamd--unbundle-lua.patch
rename to mail-filter/rspamd/files/rspamd-2.6-unbundle-lua.patch
diff --git a/mail-filter/rspamd/files/rspamd--unbundle-zstd.patch
b/mail-filter/rspamd/files/rspamd-2.6-unbundle-zstd.patch
similarity index 100%
rename from mail-filter/rspamd/files/rspamd--unbundle-zstd.patch
rename to mail-filter/rspamd/files/rspamd-2.6-unbundle-zstd.patch
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-2.6.ebuild
similarity index 94%
copy from mail-filter/rspamd/rspamd-.ebuild
copy to mail-filter/rspamd/rspamd-2.6.ebuild
index cad05375702..4c166ee4b01 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-2.6.ebuild
@@ -58,10 +58,10 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/rspamd--unbundle-lua.patch"
- "${FILESDIR}/rspamd--unbundle-zstd.patch"
+ "${FILESDIR}/rspamd-2.6-unbundle-lua.patch"
+ "${FILESDIR}/rspamd-2.6-unbundle-zstd.patch"
"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
- "${FILESDIR}/rspamd--unbundle-hiredis.patch"
+ "${FILESDIR}/rspamd-2.6-unbundle-hiredis.patch"
)
src_prepare() {
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index cad05375702..4c166ee4b01 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -58,10 +58,10 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/rspamd--unbundle-lua.patch"
- "${FILESDIR}/rspamd--unbundle-zstd.patch"
+ "${FILESDIR}/rspamd-2.6-unbundle-lua.patch"
+ "${FILESDIR}/rspamd-2.6-unbundle-zstd.patch"
"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
- "${FILESDIR}/rspamd--unbundle-hiredis.patch"
+ "${FILESDIR}/rspamd-2.6-unbundle-hiredis.patch"
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/
commit: 560a9449d85a8f3e68c2b8bb3c9379d288bde3fd
Author: Petr Vaněk atlas cz>
AuthorDate: Mon Aug 31 12:39:30 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Fri Oct 2 07:21:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=560a9449
mail-filter/rspamd: Fix gcc10 compilation issue
Closes: https://bugs.gentoo.org/738174
Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/files/rspamd-2.5-replxx-gcc10.patch | 12
mail-filter/rspamd/rspamd-2.5.ebuild | 1 +
2 files changed, 13 insertions(+)
diff --git a/mail-filter/rspamd/files/rspamd-2.5-replxx-gcc10.patch
b/mail-filter/rspamd/files/rspamd-2.5-replxx-gcc10.patch
new file mode 100644
index 000..81d7f3de295
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-2.5-replxx-gcc10.patch
@@ -0,0 +1,12 @@
+diff --git a/contrib/replxx/src/io.cxx b/contrib/replxx/src/io.cxx
+index a09886701..8df176d1c 100644
+--- a/contrib/replxx/src/io.cxx
b/contrib/replxx/src/io.cxx
+@@ -3,6 +3,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #ifdef _WIN32
+
diff --git a/mail-filter/rspamd/rspamd-2.5.ebuild
b/mail-filter/rspamd/rspamd-2.5.ebuild
index b5d45580a5d..a533869c512 100644
--- a/mail-filter/rspamd/rspamd-2.5.ebuild
+++ b/mail-filter/rspamd/rspamd-2.5.ebuild
@@ -54,6 +54,7 @@ BDEPEND="
"
PATCHES=(
+ "${FILESDIR}/rspamd-2.5-replxx-gcc10.patch"
"${FILESDIR}/rspamd-2.5-unbundle-lua.patch"
"${FILESDIR}/rspamd-2.5-unbundle-zstd.patch"
"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: b738a5b5fb44be3e4ef584c256f3e37b9a055c7e
Author: Petr Vaněk atlas cz>
AuthorDate: Mon Aug 31 13:48:36 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Fri Oct 2 07:21:40 2020 +
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 atlas.cz>
Signed-off-by: Joonas Niilola 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
20fae1b088acaf406980dc10da5efa66680f10ca8f0d262ddc735a0498f2026091806206995430d28ae27a7d348556eb1586a9217a02c39dfcf0f7c6eb95
-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..000
--- 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} == * ]] ; 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
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/
commit: 08f5c2682300ed9088fc4ead069a4e69fc85b4dc
Author: Petr Vaněk atlas cz>
AuthorDate: Tue Sep 1 12:06:43 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Fri Oct 2 07:21:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08f5c268
mail-filter/rspamd: sync live
Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/17345
Signed-off-by: Joonas Niilola gentoo.org>
.../files/rspamd--unbundle-hiredis.patch | 93 +++
.../rspamd/files/rspamd--unbundle-lua.patch| 101
.../rspamd/files/rspamd--unbundle-zstd.patch | 128 +
mail-filter/rspamd/rspamd-.ebuild | 13 ++-
4 files changed, 331 insertions(+), 4 deletions(-)
diff --git a/mail-filter/rspamd/files/rspamd--unbundle-hiredis.patch
b/mail-filter/rspamd/files/rspamd--unbundle-hiredis.patch
new file mode 100644
index 000..875009da41a
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd--unbundle-hiredis.patch
@@ -0,0 +1,93 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0afb5feff..966173075 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -170,6 +170,8 @@ ELSE()
+ ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3)
+ ENDIF()
+
++ProcessPackage(HIREDIS LIBRARY hiredis INCLUDE hiredis.h
++ ROOT ${HIREDIS_ROOT_DIR} MODULES hiredis)
+ ProcessPackage(ZSTD LIBRARY zstd INCLUDE zstd.h
+ ROOT ${ZSTD_ROOT_DIR} MODULES libzstd)
+ ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES
include/sqlite3 include/sqlite
+@@ -555,9 +557,7 @@ ENDIF(NOT DESTDIR)
+
+
+ SUBDIRS SECTION ###
+-ADD_SUBDIRECTORY(contrib/hiredis)
+ SET(WITH_HIREDIS 1)
+-INCLUDE_DIRECTORIES(BEFORE "${CMAKE_SOURCE_DIR}/contrib/hiredis")
+
+ LIST(APPEND RSPAMD_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
+ IF(HAVE_FETCH_H)
+@@ -604,7 +604,6 @@ ENDIF()
+ IF (ENABLE_SNOWBALL MATCHES "ON")
+ LIST(APPEND RSPAMD_REQUIRED_LIBRARIES stemmer)
+ ENDIF()
+-LIST(APPEND RSPAMD_REQUIRED_LIBRARIES rspamd-hiredis)
+
+ LIST(APPEND RSPAMD_REQUIRED_LIBRARIES rspamd-actrie)
+ LIST(APPEND RSPAMD_REQUIRED_LIBRARIES rspamd-t1ha)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index e0e2edd58..4908013da 100644
+--- a/src/CMakeLists.txt
b/src/CMakeLists.txt
+@@ -190,7 +190,6 @@ ENDIF()
+ IF (ENABLE_SNOWBALL MATCHES "ON")
+ TARGET_LINK_LIBRARIES(rspamd-server stemmer)
+ ENDIF()
+-TARGET_LINK_LIBRARIES(rspamd-server rspamd-hiredis)
+
+ IF (ENABLE_FANN MATCHES "ON")
+ TARGET_LINK_LIBRARIES(rspamd-server fann)
+diff --git a/src/libserver/fuzzy_backend/fuzzy_backend_redis.c
b/src/libserver/fuzzy_backend/fuzzy_backend_redis.c
+index d1e3e7532..882acdf6a 100644
+--- a/src/libserver/fuzzy_backend/fuzzy_backend_redis.c
b/src/libserver/fuzzy_backend/fuzzy_backend_redis.c
+@@ -22,8 +22,8 @@
+ #include "cryptobox.h"
+ #include "str_util.h"
+ #include "upstream.h"
+-#include "contrib/hiredis/hiredis.h"
+-#include "contrib/hiredis/async.h"
++#include
++#include
+ #include "lua/lua_common.h"
+
+ #define REDIS_DEFAULT_PORT 6379
+diff --git a/src/libserver/redis_pool.c b/src/libserver/redis_pool.c
+index 7e835013c..fccf189e1 100644
+--- a/src/libserver/redis_pool.c
b/src/libserver/redis_pool.c
+@@ -18,9 +18,9 @@
+ #include "contrib/libev/ev.h"
+ #include "redis_pool.h"
+ #include "cfg_file.h"
+-#include "contrib/hiredis/hiredis.h"
+-#include "contrib/hiredis/async.h"
+-#include "contrib/hiredis/adapters/libev.h"
++#include
++#include
++#include
+ #include "cryptobox.h"
+ #include "logger.h"
+
+diff --git a/src/lua/lua_redis.c b/src/lua/lua_redis.c
+index f9dbbdd13..b885a8b61 100644
+--- a/src/lua/lua_redis.c
b/src/lua/lua_redis.c
+@@ -17,8 +17,8 @@
+ #include "lua_thread_pool.h"
+ #include "utlist.h"
+
+-#include "contrib/hiredis/hiredis.h"
+-#include "contrib/hiredis/async.h"
++#include
++#include
+
+ #define REDIS_DEFAULT_TIMEOUT 1.0
+
+--
+2.25.3
+
diff --git a/mail-filter/rspamd/files/rspamd--unbundle-lua.patch
b/mail-filter/rspamd/files/rspamd--unbundle-lua.patch
new file mode 100644
index 000..c6f6324befc
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd--unbundle-lua.patch
@@ -0,0 +1,101 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b794b9dbd..90caf4048 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -111,7 +111,6 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/"
+ "${CMAKE_SOURCE_DIR}/contrib/librdns"
+ "${CMAKE_SOURCE_DIR}/contrib/aho-corasick"
+ "${CMAKE_SOURCE_DIR}/contrib/lc-btrie"
+- "${CMAKE_SOURCE_DIR}/contrib/lua-lpeg"
+ "${CMAKE_BINARY_DIR}/src" #Stored in the binary dir
+ "${CMAKE_BINARY_DIR}/src/libcryptobox")
+
+@@ -624,7 +623,6 @@ ENDIF()
+ ADD_SUBDIRECTORY(contrib/libucl)
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: f6b8f52d70569ce5009cf8dff1576f6dceb12022
Author: Petr Vaněk atlas cz>
AuthorDate: Wed Apr 1 14:38:30 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sat Apr 4 07:51:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6b8f52d
mail-filter/rspamd: bump to 2.5
Closes: https://bugs.gentoo.org/711972
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/Manifest | 1 +
mail-filter/rspamd/rspamd-2.5.ebuild | 114 +++
2 files changed, 115 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index dc9affa83b4..bf68858b2d9 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -2,3 +2,4 @@ DIST rspamd-2.1.tar.gz 4232297 BLAKE2B
4685fa404e5a66d2295da57ece8ce1830507b3464
DIST rspamd-2.2.tar.gz 4257574 BLAKE2B
3717736ecefea49cfc9e8bf312bdeafa8650dfe1b0a4410d98693add30c77cb054c7620ecc421edd69a2d8bfc1bcb02183951069b15774a588359da8bfb26ac9
SHA512
e62367b9d663a005686e3eef216a7913c6050125e96582e2a58ef459e14512c1bcf09108050ff8ef524ba5e7a3c78559805353a25510654d8764f985757b32fe
DIST rspamd-2.3.tar.gz 4409924 BLAKE2B
825326c8c92b9937be1aed8640acc1c94762bf8de564642e4d1d429025eb9cc7ba943217b35c881c92b888cff0bec68ffae737bfc77ccb02bfc2ebd9d5948bcc
SHA512
20fae1b088acaf406980dc10da5efa66680f10ca8f0d262ddc735a0498f2026091806206995430d28ae27a7d348556eb1586a9217a02c39dfcf0f7c6eb95
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.5.ebuild
b/mail-filter/rspamd/rspamd-2.5.ebuild
new file mode 100644
index 000..b5d45580a5d
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-2.5.ebuild
@@ -0,0 +1,114 @@
+# 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} == * ]] ; 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
+ app-arch/zstd
+ dev-db/sqlite:3
+ dev-libs/glib:2
+ dev-libs/icu:=
+ dev-libs/libev
+ dev-libs/libsodium
+ dev-libs/snowball-stemmer
+ 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
+ dev-lua/lpeg[luajit]
+ )
+ !jit? (
+ dev-lang/lua:*
+ dev-lua/lpeg[-luajit]
+ dev-lua/LuaBitOp
+ )
+ !libressl? ( dev-libs/openssl:0=[-bindist] )
+ libressl? ( dev-libs/libressl:0= )
+ pcre2? ( dev-libs/libpcre2[jit=] )
+ !pcre2? ( dev-libs/libpcre[jit=] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/ragel
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/rspamd-2.5-unbundle-lua.patch"
+ "${FILESDIR}/rspamd-2.5-unbundle-zstd.patch"
+ "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ rm -vrf contrib/{lua-{bit,lpeg},snowball,zstd} || die
+
+ 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
+
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/
commit: f9e1898e70581acc057e001cb301d091c32cb1df
Author: Petr Vaněk atlas cz>
AuthorDate: Wed Apr 1 14:33:02 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sat Apr 4 07:51:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9e1898e
mail-filter/rspamd: sync live; unbundle few libraries
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Joonas Niilola gentoo.org>
.../rspamd/files/rspamd-2.5-unbundle-lua.patch | 99
.../files/rspamd-2.5-unbundle-snowball.patch | 23
.../rspamd/files/rspamd-2.5-unbundle-zstd.patch| 132 +
mail-filter/rspamd/rspamd-.ebuild | 26 +++-
4 files changed, 277 insertions(+), 3 deletions(-)
diff --git a/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch
b/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch
new file mode 100644
index 000..b8deb2d6903
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch
@@ -0,0 +1,99 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bbc141170..8e3665c18 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -112,7 +112,6 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/"
+ "${CMAKE_SOURCE_DIR}/contrib/librdns"
+ "${CMAKE_SOURCE_DIR}/contrib/aho-corasick"
+ "${CMAKE_SOURCE_DIR}/contrib/lc-btrie"
+- "${CMAKE_SOURCE_DIR}/contrib/lua-lpeg"
+ "${CMAKE_BINARY_DIR}/src" #Stored in the binary dir
+ "${CMAKE_BINARY_DIR}/src/libcryptobox")
+
+@@ -592,16 +591,11 @@ ENDIF()
+ ADD_SUBDIRECTORY(contrib/libucl)
+ ADD_SUBDIRECTORY(contrib/librdns)
+ ADD_SUBDIRECTORY(contrib/aho-corasick)
+-ADD_SUBDIRECTORY(contrib/lua-lpeg)
+ ADD_SUBDIRECTORY(contrib/t1ha)
+ ADD_SUBDIRECTORY(contrib/libev)
+ ADD_SUBDIRECTORY(contrib/kann)
+ ADD_SUBDIRECTORY(contrib/fastutf8)
+
+-IF (NOT WITH_LUAJIT)
+- ADD_SUBDIRECTORY(contrib/lua-bit)
+-ENDIF()
+-
+ IF (ENABLE_LUA_REPL MATCHES "ON")
+ ADD_SUBDIRECTORY(contrib/replxx)
+ SET(WITH_LUA_REPL 1)
+@@ -700,7 +694,6 @@ INSTALL(FILES "contrib/lua-fun/fun.lua" DESTINATION
${LUALIBDIR})
+ INSTALL(FILES "contrib/lua-argparse/argparse.lua" DESTINATION ${LUALIBDIR})
+ INSTALL(FILES "contrib/lua-tableshape/tableshape.lua" DESTINATION
${LUALIBDIR})
+ INSTALL(FILES "contrib/lua-lupa/lupa.lua" DESTINATION ${LUALIBDIR})
+-INSTALL(FILES "contrib/lua-lpeg/lpegre.lua" DESTINATION ${LUALIBDIR})
+
+ # systemd unit
+ IF(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND WANT_SYSTEMD_UNITS MATCHES "ON")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9a34d2ac4..54b2e4083 100644
+--- a/src/CMakeLists.txt
b/src/CMakeLists.txt
+@@ -180,7 +180,6 @@ ENDIF()
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-http-parser)
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-fpconv)
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb)
+-TARGET_LINK_LIBRARIES(rspamd-server rspamd-lpeg)
+ TARGET_LINK_LIBRARIES(rspamd-server lcbtrie)
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd)
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8)
+@@ -189,10 +188,6 @@ IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
+ ADD_DEPENDENCIES(rspamd-server rspamd-clang)
+ ENDIF()
+
+-IF (NOT WITH_LUAJIT)
+- TARGET_LINK_LIBRARIES(rspamd-server rspamd-bit)
+-ENDIF()
+-
+ IF (ENABLE_SNOWBALL MATCHES "ON")
+ TARGET_LINK_LIBRARIES(rspamd-server stemmer)
+ ENDIF()
+diff --git a/src/lua/lua_common.c b/src/lua/lua_common.c
+index ce5fff6c5..509ceeb44 100644
+--- a/src/lua/lua_common.c
b/src/lua/lua_common.c
+@@ -14,7 +14,6 @@
+ * limitations under the License.
+ */
+ #include "lua_common.h"
+-#include "lptree.h"
+ #include "utlist.h"
+ #include "unix-std.h"
+ #include "ottery.h"
+@@ -903,10 +902,6 @@ rspamd_lua_wipe_realloc (void *ud,
+ return NULL;
+ }
+
+-#ifndef WITH_LUAJIT
+-extern int luaopen_bit(lua_State *L);
+-#endif
+-
+ lua_State *
+ rspamd_lua_init (bool wipe_mem)
+ {
+@@ -961,7 +956,6 @@ rspamd_lua_init (bool wipe_mem)
+ luaopen_kann (L);
+ luaopen_spf (L);
+ #ifndef WITH_LUAJIT
+- rspamd_lua_add_preload (L, "bit", luaopen_bit);
+ lua_settop (L, 0);
+ #endif
+
+@@ -971,7 +965,6 @@ rspamd_lua_init (bool wipe_mem)
+ rspamd_lua_new_class (L, "rspamd{session}", NULL);
+ lua_pop (L, 1);
+
+- rspamd_lua_add_preload (L, "lpeg", luaopen_lpeg);
+ luaopen_ucl (L);
+ rspamd_lua_add_preload (L, "ucl", luaopen_ucl);
+
diff --git a/mail-filter/rspamd/files/rspamd-2.5-unbundle-snowball.patch
b/mail-filter/rspamd/files/rspamd-2.5-unbundle-snowball.patch
new file mode 100644
index 000..10b56fa977a
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-2.5-unbundle-snowball.patch
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ad989f7f2..d08496998 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -108,7 +108,6 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/"
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/
commit: 225759c192acd2b13c08c5b7104ad5e54ba3b8c7
Author: Petr Vaněk atlas cz>
AuthorDate: Wed Apr 1 14:40:33 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sat Apr 4 07:51:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=225759c1
mail-filter/rspamd: clean old
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/15198
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/Manifest| 2 -
.../rspamd/files/rspamd-2.2-i386-hyperscan.patch | 15
mail-filter/rspamd/rspamd-2.1.ebuild | 95 -
mail-filter/rspamd/rspamd-2.2.ebuild | 98 --
4 files changed, 210 deletions(-)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index bf68858b2d9..c1caf263ac8 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,5 +1,3 @@
-DIST rspamd-2.1.tar.gz 4232297 BLAKE2B
4685fa404e5a66d2295da57ece8ce1830507b3464c5136952dbb85847a5002c9c45c4f5430d0d60bc199f3aeafde7abf3ac218451f1609b81a5edfd4d0394588
SHA512
7ecd42e9196ccad29a18bb3e6153fd13d3564c1630c4ec88c712d180f789ad2c36755bfeff65e8dd82737debfb5530a6ec4eb401b49dd82b9eb1dbdea991f84f
-DIST rspamd-2.2.tar.gz 4257574 BLAKE2B
3717736ecefea49cfc9e8bf312bdeafa8650dfe1b0a4410d98693add30c77cb054c7620ecc421edd69a2d8bfc1bcb02183951069b15774a588359da8bfb26ac9
SHA512
e62367b9d663a005686e3eef216a7913c6050125e96582e2a58ef459e14512c1bcf09108050ff8ef524ba5e7a3c78559805353a25510654d8764f985757b32fe
DIST rspamd-2.3.tar.gz 4409924 BLAKE2B
825326c8c92b9937be1aed8640acc1c94762bf8de564642e4d1d429025eb9cc7ba943217b35c881c92b888cff0bec68ffae737bfc77ccb02bfc2ebd9d5948bcc
SHA512
20fae1b088acaf406980dc10da5efa66680f10ca8f0d262ddc735a0498f2026091806206995430d28ae27a7d348556eb1586a9217a02c39dfcf0f7c6eb95
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/files/rspamd-2.2-i386-hyperscan.patch
b/mail-filter/rspamd/files/rspamd-2.2-i386-hyperscan.patch
deleted file mode 100644
index 578d3da7fa3..000
--- a/mail-filter/rspamd/files/rspamd-2.2-i386-hyperscan.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/cmake/Hyperscan.cmake b/cmake/Hyperscan.cmake
-index 3dd774511..b8f83a3bb 100644
a/cmake/Hyperscan.cmake
-+++ b/cmake/Hyperscan.cmake
-@@ -1,8 +1,8 @@
- option (ENABLE_HYPERSCAN"Enable hyperscan for fast regexp processing
[default: OFF]" OFF)
-
- if (ENABLE_HYPERSCAN MATCHES "ON")
--if (NOT "${ARCH}" STREQUAL "x86_64")
--MESSAGE(FATAL_ERROR "Hyperscan is supported only on x86_64
architecture")
-+if (NOT ("${ARCH}" STREQUAL "x86_64" OR "${ARCH}" STREQUAL "i386"))
-+MESSAGE(FATAL_ERROR "Hyperscan is supported only on x86_64/i386
architectures")
- endif ()
- ProcessPackage (HYPERSCAN LIBRARY hs INCLUDE hs.h INCLUDE_SUFFIXES
- hs include/hs
diff --git a/mail-filter/rspamd/rspamd-2.1.ebuild
b/mail-filter/rspamd/rspamd-2.1.ebuild
deleted file mode 100644
index b5ff98b60e8..000
--- a/mail-filter/rspamd/rspamd-2.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils pax-utils systemd tmpfiles
-
-if [[ ${PV} == * ]] ; 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
- net-libs/libnsl
- sys-apps/file
- dev-util/ragel
- dev-libs/libsodium
- 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? (
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 845424895d1aac6bb80f62d2f7a579e257c7eef6 Author: Petr Vaněk atlas cz> AuthorDate: Mon Mar 9 10:28:27 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Sat Mar 14 12:06:54 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84542489 mail-filter/rspamd: add licenses of bundled libraries Closes: https://bugs.gentoo.org/601434 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/14895 Signed-off-by: Joonas Niilola gentoo.org> mail-filter/rspamd/rspamd-2.1.ebuild | 2 +- mail-filter/rspamd/rspamd-2.2.ebuild | 2 +- mail-filter/rspamd/rspamd-2.3.ebuild | 2 +- mail-filter/rspamd/rspamd-2.4.ebuild | 2 +- mail-filter/rspamd/rspamd-.ebuild | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mail-filter/rspamd/rspamd-2.1.ebuild b/mail-filter/rspamd/rspamd-2.1.ebuild index dd50ca4e42d..b5ff98b60e8 100644 --- a/mail-filter/rspamd/rspamd-2.1.ebuild +++ b/mail-filter/rspamd/rspamd-2.1.ebuild @@ -15,7 +15,7 @@ fi DESCRIPTION="Rapid spam filtering system" HOMEPAGE="https://rspamd.com/ https://github.com/rspamd/rspamd; -LICENSE="Apache-2.0" +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" diff --git a/mail-filter/rspamd/rspamd-2.2.ebuild b/mail-filter/rspamd/rspamd-2.2.ebuild index ff4dde3ea73..ffab3a9e62c 100644 --- a/mail-filter/rspamd/rspamd-2.2.ebuild +++ b/mail-filter/rspamd/rspamd-2.2.ebuild @@ -15,7 +15,7 @@ fi DESCRIPTION="Rapid spam filtering system" HOMEPAGE="https://rspamd.com/ https://github.com/rspamd/rspamd; -LICENSE="Apache-2.0" +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" diff --git a/mail-filter/rspamd/rspamd-2.3.ebuild b/mail-filter/rspamd/rspamd-2.3.ebuild index 8ed1ffab616..38a8793ea03 100644 --- a/mail-filter/rspamd/rspamd-2.3.ebuild +++ b/mail-filter/rspamd/rspamd-2.3.ebuild @@ -15,7 +15,7 @@ fi DESCRIPTION="Rapid spam filtering system" HOMEPAGE="https://rspamd.com/ https://github.com/rspamd/rspamd; -LICENSE="Apache-2.0" +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" diff --git a/mail-filter/rspamd/rspamd-2.4.ebuild b/mail-filter/rspamd/rspamd-2.4.ebuild index 8ed1ffab616..38a8793ea03 100644 --- a/mail-filter/rspamd/rspamd-2.4.ebuild +++ b/mail-filter/rspamd/rspamd-2.4.ebuild @@ -15,7 +15,7 @@ fi DESCRIPTION="Rapid spam filtering system" HOMEPAGE="https://rspamd.com/ https://github.com/rspamd/rspamd; -LICENSE="Apache-2.0" +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" diff --git a/mail-filter/rspamd/rspamd-.ebuild b/mail-filter/rspamd/rspamd-.ebuild index 4b6702808e4..ea53c2dbb55 100644 --- a/mail-filter/rspamd/rspamd-.ebuild +++ b/mail-filter/rspamd/rspamd-.ebuild @@ -15,7 +15,7 @@ fi DESCRIPTION="Rapid spam filtering system" HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd; -LICENSE="Apache-2.0" +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"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 2658022c1bedbb71dffe14e5eb73dec2e796ef25
Author: Petr Vaněk atlas cz>
AuthorDate: Tue Mar 3 22:18:05 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sun Mar 8 12:57:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2658022c
mail-filter/rspamd: update urls
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/rspamd-2.1.ebuild | 8
mail-filter/rspamd/rspamd-2.2.ebuild | 6 +++---
mail-filter/rspamd/rspamd-2.3.ebuild | 6 +++---
mail-filter/rspamd/rspamd-.ebuild | 6 +++---
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-2.1.ebuild
b/mail-filter/rspamd/rspamd-2.1.ebuild
index bdfa150670b..dd50ca4e42d 100644
--- a/mail-filter/rspamd/rspamd-2.1.ebuild
+++ b/mail-filter/rspamd/rspamd-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,15 +6,15 @@ EAPI=6
inherit cmake-utils pax-utils systemd tmpfiles
if [[ ${PV} == * ]] ; then
- EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git;
+ EGIT_REPO_URI="https://github.com/rspamd/rspamd.git;
inherit git-r3
else
- SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
+ 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://github.com/vstakhov/rspamd;
+HOMEPAGE="https://rspamd.com/ https://github.com/rspamd/rspamd;
LICENSE="Apache-2.0"
SLOT="0"
IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
diff --git a/mail-filter/rspamd/rspamd-2.2.ebuild
b/mail-filter/rspamd/rspamd-2.2.ebuild
index 3b7e3129381..ff4dde3ea73 100644
--- a/mail-filter/rspamd/rspamd-2.2.ebuild
+++ b/mail-filter/rspamd/rspamd-2.2.ebuild
@@ -6,15 +6,15 @@ EAPI=7
inherit cmake pax-utils systemd tmpfiles
if [[ ${PV} == * ]] ; then
- EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git;
+ EGIT_REPO_URI="https://github.com/rspamd/rspamd.git;
inherit git-r3
else
- SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
+ 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://github.com/vstakhov/rspamd;
+HOMEPAGE="https://rspamd.com/ https://github.com/rspamd/rspamd;
LICENSE="Apache-2.0"
SLOT="0"
IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
diff --git a/mail-filter/rspamd/rspamd-2.3.ebuild
b/mail-filter/rspamd/rspamd-2.3.ebuild
index 6fc83c0865f..8ed1ffab616 100644
--- a/mail-filter/rspamd/rspamd-2.3.ebuild
+++ b/mail-filter/rspamd/rspamd-2.3.ebuild
@@ -6,15 +6,15 @@ EAPI=7
inherit cmake pax-utils systemd tmpfiles
if [[ ${PV} == * ]] ; then
- EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git;
+ EGIT_REPO_URI="https://github.com/rspamd/rspamd.git;
inherit git-r3
else
- SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
+ 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://github.com/vstakhov/rspamd;
+HOMEPAGE="https://rspamd.com/ https://github.com/rspamd/rspamd;
LICENSE="Apache-2.0"
SLOT="0"
IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index 6fc83c0865f..4b6702808e4 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -6,15 +6,15 @@ EAPI=7
inherit cmake pax-utils systemd tmpfiles
if [[ ${PV} == * ]] ; then
- EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git;
+ EGIT_REPO_URI="https://github.com/rspamd/rspamd.git;
inherit git-r3
else
- SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
+ 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://github.com/vstakhov/rspamd;
+HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd;
LICENSE="Apache-2.0"
SLOT="0"
IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 8156391b8c8fdd116535b48f31fd60e3f75012b2
Author: Petr Vaněk atlas cz>
AuthorDate: Tue Mar 3 22:10:45 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sun Mar 8 12:57:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8156391b
mail-filter/rspamd: bump to 2.4
Closes: https://bugs.gentoo.org/711020
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/Manifest | 1 +
mail-filter/rspamd/rspamd-2.4.ebuild | 94
2 files changed, 95 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index e9e306699c0..dc9affa83b4 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,3 +1,4 @@
DIST rspamd-2.1.tar.gz 4232297 BLAKE2B
4685fa404e5a66d2295da57ece8ce1830507b3464c5136952dbb85847a5002c9c45c4f5430d0d60bc199f3aeafde7abf3ac218451f1609b81a5edfd4d0394588
SHA512
7ecd42e9196ccad29a18bb3e6153fd13d3564c1630c4ec88c712d180f789ad2c36755bfeff65e8dd82737debfb5530a6ec4eb401b49dd82b9eb1dbdea991f84f
DIST rspamd-2.2.tar.gz 4257574 BLAKE2B
3717736ecefea49cfc9e8bf312bdeafa8650dfe1b0a4410d98693add30c77cb054c7620ecc421edd69a2d8bfc1bcb02183951069b15774a588359da8bfb26ac9
SHA512
e62367b9d663a005686e3eef216a7913c6050125e96582e2a58ef459e14512c1bcf09108050ff8ef524ba5e7a3c78559805353a25510654d8764f985757b32fe
DIST rspamd-2.3.tar.gz 4409924 BLAKE2B
825326c8c92b9937be1aed8640acc1c94762bf8de564642e4d1d429025eb9cc7ba943217b35c881c92b888cff0bec68ffae737bfc77ccb02bfc2ebd9d5948bcc
SHA512
20fae1b088acaf406980dc10da5efa66680f10ca8f0d262ddc735a0498f2026091806206995430d28ae27a7d348556eb1586a9217a02c39dfcf0f7c6eb95
+DIST rspamd-2.4.tar.gz 4462119 BLAKE2B
073a27dc8ca76ede3928a2bbc1c3908d442e2d70e0cb51fea73f23fea55536f84e8154b7b6423af13002c0bd5cda60ae9948b3c6321a73d365c7fbd6541c3dca
SHA512
47d64fdadc1c61642efebe4772add48848a45c8106bf431dacb458d85cdd9bf996ca46bcb75d60cedb15ae72518089e9b3e63a0716d22843f5b9f38d7d86be08
diff --git a/mail-filter/rspamd/rspamd-2.4.ebuild
b/mail-filter/rspamd/rspamd-2.4.ebuild
new file mode 100644
index 000..8ed1ffab616
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-2.4.ebuild
@@ -0,0 +1,94 @@
+# 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} == * ]] ; 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"
+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"
+}
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: ae5d87896657c9903d0a518ba88dfcd60ae240fc Author: Petr Vaněk atlas cz> AuthorDate: Fri Mar 6 07:45:40 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Sun Mar 8 12:57:57 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae5d8789 mail-filter/rspamd: add myself as a proxy maintainer Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/14831 Signed-off-by: Joonas Niilola gentoo.org> mail-filter/rspamd/metadata.xml | 4 1 file changed, 4 insertions(+) diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml index 140755872e0..c14373f9b6e 100644 --- a/mail-filter/rspamd/metadata.xml +++ b/mail-filter/rspamd/metadata.xml @@ -9,6 +9,10 @@ d...@gentoo.org Dirkjan Ochtman + +arka...@atlas.cz +Petr Vaněk + proxy-ma...@gentoo.org Proxy Maintainers
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/
commit: 97d6eb42bee13f4495bf411d9dacbef05a733607
Author: Petr Vaněk atlas cz>
AuthorDate: Tue Feb 4 18:52:38 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Mon Feb 24 05:19:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97d6eb42
mail-filter/rspamd: fix hyperscan support on i386
The patch is taken from upstream.
https://github.com/rspamd/rspamd/commit/92e62855a64d1f7f0e52720399f8aa31bdcb0983
Closes: https://bugs.gentoo.org/703004
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/14572
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/files/rspamd-2.2-i386-hyperscan.patch | 15 +++
mail-filter/rspamd/rspamd-2.2.ebuild | 2 ++
2 files changed, 17 insertions(+)
diff --git a/mail-filter/rspamd/files/rspamd-2.2-i386-hyperscan.patch
b/mail-filter/rspamd/files/rspamd-2.2-i386-hyperscan.patch
new file mode 100644
index 000..578d3da7fa3
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-2.2-i386-hyperscan.patch
@@ -0,0 +1,15 @@
+diff --git a/cmake/Hyperscan.cmake b/cmake/Hyperscan.cmake
+index 3dd774511..b8f83a3bb 100644
+--- a/cmake/Hyperscan.cmake
b/cmake/Hyperscan.cmake
+@@ -1,8 +1,8 @@
+ option (ENABLE_HYPERSCAN"Enable hyperscan for fast regexp processing
[default: OFF]" OFF)
+
+ if (ENABLE_HYPERSCAN MATCHES "ON")
+-if (NOT "${ARCH}" STREQUAL "x86_64")
+-MESSAGE(FATAL_ERROR "Hyperscan is supported only on x86_64
architecture")
++if (NOT ("${ARCH}" STREQUAL "x86_64" OR "${ARCH}" STREQUAL "i386"))
++MESSAGE(FATAL_ERROR "Hyperscan is supported only on x86_64/i386
architectures")
+ endif ()
+ ProcessPackage (HYPERSCAN LIBRARY hs INCLUDE hs.h INCLUDE_SUFFIXES
+ hs include/hs
diff --git a/mail-filter/rspamd/rspamd-2.2.ebuild
b/mail-filter/rspamd/rspamd-2.2.ebuild
index 3f29e90b90e..3b7e3129381 100644
--- a/mail-filter/rspamd/rspamd-2.2.ebuild
+++ b/mail-filter/rspamd/rspamd-2.2.ebuild
@@ -41,6 +41,8 @@ RDEPEND="
!pcre2? ( dev-libs/libpcre[jit=] )"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/${P}-i386-hyperscan.patch" )
+
src_prepare() {
cmake_src_prepare
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: a2943cbd2b4496c42b9c26aa0860379ae12da13a
Author: Petr Vaněk atlas cz>
AuthorDate: Tue Feb 4 18:03:38 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu Feb 6 06:19:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2943cbd
mail-filter/rspamd: bump to 2.3
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/14555
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/Manifest | 1 +
mail-filter/rspamd/rspamd-2.3.ebuild | 94
2 files changed, 95 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 879828213cd..e9e306699c0 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,2 +1,3 @@
DIST rspamd-2.1.tar.gz 4232297 BLAKE2B
4685fa404e5a66d2295da57ece8ce1830507b3464c5136952dbb85847a5002c9c45c4f5430d0d60bc199f3aeafde7abf3ac218451f1609b81a5edfd4d0394588
SHA512
7ecd42e9196ccad29a18bb3e6153fd13d3564c1630c4ec88c712d180f789ad2c36755bfeff65e8dd82737debfb5530a6ec4eb401b49dd82b9eb1dbdea991f84f
DIST rspamd-2.2.tar.gz 4257574 BLAKE2B
3717736ecefea49cfc9e8bf312bdeafa8650dfe1b0a4410d98693add30c77cb054c7620ecc421edd69a2d8bfc1bcb02183951069b15774a588359da8bfb26ac9
SHA512
e62367b9d663a005686e3eef216a7913c6050125e96582e2a58ef459e14512c1bcf09108050ff8ef524ba5e7a3c78559805353a25510654d8764f985757b32fe
+DIST rspamd-2.3.tar.gz 4409924 BLAKE2B
825326c8c92b9937be1aed8640acc1c94762bf8de564642e4d1d429025eb9cc7ba943217b35c881c92b888cff0bec68ffae737bfc77ccb02bfc2ebd9d5948bcc
SHA512
20fae1b088acaf406980dc10da5efa66680f10ca8f0d262ddc735a0498f2026091806206995430d28ae27a7d348556eb1586a9217a02c39dfcf0f7c6eb95
diff --git a/mail-filter/rspamd/rspamd-2.3.ebuild
b/mail-filter/rspamd/rspamd-2.3.ebuild
new file mode 100644
index 000..6fc83c0865f
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-2.3.ebuild
@@ -0,0 +1,94 @@
+# 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} == * ]] ; 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="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"
+}
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: a77f03c31b126d50e1d7c745126b1e4d6a4ebb2b
Author: Petr Vaněk atlas cz>
AuthorDate: Fri Dec 13 12:40:39 2019 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sat Dec 14 08:41:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a77f03c3
mail-filter/rspamd: use CXXFLAGS correctly
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/13770
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/rspamd-2.1.ebuild | 2 ++
mail-filter/rspamd/rspamd-2.2.ebuild | 2 ++
2 files changed, 4 insertions(+)
diff --git a/mail-filter/rspamd/rspamd-2.1.ebuild
b/mail-filter/rspamd/rspamd-2.1.ebuild
index db10c622a0c..bdfa150670b 100644
--- a/mail-filter/rspamd/rspamd-2.1.ebuild
+++ b/mail-filter/rspamd/rspamd-2.1.ebuild
@@ -44,6 +44,8 @@ DEPEND="${RDEPEND}"
src_prepare() {
cmake-utils_src_prepare
+ sed -i -e '/PROJECT/s/LANGUAGES C ASM/LANGUAGES C CXX ASM/'
CMakeLists.txt \
+ || die "sed CMakeLists.txt failed"
sed -i -e 's/User=_rspamd/User=rspamd/g' \
rspamd.service \
|| die
diff --git a/mail-filter/rspamd/rspamd-2.2.ebuild
b/mail-filter/rspamd/rspamd-2.2.ebuild
index 3a11c07504f..c428effd2fe 100644
--- a/mail-filter/rspamd/rspamd-2.2.ebuild
+++ b/mail-filter/rspamd/rspamd-2.2.ebuild
@@ -44,6 +44,8 @@ DEPEND="${RDEPEND}"
src_prepare() {
cmake-utils_src_prepare
+ sed -i -e '/PROJECT/s/LANGUAGES C ASM/LANGUAGES C CXX ASM/'
CMakeLists.txt \
+ || die "sed CMakeLists.txt failed"
sed -i -e 's/User=_rspamd/User=rspamd/g' \
rspamd.service \
|| die
