gentoo auto-resync : 07:08:2023 - 09:24:28

7 files changed, 328 insertions, 4 deletions

diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index b569bee46445..85aa863980c9 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,11 +1,17 @@
 AUX rspamd-2.5-unbundle-snowball.patch 758 BLAKE2B 4e419c4e70d5726309c17ca759b8917feb2d52842cde06453821a8b1964ed8165a5f3536ab917a8362b44b40858d1660ae7c7887fee513e9e6fb681d24589255 SHA512 5257921bdeb5febef99feebd03d291aad009a6b8a44c325305532bae7aec35456042b4813338f175c4a59aa80cce3178118d9e1e4bc5a500f42e5364c06a4dda
 AUX rspamd-3.0-cmake-lua-version.patch 1444 BLAKE2B b44ada90d1d4d59f000ab75a5d28545902235c85ccab3408eefb8f034bec0c86f6a62678cc5632c7db61b19e7cc1afff2b92a8f1493c64fbe831b3eca3836322 SHA512 f382af60698dd23e69469d6dfaf3c18cef0f413b22918725aec5dd09ee3f8c339d3a6ce92f46ebca89690ce57cab3295ab3093b502af7bce4ce5576c7fd3de9a
 AUX rspamd-3.2-unbundle-lua.patch 1749 BLAKE2B 5cab7403c2a2db85e224fddb5ce13196e10eb0a1abb4bed85a7112b8864f9635e04ba763783811a337d6d9bd87ce68250c9201c0339bb596f95f322efaa6e733 SHA512 649a02af6682e1e76f4be677d61a93d5c78997bda6fd13982791744747c185f53d7a4261b24222bc0dd626319da0632828a590806ec7b305595297164e89407a
