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