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 64819138334 for ; Tue, 3 Dec 2019 10:34:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7A32E0801; Tue, 3 Dec 2019 10:34:00 +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 7AFF9E0801 for ; Tue, 3 Dec 2019 10:34:00 +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 F15C834D71A for ; Tue, 3 Dec 2019 10:33:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7BD7C8AD for ; Tue, 3 Dec 2019 10:33:57 +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: <1575369228.8b9ebbaf620a46cdd36da1fb98b0766f65b02fd0.zx2c4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/wireguard/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/wireguard/wireguard-0.0.20191127-r1.ebuild net-vpn/wireguard/wireguard-0.0.20191127.ebuild net-vpn/wireguard/wireguard-9999.ebuild X-VCS-Directories: net-vpn/wireguard/ X-VCS-Committer: zx2c4 X-VCS-Committer-Name: Jason A. Donenfeld X-VCS-Revision: 8b9ebbaf620a46cdd36da1fb98b0766f65b02fd0 X-VCS-Branch: master Date: Tue, 3 Dec 2019 10:33:57 +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: 72740d9f-cceb-4b25-87dd-9ac0e3ac8902 X-Archives-Hash: 89b1772051250f5514c7bda49f1ce9c0 commit: 8b9ebbaf620a46cdd36da1fb98b0766f65b02fd0 Author: Jason A. Donenfeld gentoo org> AuthorDate: Tue Dec 3 10:30:18 2019 +0000 Commit: Jason A. Donenfeld gentoo org> CommitDate: Tue Dec 3 10:33:48 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b9ebbaf net-vpn/wireguard: fix dependencies Bug: https://bugs.gentoo.org/701762 Bug: https://bugs.gentoo.org/701758 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Jason A. Donenfeld gentoo.org> ...0191127.ebuild => wireguard-0.0.20191127-r1.ebuild} | 6 +++++- net-vpn/wireguard/wireguard-9999.ebuild | 18 ++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/net-vpn/wireguard/wireguard-0.0.20191127.ebuild b/net-vpn/wireguard/wireguard-0.0.20191127-r1.ebuild similarity index 94% rename from net-vpn/wireguard/wireguard-0.0.20191127.ebuild rename to net-vpn/wireguard/wireguard-0.0.20191127-r1.ebuild index e4113ef8fb9..ea25a74e43f 100644 --- a/net-vpn/wireguard/wireguard-0.0.20191127.ebuild +++ b/net-vpn/wireguard/wireguard-0.0.20191127-r1.ebuild @@ -23,7 +23,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="debug +module +tools module-src" -DEPEND="tools? ( net-libs/libmnl )" +DEPEND="tools? ( net-libs/libmnl net-firewall/iptables )" RDEPEND="${DEPEND}" MODULE_NAMES="wireguard(kernel/drivers/net:src)" @@ -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 @@ -60,6 +63,7 @@ src_install() { if use tools; then dodoc README.md dodoc -r contrib/examples + sed -i 's/iptables-restore -nw/iptables-restore -n/g' src/tools/wg-quick/linux.bash || die "Unable to patch wg-quick" emake \ WITH_BASHCOMPLETION=yes \ WITH_SYSTEMDUNITS=yes \ diff --git a/net-vpn/wireguard/wireguard-9999.ebuild b/net-vpn/wireguard/wireguard-9999.ebuild index e7bf51b60e9..7bf967c35b0 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/iptables )" RDEPEND="${DEPEND}" MODULE_NAMES="wireguard(kernel/drivers/net:src)" BUILD_TARGETS="module" CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_BLKCIPHER" +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