gentoo auto-resync : 17:11:2023 - 16:57:03

6 files changed, 26 insertions, 175 deletions

diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 2d56ff759d8e..c651a2c853fb 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,6 +1,3 @@
-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-memleak-fix.patch 1128 BLAKE2B d186839ceee2e7b050c53cef6ad2456595275f9bcb5bf4447a21feba51888d18fc03b6b21b05d8d4c4c55f5f3a1c9237559330afd0526c21b20e6b33d27dc543 SHA512 ba02cfc1a4132d4c58568fd4977fcdf9b364d7f49ad4553f583abdee6fcb1c12122653a8d7b33e5fd6a63f0c51a0a4d78f8929aa71fde4d907d4c5f2935e61e4
@@ -10,9 +7,9 @@ AUX rspamd-r1.logrotate 305 BLAKE2B 58e816e54fd0a7e977dd2f6dcf97617c188888ffea66
 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
+DIST rspamd-3.7.4.tar.gz 5903754 BLAKE2B d13b3451b4a6a7c5e8644ba57196190065edda2fc48e7245ef7e0094cb90838760cc124a2cf8d0b4b7519c7583284f6883fbcd4bf3a6489496b5e52234a36c21 SHA512 a82696957417f7197b59e614012176626b4fdf1464ed38ce57552c8a02fe2e426504e0b0780ab4f36d208a11ae4d1921bacee52341c8a906b4ab19c1719fd116
 EBUILD rspamd-3.6-r1.ebuild 3664 BLAKE2B f38c683a2727f207d6d22c746f059d8d3d34033fb03b16ae473a42fc18f0de1e2785305ebb59cb1ac6fea282b0b23b88832950a6d152d472f24c90a447e549df SHA512 d09d7775afa19372cdf743c2f810658af624ee428acf98130a0bd74e209b15bfe79a82f32ada966d4dad065bfe070730444a4a34ca9621cc43e019792e6f603c
-EBUILD rspamd-9999.ebuild 3016 BLAKE2B 91609c8fdce0395face7e1b9c82fc5c66597c56f36d2d378d352f14b62089daf366c49225d932076cfd29e1de597e9316638580c1095993dba36d9d00021de92 SHA512 1ee04859280ba1eb679e018b039b13e2aa2f437d5b2fca66524b8785f2065fcda87b2b1ee8e26860ef4666b91f2d72590f018ea3f3b49f60817acf8110e9b797
+EBUILD rspamd-3.7.4.ebuild 3597 BLAKE2B c49fc1185de8996bf32446d0679e2d4eaca1974f6abfdc8690ea288f2314dd8e5bfce0414b72877ff2e6f89bc64b475afd8008fac36807b15a819d24ccb0eca8 SHA512 c5fdeb79e8129c9467ec089f1f5f99b0ff13450960c3dc7ec42f36402e49b3a8709b9398c7b4ca041aaf7feabf45df1da474427c1c294a25abae907c14e48a10
+EBUILD rspamd-9999.ebuild 3080 BLAKE2B 056afb9f2ca183f1eb789ea0419f13ac443d14f3b8b8479970f76cf0c0242c3151229a4e95bdbe27e7f4baa9d04b8762bc4c7ce8c54211c35cb29bfe2f9df117 SHA512 832e8f1387817ede72781b4158687153bf5436d096eb95225cdfff5d26f9771b2c4cf3ecf76897f5ffd18ea96168aa64fe59e5ec270d877f68257611a69da0a4
 MISC metadata.xml 554 BLAKE2B 65f4d0c5cd49f3caad6aeb0ab37bbba43505faf800491ebfa9af8366511bb46243a1ec873d7944cbe77dbb554beef8318a76f98dd4be69407b7befa3272a69b0 SHA512 d9a82aed6a7c63dad8727be080458c165e5c5f4a3ae87330c82447bc21d87c6c10730d0622fecbc5d255ca97312992c4f45c219ad8edcf2a9f4a386a79265d22
