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 07C44158020 for ; Tue, 8 Nov 2022 22:44:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 096A6E09FD; Tue, 8 Nov 2022 22:44:33 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E20D4E09FD for ; Tue, 8 Nov 2022 22:44:32 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B1744340DEB for ; Tue, 8 Nov 2022 22:44:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 179F46DF for ; Tue, 8 Nov 2022 22:44:30 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1667947420.659557f22c2738833fb3a588880a2b0e53a6679b.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/firehol/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-firewall/firehol/firehol-3.1.7-r2.ebuild X-VCS-Directories: net-firewall/firehol/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 659557f22c2738833fb3a588880a2b0e53a6679b X-VCS-Branch: master Date: Tue, 8 Nov 2022 22:44:30 +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: 34f0013c-5c95-431f-9a06-1e4f0303894b X-Archives-Hash: f2360fd15e3dbc90f3109de5fcd19495 commit: 659557f22c2738833fb3a588880a2b0e53a6679b Author: James Le Cuirot gentoo org> AuthorDate: Tue Nov 8 22:43:40 2022 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Tue Nov 8 22:43:40 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=659557f2 net-firewall/firehol: Set bash and iprange versions to aid cross-compiling Signed-off-by: James Le Cuirot gentoo.org> net-firewall/firehol/firehol-3.1.7-r2.ebuild | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/net-firewall/firehol/firehol-3.1.7-r2.ebuild b/net-firewall/firehol/firehol-3.1.7-r2.ebuild index 79ef83977169..f750bfab3a7b 100644 --- a/net-firewall/firehol/firehol-3.1.7-r2.ebuild +++ b/net-firewall/firehol/firehol-3.1.7-r2.ebuild @@ -14,16 +14,22 @@ SLOT="0" IUSE="doc ipv6 ipset" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -RDEPEND="net-firewall/iptables +# Set the dependency versions to aid cross-compiling. Keep them at their +# minimums as the configure script merely checks whether they are sufficient. +MY_BASH_VERSION=4.0 +MY_IPRANGE_VERSION=1.0.2 + +RDEPEND=" + app-arch/gzip + >=app-shells/bash-${MY_BASH_VERSION}:0 + net-analyzer/traceroute + net-firewall/iptables + >=net-misc/iprange-${MY_IPRANGE_VERSION}:0 + net-misc/iputils[ipv6(+)?] sys-apps/iproute2[-minimal,ipv6(+)?] sys-apps/kmod[tools] - net-misc/iputils[ipv6(+)?] - net-misc/iprange - net-analyzer/traceroute - app-arch/gzip - ipset? ( - net-firewall/ipset - )" + ipset? ( net-firewall/ipset ) +" DEPEND="${RDEPEND}" pkg_setup() { @@ -50,6 +56,9 @@ pkg_setup() { } src_configure() { + # This erroneously checks for BASH_VERSION_PATH rather than BASH_VERSION. + BASH_VERSION_PATH=${MY_BASH_VERSION} \ + IPRANGE_VERSION=${MY_IPRANGE_VERSION} \ econf \ --disable-vnetbuild \ $(use_enable ipset update-ipsets) \