From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 174941385B0 for ; Sat, 15 Aug 2015 18:19:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 94257141E5; Sat, 15 Aug 2015 18:19:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D6EE4E07C9 for ; Sat, 15 Aug 2015 18:19:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 627A1340C15 for ; Sat, 15 Aug 2015 18:19:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 80424149 for ; Sat, 15 Aug 2015 18:19:37 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1439662723.1f367931c8e234cc3ac1f20ec191f80aa3a91c2a.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/iptables/, net-firewall/iptables/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-firewall/iptables/files/iptables-1.4.21-configure.patch net-firewall/iptables/iptables-1.4.21-r2.ebuild X-VCS-Directories: net-firewall/iptables/files/ net-firewall/iptables/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 1f367931c8e234cc3ac1f20ec191f80aa3a91c2a X-VCS-Branch: master Date: Sat, 15 Aug 2015 18:19:37 +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-Archives-Salt: b0e04049-3821-4d87-bd05-f04167562a5a X-Archives-Hash: ea0c581fbbc149029c80cb5513060de6 commit: 1f367931c8e234cc3ac1f20ec191f80aa3a91c2a Author: Mike Frysinger gentoo org> AuthorDate: Sat Aug 15 18:18:43 2015 +0000 Commit: Mike Frysinger gentoo 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 +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 +--- + 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 }