From 7ae45f320b8e5e3877a8e5098cf5b200c4daad58 Mon Sep 17 00:00:00 2001 From: Renbo Date: Fri, 29 Nov 2024 15:15:20 +0800 Subject: [PATCH 1/4] [BA] update to nmstate-2.2.35-1.src.rpm to #IB7WLC update to nmstate-2.2.35-1.src.rpm Signed-off-by: Renbo --- dist | 2 +- download | 6 ++--- nmstate.gpg | 50 +++++++++++++++++++++++++++++++++++++- nmstate.spec | 68 ++++++++++++++++++++++++++-------------------------- 4 files changed, 87 insertions(+), 39 deletions(-) diff --git a/dist b/dist index 9b27344..89c1faf 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an9_4 +an9 diff --git a/download b/download index 3196a48..a08d025 100644 --- a/download +++ b/download @@ -1,3 +1,3 @@ -46c9266a314fca81e9a94b0a5c84d8c0 nmstate-2.2.33.tar.gz -4465ec5625f72b2b718eee8a82199495 nmstate-2.2.33.tar.gz.asc -eb0b947a7cbe0e9a7ee724b79c393823 nmstate-vendor-2.2.33.tar.xz +2adfeeb8b7d4bc24de1bd2a6b8ea8eb7 nmstate-2.2.35.tar.gz +11c7a281c1153f4d14f9dc86d0871859 nmstate-2.2.35.tar.gz.asc +f8fbfa3b5d330e8ec0ccfb8a04b72b07 nmstate-vendor-2.2.35.tar.xz diff --git a/nmstate.gpg b/nmstate.gpg index 9c0f9a4..3b3a89b 100644 --- a/nmstate.gpg +++ b/nmstate.gpg @@ -47,5 +47,53 @@ E9NlXivSZRblfY9DEa4v0Zr7L9uyp2JU7taIexoLmPbefORThtGmNoc8DwzLlH8s SJXEX1ckgzCUNUPQs37ZmV7q4pXh2yYtcZwufH10o02nl67Yuv+43II3vuvEg9CO qOF1CIUdWB9SZwkAz4MeAjtw5d/YBSqYv9s0pSobvGuo7wBW7MTJ6PkGBzTvdR3H aOfE6WjbuPjr5H0J1oWyWa0/VB7i1OQ7/55IChT137OnVHRENP8HaGmRZYhxwLsI -=PdCG +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 +i2QY7dEEs/uMRtq8C8kSWg== +=259x -----END PGP PUBLIC KEY BLOCK----- diff --git a/nmstate.spec b/nmstate.spec index 07fa0b8..a530ef7 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -1,11 +1,10 @@ %?python_enable_dependency_generator %define srcname nmstate %define libname libnmstate -%define anolis_release .0.1 Name: nmstate -Version: 2.2.33 -Release: 1%{anolis_release}%{?dist} +Version: 2.2.35 +Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -17,9 +16,6 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: gnupg2 BuildRequires: rust-toolset -%ifarch loongarch64 -BuildRequires: cargo-vendored-nix -%endif BuildRequires: pkg-config BuildRequires: systemd @@ -78,14 +74,6 @@ This package contains the C binding development files of nmstate. %description -n python3-%{libname} This package contains the Python 3 library for Nmstate. -%package doc -Summary: Documents for %{name} -BuildArch: noarch -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description doc -Doc pages for %{name}. - %prep gpg2 --import --import-options import-export,import-minimal %{SOURCE2} > ./gpgkey-mantainers.gpg gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} @@ -94,11 +82,6 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} pushd rust # Source3 is vendored dependencies %cargo_prep -V 3 -%ifarch loongarch64 -rm -rf vendor/nix* -rm -f Cargo.lock -ln -s %{_datadir}/cargo/vendor/nix* vendor/ -%endif popd @@ -123,6 +106,7 @@ popd %files +%doc README.md %doc examples/ %{_mandir}/man8/nmstate.service.8* %{_mandir}/man8/nmstatectl.8* @@ -157,36 +141,52 @@ popd %postun libs /sbin/ldconfig -%files doc -%doc README.md - %changelog -* Thu Aug 29 2024 Xiaoping Liu - 2.2.33-1.0.1 -- Add doc sub package -- Support loongarch64 (Liwei Ge) -- remove BuildRequires cargo-vendored-libc +* Thu Aug 22 2024 Gris Ge - 2.2.35-1 +- Upgrade to 2.2.35 +- Fix gen_diff on VLAN ID change. RHEL-38623 +- Fix Nmpolicy on mac-address identifier. RHEL-54292 +- Fix reapply. RHEL-50556 * Thu Jun 13 2024 Gris Ge - 2.2.33-1 - Upgrade to 2.2.33 +- Fix validation of controller overbook. RHEL-40683 +- Support DNS and route in kernel mode. RHEL-37665 * Thu May 30 2024 Gris Ge - 2.2.32-1 - Upgrade to 2.2.32 -- Set VLAN reorder-headers to true by default. RHEL-35691 +- Set VLAN reorder-headers to true by default. RHEL-33362 -* Thu May 23 2024 Íñigo Huguet - 2.2.31-1 +* Mon May 20 2024 Fernando Fernandez Mancera - 2.2.31-1 - Upgrade to 2.2.31 +- Support IPSec leftsubnet property. RHEL-26755 -* Fri Apr 26 2024 Fernando Fernandez Mancera - 2.2.29-2 -- Uploaded the right sources +* Fri May 03 2024 Fernando Fernandez Mancera - 2.2.30-1 +- Upgrade to 2.2.30 * Thu Apr 25 2024 Fernando Fernandez Mancera - 2.2.29-1 - Upgrade to 2.2.29 -* Fri Apr 05 2024 Fernando Fernandez Mancera - 2.2.27-2 -- Rebuild to use the right target +* Mon Apr 22 2024 Fernando Fernandez Mancera - 2.2.28-1 +- Upgrade to 2.2.28 + +* Thu Mar 21 2024 Gris Ge - 2.2.27-1 +### Breaking changes + - N/A + +### New features + - Support TCP congestion window(cwnd) in route. (59f99632) + - Support query interface driver. (67817c23) + - New API to generate changed state. (fe5327a2) + +### Bug fixes + - Include driver information for `persist-nic-names` subcommand. (1129e46b) + - nm: Protect global DNS config in checkpoint. (881373ba) + - route rule: Append rule instead of overriding when iface defined. (88d3d3ef) +- Resolves RHEL-19409 -* Fri Apr 05 2024 Fernando Fernandez Mancera - 2.2.27-1 -- Upgrade to 2.2.27-1 +* Wed Mar 13 2024 Gris Ge - 2.2.26-1 +- Upgrade to 2.2.26 * Thu Feb 22 2024 Fernando Fernandez Mancera - 2.2.25-1 - Upgrade to 2.2.25 -- Gitee From c8bd0a8c9107eb1b9012feafe79114dcca0f8d57 Mon Sep 17 00:00:00 2001 From: liuxiaoping Date: Mon, 28 Nov 2022 17:52:04 +0800 Subject: [PATCH 2/4] spec: add doc sub package --- nmstate.spec | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/nmstate.spec b/nmstate.spec index a530ef7..b97ea54 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -1,10 +1,11 @@ %?python_enable_dependency_generator %define srcname nmstate %define libname libnmstate +%define anolis_release .0.1 Name: nmstate Version: 2.2.35 -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -74,6 +75,14 @@ This package contains the C binding development files of nmstate. %description -n python3-%{libname} This package contains the Python 3 library for Nmstate. +%package doc +Summary: Documents for %{name} +BuildArch: noarch +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description doc +Doc pages for %{name}. + %prep gpg2 --import --import-options import-export,import-minimal %{SOURCE2} > ./gpgkey-mantainers.gpg gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} @@ -106,7 +115,6 @@ popd %files -%doc README.md %doc examples/ %{_mandir}/man8/nmstate.service.8* %{_mandir}/man8/nmstatectl.8* @@ -141,7 +149,13 @@ popd %postun libs /sbin/ldconfig +%files doc +%doc README.md + %changelog +* Fri Nov 29 2024 Xiaoping Liu - 2.2.35-1.0.1 +- Add doc sub package + * Thu Aug 22 2024 Gris Ge - 2.2.35-1 - Upgrade to 2.2.35 - Fix gen_diff on VLAN ID change. RHEL-38623 -- Gitee From 82a07104091d0d5077ca76325a3efb25f72faef9 Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Tue, 13 Dec 2022 20:03:40 +0800 Subject: [PATCH 3/4] vendor: support loongarch64 --- nmstate.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nmstate.spec b/nmstate.spec index b97ea54..59fefae 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -17,6 +17,10 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: gnupg2 BuildRequires: rust-toolset +%ifarch loongarch64 +BuildRequires: cargo-vendored-libc +BuildRequires: cargo-vendored-nix +%endif BuildRequires: pkg-config BuildRequires: systemd @@ -91,6 +95,12 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} pushd rust # Source3 is vendored dependencies %cargo_prep -V 3 +%ifarch loongarch64 +rm -rf vendor/libc* vendor/nix* +rm -f Cargo.lock +ln -s %{_datadir}/cargo/vendor/libc* vendor/ +ln -s %{_datadir}/cargo/vendor/nix* vendor/ +%endif popd @@ -155,6 +165,7 @@ popd %changelog * Fri Nov 29 2024 Xiaoping Liu - 2.2.35-1.0.1 - Add doc sub package +- Support loongarch64 (Liwei Ge) * Thu Aug 22 2024 Gris Ge - 2.2.35-1 - Upgrade to 2.2.35 -- Gitee From b27a602a9693299f22cb7e034196605b39c80804 Mon Sep 17 00:00:00 2001 From: Bo Ren Date: Tue, 2 Jan 2024 10:41:34 +0800 Subject: [PATCH 4/4] remove BuildRequires cargo-vendored-libc Signed-off-by: Bo Ren --- nmstate.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nmstate.spec b/nmstate.spec index 59fefae..6c5f79f 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -18,7 +18,6 @@ BuildRequires: python3-setuptools BuildRequires: gnupg2 BuildRequires: rust-toolset %ifarch loongarch64 -BuildRequires: cargo-vendored-libc BuildRequires: cargo-vendored-nix %endif BuildRequires: pkg-config @@ -96,9 +95,8 @@ pushd rust # Source3 is vendored dependencies %cargo_prep -V 3 %ifarch loongarch64 -rm -rf vendor/libc* vendor/nix* +rm -rf vendor/nix* rm -f Cargo.lock -ln -s %{_datadir}/cargo/vendor/libc* vendor/ ln -s %{_datadir}/cargo/vendor/nix* vendor/ %endif @@ -166,6 +164,7 @@ popd * Fri Nov 29 2024 Xiaoping Liu - 2.2.35-1.0.1 - Add doc sub package - Support loongarch64 (Liwei Ge) +- remove BuildRequires cargo-vendored-libc * Thu Aug 22 2024 Gris Ge - 2.2.35-1 - Upgrade to 2.2.35 -- Gitee