1 |
commit: e7483fe512c16baf3dcd8c4da05d3eb93bdc1789 |
2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 20 23:59:29 2020 +0000 |
4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 20 23:59:29 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=e7483fe5 |
7 |
|
8 |
net-misc/networkmanager: Update for stable users |
9 |
|
10 |
Package-Manager: Portage-3.0.4, Repoman-2.3.23 |
11 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
12 |
|
13 |
net-misc/networkmanager/Manifest | 2 +- |
14 |
.../networkmanager/files/1.18.4-iwd1-compat.patch | 81 ------------- |
15 |
.../networkmanager/files/1.18.6-fix-bashisms.patch | 131 --------------------- |
16 |
.../networkmanager/files/init.d.NetworkManager-r1 | 58 --------- |
17 |
net-misc/networkmanager/files/musl-basic.patch | 54 +++++---- |
18 |
net-misc/networkmanager/files/musl-compar.patch | 18 +++ |
19 |
.../networkmanager/files/musl-fix-includes.patch | 78 +++++++----- |
20 |
.../files/musl-network-support.patch | 50 +++----- |
21 |
net-misc/networkmanager/files/musl-no-drand.patch | 58 +++++++++ |
22 |
.../networkmanager/files/musl-process-util.patch | 18 +-- |
23 |
...ager-data-fix-the-ID_NET_DRIVER-udev-rule.patch | 33 ------ |
24 |
...-1.18.6.ebuild => networkmanager-1.26.0.ebuild} | 49 ++++---- |
25 |
12 files changed, 190 insertions(+), 440 deletions(-) |
26 |
|
27 |
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest |
28 |
index 1218137..db1ec14 100644 |
29 |
--- a/net-misc/networkmanager/Manifest |
30 |
+++ b/net-misc/networkmanager/Manifest |
31 |
@@ -1 +1 @@ |
32 |
-DIST NetworkManager-1.18.6.tar.xz 4845144 BLAKE2B cf66789c025d9ec2007d1fe541acb8fd2b5204796ff8498fc5689124016e84a7e76509bee1b6650c796f0429cce6748c7b99e1976d95ac12bc31a1f1e67289b0 SHA512 92ab648e689dd903279fe676e867d7929f616c96dd478b2132854145a29debfcac5b083d70652ea0c7bccb0eb132534133fc9c005527237c47e2802556a29b92 |
33 |
+DIST NetworkManager-1.26.0.tar.xz 4956796 BLAKE2B 752b6b47387bac5787d06be7f31cc7387798d0c917977c8e72d6d21538a86c167003901d628e596109aec28816f56fd8cd6bf2b46a8d4918a7e6cf1946586550 SHA512 46035fda8f154497ba4a634e4bf7f0a11f579d0d3f4ffdcea7d47ea0bde6dd0183885491f5453255af7b163ae3db4f0c62c3161913a8c30c35b6475887235b6d |
34 |
|
35 |
diff --git a/net-misc/networkmanager/files/1.18.4-iwd1-compat.patch b/net-misc/networkmanager/files/1.18.4-iwd1-compat.patch |
36 |
deleted file mode 100644 |
37 |
index 12c8b87..0000000 |
38 |
--- a/net-misc/networkmanager/files/1.18.4-iwd1-compat.patch |
39 |
+++ /dev/null |
40 |
@@ -1,81 +0,0 @@ |
41 |
-From 59923ad85d1a1cf2216a4f14649702d24d3f2360 Mon Sep 17 00:00:00 2001 |
42 |
-From: Lubomir Rintel <lkundrak@××.sk> |
43 |
-Date: Sat, 2 Nov 2019 06:55:54 +0100 |
44 |
-Subject: [PATCH 1/2] iwd: add some missing error handling |
45 |
- |
46 |
-g_dbus_object_manager_get_interface() can happily return NULL and we |
47 |
-need to check for that. |
48 |
---- |
49 |
- src/devices/wifi/nm-iwd-manager.c | 10 ++++++++++ |
50 |
- 1 file changed, 10 insertions(+) |
51 |
- |
52 |
-diff --git a/src/devices/wifi/nm-iwd-manager.c b/src/devices/wifi/nm-iwd-manager.c |
53 |
-index dd1cad480..e83f8063c 100644 |
54 |
---- a/src/devices/wifi/nm-iwd-manager.c |
55 |
-+++ b/src/devices/wifi/nm-iwd-manager.c |
56 |
-@@ -136,6 +136,11 @@ agent_dbus_method_cb (GDBusConnection *connection, |
57 |
- network = g_dbus_object_manager_get_interface (priv->object_manager, |
58 |
- network_path, |
59 |
- NM_IWD_NETWORK_INTERFACE); |
60 |
-+ if (!network) { |
61 |
-+ _LOGE ("unable to find the network object"); |
62 |
-+ return; |
63 |
-+ } |
64 |
-+ |
65 |
- |
66 |
- device_path = get_property_string_or_null (G_DBUS_PROXY (network), "Device"); |
67 |
- if (!device_path) { |
68 |
-@@ -260,6 +265,11 @@ register_agent (NMIwdManager *self) |
69 |
- "/", |
70 |
- NM_IWD_AGENT_MANAGER_INTERFACE); |
71 |
- |
72 |
-+ if (!agent_manager) { |
73 |
-+ _LOGE ("unable to register the IWD Agent: PSK/8021x Wi-Fi networks may not work"); |
74 |
-+ return; |
75 |
-+ } |
76 |
-+ |
77 |
- /* Register our agent */ |
78 |
- g_dbus_proxy_call (G_DBUS_PROXY (agent_manager), |
79 |
- "RegisterAgent", |
80 |
--- |
81 |
-2.20.1 |
82 |
- |
83 |
- |
84 |
-From 186d22a9634e2bf94658ed6f1cf2b332ecb3a32c Mon Sep 17 00:00:00 2001 |
85 |
-From: Lubomir Rintel <lkundrak@××.sk> |
86 |
-Date: Sat, 2 Nov 2019 07:01:28 +0100 |
87 |
-Subject: [PATCH 2/2] iwd: unbreak iwd-1.0 |
88 |
- |
89 |
-The upstream apparently thought it's a great idea to change the agent |
90 |
-manager path. This fixes things for those unfortunate enough to run |
91 |
-IWD. |
92 |
---- |
93 |
- src/devices/wifi/nm-iwd-manager.c | 10 +++++++++- |
94 |
- 1 file changed, 9 insertions(+), 1 deletion(-) |
95 |
- |
96 |
-diff --git a/src/devices/wifi/nm-iwd-manager.c b/src/devices/wifi/nm-iwd-manager.c |
97 |
-index e83f8063c..470cb1c90 100644 |
98 |
---- a/src/devices/wifi/nm-iwd-manager.c |
99 |
-+++ b/src/devices/wifi/nm-iwd-manager.c |
100 |
-@@ -262,9 +262,17 @@ register_agent (NMIwdManager *self) |
101 |
- GDBusInterface *agent_manager; |
102 |
- |
103 |
- agent_manager = g_dbus_object_manager_get_interface (priv->object_manager, |
104 |
-- "/", |
105 |
-+ "/net/connman/iwd", |
106 |
- NM_IWD_AGENT_MANAGER_INTERFACE); |
107 |
- |
108 |
-+ if (!agent_manager) { |
109 |
-+ /* IWD prior to 1.0 dated 30 October, 2019 has the agent manager on a |
110 |
-+ * different path. */ |
111 |
-+ agent_manager = g_dbus_object_manager_get_interface (priv->object_manager, |
112 |
-+ "/", |
113 |
-+ NM_IWD_AGENT_MANAGER_INTERFACE); |
114 |
-+ } |
115 |
-+ |
116 |
- if (!agent_manager) { |
117 |
- _LOGE ("unable to register the IWD Agent: PSK/8021x Wi-Fi networks may not work"); |
118 |
- return; |
119 |
--- |
120 |
-2.20.1 |
121 |
- |
122 |
|
123 |
diff --git a/net-misc/networkmanager/files/1.18.6-fix-bashisms.patch b/net-misc/networkmanager/files/1.18.6-fix-bashisms.patch |
124 |
deleted file mode 100644 |
125 |
index 3d087ce..0000000 |
126 |
--- a/net-misc/networkmanager/files/1.18.6-fix-bashisms.patch |
127 |
+++ /dev/null |
128 |
@@ -1,131 +0,0 @@ |
129 |
-From 0adfc0f511e1389ca166fb233b9d3feb12da91d2 Mon Sep 17 00:00:00 2001 |
130 |
-From: Gilles Dartiguelongue <eva@g.o> |
131 |
-Date: Mon, 8 Jun 2020 20:42:40 -0500 |
132 |
-Subject: [PATCH] Remove subshells and fix invalid test syntax |
133 |
- |
134 |
-Signed-off-by: Gilles Dartiguelongue <eva@g.o> |
135 |
---- |
136 |
- configure.ac | 28 ++++++++++++++-------------- |
137 |
- m4/introspection.m4 | 4 ++-- |
138 |
- 2 files changed, 16 insertions(+), 16 deletions(-) |
139 |
- |
140 |
-diff --git a/configure.ac b/configure.ac |
141 |
-index 9dc0625..49cbba3 100644 |
142 |
---- a/configure.ac |
143 |
-+++ b/configure.ac |
144 |
-@@ -261,7 +261,7 @@ AC_ARG_WITH(libnm-glib, |
145 |
- AS_HELP_STRING([--with-libnm-glib], |
146 |
- [build legacy libraries])) |
147 |
- fake_typelibs=no |
148 |
--if test "$with_libnm_glib" == "yes"; then |
149 |
-+if test "$with_libnm_glib" = "yes"; then |
150 |
- PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.1 dbus-glib-1 >= 0.94, :, |
151 |
- [AC_MSG_FAILURE([$DBUS_PKG_ERRORS |
152 |
- |
153 |
-@@ -277,7 +277,7 @@ Configure with --without-libnm-glib if you do not need the legacy libraries]) |
154 |
- else |
155 |
- with_libnm_glib=no |
156 |
- fi |
157 |
--AM_CONDITIONAL(WITH_LEGACY_LIBRARIES, test "$with_libnm_glib" == "yes") |
158 |
-+AM_CONDITIONAL(WITH_LEGACY_LIBRARIES, test "$with_libnm_glib" = "yes") |
159 |
- if test "$fake_typelibs" = "yes"; then |
160 |
- AC_DEFINE(WITH_FAKE_TYPELIBS, 1, [Define for libnm to prevent GIR from loading libnm-glib]) |
161 |
- else |
162 |
-@@ -633,7 +633,7 @@ AC_ARG_ENABLE(json-validation, |
163 |
- AS_HELP_STRING([--enable-json-validation], [Enable JSON validation in libnm]), |
164 |
- [enable_json_validation=${enableval}], |
165 |
- [enable_json_validation=${have_jansson}]) |
166 |
--if (test "${enable_json_validation}" == "no"); then |
167 |
-+if (test "${enable_json_validation}" = "no"); then |
168 |
- AC_DEFINE(WITH_JSON_VALIDATION, 0, [Define if JSON validation in libnm is enabled]) |
169 |
- else |
170 |
- if test "$have_jansson" = "no"; then |
171 |
-@@ -816,8 +816,8 @@ AC_ARG_WITH([dhcpcanon], |
172 |
- if test "$with_dhcpcanon" != "no"; then |
173 |
- with_dhcpcanon_="$with_dhcpcanon" |
174 |
- AC_PATH_PROGS(with_dhcpcanon, dhcpcanon, no, /sbin:/usr/sbin:/usr/local/sbin:/usr/bin:/usr/local/bin) |
175 |
-- if test "$with_dhcpcanon" == "no"; then |
176 |
-- if test "$with_dhcpcanon_" == yes; then |
177 |
-+ if test "$with_dhcpcanon" = "no"; then |
178 |
-+ if test "$with_dhcpcanon_" = yes; then |
179 |
- AC_MSG_WARN([dhcpcanon not found, assume path /sbin/dhcpcanon]) |
180 |
- with_dhcpcanon=/sbin/dhcpcanon |
181 |
- fi |
182 |
-@@ -846,8 +846,8 @@ AC_ARG_WITH([dhclient], |
183 |
- if test "$with_dhclient" != "no"; then |
184 |
- with_dhclient_="$with_dhclient" |
185 |
- AC_PATH_PROGS(with_dhclient, dhclient, no, /sbin:/usr/sbin:/usr/local/sbin) |
186 |
-- if test "$with_dhclient" == "no"; then |
187 |
-- if test "$with_dhclient_" == yes; then |
188 |
-+ if test "$with_dhclient" = "no"; then |
189 |
-+ if test "$with_dhclient_" = yes; then |
190 |
- AC_MSG_WARN([dhclient not found, assume path /usr/sbin/dhclient]) |
191 |
- with_dhclient=/usr/sbin/dhclient |
192 |
- fi |
193 |
-@@ -865,8 +865,8 @@ AC_ARG_WITH([dhcpcd], |
194 |
- if test "$with_dhcpcd" != "no"; then |
195 |
- with_dhcpcd_="$with_dhcpcd" |
196 |
- AC_PATH_PROGS(with_dhcpcd, dhcpcd, no, /sbin:/usr/sbin:/usr/local/sbin) |
197 |
-- if test "$with_dhcpcd" == "no"; then |
198 |
-- if test "$with_dhcpcd_" == yes; then |
199 |
-+ if test "$with_dhcpcd" = "no"; then |
200 |
-+ if test "$with_dhcpcd_" = yes; then |
201 |
- AC_MSG_WARN([dhcpcd not found, assume path /usr/sbin/dhcpcd]) |
202 |
- with_dhcpcd=/usr/sbin/dhcpcd |
203 |
- fi |
204 |
-@@ -1192,17 +1192,17 @@ AS_IF([test -z "$with_valgrind"], with_valgrind="no") |
205 |
- # Normalize values |
206 |
- AS_IF([test "$enable_tests" != "yes" -a "$enable_tests" != "root"], enable_tests="no") |
207 |
- # Search for tools |
208 |
--AS_IF([test "$with_valgrind" == "yes"], |
209 |
-+AS_IF([test "$with_valgrind" = "yes"], |
210 |
- [AC_PATH_PROGS(with_valgrind, valgrind, no)]) |
211 |
- # Add conditionals and substitutions |
212 |
- AM_CONDITIONAL(ENABLE_TESTS, test "$enable_tests" != "no") |
213 |
--AM_CONDITIONAL(REQUIRE_ROOT_TESTS, test "$enable_tests" == "root") |
214 |
-+AM_CONDITIONAL(REQUIRE_ROOT_TESTS, test "$enable_tests" = "root") |
215 |
- AC_ARG_WITH(valgrind-suppressions, |
216 |
- AS_HELP_STRING([--with-valgrind-suppressions=path], [Use specific valgrind suppression file])) |
217 |
--if test "$with_valgrind" == no; then |
218 |
-+if test "$with_valgrind" = no; then |
219 |
- with_valgrind_suppressions= |
220 |
- else |
221 |
-- if test "$with_valgrind_suppressions" == ""; then |
222 |
-+ if test "$with_valgrind_suppressions" = ""; then |
223 |
- with_valgrind_suppressions='$(top_srcdir)/valgrind.suppressions' |
224 |
- fi |
225 |
- fi |
226 |
-@@ -1218,7 +1218,7 @@ GTK_DOC_CHECK(1.0) |
227 |
- build_docs=no |
228 |
- if test -n "$INTROSPECTION_MAKEFILE"; then |
229 |
- # If g-i is installed we know we have python, but we might not have pygobject |
230 |
-- if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then |
231 |
-+ if ! "$PYTHON" -c 'from gi.repository import GObject' > /dev/null 2>&1; then |
232 |
- AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)]) |
233 |
- fi |
234 |
- |
235 |
-diff --git a/m4/introspection.m4 b/m4/introspection.m4 |
236 |
-index f3bda0e..8c64bd0 100644 |
237 |
---- a/m4/introspection.m4 |
238 |
-+++ b/m4/introspection.m4 |
239 |
-@@ -31,7 +31,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], |
240 |
- INTROSPECTION_GIRDIR= |
241 |
- INTROSPECTION_TYPELIBDIR= |
242 |
- |
243 |
-- if test "x$enable_introspection" == "xno"; then |
244 |
-+ if test "x$enable_introspection" = "xno"; then |
245 |
- found_introspection="no" |
246 |
- else |
247 |
- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], [ |
248 |
-@@ -53,7 +53,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], |
249 |
- AC_MSG_RESULT([$found_introspection]) |
250 |
- ], [found_introspection="no (not installed)"]) |
251 |
- |
252 |
-- if test "x$enable_introspection" == "xyes"; then |
253 |
-+ if test "x$enable_introspection" = "xyes"; then |
254 |
- if test "x$found_introspection" != "xyes"; then |
255 |
- AC_MSG_ERROR([introspection enabled but can't be used]) |
256 |
- fi |
257 |
--- |
258 |
-2.26.2 |
259 |
- |
260 |
|
261 |
diff --git a/net-misc/networkmanager/files/init.d.NetworkManager-r1 b/net-misc/networkmanager/files/init.d.NetworkManager-r1 |
262 |
deleted file mode 100644 |
263 |
index fad772d..0000000 |
264 |
--- a/net-misc/networkmanager/files/init.d.NetworkManager-r1 |
265 |
+++ /dev/null |
266 |
@@ -1,58 +0,0 @@ |
267 |
-#!/sbin/openrc-run |
268 |
-# Copyright (c) 2008 Saleem Abdulrasool <compnerd@××××××××.org> |
269 |
-# Copyright 2013-2020 Gentoo Authors |
270 |
-# Distributed under the terms of the GNU General Public License v2 |
271 |
- |
272 |
-description="NetworkManager daemon. The service is marked as started only \ |
273 |
-when a network connection is established." |
274 |
- |
275 |
-depend() { |
276 |
- need dbus |
277 |
- use consolekit |
278 |
- provide net |
279 |
-} |
280 |
- |
281 |
-start() { |
282 |
- # If we are re-called by a dispatcher event, we want to mark the service |
283 |
- # as started without starting the daemon again |
284 |
- yesno "${IN_BACKGROUND}" && return 0 |
285 |
- |
286 |
- [ -z "${INACTIVE_TIMEOUT}" ] && INACTIVE_TIMEOUT="1" |
287 |
- |
288 |
- ebegin "Starting NetworkManager" |
289 |
- start-stop-daemon --start --quiet --pidfile /run/NetworkManager/NetworkManager.pid \ |
290 |
- --exec /usr/sbin/NetworkManager -- --pid-file /run/NetworkManager/NetworkManager.pid |
291 |
- local _retval=$? |
292 |
- eend "${_retval}" |
293 |
- if [ "x${_retval}" = 'x0' ] && ! nm-online -t "${INACTIVE_TIMEOUT}"; then |
294 |
- einfo "Marking NetworkManager as inactive. It will automatically be marked" |
295 |
- einfo "as started after a network connection has been established." |
296 |
- mark_service_inactive |
297 |
- fi |
298 |
- return "${_retval}" |
299 |
-} |
300 |
- |
301 |
-stop() { |
302 |
- # If we are re-called by a dispatcher event, we want to mark the service |
303 |
- # as inactive without stopping the daemon |
304 |
- if yesno "${IN_BACKGROUND}"; then |
305 |
- mark_service_inactive "${SVCNAME}" |
306 |
- return 0 |
307 |
- fi |
308 |
- |
309 |
- ebegin "Stopping NetworkManager" |
310 |
- local pidfile=/run/NetworkManager/NetworkManager.pid |
311 |
- if [ ! -e "${pidfile}" ] && [ -e /var/run/NetworkManager.pid ]; then |
312 |
- # Try stopping the pid file used by <0.9.7 |
313 |
- pidfile=/var/run/NetworkManager.pid |
314 |
- start-stop-daemon --stop --quiet --pidfile "${pidfile}" |
315 |
- ret=$? |
316 |
- [ ${ret} = 0 ] && [ -e "${pidfile}" ] && rm "${pidfile}" |
317 |
- eend ${ret} |
318 |
- else |
319 |
- start-stop-daemon --stop --quiet --pidfile "${pidfile}" |
320 |
- eend $? |
321 |
- fi |
322 |
-} |
323 |
- |
324 |
-# vim: set ft=gentoo-init-d ts=4 : |
325 |
|
326 |
diff --git a/net-misc/networkmanager/files/musl-basic.patch b/net-misc/networkmanager/files/musl-basic.patch |
327 |
index 8b78354..2e0d562 100644 |
328 |
--- a/net-misc/networkmanager/files/musl-basic.patch |
329 |
+++ b/net-misc/networkmanager/files/musl-basic.patch |
330 |
@@ -1,30 +1,18 @@ |
331 |
-From d12f0c518b10a3be0357c9242a2491c0904b51d6 Mon Sep 17 00:00:00 2001 |
332 |
-From: Jory Pratt <anarchy@g.o> |
333 |
-Date: Mon, 29 Jul 2019 23:24:11 -0500 |
334 |
-Subject: [PATCH 1/5] Usual musl fixes |
335 |
- |
336 |
---- |
337 |
- shared/systemd/src/basic/sort-util.h | 6 ++++++ |
338 |
- shared/systemd/src/basic/stdio-util.h | 2 ++ |
339 |
- 2 files changed, 8 insertions(+) |
340 |
- |
341 |
-diff --git a/shared/systemd/src/basic/sort-util.h b/shared/systemd/src/basic/sort-util.h |
342 |
-index e029f86..e876241 100644 |
343 |
---- a/shared/systemd/src/basic/sort-util.h |
344 |
-+++ b/shared/systemd/src/basic/sort-util.h |
345 |
-@@ -5,6 +5,12 @@ |
346 |
+diff --git a/libnm-core/nm-json.c b/libnm-core/nm-json.c |
347 |
+index aa181a4..98c39fc 100644 |
348 |
+--- a/libnm-core/nm-json.c |
349 |
++++ b/libnm-core/nm-json.c |
350 |
+@@ -23,6 +23,10 @@ |
351 |
|
352 |
- #include "macro.h" |
353 |
+ #include <dlfcn.h> |
354 |
|
355 |
-+#if !defined(__GLIBC__) |
356 |
-+typedef int (*__compar_fn_t) (const void*, const void*); |
357 |
-+typedef __compar_fn_t comparison_fn_t; |
358 |
-+typedef int (*__compar_d_fn_t) (const void *, const void *, void *); |
359 |
++#ifndef RTLD_DEEPBIND |
360 |
++#define RTLD_DEEPBIND 0 |
361 |
+#endif |
362 |
+ |
363 |
- void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, |
364 |
- __compar_d_fn_t compar, void *arg); |
365 |
- |
366 |
+ void *_nm_jansson_json_object_iter_value; |
367 |
+ void *_nm_jansson_json_object_key_to_iter; |
368 |
+ void *_nm_jansson_json_integer; |
369 |
diff --git a/shared/systemd/src/basic/stdio-util.h b/shared/systemd/src/basic/stdio-util.h |
370 |
index c3b9448..e80a938 100644 |
371 |
--- a/shared/systemd/src/basic/stdio-util.h |
372 |
@@ -39,6 +27,20 @@ index c3b9448..e80a938 100644 |
373 |
#include <stdarg.h> |
374 |
#include <stdio.h> |
375 |
#include <sys/types.h> |
376 |
--- |
377 |
-2.22.0 |
378 |
- |
379 |
+diff --git a/shared/systemd/src/basic/util.h b/shared/systemd/src/basic/util.h |
380 |
+index 25e6ab8..7967e8a 100644 |
381 |
+--- a/shared/systemd/src/basic/util.h |
382 |
++++ b/shared/systemd/src/basic/util.h |
383 |
+@@ -46,6 +46,12 @@ static inline unsigned u64log2(uint64_t n) { |
384 |
+ #endif |
385 |
+ } |
386 |
+ |
387 |
++#if !defined(__GLIBC__) |
388 |
++typedef int (*__compar_fn_t) (const void*, const void*); |
389 |
++typedef __compar_fn_t comparison_fn_t; |
390 |
++typedef int (*__compar_d_fn_t) (const void *, const void *, void *); |
391 |
++#endif |
392 |
++ |
393 |
+ static inline unsigned u32ctz(uint32_t n) { |
394 |
+ #if __SIZEOF_INT__ == 4 |
395 |
+ return n != 0 ? __builtin_ctz(n) : 32; |
396 |
|
397 |
diff --git a/net-misc/networkmanager/files/musl-compar.patch b/net-misc/networkmanager/files/musl-compar.patch |
398 |
new file mode 100644 |
399 |
index 0000000..1b1de2f |
400 |
--- /dev/null |
401 |
+++ b/net-misc/networkmanager/files/musl-compar.patch |
402 |
@@ -0,0 +1,18 @@ |
403 |
+diff --git a/shared/systemd/src/basic/sort-util.h b/shared/systemd/src/basic/sort-util.h |
404 |
+index e029f86..935f136 100644 |
405 |
+--- a/shared/systemd/src/basic/sort-util.h |
406 |
++++ b/shared/systemd/src/basic/sort-util.h |
407 |
+@@ -5,6 +5,13 @@ |
408 |
+ |
409 |
+ #include "macro.h" |
410 |
+ |
411 |
++#ifndef __COMPAR_FN_T |
412 |
++# define __COMPAR_FN_T |
413 |
++typedef int (*__compar_fn_t) (const void *, const void *); |
414 |
++typedef __compar_fn_t comparison_fn_t; |
415 |
++typedef int (*__compar_d_fn_t) (const void *, const void *, void *); |
416 |
++#endif |
417 |
++ |
418 |
+ void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, |
419 |
+ __compar_d_fn_t compar, void *arg); |
420 |
+ |
421 |
|
422 |
diff --git a/net-misc/networkmanager/files/musl-fix-includes.patch b/net-misc/networkmanager/files/musl-fix-includes.patch |
423 |
index 9ee2f7f..98f8bc2 100644 |
424 |
--- a/net-misc/networkmanager/files/musl-fix-includes.patch |
425 |
+++ b/net-misc/networkmanager/files/musl-fix-includes.patch |
426 |
@@ -1,19 +1,18 @@ |
427 |
-From f0d90910d8a8bde7608221b4e34ff12096a4d951 Mon Sep 17 00:00:00 2001 |
428 |
-From: Jory Pratt <anarchy@g.o> |
429 |
-Date: Mon, 29 Jul 2019 23:25:11 -0500 |
430 |
-Subject: [PATCH 2/5] fix includes for musl |
431 |
- |
432 |
---- |
433 |
- src/devices/nm-device.c | 4 ++++ |
434 |
- src/nm-manager.c | 1 + |
435 |
- src/platform/nm-linux-platform.c | 6 +++++- |
436 |
- 3 files changed, 10 insertions(+), 1 deletion(-) |
437 |
- |
438 |
+--- a/src/NetworkManagerUtils.c 2020-07-17 20:05:45.382005791 +0200 |
439 |
++++ b/src/NetworkManagerUtils.c 2020-07-17 20:05:39.721463542 +0200 |
440 |
+@@ -4,6 +4,7 @@ |
441 |
+ * Copyright (C) 2005 - 2008 Novell, Inc. |
442 |
+ */ |
443 |
+ |
444 |
++#include <netinet/if_ether.h> |
445 |
+ #include "nm-default.h" |
446 |
+ |
447 |
+ #include "NetworkManagerUtils.h" |
448 |
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c |
449 |
-index 42e4688..3b9da98 100644 |
450 |
+index e7a4a05..7578abf 100644 |
451 |
--- a/src/devices/nm-device.c |
452 |
+++ b/src/devices/nm-device.c |
453 |
-@@ -32,7 +32,11 @@ |
454 |
+@@ -17,7 +17,11 @@ |
455 |
#include <arpa/inet.h> |
456 |
#include <fcntl.h> |
457 |
#include <linux/if_addr.h> |
458 |
@@ -26,22 +25,22 @@ index 42e4688..3b9da98 100644 |
459 |
#include <linux/pkt_sched.h> |
460 |
|
461 |
diff --git a/src/nm-manager.c b/src/nm-manager.c |
462 |
-index 7d77144..dc143ba 100644 |
463 |
+index 132cf5a..0dd71dd 100644 |
464 |
--- a/src/nm-manager.c |
465 |
+++ b/src/nm-manager.c |
466 |
-@@ -26,6 +26,7 @@ |
467 |
- #include <stdlib.h> |
468 |
- #include <fcntl.h> |
469 |
- #include <unistd.h> |
470 |
+@@ -15,6 +15,7 @@ |
471 |
+ #include <sys/stat.h> |
472 |
+ #include <sys/sendfile.h> |
473 |
+ #include <limits.h> |
474 |
+#include <asm/types.h> |
475 |
|
476 |
#include "nm-glib-aux/nm-c-list.h" |
477 |
|
478 |
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c |
479 |
-index 7d66a88..b9a7b30 100644 |
480 |
+index 305ae52..10cfec6 100644 |
481 |
--- a/src/platform/nm-linux-platform.c |
482 |
+++ b/src/platform/nm-linux-platform.c |
483 |
-@@ -20,6 +20,7 @@ |
484 |
+@@ -6,6 +6,7 @@ |
485 |
#include "nm-default.h" |
486 |
|
487 |
#include "nm-linux-platform.h" |
488 |
@@ -49,7 +48,7 @@ index 7d66a88..b9a7b30 100644 |
489 |
|
490 |
#include <arpa/inet.h> |
491 |
#include <dlfcn.h> |
492 |
-@@ -28,7 +29,11 @@ |
493 |
+@@ -14,7 +15,11 @@ |
494 |
#include <libudev.h> |
495 |
#include <linux/fib_rules.h> |
496 |
#include <linux/ip.h> |
497 |
@@ -61,14 +60,31 @@ index 7d66a88..b9a7b30 100644 |
498 |
#include <linux/if_bridge.h> |
499 |
#include <linux/if_link.h> |
500 |
#include <linux/if_tun.h> |
501 |
-@@ -58,7 +63,6 @@ |
502 |
- #include "nm-platform-private.h" |
503 |
- #include "wifi/nm-wifi-utils.h" |
504 |
- #include "wifi/nm-wifi-utils-wext.h" |
505 |
--#include "wpan/nm-wpan-utils.h" |
506 |
- #include "nm-glib-aux/nm-io-utils.h" |
507 |
- #include "nm-udev-aux/nm-udev-utils.h" |
508 |
+diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c |
509 |
+index e1150f9..3cb8390 100644 |
510 |
+--- a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c |
511 |
++++ b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c |
512 |
+@@ -7,7 +7,11 @@ |
513 |
+ |
514 |
+ #include <errno.h> |
515 |
+ #include <sys/ioctl.h> |
516 |
++#if defined(__GLIBC__) |
517 |
+ #include <linux/if_arp.h> |
518 |
++#else |
519 |
++#include <linux/if.h> |
520 |
++#endif |
521 |
+ #include <linux/if_infiniband.h> |
522 |
+ |
523 |
+ #include "sd-dhcp6-client.h" |
524 |
+diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c |
525 |
+index c93c6a5..66d2532 100644 |
526 |
+--- a/src/devices/nm-device-bridge.c |
527 |
++++ b/src/devices/nm-device-bridge.c |
528 |
+@@ -15,6 +15,8 @@ |
529 |
+ #include "nm-device-factory.h" |
530 |
+ #include "nm-core-internal.h" |
531 |
|
532 |
--- |
533 |
-2.22.0 |
534 |
- |
535 |
++#include <linux/if_ether.h> |
536 |
++ |
537 |
+ #include "nm-device-logging.h" |
538 |
+ _LOG_DECLARE_SELF(NMDeviceBridge); |
539 |
|
540 |
diff --git a/net-misc/networkmanager/files/musl-network-support.patch b/net-misc/networkmanager/files/musl-network-support.patch |
541 |
index ca242e2..36536df 100644 |
542 |
--- a/net-misc/networkmanager/files/musl-network-support.patch |
543 |
+++ b/net-misc/networkmanager/files/musl-network-support.patch |
544 |
@@ -1,16 +1,3 @@ |
545 |
-From e5e2e822a6daab4af1710fb8044072dc2327d002 Mon Sep 17 00:00:00 2001 |
546 |
-From: Jory Pratt <anarchy@g.o> |
547 |
-Date: Mon, 29 Jul 2019 23:26:46 -0500 |
548 |
-Subject: [PATCH 4/5] add network support for musl libc |
549 |
- |
550 |
---- |
551 |
- libnm-core/nm-utils.h | 4 ++++ |
552 |
- shared/systemd/src/basic/socket-util.h | 5 +++++ |
553 |
- src/platform/wifi/nm-wifi-utils.h | 4 ++++ |
554 |
- 3 files changed, 13 insertions(+) |
555 |
- |
556 |
-diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h |
557 |
-index 2b5baba..976850c 100644 |
558 |
--- a/libnm-core/nm-utils.h |
559 |
+++ b/libnm-core/nm-utils.h |
560 |
@@ -30,7 +30,11 @@ |
561 |
@@ -25,24 +12,6 @@ index 2b5baba..976850c 100644 |
562 |
#include <linux/if_infiniband.h> |
563 |
|
564 |
#include "nm-core-enum-types.h" |
565 |
-diff --git a/shared/systemd/src/basic/socket-util.h b/shared/systemd/src/basic/socket-util.h |
566 |
-index 15443f1..b9c3291 100644 |
567 |
---- a/shared/systemd/src/basic/socket-util.h |
568 |
-+++ b/shared/systemd/src/basic/socket-util.h |
569 |
-@@ -12,6 +12,11 @@ |
570 |
- #include <sys/socket.h> |
571 |
- #include <sys/types.h> |
572 |
- #include <sys/un.h> |
573 |
-+#if !defined(__GLIBC__) |
574 |
-+/* SIOCGSTAMPNS from linux/asm-generic.h |
575 |
-+ * for src/systemd/src/libsystemd-network/sd-lldp.c */ |
576 |
-+#include <linux/sockios.h> |
577 |
-+#endif |
578 |
- |
579 |
- #include "macro.h" |
580 |
- #include "missing_socket.h" |
581 |
-diff --git a/src/platform/wifi/nm-wifi-utils.h b/src/platform/wifi/nm-wifi-utils.h |
582 |
-index 36148b5..d282eb2 100644 |
583 |
--- a/src/platform/wifi/nm-wifi-utils.h |
584 |
+++ b/src/platform/wifi/nm-wifi-utils.h |
585 |
@@ -22,7 +22,11 @@ |
586 |
@@ -56,7 +25,18 @@ index 36148b5..d282eb2 100644 |
587 |
+#endif |
588 |
|
589 |
#include "nm-dbus-interface.h" |
590 |
- #include "nm-setting-wireless.h" |
591 |
--- |
592 |
-2.22.0 |
593 |
- |
594 |
+ |
595 |
+--- a/shared/systemd/src/basic/socket-util.h 2019-03-16 15:41:33.287235649 +0100 |
596 |
++++ b/shared/systemd/src/basic/socket-util.h 2019-03-16 15:42:24.273912106 +0100 |
597 |
+@@ -12,6 +12,11 @@ |
598 |
+ #include <sys/socket.h> |
599 |
+ #include <sys/types.h> |
600 |
+ #include <sys/un.h> |
601 |
++#if !defined(__GLIBC__) |
602 |
++/* SIOCGSTAMPNS from linux/asm-generic.h |
603 |
++ * for src/systemd/src/libsystemd-network/sd-lldp.c */ |
604 |
++#include <linux/sockios.h> |
605 |
++#endif |
606 |
+ |
607 |
+ #include "macro.h" |
608 |
+ #include "missing_socket.h" |
609 |
|
610 |
diff --git a/net-misc/networkmanager/files/musl-no-drand.patch b/net-misc/networkmanager/files/musl-no-drand.patch |
611 |
new file mode 100644 |
612 |
index 0000000..46e3a79 |
613 |
--- /dev/null |
614 |
+++ b/net-misc/networkmanager/files/musl-no-drand.patch |
615 |
@@ -0,0 +1,58 @@ |
616 |
+From ec471e66ee14d7da06d4d0a22bc3cdb5f615fd6f Mon Sep 17 00:00:00 2001 |
617 |
+From: Enno Boland <g@×××.de> |
618 |
+Date: Wed, 7 Aug 2019 16:51:16 +0200 |
619 |
+Subject: [PATCH] use jrand48 instead of mrand48_r on non glibc platforms |
620 |
+ |
621 |
+--- |
622 |
+ shared/n-dhcp4/src/n-dhcp4-c-probe.c | 8 ++++++++ |
623 |
+ shared/n-dhcp4/src/n-dhcp4-private.h | 4 ++++ |
624 |
+ 2 files changed, 12 insertions(+) |
625 |
+ |
626 |
+diff --git a/shared/n-dhcp4/src/n-dhcp4-c-probe.c b/shared/n-dhcp4/src/n-dhcp4-c-probe.c |
627 |
+index 308cff8307..9463528b1f 100644 |
628 |
+--- a/shared/n-dhcp4/src/n-dhcp4-c-probe.c |
629 |
++++ b/shared/n-dhcp4/src/n-dhcp4-c-probe.c |
630 |
+@@ -362,8 +362,12 @@ static void n_dhcp4_client_probe_config_initialize_random_seed(NDhcp4ClientProbe |
631 |
+ seed16v[1] = (u64 >> 16) ^ (u64 >> 0); |
632 |
+ seed16v[2] = (u64 >> 32) ^ (u64 >> 16); |
633 |
+ |
634 |
++#ifdef __GLIBC__ |
635 |
+ r = seed48_r(seed16v, &config->entropy); |
636 |
+ c_assert(!r); |
637 |
++#else |
638 |
++ memcpy(config->entropy, seed16v, sizeof seed16v); |
639 |
++#endif |
640 |
+ } |
641 |
+ |
642 |
+ /** |
643 |
+@@ -377,10 +381,14 @@ static void n_dhcp4_client_probe_config_initialize_random_seed(NDhcp4ClientProbe |
644 |
+ */ |
645 |
+ uint32_t n_dhcp4_client_probe_config_get_random(NDhcp4ClientProbeConfig *config) { |
646 |
+ long int result; |
647 |
++#ifdef __GLIBC__ |
648 |
+ int r; |
649 |
+ |
650 |
+ r = mrand48_r(&config->entropy, &result); |
651 |
+ c_assert(!r); |
652 |
++#else |
653 |
++ result = jrand48(config->entropy); |
654 |
++#endif |
655 |
+ |
656 |
+ return result; |
657 |
+ }; |
658 |
+diff --git a/shared/n-dhcp4/src/n-dhcp4-private.h b/shared/n-dhcp4/src/n-dhcp4-private.h |
659 |
+index c38ddbfc80..fb48807712 100644 |
660 |
+--- a/shared/n-dhcp4/src/n-dhcp4-private.h |
661 |
++++ b/shared/n-dhcp4/src/n-dhcp4-private.h |
662 |
+@@ -259,7 +259,11 @@ struct NDhcp4ClientProbeConfig { |
663 |
+ bool inform_only; |
664 |
+ bool init_reboot; |
665 |
+ struct in_addr requested_ip; |
666 |
++#ifdef __GLIBC__ |
667 |
+ struct drand48_data entropy; /* entropy pool */ |
668 |
++#else |
669 |
++ unsigned short entropy[3]; /* entropy pool */ |
670 |
++#endif |
671 |
+ uint64_t ms_start_delay; /* max ms to wait before starting probe */ |
672 |
+ NDhcp4ClientProbeOption *options[UINT8_MAX + 1]; |
673 |
+ int8_t request_parameters[UINT8_MAX + 1]; |
674 |
|
675 |
diff --git a/net-misc/networkmanager/files/musl-process-util.patch b/net-misc/networkmanager/files/musl-process-util.patch |
676 |
index 6267019..0eb0057 100644 |
677 |
--- a/net-misc/networkmanager/files/musl-process-util.patch |
678 |
+++ b/net-misc/networkmanager/files/musl-process-util.patch |
679 |
@@ -1,14 +1,3 @@ |
680 |
-From 23613c07ff805744aaee22c352b24731ec4b2c69 Mon Sep 17 00:00:00 2001 |
681 |
-From: Jory Pratt <anarchy@g.o> |
682 |
-Date: Mon, 29 Jul 2019 23:27:58 -0500 |
683 |
-Subject: [PATCH 5/5] musl process util |
684 |
- |
685 |
---- |
686 |
- shared/systemd/src/basic/process-util.c | 12 +++++++++++- |
687 |
- 1 file changed, 11 insertions(+), 1 deletion(-) |
688 |
- |
689 |
-diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/process-util.c |
690 |
-index 7431be3..f9e6d49 100644 |
691 |
--- a/shared/systemd/src/basic/process-util.c |
692 |
+++ b/shared/systemd/src/basic/process-util.c |
693 |
@@ -21,6 +21,9 @@ |
694 |
@@ -21,7 +10,7 @@ index 7431be3..f9e6d49 100644 |
695 |
#if 0 /* NM_IGNORED */ |
696 |
#if HAVE_VALGRIND_VALGRIND_H |
697 |
#include <valgrind/valgrind.h> |
698 |
-@@ -1183,11 +1186,13 @@ void reset_cached_pid(void) { |
699 |
+@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) { |
700 |
cached_pid = CACHED_PID_UNSET; |
701 |
} |
702 |
|
703 |
@@ -35,7 +24,7 @@ index 7431be3..f9e6d49 100644 |
704 |
|
705 |
pid_t getpid_cached(void) { |
706 |
static bool installed = false; |
707 |
-@@ -1216,7 +1221,12 @@ pid_t getpid_cached(void) { |
708 |
+@@ -1201,7 +1206,12 @@ pid_t getpid_cached(void) { |
709 |
* only half-documented (glibc doesn't document it but LSB does — though only superficially) |
710 |
* we'll check for errors only in the most generic fashion possible. */ |
711 |
|
712 |
@@ -49,6 +38,3 @@ index 7431be3..f9e6d49 100644 |
713 |
/* OOM? Let's try again later */ |
714 |
cached_pid = CACHED_PID_UNSET; |
715 |
return new_pid; |
716 |
--- |
717 |
-2.22.0 |
718 |
- |
719 |
|
720 |
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 |
721 |
deleted file mode 100644 |
722 |
index 1b94ab4..0000000 |
723 |
--- a/net-misc/networkmanager/files/networkmanager-data-fix-the-ID_NET_DRIVER-udev-rule.patch |
724 |
+++ /dev/null |
725 |
@@ -1,33 +0,0 @@ |
726 |
-From 27d380b70ea839c7badab420361e4e65e023e8e9 Mon Sep 17 00:00:00 2001 |
727 |
-From: Lubomir Rintel <lkundrak@××.sk> |
728 |
-Date: Fri, 16 Aug 2019 13:22:09 +0200 |
729 |
-Subject: [PATCH] data: fix the ID_NET_DRIVER udev rule |
730 |
- |
731 |
-Systemd v243 is complaining about the wrong substitution there. That is |
732 |
-sort of harmless, because systemd-udevd in that version doesn't need the |
733 |
-rule anyway. But still fix it, to avoid a warning. |
734 |
- |
735 |
-Also, newer udevd's $PATH doesn't include sbin. That is also okay, |
736 |
-because we don't need the rule to actually work there. But fix it |
737 |
-anyway. |
738 |
- |
739 |
-https://bugzilla.redhat.com/show_bug.cgi?id=1740655 |
740 |
---- |
741 |
- data/84-nm-drivers.rules | 2 +- |
742 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
743 |
- |
744 |
-diff --git a/data/84-nm-drivers.rules b/data/84-nm-drivers.rules |
745 |
-index d246ef6ce..e398cb9f2 100644 |
746 |
---- a/data/84-nm-drivers.rules |
747 |
-+++ b/data/84-nm-drivers.rules |
748 |
-@@ -7,6 +7,6 @@ ACTION!="add|change", GOTO="nm_drivers_end" |
749 |
- # Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?) |
750 |
- ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end" |
751 |
- DRIVERS=="?*", GOTO="nm_drivers_end" |
752 |
--PROGRAM="/bin/sh -c 'ethtool -i $1 | sed -n s/^driver:\ //p' -- $env{INTERFACE}", RESULT=="?*", ENV{ID_NET_DRIVER}="%c" |
753 |
-+PROGRAM="/bin/sh -c '/usr/sbin/ethtool -i $$1 |/usr/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c" |
754 |
- |
755 |
- LABEL="nm_drivers_end" |
756 |
--- |
757 |
-2.21.0 |
758 |
- |
759 |
|
760 |
diff --git a/net-misc/networkmanager/networkmanager-1.18.6.ebuild b/net-misc/networkmanager/networkmanager-1.26.0.ebuild |
761 |
similarity index 87% |
762 |
rename from net-misc/networkmanager/networkmanager-1.18.6.ebuild |
763 |
rename to net-misc/networkmanager/networkmanager-1.26.0.ebuild |
764 |
index 3a90c0c..89691ae 100644 |
765 |
--- a/net-misc/networkmanager/networkmanager-1.18.6.ebuild |
766 |
+++ b/net-misc/networkmanager/networkmanager-1.26.0.ebuild |
767 |
@@ -3,10 +3,9 @@ |
768 |
|
769 |
EAPI=6 |
770 |
GNOME_ORG_MODULE="NetworkManager" |
771 |
-GNOME2_EAUTORECONF="yes" |
772 |
GNOME2_LA_PUNT="yes" |
773 |
VALA_USE_DEPEND="vapigen" |
774 |
-PYTHON_COMPAT=( python{3_6,3_7} ) |
775 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
776 |
|
777 |
inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal |
778 |
|
779 |
@@ -14,9 +13,9 @@ DESCRIPTION="A set of co-operative tools that make networking simple and straigh |
780 |
HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" |
781 |
|
782 |
LICENSE="GPL-2+" |
783 |
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version |
784 |
+SLOT="0" |
785 |
|
786 |
-IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" |
787 |
+IUSE="audit bluetooth connection-sharing consolekit dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" |
788 |
RESTRICT="!test? ( test )" |
789 |
|
790 |
REQUIRED_USE=" |
791 |
@@ -28,13 +27,11 @@ REQUIRED_USE=" |
792 |
?? ( consolekit elogind systemd ) |
793 |
" |
794 |
|
795 |
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 ~sparc x86" |
796 |
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86" |
797 |
|
798 |
# gobject-introspection-0.10.3 is needed due to gnome bug 642300 |
799 |
# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 |
800 |
COMMON_DEPEND=" |
801 |
- >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}] |
802 |
- >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}] |
803 |
>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] |
804 |
policykit? ( >=sys-auth/polkit-0.106 ) |
805 |
net-libs/libndp[${MULTILIB_USEDEP}] |
806 |
@@ -54,7 +51,8 @@ COMMON_DEPEND=" |
807 |
elogind? ( >=sys-auth/elogind-219 ) |
808 |
introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) |
809 |
json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] ) |
810 |
- modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) |
811 |
+ modemmanager? ( >=net-misc/modemmanager-0.7.991:0= |
812 |
+ net-misc/mobile-broadband-provider-info ) |
813 |
ncurses? ( >=dev-libs/newt-0.52.15 ) |
814 |
nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) |
815 |
!nss? ( gnutls? ( |
816 |
@@ -104,15 +102,13 @@ DEPEND="${COMMON_DEPEND} |
817 |
" |
818 |
|
819 |
PATCHES=( |
820 |
- "${FILESDIR}"/${PN}-data-fix-the-ID_NET_DRIVER-udev-rule.patch |
821 |
- "${FILESDIR}"/1.18.4-iwd1-compat.patch # included in 1.21.3+ |
822 |
- "${FILESDIR}"/${PV}-fix-bashisms.patch |
823 |
- |
824 |
# Required to build on musl |
825 |
"${FILESDIR}"/musl-basic.patch |
826 |
"${FILESDIR}"/musl-network-support.patch |
827 |
"${FILESDIR}"/musl-fix-includes.patch |
828 |
"${FILESDIR}"/musl-process-util.patch |
829 |
+ "${FILESDIR}"/musl-compar.patch |
830 |
+ "${FILESDIR}"/musl-no-drand.patch |
831 |
) |
832 |
|
833 |
python_check_deps() { |
834 |
@@ -178,20 +174,18 @@ multilib_src_configure() { |
835 |
--disable-more-warnings |
836 |
--disable-static |
837 |
--localstatedir=/var |
838 |
+ --with-runstatedir=/run |
839 |
--disable-lto |
840 |
- --disable-config-plugin-ibft |
841 |
--disable-qt |
842 |
--without-netconfig |
843 |
--with-dbus-sys-dir=/etc/dbus-1/system.d |
844 |
- # We need --with-libnm-glib (and dbus-glib dep) as reverse deps are |
845 |
- # still not ready for removing that lib, bug #665338 |
846 |
- --with-libnm-glib |
847 |
$(multilib_native_with nmcli) |
848 |
--with-udev-dir="$(get_udevdir)" |
849 |
--with-config-plugins-default=keyfile |
850 |
--with-iptables=/sbin/iptables |
851 |
--with-ebpf=yes |
852 |
$(multilib_native_enable concheck) |
853 |
+ --with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no) |
854 |
--with-crypto=$(usex nss nss gnutls) |
855 |
--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no))) |
856 |
# ConsoleKit has no build-time dependency, so use it as the default case. |
857 |
@@ -199,8 +193,10 @@ multilib_src_configure() { |
858 |
--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) |
859 |
$(multilib_native_use_with audit libaudit) |
860 |
$(multilib_native_use_enable bluetooth bluez5-dun) |
861 |
+ --without-dhcpcanon |
862 |
$(use_with dhclient) |
863 |
$(use_with dhcpcd) |
864 |
+ --with-config-dhcp-default=internal |
865 |
$(multilib_native_use_enable introspection) |
866 |
$(use_enable json json-validation) |
867 |
$(multilib_native_use_enable ppp) |
868 |
@@ -210,7 +206,6 @@ multilib_src_configure() { |
869 |
$(multilib_native_use_with ofono) |
870 |
$(multilib_native_use_enable ovs) |
871 |
$(multilib_native_use_enable policykit polkit) |
872 |
- $(multilib_native_use_enable policykit polkit-agent) |
873 |
$(multilib_native_use_with resolvconf) |
874 |
$(multilib_native_use_with selinux) |
875 |
$(multilib_native_use_with systemd systemd-journal) |
876 |
@@ -241,7 +236,7 @@ multilib_src_configure() { |
877 |
ln -s "${S}/man" man || die |
878 |
fi |
879 |
|
880 |
- ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}" |
881 |
+ ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}" |
882 |
} |
883 |
|
884 |
multilib_src_compile() { |
885 |
@@ -250,9 +245,6 @@ multilib_src_compile() { |
886 |
else |
887 |
local targets=( |
888 |
libnm/libnm.la |
889 |
- libnm-util/libnm-util.la |
890 |
- libnm-glib/libnm-glib.la |
891 |
- libnm-glib/libnm-glib-vpn.la |
892 |
) |
893 |
emake "${targets[@]}" |
894 |
fi |
895 |
@@ -274,14 +266,7 @@ multilib_src_install() { |
896 |
else |
897 |
local targets=( |
898 |
install-libLTLIBRARIES |
899 |
- install-libdeprecatedHEADERS |
900 |
- install-libnm_glib_libnmvpnHEADERS |
901 |
- install-libnm_glib_libnmincludeHEADERS |
902 |
- install-libnm_util_libnm_util_includeHEADERS |
903 |
install-libnmincludeHEADERS |
904 |
- install-nodist_libnm_glib_libnmincludeHEADERS |
905 |
- install-nodist_libnm_glib_libnmvpnHEADERS |
906 |
- install-nodist_libnm_util_libnm_util_includeHEADERS |
907 |
install-nodist_libnmincludeHEADERS |
908 |
install-pkgconfigDATA |
909 |
) |
910 |
@@ -354,4 +339,12 @@ pkg_postinst() { |
911 |
ewarn "either reconfigure affected networks or, at least, set the flag" |
912 |
ewarn "value to '0'." |
913 |
fi |
914 |
+ |
915 |
+ if use dhclient || use dhcpcd; then |
916 |
+ ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since" |
917 |
+ ewarn "version 1.20 defaults to the internal DHCP client. If the internal client" |
918 |
+ ewarn "works for you, and you're happy with, the alternative USE flags can be" |
919 |
+ ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak" |
920 |
+ ewarn "the main.dhcp configuration option to use one of them instead of internal." |
921 |
+ fi |
922 |
} |