| 1 |
commit: 899c6d9ae5a63e15234383cecfd401c4e7f8df1b |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 12 09:15:29 2020 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 12 09:15:29 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=899c6d9a |
| 7 |
|
| 8 |
net-misc/networkmanager: Revbump: Don't call helpers with full path |
| 9 |
|
| 10 |
84-nm-drivers.rules calls /usr/bin/sed but we have sed in /bin/ |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.93, Repoman-2.3.20 |
| 13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 14 |
|
| 15 |
...orkmanager-1.20.6-dont_call_helpers_with_full_paths.patch | 12 ++++++++++++ |
| 16 |
...manager-1.22.8.ebuild => networkmanager-1.22.8-r1.ebuild} | 4 ++++ |
| 17 |
2 files changed, 16 insertions(+) |
| 18 |
|
| 19 |
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 |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..f7ce742c5d5 |
| 22 |
--- /dev/null |
| 23 |
+++ b/net-misc/networkmanager/files/networkmanager-1.20.6-dont_call_helpers_with_full_paths.patch |
| 24 |
@@ -0,0 +1,12 @@ |
| 25 |
+We don't have sed in /usr/bin |
| 26 |
+ |
| 27 |
+--- NetworkManager-1.20.6/data/84-nm-drivers.rules |
| 28 |
++++ NetworkManager-1.20.6/data/84-nm-drivers.rules |
| 29 |
+@@ -7,6 +7,6 @@ |
| 30 |
+ # Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?) |
| 31 |
+ ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end" |
| 32 |
+ DRIVERS=="?*", GOTO="nm_drivers_end" |
| 33 |
+-PROGRAM="/bin/sh -c '/usr/sbin/ethtool -i $$1 |/usr/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c" |
| 34 |
++PROGRAM="/bin/sh -c 'ethtool -i $$1 | sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c" |
| 35 |
+ |
| 36 |
+ LABEL="nm_drivers_end" |
| 37 |
|
| 38 |
diff --git a/net-misc/networkmanager/networkmanager-1.22.8.ebuild b/net-misc/networkmanager/networkmanager-1.22.8-r1.ebuild |
| 39 |
similarity index 99% |
| 40 |
rename from net-misc/networkmanager/networkmanager-1.22.8.ebuild |
| 41 |
rename to net-misc/networkmanager/networkmanager-1.22.8-r1.ebuild |
| 42 |
index 3e0f281bfc9..08e86947d2e 100644 |
| 43 |
--- a/net-misc/networkmanager/networkmanager-1.22.8.ebuild |
| 44 |
+++ b/net-misc/networkmanager/networkmanager-1.22.8-r1.ebuild |
| 45 |
@@ -104,6 +104,10 @@ S="${WORKDIR}"/NetworkManager-${PV} |
| 46 |
# Not implemented yet. |
| 47 |
RESTRICT="test" |
| 48 |
|
| 49 |
+PATCHES=( |
| 50 |
+ "${FILESDIR}/${PN}-1.20.6-dont_call_helpers_with_full_paths.patch" |
| 51 |
+) |
| 52 |
+ |
| 53 |
python_check_deps() { |
| 54 |
if use introspection; then |
| 55 |
has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return |
Archives