gentoo auto-resync : 07:10:2022 - 13:23:59

4 files changed, 145 insertions, 4 deletions

diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index a0879d92661a..262745db415a 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -15,9 +15,11 @@ 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
 EBUILD rspamd-2.7-r104.ebuild 2714 BLAKE2B 66f8af6dc6c41333c6adfc7109d18fb4afe3add890c7599488f411d7605ce88ae401a5d9460dd0c4fd732ccfcc8409ea38fb1ff05f666dafb2846d7dc043316c SHA512 3f90efea931ce5c42ceda477879124803ab6c07b8633480ec27c12869cc8645804b262b7a44db540cafb2f6045a44eeda58cfd994645ddc9739474339ca29f70
 EBUILD rspamd-3.0-r4.ebuild 3005 BLAKE2B d92759892eab41d6c0674c13b2cdff521df58c8895d2f530010df694e352634dadeeb835ab6cfbd7d543e085e6bbd7f7d24357a56c0be4c82581b9a7e41845ac SHA512 d75a91150729eac9ea6f1dcae227f45cbf0e8b305795e9d72e42d50312c765e3ab9a1bb2573abbd0b0676d805d5cb073401f6b0fc8d00ed9639d61d8f372e94a
 EBUILD rspamd-3.1-r2.ebuild 2926 BLAKE2B acad05d3c35d53dc4c50e5f651f09fedc77dc0c7ec93c35f8e1adedc0b1e208d1076a599475d0d14ee2d6f831143579a2139ea9de6ccb0c66d534ab78de50bb6 SHA512 c5e495833dc636dd94657c5afb10b4dacaffca04441a35287514dcb7d0add3c0d9a8da8025a8d320bc95c169ed82f70922298225d2f8c9416a8c15d5c97a39b1
 EBUILD rspamd-3.2.ebuild 2904 BLAKE2B 1104dbd6d492d327b005708a4009829e53af0be6b58093d4795e1b2461c6287608246bf8f16f3d59dde8410141544e8b0669541cf43768f30539a728de9668a3 SHA512 c81efb5e723aa945ff974726b2ae72fee2d365b549f71628ccfdab8ac95a0af4919aae9eeaccabce4711b74debfffeb0efe67de50c6f4f62ed990d88f29db03d
-EBUILD rspamd-9999.ebuild 2957 BLAKE2B 9bdfb834dc41c15d8f6c2167cda32e609d833d7f94d6880215198f5c368202e5629f545723014318c6e2e28137c6e15eec4f2cfdee2c126cf554918ccb2c097d SHA512 793127e2802abba5779289e6e35765913f46a319722dbd182518eb098044922beda534d0343659541226e815ad8c7cf069c26ac4197295fe772c8336c23ef45f
-MISC metadata.xml 619 BLAKE2B 4146079273f7d9f592e37a9bcfb1ea1ec70191d0146b4f628234f33a4fe3ac2e0f1f642ae2c6ae6924f86f4d8f8448d23ceb5f813060d07af493b8ec93716acc SHA512 d0ab9bdb65773453a899bc1032e6698af5596e17cdc7153fbfe1b6004060ee4e654a03e70f9bc50f11e1ad48330dc4578a8b380381224c298370ea9489f239c2
+EBUILD rspamd-3.3.ebuild 2962 BLAKE2B 1ce9fae978e5ddafa8f887f5499585fba244774af96391639ce46b039bfbcc0cc409d8bc29acf1757d3a11b34d07d67e8498b6b8d5b540ca215142fb2549bdbe SHA512 d8c65eeb8f5be736249b2f7fbd573f669ad1a66ae95a5324de7d952086d3d17d9fb1b9c68630c37e28b8fd4cb508dfc12a0e24f2461904614c3fff46083bd37f
+EBUILD rspamd-9999.ebuild 2962 BLAKE2B 1ce9fae978e5ddafa8f887f5499585fba244774af96391639ce46b039bfbcc0cc409d8bc29acf1757d3a11b34d07d67e8498b6b8d5b540ca215142fb2549bdbe SHA512 d8c65eeb8f5be736249b2f7fbd573f669ad1a66ae95a5324de7d952086d3d17d9fb1b9c68630c37e28b8fd4cb508dfc12a0e24f2461904614c3fff46083bd37f
+MISC metadata.xml 617 BLAKE2B ba8fa4a2dd3e0ae82670c7573d59efea267cb2daf3f2332d3c66d97ce8a96b2e1385af688ed9ebb734698fe3439adbc707dc1ab6be80e3651feb5fe07ed0ace5 SHA512 c3b55719e48afcb581eb9ff9bfcde69cb72cfab4341624fefb5e15d68424099d9b4834cc2979391d8681ed081ec1b2aa1eb764e11a9a635960abeedf98ba52dc
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 @@
     <name>Proxy Maintainers</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">vstakhov/rspamd</remote-id>
+    <remote-id type="github">rspamd/rspamd</remote-id>
   </upstream>
   <use>
     <flag name="pcre2">Use <pkg>dev-libs/libpcre2</pkg></flag>
diff --git a/mail-filter/rspamd/rspamd-3.3.ebuild b/mail-filter/rspamd/rspamd-3.3.ebuild
new file mode 100644
index 000000000000..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} == *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-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
+
+		-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"
+}
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index 7874f481a0d1..b6932290133a 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.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"