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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B0DE1158013 for ; Sun, 3 Dec 2023 22:01:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1E352BC020; Sun, 3 Dec 2023 22:01:51 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D4AED2BC020 for ; Sun, 3 Dec 2023 22:01:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 277A0335DEB for ; Sun, 3 Dec 2023 22:01:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B2EC6AE3 for ; Sun, 3 Dec 2023 22:01:49 +0000 (UTC) From: "Petr Vaněk" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Petr Vaněk" Message-ID: <1701640835.056e6464c30c821ee62bea2557afa64398e20435.arkamar@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-filter/rspamd/files/rspamd-3.7.4-no-hyperscan.patch mail-filter/rspamd/rspamd-3.7.4-r1.ebuild mail-filter/rspamd/rspamd-3.7.4.ebuild X-VCS-Directories: mail-filter/rspamd/ mail-filter/rspamd/files/ X-VCS-Committer: arkamar X-VCS-Committer-Name: Petr Vaněk X-VCS-Revision: 056e6464c30c821ee62bea2557afa64398e20435 X-VCS-Branch: master Date: Sun, 3 Dec 2023 22:01:49 +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: af3995a2-56ce-4299-b65e-be5f019acd11 X-Archives-Hash: 0fed0ae430ab8ab2fc5e48e339ee75ac commit: 056e6464c30c821ee62bea2557afa64398e20435 Author: Petr Vaněk gentoo org> AuthorDate: Sun Dec 3 21:47:28 2023 +0000 Commit: Petr Vaněk gentoo org> CommitDate: Sun Dec 3 22:00:35 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=056e6464 mail-filter/rspamd: Fix build with disabled hyperscan The issue is fixed with a patch backported from upstream. Upstream-issue: https://github.com/rspamd/rspamd/issues/4701 Upstream-issue: https://github.com/rspamd/rspamd/issues/4702 Closes: https://bugs.gentoo.org/917512 Signed-off-by: Petr Vaněk gentoo.org> .../rspamd/files/rspamd-3.7.4-no-hyperscan.patch | 38 ++++++++++++++++++++++ mail-filter/rspamd/rspamd-3.7.4-r1.ebuild | 2 ++ mail-filter/rspamd/rspamd-3.7.4.ebuild | 2 ++ 3 files changed, 42 insertions(+) diff --git a/mail-filter/rspamd/files/rspamd-3.7.4-no-hyperscan.patch b/mail-filter/rspamd/files/rspamd-3.7.4-no-hyperscan.patch new file mode 100644 index 000000000000..76353b703f21 --- /dev/null +++ b/mail-filter/rspamd/files/rspamd-3.7.4-no-hyperscan.patch @@ -0,0 +1,38 @@ +From d907a95ac2e2cad6f7f65c4323f031f7931ae18b Mon Sep 17 00:00:00 2001 +From: Vsevolod Stakhov +Date: Wed, 15 Nov 2023 13:43:05 +0000 +Subject: [PATCH] [Minor] Fix build with no hyperscan + +Upstream-issue: https://github.com/rspamd/rspamd/issues/4701 +Upstream-issue: https://github.com/rspamd/rspamd/issues/4702 + +diff --git a/src/libserver/rspamd_control.c b/src/libserver/rspamd_control.c +index 986a4a2ea..69af0597f 100644 +--- a/src/libserver/rspamd_control.c ++++ b/src/libserver/rspamd_control.c +@@ -922,6 +922,7 @@ rspamd_srv_handler(EV_P_ ev_io *w, int revents) + } + break; + case RSPAMD_SRV_HYPERSCAN_LOADED: ++#ifdef WITH_HYPERSCAN + /* Load RE cache to provide it for new forks */ + if (rspamd_re_cache_is_hs_loaded(rspamd_main->cfg->re_cache) != RSPAMD_HYPERSCAN_LOADED_FULL || + cmd.cmd.hs_loaded.forced) { +@@ -932,7 +933,9 @@ rspamd_srv_handler(EV_P_ ev_io *w, int revents) + } + + /* After getting this notice, we can clean up old hyperscan files */ ++ + rspamd_hyperscan_notice_loaded(); ++ + msg_info_main("received hyperscan cache loaded from %s", + cmd.cmd.hs_loaded.cache_dir); + +@@ -945,6 +948,7 @@ rspamd_srv_handler(EV_P_ ev_io *w, int revents) + wcmd.cmd.hs_loaded.forced = cmd.cmd.hs_loaded.forced; + rspamd_control_broadcast_cmd(rspamd_main, &wcmd, rfd, + rspamd_control_ignore_io_handler, NULL, worker->pid); ++#endif + break; + case RSPAMD_SRV_MONITORED_CHANGE: + /* Broadcast command to all workers */ diff --git a/mail-filter/rspamd/rspamd-3.7.4-r1.ebuild b/mail-filter/rspamd/rspamd-3.7.4-r1.ebuild index 476878d10a51..d25c1a699699 100644 --- a/mail-filter/rspamd/rspamd-3.7.4-r1.ebuild +++ b/mail-filter/rspamd/rspamd-3.7.4-r1.ebuild @@ -71,6 +71,8 @@ PATCHES=( "${FILESDIR}/rspamd-3.6-cmake-lua-version.patch" "${FILESDIR}/rspamd-3.6-unbundle-lua.patch" "${FILESDIR}/rspamd-3.6-unbundle-snowball.patch" + + "${FILESDIR}/${P}-no-hyperscan.patch" #917512 ) src_prepare() { diff --git a/mail-filter/rspamd/rspamd-3.7.4.ebuild b/mail-filter/rspamd/rspamd-3.7.4.ebuild index ad8d2656579e..8ae0aff0c482 100644 --- a/mail-filter/rspamd/rspamd-3.7.4.ebuild +++ b/mail-filter/rspamd/rspamd-3.7.4.ebuild @@ -71,6 +71,8 @@ PATCHES=( "${FILESDIR}/rspamd-3.6-cmake-lua-version.patch" "${FILESDIR}/rspamd-3.6-unbundle-lua.patch" "${FILESDIR}/rspamd-3.6-unbundle-snowball.patch" + + "${FILESDIR}/${P}-no-hyperscan.patch" #917512 ) src_prepare() {