From 06fc0bc69cca4fade171342857caa30644d8f9fc Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 22 Jan 2024 20:33:00 +0000 Subject: [PATCH] import UBI nmstate-2.2.23-1.el9_3 --- .gitignore | 4 +- .nmstate.metadata | 4 +- ...when-ipsec-interface-set-to-yes-or-a.patch | 39 -------------- SOURCES/nmstate-2.2.21.tar.gz.asc | 16 ------ SOURCES/nmstate-2.2.23.tar.gz.asc | 16 ++++++ SOURCES/nmstate.gpg | 51 ++++++++++++++++++- SPECS/nmstate.spec | 21 ++++---- 7 files changed, 79 insertions(+), 72 deletions(-) delete mode 100644 SOURCES/RHEL-19322-ipsec-Fix-error-when-ipsec-interface-set-to-yes-or-a.patch delete mode 100644 SOURCES/nmstate-2.2.21.tar.gz.asc create mode 100644 SOURCES/nmstate-2.2.23.tar.gz.asc diff --git a/.gitignore b/.gitignore index 903b458..88f8e8e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/nmstate-2.2.21.tar.gz -SOURCES/nmstate-vendor-2.2.21.tar.xz +SOURCES/nmstate-2.2.23.tar.gz +SOURCES/nmstate-vendor-2.2.23.tar.xz diff --git a/.nmstate.metadata b/.nmstate.metadata index 3025828..9f6c5b5 100644 --- a/.nmstate.metadata +++ b/.nmstate.metadata @@ -1,2 +1,2 @@ -0f66f9a23f65fdd0e00c411f2f6b07cbed147194 SOURCES/nmstate-2.2.21.tar.gz -87863b626cd3fd7f86ec4b094bd9b29eed4e9194 SOURCES/nmstate-vendor-2.2.21.tar.xz +4ed04c63fba953243ab6025ef5a7b50e8d4985a9 SOURCES/nmstate-2.2.23.tar.gz +ff3e4b852bb1b983e79d4b4616d467f7eeffcefa SOURCES/nmstate-vendor-2.2.23.tar.xz diff --git a/SOURCES/RHEL-19322-ipsec-Fix-error-when-ipsec-interface-set-to-yes-or-a.patch b/SOURCES/RHEL-19322-ipsec-Fix-error-when-ipsec-interface-set-to-yes-or-a.patch deleted file mode 100644 index 8533662..0000000 --- a/SOURCES/RHEL-19322-ipsec-Fix-error-when-ipsec-interface-set-to-yes-or-a.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9203d781cbb12fab9f5a6fd7d4ac108c263b4254 Mon Sep 17 00:00:00 2001 -From: Gris Ge -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 ---- - 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 - diff --git a/SOURCES/nmstate-2.2.21.tar.gz.asc b/SOURCES/nmstate-2.2.21.tar.gz.asc deleted file mode 100644 index 4286ab8..0000000 --- a/SOURCES/nmstate-2.2.21.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------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----- diff --git a/SOURCES/nmstate-2.2.23.tar.gz.asc b/SOURCES/nmstate-2.2.23.tar.gz.asc new file mode 100644 index 0000000..f09728b --- /dev/null +++ b/SOURCES/nmstate-2.2.23.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEESP1vrlFad7SENoIch4lWe4cVzrwFAmWnl9sACgkQh4lWe4cV +zrwWjhAAyFbDbO5mrhRzZ0PRxVSesMzeo4Hsf5vIeAfbSqNuCU2grUpd71e1IUBM +8B1bFB/IaPLiT4hi+m5gxdwlbV5chZgpQstwZ3cLJkhrBNVsfCh5+DJaRq00wdXv +obC7xSNeIOD13XaVlbl2+MJD4qloE/3trM8TOQ3+jFKpCBGz+/HeO2UeLX+GyY5G ++kcQw8lc36+Dq8oeLIDuA/yaHyeyNRR77Ff4LS9khlzvrMjn5Ra1Vxua5HamBjNt +Mg07H6e3UQ5Ctb81NI9TUU6H24YltytyeB1hUsHkv9IWiTk8TKTNXVFDWVS6obrw +m7LY5oipEwpIJsLBuZnXdMKBRaapizLk8W3u+nV9nqvChJECyXFmFyspnybpL4vQ +oWr8rBmR/QgQGHsBtHdHBVb45RSsUnqbxSXbjzkMdybEYWbhOdwsMja+Ib5P4kHr +SrC897c+iS+ZFMHnDGq93RPrxlEf/zERvFlfk2w4/0hqJSKCnCMlKePmrZp8lLwE +XX9YDnAuytqwfRn63g/rn+8Lkktx6cB0DxKqmR3GbNp1t8NRl+I2bOQjgn84f6Ly +Or9xEXnnxkWWv2rmUVXUzdRO3v2QSK/AO9Etw97fj7pzgLccXBfOXlSMcL22t0l6 +lREm95hK3nj3uBwwAgYYGGluBUdZ+w96JxgOpejzEamutVFNpcM= +=xuSg +-----END PGP SIGNATURE----- diff --git a/SOURCES/nmstate.gpg b/SOURCES/nmstate.gpg index 3b3a89b..05ff659 100644 --- a/SOURCES/nmstate.gpg +++ b/SOURCES/nmstate.gpg @@ -94,6 +94,53 @@ V95yJtLnCnFdKlnyzT9HDepWfG8266hgBD+OQ/Kvhx6SmIImCgMOtcDW+fAz3X5L YjVo4IPCmJLRb9b8kPX9JuJWDnYWd0SOB00ImaGeXd/kV8W30Lss1OeQ7iya/Ej7 t878uw4RVPKsgCQTWKOWhC0r0DNE/bskGrWZAJGC3M7yqzAErxiIOBKRwH2haegT syMyW5sNgF43zvxzEHACZnbx+qzHYf+SeQg4pRxLlZj6/Udc3hM/j1cGkMMiwl23 -i2QY7dEEs/uMRtq8C8kSWg== -=259x +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 +KfYnetRPLeXiMqWKTUaImA== +=a0yN -----END PGP PUBLIC KEY BLOCK----- diff --git a/SPECS/nmstate.spec b/SPECS/nmstate.spec index 5f37a11..be95806 100644 --- a/SPECS/nmstate.spec +++ b/SPECS/nmstate.spec @@ -3,8 +3,8 @@ %define libname libnmstate Name: nmstate -Version: 2.2.21 -Release: 2%{?dist} +Version: 2.2.23 +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-19322-ipsec-Fix-error-when-ipsec-interface-set-to-yes-or-a.patch BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: gnupg2 @@ -84,14 +83,6 @@ pushd rust # Source3 is vendored dependencies %cargo_prep -V 3 -# The cargo_prep will create `.cargo/config` which take precedence over -# `.cargo/config.toml` shipped by upstream which fix the SONAME of cdylib. -# To workaround that, merge upstream rustflags into cargo_prep created one. -_FLAGS=`sed -ne 's/rustflags = "\(.\+\)"/\1/p' .cargo/config.toml` -sed -i -e "s/rustflags = \[\(.\+\), \]$/rustflags = [\1, \"$_FLAGS\"]/" \ - .cargo/config -rm .cargo/config.toml - popd %build @@ -151,6 +142,14 @@ popd /sbin/ldconfig %changelog +* Wed Jan 17 2024 Fernando Fernandez Mancera - 2.2.23-1 +- Upgrade to 2.2.23 +- Support type, hostaddrfamily and clientaddrfamily options in IPSec. RHEL-21354 + +* Fri Jan 05 2024 Gris Ge - 2.2.22-1 +- Use hash value to mark applied yml files at nmstatectl service. RHEL-19778 +- Support SRIOV VLAN protocol. RHEL-16487 + * Tue Dec 19 2023 Gris Ge - 2.2.21-2 - Fix `ipsec-interface` option. RHEL-19322