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

["Petr Vaněk" <arkamar@gentoo.org>]

commit:     868baf98108d1975cc049a622e90485f74ee9082
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 13 20:40:25 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Sat Jul 13 20:42:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=868baf98

mail-filter/rspamd: add 3.9.0

Signed-off-by: Petr Vaněk <arkamar <AT> 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 000000000000..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 <arkamar@gentoo.org>
+Date: Sat, 13 Jul 2024 15:53:28 +0200
+Subject: [PATCH] backward compatibility with <dev-libs/libfmt-11
+
+Upstream updated bundled libfmt to version 11 [1], where fmt/core.h was
+renamed to fmt/base.h [2]. Rspamd switched to a new header file but
+libfmt reintroduced fmt/core.h later for compatibility reasons. This
+patch switches fmt/base.h back to fmt/core.h in order to be able to work
+with <dev-libs/libfmt-11.
+
+[1] 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 <exception>
+ #include <string_view>
+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 <algorithm>// for std::transform
+ #include <memory>
+ #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 <string>
+ #include <string_view>
+ #include <vector>
+-#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 <vector>
+ #include <unicode/utf8.h>
+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"
+diff --git a/src/libserver/hyperscan_tools.cxx b/src/libserver/hyperscan_tools.cxx
+index 5035bee2c..6f8450e6a 100644
+--- a/src/libserver/hyperscan_tools.cxx
++++ b/src/libserver/hyperscan_tools.cxx
+@@ -21,7 +21,7 @@
+ #include <filesystem>
+ #include "contrib/ankerl/unordered_dense.h"
+ #include "contrib/ankerl/svector.h"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+ #include "libutil/cxx/file_util.hxx"
+ #include "libutil/cxx/error.hxx"
+ #include "hs.h"
+diff --git a/src/libserver/symcache/symcache_impl.cxx b/src/libserver/symcache/symcache_impl.cxx
+index 7159555d2..4ea087024 100644
+--- a/src/libserver/symcache/symcache_impl.cxx
++++ b/src/libserver/symcache/symcache_impl.cxx
+@@ -21,7 +21,7 @@
+ #include "unix-std.h"
+ #include "libutil/cxx/file_util.hxx"
+ #include "libutil/cxx/util.hxx"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+ #include "contrib/t1ha/t1ha.h"
+ 
+ #ifdef __has_include
+diff --git a/src/libserver/symcache/symcache_item.cxx b/src/libserver/symcache/symcache_item.cxx
+index 4a9581fe7..490a87880 100644
+--- a/src/libserver/symcache/symcache_item.cxx
++++ b/src/libserver/symcache/symcache_item.cxx
+@@ -17,7 +17,7 @@
+ #include "lua/lua_common.h"
+ #include "symcache_internal.hxx"
+ #include "symcache_item.hxx"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+ #include "libserver/task.h"
+ #include "libutil/cxx/util.hxx"
+ #include <numeric>
+diff --git a/src/libstat/backends/cdb_backend.cxx b/src/libstat/backends/cdb_backend.cxx
+index bd05e8ef8..1d2b54d4c 100644
+--- a/src/libstat/backends/cdb_backend.cxx
++++ b/src/libstat/backends/cdb_backend.cxx
+@@ -28,7 +28,7 @@
+ #include <optional>
+ #include "contrib/expected/expected.hpp"
+ #include "contrib/ankerl/unordered_dense.h"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+ 
+ namespace rspamd::stat::cdb {
+ 
+diff --git a/src/libstat/backends/redis_backend.cxx b/src/libstat/backends/redis_backend.cxx
+index 06842b078..6abcfa122 100644
+--- a/src/libstat/backends/redis_backend.cxx
++++ b/src/libstat/backends/redis_backend.cxx
+@@ -19,7 +19,7 @@
+ #include "stat_internal.h"
+ #include "upstream.h"
+ #include "libserver/mempool_vars_internal.h"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+ 
+ #include "libutil/cxx/error.hxx"
+ 
+diff --git a/test/rspamd_cxx_unit_dkim.hxx b/test/rspamd_cxx_unit_dkim.hxx
+index d445c3800..6d3b4207e 100644
+--- a/test/rspamd_cxx_unit_dkim.hxx
++++ b/test/rspamd_cxx_unit_dkim.hxx
+@@ -21,7 +21,7 @@
+ 
+ #define DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL
+ #include "doctest/doctest.h"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+ #include "libserver/dkim.h"
+ 
+ #include <vector>

diff --git a/mail-filter/rspamd/rspamd-3.9.0.ebuild b/mail-filter/rspamd/rspamd-3.9.0.ebuild
new file mode 100644
index 000000000000..40c66dca1317
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.9.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} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/rspamd/rspamd.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Rapid spam filtering system"
+HOMEPAGE="
+	https://rspamd.com
+	https://github.com/rspamd/rspamd
+"
+
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB"
+SLOT="0"
+IUSE="blas +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}/rspamd-3.6-cmake-lua-version.patch"
+	"${FILESDIR}/rspamd-3.6-unbundle-lua.patch"
+	"${FILESDIR}/rspamd-3.6-unbundle-snowball.patch"
+
+	# backward compatibility with <dev-libs/libfmt-11
+	"${FILESDIR}/${P}-older-libfmt.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
+
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
+
+src_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() {
+	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
+	newins "${FILESDIR}"/rspamd-r1.logrotate rspamd
+
+	diropts -o rspamd -g rspamd
+	keepdir /var/{lib,log}/rspamd
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+}