1 |
commit: 5f1ed4ef8ff99ac6d8814f38d4f817a9425fd776 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 9 18:37:40 2016 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 9 18:39:29 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f1ed4ef |
7 |
|
8 |
net-misc/networkmanager: Drop old |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
|
12 |
net-misc/networkmanager/Manifest | 2 - |
13 |
.../files/networkmanager-1.0.10-vpn-routes.patch | 51 --- |
14 |
.../files/networkmanager-1.0.6-vpn-mtu.patch | 53 ---- |
15 |
.../networkmanager/networkmanager-1.0.10-r1.ebuild | 346 -------------------- |
16 |
.../networkmanager/networkmanager-1.0.6-r1.ebuild | 348 --------------------- |
17 |
5 files changed, 800 deletions(-) |
18 |
|
19 |
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest |
20 |
index ddbbb88..bfa1133 100644 |
21 |
--- a/net-misc/networkmanager/Manifest |
22 |
+++ b/net-misc/networkmanager/Manifest |
23 |
@@ -1,4 +1,2 @@ |
24 |
-DIST NetworkManager-1.0.10.tar.xz 3488600 SHA256 1bcfce8441dfd9f432a100d06b54f3831a2275cccc3b74b1b4c09a011e179fbc SHA512 0c5df37565c1ec6fafe60fad0ede34d28e7d87200e338489f35eec18c3e88920f47d58eae5a8aba5caeddb26a6f7074e79e8f6a7d4f7584ce3cc9be0df99f1ef WHIRLPOOL e1a0158d69e444224c25a6287bbe4f3b89d623c85f39a59eb2aeffca83b38cd85ccf067af14e5ff79b23b4346f606e15e3d33b9d097c7ef8d50054fdc5056379 |
25 |
DIST NetworkManager-1.0.12.tar.xz 3490836 SHA256 3a470f8c60109b1acb5784ddc2423501706b5fe34c793a6faee87e591eb04a9e SHA512 926c0139dc7ade7bbc512f0d2e386a42a278aceff68996bc3a18fb1940f5d516f0ff2768459d6f50fd5669d72c15202307396bb3cf8b67c3dbac19db484b971c WHIRLPOOL 6178af61fb30a7e8b72cc05296a014a5be5b10fed41cd5385f0bebae1fa22519c83cf8c359479372f063fc2b891715015454c53cd4f1f1516fc03bca76a552ac |
26 |
-DIST NetworkManager-1.0.6.tar.xz 3381092 SHA256 38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd SHA512 74e8f91bbd9a70f1764b06c729717e091d2be0a8e316fe1b6235e644b65f43add5214be7a1100fe9d30b1511f4a00b9892dce79bb8ba0f0b0d57089d2ba6ddbb WHIRLPOOL 5f1d8c905e4aaa78c742c16e773f8fdbcdb2771edf36565f6b419af457776084573aa43b384ba32885992e76b399d4f2fc7dc94ad4295ac28dcfa3d6b6994b97 |
27 |
DIST NetworkManager-1.2.2.tar.xz 3752592 SHA256 41d8082e027f58bb5fa4181f93742606ab99c659794a18e2823eff22df0eecd9 SHA512 5360f22073dc78d5ff440a3cae8126f263c8ba8230eb77ea2b421ff26e1615c0a44b00c21abddcd0b50a38634b1a44d15c24becb72c735b5abe3ee7bbc3211d5 WHIRLPOOL 9324725793090d551e48e158c46ca283e120d4ac210ad0f14a800442fa62db17c448629f51bb7e18d0b4c602bdf7ebbb8a65cd9e1ea82b6384e8019652403683 |
28 |
|
29 |
diff --git a/net-misc/networkmanager/files/networkmanager-1.0.10-vpn-routes.patch b/net-misc/networkmanager/files/networkmanager-1.0.10-vpn-routes.patch |
30 |
deleted file mode 100644 |
31 |
index b7c2be6..0000000 |
32 |
--- a/net-misc/networkmanager/files/networkmanager-1.0.10-vpn-routes.patch |
33 |
+++ /dev/null |
34 |
@@ -1,51 +0,0 @@ |
35 |
-From 11aa07ed939193e85516c287a57dee1837242972 Mon Sep 17 00:00:00 2001 |
36 |
-From: Thomas Haller <thaller@××××××.com> |
37 |
-Date: Mon, 4 Jan 2016 18:54:26 +0100 |
38 |
-Subject: core: fix failure to configure routes due to wrong device-route for |
39 |
- IPv4 peer-addresses |
40 |
- |
41 |
-As in the case of a OpenVPN connection, we might add an address like: |
42 |
- 10.8.0.58/32 ptp 10.8.0.57 |
43 |
- |
44 |
-In this case, kernel would automatically add a device-route like: |
45 |
- 10.8.0.57/32 via 0.0.0.0 dev 32 metric 0 mss 0 src rtprot-kernel scope link pref-src 10.8.0.58 |
46 |
- |
47 |
-nm_ip4_config_commit() checks all IP addresses to figure out |
48 |
-the present device-routes. Then the routes are synced by NMRouteManager. |
49 |
-Due to a bug, we would not consider the peer-address, but the local-address |
50 |
-and configure a route 10.8.0.58/32, instead of 10.8.0.57/32. |
51 |
- |
52 |
-That stays mostly unnoticed, because usually the peer and the local-address are |
53 |
-in the same subnet, so that there is no difference (/32 is an example of the |
54 |
-peer-address being in a different subnet). |
55 |
- |
56 |
-It also seems that due to a bug fixed by df4e5357521 this issue didn't surface. |
57 |
-Probably because we would not notice the 10.8.0.57/32 right away and thus |
58 |
-nm_route_manager_ip4_route_sync() would not wrongly delete it. |
59 |
- |
60 |
-https://bugzilla.gnome.org/show_bug.cgi?id=759892 |
61 |
- |
62 |
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809195 |
63 |
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809494 |
64 |
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809526 |
65 |
-https://bugs.archlinux.org/task/47535 |
66 |
-https://bugzilla.redhat.com/show_bug.cgi?id=1294309 |
67 |
-https://mail.gnome.org/archives/networkmanager-list/2015-December/msg00059.html |
68 |
- |
69 |
-diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c |
70 |
-index f625d35..61e29af 100644 |
71 |
---- a/src/nm-ip4-config.c |
72 |
-+++ b/src/nm-ip4-config.c |
73 |
-@@ -298,7 +298,8 @@ nm_ip4_config_commit (const NMIP4Config *config, int ifindex, gboolean routes_fu |
74 |
- |
75 |
- route.ifindex = ifindex; |
76 |
- route.source = NM_IP_CONFIG_SOURCE_KERNEL; |
77 |
-- route.network = nm_utils_ip4_address_clear_host_address (addr->address, addr->plen); |
78 |
-+ route.network = nm_utils_ip4_address_clear_host_address (addr->peer_address ? : addr->address, |
79 |
-+ addr->plen); |
80 |
- route.plen = addr->plen; |
81 |
- route.pref_src = addr->address; |
82 |
- route.metric = default_route_metric; |
83 |
--- |
84 |
-cgit v0.10.2 |
85 |
- |
86 |
|
87 |
diff --git a/net-misc/networkmanager/files/networkmanager-1.0.6-vpn-mtu.patch b/net-misc/networkmanager/files/networkmanager-1.0.6-vpn-mtu.patch |
88 |
deleted file mode 100644 |
89 |
index 6159972..0000000 |
90 |
--- a/net-misc/networkmanager/files/networkmanager-1.0.6-vpn-mtu.patch |
91 |
+++ /dev/null |
92 |
@@ -1,53 +0,0 @@ |
93 |
-From 105e30efbaf422401902575749efdcd18706ace1 Mon Sep 17 00:00:00 2001 |
94 |
-From: Lubomir Rintel <lkundrak@××.sk> |
95 |
-Date: Mon, 28 Sep 2015 20:57:09 +0200 |
96 |
-Subject: vpn-connection: set the MTU for the VPN IP interface |
97 |
- |
98 |
-The 9b79e6c73 commit moved setting of the MTU from IP4Config to NMDevice, but |
99 |
-VPN connections don't have a NMDevice instance (yet). Set the MTU also from the |
100 |
-VPN connection. Also, copying of the MTU to the IP4Config is no longer needed |
101 |
-as the ip4_config_commit no longer sets the MTU. |
102 |
- |
103 |
-Fixes: 9b79e6c732ffb2fb105647c1465070d36a6cc180 |
104 |
- |
105 |
-https://bugzilla.gnome.org/show_bug.cgi?id=754781 |
106 |
-(cherry picked from commit e0fa48f224abcb73a1a129f10050f7cd942ee629) |
107 |
- |
108 |
-diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c |
109 |
-index f0e6149..e2d3103 100644 |
110 |
---- a/src/vpn-manager/nm-vpn-connection.c |
111 |
-+++ b/src/vpn-manager/nm-vpn-connection.c |
112 |
-@@ -980,6 +980,9 @@ nm_vpn_connection_apply_config (NMVpnConnection *connection) |
113 |
- TRUE)) |
114 |
- return FALSE; |
115 |
- } |
116 |
-+ |
117 |
-+ if (priv->mtu && priv->mtu != nm_platform_link_get_mtu (NM_PLATFORM_GET, priv->ip_ifindex)) |
118 |
-+ nm_platform_link_set_mtu (NM_PLATFORM_GET, priv->ip_ifindex, priv->mtu); |
119 |
- } |
120 |
- |
121 |
- apply_parent_device_config (connection); |
122 |
-@@ -1149,10 +1152,6 @@ process_generic_config (NMVpnConnection *connection, |
123 |
- } |
124 |
- } |
125 |
- |
126 |
-- /* MTU; this is a per-connection value, though NM's API treats it |
127 |
-- * like it's IP4-specific. So we store it for now and retrieve it |
128 |
-- * later in ip4_config_get. |
129 |
-- */ |
130 |
- priv->mtu = 0; |
131 |
- val = (GValue *) g_hash_table_lookup (config_hash, NM_VPN_PLUGIN_CONFIG_MTU); |
132 |
- if (val) { |
133 |
-@@ -1328,9 +1327,6 @@ nm_vpn_connection_ip4_config_get (DBusGProxy *proxy, |
134 |
- if (val) |
135 |
- nm_ip4_config_set_mss (config, g_value_get_uint (val)); |
136 |
- |
137 |
-- if (priv->mtu) |
138 |
-- nm_ip4_config_set_mtu (config, priv->mtu, NM_IP_CONFIG_SOURCE_VPN); |
139 |
-- |
140 |
- val = (GValue *) g_hash_table_lookup (config_hash, NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN); |
141 |
- if (val) |
142 |
- nm_ip4_config_add_domain (config, g_value_get_string (val)); |
143 |
--- |
144 |
-cgit v0.10.2 |
145 |
- |
146 |
|
147 |
diff --git a/net-misc/networkmanager/networkmanager-1.0.10-r1.ebuild b/net-misc/networkmanager/networkmanager-1.0.10-r1.ebuild |
148 |
deleted file mode 100644 |
149 |
index ac5e50a..0000000 |
150 |
--- a/net-misc/networkmanager/networkmanager-1.0.10-r1.ebuild |
151 |
+++ /dev/null |
152 |
@@ -1,346 +0,0 @@ |
153 |
-# Copyright 1999-2015 Gentoo Foundation |
154 |
-# Distributed under the terms of the GNU General Public License v2 |
155 |
-# $Id$ |
156 |
- |
157 |
-EAPI="5" |
158 |
-GCONF_DEBUG="no" |
159 |
-GNOME_ORG_MODULE="NetworkManager" |
160 |
-GNOME2_LA_PUNT="yes" |
161 |
-VALA_USE_DEPEND="vapigen" |
162 |
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) |
163 |
- |
164 |
-inherit autotools bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 systemd \ |
165 |
- user readme.gentoo toolchain-funcs vala versionator virtualx udev multilib-minimal |
166 |
- |
167 |
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" |
168 |
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" |
169 |
- |
170 |
-LICENSE="GPL-2+" |
171 |
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version |
172 |
- |
173 |
-IUSE="bluetooth connection-sharing consolekit +dhclient dhcpcd gnutls +introspection \ |
174 |
-kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \ |
175 |
-vala +wext +wifi zeroconf" # wimax |
176 |
- |
177 |
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~ppc ppc64 ~sparc x86" |
178 |
- |
179 |
-REQUIRED_USE=" |
180 |
- modemmanager? ( ppp ) |
181 |
- wext? ( wifi ) |
182 |
- ^^ ( nss gnutls ) |
183 |
- ^^ ( dhclient dhcpcd ) |
184 |
-" |
185 |
- |
186 |
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300 |
187 |
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 |
188 |
-# TODO: Qt support? |
189 |
-COMMON_DEPEND=" |
190 |
- >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}] |
191 |
- >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}] |
192 |
- >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}] |
193 |
- >=dev-libs/libnl-3.2.8:3= |
194 |
- >=sys-auth/polkit-0.106 |
195 |
- net-libs/libndp |
196 |
- >=net-libs/libsoup-2.40:2.4= |
197 |
- net-misc/iputils |
198 |
- sys-libs/readline:0 |
199 |
- >=virtual/libgudev-165:=[${MULTILIB_USEDEP}] |
200 |
- bluetooth? ( >=net-wireless/bluez-5 ) |
201 |
- connection-sharing? ( |
202 |
- net-dns/dnsmasq[dhcp] |
203 |
- net-firewall/iptables ) |
204 |
- gnutls? ( |
205 |
- dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] |
206 |
- net-libs/gnutls:=[${MULTILIB_USEDEP}] ) |
207 |
- modemmanager? ( >=net-misc/modemmanager-0.7.991 ) |
208 |
- ncurses? ( >=dev-libs/newt-0.52.15 ) |
209 |
- nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) |
210 |
- dhclient? ( >=net-misc/dhcp-4[client] ) |
211 |
- dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) |
212 |
- introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) |
213 |
- ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] net-dialup/rp-pppoe ) |
214 |
- resolvconf? ( net-dns/openresolv ) |
215 |
- systemd? ( >=sys-apps/systemd-209:0= ) |
216 |
- !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) ) |
217 |
- teamd? ( >=net-misc/libteam-1.9 ) |
218 |
- zeroconf? ( net-dns/avahi:=[autoipd] ) |
219 |
-" |
220 |
-RDEPEND="${COMMON_DEPEND} |
221 |
- consolekit? ( sys-auth/consolekit ) |
222 |
- wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) |
223 |
-" |
224 |
-DEPEND="${COMMON_DEPEND} |
225 |
- dev-util/gdbus-codegen |
226 |
- dev-util/gtk-doc-am |
227 |
- >=dev-util/intltool-0.40 |
228 |
- >=sys-devel/gettext-0.17 |
229 |
- >=sys-kernel/linux-headers-2.6.29 |
230 |
- virtual/pkgconfig |
231 |
- vala? ( $(vala_depend) ) |
232 |
- test? ( |
233 |
- $(python_gen_any_dep ' |
234 |
- dev-python/dbus-python[${PYTHON_USEDEP}] |
235 |
- dev-python/pygobject:2[${PYTHON_USEDEP}]') |
236 |
- ) |
237 |
-" |
238 |
- |
239 |
-sysfs_deprecated_check() { |
240 |
- ebegin "Checking for SYSFS_DEPRECATED support" |
241 |
- |
242 |
- if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then |
243 |
- eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" |
244 |
- eerror "or NetworkManager will not work correctly." |
245 |
- eerror "See https://bugs.gentoo.org/333639 for more info." |
246 |
- die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" |
247 |
- fi |
248 |
- eend $? |
249 |
-} |
250 |
- |
251 |
-pkg_pretend() { |
252 |
- if use kernel_linux; then |
253 |
- get_version |
254 |
- if linux_config_exists; then |
255 |
- sysfs_deprecated_check |
256 |
- else |
257 |
- ewarn "Was unable to determine your kernel .config" |
258 |
- ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." |
259 |
- ewarn "See https://bugs.gentoo.org/333639 for more info." |
260 |
- fi |
261 |
- |
262 |
- fi |
263 |
-} |
264 |
- |
265 |
-pkg_setup() { |
266 |
- enewgroup plugdev |
267 |
-} |
268 |
- |
269 |
-src_prepare() { |
270 |
- DOC_CONTENTS="To modify system network connections without needing to enter the |
271 |
- root password, add your user account to the 'plugdev' group." |
272 |
- |
273 |
- # Force use of /run, avoid eautoreconf, upstream bug #737139, fixed in 'master' |
274 |
- sed -e 's:$localstatedir/run/:/run/:' -i configure || die |
275 |
- |
276 |
- # Don't build examples, they are not needed and can cause build failure |
277 |
- sed -e '/^\s*examples\s*\\/d' -i Makefile.{am,in} || die |
278 |
- |
279 |
- # core: fix failure to configure routes due to wrong device-route for IPv4 peer-addresses |
280 |
- # (from 1.0 branch) |
281 |
- epatch "${FILESDIR}"/${P}-vpn-routes.patch |
282 |
- |
283 |
- use vala && vala_src_prepare |
284 |
- epatch_user # don't remove, users often want custom patches for NM |
285 |
- eautoreconf |
286 |
- gnome2_src_prepare |
287 |
-} |
288 |
- |
289 |
-multilib_src_configure() { |
290 |
- local myconf=() |
291 |
- |
292 |
- # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 |
293 |
- if use ppp; then |
294 |
- local PPPD_VER=`best_version net-dialup/ppp` |
295 |
- PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} |
296 |
- PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision |
297 |
- myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) |
298 |
- fi |
299 |
- |
300 |
- # unit files directory needs to be passed only when systemd is enabled, |
301 |
- # otherwise systemd support is not disabled completely, bug #524534 |
302 |
- use systemd && myconf+=( "$(systemd_with_unitdir)" ) |
303 |
- |
304 |
- if multilib_is_native_abi; then |
305 |
- # work-around man out-of-source brokenness, must be done before configure |
306 |
- mkdir man || die |
307 |
- find "${S}"/man -name '*.?' -exec ln -s {} man/ ';' || die |
308 |
- else |
309 |
- # libnl, libndp are only used for executables, not libraries |
310 |
- myconf+=( LIB{NL,NDP}_{CFLAGS,LIBS}=' ' ) |
311 |
- fi |
312 |
- |
313 |
- # TODO: enable wimax when we have a libnl:3 compatible revision of it |
314 |
- # wimax will be removed, bug #522822 |
315 |
- # ifnet plugin always disabled until someone volunteers to actively |
316 |
- # maintain and fix it |
317 |
- ECONF_SOURCE=${S} \ |
318 |
- gnome2_src_configure \ |
319 |
- --disable-more-warnings \ |
320 |
- --disable-static \ |
321 |
- --localstatedir=/var \ |
322 |
- --disable-lto \ |
323 |
- --disable-config-plugin-ibft \ |
324 |
- --disable-ifnet \ |
325 |
- --without-netconfig \ |
326 |
- --with-dbus-sys-dir=/etc/dbus-1/system.d \ |
327 |
- --with-udev-dir="$(get_udevdir)" \ |
328 |
- --with-config-plugins-default=keyfile \ |
329 |
- --with-iptables=/sbin/iptables \ |
330 |
- $(multilib_native_with libsoup) \ |
331 |
- $(multilib_native_enable concheck) \ |
332 |
- --with-crypto=$(usex nss nss gnutls) \ |
333 |
- --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit no)) \ |
334 |
- --with-suspend-resume=$(multilib_native_usex systemd systemd upower) \ |
335 |
- $(multilib_native_use_enable bluetooth bluez5-dun) \ |
336 |
- $(multilib_native_use_enable introspection) \ |
337 |
- $(multilib_native_use_enable ppp) \ |
338 |
- --disable-wimax \ |
339 |
- $(use_with dhclient) \ |
340 |
- $(use_with dhcpcd) \ |
341 |
- $(multilib_native_use_with modemmanager modem-manager-1) \ |
342 |
- $(multilib_native_use_with ncurses nmtui) \ |
343 |
- $(multilib_native_use_with resolvconf) \ |
344 |
- $(multilib_native_use_with selinux) \ |
345 |
- $(multilib_native_use_enable teamd teamdctl) \ |
346 |
- $(multilib_native_use_enable test tests) \ |
347 |
- $(multilib_native_use_enable vala) \ |
348 |
- --without-valgrind \ |
349 |
- $(multilib_native_use_with wext) \ |
350 |
- $(multilib_native_use_enable wifi) \ |
351 |
- "${myconf[@]}" |
352 |
- |
353 |
- # work-around gtk-doc out-of-source brokedness |
354 |
- if multilib_is_native_abi; then |
355 |
- local d |
356 |
- for d in api libnm libnm-util libnm-glib; do |
357 |
- ln -s "${S}"/docs/${d}/html docs/${d}/html || die |
358 |
- done |
359 |
- fi |
360 |
-} |
361 |
- |
362 |
-multilib_src_compile() { |
363 |
- if multilib_is_native_abi; then |
364 |
- emake |
365 |
- else |
366 |
- emake all-am |
367 |
- emake -C include |
368 |
- emake -C introspection # generated headers, needed for libnm |
369 |
- emake -C libnm-core |
370 |
- emake -C libnm |
371 |
- emake -C libnm-util |
372 |
- emake -C libnm-glib |
373 |
- fi |
374 |
-} |
375 |
- |
376 |
-multilib_src_test() { |
377 |
- if multilib_is_native_abi; then |
378 |
- python_setup |
379 |
- Xemake check |
380 |
- fi |
381 |
-} |
382 |
- |
383 |
-multilib_src_install() { |
384 |
- if multilib_is_native_abi; then |
385 |
- # Install completions at proper place, bug #465100 |
386 |
- gnome2_src_install completiondir="$(get_bashcompdir)" |
387 |
- else |
388 |
- emake DESTDIR="${D}" install-am |
389 |
- emake DESTDIR="${D}" install -C include |
390 |
- emake DESTDIR="${D}" install -C introspection |
391 |
- emake DESTDIR="${D}" install -C libnm-core |
392 |
- emake DESTDIR="${D}" install -C libnm |
393 |
- emake DESTDIR="${D}" install -C libnm-util |
394 |
- emake DESTDIR="${D}" install -C libnm-glib |
395 |
- fi |
396 |
-} |
397 |
- |
398 |
-multilib_src_install_all() { |
399 |
- ! use systemd && readme.gentoo_create_doc |
400 |
- |
401 |
- newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager |
402 |
- newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager |
403 |
- |
404 |
- # /var/run/NetworkManager is used by some distros, but not by Gentoo |
405 |
- rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed" |
406 |
- rmdir -v "${ED}/var/run" || die "rmdir failed" |
407 |
- |
408 |
- # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts |
409 |
- keepdir /etc/NetworkManager/dispatcher.d |
410 |
- |
411 |
- # Provide openrc net dependency only when nm is connected |
412 |
- exeinto /etc/NetworkManager/dispatcher.d |
413 |
- newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status |
414 |
- sed -e "s:@EPREFIX@:${EPREFIX}:g" \ |
415 |
- -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die |
416 |
- |
417 |
- keepdir /etc/NetworkManager/system-connections |
418 |
- chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594 |
419 |
- |
420 |
- # Allow users in plugdev group to modify system connections |
421 |
- insinto /usr/share/polkit-1/rules.d/ |
422 |
- doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" |
423 |
-} |
424 |
- |
425 |
-pkg_postinst() { |
426 |
- gnome2_pkg_postinst |
427 |
- ! use systemd && readme.gentoo_print_elog |
428 |
- |
429 |
- if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then |
430 |
- ewarn "The ${PN} system configuration file has moved to a new location." |
431 |
- ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" |
432 |
- ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf" |
433 |
- ewarn |
434 |
- ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf" |
435 |
- fi |
436 |
- |
437 |
- # The polkit rules file moved to /usr/share |
438 |
- old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules" |
439 |
- if [[ -f "${old_rules}" ]]; then |
440 |
- case "$(md5sum ${old_rules})" in |
441 |
- 574d0cfa7e911b1f7792077003060240* ) |
442 |
- # Automatically delete the old rules.d file if the user did not change it |
443 |
- elog |
444 |
- elog "Removing old ${old_rules} ..." |
445 |
- rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" |
446 |
- ;; |
447 |
- * ) |
448 |
- elog "The ${old_rules}" |
449 |
- elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4" |
450 |
- elog "If you edited ${old_rules}" |
451 |
- elog "without changing its behavior, you may want to remove it." |
452 |
- ;; |
453 |
- esac |
454 |
- fi |
455 |
- |
456 |
- # ifnet plugin was disabled for systemd users with 0.9.8.6 version |
457 |
- # and for all people with 0.9.10.0-r1 (see ChangeLog for full explanations) |
458 |
- if use systemd; then |
459 |
- if ! version_is_at_least 0.9.8.6 ${REPLACING_VERSIONS}; then |
460 |
- ewarn "Ifnet plugin won't be used with systemd support enabled" |
461 |
- ewarn "as it is meant to be used with openRC and can cause collisions" |
462 |
- ewarn "(like bug #485658)." |
463 |
- ewarn "Because of this, you will likely need to reconfigure some of" |
464 |
- ewarn "your networks. To do this you can rely on Gnome control center," |
465 |
- ewarn "nm-connection-editor or nmtui tools for example once updated" |
466 |
- ewarn "NetworkManager version is installed." |
467 |
- fi |
468 |
- else |
469 |
- if ! version_is_at_least 0.9.10.0-r1 ${REPLACING_VERSIONS}; then |
470 |
- ewarn "Ifnet plugin is now disabled because of it being unattended" |
471 |
- ewarn "and unmaintained for a long time, leading to some unfixed bugs" |
472 |
- ewarn "and new problems appearing. We will now use upstream 'keyfile'" |
473 |
- ewarn "plugin." |
474 |
- ewarn "Because of this, you will likely need to reconfigure some of" |
475 |
- ewarn "your networks. To do this you can rely on Gnome control center," |
476 |
- ewarn "nm-connection-editor or nmtui tools for example once updated" |
477 |
- ewarn "NetworkManager version is installed." |
478 |
- fi |
479 |
- fi |
480 |
- |
481 |
- # NM fallbacks to plugin specified at compile time (upstream bug #738611) |
482 |
- # but still show a warning to remember people to have cleaner config file |
483 |
- if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then |
484 |
- if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then |
485 |
- ewarn |
486 |
- ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf" |
487 |
- ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." |
488 |
- ewarn |
489 |
- fi |
490 |
- fi |
491 |
- |
492 |
- # NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457 |
493 |
- if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then |
494 |
- ewarn "You have psk-flags=1 setting in above files, you will need to" |
495 |
- ewarn "either reconfigure affected networks or, at least, set the flag" |
496 |
- ewarn "value to '0'." |
497 |
- fi |
498 |
-} |
499 |
|
500 |
diff --git a/net-misc/networkmanager/networkmanager-1.0.6-r1.ebuild b/net-misc/networkmanager/networkmanager-1.0.6-r1.ebuild |
501 |
deleted file mode 100644 |
502 |
index facc263..0000000 |
503 |
--- a/net-misc/networkmanager/networkmanager-1.0.6-r1.ebuild |
504 |
+++ /dev/null |
505 |
@@ -1,348 +0,0 @@ |
506 |
-# Copyright 1999-2015 Gentoo Foundation |
507 |
-# Distributed under the terms of the GNU General Public License v2 |
508 |
-# $Id$ |
509 |
- |
510 |
-EAPI="5" |
511 |
-GCONF_DEBUG="no" |
512 |
-GNOME_ORG_MODULE="NetworkManager" |
513 |
-GNOME2_LA_PUNT="yes" |
514 |
-VALA_USE_DEPEND="vapigen" |
515 |
-PYTHON_COMPAT=( python{2_7,3_3,3_4} ) |
516 |
- |
517 |
-inherit autotools bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 systemd \ |
518 |
- user readme.gentoo toolchain-funcs vala versionator virtualx udev multilib-minimal |
519 |
- |
520 |
-DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts" |
521 |
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" |
522 |
- |
523 |
-LICENSE="GPL-2+" |
524 |
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version |
525 |
- |
526 |
-IUSE="bluetooth connection-sharing consolekit +dhclient dhcpcd gnutls +introspection \ |
527 |
-kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \ |
528 |
-vala +wext +wifi zeroconf" # wimax |
529 |
- |
530 |
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86" |
531 |
- |
532 |
-REQUIRED_USE=" |
533 |
- modemmanager? ( ppp ) |
534 |
- wext? ( wifi ) |
535 |
- ^^ ( nss gnutls ) |
536 |
- ^^ ( dhclient dhcpcd ) |
537 |
-" |
538 |
- |
539 |
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300 |
540 |
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 |
541 |
-# TODO: Qt support? |
542 |
-COMMON_DEPEND=" |
543 |
- >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}] |
544 |
- >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}] |
545 |
- >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}] |
546 |
- >=dev-libs/libnl-3.2.8:3= |
547 |
- >=sys-auth/polkit-0.106 |
548 |
- net-libs/libndp |
549 |
- >=net-libs/libsoup-2.26:2.4= |
550 |
- net-misc/iputils |
551 |
- sys-libs/readline:0 |
552 |
- >=virtual/libgudev-165:=[${MULTILIB_USEDEP}] |
553 |
- bluetooth? ( >=net-wireless/bluez-5 ) |
554 |
- connection-sharing? ( |
555 |
- net-dns/dnsmasq[dhcp] |
556 |
- net-firewall/iptables ) |
557 |
- gnutls? ( |
558 |
- dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] |
559 |
- net-libs/gnutls:=[${MULTILIB_USEDEP}] ) |
560 |
- modemmanager? ( >=net-misc/modemmanager-0.7.991 ) |
561 |
- ncurses? ( >=dev-libs/newt-0.52.15 ) |
562 |
- nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) |
563 |
- dhclient? ( >=net-misc/dhcp-4[client] ) |
564 |
- dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) |
565 |
- introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) |
566 |
- ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] net-dialup/rp-pppoe ) |
567 |
- resolvconf? ( net-dns/openresolv ) |
568 |
- systemd? ( >=sys-apps/systemd-209:0= ) |
569 |
- !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) ) |
570 |
- teamd? ( >=net-misc/libteam-1.9 ) |
571 |
- zeroconf? ( net-dns/avahi:=[autoipd] ) |
572 |
-" |
573 |
-RDEPEND="${COMMON_DEPEND} |
574 |
- consolekit? ( sys-auth/consolekit ) |
575 |
- wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) |
576 |
-" |
577 |
-DEPEND="${COMMON_DEPEND} |
578 |
- dev-util/gdbus-codegen |
579 |
- dev-util/gtk-doc-am |
580 |
- >=dev-util/intltool-0.40 |
581 |
- >=sys-devel/gettext-0.17 |
582 |
- >=sys-kernel/linux-headers-2.6.29 |
583 |
- virtual/pkgconfig |
584 |
- vala? ( $(vala_depend) ) |
585 |
- test? ( |
586 |
- $(python_gen_any_dep ' |
587 |
- dev-python/dbus-python[${PYTHON_USEDEP}] |
588 |
- dev-python/pygobject:2[${PYTHON_USEDEP}]') |
589 |
- ) |
590 |
-" |
591 |
- |
592 |
-sysfs_deprecated_check() { |
593 |
- ebegin "Checking for SYSFS_DEPRECATED support" |
594 |
- |
595 |
- if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then |
596 |
- eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" |
597 |
- eerror "or NetworkManager will not work correctly." |
598 |
- eerror "See https://bugs.gentoo.org/333639 for more info." |
599 |
- die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" |
600 |
- fi |
601 |
- eend $? |
602 |
-} |
603 |
- |
604 |
-pkg_pretend() { |
605 |
- if use kernel_linux; then |
606 |
- get_version |
607 |
- if linux_config_exists; then |
608 |
- sysfs_deprecated_check |
609 |
- else |
610 |
- ewarn "Was unable to determine your kernel .config" |
611 |
- ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." |
612 |
- ewarn "See https://bugs.gentoo.org/333639 for more info." |
613 |
- fi |
614 |
- |
615 |
- fi |
616 |
-} |
617 |
- |
618 |
-pkg_setup() { |
619 |
- enewgroup plugdev |
620 |
-} |
621 |
- |
622 |
-src_prepare() { |
623 |
- DOC_CONTENTS="To modify system network connections without needing to enter the |
624 |
- root password, add your user account to the 'plugdev' group." |
625 |
- |
626 |
- # vpn-connection: set the MTU for the VPN IP interface (from nm-1.0 branch) |
627 |
- epatch "${FILESDIR}"/${P}-vpn-mtu.patch |
628 |
- |
629 |
- # Force use of /run, avoid eautoreconf, upstream bug #737139, fixed in 'master' |
630 |
- sed -e 's:$localstatedir/run/:/run/:' -i configure || die |
631 |
- |
632 |
- # Don't build examples, they are not needed and can cause build failure |
633 |
- sed -e '/^\s*examples\s*\\/d' -i Makefile.{am,in} || die |
634 |
- |
635 |
- use vala && vala_src_prepare |
636 |
- |
637 |
- epatch_user # don't remove, users often want custom patches for NM |
638 |
- |
639 |
- eautoreconf |
640 |
- |
641 |
- gnome2_src_prepare |
642 |
-} |
643 |
- |
644 |
-multilib_src_configure() { |
645 |
- local myconf=() |
646 |
- |
647 |
- # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 |
648 |
- if use ppp; then |
649 |
- local PPPD_VER=`best_version net-dialup/ppp` |
650 |
- PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} |
651 |
- PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision |
652 |
- myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) |
653 |
- fi |
654 |
- |
655 |
- # unit files directory needs to be passed only when systemd is enabled, |
656 |
- # otherwise systemd support is not disabled completely, bug #524534 |
657 |
- use systemd && myconf+=( "$(systemd_with_unitdir)" ) |
658 |
- |
659 |
- if multilib_is_native_abi; then |
660 |
- # work-around man out-of-source brokenness, must be done before configure |
661 |
- mkdir man || die |
662 |
- find "${S}"/man -name '*.?' -exec ln -s {} man/ ';' || die |
663 |
- else |
664 |
- # libnl, libndp are only used for executables, not libraries |
665 |
- myconf+=( LIB{NL,NDP}_{CFLAGS,LIBS}=' ' ) |
666 |
- fi |
667 |
- |
668 |
- # TODO: enable wimax when we have a libnl:3 compatible revision of it |
669 |
- # wimax will be removed, bug #522822 |
670 |
- # ifnet plugin always disabled until someone volunteers to actively |
671 |
- # maintain and fix it |
672 |
- ECONF_SOURCE=${S} \ |
673 |
- gnome2_src_configure \ |
674 |
- --disable-more-warnings \ |
675 |
- --disable-static \ |
676 |
- --localstatedir=/var \ |
677 |
- --disable-lto \ |
678 |
- --disable-config-plugin-ibft \ |
679 |
- --disable-ifnet \ |
680 |
- --without-netconfig \ |
681 |
- --with-dbus-sys-dir=/etc/dbus-1/system.d \ |
682 |
- --with-udev-dir="$(get_udevdir)" \ |
683 |
- --with-config-plugins-default=keyfile \ |
684 |
- --with-iptables=/sbin/iptables \ |
685 |
- $(multilib_native_with libsoup) \ |
686 |
- $(multilib_native_enable concheck) \ |
687 |
- --with-crypto=$(usex nss nss gnutls) \ |
688 |
- --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit no)) \ |
689 |
- --with-suspend-resume=$(multilib_native_usex systemd systemd upower) \ |
690 |
- $(multilib_native_use_enable bluetooth bluez5-dun) \ |
691 |
- $(multilib_native_use_enable introspection) \ |
692 |
- $(multilib_native_use_enable ppp) \ |
693 |
- --disable-wimax \ |
694 |
- $(use_with dhclient) \ |
695 |
- $(use_with dhcpcd) \ |
696 |
- $(multilib_native_use_with modemmanager modem-manager-1) \ |
697 |
- $(multilib_native_use_with ncurses nmtui) \ |
698 |
- $(multilib_native_use_with resolvconf) \ |
699 |
- $(multilib_native_use_with selinux) \ |
700 |
- $(multilib_native_use_enable teamd teamdctl) \ |
701 |
- $(multilib_native_use_enable test tests) \ |
702 |
- $(multilib_native_use_enable vala) \ |
703 |
- --without-valgrind \ |
704 |
- $(multilib_native_use_with wext) \ |
705 |
- $(multilib_native_use_enable wifi) \ |
706 |
- "${myconf[@]}" |
707 |
- |
708 |
- # work-around gtk-doc out-of-source brokedness |
709 |
- if multilib_is_native_abi; then |
710 |
- local d |
711 |
- for d in api libnm libnm-util libnm-glib; do |
712 |
- ln -s "${S}"/docs/${d}/html docs/${d}/html || die |
713 |
- done |
714 |
- fi |
715 |
-} |
716 |
- |
717 |
-multilib_src_compile() { |
718 |
- if multilib_is_native_abi; then |
719 |
- emake |
720 |
- else |
721 |
- emake all-am |
722 |
- emake -C include |
723 |
- emake -C introspection # generated headers, needed for libnm |
724 |
- emake -C libnm-core |
725 |
- emake -C libnm |
726 |
- emake -C libnm-util |
727 |
- emake -C libnm-glib |
728 |
- fi |
729 |
-} |
730 |
- |
731 |
-multilib_src_test() { |
732 |
- if multilib_is_native_abi; then |
733 |
- python_setup |
734 |
- Xemake check |
735 |
- fi |
736 |
-} |
737 |
- |
738 |
-multilib_src_install() { |
739 |
- if multilib_is_native_abi; then |
740 |
- # Install completions at proper place, bug #465100 |
741 |
- gnome2_src_install completiondir="$(get_bashcompdir)" |
742 |
- else |
743 |
- emake DESTDIR="${D}" install-am |
744 |
- emake DESTDIR="${D}" install -C include |
745 |
- emake DESTDIR="${D}" install -C introspection |
746 |
- emake DESTDIR="${D}" install -C libnm-core |
747 |
- emake DESTDIR="${D}" install -C libnm |
748 |
- emake DESTDIR="${D}" install -C libnm-util |
749 |
- emake DESTDIR="${D}" install -C libnm-glib |
750 |
- fi |
751 |
-} |
752 |
- |
753 |
-multilib_src_install_all() { |
754 |
- ! use systemd && readme.gentoo_create_doc |
755 |
- |
756 |
- newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager |
757 |
- newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager |
758 |
- |
759 |
- # /var/run/NetworkManager is used by some distros, but not by Gentoo |
760 |
- rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed" |
761 |
- rmdir -v "${ED}/var/run" || die "rmdir failed" |
762 |
- |
763 |
- # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts |
764 |
- keepdir /etc/NetworkManager/dispatcher.d |
765 |
- |
766 |
- # Provide openrc net dependency only when nm is connected |
767 |
- exeinto /etc/NetworkManager/dispatcher.d |
768 |
- newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status |
769 |
- sed -e "s:@EPREFIX@:${EPREFIX}:g" \ |
770 |
- -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die |
771 |
- |
772 |
- keepdir /etc/NetworkManager/system-connections |
773 |
- chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594 |
774 |
- |
775 |
- # Allow users in plugdev group to modify system connections |
776 |
- insinto /usr/share/polkit-1/rules.d/ |
777 |
- doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" |
778 |
-} |
779 |
- |
780 |
-pkg_postinst() { |
781 |
- gnome2_pkg_postinst |
782 |
- ! use systemd && readme.gentoo_print_elog |
783 |
- |
784 |
- if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then |
785 |
- ewarn "The ${PN} system configuration file has moved to a new location." |
786 |
- ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" |
787 |
- ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf" |
788 |
- ewarn |
789 |
- ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf" |
790 |
- fi |
791 |
- |
792 |
- # The polkit rules file moved to /usr/share |
793 |
- old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules" |
794 |
- if [[ -f "${old_rules}" ]]; then |
795 |
- case "$(md5sum ${old_rules})" in |
796 |
- 574d0cfa7e911b1f7792077003060240* ) |
797 |
- # Automatically delete the old rules.d file if the user did not change it |
798 |
- elog |
799 |
- elog "Removing old ${old_rules} ..." |
800 |
- rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" |
801 |
- ;; |
802 |
- * ) |
803 |
- elog "The ${old_rules}" |
804 |
- elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4" |
805 |
- elog "If you edited ${old_rules}" |
806 |
- elog "without changing its behavior, you may want to remove it." |
807 |
- ;; |
808 |
- esac |
809 |
- fi |
810 |
- |
811 |
- # ifnet plugin was disabled for systemd users with 0.9.8.6 version |
812 |
- # and for all people with 0.9.10.0-r1 (see ChangeLog for full explanations) |
813 |
- if use systemd; then |
814 |
- if ! version_is_at_least 0.9.8.6 ${REPLACING_VERSIONS}; then |
815 |
- ewarn "Ifnet plugin won't be used with systemd support enabled" |
816 |
- ewarn "as it is meant to be used with openRC and can cause collisions" |
817 |
- ewarn "(like bug #485658)." |
818 |
- ewarn "Because of this, you will likely need to reconfigure some of" |
819 |
- ewarn "your networks. To do this you can rely on Gnome control center," |
820 |
- ewarn "nm-connection-editor or nmtui tools for example once updated" |
821 |
- ewarn "NetworkManager version is installed." |
822 |
- fi |
823 |
- else |
824 |
- if ! version_is_at_least 0.9.10.0-r1 ${REPLACING_VERSIONS}; then |
825 |
- ewarn "Ifnet plugin is now disabled because of it being unattended" |
826 |
- ewarn "and unmaintained for a long time, leading to some unfixed bugs" |
827 |
- ewarn "and new problems appearing. We will now use upstream 'keyfile'" |
828 |
- ewarn "plugin." |
829 |
- ewarn "Because of this, you will likely need to reconfigure some of" |
830 |
- ewarn "your networks. To do this you can rely on Gnome control center," |
831 |
- ewarn "nm-connection-editor or nmtui tools for example once updated" |
832 |
- ewarn "NetworkManager version is installed." |
833 |
- fi |
834 |
- fi |
835 |
- |
836 |
- # NM fallbacks to plugin specified at compile time (upstream bug #738611) |
837 |
- # but still show a warning to remember people to have cleaner config file |
838 |
- if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then |
839 |
- if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then |
840 |
- ewarn |
841 |
- ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf" |
842 |
- ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." |
843 |
- ewarn |
844 |
- fi |
845 |
- fi |
846 |
- |
847 |
- # NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457 |
848 |
- if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then |
849 |
- ewarn "You have psk-flags=1 setting in above files, you will need to" |
850 |
- ewarn "either reconfigure affected networks or, at least, set the flag" |
851 |
- ewarn "value to '0'." |
852 |
- fi |
853 |
-} |