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 35F84138350 for ; Mon, 24 Feb 2020 05:55:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ECD53E08EF; Mon, 24 Feb 2020 05:55:46 +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 CFC90E08EF for ; Mon, 24 Feb 2020 05:55:45 +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 57FD234EFDC for ; Mon, 24 Feb 2020 05:55:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D368B146 for ; Mon, 24 Feb 2020 05:55:41 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1582521585.97d6eb42bee13f4495bf411d9dacbef05a733607.juippis@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-2.2-i386-hyperscan.patch mail-filter/rspamd/rspamd-2.2.ebuild X-VCS-Directories: mail-filter/rspamd/ mail-filter/rspamd/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 97d6eb42bee13f4495bf411d9dacbef05a733607 X-VCS-Branch: master Date: Mon, 24 Feb 2020 05:55:41 +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: 59d11944-0978-4160-905a-841bccfb30e8 X-Archives-Hash: a572fb706181a080b4952a4bedf07a9a commit: 97d6eb42bee13f4495bf411d9dacbef05a733607 Author: Petr Vaněk atlas cz> AuthorDate: Tue Feb 4 18:52:38 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Mon Feb 24 05:19:45 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97d6eb42 mail-filter/rspamd: fix hyperscan support on i386 The patch is taken from upstream. https://github.com/rspamd/rspamd/commit/92e62855a64d1f7f0e52720399f8aa31bdcb0983 Closes: https://bugs.gentoo.org/703004 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/14572 Signed-off-by: Joonas Niilola gentoo.org> mail-filter/rspamd/files/rspamd-2.2-i386-hyperscan.patch | 15 +++++++++++++++ mail-filter/rspamd/rspamd-2.2.ebuild | 2 ++ 2 files changed, 17 insertions(+) diff --git a/mail-filter/rspamd/files/rspamd-2.2-i386-hyperscan.patch b/mail-filter/rspamd/files/rspamd-2.2-i386-hyperscan.patch new file mode 100644 index 00000000000..578d3da7fa3 --- /dev/null +++ b/mail-filter/rspamd/files/rspamd-2.2-i386-hyperscan.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/Hyperscan.cmake b/cmake/Hyperscan.cmake +index 3dd774511..b8f83a3bb 100644 +--- a/cmake/Hyperscan.cmake ++++ b/cmake/Hyperscan.cmake +@@ -1,8 +1,8 @@ + option (ENABLE_HYPERSCAN "Enable hyperscan for fast regexp processing [default: OFF]" OFF) + + if (ENABLE_HYPERSCAN MATCHES "ON") +- if (NOT "${ARCH}" STREQUAL "x86_64") +- MESSAGE(FATAL_ERROR "Hyperscan is supported only on x86_64 architecture") ++ if (NOT ("${ARCH}" STREQUAL "x86_64" OR "${ARCH}" STREQUAL "i386")) ++ MESSAGE(FATAL_ERROR "Hyperscan is supported only on x86_64/i386 architectures") + endif () + ProcessPackage (HYPERSCAN LIBRARY hs INCLUDE hs.h INCLUDE_SUFFIXES + hs include/hs diff --git a/mail-filter/rspamd/rspamd-2.2.ebuild b/mail-filter/rspamd/rspamd-2.2.ebuild index 3f29e90b90e..3b7e3129381 100644 --- a/mail-filter/rspamd/rspamd-2.2.ebuild +++ b/mail-filter/rspamd/rspamd-2.2.ebuild @@ -41,6 +41,8 @@ RDEPEND=" !pcre2? ( dev-libs/libpcre[jit=] )" DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/${P}-i386-hyperscan.patch" ) + src_prepare() { cmake_src_prepare