commit: 05245ec5018525e5b759774b59e6ba435a13cd11 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Mon Jun 30 17:29:30 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jul 4 18:37:17 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05245ec5
net-misc/networkmanager: add 1.52.0 Bug: https://bugs.gentoo.org/957733 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42865 Closes: https://github.com/gentoo/gentoo/pull/42865 Signed-off-by: Sam James <sam <AT> gentoo.org> net-misc/networkmanager/Manifest | 1 + .../networkmanager-1.52.0-fix-pygobject-3.52.patch | 87 +++++ .../networkmanager/networkmanager-1.52.0.ebuild | 413 +++++++++++++++++++++ 3 files changed, 501 insertions(+) diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index 1a1171b869d8..780142fca304 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -2,3 +2,4 @@ DIST NetworkManager-1.46.0.tar.xz 7033296 BLAKE2B db190876105d83c8d2ef7e827fa653 DIST NetworkManager-1.48.10.tar.xz 6085272 BLAKE2B 8f615b1afec72ac600fd2cbe458644c4e83312e76c5ecf0e84484dce60510867350ec1fc2fb68fdee40ae4aca3d9e935ef8e433ea60ebe431b96699c0ce01222 SHA512 baef2ecc7da5c2f00278e8596f47c9304321896f1b79a6f304e27365c89a5fbaac6fbb68433a8fad94eeeffa56561968d0afee1adb24df6a8e6f2dba978cc620 DIST NetworkManager-1.48.16.tar.xz 6087160 BLAKE2B d5f3f5809cc8e11096337db0c064c10537ce8732784f7ff0031750f60a6e43918a479b7896ba39c80c8c8a949e0bfccb4b8a02842c0b8f667bde73421917073a SHA512 1a21b2c9edc82b7dbc73501d08d4fd963b07ab391cf4d9c51cb8cf42deddccd30f8a21d5a078fdaed6172a82f03b38a8951e9bf7c96de3015749ee1a21a2fd1a DIST NetworkManager-1.48.4.tar.xz 6080980 BLAKE2B b5d216e064043e688ce8fc582e4bfae859a3e746fce2bc13f43a871a6886270c75b77cb1c73f4b9c89e89619683a8cdce698cfe1bd249bd68108f02b982dea04 SHA512 73c9399d528b78fe1393ad2015f641d9dcfe8a1134b65a65e051aa08eece6574f44a340d140d1de525000b365370bc2615da0e682b16c2da28dc597961e6410d +DIST NetworkManager-1.52.0.tar.xz 6164264 BLAKE2B fe6360451af40fa86a02d639e805cfd09f603767ed07a524f5a2bc77c3358a285651a067dd7c8878c6f526e3c100ffcf872dd1b347b80319d1b49223f4013be0 SHA512 5a9e4273ef8b3a3bc9b9e15b7876e140c4accefd7d6143dfc6732b5ea62e6333838156338adcb8808b626586e0fe546bec2215a7e8e629560ce01c2e690bbffb diff --git a/net-misc/networkmanager/files/networkmanager-1.52.0-fix-pygobject-3.52.patch b/net-misc/networkmanager/files/networkmanager-1.52.0-fix-pygobject-3.52.patch new file mode 100644 index 000000000000..0c7859c24b0a --- /dev/null +++ b/net-misc/networkmanager/files/networkmanager-1.52.0-fix-pygobject-3.52.patch @@ -0,0 +1,87 @@ +https://bugs.gentoo.org/957733 +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2164 + +From 12eff9a7fdfeabab12ce56e5f7d515a13a3d704c Mon Sep 17 00:00:00 2001 +From: Jan Tojnar <[email protected]> +Date: Sun, 23 Mar 2025 16:35:44 +0100 +Subject: [PATCH] meson: Fix docs generation with PyGObject 3.52 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +PyGObject 3.52 switched from gobject-introspection’s libgirepository 1.0 +to glib’s libgirepository 2.0. As a result, the Python script would +no longer be able to find the `GIRepository` 2.0 typelib: + + (process:1944): GLib-GIRepository-DEBUG: 15:25:14.521: Ignoring GIRepository-2.0.typelib because this libgirepository corresponds to GIRepository-3.0.typelib + +We could update the script to support both versions of the typelib +but it is not really necessary. It was only used to add extra directories +from `$LD_LIBRARY_PATH` and the CLI argument to repository’s library path +but libgirepository already supports using `LD_LIBRARY_PATH` directly: +https://docs.gtk.org/girepository/method.Repository.prepend_library_path.html +--- a/src/libnm-client-impl/meson.build ++++ b/src/libnm-client-impl/meson.build +@@ -209,7 +209,6 @@ if enable_introspection + 'LD_LIBRARY_PATH=' + ld_library_path, + python_path, + gen_gir_cmd, +- '--lib-path', meson.current_build_dir(), + '--gir', libnm_gir[0], + '--output', '@OUTPUT@', + '--target', name +--- a/tools/generate-docs-nm-settings-docs-gir.py ++++ b/tools/generate-docs-nm-settings-docs-gir.py +@@ -6,26 +6,9 @@ + from __future__ import print_function, unicode_literals + import xml.etree.ElementTree as ET + import argparse +-import os + import gi + import re + +-gi.require_version("GIRepository", "2.0") +-from gi.repository import GIRepository +- +-try: +- libs = os.environ["LD_LIBRARY_PATH"].split(":") +- libs.reverse() +- for lib in libs: +- GIRepository.Repository.prepend_library_path(lib) +-except AttributeError: +- # An old GI version, that has no prepend_library_path +- # It's alright, it probably interprets LD_LIBRARY_PATH +- # correctly. +- pass +-except KeyError: +- pass +- + gi.require_version("NM", "1.0") + from gi.repository import NM, GObject + +@@ -354,13 +337,6 @@ def main(gir_path_str, output_path_str, output_target): + + if __name__ == "__main__": + parser = argparse.ArgumentParser() +- parser.add_argument( +- "-l", +- "--lib-path", +- metavar="PATH", +- action="append", +- help="path to scan for shared libraries", +- ) + parser.add_argument( + "-g", + "--gir", +@@ -384,8 +360,4 @@ if __name__ == "__main__": + + args = parser.parse_args() + +- if args.lib_path: +- for lib in args.lib_path: +- GIRepository.Repository.prepend_library_path(lib) +- + main(args.gir, args.output, args.target) +-- +GitLab + diff --git a/net-misc/networkmanager/networkmanager-1.52.0.ebuild b/net-misc/networkmanager/networkmanager-1.52.0.ebuild new file mode 100644 index 000000000000..490632201c99 --- /dev/null +++ b/net-misc/networkmanager/networkmanager-1.52.0.ebuild @@ -0,0 +1,413 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="NetworkManager" +PYTHON_COMPAT=( python3_{11..14} ) + +inherit linux-info meson-multilib flag-o-matic python-any-r1 \ + readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx + +DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" +HOMEPAGE=" + https://www.networkmanager.dev + https://gitlab.freedesktop.org/NetworkManager/NetworkManager +" +SRC_URI="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/releases/${PV}/downloads/${MY_PN}-${PV}.tar.xz"; +S="${WORKDIR}"/${MY_PN}-${PV} + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + +IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + bluetooth? ( modemmanager ) + connection-sharing? ( || ( iptables nftables ) ) + gtk-doc? ( introspection ) + iwd? ( wifi ) + test? ( tools ) + vala? ( introspection ) + wext? ( wifi ) + ^^ ( gnutls nss ) + ?? ( elogind systemd ) + ?? ( dhclient dhcpcd ) + ?? ( syslog systemd ) +" + +COMMON_DEPEND=" + sys-apps/util-linux[${MULTILIB_USEDEP}] + elogind? ( >=sys-auth/elogind-219 ) + >=virtual/libudev-175:=[${MULTILIB_USEDEP}] + sys-apps/dbus[${MULTILIB_USEDEP}] + net-libs/libndp + systemd? ( >=sys-apps/systemd-209:0= ) + >=dev-libs/glib-2.42:2[${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) + selinux? ( + sec-policy/selinux-networkmanager + sys-libs/libselinux + ) + audit? ( sys-process/audit ) + teamd? ( + >=dev-libs/jansson-2.7:= + >=net-misc/libteam-1.9 + ) + policykit? ( >=sys-auth/polkit-0.106 ) + nss? ( + dev-libs/nspr[${MULTILIB_USEDEP}] + >=dev-libs/nss-3.11[${MULTILIB_USEDEP}] + ) + gnutls? ( + >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] + ) + ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6(+)] ) + modemmanager? ( + net-misc/mobile-broadband-provider-info + >=net-misc/modemmanager-0.7.991:0= + ) + bluetooth? ( >=net-wireless/bluez-5:= ) + ofono? ( net-misc/ofono ) + dhclient? ( >=net-misc/dhcp-4[client] ) + dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) + ovs? ( >=dev-libs/jansson-2.7:= ) + resolvconf? ( virtual/resolvconf ) + connection-sharing? ( + net-dns/dnsmasq[dbus,dhcp] + iptables? ( net-firewall/iptables ) + nftables? ( net-firewall/nftables ) + ) + psl? ( net-libs/libpsl ) + concheck? ( net-misc/curl ) + tools? ( + >=dev-libs/jansson-2.7:= + >=dev-libs/newt-0.52.15 + libedit? ( dev-libs/libedit ) + !libedit? ( sys-libs/readline:= ) + ) +" +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 + net-libs/libndp[${MULTILIB_USEDEP}] + ppp? ( elibc_musl? ( net-libs/ppp-defs ) ) + test? ( >=dev-libs/jansson-2.7 ) +" +BDEPEND=" + dev-util/gdbus-codegen + dev-util/glib-utils + gtk-doc? ( + dev-util/gtk-doc + app-text/docbook-xml-dtd:4.1.2 + ) + >=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}"/networkmanager-1.52.0-fix-pygobject-3.52.patch +) + +python_check_deps() { + if use introspection; then + python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return + fi + if use test; then + python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" + 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." + + default + use vala && vala_setup + + sed -i \ + -e 's#/usr/bin/sed#/bin/sed#' \ + data/84-nm-drivers.rules \ + || die +} + +meson_nm_program() { + usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no" +} + +meson_nm_native_program() { + multilib_native_usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no" +} + +multilib_src_configure() { + # LTO is restricted in older clang for unclear reasons. + # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/593 + # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2053 + tc-is-clang && [[ $(clang-major-version) -lt 18 ]] && filter-lto + + local emesonargs=( + --localstatedir="${EPREFIX}/var" + + -Dsystemdsystemunitdir=$(systemd_get_systemunitdir) + -Dsystem_ca_path=/etc/ssl/certs + -Dudev_dir=$(get_udevdir) + -Ddbus_conf_dir=/usr/share/dbus-1/system.d + -Dkernel_firmware_dir=/lib/firmware + -Diptables=/sbin/iptables + -Dnft=/sbin/nft + -Ddnsmasq=/usr/sbin/dnsmasq + + -Ddist_version=${PVR} + $(meson_native_use_bool policykit polkit) + $(meson_native_use_bool policykit config_auth_polkit_default) + -Dmodify_system=true + -Dpolkit_agent_helper_1=/usr/lib/polkit-1/polkit-agent-helper-1 + $(meson_native_use_bool selinux) + $(meson_native_use_bool systemd systemd_journal) + -Dhostname_persist=gentoo + -Dlibaudit=$(multilib_native_usex audit) + + $(meson_native_use_bool wext) + $(meson_native_use_bool wifi) + $(meson_native_use_bool iwd) + $(meson_native_use_bool ppp) + -Dpppd=/usr/sbin/pppd + $(meson_native_use_bool modemmanager modem_manager) + $(meson_native_use_bool ofono) + $(meson_native_use_bool concheck) + $(meson_native_use_bool teamd teamdctl) + $(meson_native_use_bool ovs) + $(meson_native_use_bool tools nmcli) + $(meson_native_use_bool tools nmtui) + $(meson_native_use_bool tools nm_cloud_setup) + $(meson_native_use_bool bluetooth bluez5_dun) + # ebpf is problematic in at least v1.46.0, bug #926943 + -Debpf=false + + -Dconfig_wifi_backend_default=$(multilib_native_usex iwd iwd default) + -Dconfig_plugins_default=keyfile + -Difcfg_rh=false + -Difupdown=false + -Dconfig_migrate_ifcfg_rh_default=false + + $(meson_nm_native_program resolvconf "" /sbin/resolvconf) + -Dnetconfig=no + -Dconfig_dns_rc_manager_default=auto + + $(meson_nm_program dhclient "" /sbin/dhclient) + $(meson_nm_program dhcpcd "" /sbin/dhcpcd) + + $(meson_native_use_bool introspection) + $(meson_native_use_bool vala vapi) + $(meson_native_use_bool gtk-doc docs) + -Dtests=$(multilib_native_usex test) + $(meson_native_true firewalld_zone) + -Dmore_asserts=0 + $(meson_use debug more_logging) + -Dvalgrind=no + -Dvalgrind_suppressions= + -Dld_gc=false + $(meson_native_use_bool psl libpsl) + -Dqt=false + ) + + if multilib_is_native_abi && use systemd; then + emesonargs+=( -Dsession_tracking_consolekit=false ) + emesonargs+=( -Dsession_tracking=systemd ) + emesonargs+=( -Dsuspend_resume=systemd ) + elif multilib_is_native_abi && use elogind; then + emesonargs+=( -Dsession_tracking_consolekit=false ) + emesonargs+=( -Dsession_tracking=elogind ) + emesonargs+=( -Dsuspend_resume=elogind ) + else + emesonargs+=( -Dsession_tracking_consolekit=false ) + emesonargs+=( -Dsession_tracking=no ) + emesonargs+=( -Dsuspend_resume=auto ) + fi + + if multilib_is_native_abi && use syslog; then + emesonargs+=( -Dconfig_logging_backend_default=syslog ) + elif multilib_is_native_abi && use systemd; then + emesonargs+=( -Dconfig_logging_backend_default=journal ) + else + emesonargs+=( -Dconfig_logging_backend_default=default ) + fi + + if multilib_is_native_abi && use dhclient; then + emesonargs+=( -Dconfig_dhcp_default=dhclient ) + elif multilib_is_native_abi && use dhcpcd; then + emesonargs+=( -Dconfig_dhcp_default=dhcpcd ) + else + emesonargs+=( -Dconfig_dhcp_default=internal ) + fi + + if use nss; then + emesonargs+=( -Dcrypto=nss ) + else + emesonargs+=( -Dcrypto=gnutls ) + fi + + if use tools ; then + emesonargs+=( -Dreadline=$(usex libedit libedit libreadline) ) + else + emesonargs+=( -Dreadline=none ) + fi + + # 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 + emesonargs+=( -Dpppd_plugin_dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) + fi + + meson_src_configure +} + +multilib_src_test() { + if use test && multilib_is_native_abi; then + python_setup + virtx meson_src_test + fi +} + +multilib_src_install() { + meson_src_install + if ! multilib_is_native_abi; then + rm -r "${ED}"/{etc,usr/{bin,lib/NetworkManager,share},var} || die + fi +} + +multilib_src_install_all() { + ! use systemd && readme.gentoo_create_doc + + newinitd "${FILESDIR}/init.d.NetworkManager-r3" 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 + + insinto /usr/lib/NetworkManager/conf.d #702476 + doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf + + 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 || die + [device] + wifi.backend=iwd + EOF + fi + + mv "${ED}"/usr/share/doc/{NetworkManager/examples/,${PF}} || die + rmdir "${ED}"/usr/share/doc/NetworkManager || die + + # Empty + rmdir "${ED}"/var{/lib{/NetworkManager,},} || die + + # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/1653 + # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2068 + # prebuilt manpages aren't installed by meson + use gtk-doc || doman man/*.[1578] +} + +pkg_postinst() { + udev_reload + + 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." + # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1988 + ewarn + ewarn "Note that dhclient has been deprecated and support for that will be removed" + ewarn "in a future release." + fi +} + +pkg_postrm() { + udev_reload +}
