gentoo auto-resync : 23:02:2024 - 11:40:30

3 files changed, 165 insertions, 0 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 263574d5cb8b..e5a4e7baa81f 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index c161a9233225..dda1264cb48d 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -13,11 +13,13 @@ DIST rspamd-3.7.4.tar.gz 5903754 BLAKE2B d13b3451b4a6a7c5e8644ba57196190065edda2
 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
 EBUILD rspamd-3.6-r1.ebuild 3664 BLAKE2B f38c683a2727f207d6d22c746f059d8d3d34033fb03b16ae473a42fc18f0de1e2785305ebb59cb1ac6fea282b0b23b88832950a6d152d472f24c90a447e549df SHA512 d09d7775afa19372cdf743c2f810658af624ee428acf98130a0bd74e209b15bfe79a82f32ada966d4dad065bfe070730444a4a34ca9621cc43e019792e6f603c
 EBUILD rspamd-3.7.4-r1.ebuild 3821 BLAKE2B 13fdda81d9b87279b3d92b20fd0175b3008a13516911b7cf914bca89a1b7f3fb8b3ad0574dc6bf6d43bd52e8f3d0967c228ad1cf6e1417d7c396041c070c0609 SHA512 5174a0af107d763d8955b867a1d356b15ec660fa810a1c957c77eb208972caecd5838976cd59e2113f5e6e870483f77ee42ead7f9746a3b8192e42acb0356511
 EBUILD rspamd-3.7.4.ebuild 3852 BLAKE2B b864dc5f33403b81404a87c64794d9ee6792c87b0db354cd771dc222fa0c4ed8c5a5c3f3614784a7417fe71140af0eb093032ab8eb4c8010474fe27964daf3f5 SHA512 c0b62e12854cb6e03440cf12077fe95fa8aa583082927db52674db0d86e0c3477b2f1a4a69f91196dc8a3bc90e6fa4332f49221863e2233472ef0fedbd78c97f
 EBUILD rspamd-3.7.5.ebuild 3772 BLAKE2B e196520daf5c4ddb7ea1a71d64436527be997dec00c70709aec8b7d9339e6c5c25e30c98454e724873940e9f489662026d9218b18c1cb00946c335544a7b77e5 SHA512 554e51270ed47f09d5518127c80abf3fb16f14eecf8bd21759b2ee9ad0c5d29d12a6ff87e2720376a1253f0e71d8151442f1e7a7dab0ec7fe6bf72109317820e
 EBUILD rspamd-3.8.1.ebuild 3778 BLAKE2B 506c4b2de233b44674e60b6361e34ad13be23ac2e72aaea23d338d8bd62a10e76463b5677bf3fa829c1adcb2953a1d2659c4605a90896310900024f34598d6ab SHA512 9ca8e5de5af30a171d01ab5b2024be72d9d0ff93d8f16c5753b41309dd0e97e7d3f946c4b7a98ce142179603f252e5dd7c95a2ac975f83ffb73e25f731df12dc
 EBUILD rspamd-3.8.2.ebuild 4120 BLAKE2B 98bfb3a8d863ec99e2ea10d21259772ba534dc7b968ce52b179ef16f45970162f1f737bcc13f3ed5e73f39958611b5d343bafbcb46da09b16295fddcee253983 SHA512 d9399b70c81c560ed6b0aaf54323cbd6d5c2220d4517c6e9b5e689700934fe6dfc4fa25fc41f0f50cdc064b62848022700da91015b3b3597b746ce53f5b354df
+EBUILD rspamd-3.8.3.ebuild 4120 BLAKE2B 98bfb3a8d863ec99e2ea10d21259772ba534dc7b968ce52b179ef16f45970162f1f737bcc13f3ed5e73f39958611b5d343bafbcb46da09b16295fddcee253983 SHA512 d9399b70c81c560ed6b0aaf54323cbd6d5c2220d4517c6e9b5e689700934fe6dfc4fa25fc41f0f50cdc064b62848022700da91015b3b3597b746ce53f5b354df
 EBUILD rspamd-9999.ebuild 3603 BLAKE2B f810cdd62662c19c4c00ad69197c28b7eb00fa4bf22cc23f35fef0e070d4f2ecc28acb459f26db01537e3e297991ed36d2e3a1b0c86b426dda7cc45f55cc2fa2 SHA512 98f7aeb4b1cf55d99414be0e621a77938df01c8a1b56435d739d8023adb4248330d44a02a5f850bb970e9fafb415c2d3535f5bdb8cc325439f9a31f3608b7f99
 MISC metadata.xml 481 BLAKE2B e0eca393f0dfb4a53e1ea8c68c4daab3d2ac874f674de4468870ae826909f05e6576ca6a3fab0d87482ca21a53c85b51c346bee297e9ce9181acdce5f94b9e29 SHA512 d084bbf11c5ab839f6b6072cb574fa12966e7075ee7dbcd9829acfc458f81b09b34b38bc90baedc2c3b48b2f8c9531005d2f688994714c864a992a2b30ff7619
diff --git a/mail-filter/rspamd/rspamd-3.8.3.ebuild b/mail-filter/rspamd/rspamd-3.8.3.ebuild
new file mode 100644
index 000000000000..d1d6da7bf192
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.8.3.ebuild
@@ -0,0 +1,163 @@
+# 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/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
+
+		-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"
+
+	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
+}