gentoo auto-resync : 15:12:2023 - 20:53:45

3 files changed, 157 insertions, 0 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index b881970e8933..d9b150fc6e0a 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 3bb321dec28b..2cfc7fd36dea 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -10,8 +10,10 @@ AUX rspamd.conf 908 BLAKE2B 9d8c310c00990f47012e9d1710fbb7567ae5b0e92a411d3fb269
 AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4abe3b3d3e6046d362dae9efc723dd675dff8f1c1df9d05c09e539fcd251382cd9fc5e92351ece8a9 SHA512 1c7e6b79a05cdf9a886c6e233417a0d7b398a1e27ddd3b19c3a595afd50e502a7fd7c09a3499cb9fe6e0291b8493d150550b094c8bf6e2221b71915239c72ef8
 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
 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 3773 BLAKE2B 55835dccc1e923bceff0df464b683e4ff9dce16e22166435055ffd142b6beabcbb992f47bac439a4ea775a3c1fa52e6c12e554cc9ca594c691b6413bfd23da35 SHA512 c188bb2effea81372b4e767e52a2f0762ccb9d9401ec42dbb451bbc1cd52db499be85c61434dd1c1bbe128c0c6c489c01f33845cac906b0bb049e7a676ad6358
 EBUILD rspamd-9999.ebuild 3261 BLAKE2B b98d31b7705fbb803101dc27b9d546f629aaa3817fc09277287437c084b4148a6c064bdc4edf13613a964e02a060bf0cbee74b75062265b5a264a78a2cfadcf1 SHA512 a978d765efa61421a27c8b603a70b3b83508e6135f8662a3bc661cd2544ef86ecef7f3ae785ee256c94bbefaf1f26719fb0f978f309f91bac64d3e239b6a6b83
 MISC metadata.xml 481 BLAKE2B e0eca393f0dfb4a53e1ea8c68c4daab3d2ac874f674de4468870ae826909f05e6576ca6a3fab0d87482ca21a53c85b51c346bee297e9ce9181acdce5f94b9e29 SHA512 d084bbf11c5ab839f6b6072cb574fa12966e7075ee7dbcd9829acfc458f81b09b34b38bc90baedc2c3b48b2f8c9531005d2f688994714c864a992a2b30ff7619
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 000000000000..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} == *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"
+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
+	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
+}