From 5a8a86764dbae3defd61cb8c62f1cfb6b82c5a86 Mon Sep 17 00:00:00 2001 From: AlmaLinux RelEng Bot Date: Wed, 3 Jun 2026 04:47:14 -0400 Subject: [PATCH] import UBI nmstate-2.2.60-2.el10_2 --- .gitignore | 4 +- 0001-nispor-fix-ipoib-iface-type.patch | 63 ++++++++++++++++++++++++++ nmstate-2.2.58.tar.gz.asc | 16 ------- nmstate-2.2.60.tar.gz.asc | 11 +++++ nmstate.spec | 23 +++++++++- sources | 4 +- 6 files changed, 99 insertions(+), 22 deletions(-) create mode 100644 0001-nispor-fix-ipoib-iface-type.patch delete mode 100644 nmstate-2.2.58.tar.gz.asc create mode 100644 nmstate-2.2.60.tar.gz.asc diff --git a/.gitignore b/.gitignore index e9d70a2..6018a46 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -nmstate-2.2.58.tar.gz -nmstate-vendor-2.2.58.tar.xz +nmstate-2.2.60.tar.gz +nmstate-vendor-2.2.60.tar.xz diff --git a/0001-nispor-fix-ipoib-iface-type.patch b/0001-nispor-fix-ipoib-iface-type.patch new file mode 100644 index 0000000..6a4aabb --- /dev/null +++ b/0001-nispor-fix-ipoib-iface-type.patch @@ -0,0 +1,63 @@ +From 18fce5de48c2687131eab604c31c4738ffc2554c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=8D=C3=B1igo=20Huguet?= +Date: Mon, 4 May 2026 07:24:15 +0200 +Subject: [PATCH] infiniband: restore detection of Ipoib iface type +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes 5e13d3f "Prefer LinkInfo::Kind as interface type". This commit +made to always prefer InfoKind over anything for Ethernet, but at the +same time it made to prefer LinkLayerType over InfoKind for Infiniband. +This causes that the Ipoib iface typeis not detected anymore, causing +two problems: +- Interfaces previously detected as Ipoib are now detected as + Infiniband, breaking some clients like nmstate. +- The Ipoib data is not parsed, as it is only done for Ipoib iface type. + +Fix it by prefering the "Infiniband" generic type only if no InfoKind +was detected, or InfoKind::Other was detected. + +Signed-off-by: Íñigo Huguet +--- + src/lib/query/iface.rs | 23 ++++++++++++++++------- + 1 file changed, 16 insertions(+), 7 deletions(-) + +diff --git a/src/lib/query/iface.rs b/src/lib/query/iface.rs +index 9e21070..cce4f40 100644 +--- a/vendor/nispor/query/iface.rs ++++ b/vendor/nispor/query/iface.rs +@@ -420,14 +420,23 @@ pub(crate) fn parse_nl_msg_to_iface( + }, + _ => IfaceType::Other(format!("{t:?}").to_lowercase()), + }; +- // Always prefer InfoKind unless link type is loopback or +- // infiniband. +- if !matches!( +- iface_state.iface_type, +- IfaceType::Loopback | IfaceType::Infiniband +- ) { +- iface_state.iface_type = iface_type; ++ ++ // We prefer LinkLayerType over InfoKind for loopback, as it ++ // is more accurate in this case. We also prefer it for ++ // infiniband, but only if we didn't detect a specific ++ // InfoKind (we detected Other). For example, Ipoib is more ++ // specific than Infiniband, but Other is not. ++ if iface_state.iface_type == IfaceType::Loopback ++ || (iface_state.iface_type == IfaceType::Infiniband ++ && matches!(iface_type, IfaceType::Other(_))) ++ { ++ continue; + } ++ ++ // For any other case, we prefer InfoKind over LinkLayerType ++ // as it is almost always more accurate. LinkLayerType is ++ // set as ethernet for most device types. ++ iface_state.iface_type = iface_type; + } + } + for info in infos { +-- +2.53.0 + diff --git a/nmstate-2.2.58.tar.gz.asc b/nmstate-2.2.58.tar.gz.asc deleted file mode 100644 index 5feead5..0000000 --- a/nmstate-2.2.58.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEESP1vrlFad7SENoIch4lWe4cVzrwFAmmBms0ACgkQh4lWe4cV -zrzmcg/8C7w/0bKC6apqcux+HJb4J38fBy1ZLrvItBhT9gPka8VmbbUWKziBzHa6 -+4bRKxKJGY76RCZ88zlMR3hvKvWbir60WxsMi+Wk8pa8x4nWsvxJUTCZSJW437K7 -DWuaGui8OAMwLyiocUcf2BXTv0fwlj77PY4h9i6tI81BQoWbD2YHB7/oUxER9SgT -E4Yh/UO9HTlwxtEbM9qQ3m6mnA8vVsdJ6d4vaeqoGGHvLHtr+2jN1nGZb14MyqTU -ke0tS1JWPK5zMeyPs8H4I6cXUbiryeGhLBVr6G4OL5ipA2j6T1HXfQM4VKFgd9oR -z68AP1lNm7zmuEURyd0mCxRSF55I06RvQ48U41SYbTkGJ4sGBcf+cSmNFm6C3u92 -QfJGwa2+FXQQC0vte8p7K/5nLXn13qFPgmVv7BuDoaBytg4Ph3jBuVEP5T0ciADK -Vd9MHNLVL/bUHKkoCtGy9Jl4orxC/7tKxOSq2/eG9z+lFS/1J6P/KotIwWMN6udp -PNDhTFTAJT8QKl/syETGpnQbfeZ0q8612UQB0VzwoIiQM+stTJQ8HRejUCtL0dp6 -kkBAdPrKEdHzU6dmfZWwnKU9Y9a7B8h9IdRjsMkwQMY2E071ZmgQToU//Vst2rsf -++p7gYVfCH9AVXht4N6eNeaTCD4A5JLk66OTXlxyu/aIpmFCbfI= -=OoqX ------END PGP SIGNATURE----- diff --git a/nmstate-2.2.60.tar.gz.asc b/nmstate-2.2.60.tar.gz.asc new file mode 100644 index 0000000..7808e37 --- /dev/null +++ b/nmstate-2.2.60.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEEB/muyGFEOG2VdiELZqRHgbTrwtAFAmnojNsACgkQZqRHgbTr +wtAuOgf/fgqzvQh+cAUPLa1J1W1sA0ij8eXtOxRAK1wweUi9sS3Yg72rubTAtDGL +vgm6rGMNRHkrt13IKt1e/VwhM1IlZplj5mF4615+NnimokJksU2l9r0gw8KwkZvz +9LO2D6LNtz/qpHISX4VCULwZrW0JpTTpc+L0vJxtwhL5ZApG3n4jKipZ+x1o7f5l +oswDyTf90VcLhgiCMiSJdoVCfhxZJuttJVpIpYvPxD44tjpuFaa24e30k6S/zSop +tBFHnvDu6S0/pjKNG7/vzkSUWrbGeaOcopIQLeQQIE7XcFd1x0FrKUHkVAmXq9lu +k0Fi8L9C3+zuw1lCPEloVgCMcKAX6w== +=5HTd +-----END PGP SIGNATURE----- diff --git a/nmstate.spec b/nmstate.spec index b1e1e09..93ac231 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ ## (rpmautospec version 0.8.3) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 1; + release_number = 2; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} @@ -12,7 +12,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.58 +Version: 2.2.60 Release: %autorelease Summary: Declarative network manager API License: Apache-2.0 AND LGPL-2.1-or-later @@ -22,6 +22,7 @@ Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.g Source2: https://nmstate.io/nmstate.gpg Source3: %{url}/releases/download/v%{version}/%{srcname}-vendor-%{version}.tar.xz Requires: (nmstate-libs%{?_isa} = %{version}-%{release} if nmstate-libs) +Patch1: 0001-nispor-fix-ipoib-iface-type.patch BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: gnupg2 @@ -93,6 +94,13 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %autosetup -n %{name}-%{version_no_tilde} -p1 %{?rhel:-a3} +# If we have a patch for a vendored dependency, cargo refuses to build, +# in order to prevent accidental manual changes to vendored crates. +# This is not needed in an rpm build. Clear the list of files for which +# to check the checksum. +find vendor -name .cargo-checksum.json \ + -exec sed -i.uncheck -e 's/"files":{[^}]*}/"files":{ }/' '{}' '+' + pushd rust %if 0%{?rhel} mv ../vendor ./ @@ -161,6 +169,17 @@ popd %changelog ## START: Generated by rpmautospec +* Wed May 06 2026 Íñigo Huguet - 2.2.60-2 +- Fix infiniband devices + +* Thu Apr 23 2026 Jan Vaclav - 2.2.60-1 +- Upgrade to 2.2.60 +- ipv4: Add new parameter prefix-route-metric RHEL-170697 + +* Fri Mar 06 2026 Rahul Rajesh - 2.2.59-1 +- Upgrade to 2.2.59 +- Add support for lock-mtu option. RHEL-151937 + * Wed Feb 11 2026 Mingyu Shi - 2.2.58-1 - Upgrade to 2.2.58 - vrf: Handle ignore interface when verifying desired state. RHEL-1417 diff --git a/sources b/sources index 95fb388..a7795e6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nmstate-2.2.58.tar.gz) = c1b5e16896e95d475e8879dda0941b7850af4ab31c07e2516600142eaf9695ba4253719ec75ac08e7215cc450c51592a3c9b5f3e8181bc7e4ae74523485b8795 -SHA512 (nmstate-vendor-2.2.58.tar.xz) = 103c812b79b266bb47d446b9f2f4eb92fa69786234034ccb9576e278d2c6850459758ffc1a75b9e0a0fa3e467c43f08d16719475155ece0df16b2257ad2c600b +SHA512 (nmstate-2.2.60.tar.gz) = a1ac0d787c74c551297948aea18a4f81e61ecee139e2ed39d74fde535a3b2418e3bab121f9b2edb6613d9c11829e2018caa0300741c555cbe0d64f94c72cf123 +SHA512 (nmstate-vendor-2.2.60.tar.xz) = 9d78020f6dd0c8380aecc070ace4b5731336099f7c2a9a30387a2e8e4eebfa24a32859404f2c39402dfda2625a19292a27fd311e4b4821cd7098d873a3ce87c1