| 1 |
commit: ac4359208d9a3fe508d7668d59c0406c4080bc28 |
| 2 |
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 27 22:55:53 2019 +0000 |
| 4 |
Commit: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 27 22:56:19 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac435920 |
| 7 |
|
| 8 |
net-vpn/wireguard-tools: update to eapi 7 and use smarter kernel deps |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 11 |
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org> |
| 12 |
|
| 13 |
.../wireguard-tools-1.0.20191226.ebuild | 25 +++++++++++++++++----- |
| 14 |
.../wireguard-tools/wireguard-tools-9999.ebuild | 25 +++++++++++++++++----- |
| 15 |
2 files changed, 40 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-vpn/wireguard-tools/wireguard-tools-1.0.20191226.ebuild b/net-vpn/wireguard-tools/wireguard-tools-1.0.20191226.ebuild |
| 18 |
index 2275a3d51c3..945b8b6e505 100644 |
| 19 |
--- a/net-vpn/wireguard-tools/wireguard-tools-1.0.20191226.ebuild |
| 20 |
+++ b/net-vpn/wireguard-tools/wireguard-tools-1.0.20191226.ebuild |
| 21 |
@@ -1,7 +1,7 @@ |
| 22 |
# Copyright 1999-2019 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
-EAPI=6 |
| 26 |
+EAPI=7 |
| 27 |
|
| 28 |
inherit linux-info bash-completion-r1 |
| 29 |
|
| 30 |
@@ -20,6 +20,7 @@ fi |
| 31 |
LICENSE="GPL-2" |
| 32 |
SLOT="0" |
| 33 |
|
| 34 |
+BDEPEND="virtual/pkgconfig" |
| 35 |
DEPEND="net-libs/libmnl" |
| 36 |
RDEPEND="${DEPEND} |
| 37 |
|| ( net-firewall/nftables net-firewall/iptables ) |
| 38 |
@@ -34,10 +35,24 @@ wg_quick_optional_config_nob() { |
| 39 |
pkg_setup() { |
| 40 |
wg_quick_optional_config_nob IP_ADVANCED_ROUTER |
| 41 |
wg_quick_optional_config_nob IP_MULTIPLE_TABLES |
| 42 |
- wg_quick_optional_config_nob NETFILTER_XT_MARK |
| 43 |
- wg_quick_optional_config_nob NETFILTER_XT_CONNMARK |
| 44 |
- wg_quick_optional_config_nob IP6_NF_RAW |
| 45 |
- wg_quick_optional_config_nob IP_NF_RAW |
| 46 |
+ if has_version net-firewall/nftables; then |
| 47 |
+ wg_quick_optional_config_nob NF_TABLES |
| 48 |
+ wg_quick_optional_config_nob NF_TABLES_IPV4 |
| 49 |
+ wg_quick_optional_config_nob NF_TABLES_IPV6 |
| 50 |
+ wg_quick_optional_config_nob NFT_CT |
| 51 |
+ wg_quick_optional_config_nob NFT_FIB |
| 52 |
+ wg_quick_optional_config_nob NFT_FIB_IPV4 |
| 53 |
+ wg_quick_optional_config_nob NFT_FIB_IPV6 |
| 54 |
+ elif has_version net-firewall/iptables; then |
| 55 |
+ wg_quick_optional_config_nob NETFILTER_XTABLES |
| 56 |
+ wg_quick_optional_config_nob NETFILTER_XT_MARK |
| 57 |
+ wg_quick_optional_config_nob NETFILTER_XT_CONNMARK |
| 58 |
+ wg_quick_optional_config_nob NETFILTER_XT_MATCH_COMMENT |
| 59 |
+ wg_quick_optional_config_nob IP6_NF_RAW |
| 60 |
+ wg_quick_optional_config_nob IP_NF_RAW |
| 61 |
+ wg_quick_optional_config_nob IP6_NF_FILTER |
| 62 |
+ wg_quick_optional_config_nob IP_NF_FILTER |
| 63 |
+ fi |
| 64 |
linux-info_pkg_setup |
| 65 |
} |
| 66 |
|
| 67 |
|
| 68 |
diff --git a/net-vpn/wireguard-tools/wireguard-tools-9999.ebuild b/net-vpn/wireguard-tools/wireguard-tools-9999.ebuild |
| 69 |
index 2275a3d51c3..945b8b6e505 100644 |
| 70 |
--- a/net-vpn/wireguard-tools/wireguard-tools-9999.ebuild |
| 71 |
+++ b/net-vpn/wireguard-tools/wireguard-tools-9999.ebuild |
| 72 |
@@ -1,7 +1,7 @@ |
| 73 |
# Copyright 1999-2019 Gentoo Authors |
| 74 |
# Distributed under the terms of the GNU General Public License v2 |
| 75 |
|
| 76 |
-EAPI=6 |
| 77 |
+EAPI=7 |
| 78 |
|
| 79 |
inherit linux-info bash-completion-r1 |
| 80 |
|
| 81 |
@@ -20,6 +20,7 @@ fi |
| 82 |
LICENSE="GPL-2" |
| 83 |
SLOT="0" |
| 84 |
|
| 85 |
+BDEPEND="virtual/pkgconfig" |
| 86 |
DEPEND="net-libs/libmnl" |
| 87 |
RDEPEND="${DEPEND} |
| 88 |
|| ( net-firewall/nftables net-firewall/iptables ) |
| 89 |
@@ -34,10 +35,24 @@ wg_quick_optional_config_nob() { |
| 90 |
pkg_setup() { |
| 91 |
wg_quick_optional_config_nob IP_ADVANCED_ROUTER |
| 92 |
wg_quick_optional_config_nob IP_MULTIPLE_TABLES |
| 93 |
- wg_quick_optional_config_nob NETFILTER_XT_MARK |
| 94 |
- wg_quick_optional_config_nob NETFILTER_XT_CONNMARK |
| 95 |
- wg_quick_optional_config_nob IP6_NF_RAW |
| 96 |
- wg_quick_optional_config_nob IP_NF_RAW |
| 97 |
+ if has_version net-firewall/nftables; then |
| 98 |
+ wg_quick_optional_config_nob NF_TABLES |
| 99 |
+ wg_quick_optional_config_nob NF_TABLES_IPV4 |
| 100 |
+ wg_quick_optional_config_nob NF_TABLES_IPV6 |
| 101 |
+ wg_quick_optional_config_nob NFT_CT |
| 102 |
+ wg_quick_optional_config_nob NFT_FIB |
| 103 |
+ wg_quick_optional_config_nob NFT_FIB_IPV4 |
| 104 |
+ wg_quick_optional_config_nob NFT_FIB_IPV6 |
| 105 |
+ elif has_version net-firewall/iptables; then |
| 106 |
+ wg_quick_optional_config_nob NETFILTER_XTABLES |
| 107 |
+ wg_quick_optional_config_nob NETFILTER_XT_MARK |
| 108 |
+ wg_quick_optional_config_nob NETFILTER_XT_CONNMARK |
| 109 |
+ wg_quick_optional_config_nob NETFILTER_XT_MATCH_COMMENT |
| 110 |
+ wg_quick_optional_config_nob IP6_NF_RAW |
| 111 |
+ wg_quick_optional_config_nob IP_NF_RAW |
| 112 |
+ wg_quick_optional_config_nob IP6_NF_FILTER |
| 113 |
+ wg_quick_optional_config_nob IP_NF_FILTER |
| 114 |
+ fi |
| 115 |
linux-info_pkg_setup |
| 116 |
} |
Archives