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 00E29138334 for ; Fri, 27 Dec 2019 22:56:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D545E0984; Fri, 27 Dec 2019 22:56:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 144D7E0984 for ; Fri, 27 Dec 2019 22:56:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 4717A34DC20 for ; Fri, 27 Dec 2019 22:56:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 358BE36 for ; Fri, 27 Dec 2019 22:56:24 +0000 (UTC) From: "Jason A. Donenfeld" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason A. Donenfeld" Message-ID: <1577487379.ac4359208d9a3fe508d7668d59c0406c4080bc28.zx2c4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/wireguard-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/wireguard-tools/wireguard-tools-1.0.20191226.ebuild net-vpn/wireguard-tools/wireguard-tools-9999.ebuild X-VCS-Directories: net-vpn/wireguard-tools/ X-VCS-Committer: zx2c4 X-VCS-Committer-Name: Jason A. Donenfeld X-VCS-Revision: ac4359208d9a3fe508d7668d59c0406c4080bc28 X-VCS-Branch: master Date: Fri, 27 Dec 2019 22:56:24 +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: 9662d224-6947-4bee-a003-b53ffa6192a1 X-Archives-Hash: ce1f38d535a64a70571cb834573c8e87 commit: ac4359208d9a3fe508d7668d59c0406c4080bc28 Author: Jason A. Donenfeld gentoo org> AuthorDate: Fri Dec 27 22:55:53 2019 +0000 Commit: Jason A. Donenfeld gentoo org> CommitDate: Fri Dec 27 22:56:19 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac435920 net-vpn/wireguard-tools: update to eapi 7 and use smarter kernel deps Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Jason A. Donenfeld gentoo.org> .../wireguard-tools-1.0.20191226.ebuild | 25 +++++++++++++++++----- .../wireguard-tools/wireguard-tools-9999.ebuild | 25 +++++++++++++++++----- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/net-vpn/wireguard-tools/wireguard-tools-1.0.20191226.ebuild b/net-vpn/wireguard-tools/wireguard-tools-1.0.20191226.ebuild index 2275a3d51c3..945b8b6e505 100644 --- a/net-vpn/wireguard-tools/wireguard-tools-1.0.20191226.ebuild +++ b/net-vpn/wireguard-tools/wireguard-tools-1.0.20191226.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit linux-info bash-completion-r1 @@ -20,6 +20,7 @@ fi LICENSE="GPL-2" SLOT="0" +BDEPEND="virtual/pkgconfig" DEPEND="net-libs/libmnl" RDEPEND="${DEPEND} || ( net-firewall/nftables net-firewall/iptables ) @@ -34,10 +35,24 @@ wg_quick_optional_config_nob() { pkg_setup() { wg_quick_optional_config_nob IP_ADVANCED_ROUTER wg_quick_optional_config_nob IP_MULTIPLE_TABLES - wg_quick_optional_config_nob NETFILTER_XT_MARK - wg_quick_optional_config_nob NETFILTER_XT_CONNMARK - wg_quick_optional_config_nob IP6_NF_RAW - wg_quick_optional_config_nob IP_NF_RAW + if has_version net-firewall/nftables; then + wg_quick_optional_config_nob NF_TABLES + wg_quick_optional_config_nob NF_TABLES_IPV4 + wg_quick_optional_config_nob NF_TABLES_IPV6 + wg_quick_optional_config_nob NFT_CT + wg_quick_optional_config_nob NFT_FIB + wg_quick_optional_config_nob NFT_FIB_IPV4 + wg_quick_optional_config_nob NFT_FIB_IPV6 + elif has_version net-firewall/iptables; then + wg_quick_optional_config_nob NETFILTER_XTABLES + wg_quick_optional_config_nob NETFILTER_XT_MARK + wg_quick_optional_config_nob NETFILTER_XT_CONNMARK + wg_quick_optional_config_nob NETFILTER_XT_MATCH_COMMENT + wg_quick_optional_config_nob IP6_NF_RAW + wg_quick_optional_config_nob IP_NF_RAW + wg_quick_optional_config_nob IP6_NF_FILTER + wg_quick_optional_config_nob IP_NF_FILTER + fi linux-info_pkg_setup } diff --git a/net-vpn/wireguard-tools/wireguard-tools-9999.ebuild b/net-vpn/wireguard-tools/wireguard-tools-9999.ebuild index 2275a3d51c3..945b8b6e505 100644 --- a/net-vpn/wireguard-tools/wireguard-tools-9999.ebuild +++ b/net-vpn/wireguard-tools/wireguard-tools-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit linux-info bash-completion-r1 @@ -20,6 +20,7 @@ fi LICENSE="GPL-2" SLOT="0" +BDEPEND="virtual/pkgconfig" DEPEND="net-libs/libmnl" RDEPEND="${DEPEND} || ( net-firewall/nftables net-firewall/iptables ) @@ -34,10 +35,24 @@ wg_quick_optional_config_nob() { pkg_setup() { wg_quick_optional_config_nob IP_ADVANCED_ROUTER wg_quick_optional_config_nob IP_MULTIPLE_TABLES - wg_quick_optional_config_nob NETFILTER_XT_MARK - wg_quick_optional_config_nob NETFILTER_XT_CONNMARK - wg_quick_optional_config_nob IP6_NF_RAW - wg_quick_optional_config_nob IP_NF_RAW + if has_version net-firewall/nftables; then + wg_quick_optional_config_nob NF_TABLES + wg_quick_optional_config_nob NF_TABLES_IPV4 + wg_quick_optional_config_nob NF_TABLES_IPV6 + wg_quick_optional_config_nob NFT_CT + wg_quick_optional_config_nob NFT_FIB + wg_quick_optional_config_nob NFT_FIB_IPV4 + wg_quick_optional_config_nob NFT_FIB_IPV6 + elif has_version net-firewall/iptables; then + wg_quick_optional_config_nob NETFILTER_XTABLES + wg_quick_optional_config_nob NETFILTER_XT_MARK + wg_quick_optional_config_nob NETFILTER_XT_CONNMARK + wg_quick_optional_config_nob NETFILTER_XT_MATCH_COMMENT + wg_quick_optional_config_nob IP6_NF_RAW + wg_quick_optional_config_nob IP_NF_RAW + wg_quick_optional_config_nob IP6_NF_FILTER + wg_quick_optional_config_nob IP_NF_FILTER + fi linux-info_pkg_setup }