|
Line
Link Here
|
| 0 |
-- a/CMakeLists.txt |
0 |
++ b/CMakeLists.txt |
|
Lines 174-179
ELSE()
Link Here
|
| 174 |
ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3) |
174 |
ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3) |
| 175 |
ENDIF() |
175 |
ENDIF() |
|
|
176 |
ProcessPackage(ZSTD LIBRARY zstd INCLUDE zstd.h |
| 177 |
ROOT ${ZSTD_ROOT_DIR} MODULES libzstd) |
| 176 |
ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES include/sqlite3 include/sqlite |
178 |
ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES include/sqlite3 include/sqlite |
| 177 |
ROOT ${SQLITE3_ROOT_DIR} MODULES sqlite3 sqlite) |
179 |
ROOT ${SQLITE3_ROOT_DIR} MODULES sqlite3 sqlite) |
| 178 |
ProcessPackage(ICUDATA LIBRARY icudata INCLUDE unicode/ucnv.h |
180 |
ProcessPackage(ICUDATA LIBRARY icudata INCLUDE unicode/ucnv.h |
|
Lines 582-594
ADD_SUBDIRECTORY(contrib/http-parser)
Link Here
|
| 582 |
ADD_SUBDIRECTORY(contrib/fpconv) |
584 |
ADD_SUBDIRECTORY(contrib/fpconv) |
| 583 |
ADD_SUBDIRECTORY(contrib/lc-btrie) |
585 |
ADD_SUBDIRECTORY(contrib/lc-btrie) |
| 584 |
ADD_SUBDIRECTORY(contrib/libottery) |
586 |
ADD_SUBDIRECTORY(contrib/libottery) |
| 585 |
IF(SYSTEM_ZSTD MATCHES "OFF") |
587 |
ProcessPackage(LIBZSTD LIBRARY zstd INCLUDE zstd.h |
| 586 |
ADD_SUBDIRECTORY(contrib/zstd) |
588 |
ROOT ${LIBZSTD_ROOT_DIR} MODULES zstd) |
| 587 |
ELSE() |
589 |
ADD_DEFINITIONS(-DSYS_ZSTD) |
| 588 |
ProcessPackage(LIBZSTD LIBRARY zstd INCLUDE zstd.h |
|
|
| 589 |
ROOT ${LIBZSTD_ROOT_DIR} MODULES zstd) |
| 590 |
ADD_DEFINITIONS(-DSYS_ZSTD) |
| 591 |
ENDIF() |
| 592 |
IF(ENABLE_SNOWBALL MATCHES "ON") |
590 |
IF(ENABLE_SNOWBALL MATCHES "ON") |
| 593 |
ADD_SUBDIRECTORY(contrib/snowball) |
591 |
ADD_SUBDIRECTORY(contrib/snowball) |
| 594 |
SET(WITH_SNOWBALL 1) |
592 |
SET(WITH_SNOWBALL 1) |
| 595 |
-- a/src/CMakeLists.txt |
593 |
++ b/src/CMakeLists.txt |
|
Lines 194-205
TARGET_LINK_LIBRARIES(rspamd-server rspamd-http-parser)
Link Here
|
| 194 |
TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb) |
194 |
TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb) |
| 195 |
TARGET_LINK_LIBRARIES(rspamd-server rspamd-lpeg) |
195 |
TARGET_LINK_LIBRARIES(rspamd-server rspamd-lpeg) |
| 196 |
TARGET_LINK_LIBRARIES(rspamd-server lcbtrie) |
196 |
TARGET_LINK_LIBRARIES(rspamd-server lcbtrie) |
| 197 |
IF(SYSTEM_ZSTD MATCHES "OFF") |
197 |
TARGET_LINK_LIBRARIES(rspamd-server zstd) |
| 198 |
TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd) |
|
|
| 199 |
ELSE() |
| 200 |
TARGET_LINK_LIBRARIES(rspamd-server zstd) |
| 201 |
ENDIF() |
| 202 |
TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8) |
198 |
TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8) |
| 203 |
TARGET_LINK_LIBRARIES(rspamd-server fmt) |
199 |
TARGET_LINK_LIBRARIES(rspamd-server fmt) |
| 204 |
IF (ENABLE_CLANG_PLUGIN MATCHES "ON") |
200 |
IF (ENABLE_CLANG_PLUGIN MATCHES "ON") |
| 205 |
-- a/src/client/rspamdclient.c |
201 |
++ b/src/client/rspamdclient.c |
|
Lines 19-30
Link Here
|
| 19 |
#include "libserver/http/http_private.h" |
19 |
#include "libserver/http/http_private.h" |
| 20 |
#include "libserver/protocol_internal.h" |
20 |
#include "libserver/protocol_internal.h" |
| 21 |
#include "unix-std.h" |
21 |
#include "unix-std.h" |
| 22 |
|
22 |
#include <zstd.h> |
| 23 |
#ifdef SYS_ZSTD |
|
|
| 24 |
# include "zstd.h" |
| 25 |
#else |
| 26 |
# include "contrib/zstd/zstd.h" |
| 27 |
#endif |
| 28 |
#ifdef HAVE_FETCH_H |
23 |
#ifdef HAVE_FETCH_H |
| 29 |
#include <fetch.h> |
24 |
#include <fetch.h> |
| 30 |
-- a/src/libserver/cfg_utils.c |
25 |
++ b/src/libserver/cfg_utils.c |
|
Lines 36-47
Link Here
|
| 36 |
#include "contrib/libottery/ottery.h" |
36 |
#include "contrib/libottery/ottery.h" |
| 37 |
#include "contrib/fastutf8/fastutf8.h" |
37 |
#include "contrib/fastutf8/fastutf8.h" |
| 38 |
|
38 |
#include <zstd.h> |
| 39 |
#ifdef SYS_ZSTD |
|
|
| 40 |
# include "zstd.h" |
| 41 |
#else |
| 42 |
# define ZSTD_STATIC_LINKING_ONLY |
| 43 |
# include "contrib/zstd/zstd.h" |
| 44 |
#endif |
| 45 |
#ifdef HAVE_OPENSSL |
39 |
#ifdef HAVE_OPENSSL |
| 46 |
#include <openssl/rand.h> |
40 |
#include <openssl/rand.h> |
| 47 |
-- a/src/libserver/maps/map.c |
41 |
++ b/src/libserver/maps/map.c |
|
Lines 25-36
Link Here
|
| 25 |
#include "rspamd.h" |
25 |
#include "rspamd.h" |
| 26 |
#include "contrib/libev/ev.h" |
26 |
#include "contrib/libev/ev.h" |
| 27 |
#include "contrib/uthash/utlist.h" |
27 |
#include "contrib/uthash/utlist.h" |
| 28 |
|
28 |
#include <zstd.h> |
| 29 |
#ifdef SYS_ZSTD |
|
|
| 30 |
# include "zstd.h" |
| 31 |
#else |
| 32 |
# include "contrib/zstd/zstd.h" |
| 33 |
#endif |
| 34 |
#undef MAP_DEBUG_REFS |
29 |
#undef MAP_DEBUG_REFS |
| 35 |
#ifdef MAP_DEBUG_REFS |
30 |
#ifdef MAP_DEBUG_REFS |
| 36 |
-- a/src/libserver/protocol.c |
31 |
++ b/src/libserver/protocol.c |
|
Lines 28-39
Link Here
|
| 28 |
#include "contrib/fastutf8/fastutf8.h" |
28 |
#include "contrib/fastutf8/fastutf8.h" |
| 29 |
#include "task.h" |
29 |
#include "task.h" |
| 30 |
#include <math.h> |
30 |
#include <math.h> |
| 31 |
|
31 |
#include <zstd.h> |
| 32 |
#ifdef SYS_ZSTD |
|
|
| 33 |
# include "zstd.h" |
| 34 |
#else |
| 35 |
# include "contrib/zstd/zstd.h" |
| 36 |
#endif |
| 37 |
INIT_LOG_MODULE(protocol) |
32 |
INIT_LOG_MODULE(protocol) |
| 38 |
-- a/src/libserver/task.c |
33 |
++ b/src/libserver/task.c |
|
Lines 39-50
Link Here
|
| 39 |
#endif |
39 |
#endif |
| 40 |
#include <math.h> |
40 |
#include <math.h> |
| 41 |
|
41 |
#include <zstd.h> |
| 42 |
#ifdef SYS_ZSTD |
|
|
| 43 |
# include "zstd.h" |
| 44 |
#else |
| 45 |
# include "contrib/zstd/zstd.h" |
| 46 |
#endif |
| 47 |
__KHASH_IMPL (rspamd_req_headers_hash, static inline, |
42 |
__KHASH_IMPL (rspamd_req_headers_hash, static inline, |
| 48 |
rspamd_ftok_t *, struct rspamd_request_header_chain *, 1, |
43 |
rspamd_ftok_t *, struct rspamd_request_header_chain *, 1, |
| 49 |
-- a/src/rspamd_proxy.c |
44 |
++ b/src/rspamd_proxy.c |
|
Lines 42-53
Link Here
|
| 42 |
#ifdef HAVE_NETINET_TCP_H |
42 |
#ifdef HAVE_NETINET_TCP_H |
| 43 |
#include <netinet/tcp.h> /* for TCP_NODELAY */ |
43 |
#include <netinet/tcp.h> /* for TCP_NODELAY */ |
| 44 |
#endif |
44 |
#endif |
| 45 |
|
45 |
#include <zstd.h> |
| 46 |
#ifdef SYS_ZSTD |
|
|
| 47 |
# include "zstd.h" |
| 48 |
#else |
| 49 |
# include "contrib/zstd/zstd.h" |
| 50 |
#endif |
| 51 |
/* Rotate keys each minute by default */ |
46 |
/* Rotate keys each minute by default */ |
| 52 |
#define DEFAULT_ROTATION_TIME 60.0 |
47 |
#define DEFAULT_ROTATION_TIME 60.0 |
