summaryrefslogtreecommitdiff
path: root/mail-filter/rspamd/files/rspamd-3.2-unbundle-lua.patch
diff options
context:
space:
mode:
Diffstat (limited to 'mail-filter/rspamd/files/rspamd-3.2-unbundle-lua.patch')
-rw-r--r--mail-filter/rspamd/files/rspamd-3.2-unbundle-lua.patch61
1 files changed, 61 insertions, 0 deletions
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
+