1 |
commit: e6ed280b1e1d511db29f720f107aa0e84bf3dba5 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 7 09:15:28 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 7 09:49:23 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6ed280b |
7 |
|
8 |
net-misc/networkmanager: bump to 1.12.2, support iwd |
9 |
|
10 |
iwd support is always built with USE=wifi, as net-wireless/iwd |
11 |
itself is not necessary for build due to pure dbus usage. |
12 |
USE=iwd controls whether USE=wifi ensures wpa_supplicant or iwd |
13 |
is present at runtime, and adds a default config snippet to use |
14 |
iwd as wifi.backend instead of wpa_supplicant. |
15 |
As a result, iwd and wpa_supplicant can be used interchangably |
16 |
with configuration overrides in /etc, despite what NM iwd USE |
17 |
setting was on the install, as long as USE=wifi was enabled; but |
18 |
a choice based default is ensured to be working in lack of overrides. |
19 |
|
20 |
Also remove unused versionator and toolchain-funcs inherits and |
21 |
add now needed glib-utils build dep directly for glib migration |
22 |
to that. |
23 |
|
24 |
Closes: https://bugs.gentoo.org/661278 |
25 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
26 |
|
27 |
net-misc/networkmanager/Manifest | 2 + |
28 |
net-misc/networkmanager/metadata.xml | 5 +- |
29 |
.../networkmanager/networkmanager-1.12.2.ebuild | 341 +++++++++++++++++++++ |
30 |
profiles/arch/amd64/package.use.mask | 1 + |
31 |
profiles/arch/base/package.use.mask | 1 + |
32 |
profiles/arch/x86/package.use.mask | 1 + |
33 |
6 files changed, 349 insertions(+), 2 deletions(-) |
34 |
|
35 |
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest |
36 |
index a2cc516d288..2ea3f1ed390 100644 |
37 |
--- a/net-misc/networkmanager/Manifest |
38 |
+++ b/net-misc/networkmanager/Manifest |
39 |
@@ -1,4 +1,6 @@ |
40 |
DIST NetworkManager-1.10.10.tar.xz 4038552 BLAKE2B a0a3c2a74dd641d25267ec7932f0801e30720334cb905c86abfaeb9bc3c60a2c1e9372b738b1eb43c55a34edf952905d94e3513cef653ea62e470d56bc575b65 SHA512 e536598b19064e0ab7fe3e92362de9c380281ff53a1481438216c2247b2d5287244e735be41c56c53040a5861bf36bbb979e36578244fabd6448a50ea42c4645 |
41 |
DIST NetworkManager-1.10.6.tar.xz 4029656 BLAKE2B 0fa99dbb54c3f51755329f229f941e408d883aeff24bbcf0f9df143544190ab59ed5742caca42ea7cced949de0891ecc148394fbff1b9cd87b26c3a84f2a728e SHA512 8406ed561efff13b63dc218babdd2ad9e2816bcc829ba3ef2ce942bb5fa027640de28660381203016fa9cddb61412d3cd5102b7cbd29d0e284b5cb8d13dd8610 |
42 |
+DIST NetworkManager-1.12.2.tar.xz 4193776 BLAKE2B bc2b55f33e85dc8381eb18148cef02059e96abe1863da35af2b8f5671e3b2a4296eb1f9b79d864f3d0e6b362f7dbebdea4518a96d255acda9141b9ae95b49038 SHA512 cf5dae6ca8b6d3819a79485082f959907213d43413d15c41b79eb7da40edb913a41e7c18586b14bbf84f30ac493e2d9d466f5e66130c636f041ce939aaf49f35 |
43 |
DIST NetworkManager-1.4.4.tar.xz 3762664 BLAKE2B 430f5a15540c43d067c27927b627ecb1c7935f42566e9b14b82b6f70cf7dae3ed7398bb45647911e91d8ce14558b1eccc0f6ffa97eae852dd524219dcc536a90 SHA512 a73e423e88b0e2694a46dc04f492a656d766796aa987b2e4644147a5939a6fdeb22ff5d8b36c723444bc0ab3d8740b80fa82c2f5e07f073998841695978d6e14 |
44 |
DIST NetworkManager-1.8.4.tar.xz 3821500 BLAKE2B 7db1c95af5b8006cd3b7e1d960f9763c05caf5aadcc139bbe349a12ef996821afc38250afe4b078fd4d1953be19c1f16c6813562c5f4792e6c17f28ee0521c06 SHA512 e9aa26e2abe4537c6cbba53e281493e32be8a9f0624d5323212848f286d1279ad2ab79a39de34ad0ea188c888b1b61c4ba4d4d053c4d227e68f9236955f69bb1 |
45 |
+DIST networkmanager-1.12.2-patchset.tar.xz 4944 BLAKE2B 3ab6e395b4e13fd019fbcf851286f1cc8a08eff9d93891174c19949efe10390c69d9aaf6cdbe81f33503ec96838eb001eda67f6d1da034195327e172527cd72b SHA512 bdb22c42a8c53dce2f81ecfd026685240c8b790c44b0f13767ccfa0834cb2edec61ade69c828fb21c54ad3d37412e89b15f1fff4a98577a5bea460ba78d43bc3 |
46 |
|
47 |
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml |
48 |
index a6c3ffe1326..d2f41613703 100644 |
49 |
--- a/net-misc/networkmanager/metadata.xml |
50 |
+++ b/net-misc/networkmanager/metadata.xml |
51 |
@@ -14,6 +14,8 @@ |
52 |
getting ip</flag> |
53 |
<flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting ip</flag> |
54 |
<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag> |
55 |
+ <flag name="iwd">Use <pkg>net-wireless/iwd</pkg> instead of |
56 |
+ <pkg>net-wireless/wpa_supplicant</pkg> for wifi support by default</flag> |
57 |
<flag name="json">Enable JSON validation via <pkg>dev-libs/jansson</pkg> |
58 |
in libnm.</flag> |
59 |
<flag name="modemmanager">Enable support for mobile broadband devices |
60 |
@@ -26,8 +28,7 @@ |
61 |
<flag name="resolvconf">Use <pkg>net-dns/openresolv</pkg> for managing |
62 |
DNS information</flag> |
63 |
<flag name="teamd">Enable Teamd control support</flag> |
64 |
- <flag name="wifi">Enable support for wifi and 802.1x security using |
65 |
- <pkg>net-wireless/wpa_supplicant</pkg></flag> |
66 |
+ <flag name="wifi">Enable support for wifi and 802.1x security</flag> |
67 |
<flag name="wext">Enable support for the deprecated Wext (Wireless |
68 |
Extensions) API; needed for some older drivers (e.g. ipw2200, |
69 |
ndiswrapper)</flag> |
70 |
|
71 |
diff --git a/net-misc/networkmanager/networkmanager-1.12.2.ebuild b/net-misc/networkmanager/networkmanager-1.12.2.ebuild |
72 |
new file mode 100644 |
73 |
index 00000000000..cdfd87acdf7 |
74 |
--- /dev/null |
75 |
+++ b/net-misc/networkmanager/networkmanager-1.12.2.ebuild |
76 |
@@ -0,0 +1,341 @@ |
77 |
+# Copyright 1999-2018 Gentoo Foundation |
78 |
+# Distributed under the terms of the GNU General Public License v2 |
79 |
+ |
80 |
+EAPI=6 |
81 |
+GNOME_ORG_MODULE="NetworkManager" |
82 |
+GNOME2_LA_PUNT="yes" |
83 |
+VALA_USE_DEPEND="vapigen" |
84 |
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
85 |
+ |
86 |
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \ |
87 |
+ user readme.gentoo-r1 vala virtualx udev multilib-minimal |
88 |
+ |
89 |
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" |
90 |
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" |
91 |
+SRC_URI="${SRC_URI} https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" |
92 |
+ |
93 |
+LICENSE="GPL-2+" |
94 |
+SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version |
95 |
+ |
96 |
+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" |
97 |
+ |
98 |
+REQUIRED_USE=" |
99 |
+ iwd? ( wifi ) |
100 |
+ modemmanager? ( ppp ) |
101 |
+ vala? ( introspection ) |
102 |
+ wext? ( wifi ) |
103 |
+ ^^ ( nss gnutls ) |
104 |
+ ?? ( consolekit elogind systemd ) |
105 |
+" |
106 |
+ |
107 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
108 |
+ |
109 |
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300 |
110 |
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 |
111 |
+COMMON_DEPEND=" |
112 |
+ >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}] |
113 |
+ >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}] |
114 |
+ >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] |
115 |
+ policykit? ( >=sys-auth/polkit-0.106 ) |
116 |
+ net-libs/libndp[${MULTILIB_USEDEP}] |
117 |
+ >=net-misc/curl-7.24 |
118 |
+ net-misc/iputils |
119 |
+ sys-apps/util-linux[${MULTILIB_USEDEP}] |
120 |
+ sys-libs/readline:0= |
121 |
+ >=virtual/libudev-175:=[${MULTILIB_USEDEP}] |
122 |
+ audit? ( sys-process/audit ) |
123 |
+ bluetooth? ( >=net-wireless/bluez-5 ) |
124 |
+ connection-sharing? ( |
125 |
+ net-dns/dnsmasq[dbus,dhcp] |
126 |
+ net-firewall/iptables ) |
127 |
+ consolekit? ( >=sys-auth/consolekit-1.0.0 ) |
128 |
+ dhclient? ( >=net-misc/dhcp-4[client] ) |
129 |
+ dhcpcd? ( net-misc/dhcpcd ) |
130 |
+ elogind? ( >=sys-auth/elogind-219 ) |
131 |
+ gnutls? ( |
132 |
+ dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] |
133 |
+ >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) |
134 |
+ introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) |
135 |
+ json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] ) |
136 |
+ modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) |
137 |
+ ncurses? ( >=dev-libs/newt-0.52.15 ) |
138 |
+ nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) |
139 |
+ ofono? ( net-misc/ofono ) |
140 |
+ ovs? ( dev-libs/jansson ) |
141 |
+ ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) |
142 |
+ resolvconf? ( net-dns/openresolv ) |
143 |
+ selinux? ( sys-libs/libselinux ) |
144 |
+ systemd? ( >=sys-apps/systemd-209:0= ) |
145 |
+ teamd? ( |
146 |
+ dev-libs/jansson |
147 |
+ >=net-misc/libteam-1.9 |
148 |
+ ) |
149 |
+" |
150 |
+RDEPEND="${COMMON_DEPEND} |
151 |
+ || ( |
152 |
+ net-misc/iputils[arping(+)] |
153 |
+ net-analyzer/arping |
154 |
+ ) |
155 |
+ wifi? ( |
156 |
+ !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) |
157 |
+ iwd? ( net-wireless/iwd ) |
158 |
+ ) |
159 |
+" |
160 |
+DEPEND="${COMMON_DEPEND} |
161 |
+ dev-util/gdbus-codegen |
162 |
+ dev-util/glib-utils |
163 |
+ dev-util/gtk-doc-am |
164 |
+ >=dev-util/intltool-0.40 |
165 |
+ >=sys-devel/gettext-0.17 |
166 |
+ >=sys-kernel/linux-headers-2.6.29 |
167 |
+ virtual/pkgconfig[${MULTILIB_USEDEP}] |
168 |
+ introspection? ( |
169 |
+ $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') |
170 |
+ dev-lang/perl |
171 |
+ dev-libs/libxslt |
172 |
+ ) |
173 |
+ vala? ( $(vala_depend) ) |
174 |
+ test? ( |
175 |
+ $(python_gen_any_dep ' |
176 |
+ dev-python/dbus-python[${PYTHON_USEDEP}] |
177 |
+ dev-python/pygobject:3[${PYTHON_USEDEP}]') |
178 |
+ ) |
179 |
+" |
180 |
+ |
181 |
+PATCHES=( "${WORKDIR}"/patches/ ) # Selective patches from nm-1-12 branch, most importantly fix for NM_AVAILABLE_IN_1_12_2 macro, otherwise nm-applet and co fail to compile |
182 |
+ |
183 |
+python_check_deps() { |
184 |
+ if use introspection; then |
185 |
+ has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return |
186 |
+ fi |
187 |
+ if use test; then |
188 |
+ has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && |
189 |
+ has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" |
190 |
+ fi |
191 |
+} |
192 |
+ |
193 |
+sysfs_deprecated_check() { |
194 |
+ ebegin "Checking for SYSFS_DEPRECATED support" |
195 |
+ |
196 |
+ if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then |
197 |
+ eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" |
198 |
+ eerror "or NetworkManager will not work correctly." |
199 |
+ eerror "See https://bugs.gentoo.org/333639 for more info." |
200 |
+ die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" |
201 |
+ fi |
202 |
+ eend $? |
203 |
+} |
204 |
+ |
205 |
+pkg_pretend() { |
206 |
+ if use kernel_linux; then |
207 |
+ get_version |
208 |
+ if linux_config_exists; then |
209 |
+ sysfs_deprecated_check |
210 |
+ else |
211 |
+ ewarn "Was unable to determine your kernel .config" |
212 |
+ ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." |
213 |
+ ewarn "See https://bugs.gentoo.org/333639 for more info." |
214 |
+ fi |
215 |
+ |
216 |
+ fi |
217 |
+} |
218 |
+ |
219 |
+pkg_setup() { |
220 |
+ if use connection-sharing; then |
221 |
+ CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4" |
222 |
+ linux-info_pkg_setup |
223 |
+ fi |
224 |
+ enewgroup plugdev |
225 |
+ if use introspection || use test; then |
226 |
+ python-any-r1_pkg_setup |
227 |
+ fi |
228 |
+} |
229 |
+ |
230 |
+src_prepare() { |
231 |
+ DOC_CONTENTS="To modify system network connections without needing to enter the |
232 |
+ root password, add your user account to the 'plugdev' group." |
233 |
+ |
234 |
+ use vala && vala_src_prepare |
235 |
+ gnome2_src_prepare |
236 |
+} |
237 |
+ |
238 |
+multilib_src_configure() { |
239 |
+ local myconf=( |
240 |
+ --disable-more-warnings |
241 |
+ --disable-static |
242 |
+ --localstatedir=/var |
243 |
+ --disable-lto |
244 |
+ --disable-config-plugin-ibft |
245 |
+ --disable-qt |
246 |
+ --without-netconfig |
247 |
+ --with-dbus-sys-dir=/etc/dbus-1/system.d |
248 |
+ # We need --with-libnm-glib (and dbus-glib dep) as reverse deps are |
249 |
+ # still not ready for removing that lib, bug #665338 |
250 |
+ --with-libnm-glib |
251 |
+ --with-nmcli=yes |
252 |
+ --with-udev-dir="$(get_udevdir)" |
253 |
+ --with-config-plugins-default=keyfile |
254 |
+ --with-iptables=/sbin/iptables |
255 |
+ $(multilib_native_enable concheck) |
256 |
+ --with-crypto=$(usex nss nss gnutls) |
257 |
+ --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no))) |
258 |
+ --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) |
259 |
+ $(multilib_native_use_with audit libaudit) |
260 |
+ $(multilib_native_use_enable bluetooth bluez5-dun) |
261 |
+ $(use_with dhclient) |
262 |
+ $(use_with dhcpcd) |
263 |
+ $(multilib_native_use_enable introspection) |
264 |
+ $(use_enable json json-validation) |
265 |
+ $(multilib_native_use_enable ppp) |
266 |
+ --without-libpsl |
267 |
+ $(multilib_native_use_with modemmanager modem-manager-1) |
268 |
+ $(multilib_native_use_with ncurses nmtui) |
269 |
+ $(multilib_native_use_with ofono) |
270 |
+ $(multilib_native_use_enable ovs) |
271 |
+ $(multilib_native_use_with resolvconf) |
272 |
+ $(multilib_native_use_with selinux) |
273 |
+ $(multilib_native_use_with systemd systemd-journal) |
274 |
+ $(multilib_native_use_enable teamd teamdctl) |
275 |
+ $(multilib_native_use_enable test tests) |
276 |
+ $(multilib_native_use_enable vala) |
277 |
+ --without-valgrind |
278 |
+ $(multilib_native_use_with wifi iwd) |
279 |
+ $(multilib_native_use_with wext) |
280 |
+ $(multilib_native_use_enable wifi) |
281 |
+ ) |
282 |
+ |
283 |
+ if multilib_is_native_abi && use policykit; then |
284 |
+ myconf+=( --enable-polkit=yes ) |
285 |
+ else |
286 |
+ myconf+=( --enable-polkit=disabled ) |
287 |
+ fi |
288 |
+ |
289 |
+ # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 |
290 |
+ if use ppp; then |
291 |
+ local PPPD_VER=`best_version net-dialup/ppp` |
292 |
+ PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} |
293 |
+ PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision |
294 |
+ myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) |
295 |
+ fi |
296 |
+ |
297 |
+ # unit files directory needs to be passed only when systemd is enabled, |
298 |
+ # otherwise systemd support is not disabled completely, bug #524534 |
299 |
+ use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) |
300 |
+ |
301 |
+ if multilib_is_native_abi; then |
302 |
+ # work-around man out-of-source brokenness, must be done before configure |
303 |
+ ln -s "${S}/docs" docs || die |
304 |
+ ln -s "${S}/man" man || die |
305 |
+ fi |
306 |
+ |
307 |
+ ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}" |
308 |
+} |
309 |
+ |
310 |
+multilib_src_compile() { |
311 |
+ if multilib_is_native_abi; then |
312 |
+ emake |
313 |
+ else |
314 |
+ local targets=( |
315 |
+ libnm/libnm.la |
316 |
+ libnm-util/libnm-util.la |
317 |
+ libnm-glib/libnm-glib.la |
318 |
+ libnm-glib/libnm-glib-vpn.la |
319 |
+ ) |
320 |
+ emake "${targets[@]}" |
321 |
+ fi |
322 |
+} |
323 |
+ |
324 |
+multilib_src_test() { |
325 |
+ if use test && multilib_is_native_abi; then |
326 |
+ python_setup |
327 |
+ virtx emake check |
328 |
+ fi |
329 |
+} |
330 |
+ |
331 |
+multilib_src_install() { |
332 |
+ if multilib_is_native_abi; then |
333 |
+ # Install completions at proper place, bug #465100 |
334 |
+ gnome2_src_install completiondir="$(get_bashcompdir)" |
335 |
+ else |
336 |
+ local targets=( |
337 |
+ install-libLTLIBRARIES |
338 |
+ install-libdeprecatedHEADERS |
339 |
+ install-libnm_glib_libnmvpnHEADERS |
340 |
+ install-libnm_glib_libnmincludeHEADERS |
341 |
+ install-libnm_util_libnm_util_includeHEADERS |
342 |
+ install-libnmincludeHEADERS |
343 |
+ install-nodist_libnm_glib_libnmincludeHEADERS |
344 |
+ install-nodist_libnm_glib_libnmvpnHEADERS |
345 |
+ install-nodist_libnm_util_libnm_util_includeHEADERS |
346 |
+ install-nodist_libnmincludeHEADERS |
347 |
+ install-pkgconfigDATA |
348 |
+ ) |
349 |
+ emake DESTDIR="${D}" "${targets[@]}" |
350 |
+ fi |
351 |
+} |
352 |
+ |
353 |
+multilib_src_install_all() { |
354 |
+ ! use systemd && readme.gentoo_create_doc |
355 |
+ |
356 |
+ newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager |
357 |
+ newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager |
358 |
+ |
359 |
+ # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts |
360 |
+ keepdir /etc/NetworkManager/dispatcher.d |
361 |
+ |
362 |
+ # Provide openrc net dependency only when nm is connected |
363 |
+ exeinto /etc/NetworkManager/dispatcher.d |
364 |
+ newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status |
365 |
+ sed -e "s:@EPREFIX@:${EPREFIX}:g" \ |
366 |
+ -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die |
367 |
+ |
368 |
+ keepdir /etc/NetworkManager/system-connections |
369 |
+ chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594 |
370 |
+ |
371 |
+ # Allow users in plugdev group to modify system connections |
372 |
+ insinto /usr/share/polkit-1/rules.d/ |
373 |
+ doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" |
374 |
+ |
375 |
+ if use iwd; then |
376 |
+ # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir |
377 |
+ cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf |
378 |
+ [device] |
379 |
+ wifi.backend=iwd |
380 |
+ EOF |
381 |
+ fi |
382 |
+ |
383 |
+ # Empty |
384 |
+ rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die |
385 |
+} |
386 |
+ |
387 |
+pkg_postinst() { |
388 |
+ gnome2_pkg_postinst |
389 |
+ systemd_reenable NetworkManager.service |
390 |
+ ! use systemd && readme.gentoo_print_elog |
391 |
+ |
392 |
+ if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then |
393 |
+ ewarn "The ${PN} system configuration file has moved to a new location." |
394 |
+ ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" |
395 |
+ ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf" |
396 |
+ ewarn |
397 |
+ ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf" |
398 |
+ fi |
399 |
+ |
400 |
+ # NM fallbacks to plugin specified at compile time (upstream bug #738611) |
401 |
+ # but still show a warning to remember people to have cleaner config file |
402 |
+ if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then |
403 |
+ if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then |
404 |
+ ewarn |
405 |
+ ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf" |
406 |
+ ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." |
407 |
+ ewarn |
408 |
+ fi |
409 |
+ fi |
410 |
+ |
411 |
+ # NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457 |
412 |
+ if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then |
413 |
+ ewarn "You have psk-flags=1 setting in above files, you will need to" |
414 |
+ ewarn "either reconfigure affected networks or, at least, set the flag" |
415 |
+ ewarn "value to '0'." |
416 |
+ fi |
417 |
+} |
418 |
|
419 |
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask |
420 |
index 3de9fb1595e..9f896a204d6 100644 |
421 |
--- a/profiles/arch/amd64/package.use.mask |
422 |
+++ b/profiles/arch/amd64/package.use.mask |
423 |
@@ -20,6 +20,7 @@ |
424 |
# Ben Kohler <bkohler@g.o> (23 Aug 2018) |
425 |
# Unmask iwd support where net-wireless/iwd is keyworded |
426 |
net-misc/connman -iwd |
427 |
+net-misc/networkmanager -iwd |
428 |
|
429 |
# Thomas Deutschmann <whissi@g.o> (23 Aug 2018) |
430 |
# Dependency sys-cluster/ceph is keyworded for amd64 |
431 |
|
432 |
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask |
433 |
index 289a5dd245f..de2c0398d35 100644 |
434 |
--- a/profiles/arch/base/package.use.mask |
435 |
+++ b/profiles/arch/base/package.use.mask |
436 |
@@ -4,6 +4,7 @@ |
437 |
# Ben Kohler <bkohler@g.o> (23 Aug 2018) |
438 |
# Mask iwd support until net-wireless/iwd is keyworded |
439 |
net-misc/connman iwd |
440 |
+net-misc/networkmanager iwd |
441 |
|
442 |
# Rick Farina <zerochaos@g.o> (27 Jun 2018) |
443 |
# Catalyst only has support for assembling bootloader on some arches |
444 |
|
445 |
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask |
446 |
index 92cbc9ba5fd..89f51899898 100644 |
447 |
--- a/profiles/arch/x86/package.use.mask |
448 |
+++ b/profiles/arch/x86/package.use.mask |
449 |
@@ -15,6 +15,7 @@ media-video/vlc aom aribsub |
450 |
# Ben Kohler <bkohler@g.o> (23 Aug 2018) |
451 |
# Unmask iwd support where net-wireless/iwd is keyworded |
452 |
net-misc/connman -iwd |
453 |
+net-misc/networkmanager -iwd |
454 |
|
455 |
# Thomas Deutschmann <whissi@g.o> (23 Aug 2018) |
456 |
# Dependency sys-cluster/ceph is keyworded for x86 |