From 6880bc7ae3fd7f309bc6bd8b653d4c1a3f3aa26c Mon Sep 17 00:00:00 2001
From: Filip Pokryvka <fpokryvk@redhat.com>
Date: Wed, 12 Feb 2025 14:10:20 +0100
Subject: [PATCH] Release candidate 1.51.90 (rc1)

Fix balance-slb ports rarely not being active after reboot

Revert previous attempt to fix build on ppc64.
We limit number of jobs on ppc64 to avoid high RAM usage.

Related: RHEL-77167
---
 .gitignore                            |  1 +
 1001-disable-lto-partition-none.patch | 28 ---------------------------
 NetworkManager.spec                   | 23 ++++++++++++++++++----
 sources                               |  2 +-
 4 files changed, 21 insertions(+), 33 deletions(-)
 delete mode 100644 1001-disable-lto-partition-none.patch

diff --git a/.gitignore b/.gitignore
index 5d2da77..6c05d2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -452,3 +452,4 @@ network-manager-applet-0.8.1.tar.bz2
 /NetworkManager-1.51.5.tar.xz
 /NetworkManager-1.51.6.tar.xz
 /NetworkManager-1.51.7.tar.xz
+/NetworkManager-1.51.90.tar.xz
diff --git a/1001-disable-lto-partition-none.patch b/1001-disable-lto-partition-none.patch
deleted file mode 100644
index c397960..0000000
--- a/1001-disable-lto-partition-none.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 4f6d14da9a..335a7348ee 100644
---- a/meson.build
-+++ b/meson.build
-@@ -172,18 +172,10 @@ if enable_ld_gc
- endif
- 
- enable_lto = get_option('b_lto')
--if enable_lto
--  if  cc.get_id() == 'clang'
--    clang_version = cc.version()
--    if clang_version <= '18.0.0'
--      error('Clang version should be greater then 18.0.0 got : ' + clang_version)
--    endif
--  else
--    # Meson already adds '-flto'
--    lto_flag = '-flto-partition=none'
--    assert(cc.has_argument(lto_flag), '-flto-partition=none not supported. Disable link-time optimization with -Db_lto=false.')
--    common_flags += lto_flag
--    common_ldflags += lto_flag
-+if enable_lto and cc.get_id() == 'clang'
-+  clang_version = cc.version()
-+  if clang_version <= '18.0.0'
-+    error('Clang version should be greater then 18.0.0 got : ' + clang_version)
-   endif
- endif
- 
-
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 5fe44ba..4378342 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -4,10 +4,10 @@
 %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
 
 %global epoch_version 1
-%global real_version 1.51.7
+%global real_version 1.51.90
 %global git_tag_version_suffix -dev
 %global rpm_version %{real_version}
-%global release_version 2
+%global release_version 1
 %global snapshot %{nil}
 %global git_sha %{nil}
 %global bcond_default_debug 0
@@ -156,6 +156,11 @@
 %global ebpf_enabled "no"
 %endif
 
+# Fedora 33 enables LTO by default by setting CFLAGS="-flto -ffat-lto-objects".
+# However, we also require "-flto -flto-partition=none", so disable Fedora's
+# default and use our configure option --with-lto instead.
+%define _lto_cflags %{nil}
+
 ###############################################################################
 
 Name: NetworkManager
@@ -183,7 +188,7 @@ Source9: readme-ifcfg-rh-migrated.txt
 # Patch0001: 0001-some.patch
 
 # Bugfixes that are only relevant until next rebase of the package.
-Patch1001: 1001-disable-lto-partition-none.patch
+# Patch1001: 1001-some.patch
 
 Requires(post): systemd
 Requires(post): systemd-udev
@@ -710,7 +715,14 @@ Preferably use nmcli instead.
 	-Dconfig_dns_rc_manager_default=%{dns_rc_manager_default} \
 	-Dconfig_logging_backend_default=journal
 
-%meson_build
+# Limit number of jobs on ppc64 to prevent high RAM usage
+%ifarch ppc64le
+%global numjobs 4
+%else
+%global numjobs %{_smp_build_ncpus}
+%endif
+
+%meson_build -j %{numjobs}
 
 %install
 %meson_install
@@ -1068,6 +1080,9 @@ fi
 
 
 %changelog
+* Wed Feb 12 2025 Filip Pokryvka <fpokryvk@redhat.com> - 1:1:51.90-1
+- Fix balance-slb ports rarely not being active after reboot (RHEL-77167)
+
 * Mon Feb 10 2025 Íñigo Huguet <ihuguet@redhat.com> - 1:1:51.7-2
 - Remove the build argument -flto-partition to avoid compilation crashes due
   to high memory usage.
diff --git a/sources b/sources
index 644f433..4227448 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (NetworkManager-1.51.7.tar.xz) = 77844e95a2d2039903b05eabd01910fe13ebb1efcab618891fd15bee6fc331ba1eddfe0e6db32566d6150eb5cce0883a86ae1f2b383d6d038d02f5dba8b84068
+SHA512 (NetworkManager-1.51.90.tar.xz) = 7684d27a5e3ec89a97b02e23284602b65f4fd9f028496348ed521b1b0c225c51f68cabf514a51901e39fcc872e913523c71c77ac5662f3b2e28e4a39d54d1391