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 188FB138334 for ; Mon, 21 Oct 2019 19:43:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 19952E0AC6; Mon, 21 Oct 2019 19:43:58 +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 DD788E0AC6 for ; Mon, 21 Oct 2019 19:43:57 +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 5DF2034C18B 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 7E4CE7F8 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: <1571686772.d1ce5fdee13306b85cf67f5ea4bc950f284e3538.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/networkmanager/files/, net-misc/networkmanager/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/networkmanager/files/networkmanager-data-fix-the-ID_NET_DRIVER-udev-rule.patch net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild net-misc/networkmanager/networkmanager-1.18.4.ebuild X-VCS-Directories: net-misc/networkmanager/files/ net-misc/networkmanager/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: d1ce5fdee13306b85cf67f5ea4bc950f284e3538 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: d968668b-12ef-4e6c-8750-8190f8f9338d X-Archives-Hash: 6c7d7a8f1ebc1b0a2c595b616242dc71 commit: d1ce5fdee13306b85cf67f5ea4bc950f284e3538 Author: Matt Turner gentoo org> AuthorDate: Sat Oct 19 19:06:56 2019 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Oct 21 19:39:32 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1ce5fde net-misc/networkmanager: Fix udev rule Closes: https://bugs.gentoo.org/697774 Signed-off-by: Matt Turner gentoo.org> ...ager-data-fix-the-ID_NET_DRIVER-udev-rule.patch | 33 ++++++++++++++++++++++ ...18.4.ebuild => networkmanager-1.18.4-r1.ebuild} | 4 +++ 2 files changed, 37 insertions(+) diff --git a/net-misc/networkmanager/files/networkmanager-data-fix-the-ID_NET_DRIVER-udev-rule.patch b/net-misc/networkmanager/files/networkmanager-data-fix-the-ID_NET_DRIVER-udev-rule.patch new file mode 100644 index 00000000000..1b94ab478d8 --- /dev/null +++ b/net-misc/networkmanager/files/networkmanager-data-fix-the-ID_NET_DRIVER-udev-rule.patch @@ -0,0 +1,33 @@ +From 27d380b70ea839c7badab420361e4e65e023e8e9 Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Fri, 16 Aug 2019 13:22:09 +0200 +Subject: [PATCH] data: fix the ID_NET_DRIVER udev rule + +Systemd v243 is complaining about the wrong substitution there. That is +sort of harmless, because systemd-udevd in that version doesn't need the +rule anyway. But still fix it, to avoid a warning. + +Also, newer udevd's $PATH doesn't include sbin. That is also okay, +because we don't need the rule to actually work there. But fix it +anyway. + +https://bugzilla.redhat.com/show_bug.cgi?id=1740655 +--- + data/84-nm-drivers.rules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/84-nm-drivers.rules b/data/84-nm-drivers.rules +index d246ef6ce..e398cb9f2 100644 +--- a/data/84-nm-drivers.rules ++++ b/data/84-nm-drivers.rules +@@ -7,6 +7,6 @@ ACTION!="add|change", GOTO="nm_drivers_end" + # Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?) + ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end" + DRIVERS=="?*", GOTO="nm_drivers_end" +-PROGRAM="/bin/sh -c 'ethtool -i $1 | sed -n s/^driver:\ //p' -- $env{INTERFACE}", RESULT=="?*", ENV{ID_NET_DRIVER}="%c" ++PROGRAM="/bin/sh -c '/usr/sbin/ethtool -i $$1 |/usr/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c" + + LABEL="nm_drivers_end" +-- +2.21.0 + diff --git a/net-misc/networkmanager/networkmanager-1.18.4.ebuild b/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild similarity index 99% rename from net-misc/networkmanager/networkmanager-1.18.4.ebuild rename to net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild index 79e755a8656..6698561d3d6 100644 --- a/net-misc/networkmanager/networkmanager-1.18.4.ebuild +++ b/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild @@ -101,6 +101,10 @@ DEPEND="${COMMON_DEPEND} ) " +PATCHES=( + "${FILESDIR}"/${PN}-data-fix-the-ID_NET_DRIVER-udev-rule.patch +) + python_check_deps() { if use introspection; then has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return