1 |
commit: e300b4dadd2faf5ce2cdb268b368ad403204c847 |
2 |
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> |
3 |
AuthorDate: Sat Jan 9 10:54:54 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 9 12:33:32 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e300b4da |
7 |
|
8 |
mail-filter/rspamd: clean old |
9 |
|
10 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
11 |
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/19001 |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
mail-filter/rspamd/Manifest | 1 - |
16 |
.../rspamd/files/rspamd-2.5-replxx-gcc10.patch | 12 -- |
17 |
.../rspamd/files/rspamd-2.5-unbundle-lua.patch | 53 --------- |
18 |
.../rspamd/files/rspamd-2.5-unbundle-zstd.patch | 132 --------------------- |
19 |
mail-filter/rspamd/rspamd-2.5-r1.ebuild | 113 ------------------ |
20 |
5 files changed, 311 deletions(-) |
21 |
|
22 |
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest |
23 |
index 166cfe25a14..df4f86e665d 100644 |
24 |
--- a/mail-filter/rspamd/Manifest |
25 |
+++ b/mail-filter/rspamd/Manifest |
26 |
@@ -1,3 +1,2 @@ |
27 |
-DIST rspamd-2.5.tar.gz 4490310 BLAKE2B 8d117b1b03e8092d0c724a4da4de23dd145f5b22696aa6b4ef1c208ade28f0d143dd783c9173b6987514b2aef9327ff8fd29eeae5e3da3039d2568384e50a697 SHA512 6068309da98eeb75f95188414b12ce9443aef31200853f820646e70e1dbf2d9d1e2c661a86df2183c175cc01cfb09f6a5c7b8ba358901a56ec6cdb9d9fef4540 |
28 |
DIST rspamd-2.6.tar.gz 5079444 BLAKE2B acb9d9471d0bb457da33b4d23e3c75ef87ea26a47e6c731bfd5fbbfe28567244e2bc72fd25ca3408db0928dab4e4ab66596e38cf3eff7cb9690eec59d3b62372 SHA512 79e4c1aa763aef753c8d7b2a941ed92b384e96c25e6d1b3bd1321c5acc0ecb934d033a3bf19cb94c89809fd92edec25192cffe97de9e5251681e1a71216b734a |
29 |
DIST rspamd-2.7.tar.gz 5126227 BLAKE2B 70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930 SHA512 8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7 |
30 |
|
31 |
diff --git a/mail-filter/rspamd/files/rspamd-2.5-replxx-gcc10.patch b/mail-filter/rspamd/files/rspamd-2.5-replxx-gcc10.patch |
32 |
deleted file mode 100644 |
33 |
index 81d7f3de295..00000000000 |
34 |
--- a/mail-filter/rspamd/files/rspamd-2.5-replxx-gcc10.patch |
35 |
+++ /dev/null |
36 |
@@ -1,12 +0,0 @@ |
37 |
-diff --git a/contrib/replxx/src/io.cxx b/contrib/replxx/src/io.cxx |
38 |
-index a09886701..8df176d1c 100644 |
39 |
---- a/contrib/replxx/src/io.cxx |
40 |
-+++ b/contrib/replxx/src/io.cxx |
41 |
-@@ -3,6 +3,7 @@ |
42 |
- #include <cstdlib> |
43 |
- #include <cstring> |
44 |
- #include <array> |
45 |
-+#include <stdexcept> |
46 |
- |
47 |
- #ifdef _WIN32 |
48 |
- |
49 |
|
50 |
diff --git a/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch b/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch |
51 |
deleted file mode 100644 |
52 |
index 4a20c8f19d3..00000000000 |
53 |
--- a/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch |
54 |
+++ /dev/null |
55 |
@@ -1,53 +0,0 @@ |
56 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
57 |
-index bbc141170..7fbb1b485 100644 |
58 |
---- a/CMakeLists.txt |
59 |
-+++ b/CMakeLists.txt |
60 |
-@@ -598,10 +598,6 @@ ADD_SUBDIRECTORY(contrib/libev) |
61 |
- ADD_SUBDIRECTORY(contrib/kann) |
62 |
- ADD_SUBDIRECTORY(contrib/fastutf8) |
63 |
- |
64 |
--IF (NOT WITH_LUAJIT) |
65 |
-- ADD_SUBDIRECTORY(contrib/lua-bit) |
66 |
--ENDIF() |
67 |
-- |
68 |
- IF (ENABLE_LUA_REPL MATCHES "ON") |
69 |
- ADD_SUBDIRECTORY(contrib/replxx) |
70 |
- SET(WITH_LUA_REPL 1) |
71 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
72 |
-index 9a34d2ac4..59bab5c15 100644 |
73 |
---- a/src/CMakeLists.txt |
74 |
-+++ b/src/CMakeLists.txt |
75 |
-@@ -189,10 +189,6 @@ IF (ENABLE_CLANG_PLUGIN MATCHES "ON") |
76 |
- ADD_DEPENDENCIES(rspamd-server rspamd-clang) |
77 |
- ENDIF() |
78 |
- |
79 |
--IF (NOT WITH_LUAJIT) |
80 |
-- TARGET_LINK_LIBRARIES(rspamd-server rspamd-bit) |
81 |
--ENDIF() |
82 |
-- |
83 |
- IF (ENABLE_SNOWBALL MATCHES "ON") |
84 |
- TARGET_LINK_LIBRARIES(rspamd-server stemmer) |
85 |
- ENDIF() |
86 |
-diff --git a/src/lua/lua_common.c b/src/lua/lua_common.c |
87 |
-index ce5fff6c5..bea6dc389 100644 |
88 |
---- a/src/lua/lua_common.c |
89 |
-+++ b/src/lua/lua_common.c |
90 |
-@@ -903,10 +903,6 @@ rspamd_lua_wipe_realloc (void *ud, |
91 |
- return NULL; |
92 |
- } |
93 |
- |
94 |
--#ifndef WITH_LUAJIT |
95 |
--extern int luaopen_bit(lua_State *L); |
96 |
--#endif |
97 |
-- |
98 |
- lua_State * |
99 |
- rspamd_lua_init (bool wipe_mem) |
100 |
- { |
101 |
-@@ -961,7 +957,6 @@ rspamd_lua_init (bool wipe_mem) |
102 |
- luaopen_kann (L); |
103 |
- luaopen_spf (L); |
104 |
- #ifndef WITH_LUAJIT |
105 |
-- rspamd_lua_add_preload (L, "bit", luaopen_bit); |
106 |
- lua_settop (L, 0); |
107 |
- #endif |
108 |
- |
109 |
|
110 |
diff --git a/mail-filter/rspamd/files/rspamd-2.5-unbundle-zstd.patch b/mail-filter/rspamd/files/rspamd-2.5-unbundle-zstd.patch |
111 |
deleted file mode 100644 |
112 |
index e86d70173c6..00000000000 |
113 |
--- a/mail-filter/rspamd/files/rspamd-2.5-unbundle-zstd.patch |
114 |
+++ /dev/null |
115 |
@@ -1,132 +0,0 @@ |
116 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
117 |
-index 8e3665c18..ad989f7f2 100644 |
118 |
---- a/CMakeLists.txt |
119 |
-+++ b/CMakeLists.txt |
120 |
-@@ -171,6 +171,8 @@ ELSE() |
121 |
- ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3) |
122 |
- ENDIF() |
123 |
- |
124 |
-+ProcessPackage(ZSTD LIBRARY zstd INCLUDE zstd.h |
125 |
-+ ROOT ${ZSTD_ROOT_DIR} MODULES libzstd) |
126 |
- ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES include/sqlite3 include/sqlite |
127 |
- ROOT ${SQLITE3_ROOT_DIR} MODULES sqlite3 sqlite) |
128 |
- ProcessPackage(ICUDATA LIBRARY icudata INCLUDE unicode/ucnv.h |
129 |
-@@ -583,7 +585,6 @@ ADD_SUBDIRECTORY(contrib/http-parser) |
130 |
- ADD_SUBDIRECTORY(contrib/fpconv) |
131 |
- ADD_SUBDIRECTORY(contrib/lc-btrie) |
132 |
- ADD_SUBDIRECTORY(contrib/libottery) |
133 |
--ADD_SUBDIRECTORY(contrib/zstd) |
134 |
- IF(ENABLE_SNOWBALL MATCHES "ON") |
135 |
- ADD_SUBDIRECTORY(contrib/snowball) |
136 |
- SET(WITH_SNOWBALL 1) |
137 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
138 |
-index 54b2e4083..e0e2edd58 100644 |
139 |
---- a/src/CMakeLists.txt |
140 |
-+++ b/src/CMakeLists.txt |
141 |
-@@ -181,7 +181,6 @@ TARGET_LINK_LIBRARIES(rspamd-server rspamd-http-parser) |
142 |
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-fpconv) |
143 |
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb) |
144 |
- TARGET_LINK_LIBRARIES(rspamd-server lcbtrie) |
145 |
--TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd) |
146 |
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8) |
147 |
- |
148 |
- IF (ENABLE_CLANG_PLUGIN MATCHES "ON") |
149 |
-diff --git a/src/client/rspamdclient.c b/src/client/rspamdclient.c |
150 |
-index 98b51506b..b4ed1cb5e 100644 |
151 |
---- a/src/client/rspamdclient.c |
152 |
-+++ b/src/client/rspamdclient.c |
153 |
-@@ -19,8 +19,8 @@ |
154 |
- #include "libserver/http/http_private.h" |
155 |
- #include "libserver/protocol_internal.h" |
156 |
- #include "unix-std.h" |
157 |
--#include "contrib/zstd/zstd.h" |
158 |
--#include "contrib/zstd/zdict.h" |
159 |
-+#include <zstd.h> |
160 |
-+#include <zdict.h> |
161 |
- |
162 |
- #ifdef HAVE_FETCH_H |
163 |
- #include <fetch.h> |
164 |
-diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c |
165 |
-index d3ad9e210..c7e09c2f9 100644 |
166 |
---- a/src/libserver/cfg_utils.c |
167 |
-+++ b/src/libserver/cfg_utils.c |
168 |
-@@ -36,9 +36,8 @@ |
169 |
- #include "contrib/libottery/ottery.h" |
170 |
- #include "contrib/fastutf8/fastutf8.h" |
171 |
- |
172 |
--#define ZSTD_STATIC_LINKING_ONLY |
173 |
--#include "contrib/zstd/zstd.h" |
174 |
--#include "contrib/zstd/zdict.h" |
175 |
-+#include <zstd.h> |
176 |
-+#include <zdict.h> |
177 |
- |
178 |
- #ifdef HAVE_OPENSSL |
179 |
- #include <openssl/rand.h> |
180 |
-diff --git a/src/libserver/maps/map.c b/src/libserver/maps/map.c |
181 |
-index a832adc4f..bdc1f8ba0 100644 |
182 |
---- a/src/libserver/maps/map.c |
183 |
-+++ b/src/libserver/maps/map.c |
184 |
-@@ -23,7 +23,7 @@ |
185 |
- #include "libserver/http/http_connection.h" |
186 |
- #include "libserver/http/http_private.h" |
187 |
- #include "rspamd.h" |
188 |
--#include "contrib/zstd/zstd.h" |
189 |
-+#include <zstd.h> |
190 |
- #include "contrib/libev/ev.h" |
191 |
- #include "contrib/uthash/utlist.h" |
192 |
- |
193 |
-diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c |
194 |
-index 35d50b909..53c23ed51 100644 |
195 |
---- a/src/libserver/protocol.c |
196 |
-+++ b/src/libserver/protocol.c |
197 |
-@@ -21,7 +21,7 @@ |
198 |
- #include "worker_private.h" |
199 |
- #include "libserver/cfg_file_private.h" |
200 |
- #include "libmime/scan_result_private.h" |
201 |
--#include "contrib/zstd/zstd.h" |
202 |
-+#include <zstd.h> |
203 |
- #include "lua/lua_common.h" |
204 |
- #include "unix-std.h" |
205 |
- #include "protocol_internal.h" |
206 |
-diff --git a/src/libserver/task.c b/src/libserver/task.c |
207 |
-index 3e8dd381f..150b5d54c 100644 |
208 |
---- a/src/libserver/task.c |
209 |
-+++ b/src/libserver/task.c |
210 |
-@@ -25,7 +25,7 @@ |
211 |
- #include "stat_api.h" |
212 |
- #include "unix-std.h" |
213 |
- #include "utlist.h" |
214 |
--#include "contrib/zstd/zstd.h" |
215 |
-+#include <zstd.h> |
216 |
- #include "libserver/mempool_vars_internal.h" |
217 |
- #include "libserver/cfg_file_private.h" |
218 |
- #include "libmime/lang_detection.h" |
219 |
-diff --git a/src/lua/lua_util.c b/src/lua/lua_util.c |
220 |
-index 91cc18800..d29f8aeaa 100644 |
221 |
---- a/src/lua/lua_util.c |
222 |
-+++ b/src/lua/lua_util.c |
223 |
-@@ -17,7 +17,7 @@ |
224 |
- #include "html.h" |
225 |
- #include "tokenizers/tokenizers.h" |
226 |
- #include "unix-std.h" |
227 |
--#include "contrib/zstd/zstd.h" |
228 |
-+#include <zstd.h> |
229 |
- #include "contrib/uthash/utlist.h" |
230 |
- #include "libmime/email_addr.h" |
231 |
- #include "libmime/content_type.h" |
232 |
-diff --git a/src/rspamd_proxy.c b/src/rspamd_proxy.c |
233 |
-index e9ce9ef5e..a9f3159db 100644 |
234 |
---- a/src/rspamd_proxy.c |
235 |
-+++ b/src/rspamd_proxy.c |
236 |
-@@ -36,7 +36,7 @@ |
237 |
- #include "libserver/milter.h" |
238 |
- #include "libserver/milter_internal.h" |
239 |
- #include "libmime/lang_detection.h" |
240 |
--#include "contrib/zstd/zstd.h" |
241 |
-+#include <zstd.h> |
242 |
- |
243 |
- #include <math.h> |
244 |
- |
245 |
--- |
246 |
-2.24.1 |
247 |
- |
248 |
|
249 |
diff --git a/mail-filter/rspamd/rspamd-2.5-r1.ebuild b/mail-filter/rspamd/rspamd-2.5-r1.ebuild |
250 |
deleted file mode 100644 |
251 |
index c1020d552c7..00000000000 |
252 |
--- a/mail-filter/rspamd/rspamd-2.5-r1.ebuild |
253 |
+++ /dev/null |
254 |
@@ -1,113 +0,0 @@ |
255 |
-# Copyright 1999-2020 Gentoo Authors |
256 |
-# Distributed under the terms of the GNU General Public License v2 |
257 |
- |
258 |
-EAPI=7 |
259 |
- |
260 |
-inherit cmake pax-utils systemd tmpfiles |
261 |
- |
262 |
-if [[ ${PV} == *9999 ]] ; then |
263 |
- EGIT_REPO_URI="https://github.com/rspamd/rspamd.git" |
264 |
- inherit git-r3 |
265 |
-else |
266 |
- SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz" |
267 |
- KEYWORDS="~amd64 ~x86" |
268 |
-fi |
269 |
- |
270 |
-DESCRIPTION="Rapid spam filtering system" |
271 |
-HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd" |
272 |
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB" |
273 |
-SLOT="0" |
274 |
-IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2" |
275 |
- |
276 |
-RDEPEND=" |
277 |
- acct-group/rspamd |
278 |
- acct-user/rspamd |
279 |
- app-arch/zstd |
280 |
- dev-db/sqlite:3 |
281 |
- dev-libs/glib:2 |
282 |
- dev-libs/icu:= |
283 |
- dev-libs/libev |
284 |
- dev-libs/libsodium |
285 |
- dev-libs/snowball-stemmer |
286 |
- net-libs/libnsl |
287 |
- sys-apps/file |
288 |
- blas? ( sci-libs/openblas ) |
289 |
- cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) |
290 |
- jemalloc? ( dev-libs/jemalloc ) |
291 |
- jit? ( |
292 |
- dev-lang/luajit:2 |
293 |
- ) |
294 |
- !jit? ( |
295 |
- dev-lang/lua:0= |
296 |
- dev-lua/LuaBitOp |
297 |
- ) |
298 |
- !libressl? ( dev-libs/openssl:0=[-bindist] ) |
299 |
- libressl? ( dev-libs/libressl:0= ) |
300 |
- pcre2? ( dev-libs/libpcre2[jit=] ) |
301 |
- !pcre2? ( dev-libs/libpcre[jit=] )" |
302 |
-DEPEND="${RDEPEND}" |
303 |
-BDEPEND=" |
304 |
- dev-util/ragel |
305 |
- virtual/pkgconfig |
306 |
-" |
307 |
- |
308 |
-PATCHES=( |
309 |
- "${FILESDIR}/rspamd-2.5-replxx-gcc10.patch" |
310 |
- "${FILESDIR}/rspamd-2.5-unbundle-lua.patch" |
311 |
- "${FILESDIR}/rspamd-2.5-unbundle-zstd.patch" |
312 |
- "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch" |
313 |
-) |
314 |
- |
315 |
-src_prepare() { |
316 |
- cmake_src_prepare |
317 |
- |
318 |
- rm -vrf contrib/{lua-bit,snowball,zstd} || die |
319 |
- |
320 |
- sed -i -e 's/User=_rspamd/User=rspamd/g' \ |
321 |
- rspamd.service \ |
322 |
- || die |
323 |
-} |
324 |
- |
325 |
-src_configure() { |
326 |
- local mycmakeargs=( |
327 |
- -DCONFDIR=/etc/rspamd |
328 |
- -DRUNDIR=/var/run/rspamd |
329 |
- -DDBDIR=/var/lib/rspamd |
330 |
- -DLOGDIR=/var/log/rspamd |
331 |
- -DENABLE_BLAS=$(usex blas ON OFF) |
332 |
- -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF) |
333 |
- -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) |
334 |
- -DENABLE_LUAJIT=$(usex jit ON OFF) |
335 |
- -DENABLE_PCRE2=$(usex pcre2 ON OFF) |
336 |
- ) |
337 |
- cmake_src_configure |
338 |
-} |
339 |
- |
340 |
-src_test() { |
341 |
- cmake_src_test |
342 |
-} |
343 |
- |
344 |
-src_install() { |
345 |
- cmake_src_install |
346 |
- |
347 |
- newconfd "${FILESDIR}"/rspamd.conf rspamd |
348 |
- newinitd "${FILESDIR}/rspamd-r7.init" rspamd |
349 |
- systemd_newunit rspamd.service rspamd.service |
350 |
- |
351 |
- newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf |
352 |
- |
353 |
- # Remove mprotect for JIT support |
354 |
- if use jit; then |
355 |
- pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* |
356 |
- fi |
357 |
- |
358 |
- insinto /etc/logrotate.d |
359 |
- newins "${FILESDIR}"/rspamd-r1.logrotate rspamd |
360 |
- |
361 |
- diropts -o rspamd -g rspamd |
362 |
- keepdir /var/{lib,log}/rspamd |
363 |
-} |
364 |
- |
365 |
-pkg_postinst() { |
366 |
- tmpfiles_process "${PN}.conf" |
367 |
-} |