Sync changes to SLFO-1.2 branch

OBS-URL: https://build.opensuse.org/request/show/1298622
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/NetworkManager?expand=0&rev=283

00-server.conf

@@ -0,0 +1,7 @@
+# This configuration file disables automatic (DHCP/SLAAC) configuration
+# on ethernet devices with no other matching connections.
+#
+# See "man NetworkManager.conf" for more information about this key.
+
+[main]
+no-auto-default=*

0001-Coerce-connectivity-LIMITED-to-NONE-when-device-is-d.patch

@@ -12,11 +12,11 @@ Fixes #138
  src/devices/nm-device.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-Index: NetworkManager-1.44.0/src/core/devices/nm-device.c
+Index: NetworkManager-1.50.0/src/core/devices/nm-device.c
 ===================================================================
---- NetworkManager-1.44.0.orig/src/core/devices/nm-device.c
-+++ NetworkManager-1.44.0/src/core/devices/nm-device.c
-@@ -5945,7 +5945,8 @@ concheck_update_state(NMDevice
+--- NetworkManager-1.50.0.orig/src/core/devices/nm-device.c
++++ NetworkManager-1.50.0/src/core/devices/nm-device.c
+@@ -6338,7 +6338,8 @@ concheck_update_state(NMDevice
                  state = NM_CONNECTIVITY_LIMITED;
          } else
              state = NM_CONNECTIVITY_NONE;

0001-man-document-static-ip-setup-differences-to-dracut-n.patch

@@ -0,0 +1,36 @@
+From b2abb374a7e1500df73db4f6a93fa178c426db0a Mon Sep 17 00:00:00 2001
+From: Thomas Blume <Thomas.Blume@suse.com>
+Date: Wed, 11 Jun 2025 07:35:46 +0200
+Subject: [PATCH] man: document static ip setup differences to dracut
+ network-legacy
+
+---
+ man/nm-initrd-generator.xml | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/man/nm-initrd-generator.xml b/man/nm-initrd-generator.xml
+index 312edff2ee..c4ea8baf8f 100644
+--- a/man/nm-initrd-generator.xml
++++ b/man/nm-initrd-generator.xml
+@@ -193,6 +193,18 @@
+         NetworkManager doesn't.</para>
+       </listitem>
+ 
++      <listitem>
++        <para>When an interface is configured with a static address,
++        there is no need to disable autoconf via parameters.
++        The netmask can be give either in four digit dot separated
++        notation or as decimal number network prefix length.
++        For example:
++        <literal>ip=192.168.100.99::192.168.100.222:255.255.255.0:myhost:ens10</literal>,
++        <literal>ip=192.168.100.99::192.168.100.222:24:myhost:ens10</literal>,
++        <literal>ip=[2001:DB8:2::99]::[2001:DB8:2::1]:8:myhost:ens10</literal>.
++        </para>
++      </listitem>
++
+       <listitem>
+         <para>network-legacy configures interfaces one by one in the
+         order in which they are announced by udev. If multiple
+-- 
+2.49.0
+

2069.patch

@@ -0,0 +1,67 @@
+From 5bc38c6c9363e12890cbcad5abe1c557d01030c0 Mon Sep 17 00:00:00 2001
+From: Jordan Petridis <jpetridis@gnome.org>
+Date: Wed, 13 Nov 2024 00:41:43 +0200
+Subject: [PATCH] generate-docs-nm-settings-docs-gir: Support
+ libgirepository-2.0
+
+pygobject 3.52 has switched [1] to using libgirepository-2.0 which
+comes from glib itself now, rather than the 1.0 which came from
+gobject-introspection.
+
+This means that it fails to load the incompatible "GIRepository 2.0"
+and thus must be ported to 3.0 (which is provided by
+libgirepository-2.0).
+
+Migration guide is here [2]
+
+[1]: https://gitlab.gnome.org/GNOME/pygobject/-/merge_requests/320
+[2]: https://docs.gtk.org/girepository/migrating-gi.html
+
+This commit adds suppport for importing with
+"gi.require_version("GIRepository", "3.0") and falling
+back to the existing "GIRepository 2.0" if not found.
+---
+ tools/generate-docs-nm-settings-docs-gir.py | 16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/tools/generate-docs-nm-settings-docs-gir.py b/tools/generate-docs-nm-settings-docs-gir.py
+index e438d87ad40..dea80625b98 100755
+--- a/tools/generate-docs-nm-settings-docs-gir.py
++++ b/tools/generate-docs-nm-settings-docs-gir.py
+@@ -10,14 +10,22 @@ import os
+ import gi
+ import re
+ 
+-gi.require_version("GIRepository", "2.0")
+-from gi.repository import GIRepository
++try:
++    gi.require_version("GIRepository", "3.0")
++    from gi.repository import GIRepository
++
++    repo = GIRepository.Repository()
++except ValueError:
++    gi.require_version("GIRepository", "2.0")
++    from gi.repository import GIRepository
++
++    repo = GIRepository.Repository
+ 
+ try:
+     libs = os.environ["LD_LIBRARY_PATH"].split(":")
+     libs.reverse()
+     for lib in libs:
+-        GIRepository.Repository.prepend_library_path(lib)
++        repo.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
+@@ -386,6 +394,6 @@ if __name__ == "__main__":
+ 
+     if args.lib_path:
+         for lib in args.lib_path:
+-            GIRepository.Repository.prepend_library_path(lib)
++            repo.prepend_library_path(lib)
+ 
+     main(args.gir, args.output, args.target)
+-- 
+GitLab
+

NetworkManager-1.48.8.obscpio

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:90a092afc87c0d3a7bc58d2c6ee97b9972bab0a5662cd66c76b89ef3e89a9ed2
-size 64824846

NetworkManager.changes

@@ -1,3 +1,165 @@
+-------------------------------------------------------------------
+Wed Jun 11 06:59:12 UTC 2025 - Thomas Blume <thomas.blume@suse.com>
+
+- document static ip setup on boot (bsc#1244072)
+  add 0001-man-document-static-ip-setup-differences-to-dracut-n.patch
+
+-------------------------------------------------------------------
+Wed Apr  9 02:42:56 UTC 2025 - Jonathan Kang <songchuan.kang@suse.com>
+
+- Remove '-Dhostname_persist=suse' compile option, as it's not
+  needed anymore. The behaviours of this option are mainly:
+  1. stores hostname in /etc/HOSTNAME instead of /etc/hostname.
+  2. checks DHCLIENT_SET_HOSTNAME value in /etc/sysconfig/netowrk/dhcp
+     to know whether the hostname is valid.
+  These are not desired haviours anymore.
+
+-------------------------------------------------------------------
+Tue Mar 11 13:09:26 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add 2069.patch: Fix build against girepository-2.0 (pygobject
+  3.52).
+
+-------------------------------------------------------------------
+Fri Feb 28 21:32:31 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 1.52.0:
+  + Store interactive history in `$XDG_CACHE_HOME/nmcli-history`
+    instead of `~/.nmcli-history`
+  + Add new ipv4.link-local=fallback to set an IPv4 link-local
+    address when no other IPv4 is set.
+  + Remove support for building with Autotools
+  + Add IPVLAN interface support
+  + Allow to manually configure the authentication of LTE's initial
+    EPS Bearer.
+  + Add support for the "IPv6-only preferred" DHCPv4 option (RFC
+    8925), used to indicate that a host supports an IPv6-only mode
+    and is willing to forgo obtaining an IPv4 address if the
+    network provides IPv6 connectivity.
+  + Support automatically adding routes to DNS servers via the
+    ipv4.routed-dns and ipv6.routed-dns properties; when enabled,
+    each name server is reached only via the device that specifies
+    it.
+  + Support OCI in nm-cloud-setup
+  + Added support for ethtool FEC mode
+  + Add new ipv4.shared-dhcp-range and ipv4.shared-dhcp-lease-time,
+    which allows you to customize the DHCP range and lease time
+    offered by DHCP server in `shared` connection method.
+  + DNS servers can now be specified with a URI-like syntax which
+    supports DNS over TLS name servers.
+  + The initrd-generator understands the "rd.net.dns" option to
+    configure global name servers.
+  + Drop support for the "dhcpcanon" DHCP client.
+  + global-dns configuration section now has 2 additional keys:
+    "resolve-mode" and "certification-authority".
+  + Dnsconfd plugin can now be used for configuration of
+    system-wide DNS caching resolver. If dnsconfd plugin is enabled
+    and ipvX.routed-dns is set to -1 then adding routes is by
+    default enabled.
+  + Add "shared" method to the IPv6 configuration options in nmtui.
+  + Fix a bug that prevented the activation of bond and bridge's
+    ports in some cases.
+  + Fix a bug that prevented the activation of OVS interfaces in
+    some cases.
+  + Fix MTPCP endpoint creation for IPv4 with DAD and IPv6
+    tentative addresses.
+  + Fix some VPN routes not being added to the table specified in
+    ipv4/6.routing-table. This fix allow to use policy routing to
+    mitigate Tunnelvision attacks.
+- Stop passing dhcpcanon=no to meson setup, no longer recognized,
+  nor needed.
+
+-------------------------------------------------------------------
+Fri Feb 28 21:18:28 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 1.50.3:
+  + Wait configuring MPTCP endpoints until DAD has completed.
+  + Properly autoconnect OVS ports at boot.
+  + Allow configuring "shared" IPv6 method in nmtui.
+- Changes from version 1.50.2:
+  + Fix potential crash when the property "ipv4.dhcp-send-release"
+    is enabled.
+  + Support routing rules for VPN connections.
+  + Place the route to the VPN gateway into the table defined by
+    the "ipv{4,6}.route-table" properties-
+  + Fix error handling rp_filter when kernel don't support MPTCP.
+  + Fix configuration of VLAN QoS mappings.
+- Changes from version 1.50.1:
+  + nmcli: fix handling of connection.down-on-poweroff property
+  + sriov: only validate sriov capacity when enabled
+  + wwan: fix crash with IPv4 and method=auto
+  + dns: fix deleting internal global DNS configuration
+  + wifi: fix list corruption when scanning with explicit SSID
+  + bonding: steer IGMP queries to the active bond balance-slb
+    primary port
+  + Remove routes added by NM on reapply
+  + Never retry ACD on NOARP interfaces
+  + Support IPv6 EUI64 link-local address for ipv6 tunnels
+
+-------------------------------------------------------------------
+Thu Jan 23 06:14:32 UTC 2025 - Jonathan Kang <songchuan.kang@suse.com>
+
+- Add config-server subpackage (bsc#1224868).
+
+-------------------------------------------------------------------
+Thu Oct  3 06:25:07 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 1.50.0:
+  + The support for "dhclient" has been deprecated, not built
+    unless explicitely enabled, and will be removed in a future
+    release. The internal DHCP client should be used instead and
+    has been the default since version 1.20 (1.12 when built with
+    meson).
+  + Support matching a OVS system interface by MAC address.
+  + Add a timeout option to connectivity checking.
+  + Support configuring veth interfaces in nmtui.
+  + When looking up the system hostname from the reverse DNS lookup
+    of addresses configured on interfaces, NetworkManager now takes
+    into account the content of /etc/hosts.
+  + Revert to using sysctl ipv6.conf.default for ip6-privacy.
+  + Allow specifying a system OVS interface by MAC address.
+  + ndisc: Support multiple gateways for a single network.
+  + wifi: Support configuring channel-width in AP mode.
+  + keyfile: Stop writing offensive terms into keyfiles.
+  + Support reapplying the VLANs on bridge ports.
+  + Fix crash caused by malformed LLDP package if debug log is
+    enabled.
+  + Retry hostname resolution when it fails.
+- Drop NetworkManager-dont-enforce-ip-cleanup-on-device-deactivating.patch:
+  Fixed upstream.
+- Rebase patches with quilt.
+
+-------------------------------------------------------------------
+Mon Aug 26 09:45:32 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 1.48.10:
+  + nmcli/edit: fix memory leak in extract_setting_and_property
+  + autotools: fix another filename that was renamed
+  + gitlab: fix helper scripts to support DNF5
+  + CI: update the imported templates_sha
+  + autotools: fix filename that was renamed
+  + format: run nm-code-format
+  + policy: retry hostname resolution when it fails
+  + platform: add small backoff time before resync
+  + bridge: reapply port VLANs only when necessary
+  + platform: add nmp_utils_bridge_normalized_vlans_equal()
+  + platform: support reading bridge VLANs
+  + device: support reapplying bridge-port VLANs
+  + bridge: change the signature for
+    nm_platform_link_set_bridge_vlans()
+  + platform: add define for IFLA_BOND_SLAVE_PRIO
+  + lldp: fix multiple access to argument in logging macro
+  + lldp: fix crash dereferencing NULL pointer during debug logging
+  + policy: unblock the autoconnect for children when parent is
+    available
+
+-------------------------------------------------------------------
+Thu Aug 22 06:07:45 UTC 2024 - Jonathan Kang <songchuan.kang@suse.com>
+
+- Add NetworkManager-dont-enforce-ip-cleanup-on-device-deactivating.patch:
+  device: don't enforce IP cleanup on deactivating state
+  (bsc#1228154, glfd#NetworkManager/NetworkManager!2016).
+
 -------------------------------------------------------------------
 Fri Aug  9 15:39:55 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
 

NetworkManager.obsinfo

@@ -1,4 +1,4 @@
 name: NetworkManager
-version: 1.48.8
-mtime: 1723216466
-commit: 575134dd6732f1e1fe685bbc9af92c5553797c0c
+version: 1.52.0
+mtime: 1740750933
+commit: 995a28fa1ccc54ad22e794294c3c6783cc3f30ed

NetworkManager.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package NetworkManager
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -64,7 +64,7 @@
 %endif
 
 Name:           NetworkManager
-Version:        1.48.8
+Version:        1.52.0
 Release:        0
 Summary:        Standard Linux network configuration tool suite
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -75,6 +75,7 @@ Source1:        nfs
 Source2:        NetworkManager.conf
 Source3:        baselibs.conf
 Source4:        conncheck-disabled.conf
+Source5:        00-server.conf
 Source98:       macros.NetworkManager
 Source99:       NetworkManager-rpmlintrc
 
@@ -94,6 +95,10 @@ Patch7:         nm-add-CAP_SYS_ADMIN-permission.patch
 Patch8:         python3.6-in-sle.patch
 # PATCH-FIX-SLE NetworkManager-dont-renew-bridge-dhcp-if-no-mac-on-wakeup.patch bsc#1225498, glfd#NetworkManager/NetworkManager#1587 -- manager: don't renew dhcp lease when software devices' MAC is empty
 Patch9:         NetworkManager-dont-renew-bridge-dhcp-if-no-mac-on-wakeup.patch
+# PATCH-FIX-UPSTREAM
+Patch10:        https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2069.patch
+# PATCH-FIX-SLE nm-initrd-generator document static ip setup bsc#1244072
+Patch11:        0001-man-document-static-ip-setup-differences-to-dracut-n.patch
 
 BuildRequires:  c++_compiler
 BuildRequires:  dnsmasq
@@ -289,6 +294,18 @@ Installs a nm-cloud-setup tool that can automatically configure
 NetworkManager in cloud setups. Currently only EC2 is supported.
 This tool is still experimental.
 
+%package config-server
+Summary:        NetworkManager config file for "server-like" defualts
+Group:          System Environment/Base
+Requires:       %{name} = %{version}
+BuildArch:      noarch
+
+%description config-server
+This package adds a configuration file to disable automatic (DHCP/SLAAC)
+configuration on ethernet devices with no other matching connections.
+
+This package is intended to be installed by default for server deployments.
+
 %lang_package
 
 %prep
@@ -305,6 +322,8 @@ This tool is still experimental.
 %patch -P 8 -p1
 %patch -P 9 -p1
 %endif
+%patch -P 10 -p1
+%patch -P 11 -p1
 
 # Fix server.conf's location, to end up in %%{_defaultdocdir}/%%{name},
 # rather then %%{_datadir}/doc/%%{name}/examples:
@@ -322,7 +341,6 @@ export PYTHON=%{_bindir}/python3
     -Ddnsmasq=%{_sbindir}/dnsmasq \
     -Ddist_version=%{version} \
     -Dpolkit_agent_helper_1=%{_libexecdir}/polkit-1/polkit-agent-helper-1 \
-    -Dhostname_persist=suse \
     -Dlibaudit=%{libaudit_meson_opt} \
     -Diwd=true \
     -Dpppd=%{_sbindir}/pppd \
@@ -335,7 +353,6 @@ export PYTHON=%{_bindir}/python3
     -Dnetconfig=/sbin/netconfig \
 %endif
     -Dconfig_dhcp_default=internal \
-    -Ddhcpcanon=no \
     -Ddhcpcd=no \
     -Ddhclient=%{_sbindir}/dhclient \
     -Ddocs=true \
@@ -369,6 +386,7 @@ install -m 0755 %{SOURCE1} %{buildroot}%{_prefix}/lib/NetworkManager/dispatcher.
 install -m 0644 %{SOURCE2} %{buildroot}%{_prefix}/lib/NetworkManager/
 chmod 0644 %{buildroot}%{_prefix}/lib/NetworkManager/NetworkManager.conf
 install -m 0644 %{SOURCE4} %{buildroot}%{_prefix}/lib/NetworkManager/conf.d
+install -m 0644 %{SOURCE5} %{buildroot}%{_prefix}/lib/NetworkManager/conf.d
 # Install RPM macros to be consumed by plugins
 mkdir -p %{buildroot}%{_rpmmacrodir}
 install -m 0644 %{SOURCE98} %{buildroot}%{_rpmmacrodir}/
@@ -524,4 +542,7 @@ rm -f %{buildroot}%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkMana
 %{_prefix}/lib/NetworkManager/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh
 %{_mandir}/man8/nm-cloud-setup.8%{?ext_man}
 
+%files config-server
+%{_prefix}/lib/NetworkManager/conf.d/00-server.conf
+
 %changelog

_service

@@ -3,7 +3,7 @@
   <service name="obs_scm" mode="manual">
     <param name="scm">git</param>
     <param name="url">https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git</param>
-    <param name="revision">1.48.8</param>
+    <param name="revision">1.52.0</param>
     <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
     <param name="versionrewrite-pattern">(.*)\+0</param>
     <param name="versionrewrite-replacement">\1</param>

nm-add-CAP_SYS_ADMIN-permission.patch

@@ -1,11 +1,11 @@
-Index: NetworkManager-1.44.0/data/NetworkManager.service.in
+Index: NetworkManager-1.50.0/data/NetworkManager.service.in
 ===================================================================
---- NetworkManager-1.44.0.orig/data/NetworkManager.service.in
-+++ NetworkManager-1.44.0/data/NetworkManager.service.in
-@@ -20,7 +20,7 @@ KillMode=process
+--- NetworkManager-1.50.0.orig/data/NetworkManager.service.in
++++ NetworkManager-1.50.0/data/NetworkManager.service.in
+@@ -19,7 +19,7 @@ KillMode=process
+ # With a huge number of interfaces, starting can take a long time.
  TimeoutStartSec=600
  
- # CAP_DAC_OVERRIDE: required to open /run/openvswitch/db.sock socket.
 -CapabilityBoundingSet=CAP_NET_ADMIN CAP_DAC_OVERRIDE CAP_NET_RAW CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_MODULE CAP_AUDIT_WRITE CAP_KILL CAP_SYS_CHROOT
 +CapabilityBoundingSet=CAP_NET_ADMIN CAP_DAC_OVERRIDE CAP_NET_RAW CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_MODULE CAP_AUDIT_WRITE CAP_KILL CAP_SYS_CHROOT CAP_SYS_ADMIN
  

systemd-network-config.patch

@@ -1,7 +1,7 @@
-Index: NetworkManager-1.44.0/data/NetworkManager.service.in
+Index: NetworkManager-1.50.0/data/NetworkManager.service.in
 ===================================================================
---- NetworkManager-1.44.0.orig/data/NetworkManager.service.in
-+++ NetworkManager-1.44.0/data/NetworkManager.service.in
+--- NetworkManager-1.50.0.orig/data/NetworkManager.service.in
++++ NetworkManager-1.50.0/data/NetworkManager.service.in
 @@ -1,7 +1,7 @@
  [Unit]
  Description=Network Manager
@@ -11,7 +11,7 @@ Index: NetworkManager-1.44.0/data/NetworkManager.service.in
  After=network-pre.target dbus.service
  Before=network.target @DISTRO_NETWORK_SERVICE@
  BindsTo=dbus.service
-@@ -31,6 +31,7 @@ LimitNOFILE=65536
+@@ -30,6 +30,7 @@ LimitNOFILE=65536
  
  [Install]
  WantedBy=multi-user.target
@@ -19,10 +19,10 @@ Index: NetworkManager-1.44.0/data/NetworkManager.service.in
  Also=NetworkManager-dispatcher.service
  
  # We want to enable NetworkManager-wait-online.service whenever this service
-Index: NetworkManager-1.44.0/data/NetworkManager-wait-online.service.in
+Index: NetworkManager-1.50.0/data/NetworkManager-wait-online.service.in
 ===================================================================
---- NetworkManager-1.44.0.orig/data/NetworkManager-wait-online.service.in
-+++ NetworkManager-1.44.0/data/NetworkManager-wait-online.service.in
+--- NetworkManager-1.50.0.orig/data/NetworkManager-wait-online.service.in
++++ NetworkManager-1.50.0/data/NetworkManager-wait-online.service.in
 @@ -16,7 +16,9 @@ Before=network-online.target
  # time.