+AUX rspamd-3.6-cmake-lua-version.patch 2030 BLAKE2B 0c40d69e90acd031446c93965fbb8074aca7c383c92f2b14048d3ca3c6dcb8dbde8a662fa5a5a2bc5364e129588baac7657f6f8e5e3263f368d5c9f47d36c7b2 SHA512 5de0ae00fdc7ba556f6d3a2ccb6889776b608d850021612fc1f34955d96d9056ff067408acf47e0b4b7d42877606ab6b13b23e9be2c2cdf1304ca20b4965c733
+AUX rspamd-3.6-fix-tests.patch 1015 BLAKE2B 7295d40e5ede063593df174c00f6ddcf286965cb079312f5601cf6a222a1157fae055cf9e14e8359dd7858af859fab1ad42682e34f1fcd30ec827ebd107777d2 SHA512 a72f7f2af0f2a6f74f25eb7cbd609f40e009b516ff0e71af708cae14f8a7db40c0084542ef62a3ede402d182c6c4d8b9303a9ed843401f0f4cf11959dbabe4b1
+AUX rspamd-3.6-unbundle-lua.patch 1767 BLAKE2B 0a4a8aeb251618f103f87d66d5d0613c7a3eaa86acaaacfd7023fe8bd8ba8c43abb6b9ad2b20a87166cf7cd855555ec8d9fac0907cce9462d06cf0706ffa6eff SHA512 6413dbc6864046cd6951f8e5720d46f7e158636f9c9b5fc76636f2c55e6df7982aef46ae144e031677230159faf54cf501c12bef147b11fd339f29cd0bc437d4
+AUX rspamd-3.6-unbundle-snowball.patch 741 BLAKE2B 9ff27c5434eb15808ae81775bcef8591010872737badf91aba28ecdd784158780f4b74774bb1f2c1581758be733040893a59926b8f5e3135fd7d166fd05ea63b SHA512 924599202e9b7cfddf17bc983053c01e771af791a7ae2f3d9248809d97779d5bfc15ac6f212892b5eedbc98132779ae5d6519279ee2231cef99be97a2c9d8a3b
 AUX rspamd-r1.logrotate 305 BLAKE2B 58e816e54fd0a7e977dd2f6dcf97617c188888ffea66769ef60ce799f980e2814221734fee7b47c93790a5bbfecbb2f315f93c84bec9dd29b0f80c15e1b9e349 SHA512 0515d31a890058194106d9b8960d77909914986e73619dede751be2efb9592a41f90f15599310b5d6d027c3a203df412c8379ade7df09ecdfd4dcf43bfff4fa7
 AUX rspamd-r7.init 1357 BLAKE2B 90227e0980397a256e6136cac4a4a4d143130d82a211bfd4894d5f8deb85113e0b219e6453257d548ec3d80de24241e6ecfc2b0a4178cb344c8c6549d96e549b SHA512 89a079d32b7d8c5a037c7bb2ab6825624ce89ea4b25893bcf6f49befc0c7b924b51d48b30bf61c4b3ea5bc3ccbaba16664c7df52236debda0bdb58f1adf8867a
 AUX rspamd.conf 908 BLAKE2B 9d8c310c00990f47012e9d1710fbb7567ae5b0e92a411d3fb2696bfb32b70c31ceeaded873f06c759a471d534fb872656907e73ee095150fae384de4df6e9946 SHA512 753011de167af9261cc67676357aadf34d0b160d343a20d5efe8b3389e8a604775b7a6abbaad3174acae7df5579b52b4ba8a0a714419084befedfa96a3a8a9b1
 AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4abe3b3d3e6046d362dae9efc723dd675dff8f1c1df9d05c09e539fcd251382cd9fc5e92351ece8a9 SHA512 1c7e6b79a05cdf9a886c6e233417a0d7b398a1e27ddd3b19c3a595afd50e502a7fd7c09a3499cb9fe6e0291b8493d150550b094c8bf6e2221b71915239c72ef8
 DIST rspamd-3.5.tar.gz 5806722 BLAKE2B 547cd9bb26942dc584d1f4b164e61bdb15505a56399fa19b358b7d7525ee983acc8d5ae1fdb3de340e3461a03aedbb48266fd81404c1f4a2e8fc5bd6735d9a62 SHA512 39c87d5dfd9ae1fc7709e19967eac5e7c7dc83fa070dfebbb7ab5411d7d50d6e6f10248ada717cf1cb3f6ff6c5bfb4d31fd87e1a7e1b2e5f876f6be7b5705623
+DIST rspamd-3.6.tar.gz 5843907 BLAKE2B 2ccb3e65a14624d48540bd3e2d034fec0dd89cd75032ade3ca74ded09cee6ed67f670c31035b18583b850cc4efeb21b44f97ec2c35d518a49b0c4e6f0eb8c90f SHA512 d99e2a60eec94eb39902454a8041eeb76f673c9f784849128766323a218d6c419755e0f8819e2a6921ca08c6a7d63660dc87bc911f808fb4a67d29e8fbfc571b
 EBUILD rspamd-3.5-r1.ebuild 3794 BLAKE2B 715366013f8ec70da9eb03d1adec32772ad20272915765fe57909e9b39c065d1dc80bf5d86764db394cae9963e3a4b40aae6b180ab2ee72576d6d92601a872cc SHA512 6e01e65d9a9873a6c966017092c975437f010cbf1010bab7330b7ce7faf5c53db730c849d118b7b292ce1761812bca76877271554326b346bd9b00f7c0430412
