commit: d1ce5fdee13306b85cf67f5ea4bc950f284e3538 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Sat Oct 19 19:06:56 2019 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> 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 <mattst88 <AT> 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 <[email protected]> +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
