From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1605803-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 37177158041
for <garchives@archives.gentoo.org>; Fri, 1 Mar 2024 19:31:32 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 71423E29DA;
Fri, 1 Mar 2024 19:31:31 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 4D745E29DA
for <gentoo-commits@lists.gentoo.org>; Fri, 1 Mar 2024 19:31:31 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 6D3983430F6
for <gentoo-commits@lists.gentoo.org>; Fri, 1 Mar 2024 19:31:30 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 9C65D118C
for <gentoo-commits@lists.gentoo.org>; Fri, 1 Mar 2024 19:31:28 +0000 (UTC)
From: "Patrick McLean" <chutzpah@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" <chutzpah@gentoo.org>
Message-ID: <1709321455.3464267fecb5f915bb53df6213935859b860e421.chutzpah@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/networkmanager/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-misc/networkmanager/Manifest net-misc/networkmanager/networkmanager-1.46.0.ebuild
X-VCS-Directories: net-misc/networkmanager/
X-VCS-Committer: chutzpah
X-VCS-Committer-Name: Patrick McLean
X-VCS-Revision: 3464267fecb5f915bb53df6213935859b860e421
X-VCS-Branch: master
Date: Fri, 1 Mar 2024 19:31:28 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 36754441-0eda-4368-a2e9-ce757084fa04
X-Archives-Hash: 25b543f13b4d0a30669f0c4cd256167b
commit: 3464267fecb5f915bb53df6213935859b860e421
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 1 19:30:55 2024 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Mar 1 19:30:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3464267f
net-misc/networkmanager: add 1.46.0
Closes: https://bugs.gentoo.org/921563
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
net-misc/networkmanager/Manifest | 1 +
.../networkmanager/networkmanager-1.46.0.ebuild | 390 +++++++++++++++++++++
2 files changed, 391 insertions(+)
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index bdec73d02cda..cddcb35ea5d9 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,4 +1,5 @@
DIST NetworkManager-1.42.6.tar.xz 6749088 BLAKE2B 9d583c163908ee4fe145cdbdaa657cbc682d9f6270efc7d7525acd86912a0da50f2ccf14810fdfe2998c6ce701dcabc2b5b39fa58ff9d3fe4f5630205b15f4c8 SHA512 606a996043d8fbc7972329b94bc9854557950f665790381611eddfc632850b31584a4ba2d773fa9d12127db4c37ea2076c657521b78cedb012144df6f41d3748
DIST NetworkManager-1.44.0.tar.xz 6868528 BLAKE2B f916620e74c0d5b8581b8c1eeb8f58c1cbac2d6c18bc72a25679cf5d36975df6c37b130f97e8d2078d9ab7aeeb4371ed6f9e830c5e6dce19feb41f26277be734 SHA512 7ebece465dfd108d66adb1c941ab22bdca8bb0ce7869baa421e4aef65e89a23bf63f3713e809e1e7b6c5226813ad9d56d8af339c711507a33aa6728afd334405
DIST NetworkManager-1.44.2.tar.xz 6863972 BLAKE2B 2bb5ac06018d45d55623d742fba49c3b485116091992ad56a4680ce00946c96bd0c1b3b5d34f2c36c6347ff51182e00158351c0c6989cdc7db4a49b52564a1b7 SHA512 2f3721ebdfa14470c8bb22362c4f598a277c6cea77a34101a6cc9ef32b44382bd408d55e4c58561c324864bfb814b6efb563fbbd593a16c191524cde8ee758f5
+DIST NetworkManager-1.46.0.tar.xz 7033296 BLAKE2B db190876105d83c8d2ef7e827fa653ab14f9687ab18392600e04d20020d1dc797d3857c9fb05111fcafd18fe477b93947566100ea7113758703842cded71ed40 SHA512 27f234ad5b715ad0ae9d6adcdc91a4499b76fe78d3a5644aced8976588f0e82f2d03daec47589f1313b9802207c784ade67e921d4d2fa3c813cbf727558ad407
DIST networkmanager-ppp-2.5.0.patch 45845 BLAKE2B afcf1410f89db950a7e7c2c0af3aaed174a43fae127c8a139431093a3ae9802542c40cf69faabd1d057563438b48f0a0b0d4c7fc188c13e9320d127e0034f181 SHA512 34fe7780ac1780efa156429166344548058a9079ad61238a33d89a57e52ab79765ebfaf39bd9c246d0b74549ca7156e9df1a472920485cbe23ed81de4f8cf243
diff --git a/net-misc/networkmanager/networkmanager-1.46.0.ebuild b/net-misc/networkmanager/networkmanager-1.46.0.ebuild
new file mode 100644
index 000000000000..06d5ab263971
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.46.0.ebuild
@@ -0,0 +1,390 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME_ORG_MODULE="NetworkManager"
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit gnome.org linux-info meson-multilib flag-o-matic python-any-r1 readme.gentoo-r1 systemd udev vala virtualx
+
+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 +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 )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+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/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 ) )
+"
+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? (
+ >=dev-libs/jansson-2.7
+ $(python_gen_any_dep '
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]')
+ )
+"
+
+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() {
+ # Workaround for LLD 17 (bug #915819)
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+ 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)
+ -Debpf=true
+
+ -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)
+ -Ddhcpcanon=no
+ $(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-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
+
+ 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
+}
+
+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."
+ fi
+}
+
+pkg_postrm() {
+ udev_reload
+}