gentoo resync : 16.04.2022

7 files changed, 218 insertions, 17 deletions

diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 380933e940bc..3ddda0f791a4 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -6,6 +6,7 @@ AUX rspamd-3.0-cmake-lua-version.patch 1444 BLAKE2B b44ada90d1d4d59f000ab75a5d28
 AUX rspamd-3.0-fix-null-dereference.patch 1151 BLAKE2B ac2de9943a6581eb700d5c81b61afb79129fd485f004a4d65ba2ef8a5cf9c7f7e9bcc4e1b19f898fc6e781586c977aa65ac957eeff34766994e5159efe7a30c9 SHA512 acf836d043c38f741287d9d2f7a936f75e9b6ecb0609c58a4f315a10ecb089592feea968a71be2409c31aacd5c56340b6bbe59624cb40982656b50a3b0659e0f
 AUX rspamd-3.0-system-doctest.patch 3087 BLAKE2B 5d61f548bb2feba2fcb5de0eac5af3fd185e00d9c6a13e931f8f61e95a3465f93155a6335d6fb182da626baaf5e378db946219dba4c10994867a48fde3ebe9e7 SHA512 57f6e82319bf1e29d65953072e3c3a1d526c34fb01742080990d4764df35862c88aa4c44c06577a8265f52a401c48ecffd88e109f3abe69255b77ea9284a3cc5
 AUX rspamd-3.0-system-libfmt.patch 1860 BLAKE2B 50754cbcc3bf687fb0274af69d5985b3da2278444819c43d7b51ee11b97776eb49e303f0d606538dd67295efb1e66d0265cc44ad8882a482c01b7733cfc46228 SHA512 6d64681d4ba6f6e93dc2f021041e0cb72309e369daaeb93f42ff9ee34ce6a9ea05db4a7ff21948788717d18d89287d2c0a9454a60b3f9bb9f72dab5be60ce7b2
+AUX rspamd-3.2-unbundle-lua.patch 1749 BLAKE2B 5cab7403c2a2db85e224fddb5ce13196e10eb0a1abb4bed85a7112b8864f9635e04ba763783811a337d6d9bd87ce68250c9201c0339bb596f95f322efaa6e733 SHA512 649a02af6682e1e76f4be677d61a93d5c78997bda6fd13982791744747c185f53d7a4261b24222bc0dd626319da0632828a590806ec7b305595297164e89407a
 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
@@ -13,8 +14,10 @@ AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4ab
 DIST rspamd-2.7.tar.gz 5126227 BLAKE2B 70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930 SHA512 8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7
 DIST rspamd-3.0.tar.gz 5535659 BLAKE2B 605ac59b947b49efb026e04d153df5fc0d56c65712def3f2c54a949db32b8534e634d172a1899cc08e98e0a9da839fc00f0f569dc8c52a743f38bd71b8abaeaa SHA512 1ea6f9ffe58b7f280dbd31e39db6412ebeddda634ca8a669fa5bff2951d17123a5d4a09ec0f366c6b0c0b585f868e646fd49e4d45bd451408675b927ec2557c4
 DIST rspamd-3.1.tar.gz 5566920 BLAKE2B dfb31534e7dbce303729e89537f83eea90d6524a0ccf81633e0d55840f21936985ba5991f2a2ed9ca5594a4a3938f9366f7a1879fc553f41ab52bb89460b87dc SHA512 3c3c06c10d3dfc90e4bc92c7ebaff4bd4854d3b0e56d6476f0223918c4a52f4cc7a8b381b1f867164199ee18ea00eda77ae0315925f3fd71596d610200667178
-EBUILD rspamd-2.7-r103.ebuild 2645 BLAKE2B e2116351088e43ee3c62f9defdf8fa46aa2cbde1889219325130d029dcd73dc476d9015b7c3d01b33240e6f650872da61fef47fe7365029a3b9907ba0bab1e56 SHA512 b82708290ae84d57c3903d965df5c108b4a595d4278569f453f3866d5cc119ed07e41e12e1f4ad54d136d296924671670cf9fe0623c4cfccffc464b0a583f245
-EBUILD rspamd-3.0-r3.ebuild 2936 BLAKE2B f34324cbc30d49cea77200a3761a4b3947a4b645d86c82e601dd4a1d14b20fd546a3c04195aa79d70294ba8bcc6f88b34b3247b649603e40ba6d9ae7f3e2493d SHA512 7d6cb01d02542f8275e40e2ff21e390d95da89942d5b8c58cbee27d5ff825507d3c154881ba126411260933600194eba8739f67dd647d692e2ac0fec730bde4e
-EBUILD rspamd-3.1-r1.ebuild 2864 BLAKE2B bfaa8caacbf747a9d96049a294d0de265911662be4acb555e403600d3bd1e673a183f6f35fedae44a357cebe5a32e87f9e59cf4d0e5746dc4dbec392df088da3 SHA512 02c20b2f2fe26f7eb9d331cb2c99a4d1b571145153eb207344ce81fde76df34ab81303319570329c0f672e2f9087eb555b0dc7f974d79e6144a551fc839d4e2f
-EBUILD rspamd-9999.ebuild 2855 BLAKE2B e97810948f4790f44dedc59fa856823ef0cdfc20d0ae4adc2358d6f2644903fd311fd8dd16e0766e4600d0390c4eab33e5432627b08ec0d906c8da1f4c5caf8f SHA512 8d57c5a91580a969aff87c7c6c09c4d3fb5924226588e861e1bb97f2bb2c289382a857009b130410b32241f06d695c214f7ebaddc519a8db2f7710e521910c94
+DIST rspamd-3.2.tar.gz 5637835 BLAKE2B 8d42b34dacdc818689fd8602abf8c4d5ff2431eb30b2d8fae6e78642ce4361d39a54cb4b981c58cd31205b0f2013978896081e0d7364620312db3fa855d14b1e SHA512 fd3570da24d7f09f48ba6e98c210789b85006c51adaf37336c83a570ef5b9239d4a09491b647464254d3600fbea7c662ec271e9a77ee4108236962490c677a79
+EBUILD rspamd-2.7-r104.ebuild 2660 BLAKE2B 686f0b1654f99906731519e73b397194027bcd620de37bd22f9c6369f948a3b51c3f4fb5a232d651bb53fdb0afafc7cf989021845c62c1dc7b297e73e31af517 SHA512 aed6860f94cd163c11ecb5511ff254a4cdfd6f9719192e460c4d082d9bdf5be89a027eef0ddeef829aab14703d6386ad588d08b7982d0c762bae39cdbcd57984
+EBUILD rspamd-3.0-r4.ebuild 2951 BLAKE2B cfca70ed9b3e396223bd00d55dee0ccc77c447b9b9ffd12efb4c67692b9f85816cc479769ca479ac33a11764790a6b1692079f3c794ba3a1457f1756acc8aeec SHA512 c4a6bd14abce61d2364bbc9aea28d829c0420a4b69ada8075b56a40fed38b6e624e8ac391948371844840e06b41789de0988310a87ae158509c131edeba76b13
+EBUILD rspamd-3.1-r2.ebuild 2879 BLAKE2B 9cb0194aa733c6cf1685b245ba84929f679af58a1967a5b26fda083fc156da5e9c55b60c9e557957d7c29c40d7097ef2b614244fa1d7073d59e92ed25ac6482a SHA512 858e119de3ad4a39efb17131d387fc39ada41263a036b210c3dbb7839aebc0903df2d30dc405f5c6ab32c15fad35a4f33a22c8d533ce858756cea9e04632e305
+EBUILD rspamd-3.2.ebuild 2906 BLAKE2B e1aa6a03336842a7a89cc7685c6281fb80520e3702329f68fa3bb9f916b6d361604edd36950478b4e139c6b331e5a782e3054b95b1f59bf628af8b0fce6d059a SHA512 eef9e18fca0b28fb61bf7d4c27f6e1fcce794c0ee7c2a38c8150fdfe70713366fdaf6dab164b328dde0756aa71df24ca75c987d8ad8660ac5eae60b4ef0cdf05
+EBUILD rspamd-9999.ebuild 2903 BLAKE2B e2ce96b302fa2d7d793a2728b31f2f01d25bd5b67d9b616ba7413e720807c8a0a171f13e98c15fc23c7ffa9ed24e6d5391bf09d5ffbf5c17fea12de78cab4efb SHA512 732916a7d023ac5526ac21175c4731fa533354928a8ee6bf2b0572c5f86bc2cf690431af0169f1c0a760990b17d0f419b2200e12beffa59312a94f52a1d8af56
 MISC metadata.xml 619 BLAKE2B 4146079273f7d9f592e37a9bcfb1ea1ec70191d0146b4f628234f33a4fe3ac2e0f1f642ae2c6ae6924f86f4d8f8448d23ceb5f813060d07af493b8ec93716acc SHA512 d0ab9bdb65773453a899bc1032e6698af5596e17cdc7153fbfe1b6004060ee4e654a03e70f9bc50f11e1ad48330dc4578a8b380381224c298370ea9489f239c2
