Sync from SUSE:SLFO:1.1 NetworkManager revision 6af28dbd1a52a38ba7b60fa0c9e851de

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.50.0/src/core/devices/nm-device.c
+Index: NetworkManager-1.42.2/src/core/devices/nm-device.c
 ===================================================================
---- NetworkManager-1.50.0.orig/src/core/devices/nm-device.c
+--- NetworkManager-1.42.2.orig/src/core/devices/nm-device.c
-+++ NetworkManager-1.50.0/src/core/devices/nm-device.c
++++ NetworkManager-1.42.2/src/core/devices/nm-device.c
-@@ -6338,7 +6338,8 @@ concheck_update_state(NMDevice
+@@ -5758,7 +5758,8 @@ concheck_update_state(NMDevice
                  state = NM_CONNECTIVITY_LIMITED;
          } else
              state = NM_CONNECTIVITY_NONE;

NetworkManager-1.10.6-netconfig.patch

@@ -1,8 +1,8 @@
-Index: NetworkManager-1.44.0/src/core/dns/nm-dns-manager.c
+Index: NetworkManager-1.40.0/src/core/dns/nm-dns-manager.c
 ===================================================================
---- NetworkManager-1.44.0.orig/src/core/dns/nm-dns-manager.c
+--- NetworkManager-1.40.0.orig/src/core/dns/nm-dns-manager.c
-+++ NetworkManager-1.44.0/src/core/dns/nm-dns-manager.c
++++ NetworkManager-1.40.0/src/core/dns/nm-dns-manager.c
-@@ -733,6 +733,14 @@ dispatch_netconfig(NMDnsManager      *se
+@@ -698,6 +698,14 @@ dispatch_netconfig(NMDnsManager      *se
      gssize                        l;
      nm_auto_free_gstring GString *str = NULL;
  

NetworkManager-dont-renew-bridge-dhcp-if-no-mac-on-wakeup.patch

@@ -1,45 +0,0 @@
-From a32094e9f8845700c6037634614863d1cee1ff55 Mon Sep 17 00:00:00 2001
-From: Jonathan Kang <jonathankang@gnome.org>
-Date: Wed, 17 Jul 2024 21:06:45 +0800
-Subject: [PATCH] manager: don't renew dhcp lease when software devices' MAC is
- empty
-
-If a bridge device doesn't have a permanent MAC address, its MAC address
-will change based on the attached ports. When suspending the system, all
-slaves can be released, thus MAC address of the bridge interface changes
-to 00:00:00:00:00:00. In such scenarios, if you resume the system,
-NetworkManager tries to renew dhcp lease on the bridge interface with an
-empty MAC address. Because its slaved ports haven't been attached yet.
-
-Fix that in this commit.
-
-https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/1587
----
- src/core/nm-manager.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c
-index e949ea1189..00aa58c23a 100644
---- a/src/core/nm-manager.c
-+++ b/src/core/nm-manager.c
-@@ -10,6 +10,7 @@
- 
- #include <fcntl.h>
- #include <limits.h>
-+#include <linux/if_ether.h>
- #include <stdlib.h>
- #include <sys/sendfile.h>
- #include <sys/stat.h>
-@@ -7359,7 +7360,8 @@ do_sleep_wake(NMManager *self, gboolean sleeping_changed)
-             guint               i;
- 
-             if (nm_device_is_software(device)
--                && !nm_device_get_unmanaged_flags(device, NM_UNMANAGED_SLEEPING)) {
-+                && !nm_device_get_unmanaged_flags(device, NM_UNMANAGED_SLEEPING)
-+                && !nm_utils_hwaddr_matches(nm_device_get_hw_address(device), -1, &nm_ether_addr_zero, ETH_ALEN)) {
-                 /* DHCP leases of software devices could have gone stale
-                  * so we need to renew them. */
-                 nm_device_update_dynamic_ip_setup(device, "wake up");
--- 
-2.45.2
-

NetworkManager.changes

@@ -3,317 +3,6 @@ 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>
-
-- Update to version 1.48.8:
-  + ovs: fix triggering stage3 activation without DHCP client
-    initialized
-  + config: parse autoconnect-ports value on config
-  + ndisc: preserve router preferences
-
--------------------------------------------------------------------
-Mon Jul 29 06:41:28 UTC 2024 - Jonathan Kang <songchuan.kang@suse.com>
-
-- Add NetworkManager-dont-renew-bridge-dhcp-if-no-mac-on-wakeup.patch:
-  manager: don't renew dhcp lease when software devices' MAC is empty
-  (bsc#1225498, glfd#NetworkManager/NetworkManager#1587).
-
--------------------------------------------------------------------
-Fri Jul 26 21:09:34 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
-
-- Update to version 1.48.6:
-  + activation: Allow changing controller of exposed active
-    connection
-  + ovs: wait for the link to be ready before activating
-  + policy: assert that the auto-activate list is empty on dispose
-
--------------------------------------------------------------------
-Fri Jul  5 15:36:31 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
-
-- Update to version 1.48.4:
-  + Support matching a OVS system interface by MAC address.
-  + 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.
-
--------------------------------------------------------------------
-Mon Jun 24 08:58:21 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Update to version 1.48.2:
-  + Support matching a OVS system interface by MAC address.
-  + Fix port reactivation when the controller is reactivating.
-  + Save connection timestamps when shutting down, so that the
-    right connection autoactivates after restart.
-  + Fix handling of VPN secrets for 2-factor authentication.
-
--------------------------------------------------------------------
-Wed Jun  5 06:02:09 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Update to version 1.48.0:
-  + Building with autotools is now deprecated and will be
-    completely removed in the next development cycle.
-  + Support changing the OpenSSL ciphers for 802.1X authentication
-    via connection property "802-1x.openssl-ciphers".
-  + The reason why a device is unmanaged is now properly set in the
-    "StateReason" property of the "Device" D-Bus object. The
-    property is visible in nmcli via "nmcli -f all device show
-    $DEV".
-  + Deprecated 802-11-wireless and 802-11-wired property
-    'mac-address-blacklist' and introduced the
-    'mac-address-denylist' property.
-  + Properly restore in-memory connection profiles during the
-    rollback of a checkpoint.
-  + Fix detection of 6 GHz band capability for WiFi devices.
-  + Allow IPv6 SLAAC and static IPv6 DNS server assignment for
-    modem broadband when IPv6 device address was not explicitly
-    passed on by ModemManager.
-  + Fix a performance issue that was leading to 100% CPU usage by
-    NetworkManager if external programs were doing a big amount of
-    routes updates.
-  + Patch-level development releases (i.e. 1.48.1-dev) won't be
-    used anymore.
-- Changes from version 1.46
-  + Support dynamic value "${NETWORK_SSID}" for
-    connection.stable-id to generate the stable ID based on the
-    Wi-Fi's SSID.
-  + Support new value "wifi.cloned-mac-address=stable-ssid" for
-    randomizing the MAC address based on the Wi-Fi network.
-  + Change internal ABI of NMSetting types and NMSimpleConnection.
-  + Honor udev property ID_NET_AUTO_LINK_LOCAL_ONLY=1 for enabling
-    link local addresses on default wired connection.
-  + Honor udev property ID_NET_MANAGED_BY to only manage an
-    interface when set to "org.freedesktop.NetworkManager".
-  + D-Bus methods StartFind() and StopFind() on interface
-    "org.freedesktop.NetworkManager.Device.WifiP2P" now require the
-    "org.freedesktop.NetworkManager.wifi.scan" Polkit permission.
-  + Drop build support with Python2. Python3 is now required.
-  + nmcli: limit number of printed addresses/routes in `nmcli`
-    overview to 10.
-  + Limit number of exported IP addresses/routes on D-Bus to 100 to
-    reduce performance cost. Also, D-Bus updates for
-    addresses/routes are now rate limited to 3 per second.
-  + cloud-setup: enable more sandboxing options in systemd service
-    file.
-  + nmcli: show WiFi bandwidth.
-  + Internal improvements and bugfixes.
-  + Man page now show the format and accepted values of all
-    properties.
-  + Added the 'dns-change' dispatcher event.
-  + Show WiFi devices capability to work on the 6GHz band.
-  + Allow to set dhcp-client-id to none.
-  + Support configuring ethtool channels property to configure NIC
-    multiqueue.
-  + Don't attempt to use IPv6 if it's disabled in kernel.
-  + Fix handling of OVS interfaces with netdev datapath and cloned
-    MAC.
-  + Support for old systemd has been droped, at least systemd v200
-    is required.
-  + Support Ethtool EEE (Energy Efficient Ethernet) settings.
-  + Add options to prevent edns0 and trust-ad being automatically
-    added to DNS configuration.
-  + Implement fwmark property for IP tunnels.
-  + Add support to HSR/PRP interfaces.
-  + Deprecated connection.* properties master, slave-type,
-    autoconnect-slaves
-  + Allow configuring static routes also when addresses is empty.
-  + VPN: accept pref-src for IPv6 routes from VPN plugins.
-  + nmcli: show global metered state.
-  + Support modifying the DSCP header field for DHCP packets, and
-    change the default to CS0.
-  + Enable IPv4 DAD (Duplicate Address Detection) by default.
-  + vpn: support 2FA authentication from VPN plugins.
-  + nmtui: allow adding a bond as bridge port.
-  + sriov: add support to configure the NIC's eswitch settings via
-    Devlink.
-  + ndisc: fix IPv6 address lifetimes computation.
-  + Support the MACsec offload mode.
-  + Support creating generic devices via external "device-handler"
-    dispatcher.
-  + Documentation improvements.
-  + Many internal improvements and bug fixes.
-- Drop nm-runstatedir.patch: no longer needed.
-
--------------------------------------------------------------------
-Thu May  9 02:29:22 UTC 2024 - Jonathan Kang <songchuan.kang@suse.com>
-
-- Don't recommend ModemManager for the main package, as it's only
-  needed by NetworkManager-wwan subpackage(bsc#1100395).
-
--------------------------------------------------------------------
-Fri Apr 19 13:03:27 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Update to version 1.44.4:
-  + Add the 'dns-change' dispatcher event.
-  + Various fixed related to IPv4 duplicate address detection.
-  + Fix support for OVS netdev datapath
-  + Fix handling of IPv6 hop limit
-
--------------------------------------------------------------------
-Sun Dec  3 07:39:25 UTC 2023 - Yifan Jiang <yfjiang@suse.com>
-
-- Add python3.6-in-sle.patch: SLE still takes python 3.6 as primary
-  system, the patch allows meson to find python 3.6 in SLE.
-
--------------------------------------------------------------------
-Tue Nov 28 12:04:20 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Use %patch -p N instead of deprecated %patchN.
-
--------------------------------------------------------------------
-Tue Oct  3 19:21:58 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
-
-- Update to version 1.44.2:
-  + Better log IPv4 Address Conflict Detection (ACD) conflicts
-  + Remove the upper limit of 65535 for PIDs read from the PID file
-  + Allow missing default gateway with oFono
-  + Honor the CLICOLOR_FORCE environment variable
-  + Fix generating connection with IPv6 method disabled vs ignored
-  + Fix possible segmentation fault when doing a checkpoint
-    rollback
-  + Documentation improvements
-- Switch to source services, use explicit released tag.
-
--------------------------------------------------------------------
-Wed Aug  9 15:58:57 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
-
-- Update to version 1.44.0:
-  + Introduce a new "link" setting that holds properties related to
-    the kernel link such as "tx-queue-length", "gso-max-size",
-    "gso-max-segments", "gro-max-size".
-  + Support sending a DHCPv6 prefix delegation hint via the
-    "ipv6.dhcp-pd-hint" connection property.
-  + Support new bond options: "arp_missed_max", "lacp_active",
-    "ns_ip6_target".
-  + Add new "initial-eps-bearer-configure" and
-    "initial-eps-bearer-apn" properties in the GSM setting.
-  + Setting "connection.stable-id=default${CONNECTION}" changed
-    behavior to be identical to the built-in default value when the
-    stable-id is not set.
-  + Add a "[keyfile].rename" option to NetworkManager.conf to force
-    renaming profiles on disk when their name changes.
-  + The ifcfg-rh plugin is deprecated; it will only receive
-    bugfixes and no new features. A warning is emitted the log when
-    a connection in ifcfg-rh format is found.
-  + To automatically migrate existing ifcfg-rh connections to the
-    keyfile format, a new configuration option
-    "main.migrate-ifcfg-rh" is provided. Migration is disabled by
-    default, but the default value can be changed at build time via
-    "--with-config-migrate-ifcfg-rh-default=yes".
-  + When configuring hostnames in non-public TLD (like
-    "example.local"), use the TLD as default search domain instead
-    of the full hostname.
-  + Always apply DNS options from the [global-dns] configuration
-    section
-  + The NetworkManager daemon now acquires the D-Bus name only
-    after populating the D-Bus tree. This can add a delay during
-    startup but it is required to avoid race conditions with other
-    services depending on NM.
-  + Add a "version-id" argument to the Update2() D-Bus call to
-    guard against concurrent modifications of profiles.
-  + Don't use tentative IPv6 addresses to resolve the system
-    hostname via DNS.
-  + Track the number of autoconnect retries left for each device
-    and connection. Previously it was tracked only per connection
-    and this lead to unexpected behaviors in case of multiconnect
-    profiles.
-  + Set VLAN filtering options on bridge via netlink instead of
-    sysfs.
-  + nm-cloud-setup now supports IMDSv2 on Amazon EC2.
-  + nmtui now allows to enable or disable Wi-Fi and WWAN radios.
-  + Honor ignore-carrier=no for bond/bridge/team devices.
-  + Add version mismatch warning when running nmcli commands.
-- Rebase patches with quilt.
-
--------------------------------------------------------------------
-Thu Jun 29 08:08:05 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
-
-- Update to version 1.42.8:
-  + Add support for ppp 2.5.0.
-  + Fix nft rules for balance-slb bonding.
-  + Support port priority for bonding.
-  + Fix regression handling the PKEY_ID for infiniband profiles in
-    ifcfg-rh format.
-  + Fix race in nm-cloud-setup that caused partial configuration
-    and loss of connectivity with multiple interfaces.
-  + Don't touch "net.ipv6.conf.$IFACE.forwarding" unless explicitly
-    required for IPv6 sharing.
-  + Various bugfixes related to team, Wi-Fi P2P, IPv6LL.
-  + Automatically unblock autoconnect of profiles during reapply.
-
--------------------------------------------------------------------
-Wed May 31 03:30:40 UTC 2023 - Luciano Santos <luc14n0@opensuse.org>
-
-- Update https://www.gnome.org/projects/NetworkManager/ URL tag to
-  NM's newest home page: https://networkmanager.dev/, and main
-  package summary to: standard Linux network configuration tool
-  suite.
-
--------------------------------------------------------------------
-Sat May 13 16:50:57 UTC 2023 - Callum Farmer <gmbr3@opensuse.org>
-
-- Add nm-runstatedir.patch: to correct rundir from /var/run to /run
-  for systemd FHS compatibility
-
 -------------------------------------------------------------------
 Thu Apr 20 18:23:33 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
 
@@ -338,13 +27,6 @@ Thu Mar  9 09:52:07 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
     documentation.
   + Documentation improvements.
 
--------------------------------------------------------------------
-Mon Mar  6 03:08:01 UTC 2023 - Jonathan Kang <songchuan.kang@suse.com>
-- Changes from version 1.38.6 (bsc#1208631):
-  + Fix honoring DNS priority.
-  + Decline DHCPv6 lease when DAD fails.
-  + Various bugfixes.
-
 -------------------------------------------------------------------
 Thu Feb 23 09:59:19 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
 
@@ -535,8 +217,6 @@ Thu Aug 11 17:25:06 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
   + Fix DAD for DHCPv6 addresses.
   + Wi-Fi: improvements for OWE networks.
   + Support EC private keys.
-  + Fix nmcli tab completion support for embedded quote characters.
-  + Fix reapply for lldp/mdns/llmnr/dns-over-tls settings.
   + Various bugfixes.
 
 -------------------------------------------------------------------

NetworkManager.obsinfo

@@ -1,4 +0,0 @@
-name: NetworkManager
-version: 1.50.0
-mtime: 1727899484
-commit: acc9926e1da6aa58152e519abad4d80b9f371b3b

NetworkManager.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package NetworkManager
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -64,13 +64,13 @@
 %endif
 
 Name:           NetworkManager
-Version:        1.50.0
+Version:        1.42.6
 Release:        0
-Summary:        Standard Linux network configuration tool suite
+Summary:        Network Link Manager and user applications for it
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:          Productivity/Networking/System
-URL:            https://networkmanager.dev/
+URL:            https://www.gnome.org/projects/NetworkManager/
-Source0:        %{name}-%{version}.tar.zst
+Source0:        https://download.gnome.org/sources/NetworkManager/1.42/%{name}-%{version}.tar.xz
 Source1:        nfs
 Source2:        NetworkManager.conf
 Source3:        baselibs.conf
@@ -91,15 +91,11 @@ Patch5:         NetworkManager-1.10.6-netconfig.patch
 Patch6:         0001-Coerce-connectivity-LIMITED-to-NONE-when-device-is-d.patch
 # PATCH-FIX-OPENSUSE nm-add-CAP_SYS_ADMIN-permission.patch bsc#1129587 sckang@suse.com -- Add CAP_SYS_ADMIN which netconfig needs to call setdomainname
 Patch7:         nm-add-CAP_SYS_ADMIN-permission.patch
-# PATCH-FIX-SLE python3.6-in-sle.patch yfjiang@suse.com -- SLE still takes python 3.6 as primary runtime system, the patch makes meson find python 3.6
-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
 
 BuildRequires:  c++_compiler
 BuildRequires:  dnsmasq
 BuildRequires:  fdupes
-BuildRequires:  meson >= 0.51.0
+BuildRequires:  meson
 BuildRequires:  ncurses-devel
 BuildRequires:  pkgconfig
 BuildRequires:  ppp-devel
@@ -110,7 +106,7 @@ BuildRequires:  wireless-tools
 BuildRequires:  perl(YAML)
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(dbus-glib-1) >= 0.94
-BuildRequires:  pkgconfig(glib-2.0) >= 2.42
+BuildRequires:  pkgconfig(glib-2.0) >= 2.32
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(gtk-doc)
 BuildRequires:  pkgconfig(jansson) >= 2.7
@@ -150,6 +146,7 @@ Recommends:     dnsmasq
 Recommends:     iproute2
 Recommends:     iputils
 Recommends:     nftables
+Recommends:     org.freedesktop.ModemManager
 # Provides required by sysconfig. The latter is used by older versions.
 Provides:       dhcdbd = 1.14
 Provides:       service(network)
@@ -306,18 +303,14 @@ This package is intended to be installed by default for server deployments.
 
 %prep
 %setup -q
-%patch -P 0 -p1
+%patch0 -p1
 %if %{with_cacert_patch}
-%patch -P 1 -p1
+%patch1 -p1
-%endif
-%patch -P 4 -p1
-%patch -P 5 -p1
-%patch -P 6 -p1
-%patch -P 7 -p1
-%if 0%{?sle_version} && 0%{?sle_version} < 160000
-%patch -P 8 -p1
-%patch -P 9 -p1
 %endif
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 # Fix server.conf's location, to end up in %%{_defaultdocdir}/%%{name},
 # rather then %%{_datadir}/doc/%%{name}/examples:
@@ -470,7 +463,6 @@ rm -f %{buildroot}%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkMana
 %dir %{_prefix}/lib/NetworkManager/dispatcher.d
 %dir %{_prefix}/lib/NetworkManager/dispatcher.d/no-wait.d
 %dir %{_prefix}/lib/NetworkManager/dispatcher.d/pre-up.d
-%{_prefix}/lib/NetworkManager/dispatcher.d/pre-up.d/90-nm-cloud-setup.sh
 %dir %{_prefix}/lib/NetworkManager/dispatcher.d/pre-down.d
 %dir %{_prefix}/lib/NetworkManager/VPN
 %dir %{_prefix}/lib/firewalld

_service

@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<services>
-  <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.50.0</param>
-    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
-    <param name="versionrewrite-pattern">(.*)\+0</param>
-    <param name="versionrewrite-replacement">\1</param>
-<!--    <param name="changesgenerate">enable</param> -->
-  </service>
-  <service name="set_version" mode="manual" />
-  <service name="tar" mode="buildtime"/>
-  <service name="recompress" mode="buildtime">
-    <param name="file">*.tar</param>
-    <param name="compression">zst</param>
-  </service>
-</services>
-

nm-add-CAP_SYS_ADMIN-permission.patch

@@ -1,11 +1,9 @@
-Index: NetworkManager-1.50.0/data/NetworkManager.service.in
+--- NetworkManager-1.32.0-orig/data/NetworkManager.service.in	2021-06-10 22:26:13.000000000 +0200
-===================================================================
++++ NetworkManager-1.32.0/data/NetworkManager.service.in	2021-06-16 21:57:08.635254606 +0200
---- NetworkManager-1.50.0.orig/data/NetworkManager.service.in
+@@ -16,7 +16,7 @@
-+++ NetworkManager-1.50.0/data/NetworkManager.service.in
+ KillMode=process
-@@ -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
  

nm-dont-overwrite-resolv-conf.patch

@@ -1,8 +1,8 @@
-Index: NetworkManager-1.44.0/src/core/dns/nm-dns-manager.c
+Index: NetworkManager-1.40.0/src/core/dns/nm-dns-manager.c
 ===================================================================
---- NetworkManager-1.44.0.orig/src/core/dns/nm-dns-manager.c
+--- NetworkManager-1.40.0.orig/src/core/dns/nm-dns-manager.c
-+++ NetworkManager-1.44.0/src/core/dns/nm-dns-manager.c
++++ NetworkManager-1.40.0/src/core/dns/nm-dns-manager.c
-@@ -760,7 +760,7 @@ again:
+@@ -725,7 +725,7 @@ again:
      /* FIXME: don't write to netconfig synchronously. */
  
      /* Wait until the process exits */

python3.6-in-sle.patch

@@ -1,13 +0,0 @@
-Index: NetworkManager-1.44.2/meson.build
-===================================================================
---- NetworkManager-1.44.2.orig/meson.build
-+++ NetworkManager-1.44.2/meson.build
-@@ -882,7 +882,7 @@ test_args = [
- ]
- 
- py3 = import('python3')
--python = py3.find_python()
-+python = find_program('python3')
- 
- if python.found()
-   config_h.set_quoted('TEST_NM_PYTHON', python.path())

systemd-network-config.patch

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