-EBUILD rspamd-9999.ebuild 3016 BLAKE2B 04fd0a9836987227fedde2fd2c70e35560bef8d772e274d807a52eba6357e09ac8e6cd7965ce8b1aa2b5eee3a332773a9e8a5d3444bbe1d6b777e9737ded6f6e SHA512 e3bbd88184df37490dcd2292af7ff5e88ef0e6760792135de32d66034c7b79c515df02119f3e0ccb4ca5cbc6aa42e852abd95d794b4ed57cd5127d17ee9be868
+EBUILD rspamd-3.6.ebuild 3575 BLAKE2B b3f5e9fad1522309077e5bbdaa4daa73363290fb6bbc2b7699b97f2afc88a8b9a07962a6edc4ee28de655f6165f8ce5c5c413b5d16a95f800a72419d46d326b5 SHA512 7ba3dabe8c9cbbeb4a12583a944f4b0fc63a07ec83eaf4c4b83011a90e498221b3f9e2bff4de6fec383d34b8f7513dffedba510ee80f849ea72a4f1a820b2d77
+EBUILD rspamd-9999.ebuild 3016 BLAKE2B 91609c8fdce0395face7e1b9c82fc5c66597c56f36d2d378d352f14b62089daf366c49225d932076cfd29e1de597e9316638580c1095993dba36d9d00021de92 SHA512 1ee04859280ba1eb679e018b039b13e2aa2f437d5b2fca66524b8785f2065fcda87b2b1ee8e26860ef4666b91f2d72590f018ea3f3b49f60817acf8110e9b797
 MISC metadata.xml 554 BLAKE2B 65f4d0c5cd49f3caad6aeb0ab37bbba43505faf800491ebfa9af8366511bb46243a1ec873d7944cbe77dbb554beef8318a76f98dd4be69407b7befa3272a69b0 SHA512 d9a82aed6a7c63dad8727be080458c165e5c5f4a3ae87330c82447bc21d87c6c10730d0622fecbc5d255ca97312992c4f45c219ad8edcf2a9f4a386a79265d22
