import UBI nmstate-2.2.21-2.el9_3
This commit is contained in:
eabdullin
parent
ac764d2417
commit
2ed4deeaba
|
|
@ -1,2 +1,2 @@
|
|||
SOURCES/nmstate-2.2.19.tar.gz
|
||||
SOURCES/nmstate-vendor-2.2.19.tar.xz
|
||||
SOURCES/nmstate-2.2.21.tar.gz
|
||||
SOURCES/nmstate-vendor-2.2.21.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
7793d06955c3f9c4c5c182dd4568a7f2a929b7dc SOURCES/nmstate-2.2.19.tar.gz
|
||||
a91a9d2f0c97b752af9219e97cd273585b43d238 SOURCES/nmstate-vendor-2.2.19.tar.xz
|
||||
0f66f9a23f65fdd0e00c411f2f6b07cbed147194 SOURCES/nmstate-2.2.21.tar.gz
|
||||
87863b626cd3fd7f86ec4b094bd9b29eed4e9194 SOURCES/nmstate-vendor-2.2.21.tar.xz
|
||||
|
|
|
|||
|
|
@ -0,0 +1,39 @@
|
|||
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
|
||||
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEESP1vrlFad7SENoIch4lWe4cVzrwFAmVUn78ACgkQh4lWe4cV
|
||||
zrxlJA//dIzTBzhNOone/yv0/dv84Q8Eyh5Ai0ty9tEcYinwckuCjWXAuzYNevXr
|
||||
XqTr83qvBRvsQCv6fbc6K/8DeUfK2FciiIc7pBB+HwgTZu7OZa7y5iY91z6/Je+k
|
||||
5pc/40kB2B8ZmBta4D6IDCL3ysgWWUVpSZjyt2DShEAOBVrofF2PPQZyxmyPVOTJ
|
||||
itbe0kQlGjFFBJGd3KdsNAuJQ0Bfnpovsz0pUB9E5vu3GhBxV5WlTKBRnAl8+c/Z
|
||||
SIaK1moqpDkkBU35M+8EB7e5KV3P/9dnDMESC7gT2pQLAItswb4q5RWzZjq5y4v6
|
||||
dXFKwntmqp7/+B/3HSD1YmxiKpZvs2pxm3+5HHUex2WzRuKd40o76R9jZeuJmVLQ
|
||||
A0ifW/crNxXSmfNYBjD6v+FvrUHRS3w5UE/lkq6DkRNCsGd4RSu7gs46ETlgCZ7G
|
||||
LLtBULyNmdICr37sXSRDu1awZrvbA+y+lXzkfC9VNNYisZpNkH3sN/qV1NwOdiSy
|
||||
SUD9LxCkKKmderdqlDvTK+qQUfPMfiSbCX47sSVyJdLv0aQheiHJ+z17LfUDJlsK
|
||||
V1i03hLanIC30nb0zmgWSsNBpsCgqnuZX2ZS/6DDllIT2J4TZzS4OfQXNjmYtGm7
|
||||
smZIhC4a+Shh3ASEzG/o+T1q6sEy0Wd9nfU5cumMkwGFVHpptes=
|
||||
=25m1
|
||||
-----END PGP SIGNATURE-----
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEESP1vrlFad7SENoIch4lWe4cVzrwFAmV65jIACgkQh4lWe4cV
|
||||
zrxUzBAAlyK+n65QCzp1vWcUUoJ0q8N6MrbGsyvmXN5WYT9QhSS4+2RfGkId9SxN
|
||||
0xW2qqbdiOE9m/h4UNuWCvnSzsUcHRqSzMgpn4OFcwrrcVie7NvntoGlcV6bLReY
|
||||
hJFD/3818PELChCPQhvo5BFcU2wICEz0IYC/lQ+LiHStQa3wSmi+jO7cV67Pqsp8
|
||||
snZ1cJhmXq7UulqTYSBfZsUqfrOcgLDahUguIEkDPCWqcXbARyzMiAeTIgqCvtup
|
||||
UQuST6ibchla+sQh/MuGSEovQogN7mS8JWiBbo/uYyVEIXRbFZkqhJJNsiL66X7O
|
||||
YnM65dFHk/kaTw5LSHFf0PCsy0T2xwFYMuY04eXi+BDxc4z2C9JDQDHFfuKxVEIu
|
||||
8jKY1iLjcEr+FZvctWm7stARKb1lYAEPscmvZ0J8KWvswdMY8/Y9J1zkm9EirGv2
|
||||
sp1oABlp4LJG7z30QDzlK62qeaQy1Tn6GT2mzcwcLgfe0uTlbAxKg/2LN5YpcoIG
|
||||
edqBwCRdYRV8ohJroBsxC97E833289Xrh+eoJO5u4LFJVlkI9V0YM1KSGy4taOkb
|
||||
CFTsBpekd6OHxqi+pRQPuYB6GhcMxUtg32TQz9tnQLjRtLdiPdArPZV4+Fb1Z1W/
|
||||
ao0p3CZULb58b6TkDnVs+P6ln5crH9mYx5psbXvZKWrwGAgB3PQ=
|
||||
=8ufe
|
||||
-----END PGP SIGNATURE-----
|
||||
|
|
@ -3,8 +3,8 @@
|
|||
%define libname libnmstate
|
||||
|
||||
Name: nmstate
|
||||
Version: 2.2.19
|
||||
Release: 1%{?dist}
|
||||
Version: 2.2.21
|
||||
Release: 2%{?dist}
|
||||
Summary: Declarative network manager API
|
||||
License: LGPLv2+
|
||||
URL: https://github.com/%{srcname}/%{srcname}
|
||||
|
|
@ -12,6 +12,7 @@ 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-19322-ipsec-Fix-error-when-ipsec-interface-set-to-yes-or-a.patch
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: gnupg2
|
||||
|
|
@ -98,7 +99,7 @@ pushd rust/src/python
|
|||
%py3_build
|
||||
popd
|
||||
pushd rust
|
||||
%cargo_build
|
||||
%cargo_build --ignore-rust-version
|
||||
popd
|
||||
|
||||
%install
|
||||
|
|
@ -150,6 +151,13 @@ popd
|
|||
/sbin/ldconfig
|
||||
|
||||
%changelog
|
||||
* Tue Dec 19 2023 Gris Ge <fge@redhat.com> - 2.2.21-2
|
||||
- Fix `ipsec-interface` option. RHEL-19322
|
||||
|
||||
* Fri Dec 15 2023 Íñigo Huguet <ihuguet@redhat.com> - 2.2.21-1
|
||||
- Upgrade to 2.2.21
|
||||
- Add Custom DPD Parameter - Authby and Interface. RHEL-19322
|
||||
|
||||
* Wed Nov 15 2023 Gris Ge <fge@redhat.com> - 2.2.19-1
|
||||
- Fix static route converting auto IP interface to static IP. RHEL-16324
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue