From 7db983f17e59dfa621d994bcbdbddc71a6e70a57 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 9 Nov 2022 03:25:11 +0000 Subject: gentoo auto-resync : 09:11:2022 - 03:25:11 --- net-firewall/firehol/Manifest | 2 +- net-firewall/firehol/firehol-3.1.7-r2.ebuild | 25 +++++++++++++++++-------- 2 files changed, 18 insertions(+), 9 deletions(-) (limited to 'net-firewall/firehol') diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest index 08aadac44f8e..3a9b59421c70 100644 --- a/net-firewall/firehol/Manifest +++ b/net-firewall/firehol/Manifest @@ -5,5 +5,5 @@ AUX fireqos.initd 829 BLAKE2B f09905f02189f155455886dd1896a183f2f529d0737939a706 DIST firehol-3.1.6.tar.xz 1484424 BLAKE2B aea45aa424b7b43ed0576916f52a785601a21489263c1b5c6abbf3b2b97db80bf2a2420ae8176cd55e335ab93c18a8209a47f467dba80a63cf2c319b3e3e27d8 SHA512 5ffa7e59d3f10a6c7d3f5b5ef9d93f1b2138063374a10cb0c1ac4e75578d6cf7755e154b51febf546563ba003f100af13f89bca3843b66a8d22b8fc2da3fadfe DIST firehol-3.1.7.tar.xz 1457932 BLAKE2B 9a861f2e9c900bce45d0dbd12f4546bc14eb4d74aea27a8d4cb0e5bfe8bea92d9bff3ccf008d46bd64212d689123273c99d0b0faaaadd34f0e1d85e22ee757c9 SHA512 b05cec806c2c8fc410bf9c7a30e3ad1d9f1c06fd2d501a7e5434010f6bb38722aac5b64de9b4285d2c71cacbf6b2f3c758685da5a70c05621df52879eb5148c2 EBUILD firehol-3.1.6-r3.ebuild 1448 BLAKE2B e0f98abc7590813988cc7a4cc7d0a930e488978e372cda90378306298d3a45eccddf9f1a96f3ab1bc934eae8b886787668e6f154be69abb13f0094683aa8953b SHA512 c5dcb2e0f55951cb48ac82b573b399ba1ec8526e146ce87cae27a5c0dfc0efa37d15d069b63b1b9ebb0099d5a8635bba438b669aa5884ac01b8a76c36f82944c -EBUILD firehol-3.1.7-r2.ebuild 1505 BLAKE2B 71f242ca1f5e53e5446b8a45d34685dbe3d6ad69c1762495df23ec11bbc6b10c8738e601087224231448d510ed86388bbf8c69f1389af168e4d3245224d57e27 SHA512 40c26898272185283a16cb54bddacb5c8a5b32b513eb519353248c2450a20dcdbc4cad90ff637daba1798968e8f00d8c62facb3212d8ac1263f6894d211cd92f +EBUILD firehol-3.1.7-r2.ebuild 1924 BLAKE2B d6869eb24b20b4d528d1d3e4fec5d217065823aad0331cf71c112650d0efb5867426bcb927a38018c5fc7759e26eeeadbf40d6c58ff2132f2cafc4656b590fc5 SHA512 d0692bcae2854491668336548ae9c5dd4151e4861565d176b226e27464ba1d232a46271060a38e965aa6bc2ec5277d9739657c536bdd40dd0c6a7bc0a759142c MISC metadata.xml 465 BLAKE2B bfefafde956a4355f827c12438dc41f337e3199f6da88bba92d67d811a6f1d2d086e688c2aa262c40c86535671c0db3a32d424d96a2c7c9525f107711beb9c7f SHA512 36174445bf13870981133d45de5d807cec2178612256a6a51dfe2f4b69ee5fd9f245b6fad52a2a194745bb6d4e83115889ce3f18cfbb69b78ec925408fd3bd16 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) \ -- cgit v1.2.3