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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A88D1138335 for ; Fri, 27 Dec 2019 18:52:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A9F83E0A60; Fri, 27 Dec 2019 18:51:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 92058E0A60 for ; Fri, 27 Dec 2019 18:51:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 43B2434DC2A for ; Fri, 27 Dec 2019 18:51:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C039D36 for ; Fri, 27 Dec 2019 18:51:55 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1577472705.b23e2cd1aefb1b2ff49da3d12c1fb96f2cf361c0.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild net-firewall/ipt_netflow/ipt_netflow-9999.ebuild X-VCS-Directories: net-firewall/ipt_netflow/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: b23e2cd1aefb1b2ff49da3d12c1fb96f2cf361c0 X-VCS-Branch: master Date: Fri, 27 Dec 2019 18:51:55 +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: d372e7e4-2050-4e47-bd70-bcf807d25eaf X-Archives-Hash: 6a8308fb8811b42b81d5ed1f22c57b20 commit: b23e2cd1aefb1b2ff49da3d12c1fb96f2cf361c0 Author: Jeroen Roovers gentoo org> AuthorDate: Fri Dec 27 18:48:23 2019 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Fri Dec 27 18:51:45 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b23e2cd1 net-firewall/ipt_netflow: Check for NF_NAT in kernel >=5.2 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Jeroen Roovers gentoo.org> net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild | 17 ++++++++++++++--- net-firewall/ipt_netflow/ipt_netflow-9999.ebuild | 17 ++++++++++++++--- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild index 88d6cef84f3..b8e3956550b 100644 --- a/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild +++ b/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild @@ -31,12 +31,23 @@ PATCHES=( ) pkg_setup() { + linux-info_pkg_setup + + local CONFIG_CHECK="~IP_NF_IPTABLES VLAN_8021Q" + use debug && CONFIG_CHECK+=" ~DEBUG_FS" + if use natevents; then + CONFIG_CHECK+=" NF_CONNTRACK_EVENTS" + if kernel_is lt 5 2; then + CONFIG_CHECK+=" NF_NAT_NEEDED" + else + CONFIG_CHECK+=" NF_NAT" + fi + fi + BUILD_TARGETS="all" MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})" IPT_LIB="/usr/$(get_libdir)/xtables" - local CONFIG_CHECK="~IP_NF_IPTABLES VLAN_8021Q" - use debug && CONFIG_CHECK+=" ~DEBUG_FS" - use natevents && CONFIG_CHECK+=" NF_CONNTRACK_EVENTS NF_NAT_NEEDED" + linux-mod_pkg_setup } diff --git a/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild b/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild index 71ba1b74afb..7414800f8c3 100644 --- a/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild +++ b/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild @@ -31,12 +31,23 @@ PATCHES=( ) pkg_setup() { + linux-info_pkg_setup + + local CONFIG_CHECK="~IP_NF_IPTABLES VLAN_8021Q" + use debug && CONFIG_CHECK+=" ~DEBUG_FS" + if use natevents; then + CONFIG_CHECK+=" NF_CONNTRACK_EVENTS" + if kernel_is lt 5 2; then + CONFIG_CHECK+=" NF_NAT_NEEDED" + else + CONFIG_CHECK+=" NF_NAT" + fi + fi + BUILD_TARGETS="all" MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})" IPT_LIB="/usr/$(get_libdir)/xtables" - local CONFIG_CHECK="~IP_NF_IPTABLES VLAN_8021Q" - use debug && CONFIG_CHECK+=" ~DEBUG_FS" - use natevents && CONFIG_CHECK+=" NF_CONNTRACK_EVENTS NF_NAT_NEEDED" + linux-mod_pkg_setup }