[rpms/NetworkManager] rawhide: Merge #37 `spec: fix scriptlet dependencies`

[rpms/NetworkManager] rawhide: Merge #37 `spec: fix scriptlet dependencies`

[Josephine Pfeiffer]

A new commit has been pushed.

Repo   : rpms/NetworkManager
Branch : rawhide
Commit : f4a3dac29c1d734aded5c262aa65ecc487e6800b
Author : Josephine Pfeiffer <josie@redhat.com>
Date   : 2026-07-06T07:29:23+00:00
Stats  : +20/-86 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/NetworkManager/c/f4a3dac29c1d734aded5c262aa65ecc487e6800b?branch=rawhide

Log:
Merge #37 `spec: fix scriptlet dependencies`

---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index f9be29d..4b16512 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -160,10 +160,7 @@ Source9: readme-ifcfg-rh-migrated.txt
 Source10: 24-clat-auto.conf
 
 Requires(post): systemd
-Requires(post): systemd-udev
-Requires(post): /usr/sbin/update-alternatives
 Requires(preun): systemd
-Requires(preun): /usr/sbin/update-alternatives
 Requires(postun): systemd
 
 Requires: dbus >= %{dbus_version}
@@ -548,6 +545,8 @@ Group: System Environment/Base
 BuildArch: noarch
 Requires: NetworkManager
 Requires: /usr/bin/nmcli
+Requires(post): /usr/sbin/update-alternatives
+Requires(preun): /usr/sbin/update-alternatives
 Obsoletes: NetworkManager < %{obsoletes_initscripts_updown}
 
 %description initscripts-updown
@@ -824,8 +823,12 @@ fi
 
 
 %postun
-/usr/bin/udevadm control --reload-rules || :
-/usr/bin/udevadm trigger --subsystem-match=net || :
+# skip triggering if udevd isn't even accessible, e.g. containers or
+# rpm-ostree-based systems
+if [ -S /run/udev/control ]; then
+    /usr/bin/udevadm control --reload-rules || :
+    /usr/bin/udevadm trigger --subsystem-match=net || :
+fi
 %firewalld_reload
 
 %systemd_postun %{systemd_units}

diff --git a/.gitignore b/.gitignore
index 6f2643e..d02b5b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -457,3 +457,4 @@ prepare_sources_result*/
 /NetworkManager-1.56.0.tar.xz
 /NetworkManager-1.57.3-dev.tar.xz
 /NetworkManager-1.57.4-dev.tar.xz
+/NetworkManager-1.58-rc1.tar.xz