diff --git a/mail-filter/rspamd/files/rspamd-3.2-unbundle-lua.patch b/mail-filter/rspamd/files/rspamd-3.2-unbundle-lua.patch
new file mode 100644
index 000000000000..36aed009c6c8
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.2-unbundle-lua.patch
@@ -0,0 +1,61 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 096c2e79e..f323bfd40 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -620,10 +620,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)
+@@ -721,7 +717,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 77c8756af..e0476bdc1 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -206,10 +206,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 ab411fa66..85787b31e 100644
+--- a/src/lua/lua_common.c
++++ b/src/lua/lua_common.c
+@@ -923,10 +923,6 @@ rspamd_lua_wipe_realloc (void *ud,
+ 	return NULL;
+ }
+ 
+-#ifndef WITH_LUAJIT
+-extern int luaopen_bit(lua_State *L);
+-#endif
+-
+ lua_State *
+ rspamd_lua_init (bool wipe_mem)
+ {
+@@ -984,7 +980,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/rspamd-2.7-r103.ebuild b/mail-filter/rspamd/rspamd-2.7-r104.ebuild
index e3e4d0e59f1e..8c015b8220b0 100644
--- a/mail-filter/rspamd/rspamd-2.7-r103.ebuild
+++ b/mail-filter/rspamd/rspamd-2.7-r104.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,6 +37,7 @@ RDEPEND="${LUA_DEPS}
 	dev-libs/libsodium:=
 	dev-libs/snowball-stemmer:=
 	sys-apps/file
+	sys-libs/zlib
 	blas? (
 		virtual/blas
 		virtual/lapack
diff --git a/mail-filter/rspamd/rspamd-3.0-r3.ebuild b/mail-filter/rspamd/rspamd-3.0-r4.ebuild
index 54434e12ad55..e8f4e0ccb5a0 100644
--- a/mail-filter/rspamd/rspamd-3.0-r3.ebuild
+++ b/mail-filter/rspamd/rspamd-3.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,6 +42,7 @@ RDEPEND="${LUA_DEPS}
 	dev-libs/libsodium:=
 	dev-libs/snowball-stemmer:=
 	sys-apps/file
+	sys-libs/zlib
 	blas? (
 		virtual/blas
 		virtual/lapack
diff --git a/mail-filter/rspamd/rspamd-3.1-r1.ebuild b/mail-filter/rspamd/rspamd-3.1-r2.ebuild
index d1cc32c3e7bb..9e9406415871 100644
--- a/mail-filter/rspamd/rspamd-3.1-r1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.1-r2.ebuild
@@ -41,6 +41,7 @@ RDEPEND="${LUA_DEPS}
 	dev-libs/libsodium:=
 	dev-libs/snowball-stemmer:=
 	sys-apps/file
+	sys-libs/zlib
 	blas? (
 		virtual/blas
 		virtual/lapack
diff --git a/mail-filter/rspamd/rspamd-3.2.ebuild b/mail-filter/rspamd/rspamd-3.2.ebuild
new file mode 100644
index 000000000000..4446b30d950e
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.2.ebuild
@@ -0,0 +1,129 @@
+# 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 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:=
+	sys-apps/file
+	sys-libs/zlib
+	blas? (
+		virtual/blas
+		virtual/lapack
+	)
+	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
+	jemalloc? ( dev-libs/jemalloc:= )
+"
+# This version is also affected with bug #830624
+DEPEND="${RDEPEND}
+	<dev-cpp/doctest-2.4.7
+"
+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,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_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 b4d4c6d23bae..bbae6a310243 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-{1..4} luajit )
 
@@ -19,7 +19,7 @@ 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 pcre2 test"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit test"
 RESTRICT="!test? ( test )"
 
 # A part of tests use ffi luajit extension
@@ -29,29 +29,33 @@ REQUIRED_USE="${LUA_REQUIRED_USE}
 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-cpp/doctest
 	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:= )
-	dev-libs/openssl:0=[-bindist(-)]
-	pcre2? ( dev-libs/libpcre2:=[jit=] )
-	!pcre2? ( dev-libs/libpcre[jit=] )"
-DEPEND="${RDEPEND}"
+"
+DEPEND="${RDEPEND}
+	dev-cpp/doctest
+"
 BDEPEND="
 	dev-util/ragel
 	virtual/pkgconfig
@@ -59,14 +63,14 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/rspamd-3.0-cmake-lua-version.patch"
-	"${FILESDIR}/rspamd-2.6-unbundle-lua.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-bit,snowball,zstd} || die
+	rm -vrf contrib/{doctest,fmt,lua-{argparse,bit},snowball,xxhash,zstd} || die
 
 	> cmake/Toolset.cmake || die #827550
 
@@ -84,13 +88,14 @@ src_configure() {
 
 		-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=$(usex pcre2 ON OFF)
+		-DENABLE_PCRE2=ON
 	)
 	cmake_src_configure
 }