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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B58DC15802C for ; Thu, 19 Dec 2024 16:45:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B428AE07E1; Thu, 19 Dec 2024 16:45:50 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 C0388E07E1 for ; Thu, 19 Dec 2024 16:45:47 +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 7984A335D75 for ; Thu, 19 Dec 2024 16:45:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 17EC21048 for ; Thu, 19 Dec 2024 16:45:44 +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: <1734626728.ee616175eee3844911446b7441b5a942d58ea5ca.arkamar@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-3.11.0-simdutf-hdr.patch mail-filter/rspamd/rspamd-3.11.0-r1.ebuild mail-filter/rspamd/rspamd-3.11.0.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: ee616175eee3844911446b7441b5a942d58ea5ca X-VCS-Branch: master Date: Thu, 19 Dec 2024 16:45:44 +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: 4b2314dc-4ced-4e5b-b65b-45a2c86f1827 X-Archives-Hash: b6767e6f3333e33d30dc0faddf157535 commit: ee616175eee3844911446b7441b5a942d58ea5ca Author: Petr Vaněk gentoo org> AuthorDate: Thu Dec 19 16:41:41 2024 +0000 Commit: Petr Vaněk gentoo org> CommitDate: Thu Dec 19 16:45:28 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee616175 mail-filter/rspamd: fix build with USE=-hyperscan This fix backports upstream patch https://github.com/rspamd/rspamd/commit/ccb45df90df60fae36b9438cfb2b0088e590306b Closes: https://bugs.gentoo.org/946676 Signed-off-by: Petr Vaněk gentoo.org> .../rspamd/files/rspamd-3.11.0-simdutf-hdr.patch | 27 ++++++++++++++++++++++ ...spamd-3.11.0.ebuild => rspamd-3.11.0-r1.ebuild} | 3 +++ 2 files changed, 30 insertions(+) diff --git a/mail-filter/rspamd/files/rspamd-3.11.0-simdutf-hdr.patch b/mail-filter/rspamd/files/rspamd-3.11.0-simdutf-hdr.patch new file mode 100644 index 000000000000..eb129268b49f --- /dev/null +++ b/mail-filter/rspamd/files/rspamd-3.11.0-simdutf-hdr.patch @@ -0,0 +1,27 @@ +From ccb45df90df60fae36b9438cfb2b0088e590306b Mon Sep 17 00:00:00 2001 +From: Vsevolod Stakhov +Date: Tue, 17 Dec 2024 13:37:54 +0000 +Subject: [PATCH] [Fix] Fix crash on FreeBSD when Rspamd is built without + hyperscan + +Upstream-commit: https://github.com/rspamd/rspamd/commit/ccb45df90df60fae36b9438cfb2b0088e590306b +--- + src/rspamd.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/rspamd.c b/src/rspamd.c +index 088bfba49c..dafd9aebeb 100644 +--- a/src/rspamd.c ++++ b/src/rspamd.c +@@ -56,9 +56,10 @@ + + #ifdef WITH_HYPERSCAN + #include "libserver/hyperscan_tools.h" +-#include "rspamd_simdutf.h" + #endif + ++#include "rspamd_simdutf.h" ++ + /* 2 seconds to fork new process in place of dead one */ + #define SOFT_FORK_TIME 2 + diff --git a/mail-filter/rspamd/rspamd-3.11.0.ebuild b/mail-filter/rspamd/rspamd-3.11.0-r1.ebuild similarity index 98% rename from mail-filter/rspamd/rspamd-3.11.0.ebuild rename to mail-filter/rspamd/rspamd-3.11.0-r1.ebuild index 45df6738554b..cc4d00d79234 100644 --- a/mail-filter/rspamd/rspamd-3.11.0.ebuild +++ b/mail-filter/rspamd/rspamd-3.11.0-r1.ebuild @@ -75,6 +75,9 @@ PATCHES=( # backward compatibility with