commit: 1f367931c8e234cc3ac1f20ec191f80aa3a91c2a Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> AuthorDate: Sat Aug 15 18:18:43 2015 +0000 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> CommitDate: Sat Aug 15 18:18:43 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f367931
net-firewall/iptables: fix configure enable flag parsing #557586 .../iptables/files/iptables-1.4.21-configure.patch | 34 ++++++++++++++++++++++ net-firewall/iptables/iptables-1.4.21-r2.ebuild | 2 ++ 2 files changed, 36 insertions(+) diff --git a/net-firewall/iptables/files/iptables-1.4.21-configure.patch b/net-firewall/iptables/files/iptables-1.4.21-configure.patch new file mode 100644 index 0000000..e827885 --- /dev/null +++ b/net-firewall/iptables/files/iptables-1.4.21-configure.patch @@ -0,0 +1,34 @@ +https://bugs.gentoo.org/557586 + +From b24e59fba39120bfdb9e521bbd0af8f33a60466e Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <[email protected]> +Date: Sat, 15 Aug 2015 14:12:39 -0400 +Subject: [PATCH] configure: fix 3rd arg w/AC_ARG_ENABLE + +The 3rd arg is used when --{enable,disable}-foo are passed in, not when +the feature is enabled. Use the existing $enableval instead. + +Signed-off-by: Mike Frysinger <[email protected]> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/configure ++++ b/configure +@@ -11898,14 +11898,14 @@ fi + + # Check whether --enable-bpf-compiler was given. + if test "${enable_bpf_compiler+set}" = set; then : +- enableval=$enable_bpf_compiler; enable_bpfc="yes" ++ enableval=$enable_bpf_compiler; enable_bpfc="$enableval" + else + enable_bpfc="no" + fi + + # Check whether --enable-nfsynproxy was given. + if test "${enable_nfsynproxy+set}" = set; then : +- enableval=$enable_nfsynproxy; enable_nfsynproxy="yes" ++ enableval=$enable_nfsynproxy; enable_nfsynproxy="$enableval" + else + enable_nfsynproxy="no" + fi diff --git a/net-firewall/iptables/iptables-1.4.21-r2.ebuild b/net-firewall/iptables/iptables-1.4.21-r2.ebuild index e70cf33..268e0f7 100644 --- a/net-firewall/iptables/iptables-1.4.21-r2.ebuild +++ b/net-firewall/iptables/iptables-1.4.21-r2.ebuild @@ -34,6 +34,8 @@ src_prepare() { # use the saner headers from the kernel rm -f include/linux/{kernel,types}.h + epatch "${FILESDIR}"/${P}-configure.patch #557586 + # Only run autotools if user patched something epatch_user && eautoreconf || elibtoolize }
