1 |
commit: 309b556f943089607f5999e740fd979c467a6ffd |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Oct 24 15:49:47 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 24 16:17:13 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=309b556f |
7 |
|
8 |
net-misc/networkmanager: bump to 1.14.4 for various crash fixes |
9 |
|
10 |
Also fix docs installation |
11 |
|
12 |
Closes: https://bugs.gentoo.org/669432 |
13 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
14 |
Package-Manager: Portage-2.3.49, Repoman-2.3.11 |
15 |
|
16 |
net-misc/networkmanager/Manifest | 1 + |
17 |
.../networkmanager/networkmanager-1.14.4.ebuild | 339 +++++++++++++++++++++ |
18 |
2 files changed, 340 insertions(+) |
19 |
|
20 |
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest |
21 |
index 96f550bf5a6..85b1534e590 100644 |
22 |
--- a/net-misc/networkmanager/Manifest |
23 |
+++ b/net-misc/networkmanager/Manifest |
24 |
@@ -2,4 +2,5 @@ DIST NetworkManager-1.10.10.tar.xz 4038552 BLAKE2B a0a3c2a74dd641d25267ec7932f08 |
25 |
DIST NetworkManager-1.12.4.tar.xz 4195812 BLAKE2B 11c59da430cdf6f70cc841d980e0bc0280244a1a1ee52311946f27c1f61ae23b14e115caba02c80738ef35d67eab6f1fadc1a0dee3250510d05fd1e90aed5ac1 SHA512 6fc891a6f8c3b4cc43449dabf0c025a9e706b723f602085f34cc93bda885c300de293004390c4926b95e26201b86d97ecd23160f82ef03e4d2b680f822c827c3 |
26 |
DIST NetworkManager-1.14.0.tar.xz 4389692 BLAKE2B 1d1b12764503d5f56d27f11449f3a0149491887312ed735c5cd25c0eeb6928fead30544d32cdd65262e00c4bdaed55dfb6dbc731c82de41ff8c49ff85937211e SHA512 cb0add2585c586ad36b4fb986a654de30047dc77f038927437156227f42622ac1045c58b76573f4e1acef22aa9f695da417f392a50fde70f4a086504701cecf1 |
27 |
DIST NetworkManager-1.14.2.tar.xz 4415068 BLAKE2B e33d385f907feb6ca7cae51aaa4a0c64e9f33d7f3c9ba11ca19ba71d0d9f1f9b05ab99eb10debb65d4d0bf9d76be7d1610d23dfe84a2718be353725d8d0a7c70 SHA512 f2c45138daf8124704d4f8ee3966da8a2b6c9a18bc51332d19c36d6d5bbd795c6f85f182c7816604fa5e8be7e6ee1daa62b26a868b731e7bc4d4b72e543d3646 |
28 |
+DIST NetworkManager-1.14.4.tar.xz 4414196 BLAKE2B 31b236ee143892725cccccfe26a83bc75f938e19f52c5d09fb6ea3635f517feb5bab428eec4ee5e617920a8a8dd6bfe72bf9b760ecf16dec0bac4bb8663c58e4 SHA512 4199d6d7bbbee318b0f69cf2c1bf46cc3721c764121634751753c3cc833c4c5ac0856467896536e3d403ba8783fe452aaa79bfcd71a5ec324a4274989fb656c7 |
29 |
DIST NetworkManager-1.8.4.tar.xz 3821500 BLAKE2B 7db1c95af5b8006cd3b7e1d960f9763c05caf5aadcc139bbe349a12ef996821afc38250afe4b078fd4d1953be19c1f16c6813562c5f4792e6c17f28ee0521c06 SHA512 e9aa26e2abe4537c6cbba53e281493e32be8a9f0624d5323212848f286d1279ad2ab79a39de34ad0ea188c888b1b61c4ba4d4d053c4d227e68f9236955f69bb1 |
30 |
|
31 |
diff --git a/net-misc/networkmanager/networkmanager-1.14.4.ebuild b/net-misc/networkmanager/networkmanager-1.14.4.ebuild |
32 |
new file mode 100644 |
33 |
index 00000000000..eeae52d8bd2 |
34 |
--- /dev/null |
35 |
+++ b/net-misc/networkmanager/networkmanager-1.14.4.ebuild |
36 |
@@ -0,0 +1,339 @@ |
37 |
+# Copyright 1999-2018 Gentoo Authors |
38 |
+# Distributed under the terms of the GNU General Public License v2 |
39 |
+ |
40 |
+EAPI=6 |
41 |
+GNOME_ORG_MODULE="NetworkManager" |
42 |
+GNOME2_LA_PUNT="yes" |
43 |
+VALA_USE_DEPEND="vapigen" |
44 |
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) |
45 |
+ |
46 |
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \ |
47 |
+ user readme.gentoo-r1 vala virtualx udev multilib-minimal |
48 |
+ |
49 |
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" |
50 |
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" |
51 |
+ |
52 |
+LICENSE="GPL-2+" |
53 |
+SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version |
54 |
+ |
55 |
+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" |
56 |
+ |
57 |
+REQUIRED_USE=" |
58 |
+ iwd? ( wifi ) |
59 |
+ modemmanager? ( ppp ) |
60 |
+ vala? ( introspection ) |
61 |
+ wext? ( wifi ) |
62 |
+ ^^ ( nss gnutls ) |
63 |
+ ?? ( consolekit elogind systemd ) |
64 |
+" |
65 |
+ |
66 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
67 |
+ |
68 |
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300 |
69 |
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 |
70 |
+COMMON_DEPEND=" |
71 |
+ >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}] |
72 |
+ >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}] |
73 |
+ >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] |
74 |
+ policykit? ( >=sys-auth/polkit-0.106 ) |
75 |
+ net-libs/libndp[${MULTILIB_USEDEP}] |
76 |
+ >=net-misc/curl-7.24 |
77 |
+ net-misc/iputils |
78 |
+ sys-apps/util-linux[${MULTILIB_USEDEP}] |
79 |
+ sys-libs/readline:0= |
80 |
+ >=virtual/libudev-175:=[${MULTILIB_USEDEP}] |
81 |
+ audit? ( sys-process/audit ) |
82 |
+ bluetooth? ( >=net-wireless/bluez-5 ) |
83 |
+ connection-sharing? ( |
84 |
+ net-dns/dnsmasq[dbus,dhcp] |
85 |
+ net-firewall/iptables ) |
86 |
+ consolekit? ( >=sys-auth/consolekit-1.0.0 ) |
87 |
+ dhclient? ( >=net-misc/dhcp-4[client] ) |
88 |
+ dhcpcd? ( net-misc/dhcpcd ) |
89 |
+ elogind? ( >=sys-auth/elogind-219 ) |
90 |
+ gnutls? ( |
91 |
+ dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] |
92 |
+ >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) |
93 |
+ introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) |
94 |
+ json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] ) |
95 |
+ modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) |
96 |
+ ncurses? ( >=dev-libs/newt-0.52.15 ) |
97 |
+ nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) |
98 |
+ ofono? ( net-misc/ofono ) |
99 |
+ ovs? ( dev-libs/jansson ) |
100 |
+ ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) |
101 |
+ resolvconf? ( net-dns/openresolv ) |
102 |
+ selinux? ( sys-libs/libselinux ) |
103 |
+ systemd? ( >=sys-apps/systemd-209:0= ) |
104 |
+ teamd? ( |
105 |
+ dev-libs/jansson |
106 |
+ >=net-misc/libteam-1.9 |
107 |
+ ) |
108 |
+" |
109 |
+RDEPEND="${COMMON_DEPEND} |
110 |
+ || ( |
111 |
+ net-misc/iputils[arping(+)] |
112 |
+ net-analyzer/arping |
113 |
+ ) |
114 |
+ wifi? ( |
115 |
+ !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) |
116 |
+ iwd? ( net-wireless/iwd ) |
117 |
+ ) |
118 |
+" |
119 |
+DEPEND="${COMMON_DEPEND} |
120 |
+ dev-util/gdbus-codegen |
121 |
+ dev-util/glib-utils |
122 |
+ dev-util/gtk-doc-am |
123 |
+ >=dev-util/intltool-0.40 |
124 |
+ >=sys-devel/gettext-0.17 |
125 |
+ >=sys-kernel/linux-headers-2.6.29 |
126 |
+ virtual/pkgconfig[${MULTILIB_USEDEP}] |
127 |
+ introspection? ( |
128 |
+ $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') |
129 |
+ dev-lang/perl |
130 |
+ dev-libs/libxslt |
131 |
+ ) |
132 |
+ vala? ( $(vala_depend) ) |
133 |
+ test? ( |
134 |
+ $(python_gen_any_dep ' |
135 |
+ dev-python/dbus-python[${PYTHON_USEDEP}] |
136 |
+ dev-python/pygobject:3[${PYTHON_USEDEP}]') |
137 |
+ ) |
138 |
+" |
139 |
+ |
140 |
+python_check_deps() { |
141 |
+ if use introspection; then |
142 |
+ has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return |
143 |
+ fi |
144 |
+ if use test; then |
145 |
+ has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && |
146 |
+ has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" |
147 |
+ fi |
148 |
+} |
149 |
+ |
150 |
+sysfs_deprecated_check() { |
151 |
+ ebegin "Checking for SYSFS_DEPRECATED support" |
152 |
+ |
153 |
+ if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then |
154 |
+ eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" |
155 |
+ eerror "or NetworkManager will not work correctly." |
156 |
+ eerror "See https://bugs.gentoo.org/333639 for more info." |
157 |
+ die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" |
158 |
+ fi |
159 |
+ eend $? |
160 |
+} |
161 |
+ |
162 |
+pkg_pretend() { |
163 |
+ if use kernel_linux; then |
164 |
+ get_version |
165 |
+ if linux_config_exists; then |
166 |
+ sysfs_deprecated_check |
167 |
+ else |
168 |
+ ewarn "Was unable to determine your kernel .config" |
169 |
+ ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." |
170 |
+ ewarn "See https://bugs.gentoo.org/333639 for more info." |
171 |
+ fi |
172 |
+ |
173 |
+ fi |
174 |
+} |
175 |
+ |
176 |
+pkg_setup() { |
177 |
+ if use connection-sharing; then |
178 |
+ CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4" |
179 |
+ linux-info_pkg_setup |
180 |
+ fi |
181 |
+ enewgroup plugdev |
182 |
+ if use introspection || use test; then |
183 |
+ python-any-r1_pkg_setup |
184 |
+ fi |
185 |
+} |
186 |
+ |
187 |
+src_prepare() { |
188 |
+ DOC_CONTENTS="To modify system network connections without needing to enter the |
189 |
+ root password, add your user account to the 'plugdev' group." |
190 |
+ |
191 |
+ use vala && vala_src_prepare |
192 |
+ gnome2_src_prepare |
193 |
+} |
194 |
+ |
195 |
+multilib_src_configure() { |
196 |
+ local myconf=( |
197 |
+ --disable-more-warnings |
198 |
+ --disable-static |
199 |
+ --localstatedir=/var |
200 |
+ --disable-lto |
201 |
+ --disable-config-plugin-ibft |
202 |
+ --disable-qt |
203 |
+ --without-netconfig |
204 |
+ --with-dbus-sys-dir=/etc/dbus-1/system.d |
205 |
+ # We need --with-libnm-glib (and dbus-glib dep) as reverse deps are |
206 |
+ # still not ready for removing that lib, bug #665338 |
207 |
+ --with-libnm-glib |
208 |
+ --with-nmcli=yes |
209 |
+ --with-udev-dir="$(get_udevdir)" |
210 |
+ --with-config-plugins-default=keyfile |
211 |
+ --with-iptables=/sbin/iptables |
212 |
+ $(multilib_native_enable concheck) |
213 |
+ --with-crypto=$(usex nss nss gnutls) |
214 |
+ --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no))) |
215 |
+ --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) |
216 |
+ $(multilib_native_use_with audit libaudit) |
217 |
+ $(multilib_native_use_enable bluetooth bluez5-dun) |
218 |
+ $(use_with dhclient) |
219 |
+ $(use_with dhcpcd) |
220 |
+ $(multilib_native_use_enable introspection) |
221 |
+ $(use_enable json json-validation) |
222 |
+ $(multilib_native_use_enable ppp) |
223 |
+ --without-libpsl |
224 |
+ $(multilib_native_use_with modemmanager modem-manager-1) |
225 |
+ $(multilib_native_use_with ncurses nmtui) |
226 |
+ $(multilib_native_use_with ofono) |
227 |
+ $(multilib_native_use_enable ovs) |
228 |
+ $(multilib_native_use_with resolvconf) |
229 |
+ $(multilib_native_use_with selinux) |
230 |
+ $(multilib_native_use_with systemd systemd-journal) |
231 |
+ $(multilib_native_use_enable teamd teamdctl) |
232 |
+ $(multilib_native_use_enable test tests) |
233 |
+ $(multilib_native_use_enable vala) |
234 |
+ --without-valgrind |
235 |
+ $(multilib_native_use_with wifi iwd) |
236 |
+ $(multilib_native_use_with wext) |
237 |
+ $(multilib_native_use_enable wifi) |
238 |
+ ) |
239 |
+ |
240 |
+ if multilib_is_native_abi && use policykit; then |
241 |
+ myconf+=( --enable-polkit=yes ) |
242 |
+ else |
243 |
+ myconf+=( --enable-polkit=disabled ) |
244 |
+ fi |
245 |
+ |
246 |
+ # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 |
247 |
+ if use ppp; then |
248 |
+ local PPPD_VER=`best_version net-dialup/ppp` |
249 |
+ PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} |
250 |
+ PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision |
251 |
+ myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) |
252 |
+ fi |
253 |
+ |
254 |
+ # unit files directory needs to be passed only when systemd is enabled, |
255 |
+ # otherwise systemd support is not disabled completely, bug #524534 |
256 |
+ use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) |
257 |
+ |
258 |
+ if multilib_is_native_abi; then |
259 |
+ # work-around man out-of-source brokenness, must be done before configure |
260 |
+ ln -s "${S}/docs" docs || die |
261 |
+ ln -s "${S}/man" man || die |
262 |
+ fi |
263 |
+ |
264 |
+ ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}" |
265 |
+} |
266 |
+ |
267 |
+multilib_src_compile() { |
268 |
+ if multilib_is_native_abi; then |
269 |
+ emake |
270 |
+ else |
271 |
+ local targets=( |
272 |
+ libnm/libnm.la |
273 |
+ libnm-util/libnm-util.la |
274 |
+ libnm-glib/libnm-glib.la |
275 |
+ libnm-glib/libnm-glib-vpn.la |
276 |
+ ) |
277 |
+ emake "${targets[@]}" |
278 |
+ fi |
279 |
+} |
280 |
+ |
281 |
+multilib_src_test() { |
282 |
+ if use test && multilib_is_native_abi; then |
283 |
+ python_setup |
284 |
+ virtx emake check |
285 |
+ fi |
286 |
+} |
287 |
+ |
288 |
+multilib_src_install() { |
289 |
+ if multilib_is_native_abi; then |
290 |
+ # Install completions at proper place, bug #465100 |
291 |
+ gnome2_src_install completiondir="$(get_bashcompdir)" |
292 |
+ else |
293 |
+ local targets=( |
294 |
+ install-libLTLIBRARIES |
295 |
+ install-libdeprecatedHEADERS |
296 |
+ install-libnm_glib_libnmvpnHEADERS |
297 |
+ install-libnm_glib_libnmincludeHEADERS |
298 |
+ install-libnm_util_libnm_util_includeHEADERS |
299 |
+ install-libnmincludeHEADERS |
300 |
+ install-nodist_libnm_glib_libnmincludeHEADERS |
301 |
+ install-nodist_libnm_glib_libnmvpnHEADERS |
302 |
+ install-nodist_libnm_util_libnm_util_includeHEADERS |
303 |
+ install-nodist_libnmincludeHEADERS |
304 |
+ install-pkgconfigDATA |
305 |
+ ) |
306 |
+ emake DESTDIR="${D}" "${targets[@]}" |
307 |
+ fi |
308 |
+} |
309 |
+ |
310 |
+multilib_src_install_all() { |
311 |
+ einstalldocs |
312 |
+ ! use systemd && readme.gentoo_create_doc |
313 |
+ |
314 |
+ newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager |
315 |
+ newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager |
316 |
+ |
317 |
+ # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts |
318 |
+ keepdir /etc/NetworkManager/dispatcher.d |
319 |
+ |
320 |
+ # Provide openrc net dependency only when nm is connected |
321 |
+ exeinto /etc/NetworkManager/dispatcher.d |
322 |
+ newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status |
323 |
+ sed -e "s:@EPREFIX@:${EPREFIX}:g" \ |
324 |
+ -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die |
325 |
+ |
326 |
+ keepdir /etc/NetworkManager/system-connections |
327 |
+ chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594 |
328 |
+ |
329 |
+ # Allow users in plugdev group to modify system connections |
330 |
+ insinto /usr/share/polkit-1/rules.d/ |
331 |
+ doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" |
332 |
+ |
333 |
+ if use iwd; then |
334 |
+ # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir |
335 |
+ cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf |
336 |
+ [device] |
337 |
+ wifi.backend=iwd |
338 |
+ EOF |
339 |
+ fi |
340 |
+ |
341 |
+ # Empty |
342 |
+ rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die |
343 |
+} |
344 |
+ |
345 |
+pkg_postinst() { |
346 |
+ gnome2_pkg_postinst |
347 |
+ systemd_reenable NetworkManager.service |
348 |
+ ! use systemd && readme.gentoo_print_elog |
349 |
+ |
350 |
+ if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then |
351 |
+ ewarn "The ${PN} system configuration file has moved to a new location." |
352 |
+ ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" |
353 |
+ ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf" |
354 |
+ ewarn |
355 |
+ ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf" |
356 |
+ fi |
357 |
+ |
358 |
+ # NM fallbacks to plugin specified at compile time (upstream bug #738611) |
359 |
+ # but still show a warning to remember people to have cleaner config file |
360 |
+ if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then |
361 |
+ if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then |
362 |
+ ewarn |
363 |
+ ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf" |
364 |
+ ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." |
365 |
+ ewarn |
366 |
+ fi |
367 |
+ fi |
368 |
+ |
369 |
+ # NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457 |
370 |
+ if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then |
371 |
+ ewarn "You have psk-flags=1 setting in above files, you will need to" |
372 |
+ ewarn "either reconfigure affected networks or, at least, set the flag" |
373 |
+ ewarn "value to '0'." |
374 |
+ fi |
375 |
+} |