| 1 |
commit: 74663b22b297f2f0e61d5bfb6da20258969a5f83 |
| 2 |
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> |
| 3 |
AuthorDate: Sat Aug 21 21:41:17 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 22 02:49:03 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74663b22 |
| 7 |
|
| 8 |
mail-filter/rspamd: drop 2.6-r102 |
| 9 |
|
| 10 |
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/22070 |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
mail-filter/rspamd/Manifest | 1 - |
| 15 |
.../files/rspamd-2.6-cmake-lua-version.patch | 44 ------- |
| 16 |
.../rspamd/files/rspamd-2.6-unbundle-zstd.patch | 128 --------------------- |
| 17 |
mail-filter/rspamd/rspamd-2.6-r102.ebuild | 115 ------------------ |
| 18 |
4 files changed, 288 deletions(-) |
| 19 |
|
| 20 |
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest |
| 21 |
index 48c11b72f36..fa7fefdafd2 100644 |
| 22 |
--- a/mail-filter/rspamd/Manifest |
| 23 |
+++ b/mail-filter/rspamd/Manifest |
| 24 |
@@ -1,3 +1,2 @@ |
| 25 |
-DIST rspamd-2.6.tar.gz 5079444 BLAKE2B acb9d9471d0bb457da33b4d23e3c75ef87ea26a47e6c731bfd5fbbfe28567244e2bc72fd25ca3408db0928dab4e4ab66596e38cf3eff7cb9690eec59d3b62372 SHA512 79e4c1aa763aef753c8d7b2a941ed92b384e96c25e6d1b3bd1321c5acc0ecb934d033a3bf19cb94c89809fd92edec25192cffe97de9e5251681e1a71216b734a |
| 26 |
DIST rspamd-2.7.tar.gz 5126227 BLAKE2B 70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930 SHA512 8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7 |
| 27 |
DIST rspamd-3.0.tar.gz 5535659 BLAKE2B 605ac59b947b49efb026e04d153df5fc0d56c65712def3f2c54a949db32b8534e634d172a1899cc08e98e0a9da839fc00f0f569dc8c52a743f38bd71b8abaeaa SHA512 1ea6f9ffe58b7f280dbd31e39db6412ebeddda634ca8a669fa5bff2951d17123a5d4a09ec0f366c6b0c0b585f868e646fd49e4d45bd451408675b927ec2557c4 |
| 28 |
|
| 29 |
diff --git a/mail-filter/rspamd/files/rspamd-2.6-cmake-lua-version.patch b/mail-filter/rspamd/files/rspamd-2.6-cmake-lua-version.patch |
| 30 |
deleted file mode 100644 |
| 31 |
index 141b13dfa8a..00000000000 |
| 32 |
--- a/mail-filter/rspamd/files/rspamd-2.6-cmake-lua-version.patch |
| 33 |
+++ /dev/null |
| 34 |
@@ -1,44 +0,0 @@ |
| 35 |
---- a/CMakeLists.txt |
| 36 |
-+++ b/CMakeLists.txt |
| 37 |
-@@ -139,40 +139,8 @@ |
| 38 |
- ELSE(ENABLE_LUAJIT MATCHES "ON") |
| 39 |
- |
| 40 |
- ProcessPackage(LIBLUA LIBRARY "lua" |
| 41 |
-- "lua-5.3" |
| 42 |
-- INCLUDE lua.h INCLUDE_SUFFIXES |
| 43 |
-- "include/lua-5.3" |
| 44 |
-- "include/lua5.3" |
| 45 |
-- "include/lua53" |
| 46 |
-- "include/lua" |
| 47 |
- ROOT ${LUA_ROOT} |
| 48 |
-- MODULES lua53 |
| 49 |
-- OPTIONAL) |
| 50 |
-- |
| 51 |
-- IF (NOT WITH_LIBLUA) |
| 52 |
-- ProcessPackage(LIBLUA LIBRARY "lua" |
| 53 |
-- "lua-5.2" |
| 54 |
-- INCLUDE lua.h INCLUDE_SUFFIXES |
| 55 |
-- "include/lua-5.2" |
| 56 |
-- "include/lua5.2" |
| 57 |
-- "include/lua52" |
| 58 |
-- "include/lua" |
| 59 |
-- ROOT ${LUA_ROOT} |
| 60 |
-- MODULES lua52 |
| 61 |
-- OPTIONAL) |
| 62 |
-- |
| 63 |
-- IF (NOT WITH_LIBLUA) |
| 64 |
-- ProcessPackage(LIBLUA LIBRARY "lua" |
| 65 |
-- "lua-5.1" |
| 66 |
-- INCLUDE lua.h INCLUDE_SUFFIXES |
| 67 |
-- "include/lua-5.1" |
| 68 |
-- "include/lua5.1" |
| 69 |
-- "include/lua51" |
| 70 |
-- "include/lua" |
| 71 |
-- ROOT ${LUA_ROOT} |
| 72 |
-- MODULES lua51) |
| 73 |
-- ENDIF() |
| 74 |
-- ENDIF() |
| 75 |
-+ MODULES lua) |
| 76 |
- ENDIF(ENABLE_LUAJIT MATCHES "ON") |
| 77 |
- |
| 78 |
- IF(ENABLE_JEMALLOC MATCHES "ON" AND NOT SANITIZE) |
| 79 |
|
| 80 |
diff --git a/mail-filter/rspamd/files/rspamd-2.6-unbundle-zstd.patch b/mail-filter/rspamd/files/rspamd-2.6-unbundle-zstd.patch |
| 81 |
deleted file mode 100644 |
| 82 |
index 1a7f4453c86..00000000000 |
| 83 |
--- a/mail-filter/rspamd/files/rspamd-2.6-unbundle-zstd.patch |
| 84 |
+++ /dev/null |
| 85 |
@@ -1,128 +0,0 @@ |
| 86 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 87 |
-index 90caf4048..e2e5d182c 100644 |
| 88 |
---- a/CMakeLists.txt |
| 89 |
-+++ b/CMakeLists.txt |
| 90 |
-@@ -198,6 +198,8 @@ ELSE() |
| 91 |
- ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3) |
| 92 |
- ENDIF() |
| 93 |
- |
| 94 |
-+ProcessPackage(ZSTD LIBRARY zstd INCLUDE zstd.h |
| 95 |
-+ ROOT ${ZSTD_ROOT_DIR} MODULES libzstd) |
| 96 |
- ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES include/sqlite3 include/sqlite |
| 97 |
- ROOT ${SQLITE3_ROOT_DIR} MODULES sqlite3 sqlite) |
| 98 |
- ProcessPackage(ICUDATA LIBRARY icudata INCLUDE unicode/ucnv.h |
| 99 |
-@@ -615,7 +617,6 @@ ADD_SUBDIRECTORY(contrib/http-parser) |
| 100 |
- ADD_SUBDIRECTORY(contrib/fpconv) |
| 101 |
- ADD_SUBDIRECTORY(contrib/lc-btrie) |
| 102 |
- ADD_SUBDIRECTORY(contrib/libottery) |
| 103 |
--ADD_SUBDIRECTORY(contrib/zstd) |
| 104 |
- IF(ENABLE_SNOWBALL MATCHES "ON") |
| 105 |
- ADD_SUBDIRECTORY(contrib/snowball) |
| 106 |
- SET(WITH_SNOWBALL 1) |
| 107 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
| 108 |
-index 54b2e4083..e0e2edd58 100644 |
| 109 |
---- a/src/CMakeLists.txt |
| 110 |
-+++ b/src/CMakeLists.txt |
| 111 |
-@@ -181,7 +181,6 @@ TARGET_LINK_LIBRARIES(rspamd-server rspamd-http-parser) |
| 112 |
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-fpconv) |
| 113 |
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb) |
| 114 |
- TARGET_LINK_LIBRARIES(rspamd-server lcbtrie) |
| 115 |
--TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd) |
| 116 |
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8) |
| 117 |
- |
| 118 |
- IF (ENABLE_CLANG_PLUGIN MATCHES "ON") |
| 119 |
-diff --git a/src/client/rspamdclient.c b/src/client/rspamdclient.c |
| 120 |
-index bcb25672e..48ca58e94 100644 |
| 121 |
---- a/src/client/rspamdclient.c |
| 122 |
-+++ b/src/client/rspamdclient.c |
| 123 |
-@@ -19,7 +19,7 @@ |
| 124 |
- #include "libserver/http/http_private.h" |
| 125 |
- #include "libserver/protocol_internal.h" |
| 126 |
- #include "unix-std.h" |
| 127 |
--#include "contrib/zstd/zstd.h" |
| 128 |
-+#include <zstd.h> |
| 129 |
- |
| 130 |
- #ifdef HAVE_FETCH_H |
| 131 |
- #include <fetch.h> |
| 132 |
-diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c |
| 133 |
-index 78e3fc79f..40110c693 100644 |
| 134 |
---- a/src/libserver/cfg_utils.c |
| 135 |
-+++ b/src/libserver/cfg_utils.c |
| 136 |
-@@ -36,8 +36,7 @@ |
| 137 |
- #include "contrib/libottery/ottery.h" |
| 138 |
- #include "contrib/fastutf8/fastutf8.h" |
| 139 |
- |
| 140 |
--#define ZSTD_STATIC_LINKING_ONLY |
| 141 |
--#include "contrib/zstd/zstd.h" |
| 142 |
-+#include <zstd.h> |
| 143 |
- |
| 144 |
- #ifdef HAVE_OPENSSL |
| 145 |
- #include <openssl/rand.h> |
| 146 |
-diff --git a/src/libserver/maps/map.c b/src/libserver/maps/map.c |
| 147 |
-index 8b9f522b2..8cf03ffd6 100644 |
| 148 |
---- a/src/libserver/maps/map.c |
| 149 |
-+++ b/src/libserver/maps/map.c |
| 150 |
-@@ -23,7 +23,7 @@ |
| 151 |
- #include "libserver/http/http_connection.h" |
| 152 |
- #include "libserver/http/http_private.h" |
| 153 |
- #include "rspamd.h" |
| 154 |
--#include "contrib/zstd/zstd.h" |
| 155 |
-+#include <zstd.h> |
| 156 |
- #include "contrib/libev/ev.h" |
| 157 |
- #include "contrib/uthash/utlist.h" |
| 158 |
- |
| 159 |
-diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c |
| 160 |
-index 9d1276064..6f0a66fb8 100644 |
| 161 |
---- a/src/libserver/protocol.c |
| 162 |
-+++ b/src/libserver/protocol.c |
| 163 |
-@@ -21,7 +21,7 @@ |
| 164 |
- #include "worker_private.h" |
| 165 |
- #include "libserver/cfg_file_private.h" |
| 166 |
- #include "libmime/scan_result_private.h" |
| 167 |
--#include "contrib/zstd/zstd.h" |
| 168 |
-+#include <zstd.h> |
| 169 |
- #include "lua/lua_common.h" |
| 170 |
- #include "unix-std.h" |
| 171 |
- #include "protocol_internal.h" |
| 172 |
-diff --git a/src/libserver/task.c b/src/libserver/task.c |
| 173 |
-index 53da0dae6..6538abdbf 100644 |
| 174 |
---- a/src/libserver/task.c |
| 175 |
-+++ b/src/libserver/task.c |
| 176 |
-@@ -25,7 +25,7 @@ |
| 177 |
- #include "stat_api.h" |
| 178 |
- #include "unix-std.h" |
| 179 |
- #include "utlist.h" |
| 180 |
--#include "contrib/zstd/zstd.h" |
| 181 |
-+#include <zstd.h> |
| 182 |
- #include "libserver/mempool_vars_internal.h" |
| 183 |
- #include "libserver/cfg_file_private.h" |
| 184 |
- #include "libmime/lang_detection.h" |
| 185 |
-diff --git a/src/lua/lua_util.c b/src/lua/lua_util.c |
| 186 |
-index 0787736d5..21474317a 100644 |
| 187 |
---- a/src/lua/lua_util.c |
| 188 |
-+++ b/src/lua/lua_util.c |
| 189 |
-@@ -17,7 +17,7 @@ |
| 190 |
- #include "html.h" |
| 191 |
- #include "tokenizers/tokenizers.h" |
| 192 |
- #include "unix-std.h" |
| 193 |
--#include "contrib/zstd/zstd.h" |
| 194 |
-+#include <zstd.h> |
| 195 |
- #include "contrib/uthash/utlist.h" |
| 196 |
- #include "libmime/email_addr.h" |
| 197 |
- #include "libmime/content_type.h" |
| 198 |
-diff --git a/src/rspamd_proxy.c b/src/rspamd_proxy.c |
| 199 |
-index 4ed8cfab7..5f8808e40 100644 |
| 200 |
---- a/src/rspamd_proxy.c |
| 201 |
-+++ b/src/rspamd_proxy.c |
| 202 |
-@@ -36,7 +36,7 @@ |
| 203 |
- #include "libserver/milter.h" |
| 204 |
- #include "libserver/milter_internal.h" |
| 205 |
- #include "libmime/lang_detection.h" |
| 206 |
--#include "contrib/zstd/zstd.h" |
| 207 |
-+#include <zstd.h> |
| 208 |
- |
| 209 |
- #include <math.h> |
| 210 |
- |
| 211 |
--- |
| 212 |
-2.26.2 |
| 213 |
- |
| 214 |
|
| 215 |
diff --git a/mail-filter/rspamd/rspamd-2.6-r102.ebuild b/mail-filter/rspamd/rspamd-2.6-r102.ebuild |
| 216 |
deleted file mode 100644 |
| 217 |
index fc005db11e8..00000000000 |
| 218 |
--- a/mail-filter/rspamd/rspamd-2.6-r102.ebuild |
| 219 |
+++ /dev/null |
| 220 |
@@ -1,115 +0,0 @@ |
| 221 |
-# Copyright 1999-2021 Gentoo Authors |
| 222 |
-# Distributed under the terms of the GNU General Public License v2 |
| 223 |
- |
| 224 |
-EAPI=7 |
| 225 |
- |
| 226 |
-LUA_COMPAT=( lua5-{1..3} luajit ) |
| 227 |
- |
| 228 |
-inherit cmake lua-single pax-utils systemd tmpfiles |
| 229 |
- |
| 230 |
-if [[ ${PV} == *9999 ]] ; then |
| 231 |
- EGIT_REPO_URI="https://github.com/rspamd/rspamd.git" |
| 232 |
- inherit git-r3 |
| 233 |
-else |
| 234 |
- SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 235 |
- KEYWORDS="amd64 x86" |
| 236 |
-fi |
| 237 |
- |
| 238 |
-DESCRIPTION="Rapid spam filtering system" |
| 239 |
-HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd" |
| 240 |
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB" |
| 241 |
-SLOT="0" |
| 242 |
-IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2" |
| 243 |
- |
| 244 |
-REQUIRED_USE="${LUA_REQUIRED_USE} |
| 245 |
- jit? ( lua_single_target_luajit )" |
| 246 |
- |
| 247 |
-RDEPEND="${LUA_DEPS} |
| 248 |
- $(lua_gen_cond_dep ' |
| 249 |
- dev-lua/LuaBitOp[${LUA_USEDEP}] |
| 250 |
- ' lua5-{1,2}) |
| 251 |
- acct-group/rspamd |
| 252 |
- acct-user/rspamd |
| 253 |
- app-arch/zstd:= |
| 254 |
- dev-db/sqlite:3 |
| 255 |
- dev-libs/glib:2 |
| 256 |
- dev-libs/icu:= |
| 257 |
- dev-libs/libev |
| 258 |
- dev-libs/libsodium:= |
| 259 |
- dev-libs/snowball-stemmer |
| 260 |
- sys-apps/file |
| 261 |
- blas? ( |
| 262 |
- virtual/blas |
| 263 |
- virtual/lapack |
| 264 |
- ) |
| 265 |
- cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) |
| 266 |
- jemalloc? ( dev-libs/jemalloc:= ) |
| 267 |
- dev-libs/openssl:0=[-bindist(-)] |
| 268 |
- pcre2? ( dev-libs/libpcre2:=[jit=] ) |
| 269 |
- !pcre2? ( dev-libs/libpcre[jit=] )" |
| 270 |
-DEPEND="${RDEPEND}" |
| 271 |
-BDEPEND=" |
| 272 |
- dev-util/ragel |
| 273 |
- virtual/pkgconfig |
| 274 |
-" |
| 275 |
- |
| 276 |
-PATCHES=( |
| 277 |
- "${FILESDIR}/rspamd-2.6-cmake-lua-version.patch" |
| 278 |
- "${FILESDIR}/rspamd-2.6-unbundle-lua.patch" |
| 279 |
- "${FILESDIR}/rspamd-2.6-unbundle-zstd.patch" |
| 280 |
- "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch" |
| 281 |
-) |
| 282 |
- |
| 283 |
-src_prepare() { |
| 284 |
- cmake_src_prepare |
| 285 |
- |
| 286 |
- rm -vrf contrib/{lua-bit,snowball,zstd} || die |
| 287 |
- |
| 288 |
- sed -i -e 's/User=_rspamd/User=rspamd/g' \ |
| 289 |
- rspamd.service \ |
| 290 |
- || die |
| 291 |
-} |
| 292 |
- |
| 293 |
-src_configure() { |
| 294 |
- local mycmakeargs=( |
| 295 |
- -DCONFDIR=/etc/rspamd |
| 296 |
- -DRUNDIR=/var/run/rspamd |
| 297 |
- -DDBDIR=/var/lib/rspamd |
| 298 |
- -DLOGDIR=/var/log/rspamd |
| 299 |
- -DENABLE_BLAS=$(usex blas ON OFF) |
| 300 |
- -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF) |
| 301 |
- -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) |
| 302 |
- -DENABLE_LUAJIT=$(usex lua_single_target_luajit ON OFF) |
| 303 |
- -DENABLE_PCRE2=$(usex pcre2 ON OFF) |
| 304 |
- ) |
| 305 |
- cmake_src_configure |
| 306 |
-} |
| 307 |
- |
| 308 |
-src_test() { |
| 309 |
- cmake_src_test |
| 310 |
-} |
| 311 |
- |
| 312 |
-src_install() { |
| 313 |
- cmake_src_install |
| 314 |
- |
| 315 |
- newconfd "${FILESDIR}"/rspamd.conf rspamd |
| 316 |
- newinitd "${FILESDIR}/rspamd-r7.init" rspamd |
| 317 |
- systemd_newunit rspamd.service rspamd.service |
| 318 |
- |
| 319 |
- newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf |
| 320 |
- |
| 321 |
- # Remove mprotect for JIT support |
| 322 |
- if use lua_single_target_luajit; then |
| 323 |
- pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* |
| 324 |
- fi |
| 325 |
- |
| 326 |
- insinto /etc/logrotate.d |
| 327 |
- newins "${FILESDIR}"/rspamd-r1.logrotate rspamd |
| 328 |
- |
| 329 |
- diropts -o rspamd -g rspamd |
| 330 |
- keepdir /var/{lib,log}/rspamd |
| 331 |
-} |
| 332 |
- |
| 333 |
-pkg_postinst() { |
| 334 |
- tmpfiles_process "${PN}.conf" |
| 335 |
-} |
Archives