diff options
author | Thomas Deutschmann <whissi@gentoo.org> | 2021-03-18 02:00:20 +0100 |
---|---|---|
committer | Thomas Deutschmann <whissi@gentoo.org> | 2021-03-18 02:00:45 +0100 |
commit | 33fe5dab349592699974f73413bb5422b60bd4af (patch) | |
tree | c44935bb596d534f1dc09d20e13d2469ec082758 /net-misc | |
parent | sys-kernel/gentoo-kernel-bin: Bump to 5.11.7 (diff) | |
download | gentoo-33fe5dab349592699974f73413bb5422b60bd4af.tar.gz gentoo-33fe5dab349592699974f73413bb5422b60bd4af.tar.bz2 gentoo-33fe5dab349592699974f73413bb5422b60bd4af.zip |
net-misc/networkmanager: bump to v1.30.2
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'net-misc')
3 files changed, 408 insertions, 0 deletions
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index ee61dc7c1e22..7c88e29794be 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -2,3 +2,4 @@ DIST NetworkManager-1.22.10.tar.bz2 6292347 BLAKE2B b6cb06a0630685714cdd3c8b8e1d DIST NetworkManager-1.26.4.tar.xz 5051424 BLAKE2B 53a8fd9f9a061b9ac6b117f431e72b1967cfd2fffb539e0dc9335c37a3a59dc33562e81f7887019c3460f403a95b96e8105b1ae41b00c8488ae12a370a3d82ff SHA512 91e865c83a6ae694c9f6aa50e7f938dfa55bfddac32a6dfb73e6edb34b2539068ff9f83bf662bb2d689bd3c66cf53d7fa015930940cf7bda2d4a16561cf02328 DIST NetworkManager-1.26.6.tar.xz 4975020 BLAKE2B 0c66b307a98e71e31d253a7ad5a3d3ee625c1c66e75a1775b49182e63c7a03fb4175ccc2c5cbe92216d7aac6369158f9601fa27a2045892116684e22e74b5ccd SHA512 f43869473bf625be270e3781a77310a877a8e945df08a6f9e668bb66fe173615e990fd9b3011c1c7b3aa23a9007db99c2f06c67f1185f7547771a816b06caf64 DIST NetworkManager-1.28.0.tar.xz 5129848 BLAKE2B 37dc9cda283dad29a70c85ed41a77844b4f60a9815be4b6780fbefecfeffb644fd67ea65373a1895fd2102f2beec9ad141b6e9a92a1a32de646d64acd4250b62 SHA512 ab0bc39626dc55df4e122ad6e1a8086e1467f44bdd41c4491c752dca3ffb549796e0ac888041f12f661f2f6cf4142d0fce59b5135549e48a0076fafcdc45ca06 +DIST NetworkManager-1.30.2.tar.xz 5302032 BLAKE2B 2fd30a09b479a4202c905ef29905d0672c0f4e07af15b0b124a626f160d150348e3d4b256386db43b91c4ac27c897f82269ede6e0f35f4b82905920494d070f2 SHA512 08482ac18814fd94bc99f0aa32de7d38c39d29c914a3080fb6df7ec2437b30f1aea1b5207edeae74ff63b9a181a4823cfa11e8884bc22ae80cb0b95f8cc3514e diff --git a/net-misc/networkmanager/files/networkmanager-1.30.2-iwd-autoconnect-fix-pr785.patch b/net-misc/networkmanager/files/networkmanager-1.30.2-iwd-autoconnect-fix-pr785.patch new file mode 100644 index 000000000000..0e60ccdcb894 --- /dev/null +++ b/net-misc/networkmanager/files/networkmanager-1.30.2-iwd-autoconnect-fix-pr785.patch @@ -0,0 +1,58 @@ +From 4409900f1d05bf60647492a75e478590647b997a Mon Sep 17 00:00:00 2001 +From: Andrew Zaborowski <andrew.zaborowski@intel.com> +Date: Thu, 18 Mar 2021 00:21:31 +0100 +Subject: [PATCH] iwd: Don't call IWD methods when device unmanaged + +When using IWD-side autoconnect mode (current default), in .deactivate() +and .deactivate_async() refrain from commanding IWD to actually +disconnect until the device is managed. Likely the device is already +disconnected but in any case it's up to IWD to decide in this mode. + +Calling IWD device's .Disconnect() D-Bus method has the side effect of +disabling autoconnect and doing this while NM is still in platform-init +was unexpectedly leaving the device without autoconnect after +platform-init was done, according to user reports. + +Fixes: dc0e31fb7014d8a97aca96bf97a8f86f8236300c +--- + src/core/devices/wifi/nm-device-iwd.c | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/src/core/devices/wifi/nm-device-iwd.c b/src/core/devices/wifi/nm-device-iwd.c +index 95ade44b58..01f2a30396 100644 +--- a/src/core/devices/wifi/nm-device-iwd.c ++++ b/src/core/devices/wifi/nm-device-iwd.c +@@ -588,10 +588,16 @@ deactivate(NMDevice *device) + return; + } + +- cleanup_association_attempt(self, TRUE); ++ cleanup_association_attempt(self, FALSE); + priv->act_mode_switch = FALSE; + +- if (!priv->dbus_station_proxy) ++ /* Don't trigger any actions on the IWD side until the device is managed */ ++ if (priv->iwd_autoconnect && nm_device_get_state(device) < NM_DEVICE_STATE_DISCONNECTED) ++ return; ++ ++ if (priv->dbus_station_proxy) ++ send_disconnect(self); ++ else + reset_mode(self, NULL, NULL, NULL); + } + +@@ -647,6 +653,11 @@ deactivate_async(NMDevice * device, + cleanup_association_attempt(self, FALSE); + priv->act_mode_switch = FALSE; + ++ if (priv->iwd_autoconnect && nm_device_get_state(device) < NM_DEVICE_STATE_DISCONNECTED) { ++ nm_utils_invoke_on_idle(cancellable, disconnect_cb_on_idle, user_data); ++ return; ++ } ++ + if (priv->dbus_station_proxy) { + g_dbus_proxy_call(priv->dbus_station_proxy, + "Disconnect", +-- +GitLab + diff --git a/net-misc/networkmanager/networkmanager-1.30.2.ebuild b/net-misc/networkmanager/networkmanager-1.30.2.ebuild new file mode 100644 index 000000000000..5dfe828e9e78 --- /dev/null +++ b/net-misc/networkmanager/networkmanager-1.30.2.ebuild @@ -0,0 +1,349 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +GNOME_ORG_MODULE="NetworkManager" +VALA_USE_DEPEND="vapigen" +PYTHON_COMPAT=( python3_{7..9} ) + +inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal + +DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" +HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" + +IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + bluetooth? ( modemmanager ) + iwd? ( wifi ) + vala? ( introspection ) + wext? ( wifi ) + || ( nss gnutls ) + ?? ( elogind systemd ) +" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +# gobject-introspection-0.10.3 is needed due to gnome bug 642300 +# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 +COMMON_DEPEND=" + >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] + policykit? ( >=sys-auth/polkit-0.106 ) + net-libs/libndp[${MULTILIB_USEDEP}] + >=net-misc/curl-7.24 + net-misc/iputils + sys-apps/util-linux[${MULTILIB_USEDEP}] + sys-libs/readline:0= + >=virtual/libudev-175:=[${MULTILIB_USEDEP}] + audit? ( sys-process/audit ) + bluetooth? ( >=net-wireless/bluez-5 ) + connection-sharing? ( + net-dns/dnsmasq[dbus,dhcp] + net-firewall/iptables ) + dhclient? ( >=net-misc/dhcp-4[client] ) + dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) + elogind? ( >=sys-auth/elogind-219 ) + introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) + modemmanager? ( >=net-misc/modemmanager-0.7.991:0= + net-misc/mobile-broadband-provider-info ) + ncurses? ( >=dev-libs/newt-0.52.15 ) + nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) + !nss? ( gnutls? ( + dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] + >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) ) + ofono? ( net-misc/ofono ) + ovs? ( dev-libs/jansson ) + ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) + resolvconf? ( net-dns/openresolv ) + selinux? ( sys-libs/libselinux ) + systemd? ( >=sys-apps/systemd-209:0= ) + teamd? ( + dev-libs/jansson + >=net-misc/libteam-1.9 + ) +" +RDEPEND="${COMMON_DEPEND} + acct-group/plugdev + || ( + net-misc/iputils[arping(+)] + net-analyzer/arping + ) + wifi? ( + !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) + iwd? ( net-wireless/iwd ) + ) +" +DEPEND="${COMMON_DEPEND} + >=sys-kernel/linux-headers-3.18 + " +BDEPEND=" + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/gtk-doc-am + >=dev-util/intltool-0.40 + >=sys-devel/gettext-0.17 + virtual/pkgconfig + introspection? ( + $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') + dev-lang/perl + dev-libs/libxslt + ) + vala? ( $(vala_depend) ) + test? ( + $(python_gen_any_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}]') + ) +" + +PATCHES=( + "${FILESDIR}"/${P}-iwd-autoconnect-fix-pr785.patch +) + +python_check_deps() { + if use introspection; then + has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return + fi + if use test; then + has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && + has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" + fi +} + +sysfs_deprecated_check() { + ebegin "Checking for SYSFS_DEPRECATED support" + + if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then + eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" + eerror "or NetworkManager will not work correctly." + eerror "See https://bugs.gentoo.org/333639 for more info." + die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" + fi + eend $? +} + +pkg_pretend() { + if use kernel_linux; then + get_version + if linux_config_exists; then + sysfs_deprecated_check + else + ewarn "Was unable to determine your kernel .config" + ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." + ewarn "See https://bugs.gentoo.org/333639 for more info." + fi + + fi +} + +pkg_setup() { + if use connection-sharing; then + if kernel_is lt 5 1; then + CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4" + else + CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE" + fi + linux-info_pkg_setup + fi + if use introspection || use test; then + python-any-r1_pkg_setup + fi +} + +src_prepare() { + DOC_CONTENTS="To modify system network connections without needing to enter the + root password, add your user account to the 'plugdev' group." + + use vala && vala_src_prepare + gnome2_src_prepare + + sed -i \ + -e 's#/usr/bin/sed#/bin/sed#' \ + data/84-nm-drivers.rules \ + || die +} + +multilib_src_configure() { + local myconf=( + --disable-more-warnings + --disable-static + --localstatedir=/var + --with-runstatedir=/run + --disable-lto + --disable-qt + --without-netconfig + --with-dbus-sys-dir=/etc/dbus-1/system.d + $(multilib_native_with nmcli) + --with-udev-dir="$(get_udevdir)" + --with-config-plugins-default=keyfile + --with-iptables=/sbin/iptables + --with-ebpf=yes + $(multilib_native_enable concheck) + --with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no) + --with-crypto=$(usex nss nss gnutls) + # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option + # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime. + # (There is no off switch, and we do not support upower.) + # bug #747358 + --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) + --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) + $(multilib_native_use_with audit libaudit) + $(multilib_native_use_enable bluetooth bluez5-dun) + --without-dhcpcanon + $(use_with dhclient) + $(use_with dhcpcd) + --with-config-dhcp-default=internal + $(multilib_native_use_enable introspection) + $(multilib_native_use_enable ppp) + --without-libpsl + $(multilib_native_use_with modemmanager modem-manager-1) + $(multilib_native_use_with ncurses nmtui) + $(multilib_native_use_with ofono) + $(multilib_native_use_enable ovs) + $(multilib_native_use_enable policykit polkit) + $(multilib_native_use_with resolvconf) + $(multilib_native_use_with selinux) + $(multilib_native_use_with systemd systemd-journal) + $(multilib_native_use_enable teamd teamdctl) + $(multilib_native_use_enable test tests) + $(multilib_native_use_enable vala) + --without-valgrind + $(multilib_native_use_with wifi iwd) + $(multilib_native_use_with wext) + $(multilib_native_use_enable wifi) + ) + + # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 + if use ppp; then + local PPPD_VER=`best_version net-dialup/ppp` + PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} + PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision + myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) + fi + + # unit files directory needs to be passed only when systemd is enabled, + # otherwise systemd support is not disabled completely, bug #524534 + use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) + + if multilib_is_native_abi; then + # work-around man out-of-source brokenness, must be done before configure + ln -s "${S}/docs" docs || die + ln -s "${S}/man" man || die + fi + + ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}" +} + +multilib_src_compile() { + if multilib_is_native_abi; then + emake + else + local targets=( + libnm/libnm.la + ) + emake "${targets[@]}" + fi +} + +multilib_src_test() { + if use test && multilib_is_native_abi; then + python_setup + virtx emake check + fi +} + +multilib_src_install() { + if multilib_is_native_abi; then + # Install completions at proper place, bug #465100 + gnome2_src_install completiondir="$(get_bashcompdir)" + insinto /usr/lib/NetworkManager/conf.d #702476 + doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf + else + local targets=( + install-libLTLIBRARIES + install-libnmincludeHEADERS + install-nodist_libnmincludeHEADERS + install-pkgconfigDATA + ) + emake DESTDIR="${D}" "${targets[@]}" + fi +} + +multilib_src_install_all() { + einstalldocs + ! use systemd && readme.gentoo_create_doc + + newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager + newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager + + # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts + keepdir /etc/NetworkManager/dispatcher.d + + # Provide openrc net dependency only when nm is connected + exeinto /etc/NetworkManager/dispatcher.d + newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status + sed -e "s:@EPREFIX@:${EPREFIX}:g" \ + -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die + + keepdir /etc/NetworkManager/system-connections + chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594 + + # Allow users in plugdev group to modify system connections + insinto /usr/share/polkit-1/rules.d/ + doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" + + if use iwd; then + # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir + cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf + [device] + wifi.backend=iwd + EOF + fi + + # Empty + rmdir "${ED}"/var{/lib{/NetworkManager,},} || die +} + +pkg_postinst() { + gnome2_pkg_postinst + systemd_reenable NetworkManager.service + ! use systemd && readme.gentoo_print_elog + + if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then + ewarn "The ${PN} system configuration file has moved to a new location." + ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" + ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf" + ewarn + ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf" + fi + + # NM fallbacks to plugin specified at compile time (upstream bug #738611) + # but still show a warning to remember people to have cleaner config file + if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then + if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then + ewarn + ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf" + ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." + ewarn + fi + fi + + # NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457 + if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then + ewarn "You have psk-flags=1 setting in above files, you will need to" + ewarn "either reconfigure affected networks or, at least, set the flag" + ewarn "value to '0'." + fi + + if use dhclient || use dhcpcd; then + ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since" + ewarn "version 1.20 defaults to the internal DHCP client. If the internal client" + ewarn "works for you, and you're happy with, the alternative USE flags can be" + ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak" + ewarn "the main.dhcp configuration option to use one of them instead of internal." + fi +} |