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 6A8ED138334 for ; Mon, 21 Oct 2019 19:43:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8997AE0AC2; Mon, 21 Oct 2019 19:43:57 +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 702C3E0AC2 for ; Mon, 21 Oct 2019 19:43:57 +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 7967234C193 for ; Mon, 21 Oct 2019 19:43:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 925C483E for ; Mon, 21 Oct 2019 19:43:54 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1571686780.6d1d316c6e8715035f12d4bb5ac24065bf1ef851.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/networkmanager/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/networkmanager/networkmanager-1.18.2.ebuild net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild X-VCS-Directories: net-misc/networkmanager/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 6d1d316c6e8715035f12d4bb5ac24065bf1ef851 X-VCS-Branch: master Date: Mon, 21 Oct 2019 19:43:54 +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: 7ff0d0b4-562c-4be2-b296-5012c9140d96 X-Archives-Hash: 0fa6aef94d8a3953a5820233d95706e5 commit: 6d1d316c6e8715035f12d4bb5ac24065bf1ef851 Author: Rodrigo Saboya gmail com> AuthorDate: Wed Jul 31 14:35:52 2019 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Oct 21 19:39:40 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d1d316c net-misc/networkmanager: Fixing kernel config check CONFIG_NF_NAT_IPV4 and CONFIG_NF_NAT_IPV6 were merged into CONFIG_NF_NAT on: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3bf195ae6037e310d693ff3313401cfaf1261b71 CONFIG_NF_NAT_MASQUERADE_IPV4 and CONFIG_NF_NAT_MASQUERADE_IPV6 were merged into CONFIG_NF_NAT_MASQUERADE on: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d1aca8ab3104aa7131f5ab144c6f586b54df084b Closes: https://bugs.gentoo.org/691140 Closes: https://github.com/gentoo/gentoo/pull/12559 Signed-off-by: Rodrigo Saboya gmail.com> Signed-off-by: Matt Turner gentoo.org> net-misc/networkmanager/networkmanager-1.18.2.ebuild | 6 +++++- net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/net-misc/networkmanager/networkmanager-1.18.2.ebuild b/net-misc/networkmanager/networkmanager-1.18.2.ebuild index 4342ec029ba..2c4f15a72ad 100644 --- a/net-misc/networkmanager/networkmanager-1.18.2.ebuild +++ b/net-misc/networkmanager/networkmanager-1.18.2.ebuild @@ -139,7 +139,11 @@ pkg_pretend() { pkg_setup() { if use connection-sharing; then - CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE" + if kernel_is lt 5 1; then + CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4" + else + CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE" + fi linux-info_pkg_setup fi if use introspection || use test; then diff --git a/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild b/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild index 6698561d3d6..349e1bbb84c 100644 --- a/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild +++ b/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild @@ -143,7 +143,11 @@ pkg_pretend() { pkg_setup() { if use connection-sharing; then - CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE" + if kernel_is lt 5 1; then + CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4" + else + CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE" + fi linux-info_pkg_setup fi if use introspection || use test; then