diff --git a/mail-filter/rspamd/files/rspamd-3.6-cmake-lua-version.patch b/mail-filter/rspamd/files/rspamd-3.6-cmake-lua-version.patch
new file mode 100644
index 000000000000..9a08eaac28b0
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.6-cmake-lua-version.patch
@@ -0,0 +1,64 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bea0af828..f72304f05 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -149,55 +149,8 @@ IF (ENABLE_LUAJIT MATCHES "ON")
+ ELSE (ENABLE_LUAJIT MATCHES "ON")
+ 
+     ProcessPackage(LIBLUA LIBRARY "lua"
+-            "lua-5.3"
+-            LIB_SUFFIXES "lua5.3"
+-            INCLUDE lua.h INCLUDE_SUFFIXES
+-            "include/lua-5.3"
+-            "include/lua5.3"
+-            "include/lua53"
+-            "include/lua"
+             ROOT ${LUA_ROOT}
+-            MODULES lua53
+-            OPTIONAL)
+-
+-    IF (NOT WITH_LIBLUA)
+-        ProcessPackage(LIBLUA LIBRARY "lua"
+-                "lua-5.4"
+-                LIB_SUFFIXES "lua5.4"
+-                INCLUDE lua.h INCLUDE_SUFFIXES
+-                "include/lua-5.4"
+-                "include/lua5.4"
+-                "include/lua54"
+-                "include/lua"
+-                ROOT ${LUA_ROOT}
+-                MODULES lua54
+-                OPTIONAL)
+-        IF (NOT WITH_LIBLUA)
+-            ProcessPackage(LIBLUA LIBRARY "lua"
+-                    "lua-5.2"
+-                    LIB_SUFFIXES "lua5.2"
+-                    INCLUDE lua.h INCLUDE_SUFFIXES
+-                    "include/lua-5.2"
+-                    "include/lua5.2"
+-                    "include/lua52"
+-                    "include/lua"
+-                    ROOT ${LUA_ROOT}
+-                    MODULES lua52
+-                    OPTIONAL)
+-
+-            IF (NOT WITH_LIBLUA)
+-                ProcessPackage(LIBLUA LIBRARY "lua"
+-                        "lua-5.1"
+-                        INCLUDE lua.h INCLUDE_SUFFIXES
+-                        "include/lua-5.1"
+-                        "include/lua5.1"
+-                        "include/lua51"
+-                        "include/lua"
+-                        ROOT ${LUA_ROOT}
+-                        MODULES lua51)
+-            ENDIF ()
+-        ENDIF ()
+-    ENDIF ()
++            MODULES lua)
+ ENDIF (ENABLE_LUAJIT MATCHES "ON")
+ 
+ IF (ENABLE_JEMALLOC MATCHES "ON" AND NOT SANITIZE)
+-- 
+2.41.0
+
diff --git a/mail-filter/rspamd/files/rspamd-3.6-fix-tests.patch b/mail-filter/rspamd/files/rspamd-3.6-fix-tests.patch
new file mode 100644
index 000000000000..33e851261f46
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.6-fix-tests.patch
@@ -0,0 +1,23 @@
+From: Duncan Bellamy <dunk@denkimushi.com>
+Date: Thu, 3 Aug 2023 22:08:06 +0000
+Subject: [PATCH] [Fix] CMakeLists.txt remove whitespace added by linter as it
+ makes tests fail
+
+Upstream-PR: https://github.com/rspamd/rspamd/pull/4560
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5402c4806..efda209ca 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -777,7 +777,7 @@ IF (NOT DEBIAN_BUILD)
+     ADD_CUSTOM_TARGET(check DEPENDS rspamd-test-cxx rspamd-test)
+     ADD_CUSTOM_TARGET(run-test DEPENDS check
+             COMMAND test/rspamd-test-cxx
+-            COMMAND sh -c 'LUA_PATH= "${CMAKE_SOURCE_DIR}/lualib/?.lua\;${CMAKE_SOURCE_DIR}/lualib/?/?.lua\;${CMAKE_SOURCE_DIR}/lualib/?/init.lua\;${CMAKE_SOURCE_DIR}/contrib/lua-?/?.lua"
++            COMMAND sh -c 'LUA_PATH="${CMAKE_SOURCE_DIR}/lualib/?.lua\;${CMAKE_SOURCE_DIR}/lualib/?/?.lua\;${CMAKE_SOURCE_DIR}/lualib/?/init.lua\;${CMAKE_SOURCE_DIR}/contrib/lua-?/?.lua"
+             test/rspamd-test -p /rspamd/lua')
+ ENDIF (NOT DEBIAN_BUILD)
+ 
+-- 
+2.41.0
+
diff --git a/mail-filter/rspamd/files/rspamd-3.6-unbundle-lua.patch b/mail-filter/rspamd/files/rspamd-3.6-unbundle-lua.patch
new file mode 100644
index 000000000000..78a2a49d796f
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.6-unbundle-lua.patch
@@ -0,0 +1,61 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bea0af828..d7a4eed14 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -641,10 +641,6 @@ ELSE ()
+     find_package(doctest)
+ ENDIF ()
+ 
+-IF (NOT WITH_LUAJIT)
+-    ADD_SUBDIRECTORY(contrib/lua-bit)
+-ENDIF ()
+-
+ IF (ENABLE_LUA_REPL MATCHES "ON")
+     ADD_SUBDIRECTORY(contrib/replxx)
+     SET(WITH_LUA_REPL 1)
+@@ -742,7 +738,6 @@ ENDFOREACH (LUA_LIB)
+ 
+ # Install lua fun library
+ INSTALL(FILES "contrib/lua-fun/fun.lua" DESTINATION ${LUALIBDIR})
+-INSTALL(FILES "contrib/lua-argparse/argparse.lua" DESTINATION ${LUALIBDIR})
+ INSTALL(FILES "contrib/lua-tableshape/tableshape.lua" DESTINATION ${LUALIBDIR})
+ INSTALL(FILES "contrib/lua-lupa/lupa.lua" DESTINATION ${LUALIBDIR})
+ INSTALL(FILES "contrib/lua-lpeg/lpegre.lua" DESTINATION ${LUALIBDIR})
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5dee8e610..a90f8d52d 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -205,10 +205,6 @@ IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
+ 	ADD_DEPENDENCIES(rspamd-server rspamd-clang)
+ ENDIF()
+ 
+-IF (NOT WITH_LUAJIT)
+-	TARGET_LINK_LIBRARIES(rspamd-server rspamd-bit)
+-ENDIF()
+-
+ IF (ENABLE_SNOWBALL MATCHES "ON")
+ 	TARGET_LINK_LIBRARIES(rspamd-server stemmer)
+ ENDIF()
+diff --git a/src/lua/lua_common.c b/src/lua/lua_common.c
+index b543ae5db..7a93934fd 100644
+--- a/src/lua/lua_common.c
++++ b/src/lua/lua_common.c
+@@ -904,10 +904,6 @@ rspamd_lua_wipe_realloc(void *ud,
+ 	return NULL;
+ }
+ 
+-#ifndef WITH_LUAJIT
+-extern int luaopen_bit(lua_State *L);
+-#endif
+-
+ static unsigned int lua_initialized = 0;
+ 
+ lua_State *
+@@ -975,7 +971,6 @@ rspamd_lua_init(bool wipe_mem)
+ 	luaopen_parsers(L);
+ 	luaopen_compress(L);
+ #ifndef WITH_LUAJIT
+-	rspamd_lua_add_preload(L, "bit", luaopen_bit);
+ 	lua_settop(L, 0);
+ #endif
+ 
diff --git a/mail-filter/rspamd/files/rspamd-3.6-unbundle-snowball.patch b/mail-filter/rspamd/files/rspamd-3.6-unbundle-snowball.patch
new file mode 100644
index 000000000000..5779142b7b10
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.6-unbundle-snowball.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bea0af828..00778100c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -115,7 +115,6 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/"
+         "${CMAKE_SOURCE_DIR}/contrib/fpconv"
+         "${CMAKE_SOURCE_DIR}/contrib/libottery"
+         "${CMAKE_SOURCE_DIR}/contrib/cdb"
+-        "${CMAKE_SOURCE_DIR}/contrib/snowball/include"
+         "${CMAKE_SOURCE_DIR}/contrib/librdns"
+         "${CMAKE_SOURCE_DIR}/contrib/aho-corasick"
+         "${CMAKE_SOURCE_DIR}/contrib/lc-btrie"
+@@ -617,7 +616,6 @@ ELSE ()
+     ADD_DEFINITIONS(-DSYS_ZSTD)
+ ENDIF ()
+ IF (ENABLE_SNOWBALL MATCHES "ON")
+-    ADD_SUBDIRECTORY(contrib/snowball)
+     SET(WITH_SNOWBALL 1)
+ ENDIF ()
+ ADD_SUBDIRECTORY(contrib/libucl)
diff --git a/mail-filter/rspamd/rspamd-3.6.ebuild b/mail-filter/rspamd/rspamd-3.6.ebuild
new file mode 100644
index 000000000000..fb768118313d
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.6.ebuild
@@ -0,0 +1,150 @@
+# 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.6-cmake-lua-version.patch"
+	"${FILESDIR}/rspamd-3.6-unbundle-lua.patch"
+	"${FILESDIR}/rspamd-3.6-unbundle-snowball.patch"
+	"${FILESDIR}/rspamd-3.6-fix-tests.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 b60d7d586587..8d0f80ea85ed 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -68,9 +68,9 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/rspamd-3.0-cmake-lua-version.patch"
-	"${FILESDIR}/rspamd-3.2-unbundle-lua.patch"
-	"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
+	"${FILESDIR}/rspamd-3.6-cmake-lua-version.patch"
+	"${FILESDIR}/rspamd-3.6-unbundle-lua.patch"
+	"${FILESDIR}/rspamd-3.6-unbundle-snowball.patch"
 )
 
 src_prepare() {