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

3 files changed, 0 insertions, 148 deletions

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
-