gentoo auto-resync : 20:03:2023 - 00:35:55

4 files changed, 156 insertions, 4 deletions

diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 540247f513a6..c83a78637892 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -9,6 +9,8 @@ AUX rspamd-r7.init 1357 BLAKE2B 90227e0980397a256e6136cac4a4a4d143130d82a211bfd4
 AUX rspamd.conf 908 BLAKE2B 9d8c310c00990f47012e9d1710fbb7567ae5b0e92a411d3fb2696bfb32b70c31ceeaded873f06c759a471d534fb872656907e73ee095150fae384de4df6e9946 SHA512 753011de167af9261cc67676357aadf34d0b160d343a20d5efe8b3389e8a604775b7a6abbaad3174acae7df5579b52b4ba8a0a714419084befedfa96a3a8a9b1
 AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4abe3b3d3e6046d362dae9efc723dd675dff8f1c1df9d05c09e539fcd251382cd9fc5e92351ece8a9 SHA512 1c7e6b79a05cdf9a886c6e233417a0d7b398a1e27ddd3b19c3a595afd50e502a7fd7c09a3499cb9fe6e0291b8493d150550b094c8bf6e2221b71915239c72ef8
 DIST rspamd-3.4.tar.gz 5689732 BLAKE2B 8d1b98205f51cfe834db3ed53b8be72ada834980380cba06c4470689d16ef4a6396190ae27044ae76a7b35df6afd3cdf551f9469d878ac69ec61ef6b86b46104 SHA512 fec8cb7b845bf25d02f1c32c82bf35ad9c65f3301a73f3ea611b6fcfa0ac1b75f75561c4c42f142f876ac3a78f96fd91d22d30c5b3600e4001e25f06bc693ccf
-EBUILD rspamd-3.4-r2.ebuild 3669 BLAKE2B f4176ac0886d5628cda9a1c5d3cfb88b1bfaf0d3ef166170d42d68da11f8d866cde901206d303fd572cc2c718d6cb7515fbbde29a5e0061886aeafeffb8a30f5 SHA512 28083c7df17c4ca97bd0fd4a5fb383594c2251167fecf2b39890c027b5f0359569e88935210047039b52a92efc4f4891b7092095b3a3fc643428402a1d66a65c
-EBUILD rspamd-9999.ebuild 2977 BLAKE2B 78567033b92fcb6237f794092cb62c7aa284211dab41c88d4a9c9069643c73f7b13afdd313bb14ecda628046158498f20b8783309ead10978d4a572a2fa5a19f SHA512 723b836bf5d404f7baaf298a8e28af7b126f14acab74f732dd19615c326917782ff6cb0d483e651cfb0f15966c8335066d96ca83a49752476488379fee5a2741
+DIST rspamd-3.5.tar.gz 5806722 BLAKE2B 547cd9bb26942dc584d1f4b164e61bdb15505a56399fa19b358b7d7525ee983acc8d5ae1fdb3de340e3461a03aedbb48266fd81404c1f4a2e8fc5bd6735d9a62 SHA512 39c87d5dfd9ae1fc7709e19967eac5e7c7dc83fa070dfebbb7ab5411d7d50d6e6f10248ada717cf1cb3f6ff6c5bfb4d31fd87e1a7e1b2e5f876f6be7b5705623
+EBUILD rspamd-3.4-r2.ebuild 3665 BLAKE2B c637b30e2a14d80a4fd7d1bff2fbf4140994cdd5c117267f454cbfff37a02b87cc7e91128fffa2f7f6dbd6aa9cd79a6395e6a66a7f78220a753fdf2b58d1a9b4 SHA512 f354cfefb89bbb0a18df6c13fb3da579eb2a2f3a10f24a9a6d6eeab6720d60ecf8acb170ba5f0b0df1a43c86186d5774af51867c0940fa6473af0e5162c749ea
+EBUILD rspamd-3.5.ebuild 3533 BLAKE2B 08fd7172149667eabb6a0a2fbb5a1bd70c46f79e9e414db24a33a74ab87034cf32452a4b331ea5cdd2509e5b9985aa984840e3ca69c5a894d728bd65ec075344 SHA512 551da2531628dbe157d622ec74b2f97c49d1eca305f7b0367b85af1a95dca10677492c03d206f45c6ac3cb67bf2223e30ca067ff3fe6f4aba37b446c2cda0ef7
+EBUILD rspamd-9999.ebuild 3016 BLAKE2B 04fd0a9836987227fedde2fd2c70e35560bef8d772e274d807a52eba6357e09ac8e6cd7965ce8b1aa2b5eee3a332773a9e8a5d3444bbe1d6b777e9737ded6f6e SHA512 e3bbd88184df37490dcd2292af7ff5e88ef0e6760792135de32d66034c7b79c515df02119f3e0ccb4ca5cbc6aa42e852abd95d794b4ed57cd5127d17ee9be868
 MISC metadata.xml 554 BLAKE2B 65f4d0c5cd49f3caad6aeb0ab37bbba43505faf800491ebfa9af8366511bb46243a1ec873d7944cbe77dbb554beef8318a76f98dd4be69407b7befa3272a69b0 SHA512 d9a82aed6a7c63dad8727be080458c165e5c5f4a3ae87330c82447bc21d87c6c10730d0622fecbc5d255ca97312992c4f45c219ad8edcf2a9f4a386a79265d22
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."
 
diff --git a/mail-filter/rspamd/rspamd-3.5.ebuild b/mail-filter/rspamd/rspamd-3.5.ebuild
new file mode 100644
index 000000000000..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} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/rspamd/rspamd.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Rapid spam filtering system"
+HOMEPAGE="
+	https://rspamd.com
+	https://github.com/rspamd/rspamd
+"
+
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB"
+SLOT="0"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit 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
+
+	# 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"
+
+	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 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."
+
+			find "${EROOT}/var/lib/rspamd" -type f -name '*.unser' -delete
+		fi
+	done
+}
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index 5e7014163c32..b60d7d586587 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.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