diff options
Diffstat (limited to 'mail-filter/rspamd/files/rspamd-9999-unbundle-hiredis.patch')
-rw-r--r-- | mail-filter/rspamd/files/rspamd-9999-unbundle-hiredis.patch | 93 |
1 files changed, 93 insertions, 0 deletions
diff --git a/mail-filter/rspamd/files/rspamd-9999-unbundle-hiredis.patch b/mail-filter/rspamd/files/rspamd-9999-unbundle-hiredis.patch new file mode 100644 index 000000000000..875009da41aa --- /dev/null +++ b/mail-filter/rspamd/files/rspamd-9999-unbundle-hiredis.patch @@ -0,0 +1,93 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0afb5feff..966173075 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -170,6 +170,8 @@ ELSE() + ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3) + ENDIF() + ++ProcessPackage(HIREDIS LIBRARY hiredis INCLUDE hiredis.h ++ ROOT ${HIREDIS_ROOT_DIR} MODULES hiredis) + ProcessPackage(ZSTD LIBRARY zstd INCLUDE zstd.h + ROOT ${ZSTD_ROOT_DIR} MODULES libzstd) + ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES include/sqlite3 include/sqlite +@@ -555,9 +557,7 @@ ENDIF(NOT DESTDIR) + + + ################################ SUBDIRS SECTION ########################### +-ADD_SUBDIRECTORY(contrib/hiredis) + SET(WITH_HIREDIS 1) +-INCLUDE_DIRECTORIES(BEFORE "${CMAKE_SOURCE_DIR}/contrib/hiredis") + + LIST(APPEND RSPAMD_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}") + IF(HAVE_FETCH_H) +@@ -604,7 +604,6 @@ ENDIF() + IF (ENABLE_SNOWBALL MATCHES "ON") + LIST(APPEND RSPAMD_REQUIRED_LIBRARIES stemmer) + ENDIF() +-LIST(APPEND RSPAMD_REQUIRED_LIBRARIES rspamd-hiredis) + + LIST(APPEND RSPAMD_REQUIRED_LIBRARIES rspamd-actrie) + LIST(APPEND RSPAMD_REQUIRED_LIBRARIES rspamd-t1ha) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e0e2edd58..4908013da 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -190,7 +190,6 @@ ENDIF() + IF (ENABLE_SNOWBALL MATCHES "ON") + TARGET_LINK_LIBRARIES(rspamd-server stemmer) + ENDIF() +-TARGET_LINK_LIBRARIES(rspamd-server rspamd-hiredis) + + IF (ENABLE_FANN MATCHES "ON") + TARGET_LINK_LIBRARIES(rspamd-server fann) +diff --git a/src/libserver/fuzzy_backend/fuzzy_backend_redis.c b/src/libserver/fuzzy_backend/fuzzy_backend_redis.c +index d1e3e7532..882acdf6a 100644 +--- a/src/libserver/fuzzy_backend/fuzzy_backend_redis.c ++++ b/src/libserver/fuzzy_backend/fuzzy_backend_redis.c +@@ -22,8 +22,8 @@ + #include "cryptobox.h" + #include "str_util.h" + #include "upstream.h" +-#include "contrib/hiredis/hiredis.h" +-#include "contrib/hiredis/async.h" ++#include <hiredis.h> ++#include <async.h> + #include "lua/lua_common.h" + + #define REDIS_DEFAULT_PORT 6379 +diff --git a/src/libserver/redis_pool.c b/src/libserver/redis_pool.c +index 7e835013c..fccf189e1 100644 +--- a/src/libserver/redis_pool.c ++++ b/src/libserver/redis_pool.c +@@ -18,9 +18,9 @@ + #include "contrib/libev/ev.h" + #include "redis_pool.h" + #include "cfg_file.h" +-#include "contrib/hiredis/hiredis.h" +-#include "contrib/hiredis/async.h" +-#include "contrib/hiredis/adapters/libev.h" ++#include <hiredis.h> ++#include <async.h> ++#include <adapters/libev.h> + #include "cryptobox.h" + #include "logger.h" + +diff --git a/src/lua/lua_redis.c b/src/lua/lua_redis.c +index f9dbbdd13..b885a8b61 100644 +--- a/src/lua/lua_redis.c ++++ b/src/lua/lua_redis.c +@@ -17,8 +17,8 @@ + #include "lua_thread_pool.h" + #include "utlist.h" + +-#include "contrib/hiredis/hiredis.h" +-#include "contrib/hiredis/async.h" ++#include <hiredis.h> ++#include <async.h> + + #define REDIS_DEFAULT_TIMEOUT 1.0 + +-- +2.25.3 + |