diff --git a/mail-filter/rspamd/files/rspamd-2.5-unbundle-snowball.patch b/mail-filter/rspamd/files/rspamd-2.5-unbundle-snowball.patch
deleted file mode 100644
index 10b56fa977ad..000000000000
--- a/mail-filter/rspamd/files/rspamd-2.5-unbundle-snowball.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ad989f7f2..d08496998 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -108,7 +108,6 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/"
- 		"${CMAKE_SOURCE_DIR}/contrib/libottery"
- 		"${CMAKE_SOURCE_DIR}/contrib/xxhash"
- 		"${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"
-@@ -586,7 +585,6 @@ ADD_SUBDIRECTORY(contrib/fpconv)
- ADD_SUBDIRECTORY(contrib/lc-btrie)
- ADD_SUBDIRECTORY(contrib/libottery)
- IF(ENABLE_SNOWBALL MATCHES "ON")
--	ADD_SUBDIRECTORY(contrib/snowball)
- 	SET(WITH_SNOWBALL 1)
- ENDIF()
- ADD_SUBDIRECTORY(contrib/libucl)
--- 
-2.24.1
-
diff --git a/mail-filter/rspamd/files/rspamd-3.0-cmake-lua-version.patch b/mail-filter/rspamd/files/rspamd-3.0-cmake-lua-version.patch
deleted file mode 100644
index 55665b887c3b..000000000000
--- a/mail-filter/rspamd/files/rspamd-3.0-cmake-lua-version.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b53793008..5d092d654 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -147,55 +147,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.26.3
-
diff --git a/mail-filter/rspamd/files/rspamd-3.2-unbundle-lua.patch b/mail-filter/rspamd/files/rspamd-3.2-unbundle-lua.patch
deleted file mode 100644
index 36aed009c6c8..000000000000
--- a/mail-filter/rspamd/files/rspamd-3.2-unbundle-lua.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-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-3.5-r1.ebuild b/mail-filter/rspamd/rspamd-3.7.4.ebuild
index eaa2b34643f9..7f70037f8cbe 100644
--- a/mail-filter/rspamd/rspamd-3.5-r1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.7.4.ebuild
@@ -3,10 +3,7 @@
 
 EAPI=8
 
-# lua5-{3,4} were dropped due to bug #903577. This issue has been resolved
-# upstream, see https://github.com/rspamd/rspamd/issues/4455. They will be
-# restored with the next version bump.
-LUA_COMPAT=( lua5-1 luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
 
 inherit cmake lua-single pax-utils systemd tmpfiles
 
@@ -15,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Rapid spam filtering system"
@@ -33,8 +30,8 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="${LUA_REQUIRED_USE}
 	test? ( lua_single_target_luajit )"
 
-# for <dev-libs/libfmt-10 see https://github.com/rspamd/rspamd/issues/4482
-RDEPEND="${LUA_DEPS}
+RDEPEND="
+	${LUA_DEPS}
 	$(lua_gen_cond_dep '
 		dev-lua/LuaBitOp[${LUA_USEDEP}]
 		dev-lua/lua-argparse[${LUA_USEDEP}]
@@ -45,14 +42,10 @@ RDEPEND="${LUA_DEPS}
 	dev-db/sqlite:3
 	dev-libs/glib:2
 	dev-libs/icu:=
-	dev-libs/libev
-	<dev-libs/libfmt-10:=
 	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
@@ -62,8 +55,11 @@ RDEPEND="${LUA_DEPS}
 	jemalloc? ( dev-libs/jemalloc:= )
 	selinux? ( sec-policy/selinux-spamassassin )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	dev-cpp/doctest
+	dev-libs/libfmt:=
+	>=dev-libs/xxhash-0.8.0
 "
 BDEPEND="
 	dev-lang/perl
@@ -72,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() {
@@ -102,6 +98,9 @@ src_configure() {
 		-DSYSTEM_XXHASH=ON
 		-DSYSTEM_ZSTD=ON
 
+		# For bundled https://github.com/bombela/backward-cpp
+		-DSTACK_DETAILS_AUTO_DETECT=OFF
+
 		-DENABLE_BLAS=$(usex blas ON OFF)
 		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
 		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index 8d0f80ea85ed..8a3804be1663 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -30,7 +30,8 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="${LUA_REQUIRED_USE}
 	test? ( lua_single_target_luajit )"
 
-RDEPEND="${LUA_DEPS}
+RDEPEND="
+	${LUA_DEPS}
 	$(lua_gen_cond_dep '
 		dev-lua/LuaBitOp[${LUA_USEDEP}]
 		dev-lua/lua-argparse[${LUA_USEDEP}]
@@ -41,14 +42,10 @@ RDEPEND="${LUA_DEPS}
 	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
@@ -58,8 +55,11 @@ RDEPEND="${LUA_DEPS}
 	jemalloc? ( dev-libs/jemalloc:= )
 	selinux? ( sec-policy/selinux-spamassassin )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	dev-cpp/doctest
+	dev-libs/libfmt:=
+	>=dev-libs/xxhash-0.8.0
 "
 BDEPEND="
 	dev-lang/perl
@@ -98,6 +98,9 @@ src_configure() {
 		-DSYSTEM_XXHASH=ON
 		-DSYSTEM_ZSTD=ON
 
+		# For bundled https://github.com/bombela/backward-cpp
+		-DSTACK_DETAILS_AUTO_DETECT=OFF
+
 		-DENABLE_BLAS=$(usex blas ON OFF)
 		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
 		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)