summaryrefslogtreecommitdiff
path: root/net-vpn/wireguard
diff options
context:
space:
mode:
Diffstat (limited to 'net-vpn/wireguard')
-rw-r--r--net-vpn/wireguard/Manifest6
-rw-r--r--net-vpn/wireguard/wireguard-0.0.20191212.ebuild (renamed from net-vpn/wireguard/wireguard-0.0.20191012.ebuild)7
-rw-r--r--net-vpn/wireguard/wireguard-9999.ebuild20
3 files changed, 25 insertions, 8 deletions
diff --git a/net-vpn/wireguard/Manifest b/net-vpn/wireguard/Manifest
index 55a726931ca1..afc240e105f7 100644
--- a/net-vpn/wireguard/Manifest
+++ b/net-vpn/wireguard/Manifest
@@ -1,4 +1,4 @@
-DIST WireGuard-0.0.20191012.tar.xz 331812 BLAKE2B 63abc538611d8d9775e2e7fe4c848aae9a4ed93c55db669076452f8997ba036fd4dca9735062f52888240cf3aefbdb0b999fc3bec78ce211d65c124f28d96938 SHA512 b15424036f26298d8511ca0d0d6a485ff0992726d61fabff8bf6dd64d0a65423bf901e5eb14d3080372017390b05d25faff89a72128932c7408f93f59165c321
-EBUILD wireguard-0.0.20191012.ebuild 5142 BLAKE2B 4d8631e7f3e819db7478096d3fbb733736b468780f91562f474c125a5a19281f69a9f46ff342b96160b7e393a9b0652cf4f4b00ae53932cd319092dd6b7ac3c0 SHA512 e1fb55d03036d9addbd2b20c71b4a2b26dabf825ab5957cbcc96c2a9ae3135ed7ea50dac0029f92d2cae7026d569bd744229a2d10780f2e8ac445dfb98d3c8d2
-EBUILD wireguard-9999.ebuild 4720 BLAKE2B 4de715d72ccd551ee68eeab051ff9905323fe57d475e6c17ad39542c3c50416d0ff6cfa27c994afe1edf6277bdbd6bab9b3351d74cfcae5921f24c2c93f0cb36 SHA512 e71251e953b6046149d69b1168af47e20ae705c3822f8c80542388571e8677ddfe299eb46808ec462c8a13764fc939eafe7f51dcfa0d7e3aca7c6e153ba14c7b
+DIST WireGuard-0.0.20191212.tar.xz 333024 BLAKE2B 89bf2fc6a76b5a20e3d468581fe509178eb177760b3084577fdcba46b6c3ca4228e4f06f9e666bf901f8401b4109a3e1646c527195d5598fb2dd8c655813a4a7 SHA512 3e6b3841c72f0b30dab6e61ba07a865c5601617047f90a228cefc4ed6eb0511b9c76d745df9a89dfc71791937e1268bbc0b1cfa6f7291b77a4db0f2fb14d272a
+EBUILD wireguard-0.0.20191212.ebuild 5329 BLAKE2B 971467aad5f0b524255bbbc46f5fdd267dd04dbbd76e4253224e80cffc3c6f1aaa58d46ddc5a86eb021b9c667157f88bf0a4766fca1f22eaa2366665eb4cffbe SHA512 8a2182da7b547fb287f62cb6673be2cc4899423656e81e1d8b41b26de20ca1b12bae1503d917b175afa82918382ccce7b5373ae422e69db82d83c6a30d0e72d5
+EBUILD wireguard-9999.ebuild 5329 BLAKE2B 971467aad5f0b524255bbbc46f5fdd267dd04dbbd76e4253224e80cffc3c6f1aaa58d46ddc5a86eb021b9c667157f88bf0a4766fca1f22eaa2366665eb4cffbe SHA512 8a2182da7b547fb287f62cb6673be2cc4899423656e81e1d8b41b26de20ca1b12bae1503d917b175afa82918382ccce7b5373ae422e69db82d83c6a30d0e72d5
MISC metadata.xml 765 BLAKE2B 4b3a03aea5271da19dddddfc4f7fa180c4b3b846bbe434786c3b3e7bbfb51424cf3be55877cf6b2af60559a456978946ed68354600e43fbb461d2000bd655b70 SHA512 794ffdecbc09f27080cade3a5753e0d1e9021edb400282ee6db7099d4583ab4d4ed28a343e2b8c2227ab39b8bc4182938d6c82ae4a4f7e9980f21348d8d8c805
diff --git a/net-vpn/wireguard/wireguard-0.0.20191012.ebuild b/net-vpn/wireguard/wireguard-0.0.20191212.ebuild
index e4113ef8fb96..e405c52079de 100644
--- a/net-vpn/wireguard/wireguard-0.0.20191012.ebuild
+++ b/net-vpn/wireguard/wireguard-0.0.20191212.ebuild
@@ -23,12 +23,12 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="debug +module +tools module-src"
-DEPEND="tools? ( net-libs/libmnl )"
+DEPEND="tools? ( net-libs/libmnl || ( net-firewall/nftables net-firewall/iptables ) )"
RDEPEND="${DEPEND}"
MODULE_NAMES="wireguard(kernel/drivers/net:src)"
BUILD_TARGETS="module"
-CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_BLKCIPHER"
+CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_ALGAPI"
wg_quick_optional_config_nob() {
CONFIG_CHECK="$CONFIG_CHECK ~$1"
@@ -41,6 +41,9 @@ 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
fi
linux-mod_pkg_setup
diff --git a/net-vpn/wireguard/wireguard-9999.ebuild b/net-vpn/wireguard/wireguard-9999.ebuild
index e7bf51b60e9c..e405c52079de 100644
--- a/net-vpn/wireguard/wireguard-9999.ebuild
+++ b/net-vpn/wireguard/wireguard-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,15 +23,29 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="debug +module +tools module-src"
-DEPEND="tools? ( net-libs/libmnl )"
+DEPEND="tools? ( net-libs/libmnl || ( net-firewall/nftables net-firewall/iptables ) )"
RDEPEND="${DEPEND}"
MODULE_NAMES="wireguard(kernel/drivers/net:src)"
BUILD_TARGETS="module"
-CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_BLKCIPHER"
+CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_ALGAPI"
+
+wg_quick_optional_config_nob() {
+ CONFIG_CHECK="$CONFIG_CHECK ~$1"
+ declare -g ERROR_$1="CONFIG_$1: This option is required for automatic routing of default routes inside of wg-quick(8), though it is not required for general WireGuard usage."
+}
pkg_setup() {
if use module; then
+ if use tools; then
+ 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
+ fi
+
linux-mod_pkg_setup
kernel_is -lt 3 10 0 && die "This version of ${PN} requires Linux >= 3.10"
fi