From 7c78c5f223626fb3bb688cce6e50068e90cb1704 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Tue, 20 Dec 2022 22:14:40 +0100 Subject: mail-filter/rspamd: drop 2.7-r104 Signed-off-by: Andreas Sturmlechner --- mail-filter/rspamd/Manifest | 1 - .../rspamd/files/rspamd-2.6-unbundle-lua.patch | 53 --------- .../files/rspamd-2.7-cmake-lua-version.patch | 49 -------- .../rspamd/files/rspamd-2.7-unbundle-zstd.patch | 125 --------------------- mail-filter/rspamd/metadata.xml | 1 - mail-filter/rspamd/rspamd-2.7-r104.ebuild | 116 ------------------- 6 files changed, 345 deletions(-) delete mode 100644 mail-filter/rspamd/files/rspamd-2.6-unbundle-lua.patch delete mode 100644 mail-filter/rspamd/files/rspamd-2.7-cmake-lua-version.patch delete mode 100644 mail-filter/rspamd/files/rspamd-2.7-unbundle-zstd.patch delete mode 100644 mail-filter/rspamd/rspamd-2.7-r104.ebuild (limited to 'mail-filter') diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest index bca781f9d3ef..8892d1cbf45b 100644 --- a/mail-filter/rspamd/Manifest +++ b/mail-filter/rspamd/Manifest @@ -1,3 +1,2 @@ -DIST rspamd-2.7.tar.gz 5126227 BLAKE2B 70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930 SHA512 8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7 DIST rspamd-3.3.tar.gz 5680874 BLAKE2B 2fbafabc0a59ca4ad1bbdc1b7ceb5b5bc281dc75d2997ac50c080cdf5ced2582409e3f98b63239bab64fafbcc63016d857967fe00c371a6d5b896d170f5da4a9 SHA512 02c5e62cb9ce32cdd6da859c4afe2bf03fcaff456d79f68ab7c3c288a0b36f11a701825c3cb7f0ecaccd419f84ce693961c1ed955ce4dbcfe291a8e978e2e69c DIST rspamd-3.4.tar.gz 5689732 BLAKE2B 8d1b98205f51cfe834db3ed53b8be72ada834980380cba06c4470689d16ef4a6396190ae27044ae76a7b35df6afd3cdf551f9469d878ac69ec61ef6b86b46104 SHA512 fec8cb7b845bf25d02f1c32c82bf35ad9c65f3301a73f3ea611b6fcfa0ac1b75f75561c4c42f142f876ac3a78f96fd91d22d30c5b3600e4001e25f06bc693ccf diff --git a/mail-filter/rspamd/files/rspamd-2.6-unbundle-lua.patch b/mail-filter/rspamd/files/rspamd-2.6-unbundle-lua.patch deleted file mode 100644 index 9278fa8608d7..000000000000 --- a/mail-filter/rspamd/files/rspamd-2.6-unbundle-lua.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b794b9dbd..1ba5c085e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -632,10 +632,6 @@ ADD_SUBDIRECTORY(contrib/fastutf8) - ADD_SUBDIRECTORY(contrib/google-ced) - - --IF (NOT WITH_LUAJIT) -- ADD_SUBDIRECTORY(contrib/lua-bit) --ENDIF() -- - IF (ENABLE_LUA_REPL MATCHES "ON") - ADD_SUBDIRECTORY(contrib/replxx) - SET(WITH_LUA_REPL 1) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9a34d2ac4..59bab5c15 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -189,10 +189,6 @@ IF (ENABLE_CLANG_PLUGIN MATCHES "ON") - ADD_DEPENDENCIES(rspamd-server rspamd-clang) - ENDIF() - --IF (NOT WITH_LUAJIT) -- TARGET_LINK_LIBRARIES(rspamd-server rspamd-bit) --ENDIF() -- - IF (ENABLE_SNOWBALL MATCHES "ON") - TARGET_LINK_LIBRARIES(rspamd-server stemmer) - ENDIF() -diff --git a/src/lua/lua_common.c b/src/lua/lua_common.c -index b7fcc2034..1d86464da 100644 ---- a/src/lua/lua_common.c -+++ b/src/lua/lua_common.c -@@ -922,10 +922,6 @@ rspamd_lua_wipe_realloc (void *ud, - return NULL; - } - --#ifndef WITH_LUAJIT --extern int luaopen_bit(lua_State *L); --#endif -- - lua_State * - rspamd_lua_init (bool wipe_mem) - { -@@ -981,7 +977,6 @@ rspamd_lua_init (bool wipe_mem) - luaopen_spf (L); - luaopen_tensor (L); - #ifndef WITH_LUAJIT -- rspamd_lua_add_preload (L, "bit", luaopen_bit); - lua_settop (L, 0); - #endif - diff --git a/mail-filter/rspamd/files/rspamd-2.7-cmake-lua-version.patch b/mail-filter/rspamd/files/rspamd-2.7-cmake-lua-version.patch deleted file mode 100644 index c8254f1ce95e..000000000000 --- a/mail-filter/rspamd/files/rspamd-2.7-cmake-lua-version.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 72382acb6..2335ae4bc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -141,42 +141,8 @@ IF(ENABLE_LUAJIT MATCHES "ON") - ELSE(ENABLE_LUAJIT MATCHES "ON") - - ProcessPackage(LIBLUA LIBRARY "lua" -- "lua-5.3" -- LIB_SUFFIXES "lua5.3" -- INCLUDE lua.h INCLUDE_SUFFIXES -- "include/lua-5.3" -- "include/lua5.3" -- "include/lua53" -- "include/lua" - ROOT ${LUA_ROOT} -- MODULES lua53 -- OPTIONAL) -- -- IF (NOT WITH_LIBLUA) -- ProcessPackage(LIBLUA LIBRARY "lua" -- "lua-5.2" -- LIB_SUFFIXES "lua5.2" -- INCLUDE lua.h INCLUDE_SUFFIXES -- "include/lua-5.2" -- "include/lua5.2" -- "include/lua52" -- "include/lua" -- ROOT ${LUA_ROOT} -- MODULES lua52 -- OPTIONAL) -- -- IF (NOT WITH_LIBLUA) -- ProcessPackage(LIBLUA LIBRARY "lua" -- "lua-5.1" -- INCLUDE lua.h INCLUDE_SUFFIXES -- "include/lua-5.1" -- "include/lua5.1" -- "include/lua51" -- "include/lua" -- ROOT ${LUA_ROOT} -- MODULES lua51) -- ENDIF() -- ENDIF() -+ MODULES lua) - ENDIF(ENABLE_LUAJIT MATCHES "ON") - - IF(ENABLE_JEMALLOC MATCHES "ON" AND NOT SANITIZE) --- diff --git a/mail-filter/rspamd/files/rspamd-2.7-unbundle-zstd.patch b/mail-filter/rspamd/files/rspamd-2.7-unbundle-zstd.patch deleted file mode 100644 index f0fc9f8352bd..000000000000 --- a/mail-filter/rspamd/files/rspamd-2.7-unbundle-zstd.patch +++ /dev/null @@ -1,125 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 77ad86785..56246807e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -202,6 +202,8 @@ ELSE() - ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3) - ENDIF() - -+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 - ROOT ${SQLITE3_ROOT_DIR} MODULES sqlite3 sqlite) - ProcessPackage(ICUDATA LIBRARY icudata INCLUDE unicode/ucnv.h -@@ -619,7 +621,6 @@ ADD_SUBDIRECTORY(contrib/http-parser) - ADD_SUBDIRECTORY(contrib/fpconv) - ADD_SUBDIRECTORY(contrib/lc-btrie) - ADD_SUBDIRECTORY(contrib/libottery) --ADD_SUBDIRECTORY(contrib/zstd) - IF(ENABLE_SNOWBALL MATCHES "ON") - ADD_SUBDIRECTORY(contrib/snowball) - SET(WITH_SNOWBALL 1) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 54b2e4083..e0e2edd58 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -181,7 +181,6 @@ TARGET_LINK_LIBRARIES(rspamd-server rspamd-http-parser) - TARGET_LINK_LIBRARIES(rspamd-server rspamd-fpconv) - TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb) - TARGET_LINK_LIBRARIES(rspamd-server lcbtrie) --TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd) - TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8) - - IF (ENABLE_CLANG_PLUGIN MATCHES "ON") -diff --git a/src/client/rspamdclient.c b/src/client/rspamdclient.c -index bcb25672e..48ca58e94 100644 ---- a/src/client/rspamdclient.c -+++ b/src/client/rspamdclient.c -@@ -19,7 +19,7 @@ - #include "libserver/http/http_private.h" - #include "libserver/protocol_internal.h" - #include "unix-std.h" --#include "contrib/zstd/zstd.h" -+#include - - #ifdef HAVE_FETCH_H - #include -diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c -index 987123cbb..51c2e1468 100644 ---- a/src/libserver/cfg_utils.c -+++ b/src/libserver/cfg_utils.c -@@ -36,8 +36,7 @@ - #include "contrib/libottery/ottery.h" - #include "contrib/fastutf8/fastutf8.h" - --#define ZSTD_STATIC_LINKING_ONLY --#include "contrib/zstd/zstd.h" -+#include - - #ifdef HAVE_OPENSSL - #include -diff --git a/src/libserver/maps/map.c b/src/libserver/maps/map.c -index 14792753a..20ca8416e 100644 ---- a/src/libserver/maps/map.c -+++ b/src/libserver/maps/map.c -@@ -23,7 +23,7 @@ - #include "libserver/http/http_connection.h" - #include "libserver/http/http_private.h" - #include "rspamd.h" --#include "contrib/zstd/zstd.h" -+#include - #include "contrib/libev/ev.h" - #include "contrib/uthash/utlist.h" - -diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c -index 31b0308cb..62ba3d833 100644 ---- a/src/libserver/protocol.c -+++ b/src/libserver/protocol.c -@@ -21,7 +21,7 @@ - #include "worker_private.h" - #include "libserver/cfg_file_private.h" - #include "libmime/scan_result_private.h" --#include "contrib/zstd/zstd.h" -+#include - #include "lua/lua_common.h" - #include "unix-std.h" - #include "protocol_internal.h" -diff --git a/src/libserver/task.c b/src/libserver/task.c -index 096933803..f78754ab4 100644 ---- a/src/libserver/task.c -+++ b/src/libserver/task.c -@@ -25,7 +25,7 @@ - #include "stat_api.h" - #include "unix-std.h" - #include "utlist.h" --#include "contrib/zstd/zstd.h" -+#include - #include "libserver/mempool_vars_internal.h" - #include "libserver/cfg_file_private.h" - #include "libmime/lang_detection.h" -diff --git a/src/lua/lua_util.c b/src/lua/lua_util.c -index e879d37af..88451e222 100644 ---- a/src/lua/lua_util.c -+++ b/src/lua/lua_util.c -@@ -15,7 +15,7 @@ - */ - #include "lua_common.h" - #include "unix-std.h" --#include "contrib/zstd/zstd.h" -+#include - #include "libmime/email_addr.h" - #include "libmime/content_type.h" - #include "libmime/mime_headers.h" -diff --git a/src/rspamd_proxy.c b/src/rspamd_proxy.c -index 3fa5da390..c641fb263 100644 ---- a/src/rspamd_proxy.c -+++ b/src/rspamd_proxy.c -@@ -36,7 +36,7 @@ - #include "libserver/milter.h" - #include "libserver/milter_internal.h" - #include "libmime/lang_detection.h" --#include "contrib/zstd/zstd.h" -+#include - - #include - diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml index ebd97898f0a6..09b8498d3eb3 100644 --- a/mail-filter/rspamd/metadata.xml +++ b/mail-filter/rspamd/metadata.xml @@ -13,7 +13,6 @@ rspamd/rspamd - Use dev-libs/libpcre2 Enable PCRE JIT support diff --git a/mail-filter/rspamd/rspamd-2.7-r104.ebuild b/mail-filter/rspamd/rspamd-2.7-r104.ebuild deleted file mode 100644 index 12fd017ebb51..000000000000 --- a/mail-filter/rspamd/rspamd-2.7-r104.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..2} luajit ) - -inherit cmake lua-single pax-utils systemd tmpfiles - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/rspamd/rspamd.git" - inherit git-r3 -else - SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 x86" -fi - -DESCRIPTION="Rapid spam filtering system" -HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd" -LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB" -SLOT="0" -IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 selinux" - -REQUIRED_USE="${LUA_REQUIRED_USE}" - -RDEPEND="${LUA_DEPS} - $(lua_gen_cond_dep ' - dev-lua/LuaBitOp[${LUA_USEDEP}] - ' lua5-{1,2}) - acct-group/rspamd - acct-user/rspamd - app-arch/zstd:= - dev-db/sqlite:3 - dev-libs/glib:2 - dev-libs/icu:= - dev-libs/libev - dev-libs/libsodium:= - dev-libs/snowball-stemmer:= - sys-apps/file - sys-libs/zlib - blas? ( - virtual/blas - virtual/lapack - ) - cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) - jemalloc? ( dev-libs/jemalloc:= ) - dev-libs/openssl:0=[-bindist(-)] - pcre2? ( dev-libs/libpcre2:=[jit=] ) - !pcre2? ( dev-libs/libpcre[jit=] ) - selinux? ( sec-policy/selinux-spamassassin )" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/ragel - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/rspamd-2.7-cmake-lua-version.patch" - "${FILESDIR}/rspamd-2.6-unbundle-lua.patch" - "${FILESDIR}/rspamd-2.7-unbundle-zstd.patch" - "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch" -) - -src_prepare() { - cmake_src_prepare - - rm -vrf contrib/{lua-bit,snowball,zstd} || die - - sed -i -e 's/User=_rspamd/User=rspamd/g' \ - rspamd.service \ - || die -} - -src_configure() { - local mycmakeargs=( - -DCONFDIR=/etc/rspamd - -DRUNDIR=/var/run/rspamd - -DDBDIR=/var/lib/rspamd - -DLOGDIR=/var/log/rspamd - -DENABLE_BLAS=$(usex blas ON OFF) - -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF) - -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) - -DENABLE_LUAJIT=$(usex lua_single_target_luajit ON OFF) - -DENABLE_PCRE2=$(usex pcre2 ON OFF) - ) - cmake_src_configure -} - -src_test() { - cmake_src_test -} - -src_install() { - cmake_src_install - - newconfd "${FILESDIR}"/rspamd.conf rspamd - newinitd "${FILESDIR}/rspamd-r7.init" rspamd - systemd_newunit rspamd.service rspamd.service - - newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf - - # Remove mprotect for JIT support - if use lua_single_target_luajit; then - pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* - fi - - insinto /etc/logrotate.d - newins "${FILESDIR}"/rspamd-r1.logrotate rspamd - - diropts -o rspamd -g rspamd - keepdir /var/{lib,log}/rspamd -} - -pkg_postinst() { - tmpfiles_process "${PN}.conf" -} -- cgit v1.2.3-65-gdbad