From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 118AF1382C5 for ; Sat, 9 Jan 2021 12:33:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F4B4E0207; Sat, 9 Jan 2021 12:33:44 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1C058E0207 for ; Sat, 9 Jan 2021 12:33:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 00B8B34107A for ; Sat, 9 Jan 2021 12:33:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AB27748D for ; Sat, 9 Jan 2021 12:33:35 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1610195611.84ba790757559589325dbaccde894d92c558a72a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-filter/rspamd/files/rspamd-9999-unbundle-zstd.patch mail-filter/rspamd/rspamd-9999.ebuild X-VCS-Directories: mail-filter/rspamd/files/ mail-filter/rspamd/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 84ba790757559589325dbaccde894d92c558a72a X-VCS-Branch: master Date: Sat, 9 Jan 2021 12:33:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2687eb52-b454-444e-a816-722c54070ce8 X-Archives-Hash: e2938664d8bffb74c71d3552c1bb1042 commit: 84ba790757559589325dbaccde894d92c558a72a Author: Petr Vaněk atlas cz> AuthorDate: Sat Jan 9 10:49:17 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jan 9 12:33:31 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84ba7907 mail-filter/rspamd: sync live Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Sam James gentoo.org> .../rspamd/files/rspamd-9999-unbundle-zstd.patch | 125 --------------------- mail-filter/rspamd/rspamd-9999.ebuild | 6 +- 2 files changed, 3 insertions(+), 128 deletions(-) diff --git a/mail-filter/rspamd/files/rspamd-9999-unbundle-zstd.patch b/mail-filter/rspamd/files/rspamd-9999-unbundle-zstd.patch deleted file mode 100644 index c42bb8f5d6f..00000000000 --- a/mail-filter/rspamd/files/rspamd-9999-unbundle-zstd.patch +++ /dev/null @@ -1,125 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3b4bd8469..75582513e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -199,6 +199,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 -@@ -616,7 +618,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 59bab5c15..098329991 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -182,7 +182,6 @@ TARGET_LINK_LIBRARIES(rspamd-server rspamd-fpconv) - TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb) - TARGET_LINK_LIBRARIES(rspamd-server rspamd-lpeg) - 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 e2f886aa6..5b214c09c 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 e7a83a603..c613fffcc 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/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild index 8f97da55c2b..0ba25019331 100644 --- a/mail-filter/rspamd/rspamd-9999.ebuild +++ b/mail-filter/rspamd/rspamd-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -56,9 +56,9 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/rspamd-2.6-cmake-lua-version.patch" + "${FILESDIR}/rspamd-2.7-cmake-lua-version.patch" "${FILESDIR}/rspamd-2.6-unbundle-lua.patch" - "${FILESDIR}/rspamd-9999-unbundle-zstd.patch" + "${FILESDIR}/rspamd-2.7-unbundle-zstd.patch" "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch" )