1 |
commit: 84ba790757559589325dbaccde894d92c558a72a |
2 |
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> |
3 |
AuthorDate: Sat Jan 9 10:49:17 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 9 12:33:31 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84ba7907 |
7 |
|
8 |
mail-filter/rspamd: sync live |
9 |
|
10 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
11 |
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
.../rspamd/files/rspamd-9999-unbundle-zstd.patch | 125 --------------------- |
15 |
mail-filter/rspamd/rspamd-9999.ebuild | 6 +- |
16 |
2 files changed, 3 insertions(+), 128 deletions(-) |
17 |
|
18 |
diff --git a/mail-filter/rspamd/files/rspamd-9999-unbundle-zstd.patch b/mail-filter/rspamd/files/rspamd-9999-unbundle-zstd.patch |
19 |
deleted file mode 100644 |
20 |
index c42bb8f5d6f..00000000000 |
21 |
--- a/mail-filter/rspamd/files/rspamd-9999-unbundle-zstd.patch |
22 |
+++ /dev/null |
23 |
@@ -1,125 +0,0 @@ |
24 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
25 |
-index 3b4bd8469..75582513e 100644 |
26 |
---- a/CMakeLists.txt |
27 |
-+++ b/CMakeLists.txt |
28 |
-@@ -199,6 +199,8 @@ ELSE() |
29 |
- ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3) |
30 |
- ENDIF() |
31 |
- |
32 |
-+ProcessPackage(ZSTD LIBRARY zstd INCLUDE zstd.h |
33 |
-+ ROOT ${ZSTD_ROOT_DIR} MODULES libzstd) |
34 |
- ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES include/sqlite3 include/sqlite |
35 |
- ROOT ${SQLITE3_ROOT_DIR} MODULES sqlite3 sqlite) |
36 |
- ProcessPackage(ICUDATA LIBRARY icudata INCLUDE unicode/ucnv.h |
37 |
-@@ -616,7 +618,6 @@ ADD_SUBDIRECTORY(contrib/http-parser) |
38 |
- ADD_SUBDIRECTORY(contrib/fpconv) |
39 |
- ADD_SUBDIRECTORY(contrib/lc-btrie) |
40 |
- ADD_SUBDIRECTORY(contrib/libottery) |
41 |
--ADD_SUBDIRECTORY(contrib/zstd) |
42 |
- IF(ENABLE_SNOWBALL MATCHES "ON") |
43 |
- ADD_SUBDIRECTORY(contrib/snowball) |
44 |
- SET(WITH_SNOWBALL 1) |
45 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
46 |
-index 59bab5c15..098329991 100644 |
47 |
---- a/src/CMakeLists.txt |
48 |
-+++ b/src/CMakeLists.txt |
49 |
-@@ -182,7 +182,6 @@ TARGET_LINK_LIBRARIES(rspamd-server rspamd-fpconv) |
50 |
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb) |
51 |
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-lpeg) |
52 |
- TARGET_LINK_LIBRARIES(rspamd-server lcbtrie) |
53 |
--TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd) |
54 |
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8) |
55 |
- |
56 |
- IF (ENABLE_CLANG_PLUGIN MATCHES "ON") |
57 |
-diff --git a/src/client/rspamdclient.c b/src/client/rspamdclient.c |
58 |
-index bcb25672e..48ca58e94 100644 |
59 |
---- a/src/client/rspamdclient.c |
60 |
-+++ b/src/client/rspamdclient.c |
61 |
-@@ -19,7 +19,7 @@ |
62 |
- #include "libserver/http/http_private.h" |
63 |
- #include "libserver/protocol_internal.h" |
64 |
- #include "unix-std.h" |
65 |
--#include "contrib/zstd/zstd.h" |
66 |
-+#include <zstd.h> |
67 |
- |
68 |
- #ifdef HAVE_FETCH_H |
69 |
- #include <fetch.h> |
70 |
-diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c |
71 |
-index e2f886aa6..5b214c09c 100644 |
72 |
---- a/src/libserver/cfg_utils.c |
73 |
-+++ b/src/libserver/cfg_utils.c |
74 |
-@@ -36,8 +36,7 @@ |
75 |
- #include "contrib/libottery/ottery.h" |
76 |
- #include "contrib/fastutf8/fastutf8.h" |
77 |
- |
78 |
--#define ZSTD_STATIC_LINKING_ONLY |
79 |
--#include "contrib/zstd/zstd.h" |
80 |
-+#include <zstd.h> |
81 |
- |
82 |
- #ifdef HAVE_OPENSSL |
83 |
- #include <openssl/rand.h> |
84 |
-diff --git a/src/libserver/maps/map.c b/src/libserver/maps/map.c |
85 |
-index 14792753a..20ca8416e 100644 |
86 |
---- a/src/libserver/maps/map.c |
87 |
-+++ b/src/libserver/maps/map.c |
88 |
-@@ -23,7 +23,7 @@ |
89 |
- #include "libserver/http/http_connection.h" |
90 |
- #include "libserver/http/http_private.h" |
91 |
- #include "rspamd.h" |
92 |
--#include "contrib/zstd/zstd.h" |
93 |
-+#include <zstd.h> |
94 |
- #include "contrib/libev/ev.h" |
95 |
- #include "contrib/uthash/utlist.h" |
96 |
- |
97 |
-diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c |
98 |
-index 31b0308cb..62ba3d833 100644 |
99 |
---- a/src/libserver/protocol.c |
100 |
-+++ b/src/libserver/protocol.c |
101 |
-@@ -21,7 +21,7 @@ |
102 |
- #include "worker_private.h" |
103 |
- #include "libserver/cfg_file_private.h" |
104 |
- #include "libmime/scan_result_private.h" |
105 |
--#include "contrib/zstd/zstd.h" |
106 |
-+#include <zstd.h> |
107 |
- #include "lua/lua_common.h" |
108 |
- #include "unix-std.h" |
109 |
- #include "protocol_internal.h" |
110 |
-diff --git a/src/libserver/task.c b/src/libserver/task.c |
111 |
-index e7a83a603..c613fffcc 100644 |
112 |
---- a/src/libserver/task.c |
113 |
-+++ b/src/libserver/task.c |
114 |
-@@ -25,7 +25,7 @@ |
115 |
- #include "stat_api.h" |
116 |
- #include "unix-std.h" |
117 |
- #include "utlist.h" |
118 |
--#include "contrib/zstd/zstd.h" |
119 |
-+#include <zstd.h> |
120 |
- #include "libserver/mempool_vars_internal.h" |
121 |
- #include "libserver/cfg_file_private.h" |
122 |
- #include "libmime/lang_detection.h" |
123 |
-diff --git a/src/lua/lua_util.c b/src/lua/lua_util.c |
124 |
-index e879d37af..88451e222 100644 |
125 |
---- a/src/lua/lua_util.c |
126 |
-+++ b/src/lua/lua_util.c |
127 |
-@@ -15,7 +15,7 @@ |
128 |
- */ |
129 |
- #include "lua_common.h" |
130 |
- #include "unix-std.h" |
131 |
--#include "contrib/zstd/zstd.h" |
132 |
-+#include <zstd.h> |
133 |
- #include "libmime/email_addr.h" |
134 |
- #include "libmime/content_type.h" |
135 |
- #include "libmime/mime_headers.h" |
136 |
-diff --git a/src/rspamd_proxy.c b/src/rspamd_proxy.c |
137 |
-index 3fa5da390..c641fb263 100644 |
138 |
---- a/src/rspamd_proxy.c |
139 |
-+++ b/src/rspamd_proxy.c |
140 |
-@@ -36,7 +36,7 @@ |
141 |
- #include "libserver/milter.h" |
142 |
- #include "libserver/milter_internal.h" |
143 |
- #include "libmime/lang_detection.h" |
144 |
--#include "contrib/zstd/zstd.h" |
145 |
-+#include <zstd.h> |
146 |
- |
147 |
- #include <math.h> |
148 |
- |
149 |
|
150 |
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild |
151 |
index 8f97da55c2b..0ba25019331 100644 |
152 |
--- a/mail-filter/rspamd/rspamd-9999.ebuild |
153 |
+++ b/mail-filter/rspamd/rspamd-9999.ebuild |
154 |
@@ -1,4 +1,4 @@ |
155 |
-# Copyright 1999-2020 Gentoo Authors |
156 |
+# Copyright 1999-2021 Gentoo Authors |
157 |
# Distributed under the terms of the GNU General Public License v2 |
158 |
|
159 |
EAPI=7 |
160 |
@@ -56,9 +56,9 @@ BDEPEND=" |
161 |
" |
162 |
|
163 |
PATCHES=( |
164 |
- "${FILESDIR}/rspamd-2.6-cmake-lua-version.patch" |
165 |
+ "${FILESDIR}/rspamd-2.7-cmake-lua-version.patch" |
166 |
"${FILESDIR}/rspamd-2.6-unbundle-lua.patch" |
167 |
- "${FILESDIR}/rspamd-9999-unbundle-zstd.patch" |
168 |
+ "${FILESDIR}/rspamd-2.7-unbundle-zstd.patch" |
169 |
"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch" |
170 |
) |