Upgrade to 2.2.22

Resolves: RHEL-1425
Resolves: RHEL-19680

Signed-off-by: Gris Ge <fge@redhat.com>

.gitignore

@@ -200,3 +200,6 @@
 /nmstate-2.2.21.tar.gz
 /nmstate-2.2.21.tar.gz.asc
 /nmstate-vendor-2.2.21.tar.xz
+/nmstate-2.2.22.tar.gz
+/nmstate-2.2.22.tar.gz.asc
+/nmstate-vendor-2.2.22.tar.xz

RHEL-17403-ipsec-Fix-error-when-ipsec-interface-set-to-yes-or-a.patch

@@ -1,39 +0,0 @@
-From 9203d781cbb12fab9f5a6fd7d4ac108c263b4254 Mon Sep 17 00:00:00 2001
-From: Gris Ge <fge@redhat.com>
-Date: Fri, 15 Dec 2023 20:45:11 +0800
-Subject: [PATCH] ipsec: Fix error when `ipsec-interface` set to yes or a
- number
-
-The new nispor 1.2.15 is showing xfrm interface type as `Other("Xfrm")`
-as its dependent netlink-packet-route is not placing it into Other.
-
-To fix that, we just compare the interface type after
-`str::to_lowercase()`.
-
-No test code needed, existing
-`test_ipsec_ipv4_libreswan_psk_auth_with_ipsec_iface` can reproduce this
-problem.
-
-Signed-off-by: Gris Ge <fge@redhat.com>
----
- rust/src/lib/nispor/base_iface.rs | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/rust/src/lib/nispor/base_iface.rs b/rust/src/lib/nispor/base_iface.rs
-index 415769d3..011182e6 100644
---- a/rust/src/lib/nispor/base_iface.rs
-+++ b/rust/src/lib/nispor/base_iface.rs
-@@ -26,7 +26,9 @@ fn np_iface_type_to_nmstate(
-         nispor::IfaceType::Vxlan => InterfaceType::Vxlan,
-         nispor::IfaceType::Ipoib => InterfaceType::InfiniBand,
-         nispor::IfaceType::Tun => InterfaceType::Tun,
--        nispor::IfaceType::Other(v) if v == "xfrm" => InterfaceType::Xfrm,
-+        nispor::IfaceType::Other(v) if v.to_lowercase() == "xfrm" => {
-+            InterfaceType::Xfrm
-+        }
-         _ => InterfaceType::Other(format!("{np_iface_type:?}")),
-     }
- }
--- 
-2.43.0
-

nmstate.spec

@@ -3,8 +3,8 @@
 %define libname libnmstate
 
 Name:           nmstate
-Version:        2.2.21
-Release:        2%{?dist}
+Version:        2.2.22
+Release:        1%{?dist}
 Summary:        Declarative network manager API
 License:        LGPLv2+
 URL:            https://github.com/%{srcname}/%{srcname}
@@ -12,7 +12,6 @@ Source0:        https://github.com/nmstate/nmstate/releases/download/v%{version}
 Source1:        https://github.com/nmstate/nmstate/releases/download/v%{version}/nmstate-%{version}.tar.gz.asc
 Source2:        https://nmstate.io/nmstate.gpg
 Source3:        https://github.com/nmstate/nmstate/releases/download/v%{version}/nmstate-vendor-%{version}.tar.xz
-Patch1:         RHEL-17403-ipsec-Fix-error-when-ipsec-interface-set-to-yes-or-a.patch
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  gnupg2
@@ -151,6 +150,9 @@ popd
 /sbin/ldconfig
 
 %changelog
+* Fri Jan 05 2024 Gris Ge <fge@redhat.com> - 2.2.22-1
+- Upgrade to 2.2.22.
+
 * Tue Dec 19 2023 Gris Ge <fge@redhat.com> - 2.2.21-2
 - Fix `ipsec-interface` option. RHEL-17403
 

sources

@@ -1,4 +1,4 @@
-SHA512 (nmstate-2.2.21.tar.gz) = 5b367547064eba4f76bb1ccccab517bf67bf8b9f6d1afd9041ccba075863e168b2f29719276f4cc8eaf6e1fe6e1ce941828f79d2f7bd08b187e09c1eb3156d22
-SHA512 (nmstate-2.2.21.tar.gz.asc) = 9dc40cc990fdd12ec5f776a36c99c75a84dfc961207b8080de43e7564f38e9f0cada8d8e786e6ff4b8ca291446dc70920b6c966734d510e2293c259d68d3fa5d
-SHA512 (nmstate-vendor-2.2.21.tar.xz) = 9da67a516657b87d82318775ed47b826089cd970f00c1e62aa7a9a5898cd66c54cec400561f2c9704916e5c618bb6a63a41abacc33c5d0d2c647c86eef116294
+SHA512 (nmstate-2.2.22.tar.gz) = 4acf5ba806e940d348d17c34da170248545796784f4d4fafb05c3c6f7a4831fee9f255e21aafcdfb5465d7fd1fac291d5dce13972ceb13dc20e1f252da3344b9
+SHA512 (nmstate-2.2.22.tar.gz.asc) = 0ac02338633ec7a05a4d0bf6b4f3481b900f76a9511e01ac394ca995154f4a508fdb47ff661e955e17f7ed2191bbb53eda0bf259556b3a6da751011ad45f302c
 SHA512 (nmstate.gpg) = bfbf3620045f3c1f15eaf6877fd7407834a75d2650976f2327abd02ddb910aa34500f07a774dd17023c43dcba42a0ffc66f23cd6816fd9694acad2c5eed9e8d3
+SHA512 (nmstate-vendor-2.2.22.tar.xz) = 8a625800c9930b02186a4d1b94cd523e938402ba4340e8fdb6ae3abfee09f79002e4e9a6b08ccaa706f998eceb855eae4c68036cac9b015a05d8d88f00556c1e