diff --git a/0001-nmtui-fix-wrong-use-of-assertions-in-bond-page.patch b/0001-nmtui-fix-wrong-use-of-assertions-in-bond-page.patch
deleted file mode 100644
index a4295f6..0000000
--- a/0001-nmtui-fix-wrong-use-of-assertions-in-bond-page.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 77c1cf9624e5eb788c47ff3a4feb61f4ed28a48b Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Wed, 27 May 2026 23:40:31 +0200
-Subject: [PATCH] nmtui: fix wrong use of assertions in bond page
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When building in release mode the compiler complains with:
-
-  ../src/nmtui/nmt-page-bond.c: In function ‘other_options_widget_changed’:
-  ../src/nmtui/nmt-page-bond.c:373:13: error: ‘name’ may be used uninitialized [-Werror=maybe-uninitialized]
-    373 |         if (_is_other_option(name)) {
-        |             ^~~~~~~~~~~~~~~~~~~~~~
-  ../src/nmtui/nmt-page-bond.c:357:25: note: ‘name’ was declared here
-    357 |     const char         *name;
-        |                         ^~~~
-
-That happens because "name" is initialized inside an assertion, which
-is removed in release builds. Assertions must not have side effects.
-
-Move the initialization out of the assertion.
-
-Fixes: 6a841072ec3b ('nmtui/bond: introduce "other options" list')
----
- src/nmtui/nmt-page-bond.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/nmtui/nmt-page-bond.c b/src/nmtui/nmt-page-bond.c
-index 962a95096b..eeea0b0b73 100644
---- a/src/nmtui/nmt-page-bond.c
-+++ b/src/nmtui/nmt-page-bond.c
-@@ -87,8 +87,10 @@ _bond_update_other_options(NMSettingBond *s_bond, NmtList *list)
-     for (i = 0; i < num_opts; i++) {
-         const char *opt_name;
-         const char *opt_value;
-+        gboolean    ret;
- 
--        nm_assert(nm_setting_bond_get_option(s_bond, i, &opt_name, &opt_value));
-+        ret = nm_setting_bond_get_option(s_bond, i, &opt_name, &opt_value);
-+        nm_assert(ret);
- 
-         if (_is_other_option(opt_name)) {
-             g_ptr_array_add(arr, g_strdup_printf("%s=%s", opt_name, opt_value));
-@@ -355,6 +357,7 @@ other_options_widget_changed(GObject *object, GParamSpec *pspec, gpointer user_d
-     NmtPageBondPrivate *priv          = NMT_PAGE_BOND_GET_PRIVATE(bond);
-     gs_strfreev char  **other_options = NULL;
-     const char         *name;
-+    gboolean            ret;
-     guint               num;
-     guint               i;
- 
-@@ -368,7 +371,8 @@ other_options_widget_changed(GObject *object, GParamSpec *pspec, gpointer user_d
- again:
-     num = nm_setting_bond_get_num_options(priv->s_bond);
-     for (i = 0; i < num; i++) {
--        nm_assert(nm_setting_bond_get_option(priv->s_bond, i, &name, NULL));
-+        ret = nm_setting_bond_get_option(priv->s_bond, i, &name, NULL);
-+        nm_assert(ret);
- 
-         if (_is_other_option(name)) {
-             nm_setting_bond_remove_option(priv->s_bond, name);
--- 
-2.53.0
-

diff --git a/NetworkManager.spec b/NetworkManager.spec
index 8cb2d64..4b16512 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -5,8 +5,8 @@ URL:     https://networkmanager.dev/
 Group:   System Environment/Base
 
 Epoch:   1
-Version: 1.57.4~dev
-Release: 2%{?dist}
+Version: 1.58~rc1
+Release: 1%{?dist}
 
 ###############################################################################
 
@@ -34,11 +34,6 @@ Release: 2%{?dist}
 %global systemd_units_cloud_setup nm-cloud-setup.service nm-cloud-setup.timer
 
 ###############################################################################
-%if 0%{?fedora} > 40 || 0%{?rhel} >= 10
-%bcond_with dhclient
-%else
-%bcond_without dhclient
-%endif
 %bcond_without adsl
 %bcond_without bluetooth
 %bcond_without wwan
@@ -164,9 +159,6 @@ Source8: readme-ifcfg-rh.txt
 Source9: readme-ifcfg-rh-migrated.txt
 Source10: 24-clat-auto.conf
 
-# Keep until next rebase
-Patch1: 0001-nmtui-fix-wrong-use-of-assertions-in-bond-page.patch
-
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
@@ -578,11 +570,6 @@ Preferably use nmcli instead.
 	-Dnft=%{_sbindir}/nft \
 	-Diptables=%{_sbindir}/iptables \
 	-Dip6tables=%{_sbindir}/ip6tables \
-%if %{with dhclient}
-	-Ddhclient=%{_sbindir}/dhclient \
-%else
-	-Ddhclient=no \
-%endif
 	-Ddhcpcd=no \
 	-Dcrypto=gnutls \
 %if %{with debug}
@@ -1076,6 +1063,14 @@ fi
 
 
 %changelog
+* Thu Jul 02 2026 Josephine Pfeiffer <josie@redhat.com> - 1:1.58~rc1-1
+- Update to 1.58-rc1 release
+- Drop patches now merged upstream (nmtui bond assertions, libnm cert dir permissions)
+- Drop the dhclient meson option, removed upstream in 1.58
+
+* Thu Jun 11 2026 Christian Krause <chkr@fedoraproject.org> - 1:1.57.4-3
+- Apply upstream patch to fix strongSwan VPN connection problem (rhbz#2461399)
+
 * Thu Jun 04 2026 Jaroslav Škarvada <jskarvad@redhat.com> - 1:1.57.4-2
 - Rebuilt for new ppp
 

diff --git a/sources b/sources
index 400e2b3..ae9dcc2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (NetworkManager-1.57.4-dev.tar.xz) = a6219479ed133a55e3cc207bfad10a8bf54dd74c4d5581dd731f406c46210d35bba497d24adbb05890673e4d14d0f762431a14a5bea2a4c2f79307c55ce62792
+SHA512 (NetworkManager-1.58-rc1.tar.xz) = 35a4ada775e411bfb74345d1d492b9297a3a8c42412d2ca16d74bb118ffe2dc982749761f8b682336e5724213455769032889c4670efe1bfe4a479640b6af328