net-misc/networkmanager: Revbump: Don't call helpers with full path
authorLars Wendler <polynomial-c@gentoo.org>
Thu, 12 Mar 2020 09:15:29 +0000 (10:15 +0100)
committerLars Wendler <polynomial-c@gentoo.org>
Thu, 12 Mar 2020 09:15:29 +0000 (10:15 +0100)
84-nm-drivers.rules calls /usr/bin/sed but we have sed in /bin/

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
net-misc/networkmanager/files/networkmanager-1.20.6-dont_call_helpers_with_full_paths.patch [new file with mode: 0644]
net-misc/networkmanager/networkmanager-1.22.8-r1.ebuild [moved from net-misc/networkmanager/networkmanager-1.22.8.ebuild with 99% similarity]

diff --git a/net-misc/networkmanager/files/networkmanager-1.20.6-dont_call_helpers_with_full_paths.patch b/net-misc/networkmanager/files/networkmanager-1.20.6-dont_call_helpers_with_full_paths.patch
new file mode 100644 (file)
index 0000000..f7ce742
--- /dev/null
@@ -0,0 +1,12 @@
+We don't have sed in /usr/bin
+
+--- NetworkManager-1.20.6/data/84-nm-drivers.rules
++++ NetworkManager-1.20.6/data/84-nm-drivers.rules
+@@ -7,6 +7,6 @@
+ # 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 '/usr/sbin/ethtool -i $$1 |/usr/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"
++PROGRAM="/bin/sh -c 'ethtool -i $$1 | sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"
+ LABEL="nm_drivers_end"
similarity index 99%
rename from net-misc/networkmanager/networkmanager-1.22.8.ebuild
rename to net-misc/networkmanager/networkmanager-1.22.8-r1.ebuild
index 3e0f281bfc963d20801395df944d98f16309c75f..08e86947d2ea579adf133c384ffaf16fc4f25c2d 100644 (file)
@@ -104,6 +104,10 @@ S="${WORKDIR}"/NetworkManager-${PV}
 # Not implemented yet.
 RESTRICT="test"
 
+PATCHES=(
+       "${FILESDIR}/${PN}-1.20.6-dont_call_helpers_with_full_paths.patch"
+)
+
 python_check_deps() {
        if use introspection; then
                has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return