commit: 659557f22c2738833fb3a588880a2b0e53a6679b
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 8 22:43:40 2022 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> 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 <chewi <AT> 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) \
