From ea846ca6282736a3ffaaed56b23781350d4c2893 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Tue, 3 Dec 2019 15:53:05 +0100 Subject: [PATCH 001/120] Update to 0.2.0 --- .gitignore | 2 ++ nmstate.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8fcdf17..c5d50c5 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ /nmstate-0.0.8.tar.gz /nmstate-0.1.1.tar.gz /nmstate-0.1.1.tar.gz.asc +/nmstate-0.2.0.tar.gz +/nmstate-0.2.0.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index 69a5d39..6e6e197 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,7 +3,7 @@ %define libname libnmstate Name: nmstate -Version: 0.1.1 +Version: 0.2.0 Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ @@ -65,6 +65,9 @@ sed -i -e '/^dbus-python$/d' requirements.txt %{python3_sitelib}/%{srcname}-*.egg-info/ %changelog +* Tue Dec 03 2019 Fernando Fernandez Mancera - 0.2.2-1 +- Update to 0.2.0 + * Mon Dec 02 2019 Till Maas - 0.1.1-1 - Update to 0.1.1 - Sync with upstream specfile diff --git a/sources b/sources index c91698b..17bbc24 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (nmstate-0.1.1.tar.gz) = 5ff609a8cc886c2528ed167db503785224bd9d5d590ab279af46ba7be4fd6dc1e0f41fe5b5809d04d91e0825ed93f83c0df8ae06eccacbb18a7f1e9691967cdb -SHA512 (nmstate-0.1.1.tar.gz.asc) = c4044a2228304e7f02daec3d90dcdd8fa5239b1c956f1bf9ea68b111bb01d462f13c125285ffce462dc74f0e3eb4d931f84b999f7672828f61ffc40f60243bc9 +SHA512 (nmstate-0.2.0.tar.gz) = 9294b3754e340a4d70f0f219996589785f38b0a4804d7d07aa07715ab7356ce1ae36c2ddbb34f45b4c1251d87098fa853cc8201a3bdf2d87ba782001dea837f2 +SHA512 (nmstate-0.2.0.tar.gz.asc) = 4cf6cfc3b8ec911728c70e2c5a60c2e9904f92123667baf6244f882e5f16c0ff9532c5235af4bc883ec741c71dbec4f5352e719884f2cdd42a78b50ffd57bfd6 SHA512 (gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.gpg) = 0b416e3c465ff679f701cb1f4d264d8341f1c778ca1403a39b83df959cad5c4faf23f6cbb1772b2547cbbdb267cb9d1a34794cc1710950f0d847b5f5c67361bf From 2d868b4e8a6151054aa3ca797cbc1d88b3783f63 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Tue, 3 Dec 2019 16:49:37 +0100 Subject: [PATCH 002/120] Fix changelog --- nmstate.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nmstate.spec b/nmstate.spec index 6e6e197..2ebc41a 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -4,7 +4,7 @@ Name: nmstate Version: 0.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -65,7 +65,10 @@ sed -i -e '/^dbus-python$/d' requirements.txt %{python3_sitelib}/%{srcname}-*.egg-info/ %changelog -* Tue Dec 03 2019 Fernando Fernandez Mancera - 0.2.2-1 +* Tue Dec 03 2019 Fernando Fernandez Mancera - 0.2.0-2 +- Fix changelog + +* Tue Dec 03 2019 Fernando Fernandez Mancera - 0.2.0-1 - Update to 0.2.0 * Mon Dec 02 2019 Till Maas - 0.1.1-1 From 00a849c786d1c63bf06279d2eeb19fcbb59fa188 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Mon, 9 Dec 2019 15:10:39 +0100 Subject: [PATCH 003/120] Use ascii-armored keyring This makes it possible to use `fedpkg new-sources` again. --- ...910D93CA83D77348595C0E899014C0463C12BB.asc | 50 +++++++++++++++++++ nmstate.spec | 5 +- sources | 1 - 3 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.asc diff --git a/gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.asc b/gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.asc new file mode 100644 index 0000000..5c599f3 --- /dev/null +++ b/gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.asc @@ -0,0 +1,50 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBFvAY4kBEADxj6yl2aP0+fuXzpxkAgIYcQzrqZKeYPxlEXB0KGW6RlJK+ASj +YEB3PliRpJ9e1MfmS4Hhdn+FOtd+4AYrJegDWoPgSXWvLzVFd7egE13oQfInFxCj +1tbYePL6vy2VHMY4HJSTHLqPFNo6M2A3b36x5YWzWwoh92G+vtzVtkSNR1cflx/Y +XUojU3LdFNf05xwtx/SQ52yOz+8cBQb36ht8E2Df8TmQFun2m6n6G/lWbnAd5STx +Qrv5p0wvNGn7VQZiedvnAjN/W2Y18vrZFMpHyG1qUgb2aOvYRBNgZ1rNwisfpBYF +8P3MGmzFtwRScKvrDzj0iHWXtGXP/sn/rjiOkPeBpEqZddpU3reA5KLd5oneie4l +Jr/SrFBiXxm5G8swXI8D/mzW64XiQ4o5rAnPqRyK4C6lL0n7u+0xOBCIoD/lI+Yr +HqGS8UIb/cJadBEEcTPl6Mt05fELeeb0kO+x4YJj9N3mWV9JtGoDOtyyUvoWa34v +U5aBp6qsqmYAfcu0kLFEW+JxTleLEwfpO3TSvnOnzQegeIhubRUJoA7z57OyI98T +Gs8hmkz5J3hQcbnlVdsEXzOmEubwUv74u7kSmLd95D4v4r3uyWfxMQdbyta0xT8Z +QgFrNoQ6c9tpTUYisYt16M8eJDBBCXguNzrfHwivasAssxag93RScfRmWwARAQAB +tCBFZHdhcmQgSGFhcyA8ZWR3YXJkaEByZWRoYXQuY29tPokCOQQTAQIAIwUCW8Bj +iQIbAwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEImQFMBGPBK7bEcP+wU3 +6d1G3K6LyJprhckfyUnVw4JVBxd4QVo0iHLtG0ZEAfx81iMmKSxXXR4ckXwmK7Xc +DtT73aPWHGqwJE4/j9i99dgVCcZguJtK9qbaew4Txd5KDuQxl2Vj6li3M0qXVCxh +2nwRhTNKcr8pUawPdGfe11p8G85gyqzNpJN7OegfLZhuIXIZmbOrWfimoWiNTiyT +6VmXi2TLtNQKxnr1QQ8FRM0ajJECJ2fQDiaZlTiTpFrKHpYqTfGra8Bf741CeZf6 +WcttYQR/nywK2HwWjl19MTYRp9GHi3rWWwHmRKeD2a4aedPwUudHzwtsrGGvXrhQ +iuDtANLrDsYdnUGtkfvZxXABHaCz3kl6x28pOgrMzK+grF25cN+pk4/g4Q2cbZjM +4tuhTyTaOroeQn2jc0qDaRhN1iXyuKCsz6aQ4K1E8FlVPck2Kf/hq6n4WC1oxix8 +LNbpWICbaqc++t/eUPlZBpMzxmp3yQx/++wuzp9FeyyDiLTRSdFlJ2iZALASRxN2 +Wyk9ce/BorTf4y3dqweKNqpqSXc57nc98dcFrdIMW876S+nbDwYIC4ncV2u0Nh4P +Sll2HBPaXgMIAln8YKaCqnsdavJeeQdQ78rJhy40uNWLcknqOvZGI77SzahW/wJg +2K1qFSNaiOFFvwJQyEKHpSTxoo3ZmrPPVpRzj7MVuQINBFvAY4kBEACtEudGB3Bd +G7ulF8BG0z+8Ed6TmjsTYTmO1yPtxvtNVD5yNOUZjD7ViBvCE/6bnkHubeeCmTgx +S0XVFK9bGZFTb03wdq6TSRTvFN1LtcFb1oV/TjIQTjxdjMoHtJkqJ7JKjn8PP060 +WW+BLgE+jtK6RkodbBH1SZnNbzozpWNCVNN+Xch22H3X9KH9C122aXX4WnOTzizy +Drv2dymiYLhf6dAYGT1WY/e3zjWIiEr6OED8SPIcuC7QNjGtIjksW2jkGJlIRNi6 +Oz10eggaeMv2OfYpFLShpL8RwfgDxPcijaSTtiCoziLP3nrbgfbg2uCcbuGHKU5c +3HxO8eJJN3V8fGbesMH8owqQ6d0jh5kLSfqcyg3ddhU8qr3mQZOb/JaCEr0VPc68 +bxnAkX/hkHzatTrYP+xNKqTCwNKEPTWCVsz196zUSThJiAb+cnPYlqS1akYXE9y2 +ordTB0B6cCQ3jKk1VZLMqdTYDpemVQN+Yez24AhE0ttllR0XaU8OeVx1/yhsgG76 +dsdS4p/yM/cc3KWoFu/1jGgn+6vHNiHj4Wzjpx9cOgggUoBmN4ou6ZEi63x3i0qF +9xRNo3u8sgjVObgXZXb3VXcm1ANoEczsxGGtGVAPKch7M9fnMRsQQE0jSwxJ+j+o +9fw6xRbHIjJqvfm3/HvfJ1zMIpZDwJNM5wARAQABiQIfBBgBAgAJBQJbwGOJAhsM +AAoJEImQFMBGPBK7XlkQAJ+Pj2g0oU5q7QHsuUFtjBP5DhjAhoLbp/oCE0L6Y0g5 +KNFoMqsQcewdLsRR0kv7QslVeLSO1mrSQNBrd5AHjszme40Kym4Z5vrI23lFVNVf +pEG3FxrKVgSqT1Ter7HTxuZIZXM4r4O4//6ShjmzpeHIEaJ2dq2kbtbC0xFgOYMC +qjnoCBwL+IPkNzlab+mNCYX+JDcq/st+qLwfGJO+1kd+yWfouQ2KwIW59800rCSS +Q8gWh6myP9gzV2ME9Sqajyj8GkF9987MWCrsZdz4askugG4v1BoFCmb/Nc08pS7N +fXsd3NzD9qlbO/EsJalbs/jSmyEr1RSCz2nphZocx7YOr2p0Fi3EnUPhWYrpFQDf +rXklslRRFkWq2SgK+UaawJDb7emCiVVyHU8YMq9QWLh13eMqv69K+ef7lf1Um4GD +jmzAwRWUdqJdHV7qcBxpZLG0suNSY6yTZVK3IKL/HYbqmaJE9MsNFKYe/IYAHckg +2D34PgooJyhAz8q2znrCvJnJCJey07z5PXhPJW3Y5Iw64ve9vqWIbBaSYEkdFSXq +nJwyEa8SpCiunNstyRWdSpCIsh7KpJNYHs8J2TPsyiesAadM2i6U5utku/C5pLdP +QT/QPKULLytWY7ek4stF7TIIIMlCO/uXbfZDilTyFbbJ7L9yjsdMNEItS1/aR97W +=yD6X +-----END PGP PUBLIC KEY BLOCK----- diff --git a/nmstate.spec b/nmstate.spec index 2ebc41a..b0b06c1 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -10,7 +10,7 @@ License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc -Source2: gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.gpg +Source2: gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.asc BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -42,7 +42,8 @@ Suggests: NetworkManager-ovs This package contains the Python 3 library for Nmstate. %prep -gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} +gpg2 --import --import-options import-export,import-minimal %{SOURCE2} > ./gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.gpg +gpgv2 --keyring ./gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.gpg %{SOURCE1} %{SOURCE0} %setup -q sed -i -e '/^dbus-python$/d' requirements.txt diff --git a/sources b/sources index 17bbc24..ccb7d64 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ SHA512 (nmstate-0.2.0.tar.gz) = 9294b3754e340a4d70f0f219996589785f38b0a4804d7d07aa07715ab7356ce1ae36c2ddbb34f45b4c1251d87098fa853cc8201a3bdf2d87ba782001dea837f2 SHA512 (nmstate-0.2.0.tar.gz.asc) = 4cf6cfc3b8ec911728c70e2c5a60c2e9904f92123667baf6244f882e5f16c0ff9532c5235af4bc883ec741c71dbec4f5352e719884f2cdd42a78b50ffd57bfd6 -SHA512 (gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.gpg) = 0b416e3c465ff679f701cb1f4d264d8341f1c778ca1403a39b83df959cad5c4faf23f6cbb1772b2547cbbdb267cb9d1a34794cc1710950f0d847b5f5c67361bf From 3a871bc1915d6525667a7dc3e3ce08e2269a5f87 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Tue, 14 Jan 2020 00:00:26 +0100 Subject: [PATCH 004/120] Update to 0.2.1 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c5d50c5..00c0d1d 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ /nmstate-0.1.1.tar.gz.asc /nmstate-0.2.0.tar.gz /nmstate-0.2.0.tar.gz.asc +/nmstate-0.2.1.tar.gz +/nmstate-0.2.1.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index b0b06c1..d9e3d1e 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,7 +3,7 @@ %define libname libnmstate Name: nmstate -Version: 0.2.0 +Version: 0.2.1 Release: 2%{?dist} Summary: Declarative network manager API License: LGPLv2+ @@ -66,6 +66,9 @@ sed -i -e '/^dbus-python$/d' requirements.txt %{python3_sitelib}/%{srcname}-*.egg-info/ %changelog +* Tue Jan 14 2019 Fernando Fernandez Mancera - 0.2.1-1 +- Update to 0.2.1 + * Tue Dec 03 2019 Fernando Fernandez Mancera - 0.2.0-2 - Fix changelog diff --git a/sources b/sources index ccb7d64..abf2a72 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nmstate-0.2.0.tar.gz) = 9294b3754e340a4d70f0f219996589785f38b0a4804d7d07aa07715ab7356ce1ae36c2ddbb34f45b4c1251d87098fa853cc8201a3bdf2d87ba782001dea837f2 -SHA512 (nmstate-0.2.0.tar.gz.asc) = 4cf6cfc3b8ec911728c70e2c5a60c2e9904f92123667baf6244f882e5f16c0ff9532c5235af4bc883ec741c71dbec4f5352e719884f2cdd42a78b50ffd57bfd6 +SHA512 (nmstate-0.2.1.tar.gz) = a10eca0fa8fdede6e9bccfc557a10afba6110c67fb2e029bae57acbadade9bb029d4dcd8c585533399544ffd99c75cf971642dd031cb2fbecdc175a8553d4423 +SHA512 (nmstate-0.2.1.tar.gz.asc) = a546c04a20d9d56b2da10e67de20c58e8ca885901a5b0df3c0416c1efb6177429331ff0c00f3e8b4a32f676c55751fe4c0659d54d78354c8f46dd5077201713f From cb52d7d032439416b03f48055d1509e0281e4dfe Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Tue, 14 Jan 2020 00:07:30 +0100 Subject: [PATCH 005/120] Fix changelog Signed-off-by: Fernando Fernandez Mancera --- nmstate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nmstate.spec b/nmstate.spec index d9e3d1e..156da9f 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -66,7 +66,10 @@ sed -i -e '/^dbus-python$/d' requirements.txt %{python3_sitelib}/%{srcname}-*.egg-info/ %changelog -* Tue Jan 14 2019 Fernando Fernandez Mancera - 0.2.1-1 +* Tue Jan 14 2020 Fernando Fernandez Mancera - 0.2.1-2 +- Fix changelog + +* Tue Jan 14 2020 Fernando Fernandez Mancera - 0.2.1-1 - Update to 0.2.1 * Tue Dec 03 2019 Fernando Fernandez Mancera - 0.2.0-2 From 5945b49ba4c02f390bd2dd32c860a5b39b90a5ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 15:04:40 +0000 Subject: [PATCH 006/120] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nmstate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nmstate.spec b/nmstate.spec index 156da9f..d7287a8 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -4,7 +4,7 @@ Name: nmstate Version: 0.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -66,6 +66,9 @@ sed -i -e '/^dbus-python$/d' requirements.txt %{python3_sitelib}/%{srcname}-*.egg-info/ %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 0.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Jan 14 2020 Fernando Fernandez Mancera - 0.2.1-2 - Fix changelog From d88b1182240938e11ae0d8d3c1eb213b8d5d3896 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Tue, 4 Feb 2020 22:23:10 +0100 Subject: [PATCH 007/120] Update to 0.2.2 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 16 ++++++++++------ sources | 4 ++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 00c0d1d..dd7111b 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ /nmstate-0.2.0.tar.gz.asc /nmstate-0.2.1.tar.gz /nmstate-0.2.1.tar.gz.asc +/nmstate-0.2.2.tar.gz +/nmstate-0.2.2.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index d7287a8..37f199b 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,8 +3,8 @@ %define libname libnmstate Name: nmstate -Version: 0.2.1 -Release: 3%{?dist} +Version: 0.2.2 +Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -27,15 +27,16 @@ provider support on the southbound. %package -n python3-%{libname} Summary: nmstate Python 3 API library -Requires: python3-dbus -Requires: NetworkManager-libnm >= 1:1.20 +Requires: NetworkManager-libnm >= 1:1.22 # Use Recommends for NetworkManager because only access to NM DBus is required, # but NM could be running on a different host Recommends: NetworkManager # Avoid automatically generated profiles Recommends: NetworkManager-config-server -# Use Suggests for NetworkManager-ovs since it is only required for OVS support +# Use Suggests for NetworkManager-ovs and NetworkManager-team since it is only +# required for OVS and team support Suggests: NetworkManager-ovs +Suggests: NetworkManager-team %description -n python3-%{libname} @@ -45,7 +46,6 @@ This package contains the Python 3 library for Nmstate. gpg2 --import --import-options import-export,import-minimal %{SOURCE2} > ./gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.gpg gpgv2 --keyring ./gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.gpg %{SOURCE1} %{SOURCE0} %setup -q -sed -i -e '/^dbus-python$/d' requirements.txt %build %py3_build @@ -66,6 +66,10 @@ sed -i -e '/^dbus-python$/d' requirements.txt %{python3_sitelib}/%{srcname}-*.egg-info/ %changelog +* Tue Feb 04 2020 Fernando Fernandez Mancera - 0.2.2-1 +- Update to 0.2.2 +- Sync with upstream specfile + * Wed Jan 29 2020 Fedora Release Engineering - 0.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index abf2a72..664436b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nmstate-0.2.1.tar.gz) = a10eca0fa8fdede6e9bccfc557a10afba6110c67fb2e029bae57acbadade9bb029d4dcd8c585533399544ffd99c75cf971642dd031cb2fbecdc175a8553d4423 -SHA512 (nmstate-0.2.1.tar.gz.asc) = a546c04a20d9d56b2da10e67de20c58e8ca885901a5b0df3c0416c1efb6177429331ff0c00f3e8b4a32f676c55751fe4c0659d54d78354c8f46dd5077201713f +SHA512 (nmstate-0.2.2.tar.gz) = 36216a19fb703efd6d2fba89fbf94d45556b7f7bb0e01c33a5847cfb48c504d003e7ddd7c5060899a7ad6b856b4ec0baf746a359541f307e86ac542319949526 +SHA512 (nmstate-0.2.2.tar.gz.asc) = ec520d0258076d991a151c3b36439fc68af6560d0b764bd182661b609a519158e1e2e85a2f394eb2125693696ff685b29b9fceaadfeab31fc2cae6c192fedc68 From d64cfeb89fcdfc3d37df3ceb421824fc2976ce38 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Wed, 5 Feb 2020 17:30:46 +0100 Subject: [PATCH 008/120] Update to 0.2.3 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dd7111b..f2c53b9 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ /nmstate-0.2.1.tar.gz.asc /nmstate-0.2.2.tar.gz /nmstate-0.2.2.tar.gz.asc +/nmstate-0.2.3.tar.gz +/nmstate-0.2.3.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index 37f199b..80eaa18 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,7 +3,7 @@ %define libname libnmstate Name: nmstate -Version: 0.2.2 +Version: 0.2.3 Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ @@ -66,6 +66,9 @@ gpgv2 --keyring ./gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.gpg %{SOURCE1} %{python3_sitelib}/%{srcname}-*.egg-info/ %changelog +* Wed Feb 05 2020 Fernando Fernandez Mancera - 0.2.3-1 +- Update to 0.2.3 + * Tue Feb 04 2020 Fernando Fernandez Mancera - 0.2.2-1 - Update to 0.2.2 - Sync with upstream specfile diff --git a/sources b/sources index 664436b..4954851 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nmstate-0.2.2.tar.gz) = 36216a19fb703efd6d2fba89fbf94d45556b7f7bb0e01c33a5847cfb48c504d003e7ddd7c5060899a7ad6b856b4ec0baf746a359541f307e86ac542319949526 -SHA512 (nmstate-0.2.2.tar.gz.asc) = ec520d0258076d991a151c3b36439fc68af6560d0b764bd182661b609a519158e1e2e85a2f394eb2125693696ff685b29b9fceaadfeab31fc2cae6c192fedc68 +SHA512 (nmstate-0.2.3.tar.gz) = 3f61ef3c31dd0a8a87f8f79995fd6d304db32eea35ee7ffd9d3b1d8e39e7e8a005232a93407cf9f35d5e718edfbc036f3ab911b35f54b1cf1623065b0b4c2b22 +SHA512 (nmstate-0.2.3.tar.gz.asc) = 6deab70e2b7470a6b647bcde43925a7961aafe36ae9956bf3897d9d97f5098de6764ad9274ce13f7554cee6f57e405ffbeee97e830b69bf500780a25cc94b104 From 1df09d1a8ecbe5561adf1a7d5fdf6b856a3aad98 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Wed, 12 Feb 2020 17:48:41 +0100 Subject: [PATCH 009/120] Update to 0.2.4 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f2c53b9..9d43c37 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,5 @@ /nmstate-0.2.2.tar.gz.asc /nmstate-0.2.3.tar.gz /nmstate-0.2.3.tar.gz.asc +/nmstate-0.2.4.tar.gz +/nmstate-0.2.4.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index 80eaa18..32733f3 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,7 +3,7 @@ %define libname libnmstate Name: nmstate -Version: 0.2.3 +Version: 0.2.4 Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ @@ -66,6 +66,9 @@ gpgv2 --keyring ./gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.gpg %{SOURCE1} %{python3_sitelib}/%{srcname}-*.egg-info/ %changelog +* Wed Feb 12 2020 Fernando Fernandez Mancera - 0.2.4-1 +- Update to 0.2.4 + * Wed Feb 05 2020 Fernando Fernandez Mancera - 0.2.3-1 - Update to 0.2.3 diff --git a/sources b/sources index 4954851..696ac05 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nmstate-0.2.3.tar.gz) = 3f61ef3c31dd0a8a87f8f79995fd6d304db32eea35ee7ffd9d3b1d8e39e7e8a005232a93407cf9f35d5e718edfbc036f3ab911b35f54b1cf1623065b0b4c2b22 -SHA512 (nmstate-0.2.3.tar.gz.asc) = 6deab70e2b7470a6b647bcde43925a7961aafe36ae9956bf3897d9d97f5098de6764ad9274ce13f7554cee6f57e405ffbeee97e830b69bf500780a25cc94b104 +SHA512 (nmstate-0.2.4.tar.gz) = 492c25a7b9527982b1cb8e5040914508c98916913fce360382d3507312c8c02166a3cf09faaebd184928a1f602719ab90248292d868a3b3fbbf71869af41f73f +SHA512 (nmstate-0.2.4.tar.gz.asc) = 2aab462e42b3f2f2e6e6ccf69798177a78cf0372069e955f504d1d4e9d6b36d66e244cbb9c487593b90fbd826b950c991008d4e28a78b491eb1576b597cf65d1 From 7589a7b6e027810e1282880981880b9948477cc0 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Wed, 19 Feb 2020 19:16:44 +0100 Subject: [PATCH 010/120] Update to 0.2.5 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 8 ++++++-- sources | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9d43c37..b9c80fc 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,5 @@ /nmstate-0.2.3.tar.gz.asc /nmstate-0.2.4.tar.gz /nmstate-0.2.4.tar.gz.asc +/nmstate-0.2.5.tar.gz +/nmstate-0.2.5.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index 32733f3..b043b32 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,7 +3,7 @@ %define libname libnmstate Name: nmstate -Version: 0.2.4 +Version: 0.2.5 Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ @@ -27,7 +27,7 @@ provider support on the southbound. %package -n python3-%{libname} Summary: nmstate Python 3 API library -Requires: NetworkManager-libnm >= 1:1.22 +Requires: NetworkManager-libnm >= 1:1.22.8 # Use Recommends for NetworkManager because only access to NM DBus is required, # but NM could be running on a different host Recommends: NetworkManager @@ -66,6 +66,10 @@ gpgv2 --keyring ./gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.gpg %{SOURCE1} %{python3_sitelib}/%{srcname}-*.egg-info/ %changelog +* Wed Feb 19 2020 Fernando Fernandez Mancera - 0.2.5-1 +- Update to 0.2.5 +- Sync with upstream specfile + * Wed Feb 12 2020 Fernando Fernandez Mancera - 0.2.4-1 - Update to 0.2.4 diff --git a/sources b/sources index 696ac05..203a884 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nmstate-0.2.4.tar.gz) = 492c25a7b9527982b1cb8e5040914508c98916913fce360382d3507312c8c02166a3cf09faaebd184928a1f602719ab90248292d868a3b3fbbf71869af41f73f -SHA512 (nmstate-0.2.4.tar.gz.asc) = 2aab462e42b3f2f2e6e6ccf69798177a78cf0372069e955f504d1d4e9d6b36d66e244cbb9c487593b90fbd826b950c991008d4e28a78b491eb1576b597cf65d1 +SHA512 (nmstate-0.2.5.tar.gz) = 9bc1bf391ab9208759313ef38160f264fc15deb5725a9a73b2ca8a9e7f2d444d7c96d51d39d6ad95f7fec03b513aec2d5c188ce0da92b6e7a7a99a9f282c7ece +SHA512 (nmstate-0.2.5.tar.gz.asc) = 1e0dfb846a6f1e612c2975d670374b19448139d017e5c366ef2b432359d6c14c5de0e2c1ef2f874d427fba87b1f9a1e872293aa310dfff9a4584b91b6c8d1272 From 79f13452fe6234e3d5a59137a35767f54fef2c8e Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Mon, 24 Feb 2020 21:26:31 +0100 Subject: [PATCH 011/120] Update to 0.2.6 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b9c80fc..3d56231 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,5 @@ /nmstate-0.2.4.tar.gz.asc /nmstate-0.2.5.tar.gz /nmstate-0.2.5.tar.gz.asc +/nmstate-0.2.6.tar.gz +/nmstate-0.2.6.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index b043b32..4fe4ed4 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,7 +3,7 @@ %define libname libnmstate Name: nmstate -Version: 0.2.5 +Version: 0.2.6 Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ @@ -66,6 +66,9 @@ gpgv2 --keyring ./gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.gpg %{SOURCE1} %{python3_sitelib}/%{srcname}-*.egg-info/ %changelog +* Mon Feb 24 2020 Fernando Fernandez Mancera - 0.2.6-1 +- Update to 0.2.6 + * Wed Feb 19 2020 Fernando Fernandez Mancera - 0.2.5-1 - Update to 0.2.5 - Sync with upstream specfile diff --git a/sources b/sources index 203a884..c5683ac 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nmstate-0.2.5.tar.gz) = 9bc1bf391ab9208759313ef38160f264fc15deb5725a9a73b2ca8a9e7f2d444d7c96d51d39d6ad95f7fec03b513aec2d5c188ce0da92b6e7a7a99a9f282c7ece -SHA512 (nmstate-0.2.5.tar.gz.asc) = 1e0dfb846a6f1e612c2975d670374b19448139d017e5c366ef2b432359d6c14c5de0e2c1ef2f874d427fba87b1f9a1e872293aa310dfff9a4584b91b6c8d1272 +SHA512 (nmstate-0.2.6.tar.gz) = c71b863856140a190363f6264998fdf26ec2f529d66c94c0c6c9514f7c98c32d11d36cd8d4780811f10278cb1ed8651e8eefd4262671ecbccc852ceb5ea3031a +SHA512 (nmstate-0.2.6.tar.gz.asc) = e134e8e58c495de73fafab30fc06002cc2d1afbc1a86c359a663802a8757b6342006edbd06a6ac26eedddc8ce3aa973dac4b4d582338f3884ea00ace35e6481b From aab9253e140e9e77459357ac29188dfdfcfa7b8f Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Wed, 4 Mar 2020 15:24:26 +0100 Subject: [PATCH 012/120] Update to 0.2.7 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3d56231..e6c28f0 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ /nmstate-0.2.5.tar.gz.asc /nmstate-0.2.6.tar.gz /nmstate-0.2.6.tar.gz.asc +/nmstate-0.2.7.tar.gz +/nmstate-0.2.7.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index 4fe4ed4..ce337a3 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,7 +3,7 @@ %define libname libnmstate Name: nmstate -Version: 0.2.6 +Version: 0.2.7 Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ @@ -66,6 +66,9 @@ gpgv2 --keyring ./gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.gpg %{SOURCE1} %{python3_sitelib}/%{srcname}-*.egg-info/ %changelog +* Wed Mar 04 2020 Fernando Fernandez Mancera - 0.2.7-1 +- Update to 0.2.7 + * Mon Feb 24 2020 Fernando Fernandez Mancera - 0.2.6-1 - Update to 0.2.6 diff --git a/sources b/sources index c5683ac..dc17940 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nmstate-0.2.6.tar.gz) = c71b863856140a190363f6264998fdf26ec2f529d66c94c0c6c9514f7c98c32d11d36cd8d4780811f10278cb1ed8651e8eefd4262671ecbccc852ceb5ea3031a -SHA512 (nmstate-0.2.6.tar.gz.asc) = e134e8e58c495de73fafab30fc06002cc2d1afbc1a86c359a663802a8757b6342006edbd06a6ac26eedddc8ce3aa973dac4b4d582338f3884ea00ace35e6481b +SHA512 (nmstate-0.2.7.tar.gz) = 79914bcdc6027012f0d2ceaf9df07309eee731402cd8d936624f3b8c86379e01aa9eb6122c596be380dae22d8195a31c6ba15ba4b1ff29305c0c87ce8434a755 +SHA512 (nmstate-0.2.7.tar.gz.asc) = f824087f9562dc58246507ce5bafbdf6cc1d06ce6657f95738aff7eb24a7bbae6d856c78a48a201be12876ee527456cc1e31d8d4a391f35ac23a140570a4b7bc From 70a8bf5b3eeb9e1e01da085e0706d3a033983f55 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Fri, 13 Mar 2020 10:03:02 +0100 Subject: [PATCH 013/120] Update to 0.2.8 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e6c28f0..1a2ec89 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,5 @@ /nmstate-0.2.6.tar.gz.asc /nmstate-0.2.7.tar.gz /nmstate-0.2.7.tar.gz.asc +/nmstate-0.2.8.tar.gz +/nmstate-0.2.8.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index ce337a3..d5d7bab 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,7 +3,7 @@ %define libname libnmstate Name: nmstate -Version: 0.2.7 +Version: 0.2.8 Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ @@ -66,6 +66,9 @@ gpgv2 --keyring ./gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.gpg %{SOURCE1} %{python3_sitelib}/%{srcname}-*.egg-info/ %changelog +* Fri Mar 13 2020 Fernando Fernandez Mancera - 0.2.8-1 +- Update to 0.2.8 + * Wed Mar 04 2020 Fernando Fernandez Mancera - 0.2.7-1 - Update to 0.2.7 diff --git a/sources b/sources index dc17940..eac1dd2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nmstate-0.2.7.tar.gz) = 79914bcdc6027012f0d2ceaf9df07309eee731402cd8d936624f3b8c86379e01aa9eb6122c596be380dae22d8195a31c6ba15ba4b1ff29305c0c87ce8434a755 -SHA512 (nmstate-0.2.7.tar.gz.asc) = f824087f9562dc58246507ce5bafbdf6cc1d06ce6657f95738aff7eb24a7bbae6d856c78a48a201be12876ee527456cc1e31d8d4a391f35ac23a140570a4b7bc +SHA512 (nmstate-0.2.8.tar.gz) = 9bfe982f6fda674daf8c263d5cd4507fb785c2f4453bb9fa8858d8e1d395e15c68860c17df3709b190494a09b61befbed9b708013025bf6ababa3db171122cad +SHA512 (nmstate-0.2.8.tar.gz.asc) = bb2dcfbba46364c8f1c5c65cd786b5973c75da1891fd76359fec89e42898cfceb887998e6272d535e92aa017ce880bd423f588c86fdefc62485ca467404f23c6 From bcd340bf3c96b01682fb4e2c8b27bb8d529c318a Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Thu, 26 Mar 2020 16:13:37 +0100 Subject: [PATCH 014/120] Update to 0.2.9 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1a2ec89..e79cdab 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,5 @@ /nmstate-0.2.7.tar.gz.asc /nmstate-0.2.8.tar.gz /nmstate-0.2.8.tar.gz.asc +/nmstate-0.2.9.tar.gz +/nmstate-0.2.9.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index d5d7bab..4b26b6e 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,7 +3,7 @@ %define libname libnmstate Name: nmstate -Version: 0.2.8 +Version: 0.2.9 Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ @@ -66,6 +66,9 @@ gpgv2 --keyring ./gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.gpg %{SOURCE1} %{python3_sitelib}/%{srcname}-*.egg-info/ %changelog +* Thu Mar 26 2020 Fernando Fernandez Mancera - 0.2.9-1 +- Update to 0.2.9 + * Fri Mar 13 2020 Fernando Fernandez Mancera - 0.2.8-1 - Update to 0.2.8 diff --git a/sources b/sources index eac1dd2..464e598 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nmstate-0.2.8.tar.gz) = 9bfe982f6fda674daf8c263d5cd4507fb785c2f4453bb9fa8858d8e1d395e15c68860c17df3709b190494a09b61befbed9b708013025bf6ababa3db171122cad -SHA512 (nmstate-0.2.8.tar.gz.asc) = bb2dcfbba46364c8f1c5c65cd786b5973c75da1891fd76359fec89e42898cfceb887998e6272d535e92aa017ce880bd423f588c86fdefc62485ca467404f23c6 +SHA512 (nmstate-0.2.9.tar.gz) = a1be6d137689c2126bcc610a43e37e15a3043357188c73731e5d069161dc8225acb13ab7be8b4a186414bb7a8f2ba930579bf316793bc150e45bd567eb69e44c +SHA512 (nmstate-0.2.9.tar.gz.asc) = 021cca4475c7500bfc1fb2f7ea72e06eb8d33c082c7e6d3e0f049eae1392dcc7e691b38c57c9ae21ae23829810ab2f9b520af45c6b0820b854ad26010572dc68 From 9fcc419294da0b7299786caf232ba4e05bf84d44 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Tue, 21 Apr 2020 12:18:05 +0200 Subject: [PATCH 015/120] Update to 0.2.10 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e79cdab..32ccaea 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,5 @@ /nmstate-0.2.8.tar.gz.asc /nmstate-0.2.9.tar.gz /nmstate-0.2.9.tar.gz.asc +/nmstate-0.2.10.tar.gz +/nmstate-0.2.10.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index 4b26b6e..e270813 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,7 +3,7 @@ %define libname libnmstate Name: nmstate -Version: 0.2.9 +Version: 0.2.10 Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ @@ -66,6 +66,9 @@ gpgv2 --keyring ./gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.gpg %{SOURCE1} %{python3_sitelib}/%{srcname}-*.egg-info/ %changelog +* Tue Apr 21 2020 Fernando Fernandez Mancera - 0.2.10-1 +- Update to 0.2.10 + * Thu Mar 26 2020 Fernando Fernandez Mancera - 0.2.9-1 - Update to 0.2.9 diff --git a/sources b/sources index 464e598..aae1b91 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nmstate-0.2.9.tar.gz) = a1be6d137689c2126bcc610a43e37e15a3043357188c73731e5d069161dc8225acb13ab7be8b4a186414bb7a8f2ba930579bf316793bc150e45bd567eb69e44c -SHA512 (nmstate-0.2.9.tar.gz.asc) = 021cca4475c7500bfc1fb2f7ea72e06eb8d33c082c7e6d3e0f049eae1392dcc7e691b38c57c9ae21ae23829810ab2f9b520af45c6b0820b854ad26010572dc68 +SHA512 (nmstate-0.2.10.tar.gz) = 694b718827782dc69548770b49921c26e44e2f69a54acc02951041e261d4bda9596285f01b556ea03d204e8996381cc1eb22920730556936d4f98a5796109029 +SHA512 (nmstate-0.2.10.tar.gz.asc) = aa8785666a54c7eda953b94434e0199496c8612def6887ac8df16c286518adac78d3c9130c7c950ebce9f6b937b9f93a4091a30a66d66e56be9015c101160f41 From 06c5eb1ead8d8ee4bbd4425b822cbf7bac62244d Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Fri, 8 May 2020 08:33:03 +0200 Subject: [PATCH 016/120] Update to 0.3.0 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 8 ++++++-- sources | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 32ccaea..211fcdd 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,5 @@ /nmstate-0.2.9.tar.gz.asc /nmstate-0.2.10.tar.gz /nmstate-0.2.10.tar.gz.asc +/nmstate-0.3.0.tar.gz +/nmstate-0.3.0.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index e270813..c19be66 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,7 +3,7 @@ %define libname libnmstate Name: nmstate -Version: 0.2.10 +Version: 0.3.0 Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ @@ -27,7 +27,7 @@ provider support on the southbound. %package -n python3-%{libname} Summary: nmstate Python 3 API library -Requires: NetworkManager-libnm >= 1:1.22.8 +Requires: NetworkManager-libnm >= 1:1.22.10 # Use Recommends for NetworkManager because only access to NM DBus is required, # but NM could be running on a different host Recommends: NetworkManager @@ -66,6 +66,10 @@ gpgv2 --keyring ./gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.gpg %{SOURCE1} %{python3_sitelib}/%{srcname}-*.egg-info/ %changelog +* Fri May 08 2020 Fernando Fernandez Mancera - 0.3.0-1 +- Update to 0.3.0 +- Sync with upstream specfile + * Tue Apr 21 2020 Fernando Fernandez Mancera - 0.2.10-1 - Update to 0.2.10 diff --git a/sources b/sources index aae1b91..8f3e2da 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nmstate-0.2.10.tar.gz) = 694b718827782dc69548770b49921c26e44e2f69a54acc02951041e261d4bda9596285f01b556ea03d204e8996381cc1eb22920730556936d4f98a5796109029 -SHA512 (nmstate-0.2.10.tar.gz.asc) = aa8785666a54c7eda953b94434e0199496c8612def6887ac8df16c286518adac78d3c9130c7c950ebce9f6b937b9f93a4091a30a66d66e56be9015c101160f41 +SHA512 (nmstate-0.3.0.tar.gz) = 695b6517afdd5383d0537fe9666e43a71a4fac77a94654461b5428c053e27f00065d823d0ac4f05baada5b6a2f601d6d3ce87dc0acb5051f8b4f872695e76747 +SHA512 (nmstate-0.3.0.tar.gz.asc) = 7703858a6db20c64a32144f19a0c31f4f0d7a3c383e2b9504e3ef921df7f1e7b8c3147f78f04a4d8be5f40fb1fee80989925d69efd8a551d8a603ddd3bb1af94 From 434b6b751b90d7409d4c83dd277b24f26884f542 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Fri, 8 May 2020 08:47:01 +0200 Subject: [PATCH 017/120] Update signature verification Signed-off-by: Fernando Fernandez Mancera --- ...910D93CA83D77348595C0E899014C0463C12BB.asc | 50 ------------------- nmstate.spec | 10 ++-- 2 files changed, 6 insertions(+), 54 deletions(-) delete mode 100644 gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.asc diff --git a/gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.asc b/gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.asc deleted file mode 100644 index 5c599f3..0000000 --- a/gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.asc +++ /dev/null @@ -1,50 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQINBFvAY4kBEADxj6yl2aP0+fuXzpxkAgIYcQzrqZKeYPxlEXB0KGW6RlJK+ASj -YEB3PliRpJ9e1MfmS4Hhdn+FOtd+4AYrJegDWoPgSXWvLzVFd7egE13oQfInFxCj -1tbYePL6vy2VHMY4HJSTHLqPFNo6M2A3b36x5YWzWwoh92G+vtzVtkSNR1cflx/Y -XUojU3LdFNf05xwtx/SQ52yOz+8cBQb36ht8E2Df8TmQFun2m6n6G/lWbnAd5STx -Qrv5p0wvNGn7VQZiedvnAjN/W2Y18vrZFMpHyG1qUgb2aOvYRBNgZ1rNwisfpBYF -8P3MGmzFtwRScKvrDzj0iHWXtGXP/sn/rjiOkPeBpEqZddpU3reA5KLd5oneie4l -Jr/SrFBiXxm5G8swXI8D/mzW64XiQ4o5rAnPqRyK4C6lL0n7u+0xOBCIoD/lI+Yr -HqGS8UIb/cJadBEEcTPl6Mt05fELeeb0kO+x4YJj9N3mWV9JtGoDOtyyUvoWa34v -U5aBp6qsqmYAfcu0kLFEW+JxTleLEwfpO3TSvnOnzQegeIhubRUJoA7z57OyI98T -Gs8hmkz5J3hQcbnlVdsEXzOmEubwUv74u7kSmLd95D4v4r3uyWfxMQdbyta0xT8Z -QgFrNoQ6c9tpTUYisYt16M8eJDBBCXguNzrfHwivasAssxag93RScfRmWwARAQAB -tCBFZHdhcmQgSGFhcyA8ZWR3YXJkaEByZWRoYXQuY29tPokCOQQTAQIAIwUCW8Bj -iQIbAwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEImQFMBGPBK7bEcP+wU3 -6d1G3K6LyJprhckfyUnVw4JVBxd4QVo0iHLtG0ZEAfx81iMmKSxXXR4ckXwmK7Xc -DtT73aPWHGqwJE4/j9i99dgVCcZguJtK9qbaew4Txd5KDuQxl2Vj6li3M0qXVCxh -2nwRhTNKcr8pUawPdGfe11p8G85gyqzNpJN7OegfLZhuIXIZmbOrWfimoWiNTiyT -6VmXi2TLtNQKxnr1QQ8FRM0ajJECJ2fQDiaZlTiTpFrKHpYqTfGra8Bf741CeZf6 -WcttYQR/nywK2HwWjl19MTYRp9GHi3rWWwHmRKeD2a4aedPwUudHzwtsrGGvXrhQ -iuDtANLrDsYdnUGtkfvZxXABHaCz3kl6x28pOgrMzK+grF25cN+pk4/g4Q2cbZjM -4tuhTyTaOroeQn2jc0qDaRhN1iXyuKCsz6aQ4K1E8FlVPck2Kf/hq6n4WC1oxix8 -LNbpWICbaqc++t/eUPlZBpMzxmp3yQx/++wuzp9FeyyDiLTRSdFlJ2iZALASRxN2 -Wyk9ce/BorTf4y3dqweKNqpqSXc57nc98dcFrdIMW876S+nbDwYIC4ncV2u0Nh4P -Sll2HBPaXgMIAln8YKaCqnsdavJeeQdQ78rJhy40uNWLcknqOvZGI77SzahW/wJg -2K1qFSNaiOFFvwJQyEKHpSTxoo3ZmrPPVpRzj7MVuQINBFvAY4kBEACtEudGB3Bd -G7ulF8BG0z+8Ed6TmjsTYTmO1yPtxvtNVD5yNOUZjD7ViBvCE/6bnkHubeeCmTgx -S0XVFK9bGZFTb03wdq6TSRTvFN1LtcFb1oV/TjIQTjxdjMoHtJkqJ7JKjn8PP060 -WW+BLgE+jtK6RkodbBH1SZnNbzozpWNCVNN+Xch22H3X9KH9C122aXX4WnOTzizy -Drv2dymiYLhf6dAYGT1WY/e3zjWIiEr6OED8SPIcuC7QNjGtIjksW2jkGJlIRNi6 -Oz10eggaeMv2OfYpFLShpL8RwfgDxPcijaSTtiCoziLP3nrbgfbg2uCcbuGHKU5c -3HxO8eJJN3V8fGbesMH8owqQ6d0jh5kLSfqcyg3ddhU8qr3mQZOb/JaCEr0VPc68 -bxnAkX/hkHzatTrYP+xNKqTCwNKEPTWCVsz196zUSThJiAb+cnPYlqS1akYXE9y2 -ordTB0B6cCQ3jKk1VZLMqdTYDpemVQN+Yez24AhE0ttllR0XaU8OeVx1/yhsgG76 -dsdS4p/yM/cc3KWoFu/1jGgn+6vHNiHj4Wzjpx9cOgggUoBmN4ou6ZEi63x3i0qF -9xRNo3u8sgjVObgXZXb3VXcm1ANoEczsxGGtGVAPKch7M9fnMRsQQE0jSwxJ+j+o -9fw6xRbHIjJqvfm3/HvfJ1zMIpZDwJNM5wARAQABiQIfBBgBAgAJBQJbwGOJAhsM -AAoJEImQFMBGPBK7XlkQAJ+Pj2g0oU5q7QHsuUFtjBP5DhjAhoLbp/oCE0L6Y0g5 -KNFoMqsQcewdLsRR0kv7QslVeLSO1mrSQNBrd5AHjszme40Kym4Z5vrI23lFVNVf -pEG3FxrKVgSqT1Ter7HTxuZIZXM4r4O4//6ShjmzpeHIEaJ2dq2kbtbC0xFgOYMC -qjnoCBwL+IPkNzlab+mNCYX+JDcq/st+qLwfGJO+1kd+yWfouQ2KwIW59800rCSS -Q8gWh6myP9gzV2ME9Sqajyj8GkF9987MWCrsZdz4askugG4v1BoFCmb/Nc08pS7N -fXsd3NzD9qlbO/EsJalbs/jSmyEr1RSCz2nphZocx7YOr2p0Fi3EnUPhWYrpFQDf -rXklslRRFkWq2SgK+UaawJDb7emCiVVyHU8YMq9QWLh13eMqv69K+ef7lf1Um4GD -jmzAwRWUdqJdHV7qcBxpZLG0suNSY6yTZVK3IKL/HYbqmaJE9MsNFKYe/IYAHckg -2D34PgooJyhAz8q2znrCvJnJCJey07z5PXhPJW3Y5Iw64ve9vqWIbBaSYEkdFSXq -nJwyEa8SpCiunNstyRWdSpCIsh7KpJNYHs8J2TPsyiesAadM2i6U5utku/C5pLdP -QT/QPKULLytWY7ek4stF7TIIIMlCO/uXbfZDilTyFbbJ7L9yjsdMNEItS1/aR97W -=yD6X ------END PGP PUBLIC KEY BLOCK----- diff --git a/nmstate.spec b/nmstate.spec index c19be66..6f8cbc3 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -4,13 +4,12 @@ Name: nmstate Version: 0.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc -Source2: gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.asc BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -43,8 +42,8 @@ Suggests: NetworkManager-team This package contains the Python 3 library for Nmstate. %prep -gpg2 --import --import-options import-export,import-minimal %{SOURCE2} > ./gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.gpg -gpgv2 --keyring ./gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.gpg %{SOURCE1} %{SOURCE0} +curl --silent https://www.nmstate.io/nmstate.gpg | gpg2 --import +gpg2 --verify %{SOURCE1} %{SOURCE0} %setup -q %build @@ -66,6 +65,9 @@ gpgv2 --keyring ./gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.gpg %{SOURCE1} %{python3_sitelib}/%{srcname}-*.egg-info/ %changelog +* Fri May 08 2020 Fernando Fernandez Mancera - 0.3.0-2 +- Update signature verification + * Fri May 08 2020 Fernando Fernandez Mancera - 0.3.0-1 - Update to 0.3.0 - Sync with upstream specfile From dfd99053646db5c9521e34452d4f7016f47c324d Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Fri, 8 May 2020 09:06:05 +0200 Subject: [PATCH 018/120] Fix signature verification Signed-off-by: Fernando Fernandez Mancera --- nmstate.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nmstate.spec b/nmstate.spec index 6f8cbc3..6edc84f 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -4,12 +4,13 @@ Name: nmstate Version: 0.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc +Source2: https://www.nmstate.io/nmstate.gpg BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -42,8 +43,8 @@ Suggests: NetworkManager-team This package contains the Python 3 library for Nmstate. %prep -curl --silent https://www.nmstate.io/nmstate.gpg | gpg2 --import -gpg2 --verify %{SOURCE1} %{SOURCE0} +gpg2 --import --import-options import-export,import-minimal %{SOURCE2} > ./gpgkey-mantainers.gpg +gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %setup -q %build @@ -65,6 +66,9 @@ gpg2 --verify %{SOURCE1} %{SOURCE0} %{python3_sitelib}/%{srcname}-*.egg-info/ %changelog +* Fri May 08 2020 Fernando Fernandez Mancera - 0.3.0-3 +- Fix signature verification + * Fri May 08 2020 Fernando Fernandez Mancera - 0.3.0-2 - Update signature verification From 54076356d3ddd0c34347bb7939d34510a47dab3c Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Fri, 8 May 2020 09:37:42 +0200 Subject: [PATCH 019/120] Fix missing source Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 1 + nmstate.spec | 7 +++++-- sources | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 211fcdd..9d04536 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /nmstate-0.2.10.tar.gz.asc /nmstate-0.3.0.tar.gz /nmstate-0.3.0.tar.gz.asc +/nmstate.gpg diff --git a/nmstate.spec b/nmstate.spec index 6edc84f..4f28833 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -4,13 +4,13 @@ Name: nmstate Version: 0.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc -Source2: https://www.nmstate.io/nmstate.gpg +Source2: nmstate.gpg BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -66,6 +66,9 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{python3_sitelib}/%{srcname}-*.egg-info/ %changelog +* Fri May 08 2020 Fernando Fernandez Mancera - 0.3.0-4 +- Fix source path + * Fri May 08 2020 Fernando Fernandez Mancera - 0.3.0-3 - Fix signature verification diff --git a/sources b/sources index 8f3e2da..24e0da2 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ +SHA512 (nmstate.gpg) = a021b2cdb23869740dfb6a17d633fbecf717a209e979d600ba3e0d551569b3b93c3744439abd6e07a30511c6be15180df685f6e8c82c6e3b9fbfcb4572758052 SHA512 (nmstate-0.3.0.tar.gz) = 695b6517afdd5383d0537fe9666e43a71a4fac77a94654461b5428c053e27f00065d823d0ac4f05baada5b6a2f601d6d3ce87dc0acb5051f8b4f872695e76747 SHA512 (nmstate-0.3.0.tar.gz.asc) = 7703858a6db20c64a32144f19a0c31f4f0d7a3c383e2b9504e3ef921df7f1e7b8c3147f78f04a4d8be5f40fb1fee80989925d69efd8a551d8a603ddd3bb1af94 From 3692c40073a5cb4e5516fdc256d8d28c23e72c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 02:54:16 +0200 Subject: [PATCH 020/120] Rebuilt for Python 3.9 --- nmstate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nmstate.spec b/nmstate.spec index 4f28833..710d806 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -4,7 +4,7 @@ Name: nmstate Version: 0.3.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -66,6 +66,9 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{python3_sitelib}/%{srcname}-*.egg-info/ %changelog +* Tue May 26 2020 Miro Hrončok - 0.3.0-5 +- Rebuilt for Python 3.9 + * Fri May 08 2020 Fernando Fernandez Mancera - 0.3.0-4 - Fix source path From b36cdf124d3d8f49919e4ddefe9be85e1e4ae2ce Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Tue, 9 Jun 2020 10:10:03 +0200 Subject: [PATCH 021/120] Update to 0.3.1 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9d04536..298d2c8 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,5 @@ /nmstate-0.3.0.tar.gz /nmstate-0.3.0.tar.gz.asc /nmstate.gpg +/nmstate-0.3.1.tar.gz +/nmstate-0.3.1.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index 710d806..1623d06 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,8 +3,8 @@ %define libname libnmstate Name: nmstate -Version: 0.3.0 -Release: 5%{?dist} +Version: 0.3.1 +Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -66,6 +66,9 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{python3_sitelib}/%{srcname}-*.egg-info/ %changelog +* Tue Jun 09 2020 Fernando Fernandez Mancera - 0.3.1-1 +- Update to 0.3.1 + * Tue May 26 2020 Miro Hrončok - 0.3.0-5 - Rebuilt for Python 3.9 diff --git a/sources b/sources index 24e0da2..cab81af 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ +SHA512 (nmstate-0.3.1.tar.gz) = 5c146426c3a4c041f07c393794808e491084346643f7be28b41afa47fa6313ca4dcfddb39c181433ab532f36d39efcbd41b71f145f3ae8891556f1d360be341f +SHA512 (nmstate-0.3.1.tar.gz.asc) = 923fcc8369a10301cbae6c14c9f72bb90a6422cb42670f736691848e283fc230ddcd2c7c79944cbb399c80d4d4f68a83117775cbfdfbeb95ab75cfa5df38dbde SHA512 (nmstate.gpg) = a021b2cdb23869740dfb6a17d633fbecf717a209e979d600ba3e0d551569b3b93c3744439abd6e07a30511c6be15180df685f6e8c82c6e3b9fbfcb4572758052 -SHA512 (nmstate-0.3.0.tar.gz) = 695b6517afdd5383d0537fe9666e43a71a4fac77a94654461b5428c053e27f00065d823d0ac4f05baada5b6a2f601d6d3ce87dc0acb5051f8b4f872695e76747 -SHA512 (nmstate-0.3.0.tar.gz.asc) = 7703858a6db20c64a32144f19a0c31f4f0d7a3c383e2b9504e3ef921df7f1e7b8c3147f78f04a4d8be5f40fb1fee80989925d69efd8a551d8a603ddd3bb1af94 From 175ec679bcd5b8e14c31aaf5a3a04b6ada432860 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Tue, 16 Jun 2020 00:25:52 +0200 Subject: [PATCH 022/120] Update to 0.3.2 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 23 +++++++++++++++++++++-- sources | 4 ++-- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 298d2c8..e629955 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,5 @@ /nmstate.gpg /nmstate-0.3.1.tar.gz /nmstate-0.3.1.tar.gz.asc +/nmstate-0.3.2.tar.gz +/nmstate-0.3.2.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index 1623d06..e98a450 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,7 +3,7 @@ %define libname libnmstate Name: nmstate -Version: 0.3.1 +Version: 0.3.2 Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ @@ -27,7 +27,7 @@ provider support on the southbound. %package -n python3-%{libname} Summary: nmstate Python 3 API library -Requires: NetworkManager-libnm >= 1:1.22.10 +Requires: NetworkManager-libnm >= 1:1.22.16 # Use Recommends for NetworkManager because only access to NM DBus is required, # but NM could be running on a different host Recommends: NetworkManager @@ -38,10 +38,19 @@ Recommends: NetworkManager-config-server Suggests: NetworkManager-ovs Suggests: NetworkManager-team +%package -n nmstate-plugin-ovsdb +Summary: nmstate plugin for OVS database manipulation +Requires: python3-%{libname} = %{?epoch:%{epoch}:}%{version}-%{release} +# The python-openvswitch rpm pacakge is not in the same repo with nmstate, +# hence state it as Recommends, no requires. +Recommends: python3dist(ovs) %description -n python3-%{libname} This package contains the Python 3 library for Nmstate. +%description -n nmstate-plugin-ovsdb +This package contains the nmstate plugin for OVS database manipulation. + %prep gpg2 --import --import-options import-export,import-minimal %{SOURCE2} > ./gpgkey-mantainers.gpg gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} @@ -64,8 +73,18 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %license LICENSE %{python3_sitelib}/%{libname} %{python3_sitelib}/%{srcname}-*.egg-info/ +%exclude %{python3_sitelib}/%{libname}/plugins/nmstate_plugin_* +%exclude %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_* + +%files -n nmstate-plugin-ovsdb +%{python3_sitelib}/%{libname}/plugins/nmstate_plugin_ovsdb* +%{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Tue Jun 16 2020 Fernando Fernandez Mancera - 0.3.2-1 +- Update to 0.3.2 +- Sync with upstream specfile + * Tue Jun 09 2020 Fernando Fernandez Mancera - 0.3.1-1 - Update to 0.3.1 diff --git a/sources b/sources index cab81af..819aa91 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (nmstate-0.3.1.tar.gz) = 5c146426c3a4c041f07c393794808e491084346643f7be28b41afa47fa6313ca4dcfddb39c181433ab532f36d39efcbd41b71f145f3ae8891556f1d360be341f -SHA512 (nmstate-0.3.1.tar.gz.asc) = 923fcc8369a10301cbae6c14c9f72bb90a6422cb42670f736691848e283fc230ddcd2c7c79944cbb399c80d4d4f68a83117775cbfdfbeb95ab75cfa5df38dbde +SHA512 (nmstate-0.3.2.tar.gz) = 6a9b8103d29c081b96b4eeb6cfec2804762db1fbc2d9119bdc038af86ea001f67310d976dd9799635626a0d8dc01f9084adb07e4e380c0bd9ee5ad42eba4f7b5 +SHA512 (nmstate-0.3.2.tar.gz.asc) = fe71e580c49aaf543fe84376d0bf9198643bf552711df0ed7aa7b3f778ef093a131420204652e2307e2473173d0da8ad8d26976f8418e28a775eb4b85b46d974 SHA512 (nmstate.gpg) = a021b2cdb23869740dfb6a17d633fbecf717a209e979d600ba3e0d551569b3b93c3744439abd6e07a30511c6be15180df685f6e8c82c6e3b9fbfcb4572758052 From 33cd8ecad62fbd515f0151f87cd5466e7b04fc30 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Thu, 2 Jul 2020 18:36:59 +0200 Subject: [PATCH 023/120] Update to 0.3.3 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e629955..386c51e 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,5 @@ /nmstate-0.3.1.tar.gz.asc /nmstate-0.3.2.tar.gz /nmstate-0.3.2.tar.gz.asc +/nmstate-0.3.3.tar.gz +/nmstate-0.3.3.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index e98a450..7c561bd 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,7 +3,7 @@ %define libname libnmstate Name: nmstate -Version: 0.3.2 +Version: 0.3.3 Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ @@ -81,6 +81,9 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Thu Jul 02 2020 Fernando Fernandez Mancera - 0.3.3-1 +- Update to 0.3.3 + * Tue Jun 16 2020 Fernando Fernandez Mancera - 0.3.2-1 - Update to 0.3.2 - Sync with upstream specfile diff --git a/sources b/sources index 819aa91..1190b55 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (nmstate-0.3.2.tar.gz) = 6a9b8103d29c081b96b4eeb6cfec2804762db1fbc2d9119bdc038af86ea001f67310d976dd9799635626a0d8dc01f9084adb07e4e380c0bd9ee5ad42eba4f7b5 -SHA512 (nmstate-0.3.2.tar.gz.asc) = fe71e580c49aaf543fe84376d0bf9198643bf552711df0ed7aa7b3f778ef093a131420204652e2307e2473173d0da8ad8d26976f8418e28a775eb4b85b46d974 +SHA512 (nmstate-0.3.3.tar.gz) = fadd4adf0cdd36379d439c8a8ab058ecf53ccaff39c991da76b00c6ffca640a296026276b54b511979c12e6c4161f2ff40dbf7770808831551ffbcf6580edede +SHA512 (nmstate-0.3.3.tar.gz.asc) = 99615d8c38e148d3bc52195dd17212ad72a162424472f6ec96b8c99299391540c55f2f522b40b7cd44fbb14c68ba2318d2603273042cae5e3a14a018b16004cc SHA512 (nmstate.gpg) = a021b2cdb23869740dfb6a17d633fbecf717a209e979d600ba3e0d551569b3b93c3744439abd6e07a30511c6be15180df685f6e8c82c6e3b9fbfcb4572758052 From 145f7ab58a9d44239e7c2a63616d209b94b20fb5 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Sat, 25 Jul 2020 14:00:36 +0200 Subject: [PATCH 024/120] Update to 0.3.4 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 12 +++++++----- sources | 6 +++--- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 386c51e..cbe8602 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,5 @@ /nmstate-0.3.2.tar.gz.asc /nmstate-0.3.3.tar.gz /nmstate-0.3.3.tar.gz.asc +/nmstate-0.3.4.tar.gz +/nmstate-0.3.4.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index 7c561bd..121f9e0 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,7 +3,7 @@ %define libname libnmstate Name: nmstate -Version: 0.3.3 +Version: 0.3.4 Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ @@ -27,7 +27,7 @@ provider support on the southbound. %package -n python3-%{libname} Summary: nmstate Python 3 API library -Requires: NetworkManager-libnm >= 1:1.22.16 +Requires: NetworkManager-libnm >= 1:1.26.0 # Use Recommends for NetworkManager because only access to NM DBus is required, # but NM could be running on a different host Recommends: NetworkManager @@ -41,9 +41,7 @@ Suggests: NetworkManager-team %package -n nmstate-plugin-ovsdb Summary: nmstate plugin for OVS database manipulation Requires: python3-%{libname} = %{?epoch:%{epoch}:}%{version}-%{release} -# The python-openvswitch rpm pacakge is not in the same repo with nmstate, -# hence state it as Recommends, no requires. -Recommends: python3dist(ovs) +Requires: python3dist(ovs) %description -n python3-%{libname} This package contains the Python 3 library for Nmstate. @@ -81,6 +79,10 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Sat Jul 25 2020 Fernando Fernandez Mancera - 0.3.4-1 +- Update to 0.3.4 +- Sync. with upstream specfile + * Thu Jul 02 2020 Fernando Fernandez Mancera - 0.3.3-1 - Update to 0.3.3 diff --git a/sources b/sources index 1190b55..320b989 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (nmstate-0.3.3.tar.gz) = fadd4adf0cdd36379d439c8a8ab058ecf53ccaff39c991da76b00c6ffca640a296026276b54b511979c12e6c4161f2ff40dbf7770808831551ffbcf6580edede -SHA512 (nmstate-0.3.3.tar.gz.asc) = 99615d8c38e148d3bc52195dd17212ad72a162424472f6ec96b8c99299391540c55f2f522b40b7cd44fbb14c68ba2318d2603273042cae5e3a14a018b16004cc -SHA512 (nmstate.gpg) = a021b2cdb23869740dfb6a17d633fbecf717a209e979d600ba3e0d551569b3b93c3744439abd6e07a30511c6be15180df685f6e8c82c6e3b9fbfcb4572758052 +SHA512 (nmstate-0.3.4.tar.gz) = e367dd79e294ce260c213cc1f62880dfd58b8e2484c236b215fb0dbb1d4d679b90cde0b3f70444a45182747602ad71772ab5bd1b6eb124365f92469c091b6444 +SHA512 (nmstate-0.3.4.tar.gz.asc) = a895965a5bc58f4a6ee1ed4284aaaad4943b4f8b7f32781979584a996554ac712c2e3bb1683b569f793bcd1b093f55ddb735c0222e8cf64ad2fdb0be9f9a1ead +SHA512 (nmstate.gpg) = af6af2024ea46b5c87c6c71d4be278ce4eed58c1783385619987fe8e254eb599f9b218897e7db67050b0e9f7101b206561f63218fda18a0d95103a04682c8309 From c9fbae45148faabf944c52464d8f7c0d3f9d69d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 09:13:15 +0000 Subject: [PATCH 025/120] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nmstate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nmstate.spec b/nmstate.spec index 121f9e0..3e76ad9 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -4,7 +4,7 @@ Name: nmstate Version: 0.3.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -79,6 +79,9 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 0.3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Jul 25 2020 Fernando Fernandez Mancera - 0.3.4-1 - Update to 0.3.4 - Sync. with upstream specfile From db430872125df481b9b65685aa051d1f402a14e2 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Mon, 31 Aug 2020 10:39:18 +0200 Subject: [PATCH 026/120] Update to 0.3.5 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index cbe8602..2bb7190 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,5 @@ /nmstate-0.3.3.tar.gz.asc /nmstate-0.3.4.tar.gz /nmstate-0.3.4.tar.gz.asc +/nmstate-0.3.5.tar.gz +/nmstate-0.3.5.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index 3e76ad9..1d5972e 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,8 +3,8 @@ %define libname libnmstate Name: nmstate -Version: 0.3.4 -Release: 2%{?dist} +Version: 0.3.5 +Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -79,6 +79,9 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Mon Aug 31 2020 Fernando Fernandez Mancera - 0.3.5-1 +- Update to 0.3.5 + * Tue Jul 28 2020 Fedora Release Engineering - 0.3.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 320b989..a0525cb 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (nmstate-0.3.4.tar.gz) = e367dd79e294ce260c213cc1f62880dfd58b8e2484c236b215fb0dbb1d4d679b90cde0b3f70444a45182747602ad71772ab5bd1b6eb124365f92469c091b6444 -SHA512 (nmstate-0.3.4.tar.gz.asc) = a895965a5bc58f4a6ee1ed4284aaaad4943b4f8b7f32781979584a996554ac712c2e3bb1683b569f793bcd1b093f55ddb735c0222e8cf64ad2fdb0be9f9a1ead SHA512 (nmstate.gpg) = af6af2024ea46b5c87c6c71d4be278ce4eed58c1783385619987fe8e254eb599f9b218897e7db67050b0e9f7101b206561f63218fda18a0d95103a04682c8309 +SHA512 (nmstate-0.3.5.tar.gz) = a62ce4dd6ee5f04d5e962865df633da0247c0e859881d7476d2fe71e3625b32d7c42721aff1fdcc6a5131e8c7d1a05f32f908c3b55b56875f8096a65285fdc8a +SHA512 (nmstate-0.3.5.tar.gz.asc) = 6b57ee988fa1802ef67c7c3767538f34b62592b7af9f3d1b9ce8d6dc1b717d4916c6aafb543d85b2a9db9ec7351ec6151324cc4bf32b302add9b34dbe2ef34bc From eb2b33282fc59c43458876cb6faaa2c6f060d78d Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Sun, 20 Sep 2020 20:22:15 +0800 Subject: [PATCH 027/120] Upgrade to 0.4.0 Signed-off-by: Gris Ge --- .gitignore | 2 ++ nmstate.spec | 7 ++++++- sources | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2bb7190..bf38e9c 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,5 @@ /nmstate-0.3.4.tar.gz.asc /nmstate-0.3.5.tar.gz /nmstate-0.3.5.tar.gz.asc +/nmstate-0.4.0.tar.gz +/nmstate-0.4.0.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index 1d5972e..262711e 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,7 +3,7 @@ %define libname libnmstate Name: nmstate -Version: 0.3.5 +Version: 0.4.0 Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ @@ -37,6 +37,8 @@ Recommends: NetworkManager-config-server # required for OVS and team support Suggests: NetworkManager-ovs Suggests: NetworkManager-team +# FIXME: Once upstream included nispor into requirement.txt, remove below line +Requires: python3dist(nispor) %package -n nmstate-plugin-ovsdb Summary: nmstate plugin for OVS database manipulation @@ -79,6 +81,9 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Sun Sep 20 2020 Gris Ge - 0.4.0-1 +- Upgrade to 0.4.0 + * Mon Aug 31 2020 Fernando Fernandez Mancera - 0.3.5-1 - Update to 0.3.5 diff --git a/sources b/sources index a0525cb..ed018ea 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ +SHA512 (nmstate-0.4.0.tar.gz) = edbd9663178004786287502c10ecafd284de2b96d874b1f65a3c93f9898358341eddb2bf89fc1d989e612351e6cfbe0ce47a643c8be9139a5ac7354047057e3a +SHA512 (nmstate-0.4.0.tar.gz.asc) = 32e99c7acd93a93fab5d0e454d6ea2b87107d9a4486d879bee13fd96a32117bdccc45c7aea9fd826b4ddf5e1e7261cfd98c60b1d21a7bebbd9c894f4a42dcb23 SHA512 (nmstate.gpg) = af6af2024ea46b5c87c6c71d4be278ce4eed58c1783385619987fe8e254eb599f9b218897e7db67050b0e9f7101b206561f63218fda18a0d95103a04682c8309 -SHA512 (nmstate-0.3.5.tar.gz) = a62ce4dd6ee5f04d5e962865df633da0247c0e859881d7476d2fe71e3625b32d7c42721aff1fdcc6a5131e8c7d1a05f32f908c3b55b56875f8096a65285fdc8a -SHA512 (nmstate-0.3.5.tar.gz.asc) = 6b57ee988fa1802ef67c7c3767538f34b62592b7af9f3d1b9ce8d6dc1b717d4916c6aafb543d85b2a9db9ec7351ec6151324cc4bf32b302add9b34dbe2ef34bc From 4a5bb4e177167a1ab52cb3253a26f31f8e855a0a Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Tue, 13 Oct 2020 00:19:53 +0800 Subject: [PATCH 028/120] Fix the ELN build by put ovs stuff as soft requirement. Signed-off-by: Gris Ge --- nmstate.spec | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/nmstate.spec b/nmstate.spec index 262711e..a80764d 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -4,7 +4,7 @@ Name: nmstate Version: 0.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -33,6 +33,7 @@ Requires: NetworkManager-libnm >= 1:1.26.0 Recommends: NetworkManager # Avoid automatically generated profiles Recommends: NetworkManager-config-server +Recommends: (nmstate-plugin-ovsdb if openvswitch) # Use Suggests for NetworkManager-ovs and NetworkManager-team since it is only # required for OVS and team support Suggests: NetworkManager-ovs @@ -43,7 +44,15 @@ Requires: python3dist(nispor) %package -n nmstate-plugin-ovsdb Summary: nmstate plugin for OVS database manipulation Requires: python3-%{libname} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: python3dist(ovs) +%if 0%{?rhel} +# The python-openvswitch rpm package is not in the same repo with nmstate, +# require only if openvswitch is installed. +Requires: (python3dist(ovs) if openvswitch) +Recommends: python3dist(ovs) +%else +Requires: python3dist(ovs) +%endif + %description -n python3-%{libname} This package contains the Python 3 library for Nmstate. @@ -81,6 +90,9 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Tue Oct 13 2020 Gris Ge - 0.4.0-2 +- Fix the ELN build by put ovs stuff as soft requirement. + * Sun Sep 20 2020 Gris Ge - 0.4.0-1 - Upgrade to 0.4.0 From b83bd369ddee0ab64aab5b33de9213334c3435f5 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Thu, 22 Oct 2020 23:03:49 +0200 Subject: [PATCH 029/120] Upgrade to 0.4.1 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index bf38e9c..0234d82 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,5 @@ /nmstate-0.3.5.tar.gz.asc /nmstate-0.4.0.tar.gz /nmstate-0.4.0.tar.gz.asc +/nmstate-0.4.1.tar.gz +/nmstate-0.4.1.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index a80764d..22eace3 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,8 +3,8 @@ %define libname libnmstate Name: nmstate -Version: 0.4.0 -Release: 2%{?dist} +Version: 0.4.1 +Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -90,6 +90,9 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Thu Oct 22 2020 Fernando Fernandez Mancera - 0.4.1-1 +- Upgrade to 0.4.1 + * Tue Oct 13 2020 Gris Ge - 0.4.0-2 - Fix the ELN build by put ovs stuff as soft requirement. diff --git a/sources b/sources index ed018ea..13a28cf 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (nmstate-0.4.0.tar.gz) = edbd9663178004786287502c10ecafd284de2b96d874b1f65a3c93f9898358341eddb2bf89fc1d989e612351e6cfbe0ce47a643c8be9139a5ac7354047057e3a -SHA512 (nmstate-0.4.0.tar.gz.asc) = 32e99c7acd93a93fab5d0e454d6ea2b87107d9a4486d879bee13fd96a32117bdccc45c7aea9fd826b4ddf5e1e7261cfd98c60b1d21a7bebbd9c894f4a42dcb23 +SHA512 (nmstate-0.4.1.tar.gz) = af2a6d72b47b248146e473c0e875f333b092904fab3fa209c4dc98153ef9918e46a9d4323a5a8db234eb4423173bc5c7791ccdf0628995994e65bfc084a1e65e +SHA512 (nmstate-0.4.1.tar.gz.asc) = f773bee5cd3056b91be96ac3e6e136dc54f341664ed84452e45fae8730a5a2b9a216c2e75add71f1c4248449b46b18f298a1393595ad0df7886473736385ed76 SHA512 (nmstate.gpg) = af6af2024ea46b5c87c6c71d4be278ce4eed58c1783385619987fe8e254eb599f9b218897e7db67050b0e9f7101b206561f63218fda18a0d95103a04682c8309 From 86d064c122609eca947437c1c2c85ad592522b6b Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Tue, 8 Dec 2020 23:33:22 +0100 Subject: [PATCH 030/120] Upgrade to 1.0.0 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0234d82..f9dd77c 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,5 @@ /nmstate-0.4.0.tar.gz.asc /nmstate-0.4.1.tar.gz /nmstate-0.4.1.tar.gz.asc +/nmstate-1.0.0.tar.gz +/nmstate-1.0.0.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index 22eace3..e85668c 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,7 +3,7 @@ %define libname libnmstate Name: nmstate -Version: 0.4.1 +Version: 1.0.0 Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ @@ -90,6 +90,9 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Tue Dec 08 2020 Fernando Fernandez Mancera - 1.0.0-1 +- Upgrade to 1.0.0 + * Thu Oct 22 2020 Fernando Fernandez Mancera - 0.4.1-1 - Upgrade to 0.4.1 diff --git a/sources b/sources index 13a28cf..762d848 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (nmstate-0.4.1.tar.gz) = af2a6d72b47b248146e473c0e875f333b092904fab3fa209c4dc98153ef9918e46a9d4323a5a8db234eb4423173bc5c7791ccdf0628995994e65bfc084a1e65e -SHA512 (nmstate-0.4.1.tar.gz.asc) = f773bee5cd3056b91be96ac3e6e136dc54f341664ed84452e45fae8730a5a2b9a216c2e75add71f1c4248449b46b18f298a1393595ad0df7886473736385ed76 +SHA512 (nmstate-1.0.0.tar.gz) = ab7c1509b0356030d250a084124e0f01e049aeb0432f2e37d231c46e1b690060d02ea14cc27e18132041605d38102c593a1364eec7ef2a84d0c2a77c82de5029 +SHA512 (nmstate-1.0.0.tar.gz.asc) = 4c0ea483250795fc73ee587764ca31ad4729e5dc93ca4a9bcad8a46fe8b23604bd25a30494db87a4ceff2efb4fbccbd10cb772e9b32f0c57fdf326fb86febce6 SHA512 (nmstate.gpg) = af6af2024ea46b5c87c6c71d4be278ce4eed58c1783385619987fe8e254eb599f9b218897e7db67050b0e9f7101b206561f63218fda18a0d95103a04682c8309 From 1df8519d1f6c4973d36496e2ca43959c369b719a Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Tue, 19 Jan 2021 00:02:56 +0100 Subject: [PATCH 031/120] Upgrade to 1.0.1 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f9dd77c..bffd1bc 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,5 @@ /nmstate-0.4.1.tar.gz.asc /nmstate-1.0.0.tar.gz /nmstate-1.0.0.tar.gz.asc +/nmstate-1.0.1.tar.gz +/nmstate-1.0.1.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index e85668c..5e8070e 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,7 +3,7 @@ %define libname libnmstate Name: nmstate -Version: 1.0.0 +Version: 1.0.1 Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ @@ -90,6 +90,9 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Tue Jan 19 2021 Fernando Fernandez Mancera - 1.0.1-1 +- Upgrade to 1.0.1 + * Tue Dec 08 2020 Fernando Fernandez Mancera - 1.0.0-1 - Upgrade to 1.0.0 diff --git a/sources b/sources index 762d848..8cd9539 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (nmstate-1.0.0.tar.gz) = ab7c1509b0356030d250a084124e0f01e049aeb0432f2e37d231c46e1b690060d02ea14cc27e18132041605d38102c593a1364eec7ef2a84d0c2a77c82de5029 -SHA512 (nmstate-1.0.0.tar.gz.asc) = 4c0ea483250795fc73ee587764ca31ad4729e5dc93ca4a9bcad8a46fe8b23604bd25a30494db87a4ceff2efb4fbccbd10cb772e9b32f0c57fdf326fb86febce6 +SHA512 (nmstate-1.0.1.tar.gz) = ca1bbe3e7f6b28c05c62c84fdcdc3fb5798484afdbc58baeb7cc02c49afe27d4e76eee8d1437ad101642c0ac57f1561a3b793b846457523ffb875c4c64f4b080 +SHA512 (nmstate-1.0.1.tar.gz.asc) = 9bafd0d168b58025cc92967608495a75d4e569cc0ad853e2d511cae11236783b6e07ddeeb47504e13dc2ee078ae24016ef6896622353d2fbf25a87d51896fa44 SHA512 (nmstate.gpg) = af6af2024ea46b5c87c6c71d4be278ce4eed58c1783385619987fe8e254eb599f9b218897e7db67050b0e9f7101b206561f63218fda18a0d95103a04682c8309 From 689e6cc52ba4517c8a93d5ddd7fb6aa71e1abf6a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 21:35:08 +0000 Subject: [PATCH 032/120] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nmstate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nmstate.spec b/nmstate.spec index 5e8070e..78ee1c5 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -4,7 +4,7 @@ Name: nmstate Version: 1.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -90,6 +90,9 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jan 19 2021 Fernando Fernandez Mancera - 1.0.1-1 - Upgrade to 1.0.1 From 0c73069dfb49f25dfc826f0bfd6cd4ef32de502f Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Sun, 21 Feb 2021 19:57:01 +0100 Subject: [PATCH 033/120] Upgrade to 1.0.2 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index bffd1bc..2691cf1 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,5 @@ /nmstate-1.0.0.tar.gz.asc /nmstate-1.0.1.tar.gz /nmstate-1.0.1.tar.gz.asc +/nmstate-1.0.2.tar.gz.asc +/nmstate-1.0.2.tar.gz diff --git a/nmstate.spec b/nmstate.spec index 78ee1c5..4b948f6 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,8 +3,8 @@ %define libname libnmstate Name: nmstate -Version: 1.0.1 -Release: 2%{?dist} +Version: 1.0.2 +Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -90,6 +90,9 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Sun Feb 21 2021 Fernando Fernandez Mancera - 1.0.2-1 +- Upgrade to 1.0.2 + * Tue Jan 26 2021 Fedora Release Engineering - 1.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 8cd9539..11753cc 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (nmstate-1.0.1.tar.gz) = ca1bbe3e7f6b28c05c62c84fdcdc3fb5798484afdbc58baeb7cc02c49afe27d4e76eee8d1437ad101642c0ac57f1561a3b793b846457523ffb875c4c64f4b080 -SHA512 (nmstate-1.0.1.tar.gz.asc) = 9bafd0d168b58025cc92967608495a75d4e569cc0ad853e2d511cae11236783b6e07ddeeb47504e13dc2ee078ae24016ef6896622353d2fbf25a87d51896fa44 SHA512 (nmstate.gpg) = af6af2024ea46b5c87c6c71d4be278ce4eed58c1783385619987fe8e254eb599f9b218897e7db67050b0e9f7101b206561f63218fda18a0d95103a04682c8309 +SHA512 (nmstate-1.0.2.tar.gz.asc) = d5ba4eb128164b8180af8cdbe37e47c2e3ca8e6c1b023974b2f0526af98bd319fe6e7b2ec27d412921577469e2b105c56f384dec1a3c7fb739e5e7be2d40bbb0 +SHA512 (nmstate-1.0.2.tar.gz) = 9d5866ca9ab43dfd6241d48bee8752902bca8621d4d5dad1c178f4b139a129aceafd9c4a780663e05fe22b09fd6e707036b024e4604510700b53b569a4018a06 From 1a30cbab45a1f64a7be3c3a5f1e37bd15fd8815e Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Thu, 15 Apr 2021 15:21:11 +0200 Subject: [PATCH 034/120] Upgrade to 1.0.3 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2691cf1..2918d58 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,5 @@ /nmstate-1.0.1.tar.gz.asc /nmstate-1.0.2.tar.gz.asc /nmstate-1.0.2.tar.gz +/nmstate-1.0.3.tar.gz +/nmstate-1.0.3.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index 4b948f6..c8e07c7 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,7 +3,7 @@ %define libname libnmstate Name: nmstate -Version: 1.0.2 +Version: 1.0.3 Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ @@ -90,6 +90,9 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Thu Apr 15 2021 Fernando Fernandez Mancera - 1.0.3-1 +- Upgrade to 1.0.3 + * Sun Feb 21 2021 Fernando Fernandez Mancera - 1.0.2-1 - Upgrade to 1.0.2 diff --git a/sources b/sources index 11753cc..d0adf4b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ +SHA512 (nmstate-1.0.3.tar.gz) = 2302979f4a0c029c778cc93e586a0b81e93fdc3f605dbc212034222899b0642863bd7c0f39b7021cd2d7274420c2e6cd4975719110a0330a867e923d8d8831bb +SHA512 (nmstate-1.0.3.tar.gz.asc) = 5d9936b1ecf02e67f232379e0cbfe9741836d3179f8ef110e149d9e53436a5c475898ea17427538c4da011107c9d46287c968fb7540078714caf97173a888da8 SHA512 (nmstate.gpg) = af6af2024ea46b5c87c6c71d4be278ce4eed58c1783385619987fe8e254eb599f9b218897e7db67050b0e9f7101b206561f63218fda18a0d95103a04682c8309 -SHA512 (nmstate-1.0.2.tar.gz.asc) = d5ba4eb128164b8180af8cdbe37e47c2e3ca8e6c1b023974b2f0526af98bd319fe6e7b2ec27d412921577469e2b105c56f384dec1a3c7fb739e5e7be2d40bbb0 -SHA512 (nmstate-1.0.2.tar.gz) = 9d5866ca9ab43dfd6241d48bee8752902bca8621d4d5dad1c178f4b139a129aceafd9c4a780663e05fe22b09fd6e707036b024e4604510700b53b569a4018a06 From 5a5dcb96d07a00f540c256d53c924cde74362bce Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Mon, 19 Apr 2021 23:33:06 +0200 Subject: [PATCH 035/120] Fix installation nmstate-varlink.service Signed-off-by: Fernando Fernandez Mancera --- nmstate.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nmstate.spec b/nmstate.spec index c8e07c7..593b3a9 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -4,7 +4,7 @@ Name: nmstate Version: 1.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -15,6 +15,8 @@ BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: gnupg2 +BuildRequires: systemd-devel +BuildRequires: systemd-rpm-macros Requires: python3-setuptools Requires: python3-%{libname} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -70,6 +72,9 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %install %py3_install +mkdir -p %{buildroot}%{_unitdir} +install -p -m 644 %{buildroot}%{python3_sitelib}/nmstatectl/nmstate-varlink.service \ + %{buildroot}%{_unitdir}/nmstate-varlink.service %files %doc README.md @@ -77,6 +82,7 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{_mandir}/man8/nmstatectl.8* %{python3_sitelib}/nmstatectl %{_bindir}/nmstatectl +%{_unitdir}/nmstate-varlink.service %files -n python3-%{libname} %license LICENSE @@ -90,6 +96,9 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Mon Apr 19 2021 Fernando Fernandez Mancera - 1.0.3-2 +- Fix installation nmstate-varlink.service + * Thu Apr 15 2021 Fernando Fernandez Mancera - 1.0.3-1 - Upgrade to 1.0.3 From 654e47889dd2a0b0820a2f059275286d39a9b38f Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 20:13:06 +0200 Subject: [PATCH 036/120] Rebuilt for Python 3.10 --- nmstate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nmstate.spec b/nmstate.spec index 593b3a9..6e24309 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -4,7 +4,7 @@ Name: nmstate Version: 1.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -96,6 +96,9 @@ install -p -m 644 %{buildroot}%{python3_sitelib}/nmstatectl/nmstate-varlink.serv %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Fri Jun 04 2021 Python Maint - 1.0.3-3 +- Rebuilt for Python 3.10 + * Mon Apr 19 2021 Fernando Fernandez Mancera - 1.0.3-2 - Fix installation nmstate-varlink.service From 3e4e643581272b19283c74777542309282634af5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 16:11:47 +0000 Subject: [PATCH 037/120] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nmstate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nmstate.spec b/nmstate.spec index 6e24309..5b18ce6 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -4,7 +4,7 @@ Name: nmstate Version: 1.0.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -96,6 +96,9 @@ install -p -m 644 %{buildroot}%{python3_sitelib}/nmstatectl/nmstate-varlink.serv %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 1.0.3-3 - Rebuilt for Python 3.10 From de9c1d06d9a6cfe54dbc36773d250c58c8026a8f Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Tue, 27 Jul 2021 12:57:56 +0800 Subject: [PATCH 038/120] Upgrade to 1.1.0 Signed-off-by: Gris Ge --- .gitignore | 2 + ...mstatectl-fix-long-arguments-support.patch | 53 +++++++++ ...rve-existing-ethtool-settings-when-u.patch | 105 ++++++++++++++++++ ...nore-for-ovs-port-when-removing-them.patch | 87 +++++++++++++++ ...of-empty-next_hop_address-and-destin.patch | 86 ++++++++++++++ nmstate.spec | 16 ++- sources | 4 +- 7 files changed, 346 insertions(+), 7 deletions(-) create mode 100644 0001-nmstatectl-fix-long-arguments-support.patch create mode 100644 0002-nm-ethtool-Preserve-existing-ethtool-settings-when-u.patch create mode 100644 0003-ovs-fix-state-ignore-for-ovs-port-when-removing-them.patch create mode 100644 0004-nispor-fix-show-of-empty-next_hop_address-and-destin.patch diff --git a/.gitignore b/.gitignore index 2918d58..50acc89 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,5 @@ /nmstate-1.0.2.tar.gz /nmstate-1.0.3.tar.gz /nmstate-1.0.3.tar.gz.asc +/nmstate-1.1.0.tar.gz +/nmstate-1.1.0.tar.gz.asc diff --git a/0001-nmstatectl-fix-long-arguments-support.patch b/0001-nmstatectl-fix-long-arguments-support.patch new file mode 100644 index 0000000..4334857 --- /dev/null +++ b/0001-nmstatectl-fix-long-arguments-support.patch @@ -0,0 +1,53 @@ +From 99c7f643bab33a26c317e1b72ca3b8490cb1ea60 Mon Sep 17 00:00:00 2001 +From: Fernando Fernandez Mancera +Date: Fri, 16 Jul 2021 08:57:27 +0200 +Subject: [PATCH 1/4] nmstatectl: fix long arguments support + +The support for long arguments is broken. This patch is fixing it and +solving the following errors: + +``` +[root@d0b4a6a0f7a5 nmstate-workspace]# nmstatectl show --running-config +usage: nmstatectl [-h] [--version] + {commit,edit,rollback,set,apply,show,version,gc} ... +nmstatectl: error: unrecognized arguments: --running-config +[root@d0b4a6a0f7a5 nmstate-workspace]# nmstatectl show --show-secrets +usage: nmstatectl [-h] [--version] + {commit,edit,rollback,set,apply,show,version,gc} ... +nmstatectl: error: unrecognized arguments: --show-secrets +``` + +Integration test case added. + +Signed-off-by: Fernando Fernandez Mancera +Signed-off-by: Gris Ge +--- + nmstatectl/nmstatectl.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/nmstatectl/nmstatectl.py b/nmstatectl/nmstatectl.py +index a9f4cb6..6f83069 100644 +--- a/nmstatectl/nmstatectl.py ++++ b/nmstatectl/nmstatectl.py +@@ -223,14 +223,16 @@ def setup_subcommand_show(subparsers): + dest="yaml", + ) + parser_show.add_argument( +- "-r, --running-config", ++ "-r", ++ "--running-config", + help="Show running configurations", + default=False, + action="store_true", + dest="running_config", + ) + parser_show.add_argument( +- "-s, --show-secrets", ++ "-s", ++ "--show-secrets", + help="Show secrets also", + default=False, + action="store_true", +-- +2.32.0 + diff --git a/0002-nm-ethtool-Preserve-existing-ethtool-settings-when-u.patch b/0002-nm-ethtool-Preserve-existing-ethtool-settings-when-u.patch new file mode 100644 index 0000000..5f5ebec --- /dev/null +++ b/0002-nm-ethtool-Preserve-existing-ethtool-settings-when-u.patch @@ -0,0 +1,105 @@ +From b1cb57d1dc4bba6592ba5cfc5c810a2ad19ac941 Mon Sep 17 00:00:00 2001 +From: Gris Ge +Date: Thu, 22 Jul 2021 18:40:50 +0800 +Subject: [PATCH 2/4] nm ethtool: Preserve existing ethtool settings when + undesired + +When user does not define ethtool settings in desire state, +we should preserve existing ethtool setting. + +Integration test case included. + +Signed-off-by: Gris Ge +Signed-off-by: Fernando Fernandez Mancera +--- + libnmstate/nm/connection.py | 18 +++--------------- + libnmstate/nm/ethtool.py | 26 +++++++++++++++++++++++++- + 2 files changed, 28 insertions(+), 16 deletions(-) + +diff --git a/libnmstate/nm/connection.py b/libnmstate/nm/connection.py +index 5d60f6d..5a79c6f 100644 +--- a/libnmstate/nm/connection.py ++++ b/libnmstate/nm/connection.py +@@ -22,8 +22,6 @@ + import uuid + + from libnmstate.error import NmstatePluginError +-from libnmstate.ifaces import IfaceEthtool +-from libnmstate.schema import Ethtool + from libnmstate.schema import Interface + from libnmstate.schema import InterfaceType + from libnmstate.schema import LinuxBridge as LB +@@ -240,19 +238,9 @@ def create_new_nm_simple_conn(iface, nm_profile): + if iface.ieee_802_1x_conf: + settings.append(create_802_1x_setting(iface.ieee_802_1x_conf)) + +- if Ethtool.CONFIG_SUBTREE in iface.original_desire_dict: +- iface_ethtool = IfaceEthtool( +- iface.original_desire_dict[Ethtool.CONFIG_SUBTREE] +- ) +- iface_ethtool.canonicalize( +- iface.original_desire_dict[Ethtool.CONFIG_SUBTREE] +- ) +- setting = create_ethtool_setting( +- iface_ethtool, +- nm_profile, +- ) +- if setting: +- settings.append(setting) ++ ethtool_setting = create_ethtool_setting(iface, nm_profile) ++ if ethtool_setting: ++ settings.append(ethtool_setting) + + nm_simple_conn = NM.SimpleConnection.new() + for setting in settings: +diff --git a/libnmstate/nm/ethtool.py b/libnmstate/nm/ethtool.py +index 466f4f9..3cad1bf 100644 +--- a/libnmstate/nm/ethtool.py ++++ b/libnmstate/nm/ethtool.py +@@ -22,6 +22,7 @@ import logging + from .common import NM + from .common import GLib + ++from libnmstate.ifaces import IfaceEthtool + from libnmstate.schema import Ethtool + + +@@ -59,7 +60,7 @@ _NM_COALESCE_OPT_NAME_MAP = { + } + + +-def create_ethtool_setting(iface_ethtool, base_con_profile): ++def _create_ethtool_setting(iface_ethtool, base_con_profile): + nm_setting = None + + if base_con_profile: +@@ -159,3 +160,26 @@ def nm_set_pause(nm_setting, autoneg, rx, tx): + tx_value, + ) + # pylint: enable=no-member ++ ++ ++def create_ethtool_setting(iface, base_con_profile): ++ if Ethtool.CONFIG_SUBTREE in iface.original_desire_dict: ++ iface_ethtool = IfaceEthtool( ++ iface.original_desire_dict[Ethtool.CONFIG_SUBTREE] ++ ) ++ iface_ethtool.canonicalize( ++ iface.original_desire_dict[Ethtool.CONFIG_SUBTREE] ++ ) ++ return _create_ethtool_setting( ++ iface_ethtool, ++ base_con_profile, ++ ) ++ else: ++ # Preserve existing setting but not create new ++ if base_con_profile: ++ ethtool_setting = base_con_profile.get_setting_by_name( ++ NM.SETTING_ETHTOOL_SETTING_NAME ++ ) ++ if ethtool_setting: ++ return ethtool_setting.duplicate() ++ return None +-- +2.32.0 + diff --git a/0003-ovs-fix-state-ignore-for-ovs-port-when-removing-them.patch b/0003-ovs-fix-state-ignore-for-ovs-port-when-removing-them.patch new file mode 100644 index 0000000..ba000ef --- /dev/null +++ b/0003-ovs-fix-state-ignore-for-ovs-port-when-removing-them.patch @@ -0,0 +1,87 @@ +From f4d190653c55d399b32afc956b2b4a1ff8d20101 Mon Sep 17 00:00:00 2001 +From: Fernando Fernandez Mancera +Date: Mon, 26 Jul 2021 09:58:23 +0200 +Subject: [PATCH 3/4] ovs: fix state=ignore for ovs port when removing them + +When removing an ovs port while the interface is marked as ignored, the +interface should not being removed from the ovs bridge as the user +specidied it should be ignored. + +Example: + +``` +interfaces: +- name: dummy0 + type: dummy + state: ignore +- name: ovsbr0 + type: ovs-bridge + state: up + bridge: + port: + - name: ovs0 +``` + +Integration test case added. + +Signed-off-by: Fernando Fernandez Mancera +Signed-off-by: Gris Ge +--- + libnmstate/nm/profiles.py | 22 ++++++++++++++++++++-- + 1 file changed, 20 insertions(+), 2 deletions(-) + +diff --git a/libnmstate/nm/profiles.py b/libnmstate/nm/profiles.py +index beda5c7..3b0b6be 100644 +--- a/libnmstate/nm/profiles.py ++++ b/libnmstate/nm/profiles.py +@@ -23,6 +23,8 @@ + import logging + from operator import attrgetter + ++from libnmstate.schema import Interface ++from libnmstate.schema import InterfaceState + from libnmstate.schema import InterfaceType + + from .common import NM +@@ -359,7 +361,7 @@ def _delete_orphan_nm_ovs_port_profiles( + continue + # When OVS port has no child, delete it + ovs_bridge_iface = ovs_bridge_profile.iface +- if not _nm_ovs_port_has_child( ++ if not _nm_ovs_port_has_child_or_is_ignored( + nm_profile, ovs_bridge_iface, net_state + ): + ProfileDelete( +@@ -404,7 +406,9 @@ def _use_uuid_as_controller_and_parent(nm_profiles): + nm_profile.update_parent(uuid) + + +-def _nm_ovs_port_has_child(nm_profile, ovs_bridge_iface, net_state): ++def _nm_ovs_port_has_child_or_is_ignored( ++ nm_profile, ovs_bridge_iface, net_state ++): + ovs_port_uuid = nm_profile.get_uuid() + ovs_port_name = nm_profile.get_interface_name() + for ovs_iface_name in ovs_bridge_iface.port: +@@ -415,4 +419,18 @@ def _nm_ovs_port_has_child(nm_profile, ovs_bridge_iface, net_state): + and ovs_iface.controller_type == InterfaceType.OVS_PORT + ): + return True ++ # Gather the ovs bridge interface from the current state in order to check ++ # if any port is ignored in the original desired state. ++ current_ovs_bridge = net_state.ifaces.get_cur_iface( ++ ovs_bridge_iface.name, InterfaceType.OVS_BRIDGE ++ ) ++ if current_ovs_bridge: ++ for port_name in current_ovs_bridge.port: ++ port_iface = net_state.ifaces.all_kernel_ifaces.get(port_name) ++ if ( ++ port_iface ++ and port_iface.original_desire_dict.get(Interface.STATE) ++ == InterfaceState.IGNORE ++ ): ++ return True + return False +-- +2.32.0 + diff --git a/0004-nispor-fix-show-of-empty-next_hop_address-and-destin.patch b/0004-nispor-fix-show-of-empty-next_hop_address-and-destin.patch new file mode 100644 index 0000000..40be31b --- /dev/null +++ b/0004-nispor-fix-show-of-empty-next_hop_address-and-destin.patch @@ -0,0 +1,86 @@ +From 369ed3210ecedfa1deda88a6eb7cacc19a47f89d Mon Sep 17 00:00:00 2001 +From: Fernando Fernandez Mancera +Date: Mon, 26 Jul 2021 16:13:15 +0200 +Subject: [PATCH 4/4] nispor: fix show of empty next_hop_address and + destination + +The correct way of representing an empty next_hop_address is using +"0.0.0.0" for IPv4 and "::" for IPv6. This configuration is valid +because an user should be able to specify the following routes: + +``` +--- +routes: + config: + - destination: 0.0.0.0/0 + next-hop-address: 0.0.0.0 + next-hop-interface: dummy + - destination: ::/0 + next-hop-address: "::" + next-hop-interface: dummy + +``` + +That means each of the hosts within the range of the route are +considered to be directly connected through that interface. + +For example, using iproute2 the user should introduce the following +command: + +`ip route 0.0.0.0 0.0.0.0 dummy` + +Integration test case added. + +Ref: https://bugzilla.redhat.com/1985879 + +Signed-off-by: Fernando Fernandez Mancera +Signed-off-by: Gris Ge +--- + libnmstate/nispor/route.py | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/libnmstate/nispor/route.py b/libnmstate/nispor/route.py +index 510ddc3..9852ba5 100644 +--- a/libnmstate/nispor/route.py ++++ b/libnmstate/nispor/route.py +@@ -23,6 +23,9 @@ from libnmstate.schema import Route + IPV4_DEFAULT_GATEWAY_DESTINATION = "0.0.0.0/0" + IPV6_DEFAULT_GATEWAY_DESTINATION = "::/0" + ++IPV4_EMPTY_NEXT_HOP_ADDRESS = "0.0.0.0" ++IPV6_EMPTY_NEXT_HOP_ADDRESS = "::" ++ + LOCAL_ROUTE_TABLE = 255 + + +@@ -50,21 +53,23 @@ def nispor_route_state_to_nmstate_static(np_routes): + def _nispor_route_to_nmstate(np_rt): + if np_rt.dst: + destination = np_rt.dst +- elif np_rt.gateway: ++ else: + destination = ( + IPV6_DEFAULT_GATEWAY_DESTINATION + if np_rt.address_family == "ipv6" + else IPV4_DEFAULT_GATEWAY_DESTINATION + ) +- else: +- destination = "" + + if np_rt.via: + next_hop = np_rt.via + elif np_rt.gateway: + next_hop = np_rt.gateway + else: +- next_hop = "" ++ next_hop = ( ++ IPV6_EMPTY_NEXT_HOP_ADDRESS ++ if np_rt.address_family == "ipv6" ++ else IPV4_EMPTY_NEXT_HOP_ADDRESS ++ ) + + return { + Route.TABLE_ID: np_rt.table, +-- +2.32.0 + diff --git a/nmstate.spec b/nmstate.spec index 5b18ce6..c83815e 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,14 +3,18 @@ %define libname libnmstate Name: nmstate -Version: 1.0.3 -Release: 4%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc Source2: nmstate.gpg +Patch1: 0001-nmstatectl-fix-long-arguments-support.patch +Patch2: 0002-nm-ethtool-Preserve-existing-ethtool-settings-when-u.patch +Patch3: 0003-ovs-fix-state-ignore-for-ovs-port-when-removing-them.patch +Patch4: 0004-nispor-fix-show-of-empty-next_hop_address-and-destin.patch BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -73,16 +77,15 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %install %py3_install mkdir -p %{buildroot}%{_unitdir} -install -p -m 644 %{buildroot}%{python3_sitelib}/nmstatectl/nmstate-varlink.service \ - %{buildroot}%{_unitdir}/nmstate-varlink.service %files %doc README.md %doc examples/ %{_mandir}/man8/nmstatectl.8* +%{_mandir}/man8/nmstate-autoconf.8* %{python3_sitelib}/nmstatectl %{_bindir}/nmstatectl -%{_unitdir}/nmstate-varlink.service +%{_bindir}/nmstate-autoconf %files -n python3-%{libname} %license LICENSE @@ -96,6 +99,9 @@ install -p -m 644 %{buildroot}%{python3_sitelib}/nmstatectl/nmstate-varlink.serv %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Tue Jul 27 2021 Gris Ge - 1.1.0-1 +- Upgrade to 1.1.0 + * Thu Jul 22 2021 Fedora Release Engineering - 1.0.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index d0adf4b..abecfea 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (nmstate-1.0.3.tar.gz) = 2302979f4a0c029c778cc93e586a0b81e93fdc3f605dbc212034222899b0642863bd7c0f39b7021cd2d7274420c2e6cd4975719110a0330a867e923d8d8831bb -SHA512 (nmstate-1.0.3.tar.gz.asc) = 5d9936b1ecf02e67f232379e0cbfe9741836d3179f8ef110e149d9e53436a5c475898ea17427538c4da011107c9d46287c968fb7540078714caf97173a888da8 +SHA512 (nmstate-1.1.0.tar.gz) = f99e4fdcc0317d0b3d88e8281f5f222adcce4b8ce2d6c2f48858c934219d61701af75e416e04fc03416ce9c7787ec989673c20208b9efe0fe7bf3346a7f48373 +SHA512 (nmstate-1.1.0.tar.gz.asc) = 9bd8075b08ccadefb3920a78ab569e36991bce34e9c527913da35a307e40a74b162d91a9517827c0043394ec2fa5604f2d81c361a763aaf9c11c133999376a3b SHA512 (nmstate.gpg) = af6af2024ea46b5c87c6c71d4be278ce4eed58c1783385619987fe8e254eb599f9b218897e7db67050b0e9f7101b206561f63218fda18a0d95103a04682c8309 From 87a579a346d883975b8b7a768ef214031512db52 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Tue, 27 Jul 2021 13:01:09 +0800 Subject: [PATCH 039/120] Add varlink service back. Signed-off-by: Gris Ge --- nmstate.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nmstate.spec b/nmstate.spec index c83815e..a441dee 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -4,7 +4,7 @@ Name: nmstate Version: 1.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -77,6 +77,8 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %install %py3_install mkdir -p %{buildroot}%{_unitdir} +install -p -m 644 %{buildroot}%{python3_sitelib}/nmstatectl/nmstate-varlink.service \ + %{buildroot}%{_unitdir}/nmstate-varlink.service %files %doc README.md @@ -86,6 +88,7 @@ mkdir -p %{buildroot}%{_unitdir} %{python3_sitelib}/nmstatectl %{_bindir}/nmstatectl %{_bindir}/nmstate-autoconf +%{_unitdir}/nmstate-varlink.service %files -n python3-%{libname} %license LICENSE @@ -99,6 +102,9 @@ mkdir -p %{buildroot}%{_unitdir} %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Tue Jul 27 2021 Gris Ge - 1.1.0-2 +- Add varlink service back. + * Tue Jul 27 2021 Gris Ge - 1.1.0-1 - Upgrade to 1.1.0 From b3234cb76ff7ed581c56201c75c74f6e7c91a8a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 21:16:29 +0000 Subject: [PATCH 040/120] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nmstate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nmstate.spec b/nmstate.spec index a441dee..9ad4290 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -4,7 +4,7 @@ Name: nmstate Version: 1.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -102,6 +102,9 @@ install -p -m 644 %{buildroot}%{python3_sitelib}/nmstatectl/nmstate-varlink.serv %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Jul 27 2021 Gris Ge - 1.1.0-2 - Add varlink service back. From 1337d1c0a5a8de94918ee1c4b5d918b3027eeb4e Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Tue, 1 Feb 2022 15:21:18 +0100 Subject: [PATCH 041/120] Upgrade to 1.2.0 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 + ...mstatectl-fix-long-arguments-support.patch | 53 --------- ...rve-existing-ethtool-settings-when-u.patch | 105 ------------------ ...nore-for-ovs-port-when-removing-them.patch | 87 --------------- ...of-empty-next_hop_address-and-destin.patch | 86 -------------- nmstate.spec | 11 +- sources | 4 +- 7 files changed, 9 insertions(+), 339 deletions(-) delete mode 100644 0001-nmstatectl-fix-long-arguments-support.patch delete mode 100644 0002-nm-ethtool-Preserve-existing-ethtool-settings-when-u.patch delete mode 100644 0003-ovs-fix-state-ignore-for-ovs-port-when-removing-them.patch delete mode 100644 0004-nispor-fix-show-of-empty-next_hop_address-and-destin.patch diff --git a/.gitignore b/.gitignore index 50acc89..9428b1b 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,5 @@ /nmstate-1.0.3.tar.gz.asc /nmstate-1.1.0.tar.gz /nmstate-1.1.0.tar.gz.asc +/nmstate-1.2.0.tar.gz.asc +/nmstate-1.2.0.tar.gz diff --git a/0001-nmstatectl-fix-long-arguments-support.patch b/0001-nmstatectl-fix-long-arguments-support.patch deleted file mode 100644 index 4334857..0000000 --- a/0001-nmstatectl-fix-long-arguments-support.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 99c7f643bab33a26c317e1b72ca3b8490cb1ea60 Mon Sep 17 00:00:00 2001 -From: Fernando Fernandez Mancera -Date: Fri, 16 Jul 2021 08:57:27 +0200 -Subject: [PATCH 1/4] nmstatectl: fix long arguments support - -The support for long arguments is broken. This patch is fixing it and -solving the following errors: - -``` -[root@d0b4a6a0f7a5 nmstate-workspace]# nmstatectl show --running-config -usage: nmstatectl [-h] [--version] - {commit,edit,rollback,set,apply,show,version,gc} ... -nmstatectl: error: unrecognized arguments: --running-config -[root@d0b4a6a0f7a5 nmstate-workspace]# nmstatectl show --show-secrets -usage: nmstatectl [-h] [--version] - {commit,edit,rollback,set,apply,show,version,gc} ... -nmstatectl: error: unrecognized arguments: --show-secrets -``` - -Integration test case added. - -Signed-off-by: Fernando Fernandez Mancera -Signed-off-by: Gris Ge ---- - nmstatectl/nmstatectl.py | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/nmstatectl/nmstatectl.py b/nmstatectl/nmstatectl.py -index a9f4cb6..6f83069 100644 ---- a/nmstatectl/nmstatectl.py -+++ b/nmstatectl/nmstatectl.py -@@ -223,14 +223,16 @@ def setup_subcommand_show(subparsers): - dest="yaml", - ) - parser_show.add_argument( -- "-r, --running-config", -+ "-r", -+ "--running-config", - help="Show running configurations", - default=False, - action="store_true", - dest="running_config", - ) - parser_show.add_argument( -- "-s, --show-secrets", -+ "-s", -+ "--show-secrets", - help="Show secrets also", - default=False, - action="store_true", --- -2.32.0 - diff --git a/0002-nm-ethtool-Preserve-existing-ethtool-settings-when-u.patch b/0002-nm-ethtool-Preserve-existing-ethtool-settings-when-u.patch deleted file mode 100644 index 5f5ebec..0000000 --- a/0002-nm-ethtool-Preserve-existing-ethtool-settings-when-u.patch +++ /dev/null @@ -1,105 +0,0 @@ -From b1cb57d1dc4bba6592ba5cfc5c810a2ad19ac941 Mon Sep 17 00:00:00 2001 -From: Gris Ge -Date: Thu, 22 Jul 2021 18:40:50 +0800 -Subject: [PATCH 2/4] nm ethtool: Preserve existing ethtool settings when - undesired - -When user does not define ethtool settings in desire state, -we should preserve existing ethtool setting. - -Integration test case included. - -Signed-off-by: Gris Ge -Signed-off-by: Fernando Fernandez Mancera ---- - libnmstate/nm/connection.py | 18 +++--------------- - libnmstate/nm/ethtool.py | 26 +++++++++++++++++++++++++- - 2 files changed, 28 insertions(+), 16 deletions(-) - -diff --git a/libnmstate/nm/connection.py b/libnmstate/nm/connection.py -index 5d60f6d..5a79c6f 100644 ---- a/libnmstate/nm/connection.py -+++ b/libnmstate/nm/connection.py -@@ -22,8 +22,6 @@ - import uuid - - from libnmstate.error import NmstatePluginError --from libnmstate.ifaces import IfaceEthtool --from libnmstate.schema import Ethtool - from libnmstate.schema import Interface - from libnmstate.schema import InterfaceType - from libnmstate.schema import LinuxBridge as LB -@@ -240,19 +238,9 @@ def create_new_nm_simple_conn(iface, nm_profile): - if iface.ieee_802_1x_conf: - settings.append(create_802_1x_setting(iface.ieee_802_1x_conf)) - -- if Ethtool.CONFIG_SUBTREE in iface.original_desire_dict: -- iface_ethtool = IfaceEthtool( -- iface.original_desire_dict[Ethtool.CONFIG_SUBTREE] -- ) -- iface_ethtool.canonicalize( -- iface.original_desire_dict[Ethtool.CONFIG_SUBTREE] -- ) -- setting = create_ethtool_setting( -- iface_ethtool, -- nm_profile, -- ) -- if setting: -- settings.append(setting) -+ ethtool_setting = create_ethtool_setting(iface, nm_profile) -+ if ethtool_setting: -+ settings.append(ethtool_setting) - - nm_simple_conn = NM.SimpleConnection.new() - for setting in settings: -diff --git a/libnmstate/nm/ethtool.py b/libnmstate/nm/ethtool.py -index 466f4f9..3cad1bf 100644 ---- a/libnmstate/nm/ethtool.py -+++ b/libnmstate/nm/ethtool.py -@@ -22,6 +22,7 @@ import logging - from .common import NM - from .common import GLib - -+from libnmstate.ifaces import IfaceEthtool - from libnmstate.schema import Ethtool - - -@@ -59,7 +60,7 @@ _NM_COALESCE_OPT_NAME_MAP = { - } - - --def create_ethtool_setting(iface_ethtool, base_con_profile): -+def _create_ethtool_setting(iface_ethtool, base_con_profile): - nm_setting = None - - if base_con_profile: -@@ -159,3 +160,26 @@ def nm_set_pause(nm_setting, autoneg, rx, tx): - tx_value, - ) - # pylint: enable=no-member -+ -+ -+def create_ethtool_setting(iface, base_con_profile): -+ if Ethtool.CONFIG_SUBTREE in iface.original_desire_dict: -+ iface_ethtool = IfaceEthtool( -+ iface.original_desire_dict[Ethtool.CONFIG_SUBTREE] -+ ) -+ iface_ethtool.canonicalize( -+ iface.original_desire_dict[Ethtool.CONFIG_SUBTREE] -+ ) -+ return _create_ethtool_setting( -+ iface_ethtool, -+ base_con_profile, -+ ) -+ else: -+ # Preserve existing setting but not create new -+ if base_con_profile: -+ ethtool_setting = base_con_profile.get_setting_by_name( -+ NM.SETTING_ETHTOOL_SETTING_NAME -+ ) -+ if ethtool_setting: -+ return ethtool_setting.duplicate() -+ return None --- -2.32.0 - diff --git a/0003-ovs-fix-state-ignore-for-ovs-port-when-removing-them.patch b/0003-ovs-fix-state-ignore-for-ovs-port-when-removing-them.patch deleted file mode 100644 index ba000ef..0000000 --- a/0003-ovs-fix-state-ignore-for-ovs-port-when-removing-them.patch +++ /dev/null @@ -1,87 +0,0 @@ -From f4d190653c55d399b32afc956b2b4a1ff8d20101 Mon Sep 17 00:00:00 2001 -From: Fernando Fernandez Mancera -Date: Mon, 26 Jul 2021 09:58:23 +0200 -Subject: [PATCH 3/4] ovs: fix state=ignore for ovs port when removing them - -When removing an ovs port while the interface is marked as ignored, the -interface should not being removed from the ovs bridge as the user -specidied it should be ignored. - -Example: - -``` -interfaces: -- name: dummy0 - type: dummy - state: ignore -- name: ovsbr0 - type: ovs-bridge - state: up - bridge: - port: - - name: ovs0 -``` - -Integration test case added. - -Signed-off-by: Fernando Fernandez Mancera -Signed-off-by: Gris Ge ---- - libnmstate/nm/profiles.py | 22 ++++++++++++++++++++-- - 1 file changed, 20 insertions(+), 2 deletions(-) - -diff --git a/libnmstate/nm/profiles.py b/libnmstate/nm/profiles.py -index beda5c7..3b0b6be 100644 ---- a/libnmstate/nm/profiles.py -+++ b/libnmstate/nm/profiles.py -@@ -23,6 +23,8 @@ - import logging - from operator import attrgetter - -+from libnmstate.schema import Interface -+from libnmstate.schema import InterfaceState - from libnmstate.schema import InterfaceType - - from .common import NM -@@ -359,7 +361,7 @@ def _delete_orphan_nm_ovs_port_profiles( - continue - # When OVS port has no child, delete it - ovs_bridge_iface = ovs_bridge_profile.iface -- if not _nm_ovs_port_has_child( -+ if not _nm_ovs_port_has_child_or_is_ignored( - nm_profile, ovs_bridge_iface, net_state - ): - ProfileDelete( -@@ -404,7 +406,9 @@ def _use_uuid_as_controller_and_parent(nm_profiles): - nm_profile.update_parent(uuid) - - --def _nm_ovs_port_has_child(nm_profile, ovs_bridge_iface, net_state): -+def _nm_ovs_port_has_child_or_is_ignored( -+ nm_profile, ovs_bridge_iface, net_state -+): - ovs_port_uuid = nm_profile.get_uuid() - ovs_port_name = nm_profile.get_interface_name() - for ovs_iface_name in ovs_bridge_iface.port: -@@ -415,4 +419,18 @@ def _nm_ovs_port_has_child(nm_profile, ovs_bridge_iface, net_state): - and ovs_iface.controller_type == InterfaceType.OVS_PORT - ): - return True -+ # Gather the ovs bridge interface from the current state in order to check -+ # if any port is ignored in the original desired state. -+ current_ovs_bridge = net_state.ifaces.get_cur_iface( -+ ovs_bridge_iface.name, InterfaceType.OVS_BRIDGE -+ ) -+ if current_ovs_bridge: -+ for port_name in current_ovs_bridge.port: -+ port_iface = net_state.ifaces.all_kernel_ifaces.get(port_name) -+ if ( -+ port_iface -+ and port_iface.original_desire_dict.get(Interface.STATE) -+ == InterfaceState.IGNORE -+ ): -+ return True - return False --- -2.32.0 - diff --git a/0004-nispor-fix-show-of-empty-next_hop_address-and-destin.patch b/0004-nispor-fix-show-of-empty-next_hop_address-and-destin.patch deleted file mode 100644 index 40be31b..0000000 --- a/0004-nispor-fix-show-of-empty-next_hop_address-and-destin.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 369ed3210ecedfa1deda88a6eb7cacc19a47f89d Mon Sep 17 00:00:00 2001 -From: Fernando Fernandez Mancera -Date: Mon, 26 Jul 2021 16:13:15 +0200 -Subject: [PATCH 4/4] nispor: fix show of empty next_hop_address and - destination - -The correct way of representing an empty next_hop_address is using -"0.0.0.0" for IPv4 and "::" for IPv6. This configuration is valid -because an user should be able to specify the following routes: - -``` ---- -routes: - config: - - destination: 0.0.0.0/0 - next-hop-address: 0.0.0.0 - next-hop-interface: dummy - - destination: ::/0 - next-hop-address: "::" - next-hop-interface: dummy - -``` - -That means each of the hosts within the range of the route are -considered to be directly connected through that interface. - -For example, using iproute2 the user should introduce the following -command: - -`ip route 0.0.0.0 0.0.0.0 dummy` - -Integration test case added. - -Ref: https://bugzilla.redhat.com/1985879 - -Signed-off-by: Fernando Fernandez Mancera -Signed-off-by: Gris Ge ---- - libnmstate/nispor/route.py | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/libnmstate/nispor/route.py b/libnmstate/nispor/route.py -index 510ddc3..9852ba5 100644 ---- a/libnmstate/nispor/route.py -+++ b/libnmstate/nispor/route.py -@@ -23,6 +23,9 @@ from libnmstate.schema import Route - IPV4_DEFAULT_GATEWAY_DESTINATION = "0.0.0.0/0" - IPV6_DEFAULT_GATEWAY_DESTINATION = "::/0" - -+IPV4_EMPTY_NEXT_HOP_ADDRESS = "0.0.0.0" -+IPV6_EMPTY_NEXT_HOP_ADDRESS = "::" -+ - LOCAL_ROUTE_TABLE = 255 - - -@@ -50,21 +53,23 @@ def nispor_route_state_to_nmstate_static(np_routes): - def _nispor_route_to_nmstate(np_rt): - if np_rt.dst: - destination = np_rt.dst -- elif np_rt.gateway: -+ else: - destination = ( - IPV6_DEFAULT_GATEWAY_DESTINATION - if np_rt.address_family == "ipv6" - else IPV4_DEFAULT_GATEWAY_DESTINATION - ) -- else: -- destination = "" - - if np_rt.via: - next_hop = np_rt.via - elif np_rt.gateway: - next_hop = np_rt.gateway - else: -- next_hop = "" -+ next_hop = ( -+ IPV6_EMPTY_NEXT_HOP_ADDRESS -+ if np_rt.address_family == "ipv6" -+ else IPV4_EMPTY_NEXT_HOP_ADDRESS -+ ) - - return { - Route.TABLE_ID: np_rt.table, --- -2.32.0 - diff --git a/nmstate.spec b/nmstate.spec index 9ad4290..6d10bf9 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,18 +3,14 @@ %define libname libnmstate Name: nmstate -Version: 1.1.0 -Release: 3%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc Source2: nmstate.gpg -Patch1: 0001-nmstatectl-fix-long-arguments-support.patch -Patch2: 0002-nm-ethtool-Preserve-existing-ethtool-settings-when-u.patch -Patch3: 0003-ovs-fix-state-ignore-for-ovs-port-when-removing-them.patch -Patch4: 0004-nispor-fix-show-of-empty-next_hop_address-and-destin.patch BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -102,6 +98,9 @@ install -p -m 644 %{buildroot}%{python3_sitelib}/nmstatectl/nmstate-varlink.serv %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Tue Feb 01 2022 Fernando Fernandez Mancera - 1.2.0-1 +- Upgrade to 1.2.0 + * Thu Jan 20 2022 Fedora Release Engineering - 1.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index abecfea..1bc77fd 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (nmstate-1.1.0.tar.gz) = f99e4fdcc0317d0b3d88e8281f5f222adcce4b8ce2d6c2f48858c934219d61701af75e416e04fc03416ce9c7787ec989673c20208b9efe0fe7bf3346a7f48373 -SHA512 (nmstate-1.1.0.tar.gz.asc) = 9bd8075b08ccadefb3920a78ab569e36991bce34e9c527913da35a307e40a74b162d91a9517827c0043394ec2fa5604f2d81c361a763aaf9c11c133999376a3b SHA512 (nmstate.gpg) = af6af2024ea46b5c87c6c71d4be278ce4eed58c1783385619987fe8e254eb599f9b218897e7db67050b0e9f7101b206561f63218fda18a0d95103a04682c8309 +SHA512 (nmstate-1.2.0.tar.gz) = 1539b9574f74d0be393ca8b19ae3b1047beafca6ce5977a0c8bdeb5d57cdae8278d61e1c04c4ba922c11349ed14f1e7e86c1ea19c696f1487091a1ef672c5f9f +SHA512 (nmstate-1.2.0.tar.gz.asc) = 92451c41db3d92e625de60c5a463b03d4fb1c2b21ddcf0a2598a1822dbedf3b7b291042f021ae0d256ccf15a06c31fe636a1befcf6ee0f7159ffb0e240294a33 From 814e12dfb15ff11c997782271ce039fea36e52a8 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Tue, 15 Feb 2022 12:55:21 +0100 Subject: [PATCH 042/120] Upgrade to 2.0.0 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 9 ++++----- sources | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 9428b1b..27e0797 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,5 @@ /nmstate-1.1.0.tar.gz.asc /nmstate-1.2.0.tar.gz.asc /nmstate-1.2.0.tar.gz +/nmstate-2.0.0.tar.gz +/nmstate-2.0.0.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index 6d10bf9..b749ef5 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,7 +3,7 @@ %define libname libnmstate Name: nmstate -Version: 1.2.0 +Version: 2.0.0 Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ @@ -72,9 +72,6 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %install %py3_install -mkdir -p %{buildroot}%{_unitdir} -install -p -m 644 %{buildroot}%{python3_sitelib}/nmstatectl/nmstate-varlink.service \ - %{buildroot}%{_unitdir}/nmstate-varlink.service %files %doc README.md @@ -84,7 +81,6 @@ install -p -m 644 %{buildroot}%{python3_sitelib}/nmstatectl/nmstate-varlink.serv %{python3_sitelib}/nmstatectl %{_bindir}/nmstatectl %{_bindir}/nmstate-autoconf -%{_unitdir}/nmstate-varlink.service %files -n python3-%{libname} %license LICENSE @@ -98,6 +94,9 @@ install -p -m 644 %{buildroot}%{python3_sitelib}/nmstatectl/nmstate-varlink.serv %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Mon Feb 15 2022 Fernando Fernandez Mancera - 2.0.0-1 +- Upgrade to 2.0.0 + * Tue Feb 01 2022 Fernando Fernandez Mancera - 1.2.0-1 - Upgrade to 1.2.0 diff --git a/sources b/sources index 1bc77fd..056ed32 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ +SHA512 (nmstate-2.0.0.tar.gz) = bbc0c4c52e73646b8461e61b049f96ef1f0bce8815284e7560e65daddb177bef36cf5ec074837f6a07e6b3c8ce8ed7f13cb9b4d1b45527e6076188a762b933c6 +SHA512 (nmstate-2.0.0.tar.gz.asc) = 8d9beb2d772a5d654e4fbce492ff95792edc42e6047552d745f033552d4206a64e9a0aeff1e437d0f683fbe89f8c061c7b02f88cf79607784889845b6cd9365b SHA512 (nmstate.gpg) = af6af2024ea46b5c87c6c71d4be278ce4eed58c1783385619987fe8e254eb599f9b218897e7db67050b0e9f7101b206561f63218fda18a0d95103a04682c8309 -SHA512 (nmstate-1.2.0.tar.gz) = 1539b9574f74d0be393ca8b19ae3b1047beafca6ce5977a0c8bdeb5d57cdae8278d61e1c04c4ba922c11349ed14f1e7e86c1ea19c696f1487091a1ef672c5f9f -SHA512 (nmstate-1.2.0.tar.gz.asc) = 92451c41db3d92e625de60c5a463b03d4fb1c2b21ddcf0a2598a1822dbedf3b7b291042f021ae0d256ccf15a06c31fe636a1befcf6ee0f7159ffb0e240294a33 From 8bbb58a9474fdf0af64959e72eb5796da588dda2 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Wed, 13 Apr 2022 19:42:20 +0800 Subject: [PATCH 043/120] Upgrade to 2.1.0.alpha1 Signed-off-by: Gris Ge --- .gitignore | 2 + nmstate.spec | 334 +++++++++++++++++---------------------------------- sources | 4 +- 3 files changed, 117 insertions(+), 223 deletions(-) diff --git a/.gitignore b/.gitignore index 27e0797..f56cc12 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,5 @@ /nmstate-1.2.0.tar.gz /nmstate-2.0.0.tar.gz /nmstate-2.0.0.tar.gz.asc +/nmstate-2.1.0-alpha1.tar.gz +/nmstate-2.1.0-alpha1.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index b749ef5..fc71d4c 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -1,24 +1,37 @@ -%?python_enable_dependency_generator %define srcname nmstate %define libname libnmstate Name: nmstate -Version: 2.0.0 -Release: 1%{?dist} +Version: 2.1.0 +Release: 0.alpha1%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} -Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz -Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc +Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}-alpha1.tar.gz +Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}-alpha1.tar.gz.asc Source2: nmstate.gpg -BuildArch: noarch +BuildRequires: patchelf BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: gnupg2 BuildRequires: systemd-devel BuildRequires: systemd-rpm-macros -Requires: python3-setuptools -Requires: python3-%{libname} = %{?epoch:%{epoch}:}%{version}-%{release} +BuildRequires: rust-packaging +BuildRequires: (crate(serde/default) >= 1.0 with crate(serde/default) < 2.0) +BuildRequires: (crate(serde/derive) >= 1.0 with crate(serde/derive) < 2.0) +BuildRequires: (crate(serde_json/default) >= 1.0 with crate(serde_json/default) < 2.0) +BuildRequires: (crate(serde_yaml/default) >= 0.8 with crate(serde_yaml/default) < 0.9) +BuildRequires: (crate(uuid/v4) >= 0.8 with crate(uuid/v4) < 0.9) +BuildRequires: (crate(zbus/default) >= 1.9 with crate(zbus/default) < 2.0) +BuildRequires: (crate(zvariant/default) >= 2.10 with crate(zvariant/default) < 3.0) +BuildRequires: (crate(log/default) >= 0.4 with crate(log/default) < 0.5) +BuildRequires: (crate(libc/default) >= 0.2 with crate(libc/default) < 0.3) +BuildRequires: (crate(clap/default) >= 3.1 with crate(clap/default) < 4.0) +BuildRequires: (crate(clap/cargo) >= 3.1 with crate(clap/cargo) < 4.0) +BuildRequires: (crate(ctrlc/default) >= 3.2 with crate(ctrlc/default) < 4.0) +BuildRequires: (crate(env_logger/default) >= 0.9 with crate(env_logger/default) < 1.0) +BuildRequires: (crate(nispor/default) >= 1.2.5 with crate(nispor/default) < 2.0) +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description Nmstate is a library with an accompanying command line tool that manages host @@ -27,9 +40,28 @@ needs to manage host networking through a northbound declarative API and multi provider support on the southbound. +%package libs +Summary: C binding of nmstate +# Use Recommends for NetworkManager because only access to NM DBus is required, +# but NM could be running on a different host +Recommends: NetworkManager +# Avoid automatically generated profiles +Recommends: NetworkManager-config-server + +%description libs +C binding of nmstate. + +%package devel +Summary: Development files for nmstate +Group: Development/Libraries +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description devel +Development files of nmstate C binding. + + %package -n python3-%{libname} Summary: nmstate Python 3 API library -Requires: NetworkManager-libnm >= 1:1.26.0 # Use Recommends for NetworkManager because only access to NM DBus is required, # but NM could be running on a different host Recommends: NetworkManager @@ -40,243 +72,103 @@ Recommends: (nmstate-plugin-ovsdb if openvswitch) # required for OVS and team support Suggests: NetworkManager-ovs Suggests: NetworkManager-team -# FIXME: Once upstream included nispor into requirement.txt, remove below line -Requires: python3dist(nispor) - -%package -n nmstate-plugin-ovsdb -Summary: nmstate plugin for OVS database manipulation -Requires: python3-%{libname} = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} -# The python-openvswitch rpm package is not in the same repo with nmstate, -# require only if openvswitch is installed. -Requires: (python3dist(ovs) if openvswitch) -Recommends: python3dist(ovs) -%else -Requires: python3dist(ovs) -%endif - +Provides: nmstate-plugin-ovsdb = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Obsoletes: nmstate-plugin-ovsdb < 2.0-1 %description -n python3-%{libname} This package contains the Python 3 library for Nmstate. -%description -n nmstate-plugin-ovsdb -This package contains the nmstate plugin for OVS database manipulation. - %prep -gpg2 --import --import-options import-export,import-minimal %{SOURCE2} > ./gpgkey-mantainers.gpg +gpg2 --import --import-options import-export,import-minimal \ + %{SOURCE2} > ./gpgkey-mantainers.gpg gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %setup -q +pushd rust +rm .cargo/config.toml +%cargo_prep +popd + %build +pushd rust +%cargo_build +popd + +pushd rust/src/python %py3_build +popd %install +# We do manual install here before upstream has it +pushd rust +install -D --mode 0755 target/release/libnmstate.so \ + %{buildroot}/%{_libdir}/libnmstate.so.%{version} +ln -s libnmstate.so.%{version} %{buildroot}/%{_libdir}/libnmstate.so.2 +ln -s libnmstate.so.%{version} %{buildroot}/%{_libdir}/libnmstate.so +patchelf --set-soname libnmstate.so.2 \ + %{buildroot}/%{_libdir}/libnmstate.so.%{version} + +install -D --mode 0755 target/release/nmstatectl-rust \ + %{buildroot}/%{_bindir}/nmstatectl +ln -s nmstatectl %{buildroot}/%{_bindir}/nmstatectl-rust +ln -s nmstatectl %{buildroot}/%{_bindir}/nmstate-autoconf +popd +install -D --mode 0644 nmstatectl.8 \ + %{buildroot}/%{_mandir}/man8/nmstatectl.8 +install -D --mode 0644 nmstate-autoconf.8 \ + %{buildroot}/%{_mandir}/man8/nmstate-autoconf.8 +gzip %{buildroot}/%{_mandir}/man8/nmstatectl.8 +gzip %{buildroot}/%{_mandir}/man8/nmstate-autoconf.8 + +pushd rust/src/python %py3_install +popd + +pushd rust/src/clib +install -D --mode 0644 nmstate.h.in %{buildroot}/%{_includedir}/nmstate.h +MAJOR_VERSION=$(echo %{version} | cut -f1 -d.) +MINOR_VERSION=$(echo %{version} | cut -f2 -d.) +MICRO_VERSION=$(echo %{version} | cut -f3 -d.) +sed -i -e "s#@_VERSION_MAJOR@#${MAJOR_VERSION}#" \ + %{buildroot}/%{_includedir}/nmstate.h +sed -i -e "s#@_VERSION_MINOR@#${MINOR_VERSION}#" \ + %{buildroot}/%{_includedir}/nmstate.h +sed -i -e "s#@_VERSION_MICRO@#${MICRO_VERSION}#" \ + %{buildroot}/%{_includedir}/nmstate.h + +install -D --mode 0644 nmstate.pc.in %{buildroot}/%{_libdir}/pkgconfig/nmstate.pc +sed -i -e "s#@PREFIX@#%{_prefix}#" \ + %{buildroot}/%{_libdir}/pkgconfig/nmstate.pc +sed -i -e "s#@LIBDIR@#%{_libdir}#" \ + %{buildroot}/%{_libdir}/pkgconfig/nmstate.pc +sed -i -e "s#@INCLUDE_DIR@#%{_includedir}#" \ + %{buildroot}/%{_libdir}/pkgconfig/nmstate.pc +sed -i -e "s#@VERSION@#%{version}#" \ + %{buildroot}/%{_libdir}/pkgconfig/nmstate.pc +popd %files %doc README.md %doc examples/ %{_mandir}/man8/nmstatectl.8* %{_mandir}/man8/nmstate-autoconf.8* -%{python3_sitelib}/nmstatectl %{_bindir}/nmstatectl +%{_bindir}/nmstatectl-rust %{_bindir}/nmstate-autoconf +%files libs +%{_libdir}/libnmstate.so.* + +%files devel +%{_libdir}/libnmstate.so +%{_includedir}/nmstate.h +%{_libdir}/pkgconfig/nmstate.pc + %files -n python3-%{libname} %license LICENSE %{python3_sitelib}/%{libname} %{python3_sitelib}/%{srcname}-*.egg-info/ -%exclude %{python3_sitelib}/%{libname}/plugins/nmstate_plugin_* -%exclude %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_* - -%files -n nmstate-plugin-ovsdb -%{python3_sitelib}/%{libname}/plugins/nmstate_plugin_ovsdb* -%{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog -* Mon Feb 15 2022 Fernando Fernandez Mancera - 2.0.0-1 -- Upgrade to 2.0.0 - -* Tue Feb 01 2022 Fernando Fernandez Mancera - 1.2.0-1 -- Upgrade to 1.2.0 - -* Thu Jan 20 2022 Fedora Release Engineering - 1.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Jul 27 2021 Gris Ge - 1.1.0-2 -- Add varlink service back. - -* Tue Jul 27 2021 Gris Ge - 1.1.0-1 -- Upgrade to 1.1.0 - -* Thu Jul 22 2021 Fedora Release Engineering - 1.0.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 1.0.3-3 -- Rebuilt for Python 3.10 - -* Mon Apr 19 2021 Fernando Fernandez Mancera - 1.0.3-2 -- Fix installation nmstate-varlink.service - -* Thu Apr 15 2021 Fernando Fernandez Mancera - 1.0.3-1 -- Upgrade to 1.0.3 - -* Sun Feb 21 2021 Fernando Fernandez Mancera - 1.0.2-1 -- Upgrade to 1.0.2 - -* Tue Jan 26 2021 Fedora Release Engineering - 1.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jan 19 2021 Fernando Fernandez Mancera - 1.0.1-1 -- Upgrade to 1.0.1 - -* Tue Dec 08 2020 Fernando Fernandez Mancera - 1.0.0-1 -- Upgrade to 1.0.0 - -* Thu Oct 22 2020 Fernando Fernandez Mancera - 0.4.1-1 -- Upgrade to 0.4.1 - -* Tue Oct 13 2020 Gris Ge - 0.4.0-2 -- Fix the ELN build by put ovs stuff as soft requirement. - -* Sun Sep 20 2020 Gris Ge - 0.4.0-1 -- Upgrade to 0.4.0 - -* Mon Aug 31 2020 Fernando Fernandez Mancera - 0.3.5-1 -- Update to 0.3.5 - -* Tue Jul 28 2020 Fedora Release Engineering - 0.3.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Jul 25 2020 Fernando Fernandez Mancera - 0.3.4-1 -- Update to 0.3.4 -- Sync. with upstream specfile - -* Thu Jul 02 2020 Fernando Fernandez Mancera - 0.3.3-1 -- Update to 0.3.3 - -* Tue Jun 16 2020 Fernando Fernandez Mancera - 0.3.2-1 -- Update to 0.3.2 -- Sync with upstream specfile - -* Tue Jun 09 2020 Fernando Fernandez Mancera - 0.3.1-1 -- Update to 0.3.1 - -* Tue May 26 2020 Miro Hrončok - 0.3.0-5 -- Rebuilt for Python 3.9 - -* Fri May 08 2020 Fernando Fernandez Mancera - 0.3.0-4 -- Fix source path - -* Fri May 08 2020 Fernando Fernandez Mancera - 0.3.0-3 -- Fix signature verification - -* Fri May 08 2020 Fernando Fernandez Mancera - 0.3.0-2 -- Update signature verification - -* Fri May 08 2020 Fernando Fernandez Mancera - 0.3.0-1 -- Update to 0.3.0 -- Sync with upstream specfile - -* Tue Apr 21 2020 Fernando Fernandez Mancera - 0.2.10-1 -- Update to 0.2.10 - -* Thu Mar 26 2020 Fernando Fernandez Mancera - 0.2.9-1 -- Update to 0.2.9 - -* Fri Mar 13 2020 Fernando Fernandez Mancera - 0.2.8-1 -- Update to 0.2.8 - -* Wed Mar 04 2020 Fernando Fernandez Mancera - 0.2.7-1 -- Update to 0.2.7 - -* Mon Feb 24 2020 Fernando Fernandez Mancera - 0.2.6-1 -- Update to 0.2.6 - -* Wed Feb 19 2020 Fernando Fernandez Mancera - 0.2.5-1 -- Update to 0.2.5 -- Sync with upstream specfile - -* Wed Feb 12 2020 Fernando Fernandez Mancera - 0.2.4-1 -- Update to 0.2.4 - -* Wed Feb 05 2020 Fernando Fernandez Mancera - 0.2.3-1 -- Update to 0.2.3 - -* Tue Feb 04 2020 Fernando Fernandez Mancera - 0.2.2-1 -- Update to 0.2.2 -- Sync with upstream specfile - -* Wed Jan 29 2020 Fedora Release Engineering - 0.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Jan 14 2020 Fernando Fernandez Mancera - 0.2.1-2 -- Fix changelog - -* Tue Jan 14 2020 Fernando Fernandez Mancera - 0.2.1-1 -- Update to 0.2.1 - -* Tue Dec 03 2019 Fernando Fernandez Mancera - 0.2.0-2 -- Fix changelog - -* Tue Dec 03 2019 Fernando Fernandez Mancera - 0.2.0-1 -- Update to 0.2.0 - -* Mon Dec 02 2019 Till Maas - 0.1.1-1 -- Update to 0.1.1 -- Sync with upstream specfile - -* Thu Oct 03 2019 Miro Hrončok - 0.0.8-3 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Mon Aug 19 2019 Miro Hrončok - 0.0.8-2 -- Rebuilt for Python 3.8 - -* Fri Jul 26 2019 Gris Ge - 0.0.8-1 -- Upgrade to 0.0.8. - -* Thu Jul 25 2019 Fedora Release Engineering - 0.0.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Jun 14 2019 Gris Ge - 0.0.7-2 -- Workaround broken dbus-python packaging: - https://bugzilla.redhat.com/show_bug.cgi?id=1654774 - -* Fri Jun 14 2019 Gris Ge - 0.0.7-1 -- Upgrade to 0.0.7 - -* Sun May 05 2019 Gris Ge - 0.0.6-1 -- Upgrade to 0.0.6 - -* Fri Apr 12 2019 Gris Ge - 0.0.5-1 -- Upgrade to 0.0.5 - -* Fri Feb 01 2019 Fedora Release Engineering - 0.0.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Jan 29 2019 Till Maas - 0.0.4-2 -- Sync with upstream spec -- Use Recommends for NetworkManager -- Add Suggests for NetworkManager-ovs -- package examples as doc - -* Thu Jan 24 2019 Gris Ge - 0.0.4-1 -- Upgrade to 0.0.4. - -* Mon Jan 21 2019 Gris Ge - 0.0.3-3 -- Add missing runtime dependency for nmstatectl. - -* Wed Jan 02 2019 Gris Ge - 0.0.3-2 -- Add source file PGP verification. - -* Thu Dec 20 2018 Gris Ge - 0.0.3-1 -- Upgrade to 0.0.3. - -* Mon Dec 03 2018 Gris Ge - 0.0.2-2 -- Trival RPM SPEC fix. - -* Wed Nov 28 2018 Gris Ge - 0.0.2-1 -- Initial release. +%autochangelog diff --git a/sources b/sources index 056ed32..3ac99ab 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (nmstate-2.0.0.tar.gz) = bbc0c4c52e73646b8461e61b049f96ef1f0bce8815284e7560e65daddb177bef36cf5ec074837f6a07e6b3c8ce8ed7f13cb9b4d1b45527e6076188a762b933c6 -SHA512 (nmstate-2.0.0.tar.gz.asc) = 8d9beb2d772a5d654e4fbce492ff95792edc42e6047552d745f033552d4206a64e9a0aeff1e437d0f683fbe89f8c061c7b02f88cf79607784889845b6cd9365b +SHA512 (nmstate-2.1.0-alpha1.tar.gz) = 540121a850a070f4e19591d05027c4b1f596d9b40599f3c667f7b4e9dbe8d84269b94867fbf48891add4b86d731e139931d304b3437555b4edd26cbad389409a +SHA512 (nmstate-2.1.0-alpha1.tar.gz.asc) = b9930f6baa19faf2e86c7f0659ea461f9c7fe6f1e8f370febe9565838e66e6edaf4e7a3c0fda9cf06ea670e7fd4bb67222be9be9f6796828616a2b8d87d611c9 SHA512 (nmstate.gpg) = af6af2024ea46b5c87c6c71d4be278ce4eed58c1783385619987fe8e254eb599f9b218897e7db67050b0e9f7101b206561f63218fda18a0d95103a04682c8309 From b149a2098de5ba7a5e402fabc41e8627ac998b27 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Wed, 13 Apr 2022 20:40:16 +0800 Subject: [PATCH 044/120] Change the python binding to noarch Signed-off-by: Gris Ge --- nmstate.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nmstate.spec b/nmstate.spec index fc71d4c..5b445e8 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,7 +3,7 @@ Name: nmstate Version: 2.1.0 -Release: 0.alpha1%{?dist} +Release: 0.1.alpha1%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -75,6 +75,7 @@ Suggests: NetworkManager-team Provides: nmstate-plugin-ovsdb = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} Obsoletes: nmstate-plugin-ovsdb < 2.0-1 +BuildArch: noarch %description -n python3-%{libname} This package contains the Python 3 library for Nmstate. From 1b919fdbcb68d0c0d0dfcbd3df9d45bffe704fd9 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Tue, 19 Apr 2022 14:18:02 +0800 Subject: [PATCH 045/120] Upgrade to 2.1.0.alpha2 Signed-off-by: Gris Ge --- .gitignore | 2 ++ nmstate.spec | 53 +++++++--------------------------------------------- sources | 4 ++-- 3 files changed, 11 insertions(+), 48 deletions(-) diff --git a/.gitignore b/.gitignore index f56cc12..bd806e8 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,5 @@ /nmstate-2.0.0.tar.gz.asc /nmstate-2.1.0-alpha1.tar.gz /nmstate-2.1.0-alpha1.tar.gz.asc +/nmstate-2.1.0-alpha2.tar.gz +/nmstate-2.1.0-alpha2.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index 5b445e8..4b2e24f 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,12 +3,12 @@ Name: nmstate Version: 2.1.0 -Release: 0.1.alpha1%{?dist} +Release: 0.2.alpha2%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} -Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}-alpha1.tar.gz -Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}-alpha1.tar.gz.asc +Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}-alpha2.tar.gz +Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}-alpha2.tar.gz.asc Source2: nmstate.gpg BuildRequires: patchelf BuildRequires: python3-devel @@ -75,7 +75,6 @@ Suggests: NetworkManager-team Provides: nmstate-plugin-ovsdb = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} Obsoletes: nmstate-plugin-ovsdb < 2.0-1 -BuildArch: noarch %description -n python3-%{libname} This package contains the Python 3 library for Nmstate. @@ -101,61 +100,23 @@ pushd rust/src/python popd %install -# We do manual install here before upstream has it -pushd rust -install -D --mode 0755 target/release/libnmstate.so \ - %{buildroot}/%{_libdir}/libnmstate.so.%{version} -ln -s libnmstate.so.%{version} %{buildroot}/%{_libdir}/libnmstate.so.2 -ln -s libnmstate.so.%{version} %{buildroot}/%{_libdir}/libnmstate.so +env SKIP_PYTHON_INSTALL=1 \ + PREFIX=%{_prefix} \ + LIBDIR=%{_libdir} \ + %make_install patchelf --set-soname libnmstate.so.2 \ %{buildroot}/%{_libdir}/libnmstate.so.%{version} -install -D --mode 0755 target/release/nmstatectl-rust \ - %{buildroot}/%{_bindir}/nmstatectl -ln -s nmstatectl %{buildroot}/%{_bindir}/nmstatectl-rust -ln -s nmstatectl %{buildroot}/%{_bindir}/nmstate-autoconf -popd -install -D --mode 0644 nmstatectl.8 \ - %{buildroot}/%{_mandir}/man8/nmstatectl.8 -install -D --mode 0644 nmstate-autoconf.8 \ - %{buildroot}/%{_mandir}/man8/nmstate-autoconf.8 -gzip %{buildroot}/%{_mandir}/man8/nmstatectl.8 -gzip %{buildroot}/%{_mandir}/man8/nmstate-autoconf.8 - pushd rust/src/python %py3_install popd -pushd rust/src/clib -install -D --mode 0644 nmstate.h.in %{buildroot}/%{_includedir}/nmstate.h -MAJOR_VERSION=$(echo %{version} | cut -f1 -d.) -MINOR_VERSION=$(echo %{version} | cut -f2 -d.) -MICRO_VERSION=$(echo %{version} | cut -f3 -d.) -sed -i -e "s#@_VERSION_MAJOR@#${MAJOR_VERSION}#" \ - %{buildroot}/%{_includedir}/nmstate.h -sed -i -e "s#@_VERSION_MINOR@#${MINOR_VERSION}#" \ - %{buildroot}/%{_includedir}/nmstate.h -sed -i -e "s#@_VERSION_MICRO@#${MICRO_VERSION}#" \ - %{buildroot}/%{_includedir}/nmstate.h - -install -D --mode 0644 nmstate.pc.in %{buildroot}/%{_libdir}/pkgconfig/nmstate.pc -sed -i -e "s#@PREFIX@#%{_prefix}#" \ - %{buildroot}/%{_libdir}/pkgconfig/nmstate.pc -sed -i -e "s#@LIBDIR@#%{_libdir}#" \ - %{buildroot}/%{_libdir}/pkgconfig/nmstate.pc -sed -i -e "s#@INCLUDE_DIR@#%{_includedir}#" \ - %{buildroot}/%{_libdir}/pkgconfig/nmstate.pc -sed -i -e "s#@VERSION@#%{version}#" \ - %{buildroot}/%{_libdir}/pkgconfig/nmstate.pc -popd - %files %doc README.md %doc examples/ %{_mandir}/man8/nmstatectl.8* %{_mandir}/man8/nmstate-autoconf.8* %{_bindir}/nmstatectl -%{_bindir}/nmstatectl-rust %{_bindir}/nmstate-autoconf %files libs diff --git a/sources b/sources index 3ac99ab..d062a98 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (nmstate-2.1.0-alpha1.tar.gz) = 540121a850a070f4e19591d05027c4b1f596d9b40599f3c667f7b4e9dbe8d84269b94867fbf48891add4b86d731e139931d304b3437555b4edd26cbad389409a -SHA512 (nmstate-2.1.0-alpha1.tar.gz.asc) = b9930f6baa19faf2e86c7f0659ea461f9c7fe6f1e8f370febe9565838e66e6edaf4e7a3c0fda9cf06ea670e7fd4bb67222be9be9f6796828616a2b8d87d611c9 +SHA512 (nmstate-2.1.0-alpha2.tar.gz) = 36f9622d0e7aa7bfad6909b6f99499afffaf5bae9813b97e1fd24c83d479694fb7d847ec448a69101ee17c12361dc556293387d12634caea05d65fd0edd3c635 +SHA512 (nmstate-2.1.0-alpha2.tar.gz.asc) = 2aa4be0c9ae8f4f0794115bca243244f802da7ceea19f36a99f1112072e16f3b50586ad6ef099c181d2bd475f4abdff624b5376e7670fb54fdddd24065300f90 SHA512 (nmstate.gpg) = af6af2024ea46b5c87c6c71d4be278ce4eed58c1783385619987fe8e254eb599f9b218897e7db67050b0e9f7101b206561f63218fda18a0d95103a04682c8309 From 5242f8f1b1bb9af3bf2e0efcc268cb5884087b1b Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Tue, 19 Apr 2022 14:52:14 +0800 Subject: [PATCH 046/120] The rust CLI does not require libs Signed-off-by: Gris Ge --- nmstate.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nmstate.spec b/nmstate.spec index 4b2e24f..d403c15 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,7 +3,7 @@ Name: nmstate Version: 2.1.0 -Release: 0.2.alpha2%{?dist} +Release: 0.3.alpha2%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -31,7 +31,6 @@ BuildRequires: (crate(clap/cargo) >= 3.1 with crate(clap/cargo) < 4.0) BuildRequires: (crate(ctrlc/default) >= 3.2 with crate(ctrlc/default) < 4.0) BuildRequires: (crate(env_logger/default) >= 0.9 with crate(env_logger/default) < 1.0) BuildRequires: (crate(nispor/default) >= 1.2.5 with crate(nispor/default) < 2.0) -Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description Nmstate is a library with an accompanying command line tool that manages host From 25aebab28127d041cf94b449bd4223b4232550be Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Tue, 19 Apr 2022 14:55:38 +0800 Subject: [PATCH 047/120] Add license for -libs and -devel Signed-off-by: Gris Ge --- nmstate.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nmstate.spec b/nmstate.spec index d403c15..269e1aa 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -46,6 +46,7 @@ Summary: C binding of nmstate Recommends: NetworkManager # Avoid automatically generated profiles Recommends: NetworkManager-config-server +License: ASL 2.0 %description libs C binding of nmstate. @@ -54,6 +55,7 @@ C binding of nmstate. Summary: Development files for nmstate Group: Development/Libraries Requires: %{name}-libs%{?_isa} = %{version}-%{release} +License: ASL 2.0 %description devel Development files of nmstate C binding. From bcc29a132e01beac6910536d250cd09f895a32a7 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Fri, 22 Apr 2022 17:08:49 +0800 Subject: [PATCH 048/120] Upgrade to 2.1.0 release Signed-off-by: Gris Ge --- .gitignore | 2 ++ nmstate.spec | 6 +++--- sources | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index bd806e8..c98abd0 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,5 @@ /nmstate-2.1.0-alpha1.tar.gz.asc /nmstate-2.1.0-alpha2.tar.gz /nmstate-2.1.0-alpha2.tar.gz.asc +/nmstate-2.1.0.tar.gz +/nmstate-2.1.0.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index 269e1aa..41c644f 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,12 +3,12 @@ Name: nmstate Version: 2.1.0 -Release: 0.3.alpha2%{?dist} +Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} -Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}-alpha2.tar.gz -Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}-alpha2.tar.gz.asc +Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz +Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc Source2: nmstate.gpg BuildRequires: patchelf BuildRequires: python3-devel diff --git a/sources b/sources index d062a98..7024df9 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (nmstate-2.1.0-alpha2.tar.gz) = 36f9622d0e7aa7bfad6909b6f99499afffaf5bae9813b97e1fd24c83d479694fb7d847ec448a69101ee17c12361dc556293387d12634caea05d65fd0edd3c635 -SHA512 (nmstate-2.1.0-alpha2.tar.gz.asc) = 2aa4be0c9ae8f4f0794115bca243244f802da7ceea19f36a99f1112072e16f3b50586ad6ef099c181d2bd475f4abdff624b5376e7670fb54fdddd24065300f90 +SHA512 (nmstate-2.1.0.tar.gz) = 52f4f3076e8efc7fb940a999a659488e1162253056e2dcab73cf1cc17e1fe2d8f64b5e5b7d343486eaf61926702a10a1d899ef68adfa19667e610d2ec5b7815c +SHA512 (nmstate-2.1.0.tar.gz.asc) = 044914887be2edea22260a9cee7fd53fc0c3e9fd640aa8fcc353f064a548e23a1ecb6fd09c9d23342f8839c917edfac686ff33c5ac40563802838da3103c7309 SHA512 (nmstate.gpg) = af6af2024ea46b5c87c6c71d4be278ce4eed58c1783385619987fe8e254eb599f9b218897e7db67050b0e9f7101b206561f63218fda18a0d95103a04682c8309 From 23530cdc4390f08bb1b6084091ef0818993aba2d Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 14 Jun 2022 08:29:24 +0200 Subject: [PATCH 049/120] Rebuilt for Python 3.11 --- nmstate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nmstate.spec b/nmstate.spec index 41c644f..7ff2616 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,7 +3,7 @@ Name: nmstate Version: 2.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -134,4 +134,7 @@ popd %{python3_sitelib}/%{srcname}-*.egg-info/ %changelog +* Tue Jun 14 2022 Python Maint - 2.1.0-2 +- Rebuilt for Python 3.11 + %autochangelog From 1e1eb1c696858d9f487a54852296a3db6a6d591b Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Wed, 29 Jun 2022 12:41:12 +0800 Subject: [PATCH 050/120] WIP Signed-off-by: Gris Ge --- nmstate.spec | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/nmstate.spec b/nmstate.spec index 7ff2616..e64d3a9 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -80,6 +80,22 @@ Obsoletes: nmstate-plugin-ovsdb < 2.0-1 %description -n python3-%{libname} This package contains the Python 3 library for Nmstate. +%package -n rust-%{name}-devel +Summary: Rust crate of nmstate +BuildArch: noarch + +%description -n rust-%{name}-devel +This package contains library source intended for building other packages +which use "%{name}" crate. + +%package -n rust-%{name}+default-devel +Summary: Rust crate of nmstate with default feature +BuildArch: noarch + +%description -n rust-%{name}+default-devel +This package contains library source intended for building other packages +which use "%{name}" crate with default feature. + %prep gpg2 --import --import-options import-export,import-minimal \ %{SOURCE2} > ./gpgkey-mantainers.gpg @@ -112,6 +128,10 @@ pushd rust/src/python %py3_install popd +pushd rust/src/lib +%cargo_install +popd + %files %doc README.md %doc examples/ @@ -133,8 +153,12 @@ popd %{python3_sitelib}/%{libname} %{python3_sitelib}/%{srcname}-*.egg-info/ -%changelog -* Tue Jun 14 2022 Python Maint - 2.1.0-2 -- Rebuilt for Python 3.11 +%files -n rust-%{name}-devel +%license LICENSE +%{cargo_registry}/%{name}-%{version}/ +%files -n rust-%{name}+default-devel +%ghost %{cargo_registry}/%{name}-%{version}/Cargo.toml + +%changelog %autochangelog From 9adc7ec7a615a105a4626646f2a16e037e75a977 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Mon, 11 Jul 2022 21:01:34 +0800 Subject: [PATCH 051/120] Upgrade to nmstate 2.1.2 Signed-off-by: Gris Ge --- .gitignore | 2 ++ nmstate.spec | 29 +++++++++++++++----- sources | 6 ++--- use_uuid_1_1.patch | 67 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 95 insertions(+), 9 deletions(-) create mode 100644 use_uuid_1_1.patch diff --git a/.gitignore b/.gitignore index c98abd0..b3fd001 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,5 @@ /nmstate-2.1.0-alpha2.tar.gz.asc /nmstate-2.1.0.tar.gz /nmstate-2.1.0.tar.gz.asc +/nmstate-2.1.2.tar.gz +/nmstate-2.1.2.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index e64d3a9..ab6e9c7 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,14 +2,15 @@ %define libname libnmstate Name: nmstate -Version: 2.1.0 -Release: 2%{?dist} +Version: 2.1.2 +Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc -Source2: nmstate.gpg +Source2: https://nmstate.io/nmstate.gpg +Patch1: use_uuid_1_1.patch BuildRequires: patchelf BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -21,7 +22,8 @@ BuildRequires: (crate(serde/default) >= 1.0 with crate(serde/default) < 2.0) BuildRequires: (crate(serde/derive) >= 1.0 with crate(serde/derive) < 2.0) BuildRequires: (crate(serde_json/default) >= 1.0 with crate(serde_json/default) < 2.0) BuildRequires: (crate(serde_yaml/default) >= 0.8 with crate(serde_yaml/default) < 0.9) -BuildRequires: (crate(uuid/v4) >= 0.8 with crate(uuid/v4) < 0.9) +BuildRequires: (crate(uuid/v4) >= 1.1 with crate(uuid/v4) < 2.0) +BuildRequires: (crate(uuid/v5) >= 1.1 with crate(uuid/v5) < 2.0) BuildRequires: (crate(zbus/default) >= 1.9 with crate(zbus/default) < 2.0) BuildRequires: (crate(zvariant/default) >= 2.10 with crate(zvariant/default) < 3.0) BuildRequires: (crate(log/default) >= 0.4 with crate(log/default) < 0.5) @@ -30,7 +32,7 @@ BuildRequires: (crate(clap/default) >= 3.1 with crate(clap/default) < 4.0) BuildRequires: (crate(clap/cargo) >= 3.1 with crate(clap/cargo) < 4.0) BuildRequires: (crate(ctrlc/default) >= 3.2 with crate(ctrlc/default) < 4.0) BuildRequires: (crate(env_logger/default) >= 0.9 with crate(env_logger/default) < 1.0) -BuildRequires: (crate(nispor/default) >= 1.2.5 with crate(nispor/default) < 2.0) +BuildRequires: (crate(nispor/default) >= 1.2.7 with crate(nispor/default) < 2.0) %description Nmstate is a library with an accompanying command line tool that manages host @@ -60,6 +62,13 @@ License: ASL 2.0 %description devel Development files of nmstate C binding. +%package static +Summary: Static development files for nmstate +Group: Development/Libraries +Requires: %{name}-devel%{?_isa} = %{version}-%{release} + +%description static +Static C library bindings for nmstate. %package -n python3-%{libname} Summary: nmstate Python 3 API library @@ -100,7 +109,7 @@ which use "%{name}" crate with default feature. gpg2 --import --import-options import-export,import-minimal \ %{SOURCE2} > ./gpgkey-mantainers.gpg gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} -%setup -q +%autosetup -p1 pushd rust rm .cargo/config.toml @@ -120,6 +129,7 @@ popd env SKIP_PYTHON_INSTALL=1 \ PREFIX=%{_prefix} \ LIBDIR=%{_libdir} \ + SYSCONFDIR=%{_sysconfdir} \ %make_install patchelf --set-soname libnmstate.so.2 \ %{buildroot}/%{_libdir}/libnmstate.so.%{version} @@ -137,8 +147,12 @@ popd %doc examples/ %{_mandir}/man8/nmstatectl.8* %{_mandir}/man8/nmstate-autoconf.8* +%{_mandir}/man8/nmstate.service.8* %{_bindir}/nmstatectl %{_bindir}/nmstate-autoconf +%{_unitdir}/nmstate.service +%dir %{_sysconfdir}/%{name} +%{_sysconfdir}/%{name}/README %files libs %{_libdir}/libnmstate.so.* @@ -160,5 +174,8 @@ popd %files -n rust-%{name}+default-devel %ghost %{cargo_registry}/%{name}-%{version}/Cargo.toml +%files static +%{_libdir}/libnmstate.a + %changelog %autochangelog diff --git a/sources b/sources index 7024df9..80eb45d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (nmstate-2.1.0.tar.gz) = 52f4f3076e8efc7fb940a999a659488e1162253056e2dcab73cf1cc17e1fe2d8f64b5e5b7d343486eaf61926702a10a1d899ef68adfa19667e610d2ec5b7815c -SHA512 (nmstate-2.1.0.tar.gz.asc) = 044914887be2edea22260a9cee7fd53fc0c3e9fd640aa8fcc353f064a548e23a1ecb6fd09c9d23342f8839c917edfac686ff33c5ac40563802838da3103c7309 -SHA512 (nmstate.gpg) = af6af2024ea46b5c87c6c71d4be278ce4eed58c1783385619987fe8e254eb599f9b218897e7db67050b0e9f7101b206561f63218fda18a0d95103a04682c8309 +SHA512 (nmstate-2.1.2.tar.gz) = 4c50350f3e9a26420ec90b476230ea2702545666c005cf0d7e95f912f6586248df07fb85e5f8f4972ae1704e5bc104d94377c58f47435c636e04638432c75da2 +SHA512 (nmstate-2.1.2.tar.gz.asc) = a05e158ea6c2cebf8453efeaca30cf4cc0e518a065cb392fb49ade6d89df9d804aff3a09a769e77378b1013f70b1b355fc980934d06d217637dcab59f688aedc +SHA512 (nmstate.gpg) = 91c6b1d8aef4944520d4bdd4e90121bbbbaf772444f5eb6081cee81e17b21b66798437cdc09a117c6fc77c54d798aaa30400857aa090cb2102b47841f45cf6eb diff --git a/use_uuid_1_1.patch b/use_uuid_1_1.patch new file mode 100644 index 0000000..ed1f354 --- /dev/null +++ b/use_uuid_1_1.patch @@ -0,0 +1,67 @@ +From 56dae17862eb284900439d2af21a715678f3e45a Mon Sep 17 00:00:00 2001 +From: Gris Ge +Date: Mon, 11 Jul 2022 20:51:46 +0800 +Subject: [PATCH] nm: Upgrade to uuid 1.1 crate + +The uuid crate is upgrade from 0.8 to 1.1. Per Fedora request, we should +upgrade to latest version. + +Signed-off-by: Gris Ge +--- + rust/src/cli/Cargo.toml | 2 +- + rust/src/lib/Cargo.toml | 2 +- + rust/src/lib/nm/connection.rs | 2 +- + rust/src/lib/nm/nm_dbus/nm_api.rs | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/rust/src/cli/Cargo.toml b/rust/src/cli/Cargo.toml +index 50d8305b..34bd8fdd 100644 +--- a/rust/src/cli/Cargo.toml ++++ b/rust/src/cli/Cargo.toml +@@ -17,4 +17,4 @@ env_logger = "0.9.0" + log = "0.4.14" + serde_json = "1.0.75" + ctrlc = "3.2.1" +-uuid = { version = "0.8", features = ["v4"] } ++uuid = { version = "1.1", features = ["v4"] } +diff --git a/rust/src/lib/Cargo.toml b/rust/src/lib/Cargo.toml +index 718e6e64..767235e2 100644 +--- a/rust/src/lib/Cargo.toml ++++ b/rust/src/lib/Cargo.toml +@@ -21,7 +21,7 @@ nispor = "1.2.7" + nix = "0.24.1" + serde = { version = "1.0.132", features = ["derive"] } + serde_json = "1.0.68" +-uuid = { version = "0.8.2", features = ["v4", "v5"] } ++uuid = { version = "1.1", features = ["v4", "v5"] } + zbus = "1.9.2" + zvariant = "2.10.0" + +diff --git a/rust/src/lib/nm/connection.rs b/rust/src/lib/nm/connection.rs +index 3a49a9f8..2b85af39 100644 +--- a/rust/src/lib/nm/connection.rs ++++ b/rust/src/lib/nm/connection.rs +@@ -509,6 +509,6 @@ fn uuid_from_name_and_type( + &uuid::Uuid::NAMESPACE_URL, + format!("{}://{}", iface_type, iface_name).as_bytes(), + ) +- .to_hyphenated() ++ .hyphenated() + .to_string() + } +diff --git a/rust/src/lib/nm/nm_dbus/nm_api.rs b/rust/src/lib/nm/nm_dbus/nm_api.rs +index eb999b78..9b14d342 100644 +--- a/rust/src/lib/nm/nm_dbus/nm_api.rs ++++ b/rust/src/lib/nm/nm_dbus/nm_api.rs +@@ -205,7 +205,7 @@ impl<'a> NmApi<'a> { + + pub fn uuid_gen() -> String { + // Use Linux random number generator (RNG) to generate UUID +- uuid::Uuid::new_v4().to_hyphenated().to_string() ++ uuid::Uuid::new_v4().hyphenated().to_string() + } + + pub fn active_connections_get( +-- +2.37.0 + From f07139dbc17f174f7b6069b61c320aae01885b02 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 00:38:38 +0000 Subject: [PATCH 052/120] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nmstate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nmstate.spec b/nmstate.spec index ab6e9c7..a2ae2f4 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,7 +3,7 @@ Name: nmstate Version: 2.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -178,4 +178,7 @@ popd %{_libdir}/libnmstate.a %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 2.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + %autochangelog From 8f29f16eddf2331bf960f11e9c3237a4ce794c62 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Tue, 23 Aug 2022 14:17:31 +0800 Subject: [PATCH 053/120] Upgrade to 2.1.4 and remove rust devel package Signed-off-by: Gris Ge --- .gitignore | 2 ++ nmstate.spec | 32 +++------------------- sources | 4 +-- use_uuid_1_1.patch | 67 ---------------------------------------------- 4 files changed, 7 insertions(+), 98 deletions(-) delete mode 100644 use_uuid_1_1.patch diff --git a/.gitignore b/.gitignore index b3fd001..72dd1b5 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,5 @@ /nmstate-2.1.0.tar.gz.asc /nmstate-2.1.2.tar.gz /nmstate-2.1.2.tar.gz.asc +/nmstate-2.1.4.tar.gz +/nmstate-2.1.4.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index a2ae2f4..4658c35 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,15 +2,14 @@ %define libname libnmstate Name: nmstate -Version: 2.1.2 -Release: 2%{?dist} +Version: 2.1.4 +Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc Source2: https://nmstate.io/nmstate.gpg -Patch1: use_uuid_1_1.patch BuildRequires: patchelf BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -18,6 +17,7 @@ BuildRequires: gnupg2 BuildRequires: systemd-devel BuildRequires: systemd-rpm-macros BuildRequires: rust-packaging +BuildRequires: (crate(ipnet/default) >= 2.5 with crate(ipnet/default) < 3.0) BuildRequires: (crate(serde/default) >= 1.0 with crate(serde/default) < 2.0) BuildRequires: (crate(serde/derive) >= 1.0 with crate(serde/derive) < 2.0) BuildRequires: (crate(serde_json/default) >= 1.0 with crate(serde_json/default) < 2.0) @@ -89,22 +89,6 @@ Obsoletes: nmstate-plugin-ovsdb < 2.0-1 %description -n python3-%{libname} This package contains the Python 3 library for Nmstate. -%package -n rust-%{name}-devel -Summary: Rust crate of nmstate -BuildArch: noarch - -%description -n rust-%{name}-devel -This package contains library source intended for building other packages -which use "%{name}" crate. - -%package -n rust-%{name}+default-devel -Summary: Rust crate of nmstate with default feature -BuildArch: noarch - -%description -n rust-%{name}+default-devel -This package contains library source intended for building other packages -which use "%{name}" crate with default feature. - %prep gpg2 --import --import-options import-export,import-minimal \ %{SOURCE2} > ./gpgkey-mantainers.gpg @@ -167,18 +151,8 @@ popd %{python3_sitelib}/%{libname} %{python3_sitelib}/%{srcname}-*.egg-info/ -%files -n rust-%{name}-devel -%license LICENSE -%{cargo_registry}/%{name}-%{version}/ - -%files -n rust-%{name}+default-devel -%ghost %{cargo_registry}/%{name}-%{version}/Cargo.toml - %files static %{_libdir}/libnmstate.a %changelog -* Fri Jul 22 2022 Fedora Release Engineering - 2.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - %autochangelog diff --git a/sources b/sources index 80eb45d..6708ac6 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (nmstate-2.1.2.tar.gz) = 4c50350f3e9a26420ec90b476230ea2702545666c005cf0d7e95f912f6586248df07fb85e5f8f4972ae1704e5bc104d94377c58f47435c636e04638432c75da2 -SHA512 (nmstate-2.1.2.tar.gz.asc) = a05e158ea6c2cebf8453efeaca30cf4cc0e518a065cb392fb49ade6d89df9d804aff3a09a769e77378b1013f70b1b355fc980934d06d217637dcab59f688aedc +SHA512 (nmstate-2.1.4.tar.gz) = 698aa3f2d4ac68fe8d00ca1d984ce23f1ab8433885dcea8835d9023d4bc5313620c9064fd9c59d4bd46f111cf7ac14364ae29aa8817d553cba732e23ee4bd1e2 +SHA512 (nmstate-2.1.4.tar.gz.asc) = 3ada247852b7236111f57e70e9dd597f8df0c954d2da4a36496639aa55fc65805b3fd6fcfa006ee60d21d9de4f9c1eee9c72abb217fc8da459500d6effd8f1ce SHA512 (nmstate.gpg) = 91c6b1d8aef4944520d4bdd4e90121bbbbaf772444f5eb6081cee81e17b21b66798437cdc09a117c6fc77c54d798aaa30400857aa090cb2102b47841f45cf6eb diff --git a/use_uuid_1_1.patch b/use_uuid_1_1.patch deleted file mode 100644 index ed1f354..0000000 --- a/use_uuid_1_1.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 56dae17862eb284900439d2af21a715678f3e45a Mon Sep 17 00:00:00 2001 -From: Gris Ge -Date: Mon, 11 Jul 2022 20:51:46 +0800 -Subject: [PATCH] nm: Upgrade to uuid 1.1 crate - -The uuid crate is upgrade from 0.8 to 1.1. Per Fedora request, we should -upgrade to latest version. - -Signed-off-by: Gris Ge ---- - rust/src/cli/Cargo.toml | 2 +- - rust/src/lib/Cargo.toml | 2 +- - rust/src/lib/nm/connection.rs | 2 +- - rust/src/lib/nm/nm_dbus/nm_api.rs | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/rust/src/cli/Cargo.toml b/rust/src/cli/Cargo.toml -index 50d8305b..34bd8fdd 100644 ---- a/rust/src/cli/Cargo.toml -+++ b/rust/src/cli/Cargo.toml -@@ -17,4 +17,4 @@ env_logger = "0.9.0" - log = "0.4.14" - serde_json = "1.0.75" - ctrlc = "3.2.1" --uuid = { version = "0.8", features = ["v4"] } -+uuid = { version = "1.1", features = ["v4"] } -diff --git a/rust/src/lib/Cargo.toml b/rust/src/lib/Cargo.toml -index 718e6e64..767235e2 100644 ---- a/rust/src/lib/Cargo.toml -+++ b/rust/src/lib/Cargo.toml -@@ -21,7 +21,7 @@ nispor = "1.2.7" - nix = "0.24.1" - serde = { version = "1.0.132", features = ["derive"] } - serde_json = "1.0.68" --uuid = { version = "0.8.2", features = ["v4", "v5"] } -+uuid = { version = "1.1", features = ["v4", "v5"] } - zbus = "1.9.2" - zvariant = "2.10.0" - -diff --git a/rust/src/lib/nm/connection.rs b/rust/src/lib/nm/connection.rs -index 3a49a9f8..2b85af39 100644 ---- a/rust/src/lib/nm/connection.rs -+++ b/rust/src/lib/nm/connection.rs -@@ -509,6 +509,6 @@ fn uuid_from_name_and_type( - &uuid::Uuid::NAMESPACE_URL, - format!("{}://{}", iface_type, iface_name).as_bytes(), - ) -- .to_hyphenated() -+ .hyphenated() - .to_string() - } -diff --git a/rust/src/lib/nm/nm_dbus/nm_api.rs b/rust/src/lib/nm/nm_dbus/nm_api.rs -index eb999b78..9b14d342 100644 ---- a/rust/src/lib/nm/nm_dbus/nm_api.rs -+++ b/rust/src/lib/nm/nm_dbus/nm_api.rs -@@ -205,7 +205,7 @@ impl<'a> NmApi<'a> { - - pub fn uuid_gen() -> String { - // Use Linux random number generator (RNG) to generate UUID -- uuid::Uuid::new_v4().to_hyphenated().to_string() -+ uuid::Uuid::new_v4().hyphenated().to_string() - } - - pub fn active_connections_get( --- -2.37.0 - From ced44e2e85f07d5a208e042a4dfce4f82f948437 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Tue, 23 Aug 2022 14:50:30 +0800 Subject: [PATCH 054/120] Add back the rust-crate sub-rpms Signed-off-by: Gris Ge --- nmstate.spec | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/nmstate.spec b/nmstate.spec index 4658c35..f6546dc 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -89,6 +89,22 @@ Obsoletes: nmstate-plugin-ovsdb < 2.0-1 %description -n python3-%{libname} This package contains the Python 3 library for Nmstate. +%package -n rust-%{name}-devel +Summary: Rust crate of nmstate +BuildArch: noarch + +%description -n rust-%{name}-devel +This package contains library source intended for building other packages +which use "%{name}" crate. + +%package -n rust-%{name}+default-devel +Summary: Rust crate of nmstate with default feature +BuildArch: noarch + +%description -n rust-%{name}+default-devel +This package contains library source intended for building other packages +which use "%{name}" crate with default feature. + %prep gpg2 --import --import-options import-export,import-minimal \ %{SOURCE2} > ./gpgkey-mantainers.gpg @@ -154,5 +170,12 @@ popd %files static %{_libdir}/libnmstate.a +%files -n rust-%{name}-devel +%license LICENSE +%{cargo_registry}/%{name}-%{version}/ + +%files -n rust-%{name}+default-devel +%ghost %{cargo_registry}/%{name}-%{version}/Cargo.toml + %changelog %autochangelog From 5f2fc75273813676a9c7ae2c76722a2f250016f5 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Tue, 18 Oct 2022 01:32:05 +0800 Subject: [PATCH 055/120] Upgrade to 2.2.0 Signed-off-by: Gris Ge --- .gitignore | 2 ++ nmstate.spec | 18 +++++++++--------- sources | 4 ++-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 72dd1b5..a6c46e2 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,5 @@ /nmstate-2.1.2.tar.gz.asc /nmstate-2.1.4.tar.gz /nmstate-2.1.4.tar.gz.asc +/nmstate-2.2.0.tar.gz +/nmstate-2.2.0.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index f6546dc..2715e58 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.1.4 +Version: 2.2.0 Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ @@ -17,22 +17,22 @@ BuildRequires: gnupg2 BuildRequires: systemd-devel BuildRequires: systemd-rpm-macros BuildRequires: rust-packaging +BuildRequires: (crate(clap/cargo) >= 3.1 with crate(clap/cargo) < 4.0) +BuildRequires: (crate(clap/default) >= 3.1 with crate(clap/default) < 4.0) +BuildRequires: (crate(ctrlc/default) >= 3.2 with crate(ctrlc/default) < 4.0) +BuildRequires: (crate(env_logger/default) >= 0.9 with crate(env_logger/default) < 1.0) BuildRequires: (crate(ipnet/default) >= 2.5 with crate(ipnet/default) < 3.0) +BuildRequires: (crate(libc/default) >= 0.2 with crate(libc/default) < 0.3) +BuildRequires: (crate(log/default) >= 0.4 with crate(log/default) < 0.5) +BuildRequires: (crate(nispor/default) >= 1.2.8 with crate(nispor/default) < 2.0) BuildRequires: (crate(serde/default) >= 1.0 with crate(serde/default) < 2.0) BuildRequires: (crate(serde/derive) >= 1.0 with crate(serde/derive) < 2.0) BuildRequires: (crate(serde_json/default) >= 1.0 with crate(serde_json/default) < 2.0) -BuildRequires: (crate(serde_yaml/default) >= 0.8 with crate(serde_yaml/default) < 0.9) +BuildRequires: (crate(serde_yaml/default) >= 0.9 with crate(serde_yaml/default) < 1.0) BuildRequires: (crate(uuid/v4) >= 1.1 with crate(uuid/v4) < 2.0) BuildRequires: (crate(uuid/v5) >= 1.1 with crate(uuid/v5) < 2.0) BuildRequires: (crate(zbus/default) >= 1.9 with crate(zbus/default) < 2.0) BuildRequires: (crate(zvariant/default) >= 2.10 with crate(zvariant/default) < 3.0) -BuildRequires: (crate(log/default) >= 0.4 with crate(log/default) < 0.5) -BuildRequires: (crate(libc/default) >= 0.2 with crate(libc/default) < 0.3) -BuildRequires: (crate(clap/default) >= 3.1 with crate(clap/default) < 4.0) -BuildRequires: (crate(clap/cargo) >= 3.1 with crate(clap/cargo) < 4.0) -BuildRequires: (crate(ctrlc/default) >= 3.2 with crate(ctrlc/default) < 4.0) -BuildRequires: (crate(env_logger/default) >= 0.9 with crate(env_logger/default) < 1.0) -BuildRequires: (crate(nispor/default) >= 1.2.7 with crate(nispor/default) < 2.0) %description Nmstate is a library with an accompanying command line tool that manages host diff --git a/sources b/sources index 6708ac6..e2bd12a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (nmstate-2.1.4.tar.gz) = 698aa3f2d4ac68fe8d00ca1d984ce23f1ab8433885dcea8835d9023d4bc5313620c9064fd9c59d4bd46f111cf7ac14364ae29aa8817d553cba732e23ee4bd1e2 -SHA512 (nmstate-2.1.4.tar.gz.asc) = 3ada247852b7236111f57e70e9dd597f8df0c954d2da4a36496639aa55fc65805b3fd6fcfa006ee60d21d9de4f9c1eee9c72abb217fc8da459500d6effd8f1ce +SHA512 (nmstate-2.2.0.tar.gz) = c9449e95edb164e02720721913a9e4efd5fefd564dc19f8f527e47928643b4ac4ec8b57ffc7f5f2be547c3000d1b1f23fc0bffe4638d6f176d2f01b98916c047 +SHA512 (nmstate-2.2.0.tar.gz.asc) = f4d4efd4132edf1799a704dc5483607517c77eb50220c79c1059ab1e142da6283e99746db8280309a1df8a8fbd3a94957a28af884830a88b5d81949df61096e5 SHA512 (nmstate.gpg) = 91c6b1d8aef4944520d4bdd4e90121bbbbaf772444f5eb6081cee81e17b21b66798437cdc09a117c6fc77c54d798aaa30400857aa090cb2102b47841f45cf6eb From 3fd9def4c9b7aacb1ac00397104fe8ec9953222f Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Mon, 31 Oct 2022 17:16:29 +0800 Subject: [PATCH 056/120] Add feature sub package Signed-off-by: Gris Ge --- nmstate.spec | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/nmstate.spec b/nmstate.spec index 2715e58..faaf165 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,7 +3,7 @@ Name: nmstate Version: 2.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -105,6 +105,22 @@ BuildArch: noarch This package contains library source intended for building other packages which use "%{name}" crate with default feature. +%package -n rust-%{name}+gen_conf-devel +Summary: Rust crate of nmstate with default feature +BuildArch: noarch + +%description -n rust-%{name}+gen_conf-devel +This package contains library source intended for building other packages +which use "%{name}" crate with gen_conf feature. + +%package -n rust-%{name}+query_apply-devel +Summary: Rust crate of nmstate with default feature +BuildArch: noarch + +%description -n rust-%{name}+query_apply-devel +This package contains library source intended for building other packages +which use "%{name}" crate with query_apply feature. + %prep gpg2 --import --import-options import-export,import-minimal \ %{SOURCE2} > ./gpgkey-mantainers.gpg @@ -177,5 +193,11 @@ popd %files -n rust-%{name}+default-devel %ghost %{cargo_registry}/%{name}-%{version}/Cargo.toml +%files -n rust-%{name}+gen_conf-devel +%ghost %{cargo_registry}/%{name}-%{version}/Cargo.toml + +%files -n rust-%{name}+query_apply-devel +%ghost %{cargo_registry}/%{name}-%{version}/Cargo.toml + %changelog %autochangelog From 999e4c93ae42f474a1f494ba8a1a3c7343edc8dc Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Thu, 15 Dec 2022 11:03:36 +0800 Subject: [PATCH 057/120] Upgrade to 2.2.2 Signed-off-by: Gris Ge --- .gitignore | 2 ++ nmstate.spec | 7 ++++--- sources | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a6c46e2..4fa89a4 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,5 @@ /nmstate-2.1.4.tar.gz.asc /nmstate-2.2.0.tar.gz /nmstate-2.2.0.tar.gz.asc +/nmstate-2.2.2.tar.gz +/nmstate-2.2.2.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index faaf165..5ceb3ae 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,8 +2,8 @@ %define libname libnmstate Name: nmstate -Version: 2.2.0 -Release: 2%{?dist} +Version: 2.2.2 +Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -19,12 +19,13 @@ BuildRequires: systemd-rpm-macros BuildRequires: rust-packaging BuildRequires: (crate(clap/cargo) >= 3.1 with crate(clap/cargo) < 4.0) BuildRequires: (crate(clap/default) >= 3.1 with crate(clap/default) < 4.0) +BuildRequires: (crate(chrono/default) >= 0.4 with crate(chrono/default) < 0.5) BuildRequires: (crate(ctrlc/default) >= 3.2 with crate(ctrlc/default) < 4.0) BuildRequires: (crate(env_logger/default) >= 0.9 with crate(env_logger/default) < 1.0) BuildRequires: (crate(ipnet/default) >= 2.5 with crate(ipnet/default) < 3.0) BuildRequires: (crate(libc/default) >= 0.2 with crate(libc/default) < 0.3) BuildRequires: (crate(log/default) >= 0.4 with crate(log/default) < 0.5) -BuildRequires: (crate(nispor/default) >= 1.2.8 with crate(nispor/default) < 2.0) +BuildRequires: (crate(nispor/default) >= 1.2.9 with crate(nispor/default) < 2.0) BuildRequires: (crate(serde/default) >= 1.0 with crate(serde/default) < 2.0) BuildRequires: (crate(serde/derive) >= 1.0 with crate(serde/derive) < 2.0) BuildRequires: (crate(serde_json/default) >= 1.0 with crate(serde_json/default) < 2.0) diff --git a/sources b/sources index e2bd12a..9763a28 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (nmstate-2.2.0.tar.gz) = c9449e95edb164e02720721913a9e4efd5fefd564dc19f8f527e47928643b4ac4ec8b57ffc7f5f2be547c3000d1b1f23fc0bffe4638d6f176d2f01b98916c047 -SHA512 (nmstate-2.2.0.tar.gz.asc) = f4d4efd4132edf1799a704dc5483607517c77eb50220c79c1059ab1e142da6283e99746db8280309a1df8a8fbd3a94957a28af884830a88b5d81949df61096e5 +SHA512 (nmstate-2.2.2.tar.gz) = 9e20b4f944596e0cf46b470a2a1a4bfcd4fa7a114fd9517b17507cdfd5c1203f81c6bfd730f877c67eb80cae0cc87633ba66185f74d69fc92a7c03a9e195f315 +SHA512 (nmstate-2.2.2.tar.gz.asc) = 8167aabab9214b31a56ba986e961ec7b7e6f2513dd69c4c7cc37eea2d80d49329683c6c39c37d5f7c52512a0a6800f505e7de545b9d58c33d8c65c8902944d9e SHA512 (nmstate.gpg) = 91c6b1d8aef4944520d4bdd4e90121bbbbaf772444f5eb6081cee81e17b21b66798437cdc09a117c6fc77c54d798aaa30400857aa090cb2102b47841f45cf6eb From 6cfc035196fc6a4c73a3c9f70d515f8f1273a4f6 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Sun, 18 Dec 2022 19:15:56 +0800 Subject: [PATCH 058/120] Fix regression of VRF support Signed-off-by: Gris Ge --- 0001-iface-Include-VRF-as-support-type.patch | 38 ++++++++++++++++++++ nmstate.spec | 3 +- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0001-iface-Include-VRF-as-support-type.patch diff --git a/0001-iface-Include-VRF-as-support-type.patch b/0001-iface-Include-VRF-as-support-type.patch new file mode 100644 index 0000000..2f6c83e --- /dev/null +++ b/0001-iface-Include-VRF-as-support-type.patch @@ -0,0 +1,38 @@ +From b37434e3228b269728e9d7875993417de54d1330 Mon Sep 17 00:00:00 2001 +From: Gris Ge +Date: Thu, 15 Dec 2022 17:11:07 +0800 +Subject: [PATCH] iface: Include VRF as support type + +We accidentally forgot VRF as supported type. +The existing VRF test was skipped by CI hence not been found initially. + +Manually run the test in RHEL host works well. + +Signed-off-by: Gris Ge +--- + rust/src/lib/query_apply/iface.rs | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/rust/src/lib/query_apply/iface.rs b/rust/src/lib/query_apply/iface.rs +index a379960b..888bcbb4 100644 +--- a/rust/src/lib/query_apply/iface.rs ++++ b/rust/src/lib/query_apply/iface.rs +@@ -259,7 +259,7 @@ impl Interface { + } + + impl InterfaceType { +- pub(crate) const SUPPORTED_LIST: [InterfaceType; 13] = [ ++ pub(crate) const SUPPORTED_LIST: [InterfaceType; 14] = [ + InterfaceType::Bond, + InterfaceType::LinuxBridge, + InterfaceType::Dummy, +@@ -273,5 +273,6 @@ impl InterfaceType { + InterfaceType::Vxlan, + InterfaceType::InfiniBand, + InterfaceType::Loopback, ++ InterfaceType::Vrf, + ]; + } +-- +2.39.0 + diff --git a/nmstate.spec b/nmstate.spec index 5ceb3ae..5838dc5 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,13 +3,14 @@ Name: nmstate Version: 2.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc Source2: https://nmstate.io/nmstate.gpg +Patch1: 0001-iface-Include-VRF-as-support-type.patch BuildRequires: patchelf BuildRequires: python3-devel BuildRequires: python3-setuptools From 16b8fe63d61daecdfb476b479d6af845d022caac Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Mon, 9 Jan 2023 16:08:03 +0800 Subject: [PATCH 059/120] Upgrade to 2.2.3 Signed-off-by: Gris Ge --- .gitignore | 2 ++ 0001-iface-Include-VRF-as-support-type.patch | 38 -------------------- nmstate.spec | 5 ++- sources | 4 +-- 4 files changed, 6 insertions(+), 43 deletions(-) delete mode 100644 0001-iface-Include-VRF-as-support-type.patch diff --git a/.gitignore b/.gitignore index 4fa89a4..436b1c6 100644 --- a/.gitignore +++ b/.gitignore @@ -81,3 +81,5 @@ /nmstate-2.2.0.tar.gz.asc /nmstate-2.2.2.tar.gz /nmstate-2.2.2.tar.gz.asc +/nmstate-2.2.3.tar.gz.asc +/nmstate-2.2.3.tar.gz diff --git a/0001-iface-Include-VRF-as-support-type.patch b/0001-iface-Include-VRF-as-support-type.patch deleted file mode 100644 index 2f6c83e..0000000 --- a/0001-iface-Include-VRF-as-support-type.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b37434e3228b269728e9d7875993417de54d1330 Mon Sep 17 00:00:00 2001 -From: Gris Ge -Date: Thu, 15 Dec 2022 17:11:07 +0800 -Subject: [PATCH] iface: Include VRF as support type - -We accidentally forgot VRF as supported type. -The existing VRF test was skipped by CI hence not been found initially. - -Manually run the test in RHEL host works well. - -Signed-off-by: Gris Ge ---- - rust/src/lib/query_apply/iface.rs | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/rust/src/lib/query_apply/iface.rs b/rust/src/lib/query_apply/iface.rs -index a379960b..888bcbb4 100644 ---- a/rust/src/lib/query_apply/iface.rs -+++ b/rust/src/lib/query_apply/iface.rs -@@ -259,7 +259,7 @@ impl Interface { - } - - impl InterfaceType { -- pub(crate) const SUPPORTED_LIST: [InterfaceType; 13] = [ -+ pub(crate) const SUPPORTED_LIST: [InterfaceType; 14] = [ - InterfaceType::Bond, - InterfaceType::LinuxBridge, - InterfaceType::Dummy, -@@ -273,5 +273,6 @@ impl InterfaceType { - InterfaceType::Vxlan, - InterfaceType::InfiniBand, - InterfaceType::Loopback, -+ InterfaceType::Vrf, - ]; - } --- -2.39.0 - diff --git a/nmstate.spec b/nmstate.spec index 5838dc5..eb69c1a 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,15 +2,14 @@ %define libname libnmstate Name: nmstate -Version: 2.2.2 -Release: 2%{?dist} +Version: 2.2.3 +Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc Source2: https://nmstate.io/nmstate.gpg -Patch1: 0001-iface-Include-VRF-as-support-type.patch BuildRequires: patchelf BuildRequires: python3-devel BuildRequires: python3-setuptools diff --git a/sources b/sources index 9763a28..6b4639f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (nmstate-2.2.2.tar.gz) = 9e20b4f944596e0cf46b470a2a1a4bfcd4fa7a114fd9517b17507cdfd5c1203f81c6bfd730f877c67eb80cae0cc87633ba66185f74d69fc92a7c03a9e195f315 -SHA512 (nmstate-2.2.2.tar.gz.asc) = 8167aabab9214b31a56ba986e961ec7b7e6f2513dd69c4c7cc37eea2d80d49329683c6c39c37d5f7c52512a0a6800f505e7de545b9d58c33d8c65c8902944d9e SHA512 (nmstate.gpg) = 91c6b1d8aef4944520d4bdd4e90121bbbbaf772444f5eb6081cee81e17b21b66798437cdc09a117c6fc77c54d798aaa30400857aa090cb2102b47841f45cf6eb +SHA512 (nmstate-2.2.3.tar.gz.asc) = b083f62a0eaade25cd7a1b43e3b4c9444410bd0f46eb3e75df9598d29902956349cd2cf204755dc74838afc50dd50da25dbdc9d7f799fe0d4b2c6d1f14e386fa +SHA512 (nmstate-2.2.3.tar.gz) = 98fefc539a60bbb78071de9389001b47a8d56784cc5fdf4fe621125c3f00587f7ad4adcb2d99b9eb5de6cc8c9dd3cf1865e8c2b8f2dad1b95b5d6d390cff5ade From 878db1ae465a985452e1d3327f9079ec0ceb58d8 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Mon, 16 Jan 2023 14:35:39 +0800 Subject: [PATCH 060/120] cargo: Use explicit dependency line for rust-nmstate+query_apply-devel Resolves: RHBZ#2159314 Signed-off-by: Gris Ge --- ...Workaround-for-Fedora-rust-packaging.patch | 33 +++++++++++++++++++ nmstate.spec | 11 ++++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 0001-Workaround-for-Fedora-rust-packaging.patch diff --git a/0001-Workaround-for-Fedora-rust-packaging.patch b/0001-Workaround-for-Fedora-rust-packaging.patch new file mode 100644 index 0000000..15cd542 --- /dev/null +++ b/0001-Workaround-for-Fedora-rust-packaging.patch @@ -0,0 +1,33 @@ +From a78d7610a7a3adc4cd80433bdded7d37e738eb12 Mon Sep 17 00:00:00 2001 +From: Gris Ge +Date: Mon, 16 Jan 2023 11:56:16 +0800 +Subject: [PATCH] Workaround for Fedora rust packaging + +Signed-off-by: Gris Ge +--- + rust/src/lib/Cargo.toml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/rust/src/lib/Cargo.toml b/rust/src/lib/Cargo.toml +index 801b3e33..67c7f3dd 100644 +--- a/rust/src/lib/Cargo.toml ++++ b/rust/src/lib/Cargo.toml +@@ -9,7 +9,7 @@ documentation = "https://nmstate.io" + repository = "https://github.com/nmstate/nmstate" + keywords = ["network", "linux"] + categories = ["network-programming", "os::linux-apis"] +-rust-version = "1.58" ++rust-version = "1.60" + edition = "2018" + + [lib] +@@ -62,5 +62,5 @@ serde_yaml = "0.9" + + [features] + default = ["query_apply", "gen_conf"] +-query_apply = ["nispor", "nix", "zbus"] ++query_apply = ["dep:nispor", "dep:nix", "dep:zbus"] + gen_conf = [] +-- +2.39.0 + diff --git a/nmstate.spec b/nmstate.spec index eb69c1a..76bbde5 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,13 +3,17 @@ Name: nmstate Version: 2.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc Source2: https://nmstate.io/nmstate.gpg +# We use `dep: dep_name` to prevent rust packaging generate incorect dependency +# https://bugzilla.redhat.com/show_bug.cgi?id=2161128 +# but list Requires manually +Patch1: 0001-Workaround-for-Fedora-rust-packaging.patch BuildRequires: patchelf BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -34,6 +38,7 @@ BuildRequires: (crate(uuid/v4) >= 1.1 with crate(uuid/v4) < 2.0) BuildRequires: (crate(uuid/v5) >= 1.1 with crate(uuid/v5) < 2.0) BuildRequires: (crate(zbus/default) >= 1.9 with crate(zbus/default) < 2.0) BuildRequires: (crate(zvariant/default) >= 2.10 with crate(zvariant/default) < 3.0) +BuildRequires: (crate(nix/default) >= 0.24 with crate(nix/default) < 0.25) %description Nmstate is a library with an accompanying command line tool that manages host @@ -117,6 +122,10 @@ which use "%{name}" crate with gen_conf feature. %package -n rust-%{name}+query_apply-devel Summary: Rust crate of nmstate with default feature BuildArch: noarch +# https://bugzilla.redhat.com/show_bug.cgi?id=2161128 +Requires: (crate(nispor/default) >= 1.2.9 with crate(nispor/default) < 2.0) +Requires: (crate(nix/default) >= 0.24 with crate(nix/default) < 0.25) +Requires: (crate(zbus/default) >= 1.9 with crate(zbus/default) < 2.0) %description -n rust-%{name}+query_apply-devel This package contains library source intended for building other packages From 328381f9f182a4fff73d802e3fea03a11cfbf0b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 21:39:39 +0000 Subject: [PATCH 061/120] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nmstate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nmstate.spec b/nmstate.spec index 76bbde5..d848e0d 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,7 +3,7 @@ Name: nmstate Version: 2.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -210,4 +210,7 @@ popd %ghost %{cargo_registry}/%{name}-%{version}/Cargo.toml %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.2.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + %autochangelog From ae9407560afd7cee6b6f1c389328dd3fa2446508 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Fri, 20 Jan 2023 12:30:01 +0100 Subject: [PATCH 062/120] Upgrade to 2.2.4 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 7 ++----- sources | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 436b1c6..dea7e79 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,5 @@ /nmstate-2.2.2.tar.gz.asc /nmstate-2.2.3.tar.gz.asc /nmstate-2.2.3.tar.gz +/nmstate-2.2.4.tar.gz +/nmstate-2.2.4.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index d848e0d..678c956 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,8 +2,8 @@ %define libname libnmstate Name: nmstate -Version: 2.2.3 -Release: 3%{?dist} +Version: 2.2.4 +Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -210,7 +210,4 @@ popd %ghost %{cargo_registry}/%{name}-%{version}/Cargo.toml %changelog -* Thu Jan 19 2023 Fedora Release Engineering - 2.2.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - %autochangelog diff --git a/sources b/sources index 6b4639f..6eadcaa 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (nmstate.gpg) = 91c6b1d8aef4944520d4bdd4e90121bbbbaf772444f5eb6081cee81e17b21b66798437cdc09a117c6fc77c54d798aaa30400857aa090cb2102b47841f45cf6eb -SHA512 (nmstate-2.2.3.tar.gz.asc) = b083f62a0eaade25cd7a1b43e3b4c9444410bd0f46eb3e75df9598d29902956349cd2cf204755dc74838afc50dd50da25dbdc9d7f799fe0d4b2c6d1f14e386fa -SHA512 (nmstate-2.2.3.tar.gz) = 98fefc539a60bbb78071de9389001b47a8d56784cc5fdf4fe621125c3f00587f7ad4adcb2d99b9eb5de6cc8c9dd3cf1865e8c2b8f2dad1b95b5d6d390cff5ade +SHA512 (nmstate-2.2.4.tar.gz) = 6a9a7c94ce7743f872515a30717aa6a1690158c7459c25ccc936bf332a57a03c3c267943e0f811b8c3e8afb00dfceed07fd5d7ea0276c240be08bd326c4bfc6b +SHA512 (nmstate-2.2.4.tar.gz.asc) = f7a65e74b3f2c1388615a61f3a3dbf7f165e967d3f2ee1eab8e55c9ae2fb46464a3fe578efc17fc3eb4c0904ac9aa1add7a98b241059f28a060b88b2ab41299b +SHA512 (nmstate.gpg) = b77a72ad4711b9d0c3b3a34520b4a9c4a367ecc4b89fad9221bf9f2963fc8b504dae688213a59e184c95e83e2e8773c6018acea8ecc13fc1ff5bb894c5223760 From 1289ce8baa904e6032fe488fd3444ac929009562 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Thu, 26 Jan 2023 13:00:00 +0100 Subject: [PATCH 063/120] Upgrade to 2.2.5 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dea7e79..d7eca61 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,5 @@ /nmstate-2.2.3.tar.gz /nmstate-2.2.4.tar.gz /nmstate-2.2.4.tar.gz.asc +/nmstate-2.2.5.tar.gz +/nmstate-2.2.5.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index 678c956..d3fe394 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.4 +Version: 2.2.5 Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ diff --git a/sources b/sources index 6eadcaa..52a9c4b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (nmstate-2.2.4.tar.gz) = 6a9a7c94ce7743f872515a30717aa6a1690158c7459c25ccc936bf332a57a03c3c267943e0f811b8c3e8afb00dfceed07fd5d7ea0276c240be08bd326c4bfc6b -SHA512 (nmstate-2.2.4.tar.gz.asc) = f7a65e74b3f2c1388615a61f3a3dbf7f165e967d3f2ee1eab8e55c9ae2fb46464a3fe578efc17fc3eb4c0904ac9aa1add7a98b241059f28a060b88b2ab41299b +SHA512 (nmstate-2.2.5.tar.gz) = d768cb8ef3fcf00d1788cfa5b11b552e5d8516009bb5e8b4333b8a640b890e297f73f79c7a82016b727c9f9fff95451c7fc5b00adf7fddab05d034c8c687bce5 +SHA512 (nmstate-2.2.5.tar.gz.asc) = 2b712e932cfea1dd720ef13e9b8e9c44fd4a8b07fa422d4bd3cfe3571ca8bfc7bbcf02f5f9984fde0053bcafd8b83574abf92892327f8ef5032b0d33b932be2a SHA512 (nmstate.gpg) = b77a72ad4711b9d0c3b3a34520b4a9c4a367ecc4b89fad9221bf9f2963fc8b504dae688213a59e184c95e83e2e8773c6018acea8ecc13fc1ff5bb894c5223760 From 4be409df2e5a4d12d051c0146322f933bbcd4372 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 5 Feb 2023 20:48:28 +0100 Subject: [PATCH 064/120] Fix botched rpmautospec conversion --- nmstate.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nmstate.spec b/nmstate.spec index d3fe394..28cd03c 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,7 +3,7 @@ Name: nmstate Version: 2.2.5 -Release: 1%{?dist} +Release: %autorelease Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} From 0685232006147d68aad55bdcdd990750d8883372 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 5 Feb 2023 20:49:25 +0100 Subject: [PATCH 065/120] Rebuild for fixed frame pointer compiler flags in Rust RPM macros From 59c76c1953d6ea203c40b1adfea2743a24cbe2b5 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Sun, 12 Mar 2023 14:54:42 +0800 Subject: [PATCH 066/120] Upgrade to 2.2.8 Signed-off-by: Gris Ge --- .gitignore | 2 ++ nmstate.spec | 8 ++++++-- sources | 6 +++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d7eca61..88e11b0 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,5 @@ /nmstate-2.2.4.tar.gz.asc /nmstate-2.2.5.tar.gz /nmstate-2.2.5.tar.gz.asc +/nmstate-2.2.8.tar.gz +/nmstate-2.2.8.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index 28cd03c..ca83ede 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.5 +Version: 2.2.8 Release: %autorelease Summary: Declarative network manager API License: LGPLv2+ @@ -29,7 +29,7 @@ BuildRequires: (crate(env_logger/default) >= 0.9 with crate(env_logger/default) BuildRequires: (crate(ipnet/default) >= 2.5 with crate(ipnet/default) < 3.0) BuildRequires: (crate(libc/default) >= 0.2 with crate(libc/default) < 0.3) BuildRequires: (crate(log/default) >= 0.4 with crate(log/default) < 0.5) -BuildRequires: (crate(nispor/default) >= 1.2.9 with crate(nispor/default) < 2.0) +BuildRequires: (crate(nispor/default) >= 1.2.10 with crate(nispor/default) < 2.0) BuildRequires: (crate(serde/default) >= 1.0 with crate(serde/default) < 2.0) BuildRequires: (crate(serde/derive) >= 1.0 with crate(serde/derive) < 2.0) BuildRequires: (crate(serde_json/default) >= 1.0 with crate(serde_json/default) < 2.0) @@ -164,6 +164,10 @@ pushd rust/src/python %py3_install popd +# cargo_install has problem on detecting library when running in workspace +# due to bug https://pagure.io/fedora-rust/cargo2rpm/issue/5 +# Removing the workspace Cargo.toml will workaround this problem. +rm rust/Cargo.toml pushd rust/src/lib %cargo_install popd diff --git a/sources b/sources index 52a9c4b..1ca1dd3 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (nmstate-2.2.5.tar.gz) = d768cb8ef3fcf00d1788cfa5b11b552e5d8516009bb5e8b4333b8a640b890e297f73f79c7a82016b727c9f9fff95451c7fc5b00adf7fddab05d034c8c687bce5 -SHA512 (nmstate-2.2.5.tar.gz.asc) = 2b712e932cfea1dd720ef13e9b8e9c44fd4a8b07fa422d4bd3cfe3571ca8bfc7bbcf02f5f9984fde0053bcafd8b83574abf92892327f8ef5032b0d33b932be2a -SHA512 (nmstate.gpg) = b77a72ad4711b9d0c3b3a34520b4a9c4a367ecc4b89fad9221bf9f2963fc8b504dae688213a59e184c95e83e2e8773c6018acea8ecc13fc1ff5bb894c5223760 +SHA512 (nmstate.gpg) = 91c6b1d8aef4944520d4bdd4e90121bbbbaf772444f5eb6081cee81e17b21b66798437cdc09a117c6fc77c54d798aaa30400857aa090cb2102b47841f45cf6eb +SHA512 (nmstate-2.2.8.tar.gz) = ae13d09001794b002c26bf38892a8502c3b3519f56f0dd15a9d81e7590f3d49d52366b3d2d872dc634c97af2cee8c6866c173dd8f915291702192a487b565213 +SHA512 (nmstate-2.2.8.tar.gz.asc) = 1da865d78cf907300c302d3fbb208d29e8139d5d59adc662c0885e7882c396de72b7172df9bee35acb8f71b15e76259edbac5bb5972d7d359abfbee1e9fe437e From aebe3709e886808c70a982885ba2f3f776dfb460 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Wed, 22 Mar 2023 16:22:26 +0800 Subject: [PATCH 067/120] Enable packit Signed-off-by: Gris Ge --- .packit.yaml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .packit.yaml diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..cd4cca0 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,29 @@ +--- +downstream_package_name: nmstate +upstream_project_url: https://github.com/nmstate/nmstate +issue_repository: https://github.com/nmstate/nmstate +update_release: false +upstream_package_name: nmstate +upstream_tag_template: v{version} +copy_upstream_release_description: true + +jobs: + # This is triggered by https://release-monitoring.org/ + - job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-all + + # This is triggered at Fedora dist-git for creating koji build after + # PR in src.fedoraproject.org been merged. + - job: koji_build + trigger: commit + allowed_pr_authors: ["packit-stg", "packit"] + dist_git_branches: + - fedora-all + + # This is triggered at Fedora messaging bus about koji build finished. + - job: bodhi_update + trigger: commit + dist_git_branches: + - fedora-branched From bea67c799a6b106362655568e40bf4cc08913a72 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Thu, 23 Mar 2023 21:53:05 +0800 Subject: [PATCH 068/120] Upgrade to 2.2.9 Signed-off-by: Gris Ge --- .gitignore | 2 + ...rade-to-nix-0.26-and-env_logger-0.10.patch | 71 +++++++++++++++++++ nmstate.spec | 7 +- sources | 4 +- 4 files changed, 79 insertions(+), 5 deletions(-) create mode 100644 0002-Upgrade-to-nix-0.26-and-env_logger-0.10.patch diff --git a/.gitignore b/.gitignore index 88e11b0..7f1d57a 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,5 @@ /nmstate-2.2.5.tar.gz.asc /nmstate-2.2.8.tar.gz /nmstate-2.2.8.tar.gz.asc +/nmstate-2.2.9.tar.gz +/nmstate-2.2.9.tar.gz.asc diff --git a/0002-Upgrade-to-nix-0.26-and-env_logger-0.10.patch b/0002-Upgrade-to-nix-0.26-and-env_logger-0.10.patch new file mode 100644 index 0000000..5281828 --- /dev/null +++ b/0002-Upgrade-to-nix-0.26-and-env_logger-0.10.patch @@ -0,0 +1,71 @@ +From f9d3f0cdcabfa18d465068508d7b69b2a65823bc Mon Sep 17 00:00:00 2001 +From: Gris Ge +Date: Thu, 23 Mar 2023 21:35:08 +0800 +Subject: [PATCH] dependency: Upgrade to nix 0.26 and env_logger 0.10 + +Signed-off-by: Gris Ge +--- + rust/src/cli/Cargo.toml | 2 +- + rust/src/lib/Cargo.toml | 2 +- + rust/src/lib/nispor/hostname.rs | 14 +++++++++----- + 3 files changed, 11 insertions(+), 7 deletions(-) + +diff --git a/rust/src/cli/Cargo.toml b/rust/src/cli/Cargo.toml +index 350c9fcc..2902804a 100644 +--- a/rust/src/cli/Cargo.toml ++++ b/rust/src/cli/Cargo.toml +@@ -21,7 +21,7 @@ nmstate = {path = "../lib", version = "2.2", default-features = false} + serde_yaml = "0.9" + clap = { version = "3.1", features = ["cargo"] } + serde = { version = "1.0", features = ["derive"] } +-env_logger = "0.9.0" ++env_logger = "0.10.0" + log = "0.4.14" + serde_json = "1.0.75" + ctrlc = { version = "3.2.1", optional = true } +diff --git a/rust/src/lib/Cargo.toml b/rust/src/lib/Cargo.toml +index 721fe6a3..4a6b6b3e 100644 +--- a/rust/src/lib/Cargo.toml ++++ b/rust/src/lib/Cargo.toml +@@ -55,7 +55,7 @@ default-features = false + features = ["derive"] + + [dependencies.nix] +-version = "0.24.1" ++version = "0.26.0" + optional = true + default-features = false + features = ["feature", "hostname"] +diff --git a/rust/src/lib/nispor/hostname.rs b/rust/src/lib/nispor/hostname.rs +index 517bf7c7..5e9f1ba8 100644 +--- a/rust/src/lib/nispor/hostname.rs ++++ b/rust/src/lib/nispor/hostname.rs +@@ -1,3 +1,5 @@ ++// SPDX-License-Identifier: Apache-2.0 ++ + use std::io::Read; + + use crate::{ErrorKind, HostNameState, NmstateError}; +@@ -5,12 +7,14 @@ use crate::{ErrorKind, HostNameState, NmstateError}; + const HOST_NAME_MAX: usize = 64; + + pub(crate) fn get_hostname_state() -> Option { +- let mut buffer = [0u8; HOST_NAME_MAX]; +- let running = match nix::unistd::gethostname(&mut buffer) { ++ let running = match nix::unistd::gethostname() { + Ok(hostname_cstr) => match hostname_cstr.to_str() { +- Ok(h) => Some(h.to_string()), +- Err(e) => { +- log::error!("Failed to convert hostname to String: {}", e); ++ Some(h) => Some(h.to_string()), ++ None => { ++ log::error!( ++ "Failed to convert hostname from OsString \ ++ to String: {hostname_cstr:?}" ++ ); + None + } + }, +-- +2.40.0 + diff --git a/nmstate.spec b/nmstate.spec index ca83ede..be2a230 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.8 +Version: 2.2.9 Release: %autorelease Summary: Declarative network manager API License: LGPLv2+ @@ -14,6 +14,7 @@ Source2: https://nmstate.io/nmstate.gpg # https://bugzilla.redhat.com/show_bug.cgi?id=2161128 # but list Requires manually Patch1: 0001-Workaround-for-Fedora-rust-packaging.patch +Patch2: 0002-Upgrade-to-nix-0.26-and-env_logger-0.10.patch BuildRequires: patchelf BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -25,7 +26,7 @@ BuildRequires: (crate(clap/cargo) >= 3.1 with crate(clap/cargo) < 4.0) BuildRequires: (crate(clap/default) >= 3.1 with crate(clap/default) < 4.0) BuildRequires: (crate(chrono/default) >= 0.4 with crate(chrono/default) < 0.5) BuildRequires: (crate(ctrlc/default) >= 3.2 with crate(ctrlc/default) < 4.0) -BuildRequires: (crate(env_logger/default) >= 0.9 with crate(env_logger/default) < 1.0) +BuildRequires: (crate(env_logger/default) >= 0.10 with crate(env_logger/default) < 0.11) BuildRequires: (crate(ipnet/default) >= 2.5 with crate(ipnet/default) < 3.0) BuildRequires: (crate(libc/default) >= 0.2 with crate(libc/default) < 0.3) BuildRequires: (crate(log/default) >= 0.4 with crate(log/default) < 0.5) @@ -38,7 +39,7 @@ BuildRequires: (crate(uuid/v4) >= 1.1 with crate(uuid/v4) < 2.0) BuildRequires: (crate(uuid/v5) >= 1.1 with crate(uuid/v5) < 2.0) BuildRequires: (crate(zbus/default) >= 1.9 with crate(zbus/default) < 2.0) BuildRequires: (crate(zvariant/default) >= 2.10 with crate(zvariant/default) < 3.0) -BuildRequires: (crate(nix/default) >= 0.24 with crate(nix/default) < 0.25) +BuildRequires: (crate(nix/default) >= 0.26 with crate(nix/default) < 0.27) %description Nmstate is a library with an accompanying command line tool that manages host diff --git a/sources b/sources index 1ca1dd3..898443e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (nmstate.gpg) = 91c6b1d8aef4944520d4bdd4e90121bbbbaf772444f5eb6081cee81e17b21b66798437cdc09a117c6fc77c54d798aaa30400857aa090cb2102b47841f45cf6eb -SHA512 (nmstate-2.2.8.tar.gz) = ae13d09001794b002c26bf38892a8502c3b3519f56f0dd15a9d81e7590f3d49d52366b3d2d872dc634c97af2cee8c6866c173dd8f915291702192a487b565213 -SHA512 (nmstate-2.2.8.tar.gz.asc) = 1da865d78cf907300c302d3fbb208d29e8139d5d59adc662c0885e7882c396de72b7172df9bee35acb8f71b15e76259edbac5bb5972d7d359abfbee1e9fe437e +SHA512 (nmstate-2.2.9.tar.gz) = 117ed9a903be298691883b87b0727d4bddb6dfb744023611e645c87602bfec578008db38d21dde4279dc8ff2dc7b0838ab35248ddb5e250484cc694003f93094 +SHA512 (nmstate-2.2.9.tar.gz.asc) = 1bcde90966d188d94ef02c6d4b00f8cb63f6d4e0115c4f1900d13eb4b59c9fd21891b7eaea7e240465899b281c8e4ea340b7ce6326c217b6eede0cca8859425e From 3128e422e0a977b5d2c8fd24b87bd90873619dea Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Sun, 23 Apr 2023 18:51:18 +0800 Subject: [PATCH 069/120] Upgrade to 2.2.10 Signed-off-by: Gris Ge --- .gitignore | 2 + ...rade-to-nix-0.26-and-env_logger-0.10.patch | 71 ---------- 0002-fix_nix_deps.patch | 124 ++++++++++++++++++ nmstate.spec | 4 +- sources | 6 +- 5 files changed, 131 insertions(+), 76 deletions(-) delete mode 100644 0002-Upgrade-to-nix-0.26-and-env_logger-0.10.patch create mode 100644 0002-fix_nix_deps.patch diff --git a/.gitignore b/.gitignore index 7f1d57a..68a590c 100644 --- a/.gitignore +++ b/.gitignore @@ -91,3 +91,5 @@ /nmstate-2.2.8.tar.gz.asc /nmstate-2.2.9.tar.gz /nmstate-2.2.9.tar.gz.asc +/nmstate-2.2.10.tar.gz +/nmstate-2.2.10.tar.gz.asc diff --git a/0002-Upgrade-to-nix-0.26-and-env_logger-0.10.patch b/0002-Upgrade-to-nix-0.26-and-env_logger-0.10.patch deleted file mode 100644 index 5281828..0000000 --- a/0002-Upgrade-to-nix-0.26-and-env_logger-0.10.patch +++ /dev/null @@ -1,71 +0,0 @@ -From f9d3f0cdcabfa18d465068508d7b69b2a65823bc Mon Sep 17 00:00:00 2001 -From: Gris Ge -Date: Thu, 23 Mar 2023 21:35:08 +0800 -Subject: [PATCH] dependency: Upgrade to nix 0.26 and env_logger 0.10 - -Signed-off-by: Gris Ge ---- - rust/src/cli/Cargo.toml | 2 +- - rust/src/lib/Cargo.toml | 2 +- - rust/src/lib/nispor/hostname.rs | 14 +++++++++----- - 3 files changed, 11 insertions(+), 7 deletions(-) - -diff --git a/rust/src/cli/Cargo.toml b/rust/src/cli/Cargo.toml -index 350c9fcc..2902804a 100644 ---- a/rust/src/cli/Cargo.toml -+++ b/rust/src/cli/Cargo.toml -@@ -21,7 +21,7 @@ nmstate = {path = "../lib", version = "2.2", default-features = false} - serde_yaml = "0.9" - clap = { version = "3.1", features = ["cargo"] } - serde = { version = "1.0", features = ["derive"] } --env_logger = "0.9.0" -+env_logger = "0.10.0" - log = "0.4.14" - serde_json = "1.0.75" - ctrlc = { version = "3.2.1", optional = true } -diff --git a/rust/src/lib/Cargo.toml b/rust/src/lib/Cargo.toml -index 721fe6a3..4a6b6b3e 100644 ---- a/rust/src/lib/Cargo.toml -+++ b/rust/src/lib/Cargo.toml -@@ -55,7 +55,7 @@ default-features = false - features = ["derive"] - - [dependencies.nix] --version = "0.24.1" -+version = "0.26.0" - optional = true - default-features = false - features = ["feature", "hostname"] -diff --git a/rust/src/lib/nispor/hostname.rs b/rust/src/lib/nispor/hostname.rs -index 517bf7c7..5e9f1ba8 100644 ---- a/rust/src/lib/nispor/hostname.rs -+++ b/rust/src/lib/nispor/hostname.rs -@@ -1,3 +1,5 @@ -+// SPDX-License-Identifier: Apache-2.0 -+ - use std::io::Read; - - use crate::{ErrorKind, HostNameState, NmstateError}; -@@ -5,12 +7,14 @@ use crate::{ErrorKind, HostNameState, NmstateError}; - const HOST_NAME_MAX: usize = 64; - - pub(crate) fn get_hostname_state() -> Option { -- let mut buffer = [0u8; HOST_NAME_MAX]; -- let running = match nix::unistd::gethostname(&mut buffer) { -+ let running = match nix::unistd::gethostname() { - Ok(hostname_cstr) => match hostname_cstr.to_str() { -- Ok(h) => Some(h.to_string()), -- Err(e) => { -- log::error!("Failed to convert hostname to String: {}", e); -+ Some(h) => Some(h.to_string()), -+ None => { -+ log::error!( -+ "Failed to convert hostname from OsString \ -+ to String: {hostname_cstr:?}" -+ ); - None - } - }, --- -2.40.0 - diff --git a/0002-fix_nix_deps.patch b/0002-fix_nix_deps.patch new file mode 100644 index 0000000..e9dfd1d --- /dev/null +++ b/0002-fix_nix_deps.patch @@ -0,0 +1,124 @@ +From 4fc0b3e09ad892e2b2da975b6786998729511ac6 Mon Sep 17 00:00:00 2001 +From: Gris Ge +Date: Sun, 23 Apr 2023 17:37:00 +0800 +Subject: [PATCH 1/2] dep: Upgrade to nix 0.26.2 + +Signed-off-by: Gris Ge +--- + rust/src/lib/Cargo.toml | 2 +- + rust/src/lib/nispor/hostname.rs | 15 ++++++++------- + 2 files changed, 9 insertions(+), 8 deletions(-) + +diff --git a/rust/src/lib/Cargo.toml b/rust/src/lib/Cargo.toml +index 29fe4c34..1a4e96c4 100644 +--- a/rust/src/lib/Cargo.toml ++++ b/rust/src/lib/Cargo.toml +@@ -55,7 +55,7 @@ default-features = false + features = ["derive"] + + [dependencies.nix] +-version = "0.24.1" ++version = "0.26.2" + optional = true + default-features = false + features = ["feature", "hostname"] +diff --git a/rust/src/lib/nispor/hostname.rs b/rust/src/lib/nispor/hostname.rs +index 517bf7c7..b96fb3f3 100644 +--- a/rust/src/lib/nispor/hostname.rs ++++ b/rust/src/lib/nispor/hostname.rs +@@ -1,3 +1,5 @@ ++// SPDX-License-Identifier: Apache-2.0 ++ + use std::io::Read; + + use crate::{ErrorKind, HostNameState, NmstateError}; +@@ -5,17 +7,16 @@ use crate::{ErrorKind, HostNameState, NmstateError}; + const HOST_NAME_MAX: usize = 64; + + pub(crate) fn get_hostname_state() -> Option { +- let mut buffer = [0u8; HOST_NAME_MAX]; +- let running = match nix::unistd::gethostname(&mut buffer) { +- Ok(hostname_cstr) => match hostname_cstr.to_str() { +- Ok(h) => Some(h.to_string()), +- Err(e) => { +- log::error!("Failed to convert hostname to String: {}", e); ++ let running = match nix::unistd::gethostname() { ++ Ok(hostname_cstr) => match hostname_cstr.into_string() { ++ Ok(h) => Some(h), ++ Err(s) => { ++ log::error!("Failed to convert hostname to String: {:?}", s); + None + } + }, + Err(e) => { +- log::error!("Failed to get hostname: {}", e); ++ log::error!("Failed to get hostname {}", e); + None + } + }; +-- +2.40.0 + + +From c9fd1e80d3c87e1f844edcd86e9d36ae499ce717 Mon Sep 17 00:00:00 2001 +From: Gris Ge +Date: Sun, 23 Apr 2023 16:01:29 +0800 +Subject: [PATCH 2/2] cli: Do nothing for `persist-nic-names` when got + `net.ifnames=0` + +When `net.ifnames=0` is defined in kernel argument, systemd will disable +the predicable network interface name which make no sense for nmstate to +pin the interface names. Hence we do nothing in `persist-nic-names` in +that case. + +Manually tested in CentOS stream 9 VM. + +Signed-off-by: Gris Ge +--- + rust/src/cli/persist_nic.rs | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/rust/src/cli/persist_nic.rs b/rust/src/cli/persist_nic.rs +index 6b126d58..61b07dbb 100644 +--- a/rust/src/cli/persist_nic.rs ++++ b/rust/src/cli/persist_nic.rs +@@ -7,6 +7,8 @@ + //! + //! The logic currently is: + //! ++//! - Do nothing if kernel argument contains `net.ifnames=0` which disabled the ++//! predicable network interface name, hence not fit our use case here. + //! - Iterate over all active NICs + //! - Pin every ethernet interface to its MAC address (prefer permanent MAC + //! address) +@@ -70,6 +72,14 @@ pub(crate) fn run_persist_immediately( + PersistAction::CleanUpDryRun => return clean_up(root, true), + }; + ++ if is_prediable_ifname_disabled() { ++ log::info!( ++ "Systemd predicable network interface name is disabled \ ++ by kernel argument `net.ifnames=0`, will do nothing" ++ ); ++ return Ok("".to_string()); ++ } ++ + let stamp_path = Path::new(root) + .join(SYSTEMD_NETWORK_LINK_FOLDER) + .join(NMSTATE_PERSIST_STAMP); +@@ -317,3 +327,12 @@ fn is_nmstate_generated_systemd_link_file(file_path: &PathBuf) -> bool { + .map(|_| buff == PERSIST_GENERATED_BY.as_bytes()) + .unwrap_or_default() + } ++ ++const KERNEL_CMDLINE_FILE: &str = "/proc/cmdline"; ++ ++fn is_prediable_ifname_disabled() -> bool { ++ std::fs::read(KERNEL_CMDLINE_FILE) ++ .map(|v| String::from_utf8(v).unwrap_or_default()) ++ .map(|c| c.contains("net.ifnames=0")) ++ .unwrap_or_default() ++} +-- +2.40.0 + diff --git a/nmstate.spec b/nmstate.spec index be2a230..609500e 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.9 +Version: 2.2.10 Release: %autorelease Summary: Declarative network manager API License: LGPLv2+ @@ -14,7 +14,7 @@ Source2: https://nmstate.io/nmstate.gpg # https://bugzilla.redhat.com/show_bug.cgi?id=2161128 # but list Requires manually Patch1: 0001-Workaround-for-Fedora-rust-packaging.patch -Patch2: 0002-Upgrade-to-nix-0.26-and-env_logger-0.10.patch +Patch2: 0002-fix_nix_deps.patch BuildRequires: patchelf BuildRequires: python3-devel BuildRequires: python3-setuptools diff --git a/sources b/sources index 898443e..69439ce 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (nmstate.gpg) = 91c6b1d8aef4944520d4bdd4e90121bbbbaf772444f5eb6081cee81e17b21b66798437cdc09a117c6fc77c54d798aaa30400857aa090cb2102b47841f45cf6eb -SHA512 (nmstate-2.2.9.tar.gz) = 117ed9a903be298691883b87b0727d4bddb6dfb744023611e645c87602bfec578008db38d21dde4279dc8ff2dc7b0838ab35248ddb5e250484cc694003f93094 -SHA512 (nmstate-2.2.9.tar.gz.asc) = 1bcde90966d188d94ef02c6d4b00f8cb63f6d4e0115c4f1900d13eb4b59c9fd21891b7eaea7e240465899b281c8e4ea340b7ce6326c217b6eede0cca8859425e +SHA512 (nmstate-2.2.10.tar.gz) = dc103f30ea3c9326cca5e67cf271b057db7c8cbf756241b8d8d66351e61824c2b002b3922d63779206748c62945688e9823b499e4fcc41c882c68b8692e86af6 +SHA512 (nmstate-2.2.10.tar.gz.asc) = 1923e59420d62a98a471b05fe6c73767d887f1b227c9cdc3ed1bb9ed7dda986a082ccc4e31d7224b4f79c482bb548939920719b73ed657bb33e8bd60a4ff8ef6 +SHA512 (nmstate.gpg) = 8c0188d64660757030772096b3e836f354dbf1f3591bebd1b588aa8abef9c2e37996904e6edb8ee8797afb57237f29dd942a2ceffd24dac50af9e898c0b48c97 From 8aef716a1a6a8c55e091173c7de1fd6ab743f70c Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Sun, 23 Apr 2023 18:55:29 +0800 Subject: [PATCH 070/120] Auto build once patch from cathay4t merged got dist-git Signed-off-by: Gris Ge --- .packit.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.packit.yaml b/.packit.yaml index cd4cca0..a8f4700 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -18,7 +18,7 @@ jobs: # PR in src.fedoraproject.org been merged. - job: koji_build trigger: commit - allowed_pr_authors: ["packit-stg", "packit"] + allowed_pr_authors: ["packit-stg", "packit", "cathay4t"] dist_git_branches: - fedora-all From e8c90904f8b90a7d8894f930e8ddc0abaf1acbd6 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Tue, 25 Apr 2023 14:18:11 +0800 Subject: [PATCH 071/120] Fix error when DHCP on with auto address on STP enabled bridge Signed-off-by: Gris Ge --- ...n-DHCP-with-auto-IP-address-on-STP-e.patch | 67 +++++++++++++++++++ nmstate.spec | 2 + 2 files changed, 69 insertions(+) create mode 100644 0003-Fix-error-when-DHCP-with-auto-IP-address-on-STP-e.patch diff --git a/0003-Fix-error-when-DHCP-with-auto-IP-address-on-STP-e.patch b/0003-Fix-error-when-DHCP-with-auto-IP-address-on-STP-e.patch new file mode 100644 index 0000000..9424326 --- /dev/null +++ b/0003-Fix-error-when-DHCP-with-auto-IP-address-on-STP-e.patch @@ -0,0 +1,67 @@ +From 333e82445c048812e3e85fb9f3cb7558dc3f2aeb Mon Sep 17 00:00:00 2001 +From: Gris Ge +Date: Tue, 25 Apr 2023 14:10:34 +0800 +Subject: [PATCH] ip: Fix error when DHCP with auto IP address on STP enabled + bridge + +When DHCP enabled with auto IP address on STP enabled bridge, nmstate +will fail with verification error: + + Verification failure: br0.interface.ipv4.address desire '[]', + current 'null' + +The root cause is STP suspended the DHCP action which cause current +state shows null IP address. And nmstate incorrectly treat [] != null +for IP address. + +Fixed in `sanitize_current_for_verify()` to set empty array if None. + +To reproduce this problem, we just enable DHCP with auto IP address +where no DHCP server exists. Integration test case included. + +Signed-off-by: Gris Ge +--- + rust/src/lib/query_apply/ip.rs | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/rust/src/lib/query_apply/ip.rs b/rust/src/lib/query_apply/ip.rs +index b2d6ac49..a6df740b 100644 +--- a/rust/src/lib/query_apply/ip.rs ++++ b/rust/src/lib/query_apply/ip.rs +@@ -12,6 +12,11 @@ impl InterfaceIpv4 { + if self.dhcp_custom_hostname.is_none() { + self.dhcp_custom_hostname = Some(String::new()); + } ++ ++ // No IP address means empty. ++ if self.enabled && self.addresses.is_none() { ++ self.addresses = Some(Vec::new()); ++ } + } + + // Sort addresses and dedup +@@ -89,6 +94,11 @@ impl InterfaceIpv6 { + if self.dhcp_custom_hostname.is_none() { + self.dhcp_custom_hostname = Some(String::new()); + } ++ ++ // No IP address means empty. ++ if self.enabled && self.addresses.is_none() { ++ self.addresses = Some(Vec::new()); ++ } + } + + // Sort addresses and dedup +@@ -96,9 +106,6 @@ impl InterfaceIpv6 { + if let Some(addrs) = self.addresses.as_mut() { + addrs.sort_unstable(); + addrs.dedup(); +- if addrs.is_empty() { +- self.addresses = None; +- } + } + } + pub(crate) fn update(&mut self, other: &Self) { +-- +2.40.0 + diff --git a/nmstate.spec b/nmstate.spec index 609500e..e6c407c 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -15,6 +15,8 @@ Source2: https://nmstate.io/nmstate.gpg # but list Requires manually Patch1: 0001-Workaround-for-Fedora-rust-packaging.patch Patch2: 0002-fix_nix_deps.patch +# https://github.com/coreos/fedora-coreos-tracker/issues/1480 +Patch3: 0003-Fix-error-when-DHCP-with-auto-IP-address-on-STP-e.patch BuildRequires: patchelf BuildRequires: python3-devel BuildRequires: python3-setuptools From b3eb28c7dfb50aaa4020bcc77ad05c52eddda47b Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 3 May 2023 16:32:54 +0200 Subject: [PATCH 072/120] Rebuild for tokio crate >= v1.24.2 (RUSTSEC-2023-0005) From 6cdd9e7aa52f6ec673a5285927a502ca3bb89ed8 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 30 May 2023 12:57:00 -0400 Subject: [PATCH 073/120] Use vendored deps for RHEL builds RHEL does not provide individual Rust dependencies as separate packages. Signed-off-by: Yaakov Selkowitz --- .gitignore | 1 + nmstate.spec | 15 +++++++++++++++ sources | 1 + 3 files changed, 17 insertions(+) diff --git a/.gitignore b/.gitignore index 68a590c..492aa6b 100644 --- a/.gitignore +++ b/.gitignore @@ -93,3 +93,4 @@ /nmstate-2.2.9.tar.gz.asc /nmstate-2.2.10.tar.gz /nmstate-2.2.10.tar.gz.asc +/nmstate-vendor-2.2.10.tar.xz diff --git a/nmstate.spec b/nmstate.spec index e6c407c..bb06fbd 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -10,6 +10,7 @@ URL: https://github.com/%{srcname}/%{srcname} Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc Source2: https://nmstate.io/nmstate.gpg +Source3: %{url}/releases/download/v%{version}/%{srcname}-vendor-%{version}.tar.xz # We use `dep: dep_name` to prevent rust packaging generate incorect dependency # https://bugzilla.redhat.com/show_bug.cgi?id=2161128 # but list Requires manually @@ -23,6 +24,9 @@ BuildRequires: python3-setuptools BuildRequires: gnupg2 BuildRequires: systemd-devel BuildRequires: systemd-rpm-macros +%if 0%{?rhel} +BuildRequires: rust-toolset +%else BuildRequires: rust-packaging BuildRequires: (crate(clap/cargo) >= 3.1 with crate(clap/cargo) < 4.0) BuildRequires: (crate(clap/default) >= 3.1 with crate(clap/default) < 4.0) @@ -42,6 +46,7 @@ BuildRequires: (crate(uuid/v5) >= 1.1 with crate(uuid/v5) < 2.0) BuildRequires: (crate(zbus/default) >= 1.9 with crate(zbus/default) < 2.0) BuildRequires: (crate(zvariant/default) >= 2.10 with crate(zvariant/default) < 3.0) BuildRequires: (crate(nix/default) >= 0.26 with crate(nix/default) < 0.27) +%endif %description Nmstate is a library with an accompanying command line tool that manages host @@ -98,6 +103,7 @@ Obsoletes: nmstate-plugin-ovsdb < 2.0-1 %description -n python3-%{libname} This package contains the Python 3 library for Nmstate. +%if ! 0%{?rhel} %package -n rust-%{name}-devel Summary: Rust crate of nmstate BuildArch: noarch @@ -133,6 +139,7 @@ Requires: (crate(zbus/default) >= 1.9 with crate(zbus/default) < 2.0) %description -n rust-%{name}+query_apply-devel This package contains library source intended for building other packages which use "%{name}" crate with query_apply feature. +%endif %prep gpg2 --import --import-options import-export,import-minimal \ @@ -142,7 +149,11 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} pushd rust rm .cargo/config.toml +%if 0%{?rhel} +%cargo_prep -V 3 +%else %cargo_prep +%endif popd %build @@ -167,6 +178,7 @@ pushd rust/src/python %py3_install popd +%if ! 0%{?rhel} # cargo_install has problem on detecting library when running in workspace # due to bug https://pagure.io/fedora-rust/cargo2rpm/issue/5 # Removing the workspace Cargo.toml will workaround this problem. @@ -174,6 +186,7 @@ rm rust/Cargo.toml pushd rust/src/lib %cargo_install popd +%endif %files %doc README.md @@ -203,6 +216,7 @@ popd %files static %{_libdir}/libnmstate.a +%if ! 0%{?rhel} %files -n rust-%{name}-devel %license LICENSE %{cargo_registry}/%{name}-%{version}/ @@ -215,6 +229,7 @@ popd %files -n rust-%{name}+query_apply-devel %ghost %{cargo_registry}/%{name}-%{version}/Cargo.toml +%endif %changelog %autochangelog diff --git a/sources b/sources index 69439ce..222589b 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ SHA512 (nmstate-2.2.10.tar.gz) = dc103f30ea3c9326cca5e67cf271b057db7c8cbf756241b8d8d66351e61824c2b002b3922d63779206748c62945688e9823b499e4fcc41c882c68b8692e86af6 SHA512 (nmstate-2.2.10.tar.gz.asc) = 1923e59420d62a98a471b05fe6c73767d887f1b227c9cdc3ed1bb9ed7dda986a082ccc4e31d7224b4f79c482bb548939920719b73ed657bb33e8bd60a4ff8ef6 SHA512 (nmstate.gpg) = 8c0188d64660757030772096b3e836f354dbf1f3591bebd1b588aa8abef9c2e37996904e6edb8ee8797afb57237f29dd942a2ceffd24dac50af9e898c0b48c97 +SHA512 (nmstate-vendor-2.2.10.tar.xz) = 3e8f182d4850982dec7ffbf3bf77e7d76b96c3d4d4b24097aba8518a9f6562eaa94c69bc6d870c6fd4f2279652bf2b6c3c6dd48034b4d80432e9717e1be925e5 From 85faae152b6b47e34cb5a72f8ff466ccf2c82a15 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 1 Jun 2023 22:49:03 +0000 Subject: [PATCH 074/120] [packit] 2.2.12 upstream release Upstream tag: v2.2.12 Upstream commit: 71dd2292 --- .gitignore | 3 +++ README.packit | 3 +++ nmstate.spec | 2 +- sources | 6 +++--- 4 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 README.packit diff --git a/.gitignore b/.gitignore index 492aa6b..331513a 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,6 @@ /nmstate-2.2.10.tar.gz /nmstate-2.2.10.tar.gz.asc /nmstate-vendor-2.2.10.tar.xz +/nmstate-2.2.12.tar.gz +/nmstate-2.2.12.tar.gz.asc +/nmstate-vendor-2.2.12.tar.xz diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..01582f6 --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.76.0. diff --git a/nmstate.spec b/nmstate.spec index bb06fbd..91ae9e0 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.10 +Version: 2.2.12 Release: %autorelease Summary: Declarative network manager API License: LGPLv2+ diff --git a/sources b/sources index 222589b..fd7b9a0 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (nmstate-2.2.10.tar.gz) = dc103f30ea3c9326cca5e67cf271b057db7c8cbf756241b8d8d66351e61824c2b002b3922d63779206748c62945688e9823b499e4fcc41c882c68b8692e86af6 -SHA512 (nmstate-2.2.10.tar.gz.asc) = 1923e59420d62a98a471b05fe6c73767d887f1b227c9cdc3ed1bb9ed7dda986a082ccc4e31d7224b4f79c482bb548939920719b73ed657bb33e8bd60a4ff8ef6 +SHA512 (nmstate-2.2.12.tar.gz) = ed4b786242a2273877d58be1495fd24c9a171b814e1b9de0363c6cd52d92cea8836ce9be81c2c5371d9f846e7192f83a53d0a0b7a2c85bf63b3a20035c9b8db3 +SHA512 (nmstate-2.2.12.tar.gz.asc) = 915228c73fb69c43cf53cd89547dcfa750d67a06e722c3664d0c6421bad2a9db38b02825042649a1cd3c20a48c2c5fb119eb8dfbfe36ba32115d1b387023a5b6 SHA512 (nmstate.gpg) = 8c0188d64660757030772096b3e836f354dbf1f3591bebd1b588aa8abef9c2e37996904e6edb8ee8797afb57237f29dd942a2ceffd24dac50af9e898c0b48c97 -SHA512 (nmstate-vendor-2.2.10.tar.xz) = 3e8f182d4850982dec7ffbf3bf77e7d76b96c3d4d4b24097aba8518a9f6562eaa94c69bc6d870c6fd4f2279652bf2b6c3c6dd48034b4d80432e9717e1be925e5 +SHA512 (nmstate-vendor-2.2.12.tar.xz) = 2dfae50d1ea44896570cd778615c165f0345e74f7ed07128364b82396db630a8811d9fd034f4d632bcafdb64b09345e35c5f3ecb48c997946a716a2c4498f0fe From 898940fd2137c3031e93726840546b58851ced37 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Mon, 5 Jun 2023 16:25:38 +0800 Subject: [PATCH 075/120] New gpg public key and remove unused patches Signed-off-by: Gris Ge --- 0002-fix_nix_deps.patch | 124 ------------------ ...n-DHCP-with-auto-IP-address-on-STP-e.patch | 67 ---------- nmstate.spec | 3 - sources | 2 +- 4 files changed, 1 insertion(+), 195 deletions(-) delete mode 100644 0002-fix_nix_deps.patch delete mode 100644 0003-Fix-error-when-DHCP-with-auto-IP-address-on-STP-e.patch diff --git a/0002-fix_nix_deps.patch b/0002-fix_nix_deps.patch deleted file mode 100644 index e9dfd1d..0000000 --- a/0002-fix_nix_deps.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 4fc0b3e09ad892e2b2da975b6786998729511ac6 Mon Sep 17 00:00:00 2001 -From: Gris Ge -Date: Sun, 23 Apr 2023 17:37:00 +0800 -Subject: [PATCH 1/2] dep: Upgrade to nix 0.26.2 - -Signed-off-by: Gris Ge ---- - rust/src/lib/Cargo.toml | 2 +- - rust/src/lib/nispor/hostname.rs | 15 ++++++++------- - 2 files changed, 9 insertions(+), 8 deletions(-) - -diff --git a/rust/src/lib/Cargo.toml b/rust/src/lib/Cargo.toml -index 29fe4c34..1a4e96c4 100644 ---- a/rust/src/lib/Cargo.toml -+++ b/rust/src/lib/Cargo.toml -@@ -55,7 +55,7 @@ default-features = false - features = ["derive"] - - [dependencies.nix] --version = "0.24.1" -+version = "0.26.2" - optional = true - default-features = false - features = ["feature", "hostname"] -diff --git a/rust/src/lib/nispor/hostname.rs b/rust/src/lib/nispor/hostname.rs -index 517bf7c7..b96fb3f3 100644 ---- a/rust/src/lib/nispor/hostname.rs -+++ b/rust/src/lib/nispor/hostname.rs -@@ -1,3 +1,5 @@ -+// SPDX-License-Identifier: Apache-2.0 -+ - use std::io::Read; - - use crate::{ErrorKind, HostNameState, NmstateError}; -@@ -5,17 +7,16 @@ use crate::{ErrorKind, HostNameState, NmstateError}; - const HOST_NAME_MAX: usize = 64; - - pub(crate) fn get_hostname_state() -> Option { -- let mut buffer = [0u8; HOST_NAME_MAX]; -- let running = match nix::unistd::gethostname(&mut buffer) { -- Ok(hostname_cstr) => match hostname_cstr.to_str() { -- Ok(h) => Some(h.to_string()), -- Err(e) => { -- log::error!("Failed to convert hostname to String: {}", e); -+ let running = match nix::unistd::gethostname() { -+ Ok(hostname_cstr) => match hostname_cstr.into_string() { -+ Ok(h) => Some(h), -+ Err(s) => { -+ log::error!("Failed to convert hostname to String: {:?}", s); - None - } - }, - Err(e) => { -- log::error!("Failed to get hostname: {}", e); -+ log::error!("Failed to get hostname {}", e); - None - } - }; --- -2.40.0 - - -From c9fd1e80d3c87e1f844edcd86e9d36ae499ce717 Mon Sep 17 00:00:00 2001 -From: Gris Ge -Date: Sun, 23 Apr 2023 16:01:29 +0800 -Subject: [PATCH 2/2] cli: Do nothing for `persist-nic-names` when got - `net.ifnames=0` - -When `net.ifnames=0` is defined in kernel argument, systemd will disable -the predicable network interface name which make no sense for nmstate to -pin the interface names. Hence we do nothing in `persist-nic-names` in -that case. - -Manually tested in CentOS stream 9 VM. - -Signed-off-by: Gris Ge ---- - rust/src/cli/persist_nic.rs | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/rust/src/cli/persist_nic.rs b/rust/src/cli/persist_nic.rs -index 6b126d58..61b07dbb 100644 ---- a/rust/src/cli/persist_nic.rs -+++ b/rust/src/cli/persist_nic.rs -@@ -7,6 +7,8 @@ - //! - //! The logic currently is: - //! -+//! - Do nothing if kernel argument contains `net.ifnames=0` which disabled the -+//! predicable network interface name, hence not fit our use case here. - //! - Iterate over all active NICs - //! - Pin every ethernet interface to its MAC address (prefer permanent MAC - //! address) -@@ -70,6 +72,14 @@ pub(crate) fn run_persist_immediately( - PersistAction::CleanUpDryRun => return clean_up(root, true), - }; - -+ if is_prediable_ifname_disabled() { -+ log::info!( -+ "Systemd predicable network interface name is disabled \ -+ by kernel argument `net.ifnames=0`, will do nothing" -+ ); -+ return Ok("".to_string()); -+ } -+ - let stamp_path = Path::new(root) - .join(SYSTEMD_NETWORK_LINK_FOLDER) - .join(NMSTATE_PERSIST_STAMP); -@@ -317,3 +327,12 @@ fn is_nmstate_generated_systemd_link_file(file_path: &PathBuf) -> bool { - .map(|_| buff == PERSIST_GENERATED_BY.as_bytes()) - .unwrap_or_default() - } -+ -+const KERNEL_CMDLINE_FILE: &str = "/proc/cmdline"; -+ -+fn is_prediable_ifname_disabled() -> bool { -+ std::fs::read(KERNEL_CMDLINE_FILE) -+ .map(|v| String::from_utf8(v).unwrap_or_default()) -+ .map(|c| c.contains("net.ifnames=0")) -+ .unwrap_or_default() -+} --- -2.40.0 - diff --git a/0003-Fix-error-when-DHCP-with-auto-IP-address-on-STP-e.patch b/0003-Fix-error-when-DHCP-with-auto-IP-address-on-STP-e.patch deleted file mode 100644 index 9424326..0000000 --- a/0003-Fix-error-when-DHCP-with-auto-IP-address-on-STP-e.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 333e82445c048812e3e85fb9f3cb7558dc3f2aeb Mon Sep 17 00:00:00 2001 -From: Gris Ge -Date: Tue, 25 Apr 2023 14:10:34 +0800 -Subject: [PATCH] ip: Fix error when DHCP with auto IP address on STP enabled - bridge - -When DHCP enabled with auto IP address on STP enabled bridge, nmstate -will fail with verification error: - - Verification failure: br0.interface.ipv4.address desire '[]', - current 'null' - -The root cause is STP suspended the DHCP action which cause current -state shows null IP address. And nmstate incorrectly treat [] != null -for IP address. - -Fixed in `sanitize_current_for_verify()` to set empty array if None. - -To reproduce this problem, we just enable DHCP with auto IP address -where no DHCP server exists. Integration test case included. - -Signed-off-by: Gris Ge ---- - rust/src/lib/query_apply/ip.rs | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/rust/src/lib/query_apply/ip.rs b/rust/src/lib/query_apply/ip.rs -index b2d6ac49..a6df740b 100644 ---- a/rust/src/lib/query_apply/ip.rs -+++ b/rust/src/lib/query_apply/ip.rs -@@ -12,6 +12,11 @@ impl InterfaceIpv4 { - if self.dhcp_custom_hostname.is_none() { - self.dhcp_custom_hostname = Some(String::new()); - } -+ -+ // No IP address means empty. -+ if self.enabled && self.addresses.is_none() { -+ self.addresses = Some(Vec::new()); -+ } - } - - // Sort addresses and dedup -@@ -89,6 +94,11 @@ impl InterfaceIpv6 { - if self.dhcp_custom_hostname.is_none() { - self.dhcp_custom_hostname = Some(String::new()); - } -+ -+ // No IP address means empty. -+ if self.enabled && self.addresses.is_none() { -+ self.addresses = Some(Vec::new()); -+ } - } - - // Sort addresses and dedup -@@ -96,9 +106,6 @@ impl InterfaceIpv6 { - if let Some(addrs) = self.addresses.as_mut() { - addrs.sort_unstable(); - addrs.dedup(); -- if addrs.is_empty() { -- self.addresses = None; -- } - } - } - pub(crate) fn update(&mut self, other: &Self) { --- -2.40.0 - diff --git a/nmstate.spec b/nmstate.spec index 91ae9e0..f079da0 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -15,9 +15,6 @@ Source3: %{url}/releases/download/v%{version}/%{srcname}-vendor-%{version # https://bugzilla.redhat.com/show_bug.cgi?id=2161128 # but list Requires manually Patch1: 0001-Workaround-for-Fedora-rust-packaging.patch -Patch2: 0002-fix_nix_deps.patch -# https://github.com/coreos/fedora-coreos-tracker/issues/1480 -Patch3: 0003-Fix-error-when-DHCP-with-auto-IP-address-on-STP-e.patch BuildRequires: patchelf BuildRequires: python3-devel BuildRequires: python3-setuptools diff --git a/sources b/sources index fd7b9a0..4b6da29 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (nmstate-2.2.12.tar.gz) = ed4b786242a2273877d58be1495fd24c9a171b814e1b9de0363c6cd52d92cea8836ce9be81c2c5371d9f846e7192f83a53d0a0b7a2c85bf63b3a20035c9b8db3 SHA512 (nmstate-2.2.12.tar.gz.asc) = 915228c73fb69c43cf53cd89547dcfa750d67a06e722c3664d0c6421bad2a9db38b02825042649a1cd3c20a48c2c5fb119eb8dfbfe36ba32115d1b387023a5b6 -SHA512 (nmstate.gpg) = 8c0188d64660757030772096b3e836f354dbf1f3591bebd1b588aa8abef9c2e37996904e6edb8ee8797afb57237f29dd942a2ceffd24dac50af9e898c0b48c97 +SHA512 (nmstate.gpg) = bfbf3620045f3c1f15eaf6877fd7407834a75d2650976f2327abd02ddb910aa34500f07a774dd17023c43dcba42a0ffc66f23cd6816fd9694acad2c5eed9e8d3 SHA512 (nmstate-vendor-2.2.12.tar.xz) = 2dfae50d1ea44896570cd778615c165f0345e74f7ed07128364b82396db630a8811d9fd034f4d632bcafdb64b09345e35c5f3ecb48c997946a716a2c4498f0fe From e59491ce94fb7661b33b15473fca90b0126b3304 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 14 Jun 2023 00:43:02 +0200 Subject: [PATCH 076/120] Rebuilt for Python 3.12 From f0da2019bb69cc598508adf8f06cab0bd29c681c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 16:44:38 +0000 Subject: [PATCH 077/120] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 0cf6b1cbad8c0d60c0d08faff3ff1c9f4df353a1 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Fri, 21 Jul 2023 17:12:53 +0800 Subject: [PATCH 078/120] Upgrade 2.2.13 Signed-off-by: Gris Ge --- .gitignore | 3 +++ .packit.yaml | 2 +- nmstate.spec | 7 +++---- sources | 6 +++--- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 331513a..a08b5a7 100644 --- a/.gitignore +++ b/.gitignore @@ -97,3 +97,6 @@ /nmstate-2.2.12.tar.gz /nmstate-2.2.12.tar.gz.asc /nmstate-vendor-2.2.12.tar.xz +/nmstate-2.2.13.tar.gz +/nmstate-2.2.13.tar.gz.asc +/nmstate-vendor-2.2.13.tar.xz diff --git a/.packit.yaml b/.packit.yaml index a8f4700..cd4cca0 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -18,7 +18,7 @@ jobs: # PR in src.fedoraproject.org been merged. - job: koji_build trigger: commit - allowed_pr_authors: ["packit-stg", "packit", "cathay4t"] + allowed_pr_authors: ["packit-stg", "packit"] dist_git_branches: - fedora-all diff --git a/nmstate.spec b/nmstate.spec index f079da0..a91bd94 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.12 +Version: 2.2.13 Release: %autorelease Summary: Declarative network manager API License: LGPLv2+ @@ -30,10 +30,9 @@ BuildRequires: (crate(clap/default) >= 3.1 with crate(clap/default) < 4.0) BuildRequires: (crate(chrono/default) >= 0.4 with crate(chrono/default) < 0.5) BuildRequires: (crate(ctrlc/default) >= 3.2 with crate(ctrlc/default) < 4.0) BuildRequires: (crate(env_logger/default) >= 0.10 with crate(env_logger/default) < 0.11) -BuildRequires: (crate(ipnet/default) >= 2.5 with crate(ipnet/default) < 3.0) BuildRequires: (crate(libc/default) >= 0.2 with crate(libc/default) < 0.3) BuildRequires: (crate(log/default) >= 0.4 with crate(log/default) < 0.5) -BuildRequires: (crate(nispor/default) >= 1.2.10 with crate(nispor/default) < 2.0) +BuildRequires: (crate(nispor/default) >= 1.2.12 with crate(nispor/default) < 2.0) BuildRequires: (crate(serde/default) >= 1.0 with crate(serde/default) < 2.0) BuildRequires: (crate(serde/derive) >= 1.0 with crate(serde/derive) < 2.0) BuildRequires: (crate(serde_json/default) >= 1.0 with crate(serde_json/default) < 2.0) @@ -129,7 +128,7 @@ which use "%{name}" crate with gen_conf feature. Summary: Rust crate of nmstate with default feature BuildArch: noarch # https://bugzilla.redhat.com/show_bug.cgi?id=2161128 -Requires: (crate(nispor/default) >= 1.2.9 with crate(nispor/default) < 2.0) +Requires: (crate(nispor/default) >= 1.2.12 with crate(nispor/default) < 2.0) Requires: (crate(nix/default) >= 0.24 with crate(nix/default) < 0.25) Requires: (crate(zbus/default) >= 1.9 with crate(zbus/default) < 2.0) diff --git a/sources b/sources index 4b6da29..dbbb8bf 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (nmstate-2.2.12.tar.gz) = ed4b786242a2273877d58be1495fd24c9a171b814e1b9de0363c6cd52d92cea8836ce9be81c2c5371d9f846e7192f83a53d0a0b7a2c85bf63b3a20035c9b8db3 -SHA512 (nmstate-2.2.12.tar.gz.asc) = 915228c73fb69c43cf53cd89547dcfa750d67a06e722c3664d0c6421bad2a9db38b02825042649a1cd3c20a48c2c5fb119eb8dfbfe36ba32115d1b387023a5b6 +SHA512 (nmstate-2.2.13.tar.gz) = 5a4180d0e7ab4c9de04dadee869068921a4cd4ecc0bc12773160bd5e9a859d2aefb1194a83edbb88c34a22c4775ca328cc80a3c617e7bb2e66430de77f22fbd5 +SHA512 (nmstate-2.2.13.tar.gz.asc) = c12c270393e5945d2618b6d08f0d968f5ba8c7f0904efcfdd83de6c3dd47812d687d10315fb0cd36cfbcd6cf87c54339c1f567e8ebe822a402b928fecd4ad003 +SHA512 (nmstate-vendor-2.2.13.tar.xz) = 983799879947c836b7507220fb440c374fedd1320b944fcfd508670acbfcf3683f0ed3e9b250c5fc41f8fe7a26563eba5bd4c29f83696550c7fc2f71e05ddaa4 SHA512 (nmstate.gpg) = bfbf3620045f3c1f15eaf6877fd7407834a75d2650976f2327abd02ddb910aa34500f07a774dd17023c43dcba42a0ffc66f23cd6816fd9694acad2c5eed9e8d3 -SHA512 (nmstate-vendor-2.2.12.tar.xz) = 2dfae50d1ea44896570cd778615c165f0345e74f7ed07128364b82396db630a8811d9fd034f4d632bcafdb64b09345e35c5f3ecb48c997946a716a2c4498f0fe From 5fb767240f56e3b90adfad3ef32cad7e04ffe656 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 27 Jul 2023 04:44:48 +0000 Subject: [PATCH 079/120] [packit] 2.2.14 upstream release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream tag: v2.2.14 Upstream commit: c509a6a7 If you need to do any change in this pull request, you need to locally fetch the source branch of it and push it (with a fix) to your fork (as it is not possible to push to the branch created in the Packit’s fork): ``` git fetch https://src.fedoraproject.org/forks/packit/rpms/nmstate.git refs/heads/*:refs/remotes/packit/* git checkout packit/2.2.14-rawhide-update-pull_from_upstream ``` --- .gitignore | 3 +++ README.packit | 2 +- nmstate.spec | 2 +- sources | 6 +++--- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a08b5a7..f9b36c6 100644 --- a/.gitignore +++ b/.gitignore @@ -100,3 +100,6 @@ /nmstate-2.2.13.tar.gz /nmstate-2.2.13.tar.gz.asc /nmstate-vendor-2.2.13.tar.xz +/nmstate-2.2.14.tar.gz +/nmstate-2.2.14.tar.gz.asc +/nmstate-vendor-2.2.14.tar.xz diff --git a/README.packit b/README.packit index 01582f6..9d6cbbc 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.76.0. +The file was generated using packit 0.78.1. diff --git a/nmstate.spec b/nmstate.spec index a91bd94..e607633 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.13 +Version: 2.2.14 Release: %autorelease Summary: Declarative network manager API License: LGPLv2+ diff --git a/sources b/sources index dbbb8bf..50f597b 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (nmstate-2.2.13.tar.gz) = 5a4180d0e7ab4c9de04dadee869068921a4cd4ecc0bc12773160bd5e9a859d2aefb1194a83edbb88c34a22c4775ca328cc80a3c617e7bb2e66430de77f22fbd5 -SHA512 (nmstate-2.2.13.tar.gz.asc) = c12c270393e5945d2618b6d08f0d968f5ba8c7f0904efcfdd83de6c3dd47812d687d10315fb0cd36cfbcd6cf87c54339c1f567e8ebe822a402b928fecd4ad003 -SHA512 (nmstate-vendor-2.2.13.tar.xz) = 983799879947c836b7507220fb440c374fedd1320b944fcfd508670acbfcf3683f0ed3e9b250c5fc41f8fe7a26563eba5bd4c29f83696550c7fc2f71e05ddaa4 +SHA512 (nmstate-2.2.14.tar.gz) = 13bcbd3525b53d47f5af37e5b1c176900f5fc351e80a12cce4db449aedff78a818ec41eb4073949925f076d975d276f1a523f80c87c9bfc49d93d7800a385986 +SHA512 (nmstate-2.2.14.tar.gz.asc) = ead17efe59f1268a7934d0c37a2cb4b24e18722f7d48a697b994eb670ddb5e70c2700c9968aac5e160ef578b876fe7e3ccab87620ba7db732c173835547c9f35 SHA512 (nmstate.gpg) = bfbf3620045f3c1f15eaf6877fd7407834a75d2650976f2327abd02ddb910aa34500f07a774dd17023c43dcba42a0ffc66f23cd6816fd9694acad2c5eed9e8d3 +SHA512 (nmstate-vendor-2.2.14.tar.xz) = 4f222b6a9c3070646cc349c5ccf06ed000131d80a5d43e25b4afc86e0fe3900f7d233f0e6c579f254c47037e0638557debfccd09dc37b0d5e72177e7ca1a2422 From 8d28bee3b415763542346d7fac174cf6ddd6a396 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Mon, 21 Aug 2023 20:20:52 +0800 Subject: [PATCH 080/120] Use SPDX license Signed-off-by: Gris Ge --- nmstate.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nmstate.spec b/nmstate.spec index e607633..50bf043 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -5,7 +5,7 @@ Name: nmstate Version: 2.2.14 Release: %autorelease Summary: Declarative network manager API -License: LGPLv2+ +License: Apache-2.0 AND LGPL-2.1-or-later URL: https://github.com/%{srcname}/%{srcname} Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc From 25225840af0ac9108f25db4adc624e3e8038d84a Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 25 Aug 2023 00:43:38 +0000 Subject: [PATCH 081/120] [packit] 2.2.15 upstream release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream tag: v2.2.15 Upstream commit: a09ca27d If you need to do any change in this pull request, you need to locally fetch the source branch of it and push it (with a fix) to your fork (as it is not possible to push to the branch created in the Packit’s fork): ``` git fetch https://src.fedoraproject.org/forks/packit/rpms/nmstate.git refs/heads/*:refs/remotes/packit/* git checkout packit/2.2.15-rawhide-update-pull_from_upstream ``` --- .gitignore | 3 +++ README.packit | 2 +- nmstate.spec | 2 +- sources | 6 +++--- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f9b36c6..17145d8 100644 --- a/.gitignore +++ b/.gitignore @@ -103,3 +103,6 @@ /nmstate-2.2.14.tar.gz /nmstate-2.2.14.tar.gz.asc /nmstate-vendor-2.2.14.tar.xz +/nmstate-2.2.15.tar.gz +/nmstate-2.2.15.tar.gz.asc +/nmstate-vendor-2.2.15.tar.xz diff --git a/README.packit b/README.packit index 9d6cbbc..797aefb 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.78.1. +The file was generated using packit 0.79.0.post2+g93f33d9. diff --git a/nmstate.spec b/nmstate.spec index 50bf043..4c05c90 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.14 +Version: 2.2.15 Release: %autorelease Summary: Declarative network manager API License: Apache-2.0 AND LGPL-2.1-or-later diff --git a/sources b/sources index 50f597b..079fdac 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (nmstate-2.2.14.tar.gz) = 13bcbd3525b53d47f5af37e5b1c176900f5fc351e80a12cce4db449aedff78a818ec41eb4073949925f076d975d276f1a523f80c87c9bfc49d93d7800a385986 -SHA512 (nmstate-2.2.14.tar.gz.asc) = ead17efe59f1268a7934d0c37a2cb4b24e18722f7d48a697b994eb670ddb5e70c2700c9968aac5e160ef578b876fe7e3ccab87620ba7db732c173835547c9f35 +SHA512 (nmstate-2.2.15.tar.gz) = 692d2414352d6346d2cfd3f008d6cc36955ec328d574b5d94c536b8d5a9baa125ceaa5bf9b84632252df9fe5ef48409fdd3bd9296ff50d387b93b2dbe4963e9e +SHA512 (nmstate-2.2.15.tar.gz.asc) = d5da10e6b14c43536ef88f1e38c7142e74d7a13b5d07af4e3a46ff50fed359f762ee737004ad5203a01f56704c70ccab3fe035c9cc215598d7025058834e9e8e SHA512 (nmstate.gpg) = bfbf3620045f3c1f15eaf6877fd7407834a75d2650976f2327abd02ddb910aa34500f07a774dd17023c43dcba42a0ffc66f23cd6816fd9694acad2c5eed9e8d3 -SHA512 (nmstate-vendor-2.2.14.tar.xz) = 4f222b6a9c3070646cc349c5ccf06ed000131d80a5d43e25b4afc86e0fe3900f7d233f0e6c579f254c47037e0638557debfccd09dc37b0d5e72177e7ca1a2422 +SHA512 (nmstate-vendor-2.2.15.tar.xz) = f20c2ff65c27bcf2dac0e1acb4dc4a55b76787d3532c0385a2aa5105d32b01c875b1a0024f79a8e696dea1dac0d430ee3a57b8d5ee7f2bb26c97765681319681 From fc7f70b4063d66f2f3702bfaf5038019b7d5d307 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Wed, 6 Sep 2023 16:16:42 +0800 Subject: [PATCH 082/120] Use SPDX license for sub-packages Signed-off-by: Gris Ge --- nmstate.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/nmstate.spec b/nmstate.spec index 4c05c90..2a07bb3 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -58,7 +58,7 @@ Summary: C binding of nmstate Recommends: NetworkManager # Avoid automatically generated profiles Recommends: NetworkManager-config-server -License: ASL 2.0 +License: Apache-2.0 %description libs C binding of nmstate. @@ -67,7 +67,7 @@ C binding of nmstate. Summary: Development files for nmstate Group: Development/Libraries Requires: %{name}-libs%{?_isa} = %{version}-%{release} -License: ASL 2.0 +License: Apache-2.0 %description devel Development files of nmstate C binding. @@ -75,6 +75,7 @@ Development files of nmstate C binding. %package static Summary: Static development files for nmstate Group: Development/Libraries +License: Apache-2.0 Requires: %{name}-devel%{?_isa} = %{version}-%{release} %description static @@ -95,6 +96,7 @@ Suggests: NetworkManager-team Provides: nmstate-plugin-ovsdb = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} Obsoletes: nmstate-plugin-ovsdb < 2.0-1 +License: Apache-2.0 %description -n python3-%{libname} This package contains the Python 3 library for Nmstate. @@ -103,6 +105,7 @@ This package contains the Python 3 library for Nmstate. %package -n rust-%{name}-devel Summary: Rust crate of nmstate BuildArch: noarch +License: Apache-2.0 %description -n rust-%{name}-devel This package contains library source intended for building other packages @@ -111,6 +114,7 @@ which use "%{name}" crate. %package -n rust-%{name}+default-devel Summary: Rust crate of nmstate with default feature BuildArch: noarch +License: Apache-2.0 %description -n rust-%{name}+default-devel This package contains library source intended for building other packages @@ -119,6 +123,7 @@ which use "%{name}" crate with default feature. %package -n rust-%{name}+gen_conf-devel Summary: Rust crate of nmstate with default feature BuildArch: noarch +License: Apache-2.0 %description -n rust-%{name}+gen_conf-devel This package contains library source intended for building other packages @@ -127,6 +132,7 @@ which use "%{name}" crate with gen_conf feature. %package -n rust-%{name}+query_apply-devel Summary: Rust crate of nmstate with default feature BuildArch: noarch +License: Apache-2.0 # https://bugzilla.redhat.com/show_bug.cgi?id=2161128 Requires: (crate(nispor/default) >= 1.2.12 with crate(nispor/default) < 2.0) Requires: (crate(nix/default) >= 0.24 with crate(nix/default) < 0.25) From d2c17fdc30a03d9316edb68784dafb5249aee98d Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Fri, 15 Dec 2023 19:19:27 +0800 Subject: [PATCH 083/120] Upgrade to 2.2.21 Signed-off-by: Gris Ge --- .gitignore | 3 ++ ...Workaround-for-Fedora-rust-packaging.patch | 34 ++++--------------- nmstate.spec | 20 ++++++++--- sources | 6 ++-- 4 files changed, 27 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index 17145d8..0cbaa94 100644 --- a/.gitignore +++ b/.gitignore @@ -106,3 +106,6 @@ /nmstate-2.2.15.tar.gz /nmstate-2.2.15.tar.gz.asc /nmstate-vendor-2.2.15.tar.xz +/nmstate-2.2.21.tar.gz +/nmstate-2.2.21.tar.gz.asc +/nmstate-vendor-2.2.21.tar.xz diff --git a/0001-Workaround-for-Fedora-rust-packaging.patch b/0001-Workaround-for-Fedora-rust-packaging.patch index 15cd542..593779b 100644 --- a/0001-Workaround-for-Fedora-rust-packaging.patch +++ b/0001-Workaround-for-Fedora-rust-packaging.patch @@ -1,33 +1,11 @@ -From a78d7610a7a3adc4cd80433bdded7d37e738eb12 Mon Sep 17 00:00:00 2001 -From: Gris Ge -Date: Mon, 16 Jan 2023 11:56:16 +0800 -Subject: [PATCH] Workaround for Fedora rust packaging - -Signed-off-by: Gris Ge ---- - rust/src/lib/Cargo.toml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/rust/src/lib/Cargo.toml b/rust/src/lib/Cargo.toml -index 801b3e33..67c7f3dd 100644 ---- a/rust/src/lib/Cargo.toml -+++ b/rust/src/lib/Cargo.toml -@@ -9,7 +9,7 @@ documentation = "https://nmstate.io" - repository = "https://github.com/nmstate/nmstate" - keywords = ["network", "linux"] - categories = ["network-programming", "os::linux-apis"] --rust-version = "1.58" -+rust-version = "1.60" - edition = "2018" - - [lib] -@@ -62,5 +62,5 @@ serde_yaml = "0.9" +diff -Nur nmstate-2.2.21.orig/rust/src/lib/Cargo.toml nmstate-2.2.21/rust/src/lib/Cargo.toml +--- nmstate-2.2.21.orig/rust/src/lib/Cargo.toml 2023-12-14 19:21:53.000000000 +0800 ++++ nmstate-2.2.21/rust/src/lib/Cargo.toml 2023-12-15 19:04:02.936926574 +0800 +@@ -61,6 +61,6 @@ [features] - default = ["query_apply", "gen_conf"] + default = ["query_apply", "gen_conf", "gen_revert"] -query_apply = ["nispor", "nix", "zbus"] +query_apply = ["dep:nispor", "dep:nix", "dep:zbus"] gen_conf = [] --- -2.39.0 - + gen_revert = [] diff --git a/nmstate.spec b/nmstate.spec index 2a07bb3..99c7cdc 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.15 +Version: 2.2.21 Release: %autorelease Summary: Declarative network manager API License: Apache-2.0 AND LGPL-2.1-or-later @@ -11,9 +11,7 @@ Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.g Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc Source2: https://nmstate.io/nmstate.gpg Source3: %{url}/releases/download/v%{version}/%{srcname}-vendor-%{version}.tar.xz -# We use `dep: dep_name` to prevent rust packaging generate incorect dependency -# https://bugzilla.redhat.com/show_bug.cgi?id=2161128 -# but list Requires manually +# https://github.com/nmstate/nmstate/pull/2497 Patch1: 0001-Workaround-for-Fedora-rust-packaging.patch BuildRequires: patchelf BuildRequires: python3-devel @@ -130,7 +128,7 @@ This package contains library source intended for building other packages which use "%{name}" crate with gen_conf feature. %package -n rust-%{name}+query_apply-devel -Summary: Rust crate of nmstate with default feature +Summary: Rust crate of nmstate with query_apply feature BuildArch: noarch License: Apache-2.0 # https://bugzilla.redhat.com/show_bug.cgi?id=2161128 @@ -141,6 +139,15 @@ Requires: (crate(zbus/default) >= 1.9 with crate(zbus/default) < 2.0) %description -n rust-%{name}+query_apply-devel This package contains library source intended for building other packages which use "%{name}" crate with query_apply feature. + +%package -n rust-%{name}+gen_revert-devel +Summary: Rust crate of nmstate with gen_revert feature +BuildArch: noarch +License: Apache-2.0 + +%description -n rust-%{name}+gen_revert-devel +This package contains library source intended for building other packages +which use "%{name}" crate with gen_revert feature. %endif %prep @@ -231,6 +238,9 @@ popd %files -n rust-%{name}+query_apply-devel %ghost %{cargo_registry}/%{name}-%{version}/Cargo.toml + +%files -n rust-%{name}+gen_revert-devel +%ghost %{cargo_registry}/%{name}-%{version}/Cargo.toml %endif %changelog diff --git a/sources b/sources index 079fdac..ec8fbdb 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (nmstate-2.2.15.tar.gz) = 692d2414352d6346d2cfd3f008d6cc36955ec328d574b5d94c536b8d5a9baa125ceaa5bf9b84632252df9fe5ef48409fdd3bd9296ff50d387b93b2dbe4963e9e -SHA512 (nmstate-2.2.15.tar.gz.asc) = d5da10e6b14c43536ef88f1e38c7142e74d7a13b5d07af4e3a46ff50fed359f762ee737004ad5203a01f56704c70ccab3fe035c9cc215598d7025058834e9e8e +SHA512 (nmstate-2.2.21.tar.gz) = 5b367547064eba4f76bb1ccccab517bf67bf8b9f6d1afd9041ccba075863e168b2f29719276f4cc8eaf6e1fe6e1ce941828f79d2f7bd08b187e09c1eb3156d22 +SHA512 (nmstate-2.2.21.tar.gz.asc) = 9dc40cc990fdd12ec5f776a36c99c75a84dfc961207b8080de43e7564f38e9f0cada8d8e786e6ff4b8ca291446dc70920b6c966734d510e2293c259d68d3fa5d SHA512 (nmstate.gpg) = bfbf3620045f3c1f15eaf6877fd7407834a75d2650976f2327abd02ddb910aa34500f07a774dd17023c43dcba42a0ffc66f23cd6816fd9694acad2c5eed9e8d3 -SHA512 (nmstate-vendor-2.2.15.tar.xz) = f20c2ff65c27bcf2dac0e1acb4dc4a55b76787d3532c0385a2aa5105d32b01c875b1a0024f79a8e696dea1dac0d430ee3a57b8d5ee7f2bb26c97765681319681 +SHA512 (nmstate-vendor-2.2.21.tar.xz) = 9da67a516657b87d82318775ed47b826089cd970f00c1e62aa7a9a5898cd66c54cec400561f2c9704916e5c618bb6a63a41abacc33c5d0d2c647c86eef116294 From c5b6623ec9cbc85ab2ddb384ed3a4e925b58cdff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 09:45:55 +0000 Subject: [PATCH 084/120] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 0e983069b789e57113fd4c5bf2e12a2b2dca61d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 09:05:30 +0000 Subject: [PATCH 085/120] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 130a58c8a2f168c6dc51543fdee7c49aba3926f2 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Mon, 18 Mar 2024 13:31:57 +0800 Subject: [PATCH 086/120] Upgrade to 2.2.26 Signed-off-by: Gris Ge --- .gitignore | 3 +++ ...Workaround-for-Fedora-rust-packaging.patch | 11 ---------- nmstate.spec | 22 +++++++++++++------ sources | 6 ++--- 4 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 0001-Workaround-for-Fedora-rust-packaging.patch diff --git a/.gitignore b/.gitignore index 0cbaa94..beaeb95 100644 --- a/.gitignore +++ b/.gitignore @@ -109,3 +109,6 @@ /nmstate-2.2.21.tar.gz /nmstate-2.2.21.tar.gz.asc /nmstate-vendor-2.2.21.tar.xz +/nmstate-2.2.26.tar.gz +/nmstate-2.2.26.tar.gz.asc +/nmstate-vendor-2.2.26.tar.xz diff --git a/0001-Workaround-for-Fedora-rust-packaging.patch b/0001-Workaround-for-Fedora-rust-packaging.patch deleted file mode 100644 index 593779b..0000000 --- a/0001-Workaround-for-Fedora-rust-packaging.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur nmstate-2.2.21.orig/rust/src/lib/Cargo.toml nmstate-2.2.21/rust/src/lib/Cargo.toml ---- nmstate-2.2.21.orig/rust/src/lib/Cargo.toml 2023-12-14 19:21:53.000000000 +0800 -+++ nmstate-2.2.21/rust/src/lib/Cargo.toml 2023-12-15 19:04:02.936926574 +0800 -@@ -61,6 +61,6 @@ - - [features] - default = ["query_apply", "gen_conf", "gen_revert"] --query_apply = ["nispor", "nix", "zbus"] -+query_apply = ["dep:nispor", "dep:nix", "dep:zbus"] - gen_conf = [] - gen_revert = [] diff --git a/nmstate.spec b/nmstate.spec index 99c7cdc..b71a5d9 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.21 +Version: 2.2.26 Release: %autorelease Summary: Declarative network manager API License: Apache-2.0 AND LGPL-2.1-or-later @@ -11,8 +11,6 @@ Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.g Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc Source2: https://nmstate.io/nmstate.gpg Source3: %{url}/releases/download/v%{version}/%{srcname}-vendor-%{version}.tar.xz -# https://github.com/nmstate/nmstate/pull/2497 -Patch1: 0001-Workaround-for-Fedora-rust-packaging.patch BuildRequires: patchelf BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -30,7 +28,7 @@ BuildRequires: (crate(ctrlc/default) >= 3.2 with crate(ctrlc/default) < 4.0) BuildRequires: (crate(env_logger/default) >= 0.10 with crate(env_logger/default) < 0.11) BuildRequires: (crate(libc/default) >= 0.2 with crate(libc/default) < 0.3) BuildRequires: (crate(log/default) >= 0.4 with crate(log/default) < 0.5) -BuildRequires: (crate(nispor/default) >= 1.2.12 with crate(nispor/default) < 2.0) +BuildRequires: (crate(nispor/default) >= 1.2.17 with crate(nispor/default) < 2.0) BuildRequires: (crate(serde/default) >= 1.0 with crate(serde/default) < 2.0) BuildRequires: (crate(serde/derive) >= 1.0 with crate(serde/derive) < 2.0) BuildRequires: (crate(serde_json/default) >= 1.0 with crate(serde_json/default) < 2.0) @@ -40,6 +38,7 @@ BuildRequires: (crate(uuid/v5) >= 1.1 with crate(uuid/v5) < 2.0) BuildRequires: (crate(zbus/default) >= 1.9 with crate(zbus/default) < 2.0) BuildRequires: (crate(zvariant/default) >= 2.10 with crate(zvariant/default) < 3.0) BuildRequires: (crate(nix/default) >= 0.26 with crate(nix/default) < 0.27) +BuildRequires: (crate(toml/default) >= 0.8 with crate(toml/default) < 0.9) %endif %description @@ -154,12 +153,12 @@ which use "%{name}" crate with gen_revert feature. gpg2 --import --import-options import-export,import-minimal \ %{SOURCE2} > ./gpgkey-mantainers.gpg gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} -%autosetup -p1 + +%autosetup -n %{name}-%{version_no_tilde} -p1 %{?rhel:-a3} pushd rust -rm .cargo/config.toml %if 0%{?rhel} -%cargo_prep -V 3 +%cargo_prep -v vendor %else %cargo_prep %endif @@ -168,6 +167,11 @@ popd %build pushd rust %cargo_build +%cargo_license_summary +%{cargo_license} > ../LICENSE.dependencies +%if 0%{?rhel} +%cargo_vendor_manifest +%endif popd pushd rust/src/python @@ -199,6 +203,10 @@ popd %files %doc README.md +%license LICENSE.dependencies +%if 0%{?rhel} +%license cargo-vendor.txt +%endif %doc examples/ %{_mandir}/man8/nmstatectl.8* %{_mandir}/man8/nmstate-autoconf.8* diff --git a/sources b/sources index ec8fbdb..c2aaa63 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (nmstate-2.2.21.tar.gz) = 5b367547064eba4f76bb1ccccab517bf67bf8b9f6d1afd9041ccba075863e168b2f29719276f4cc8eaf6e1fe6e1ce941828f79d2f7bd08b187e09c1eb3156d22 -SHA512 (nmstate-2.2.21.tar.gz.asc) = 9dc40cc990fdd12ec5f776a36c99c75a84dfc961207b8080de43e7564f38e9f0cada8d8e786e6ff4b8ca291446dc70920b6c966734d510e2293c259d68d3fa5d +SHA512 (nmstate-2.2.26.tar.gz) = 52ff3f35ea514018be2dec5d83cc42ad3ed13cf93c6ac72b838ff4218e51d364abbc3f0b33feb9971cda2bc9eb8f76374c0fe66b614f311a71196900117a83fd +SHA512 (nmstate-2.2.26.tar.gz.asc) = a1cebb3221a7222188b41e348201364189b0c3b35de4964ec5fb83a13b0976bbb17fc831662bfbbf0b9461288c146551c56c6d57862dc4333d848f19ce4194e5 SHA512 (nmstate.gpg) = bfbf3620045f3c1f15eaf6877fd7407834a75d2650976f2327abd02ddb910aa34500f07a774dd17023c43dcba42a0ffc66f23cd6816fd9694acad2c5eed9e8d3 -SHA512 (nmstate-vendor-2.2.21.tar.xz) = 9da67a516657b87d82318775ed47b826089cd970f00c1e62aa7a9a5898cd66c54cec400561f2c9704916e5c618bb6a63a41abacc33c5d0d2c647c86eef116294 +SHA512 (nmstate-vendor-2.2.26.tar.xz) = 80cbb3e73a55ae602edb3f4538ef87f1b441d149e7bed53fad60828f811d19450d4882a86521c0147d5d9a932c6d5b9595803d919ab1bc7622d29a36c289446a From 2c93753894da71c3f68cab714f7334225d28d49f Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Thu, 21 Mar 2024 22:28:07 +0800 Subject: [PATCH 087/120] Fix ELN build by moving vendor folder to rust folder Signed-off-by: Gris Ge --- nmstate.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/nmstate.spec b/nmstate.spec index b71a5d9..661fa87 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -158,6 +158,7 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} pushd rust %if 0%{?rhel} +mv ../vendor ./ %cargo_prep -v vendor %else %cargo_prep From 665de0ae7c1d15694352bedd3b165419deff7569 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Thu, 21 Mar 2024 23:11:43 +0800 Subject: [PATCH 088/120] patchelf is not required anymore Signed-off-by: Gris Ge --- nmstate.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/nmstate.spec b/nmstate.spec index 661fa87..04392af 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -11,7 +11,6 @@ Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.g Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc Source2: https://nmstate.io/nmstate.gpg Source3: %{url}/releases/download/v%{version}/%{srcname}-vendor-%{version}.tar.xz -BuildRequires: patchelf BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: gnupg2 @@ -185,8 +184,6 @@ env SKIP_PYTHON_INSTALL=1 \ LIBDIR=%{_libdir} \ SYSCONFDIR=%{_sysconfdir} \ %make_install -patchelf --set-soname libnmstate.so.2 \ - %{buildroot}/%{_libdir}/libnmstate.so.%{version} pushd rust/src/python %py3_install From a66dfbca3c054cf9b45b829ef4abfb60e5365d4d Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Mon, 25 Mar 2024 08:09:54 +0800 Subject: [PATCH 089/120] Fix cargo vendor license file Signed-off-by: Gris Ge --- nmstate.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nmstate.spec b/nmstate.spec index 04392af..ecf602c 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -203,7 +203,7 @@ popd %doc README.md %license LICENSE.dependencies %if 0%{?rhel} -%license cargo-vendor.txt +%license rust/cargo-vendor.txt %endif %doc examples/ %{_mandir}/man8/nmstatectl.8* From ef31f52d33c6ba251c1055cc99c903d72f9a8e4a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 11:23:32 +0200 Subject: [PATCH 090/120] Rebuilt for Python 3.13 From 95dab51ed01141c5b31f1316e5d5a717969fbd4b Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Thu, 13 Jun 2024 17:19:15 +0800 Subject: [PATCH 091/120] Upgrade to 2.2.33 Signed-off-by: Gris Ge --- .gitignore | 3 +++ nmstate.spec | 21 +++++++++++++++------ sources | 6 +++--- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index beaeb95..778767f 100644 --- a/.gitignore +++ b/.gitignore @@ -112,3 +112,6 @@ /nmstate-2.2.26.tar.gz /nmstate-2.2.26.tar.gz.asc /nmstate-vendor-2.2.26.tar.xz +/nmstate-2.2.33.tar.gz +/nmstate-2.2.33.tar.gz.asc +/nmstate-vendor-2.2.33.tar.xz diff --git a/nmstate.spec b/nmstate.spec index ecf602c..fd1f79a 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.26 +Version: 2.2.33 Release: %autorelease Summary: Declarative network manager API License: Apache-2.0 AND LGPL-2.1-or-later @@ -23,7 +23,6 @@ BuildRequires: rust-packaging BuildRequires: (crate(clap/cargo) >= 3.1 with crate(clap/cargo) < 4.0) BuildRequires: (crate(clap/default) >= 3.1 with crate(clap/default) < 4.0) BuildRequires: (crate(chrono/default) >= 0.4 with crate(chrono/default) < 0.5) -BuildRequires: (crate(ctrlc/default) >= 3.2 with crate(ctrlc/default) < 4.0) BuildRequires: (crate(env_logger/default) >= 0.10 with crate(env_logger/default) < 0.11) BuildRequires: (crate(libc/default) >= 0.2 with crate(libc/default) < 0.3) BuildRequires: (crate(log/default) >= 0.4 with crate(log/default) < 0.5) @@ -38,6 +37,10 @@ BuildRequires: (crate(zbus/default) >= 1.9 with crate(zbus/default) < 2.0) BuildRequires: (crate(zvariant/default) >= 2.10 with crate(zvariant/default) < 3.0) BuildRequires: (crate(nix/default) >= 0.26 with crate(nix/default) < 0.27) BuildRequires: (crate(toml/default) >= 0.8 with crate(toml/default) < 0.9) +BuildRequires: (crate(tokio/default) >= 1.3 with crate(tokio/default) < 2.0) +BuildRequires: (crate(tokio/net) >= 1.3 with crate(tokio/net) < 2.0) +BuildRequires: (crate(tokio/rt) >= 1.3 with crate(tokio/rt) < 2.0) +BuildRequires: (crate(tokio/signal) >= 1.3 with crate(tokio/signal) < 2.0) %endif %description @@ -190,11 +193,17 @@ pushd rust/src/python popd %if ! 0%{?rhel} -# cargo_install has problem on detecting library when running in workspace -# due to bug https://pagure.io/fedora-rust/cargo2rpm/issue/5 -# Removing the workspace Cargo.toml will workaround this problem. -rm rust/Cargo.toml pushd rust/src/lib +# Fedora cargo2rpm has problem when working with worksace dependency +# https://pagure.io/fedora-rust/cargo2rpm/issue/13 +# we use `cargo package` to generate the expanded Cargo.toml which +# is also the one used in crates.io +cargo package --frozen --no-verify --target-dir %{_tmppath} +tar xf %{_tmppath}/package/nmstate-%{version}.crate \ + nmstate-%{version}/Cargo.toml +mv nmstate-%{version}/Cargo.toml ./Cargo.toml +# Remove worksapce Cargo.toml +rm ../../Cargo.toml %cargo_install popd %endif diff --git a/sources b/sources index c2aaa63..48c1ab5 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (nmstate-2.2.26.tar.gz) = 52ff3f35ea514018be2dec5d83cc42ad3ed13cf93c6ac72b838ff4218e51d364abbc3f0b33feb9971cda2bc9eb8f76374c0fe66b614f311a71196900117a83fd -SHA512 (nmstate-2.2.26.tar.gz.asc) = a1cebb3221a7222188b41e348201364189b0c3b35de4964ec5fb83a13b0976bbb17fc831662bfbbf0b9461288c146551c56c6d57862dc4333d848f19ce4194e5 +SHA512 (nmstate-2.2.33.tar.gz) = edf7b7bad2692f323c2d0517c55cd4ce769dc333b99cd39e590e9689c804ae4861da601da005299896e7b5bfba17bfbbe73ceb57066d988c43876c540ee99119 +SHA512 (nmstate-2.2.33.tar.gz.asc) = 32704b7d0661b926f9ac452eeed371025a73237c6810d06120284746c619781f17279b6b2cb17274ade234bf6ed5675f3a03d9752d572b3c7d127bbbb70efaad +SHA512 (nmstate-vendor-2.2.33.tar.xz) = 8e0136edac1b6789c9d30c2c1b83615e7683ec6961698bf3219aa4aa3f6cd9ca80db47092ed3a0e17515b9278b95cfd62befd6fb24e28a65c03ef713f8f9dd89 SHA512 (nmstate.gpg) = bfbf3620045f3c1f15eaf6877fd7407834a75d2650976f2327abd02ddb910aa34500f07a774dd17023c43dcba42a0ffc66f23cd6816fd9694acad2c5eed9e8d3 -SHA512 (nmstate-vendor-2.2.26.tar.xz) = 80cbb3e73a55ae602edb3f4538ef87f1b441d149e7bed53fad60828f811d19450d4882a86521c0147d5d9a932c6d5b9595803d919ab1bc7622d29a36c289446a From 06d7310403bdd9a901dede6c1f87f1322c58e932 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 19:35:26 +0000 Subject: [PATCH 092/120] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From ffa5cc509cfa2b6bfcc8e63f0df5e43f836af21d Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 1 Aug 2024 21:47:06 +0000 Subject: [PATCH 093/120] Update to 2.2.34 upstream release - Resolves: rhbz#2302393 Upstream tag: v2.2.34 Upstream commit: 84dd568c Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 3 +++ README.packit | 2 +- nmstate.spec | 2 +- sources | 6 +++--- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 778767f..4c2d500 100644 --- a/.gitignore +++ b/.gitignore @@ -115,3 +115,6 @@ /nmstate-2.2.33.tar.gz /nmstate-2.2.33.tar.gz.asc /nmstate-vendor-2.2.33.tar.xz +/nmstate-2.2.34.tar.gz +/nmstate-2.2.34.tar.gz.asc +/nmstate-vendor-2.2.34.tar.xz diff --git a/README.packit b/README.packit index 797aefb..aeaae38 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.79.0.post2+g93f33d9. +The file was generated using packit 0.99.0.post1.dev29+g2e75e6ff. diff --git a/nmstate.spec b/nmstate.spec index fd1f79a..40161e9 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.33 +Version: 2.2.34 Release: %autorelease Summary: Declarative network manager API License: Apache-2.0 AND LGPL-2.1-or-later diff --git a/sources b/sources index 48c1ab5..51bcf12 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (nmstate-2.2.33.tar.gz) = edf7b7bad2692f323c2d0517c55cd4ce769dc333b99cd39e590e9689c804ae4861da601da005299896e7b5bfba17bfbbe73ceb57066d988c43876c540ee99119 -SHA512 (nmstate-2.2.33.tar.gz.asc) = 32704b7d0661b926f9ac452eeed371025a73237c6810d06120284746c619781f17279b6b2cb17274ade234bf6ed5675f3a03d9752d572b3c7d127bbbb70efaad -SHA512 (nmstate-vendor-2.2.33.tar.xz) = 8e0136edac1b6789c9d30c2c1b83615e7683ec6961698bf3219aa4aa3f6cd9ca80db47092ed3a0e17515b9278b95cfd62befd6fb24e28a65c03ef713f8f9dd89 +SHA512 (nmstate-2.2.34.tar.gz) = 3ed1e363199369319803d64e88e4eaeff126c5bca85c646f0bab8242b668df5e012aea3a34063fea4cf321d675be850b08d9ad9472824eb5adaa26c50c059365 +SHA512 (nmstate-2.2.34.tar.gz.asc) = d0955dfbeb57696b9f6e492f6f2a891bebc6f5020b3de0ad8c71abc9bce1d877eea31dfba2caf366552c026f42f3ce5229692b52eed33d294eade4a4d3a50de2 SHA512 (nmstate.gpg) = bfbf3620045f3c1f15eaf6877fd7407834a75d2650976f2327abd02ddb910aa34500f07a774dd17023c43dcba42a0ffc66f23cd6816fd9694acad2c5eed9e8d3 +SHA512 (nmstate-vendor-2.2.34.tar.xz) = 6ef02e3a3dbdae7e1aca61aee7899c3f9e44120111235a454baf63e0d958c13ef02fef12081aca805e322f2a7067f5f20366b454dae0732685d3e29c9fd501d3 From cda27569f485b7b56ebf53af7d06e101ab14f59a Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Sat, 24 Aug 2024 08:13:58 +0800 Subject: [PATCH 094/120] Upgrade to 2.2.35 Signed-off-by: Gris Ge --- .gitignore | 3 +++ nmstate.spec | 2 +- sources | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4c2d500..99c799a 100644 --- a/.gitignore +++ b/.gitignore @@ -118,3 +118,6 @@ /nmstate-2.2.34.tar.gz /nmstate-2.2.34.tar.gz.asc /nmstate-vendor-2.2.34.tar.xz +/nmstate-2.2.35.tar.gz +/nmstate-2.2.35.tar.gz.asc +/nmstate-vendor-2.2.35.tar.xz diff --git a/nmstate.spec b/nmstate.spec index 40161e9..3022a9b 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.34 +Version: 2.2.35 Release: %autorelease Summary: Declarative network manager API License: Apache-2.0 AND LGPL-2.1-or-later diff --git a/sources b/sources index 51bcf12..029479d 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (nmstate-2.2.34.tar.gz) = 3ed1e363199369319803d64e88e4eaeff126c5bca85c646f0bab8242b668df5e012aea3a34063fea4cf321d675be850b08d9ad9472824eb5adaa26c50c059365 -SHA512 (nmstate-2.2.34.tar.gz.asc) = d0955dfbeb57696b9f6e492f6f2a891bebc6f5020b3de0ad8c71abc9bce1d877eea31dfba2caf366552c026f42f3ce5229692b52eed33d294eade4a4d3a50de2 +SHA512 (nmstate-2.2.35.tar.gz) = f546d7f99f1bf3ed13bf72c24913d895a01fca466bdd06dcfdbcb21bd3c20b42296bda667984f50e2041358dee1effed4de316e68a4e126c065b09711e3fa490 +SHA512 (nmstate-2.2.35.tar.gz.asc) = 5f19e5a9ea80733a82f93e21ab5bec79d78be3b46acb94f1e4b9c490f0af47ff7cb31a4f02784b5604fcdbaecbc6f2d28c1cacb870068b9951abe1aadc196a25 SHA512 (nmstate.gpg) = bfbf3620045f3c1f15eaf6877fd7407834a75d2650976f2327abd02ddb910aa34500f07a774dd17023c43dcba42a0ffc66f23cd6816fd9694acad2c5eed9e8d3 -SHA512 (nmstate-vendor-2.2.34.tar.xz) = 6ef02e3a3dbdae7e1aca61aee7899c3f9e44120111235a454baf63e0d958c13ef02fef12081aca805e322f2a7067f5f20366b454dae0732685d3e29c9fd501d3 +SHA512 (nmstate-vendor-2.2.35.tar.xz) = 8747790b1bf6ff07f415526183772aac38bea1f2e0472c9e17c1876f1a4ae4912edbf66586981a4e608f712fabfb18591e413a14ba23eb651fe1fc60caa50f90 From 14312fee953ae3555648359f0135621290bfa98c Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 20 Nov 2024 09:01:56 +0000 Subject: [PATCH 095/120] Update to 2.2.39 upstream release - Resolves: rhbz#2313710 Upstream tag: v2.2.39 Upstream commit: 43bbc0b7 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 3 +++ README.packit | 2 +- nmstate.spec | 2 +- sources | 6 +++--- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 99c799a..c546c70 100644 --- a/.gitignore +++ b/.gitignore @@ -121,3 +121,6 @@ /nmstate-2.2.35.tar.gz /nmstate-2.2.35.tar.gz.asc /nmstate-vendor-2.2.35.tar.xz +/nmstate-2.2.39.tar.gz +/nmstate-2.2.39.tar.gz.asc +/nmstate-vendor-2.2.39.tar.xz diff --git a/README.packit b/README.packit index aeaae38..58044ba 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.99.0.post1.dev29+g2e75e6ff. +The file was generated using packit 0.104.0. diff --git a/nmstate.spec b/nmstate.spec index 3022a9b..350c825 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.35 +Version: 2.2.39 Release: %autorelease Summary: Declarative network manager API License: Apache-2.0 AND LGPL-2.1-or-later diff --git a/sources b/sources index 029479d..a198c9f 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (nmstate-2.2.35.tar.gz) = f546d7f99f1bf3ed13bf72c24913d895a01fca466bdd06dcfdbcb21bd3c20b42296bda667984f50e2041358dee1effed4de316e68a4e126c065b09711e3fa490 -SHA512 (nmstate-2.2.35.tar.gz.asc) = 5f19e5a9ea80733a82f93e21ab5bec79d78be3b46acb94f1e4b9c490f0af47ff7cb31a4f02784b5604fcdbaecbc6f2d28c1cacb870068b9951abe1aadc196a25 +SHA512 (nmstate-2.2.39.tar.gz) = 6e3314d80448d16b5ca1eb591749d122275aac56b5e8833f6a6306a79943b062f606924674e0726d90f185083bea264328f3d2c7972fc7186ce38d5523a1297c +SHA512 (nmstate-2.2.39.tar.gz.asc) = 768d59848a260f8a947691c2f098b240e56b181d7414a3f74e86e8df8ac57691e2a98ea4f80c22485b33d2dfeb8a616621e24f3c1e88b2e742c4a567f0af596e SHA512 (nmstate.gpg) = bfbf3620045f3c1f15eaf6877fd7407834a75d2650976f2327abd02ddb910aa34500f07a774dd17023c43dcba42a0ffc66f23cd6816fd9694acad2c5eed9e8d3 -SHA512 (nmstate-vendor-2.2.35.tar.xz) = 8747790b1bf6ff07f415526183772aac38bea1f2e0472c9e17c1876f1a4ae4912edbf66586981a4e608f712fabfb18591e413a14ba23eb651fe1fc60caa50f90 +SHA512 (nmstate-vendor-2.2.39.tar.xz) = 11e89e9cf6f5efd6d4420e6c3e42d8a3ef35c242bf91378e432851364e0f568f9f2273e04f512c5b8302e55f0c42d5eb8a445d115784943d84915651dc577aa9 From 4cbe1d99e6d3e4b50937f4e6a4065624203fbbda Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Fri, 29 Nov 2024 13:15:07 +0800 Subject: [PATCH 096/120] Upgrade nmstate-libs along with nmstate rpm when installed https://issues.redhat.com/browse/RHEL-52890 suggest nmstate rpm to depend on nmstate-libs when nmstate-libs installed, with this we can force upgrading both nmstate-libs and nmstate at the same time. It does not any dependency between nmstate and nmstate-libs as we are rust project, this is purely for user experience on manual rpm upgrade. Signed-off-by: Gris Ge --- nmstate.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nmstate.spec b/nmstate.spec index 350c825..03c7956 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -11,6 +11,9 @@ Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.g Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc Source2: https://nmstate.io/nmstate.gpg Source3: %{url}/releases/download/v%{version}/%{srcname}-vendor-%{version}.tar.xz +# Force nmstate-libs upgrade along with nmstate rpm when installed +# https://issues.redhat.com/browse/RHEL-52890 +Requires: (nmstate-libs%{?_isa} = %{version}-%{release} if nmstate-libs) BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: gnupg2 From d73ec668f25792624bcb4f75a4b671e4bd473fda Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 20:12:29 +0000 Subject: [PATCH 097/120] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From c60263f5c1f0a3912b8a638733ee22107d46f509 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 24 Jan 2025 11:43:39 +0000 Subject: [PATCH 098/120] Update to 2.2.40 upstream release - Resolves: rhbz#2341922 Upstream tag: v2.2.40 Upstream commit: c10a3f6f Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 3 +++ README.packit | 2 +- nmstate.spec | 2 +- sources | 6 +++--- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c546c70..d3ba4dd 100644 --- a/.gitignore +++ b/.gitignore @@ -124,3 +124,6 @@ /nmstate-2.2.39.tar.gz /nmstate-2.2.39.tar.gz.asc /nmstate-vendor-2.2.39.tar.xz +/nmstate-2.2.40.tar.gz +/nmstate-2.2.40.tar.gz.asc +/nmstate-vendor-2.2.40.tar.xz diff --git a/README.packit b/README.packit index 58044ba..8c905b9 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.104.0. +The file was generated using packit 0.106.0.post1.dev8+g521f1e1d. diff --git a/nmstate.spec b/nmstate.spec index 03c7956..d19e03c 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.39 +Version: 2.2.40 Release: %autorelease Summary: Declarative network manager API License: Apache-2.0 AND LGPL-2.1-or-later diff --git a/sources b/sources index a198c9f..2da947c 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (nmstate-2.2.39.tar.gz) = 6e3314d80448d16b5ca1eb591749d122275aac56b5e8833f6a6306a79943b062f606924674e0726d90f185083bea264328f3d2c7972fc7186ce38d5523a1297c -SHA512 (nmstate-2.2.39.tar.gz.asc) = 768d59848a260f8a947691c2f098b240e56b181d7414a3f74e86e8df8ac57691e2a98ea4f80c22485b33d2dfeb8a616621e24f3c1e88b2e742c4a567f0af596e +SHA512 (nmstate-2.2.40.tar.gz) = 513258ee5d8e03665c6f7a070e02e0ee1e7c4b6a2f28c92d1963edc9e31507af0b028c5c2214e44965aa25e11a167bf06b09013331a24ea95ac659e1682d55a2 +SHA512 (nmstate-2.2.40.tar.gz.asc) = 65dd897817a0326f6ed5bd1d014530100dd597826c12329acb8a50e7cb1c29cc29ef9abef1834bc3afc6852b25964af957e0afaea49290ffdac701e2a52c58bf SHA512 (nmstate.gpg) = bfbf3620045f3c1f15eaf6877fd7407834a75d2650976f2327abd02ddb910aa34500f07a774dd17023c43dcba42a0ffc66f23cd6816fd9694acad2c5eed9e8d3 -SHA512 (nmstate-vendor-2.2.39.tar.xz) = 11e89e9cf6f5efd6d4420e6c3e42d8a3ef35c242bf91378e432851364e0f568f9f2273e04f512c5b8302e55f0c42d5eb8a445d115784943d84915651dc577aa9 +SHA512 (nmstate-vendor-2.2.40.tar.xz) = 757b21c10d5b6a401cebaa132db0df200977a7793ceb60e1f90cfd687ad3d138c0125ed59aa4749d03c9ea733a6f05bbb574ddd034e848c7a0fabb8ef091c939 From 71bef322e879812b64736529b53265c9091a7ac5 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Mon, 24 Feb 2025 14:58:50 +0800 Subject: [PATCH 099/120] Upgrade 2.2.41 Signed-off-by: Gris Ge --- .gitignore | 3 +++ nmstate.spec | 6 +++--- sources | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index d3ba4dd..5deca8f 100644 --- a/.gitignore +++ b/.gitignore @@ -127,3 +127,6 @@ /nmstate-2.2.40.tar.gz /nmstate-2.2.40.tar.gz.asc /nmstate-vendor-2.2.40.tar.xz +/nmstate-2.2.41.tar.gz +/nmstate-2.2.41.tar.gz.asc +/nmstate-vendor-2.2.41.tar.xz diff --git a/nmstate.spec b/nmstate.spec index d19e03c..9efc416 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.40 +Version: 2.2.41 Release: %autorelease Summary: Declarative network manager API License: Apache-2.0 AND LGPL-2.1-or-later @@ -36,8 +36,8 @@ BuildRequires: (crate(serde_json/default) >= 1.0 with crate(serde_json/default) BuildRequires: (crate(serde_yaml/default) >= 0.9 with crate(serde_yaml/default) < 1.0) BuildRequires: (crate(uuid/v4) >= 1.1 with crate(uuid/v4) < 2.0) BuildRequires: (crate(uuid/v5) >= 1.1 with crate(uuid/v5) < 2.0) -BuildRequires: (crate(zbus/default) >= 1.9 with crate(zbus/default) < 2.0) -BuildRequires: (crate(zvariant/default) >= 2.10 with crate(zvariant/default) < 3.0) +BuildRequires: (crate(zbus/default) >= 5.1 with crate(zbus/default) < 6.0) +BuildRequires: (crate(zvariant/default) >= 5.1 with crate(zvariant/default) < 6.0) BuildRequires: (crate(nix/default) >= 0.26 with crate(nix/default) < 0.27) BuildRequires: (crate(toml/default) >= 0.8 with crate(toml/default) < 0.9) BuildRequires: (crate(tokio/default) >= 1.3 with crate(tokio/default) < 2.0) diff --git a/sources b/sources index 2da947c..f5511da 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (nmstate-2.2.40.tar.gz) = 513258ee5d8e03665c6f7a070e02e0ee1e7c4b6a2f28c92d1963edc9e31507af0b028c5c2214e44965aa25e11a167bf06b09013331a24ea95ac659e1682d55a2 -SHA512 (nmstate-2.2.40.tar.gz.asc) = 65dd897817a0326f6ed5bd1d014530100dd597826c12329acb8a50e7cb1c29cc29ef9abef1834bc3afc6852b25964af957e0afaea49290ffdac701e2a52c58bf +SHA512 (nmstate-2.2.41.tar.gz) = 73540613168af6cd8bf6d5d359c2c2fab0fe983a95afefbd01702a9c58c4459d9ce630cd1386be66dc2b169f2bc6dbf8c9053d186c403197e79a3c960de50f6e +SHA512 (nmstate-2.2.41.tar.gz.asc) = c0758ca9d4a417d59ed203d7ef514592bbfc207935f1498e4d0255074028338213dddb6164b89d34a85a0f2c008a0477dc326ef9a8b88cdc7bb48186d5edf899 +SHA512 (nmstate-vendor-2.2.41.tar.xz) = f299db97a4c89f46bb8a2a246772ddddf76bd14decca495087bc295d6a50c002c094f3d0554f3d022e249abc3ef0c7e69fc04e1ad1c85110fbd7b2276bfce337 SHA512 (nmstate.gpg) = bfbf3620045f3c1f15eaf6877fd7407834a75d2650976f2327abd02ddb910aa34500f07a774dd17023c43dcba42a0ffc66f23cd6816fd9694acad2c5eed9e8d3 -SHA512 (nmstate-vendor-2.2.40.tar.xz) = 757b21c10d5b6a401cebaa132db0df200977a7793ceb60e1f90cfd687ad3d138c0125ed59aa4749d03c9ea733a6f05bbb574ddd034e848c7a0fabb8ef091c939 From db95d29ae3aa23f1f324490381234e32e71c1c1c Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Mon, 24 Feb 2025 15:37:50 +0800 Subject: [PATCH 100/120] Fix rust-nmstate-query_apply-devel dependency Signed-off-by: Gris Ge --- nmstate.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nmstate.spec b/nmstate.spec index 9efc416..fd0d385 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -136,9 +136,9 @@ Summary: Rust crate of nmstate with query_apply feature BuildArch: noarch License: Apache-2.0 # https://bugzilla.redhat.com/show_bug.cgi?id=2161128 -Requires: (crate(nispor/default) >= 1.2.12 with crate(nispor/default) < 2.0) -Requires: (crate(nix/default) >= 0.24 with crate(nix/default) < 0.25) -Requires: (crate(zbus/default) >= 1.9 with crate(zbus/default) < 2.0) +Requires: (crate(nispor/default) >= 1.2.17 with crate(nispor/default) < 2.0) +Requires: (crate(nix/default) >= 0.26 with crate(nix/default) < 0.27) +Requires: (crate(zbus/default) >= 5.1 with crate(zbus/default) < 6.0) %description -n rust-%{name}+query_apply-devel This package contains library source intended for building other packages From 3bc67a4618b77fbe060a36575093d864ec0bda1b Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Wed, 5 Mar 2025 22:03:31 +0800 Subject: [PATCH 101/120] Upgrade to 2.2.42 Signed-off-by: Gris Ge --- .gitignore | 3 +++ nmstate.spec | 4 ++-- sources | 8 ++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5deca8f..b481501 100644 --- a/.gitignore +++ b/.gitignore @@ -130,3 +130,6 @@ /nmstate-2.2.41.tar.gz /nmstate-2.2.41.tar.gz.asc /nmstate-vendor-2.2.41.tar.xz +/nmstate-2.2.42.tar.gz +/nmstate-2.2.42.tar.gz.asc +/nmstate-vendor-2.2.42.tar.xz diff --git a/nmstate.spec b/nmstate.spec index fd0d385..9e2c8ac 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.41 +Version: 2.2.42 Release: %autorelease Summary: Declarative network manager API License: Apache-2.0 AND LGPL-2.1-or-later @@ -26,7 +26,7 @@ BuildRequires: rust-packaging BuildRequires: (crate(clap/cargo) >= 3.1 with crate(clap/cargo) < 4.0) BuildRequires: (crate(clap/default) >= 3.1 with crate(clap/default) < 4.0) BuildRequires: (crate(chrono/default) >= 0.4 with crate(chrono/default) < 0.5) -BuildRequires: (crate(env_logger/default) >= 0.10 with crate(env_logger/default) < 0.11) +BuildRequires: (crate(env_logger/default) >= 0.11 with crate(env_logger/default) < 0.12) BuildRequires: (crate(libc/default) >= 0.2 with crate(libc/default) < 0.3) BuildRequires: (crate(log/default) >= 0.4 with crate(log/default) < 0.5) BuildRequires: (crate(nispor/default) >= 1.2.17 with crate(nispor/default) < 2.0) diff --git a/sources b/sources index f5511da..d108f6c 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (nmstate-2.2.41.tar.gz) = 73540613168af6cd8bf6d5d359c2c2fab0fe983a95afefbd01702a9c58c4459d9ce630cd1386be66dc2b169f2bc6dbf8c9053d186c403197e79a3c960de50f6e -SHA512 (nmstate-2.2.41.tar.gz.asc) = c0758ca9d4a417d59ed203d7ef514592bbfc207935f1498e4d0255074028338213dddb6164b89d34a85a0f2c008a0477dc326ef9a8b88cdc7bb48186d5edf899 -SHA512 (nmstate-vendor-2.2.41.tar.xz) = f299db97a4c89f46bb8a2a246772ddddf76bd14decca495087bc295d6a50c002c094f3d0554f3d022e249abc3ef0c7e69fc04e1ad1c85110fbd7b2276bfce337 -SHA512 (nmstate.gpg) = bfbf3620045f3c1f15eaf6877fd7407834a75d2650976f2327abd02ddb910aa34500f07a774dd17023c43dcba42a0ffc66f23cd6816fd9694acad2c5eed9e8d3 +SHA512 (nmstate-2.2.42.tar.gz) = d15c6a9d30b630f44fbbc52fff785593a0a9626d5591f3bca04b8eeec4253862635aeac5f14deda0a47a6573f514cedacd0e03d5e6393ee730f3cde955f2ec43 +SHA512 (nmstate-2.2.42.tar.gz.asc) = 569eb451f28a24ba7786213c71504077a5a38241c59ea40daa52e1c823037175bbc1d374234039b41a740bc2ce2ac5eb0b86d42a25c23b3bcdc85f8072bd0603 +SHA512 (nmstate-vendor-2.2.42.tar.xz) = ae6d2da3d5bbd237cde846e918c18deaac57aec28f32c1ca5a066ed8c3a55f1de7afcdd54abedb0e040211a8ff033345637d9649ee52a2e004a823fc2886644d +SHA512 (nmstate.gpg) = 37452e2588d036ab3042d2d06503d678108b2f01c2320b1a5d641c0ba3396cd38971a583d3fac939ebb80d9fa90a62208c9d8b4f6199cd861e9107ff6ddb4f20 From cca6f2991f611efb41c39d302d44faee97fd19f4 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Wed, 2 Apr 2025 14:47:25 +0800 Subject: [PATCH 102/120] Upgrade to 2.2.43 Signed-off-by: Gris Ge --- .gitignore | 3 +++ nmstate.spec | 5 +++-- sources | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b481501..6317e92 100644 --- a/.gitignore +++ b/.gitignore @@ -133,3 +133,6 @@ /nmstate-2.2.42.tar.gz /nmstate-2.2.42.tar.gz.asc /nmstate-vendor-2.2.42.tar.xz +/nmstate-2.2.43.tar.gz +/nmstate-2.2.43.tar.gz.asc +/nmstate-vendor-2.2.43.tar.xz diff --git a/nmstate.spec b/nmstate.spec index 9e2c8ac..ae59171 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.42 +Version: 2.2.43 Release: %autorelease Summary: Declarative network manager API License: Apache-2.0 AND LGPL-2.1-or-later @@ -29,7 +29,7 @@ BuildRequires: (crate(chrono/default) >= 0.4 with crate(chrono/default) < 0.5) BuildRequires: (crate(env_logger/default) >= 0.11 with crate(env_logger/default) < 0.12) BuildRequires: (crate(libc/default) >= 0.2 with crate(libc/default) < 0.3) BuildRequires: (crate(log/default) >= 0.4 with crate(log/default) < 0.5) -BuildRequires: (crate(nispor/default) >= 1.2.17 with crate(nispor/default) < 2.0) +BuildRequires: (crate(nispor/default) >= 1.2.24 with crate(nispor/default) < 2.0) BuildRequires: (crate(serde/default) >= 1.0 with crate(serde/default) < 2.0) BuildRequires: (crate(serde/derive) >= 1.0 with crate(serde/derive) < 2.0) BuildRequires: (crate(serde_json/default) >= 1.0 with crate(serde_json/default) < 2.0) @@ -44,6 +44,7 @@ BuildRequires: (crate(tokio/default) >= 1.3 with crate(tokio/default) < 2.0) BuildRequires: (crate(tokio/net) >= 1.3 with crate(tokio/net) < 2.0) BuildRequires: (crate(tokio/rt) >= 1.3 with crate(tokio/rt) < 2.0) BuildRequires: (crate(tokio/signal) >= 1.3 with crate(tokio/signal) < 2.0) +BuildRequires: (crate(once_cell/default) >= 1.12 with crate(once_cell/default) < 2.0) %endif %description diff --git a/sources b/sources index d108f6c..19a95a4 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (nmstate-2.2.42.tar.gz) = d15c6a9d30b630f44fbbc52fff785593a0a9626d5591f3bca04b8eeec4253862635aeac5f14deda0a47a6573f514cedacd0e03d5e6393ee730f3cde955f2ec43 -SHA512 (nmstate-2.2.42.tar.gz.asc) = 569eb451f28a24ba7786213c71504077a5a38241c59ea40daa52e1c823037175bbc1d374234039b41a740bc2ce2ac5eb0b86d42a25c23b3bcdc85f8072bd0603 -SHA512 (nmstate-vendor-2.2.42.tar.xz) = ae6d2da3d5bbd237cde846e918c18deaac57aec28f32c1ca5a066ed8c3a55f1de7afcdd54abedb0e040211a8ff033345637d9649ee52a2e004a823fc2886644d +SHA512 (nmstate-2.2.43.tar.gz) = da463868331ec8416154906b49138de8bca1f84d1a2a6700d0daa1d34f85ed69ba2724efad07b600e444a960cddb622f2c2454337f84459ac3ae6b2a00697042 +SHA512 (nmstate-2.2.43.tar.gz.asc) = a11b64d9733703c4dcf4a9142df37544a15543434e8acaca14a8ae7affa98cfa86adfea7e1ca69c871ec25c4c5ed4d2bb54b525ff16aebfc79e1da84d0396d32 SHA512 (nmstate.gpg) = 37452e2588d036ab3042d2d06503d678108b2f01c2320b1a5d641c0ba3396cd38971a583d3fac939ebb80d9fa90a62208c9d8b4f6199cd861e9107ff6ddb4f20 +SHA512 (nmstate-vendor-2.2.43.tar.xz) = 202574a39010164766983fd315ca50a85b55ded54e253b6cd6e3970834f5107ce648646287bad0ce044ec21b8fca4fc64226183177147187a8bb3d1230e06ddb From 64c094a94c889109a4809450b5196d61b9ca7fec Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Tue, 8 Apr 2025 15:38:00 +0800 Subject: [PATCH 103/120] Add notes for bundle update with nispor and rust-netlink Signed-off-by: Gris Ge --- README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d1ae56e..2642134 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,10 @@ # nmstate -The nmstate package \ No newline at end of file +The nmstate package + +## Bundle update with rust-netlink and nispor + +When certain nmstate update requires new release of rust-netlink or nispor, +please check this document on correct procedure: + +https://docs.fedoraproject.org/en-US/package-maintainers/Package_Update_Guide/#multiple_packages From bed009cc94fc29c2d02a8bd53792456ddc5a2b73 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 17 Apr 2025 11:55:30 +0000 Subject: [PATCH 104/120] Update to 2.2.44 upstream release - Resolves: rhbz#2354855 Upstream tag: v2.2.44 Upstream commit: 0c2ab3b4 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 3 +++ README.packit | 2 +- nmstate.spec | 2 +- sources | 6 +++--- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6317e92..c729045 100644 --- a/.gitignore +++ b/.gitignore @@ -136,3 +136,6 @@ /nmstate-2.2.43.tar.gz /nmstate-2.2.43.tar.gz.asc /nmstate-vendor-2.2.43.tar.xz +/nmstate-2.2.44.tar.gz +/nmstate-2.2.44.tar.gz.asc +/nmstate-vendor-2.2.44.tar.xz diff --git a/README.packit b/README.packit index 8c905b9..807ffc6 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.106.0.post1.dev8+g521f1e1d. +The file was generated using packit 1.6.0.post1.dev2+gd5a7662a. diff --git a/nmstate.spec b/nmstate.spec index ae59171..7097a49 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.43 +Version: 2.2.44 Release: %autorelease Summary: Declarative network manager API License: Apache-2.0 AND LGPL-2.1-or-later diff --git a/sources b/sources index 19a95a4..cfe89e4 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (nmstate-2.2.43.tar.gz) = da463868331ec8416154906b49138de8bca1f84d1a2a6700d0daa1d34f85ed69ba2724efad07b600e444a960cddb622f2c2454337f84459ac3ae6b2a00697042 -SHA512 (nmstate-2.2.43.tar.gz.asc) = a11b64d9733703c4dcf4a9142df37544a15543434e8acaca14a8ae7affa98cfa86adfea7e1ca69c871ec25c4c5ed4d2bb54b525ff16aebfc79e1da84d0396d32 +SHA512 (nmstate-2.2.44.tar.gz) = 751206437d424891296de16e03e0f9c71e0b3385e35d5568625e846e5b0ba8dc3b48d3f9ec81af7423bdb38f625b5d09420f5b6c6aa29f62eb7f3b708e85b80c +SHA512 (nmstate-2.2.44.tar.gz.asc) = 520f193ff54d6076c444c666301135a0b6bb98fccbc989754fb18d291ff160189a0b91793d139c8ef52f7bb739d9a0e61562b4b9bd70d6297e1b3584ac40b466 SHA512 (nmstate.gpg) = 37452e2588d036ab3042d2d06503d678108b2f01c2320b1a5d641c0ba3396cd38971a583d3fac939ebb80d9fa90a62208c9d8b4f6199cd861e9107ff6ddb4f20 -SHA512 (nmstate-vendor-2.2.43.tar.xz) = 202574a39010164766983fd315ca50a85b55ded54e253b6cd6e3970834f5107ce648646287bad0ce044ec21b8fca4fc64226183177147187a8bb3d1230e06ddb +SHA512 (nmstate-vendor-2.2.44.tar.xz) = da61909d9e716c92cbbb9d31d14319679a5dbd3c95264e368d58d98ecfac68939ae3d0ec1ef4230304fe83bd45472e18f94dbd6dcc4d25aa3c4219ab3cb12fe8 From bb5b08abc6819b713dd6025c609dd89c1d27a40c Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 28 May 2025 02:47:39 +0000 Subject: [PATCH 105/120] Update to 2.2.45 upstream release - Resolves: rhbz#2368875 Upstream tag: v2.2.45 Upstream commit: 6a1574f9 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 3 +++ README.packit | 2 +- nmstate.spec | 2 +- sources | 6 +++--- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c729045..03c5193 100644 --- a/.gitignore +++ b/.gitignore @@ -139,3 +139,6 @@ /nmstate-2.2.44.tar.gz /nmstate-2.2.44.tar.gz.asc /nmstate-vendor-2.2.44.tar.xz +/nmstate-2.2.45.tar.gz +/nmstate-2.2.45.tar.gz.asc +/nmstate-vendor-2.2.45.tar.xz diff --git a/README.packit b/README.packit index 807ffc6..7e268b5 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.6.0.post1.dev2+gd5a7662a. +The file was generated using packit 1.8.0.post1.dev15+g39511efc. diff --git a/nmstate.spec b/nmstate.spec index 7097a49..716b2b3 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.44 +Version: 2.2.45 Release: %autorelease Summary: Declarative network manager API License: Apache-2.0 AND LGPL-2.1-or-later diff --git a/sources b/sources index cfe89e4..178cbd3 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (nmstate-2.2.44.tar.gz) = 751206437d424891296de16e03e0f9c71e0b3385e35d5568625e846e5b0ba8dc3b48d3f9ec81af7423bdb38f625b5d09420f5b6c6aa29f62eb7f3b708e85b80c -SHA512 (nmstate-2.2.44.tar.gz.asc) = 520f193ff54d6076c444c666301135a0b6bb98fccbc989754fb18d291ff160189a0b91793d139c8ef52f7bb739d9a0e61562b4b9bd70d6297e1b3584ac40b466 +SHA512 (nmstate-2.2.45.tar.gz) = 0e3927be5b1cd36eeaf015c36b9baf06f7fd309390d82587b412e868f9b23e2bd5d66a8e63bd4fd8d4ceb64d0633af7375f5d118f86575f76093a6f4b8a4c4b8 +SHA512 (nmstate-2.2.45.tar.gz.asc) = b1effbc1173fe71f7644d797bd5f0d277ce86c92f3b10cfe07073dfc7c7e893b974e6b5876042e6fd0efac9846eaa6ab4560f89b48b6f2d482c8d4e03e455d4a SHA512 (nmstate.gpg) = 37452e2588d036ab3042d2d06503d678108b2f01c2320b1a5d641c0ba3396cd38971a583d3fac939ebb80d9fa90a62208c9d8b4f6199cd861e9107ff6ddb4f20 -SHA512 (nmstate-vendor-2.2.44.tar.xz) = da61909d9e716c92cbbb9d31d14319679a5dbd3c95264e368d58d98ecfac68939ae3d0ec1ef4230304fe83bd45472e18f94dbd6dcc4d25aa3c4219ab3cb12fe8 +SHA512 (nmstate-vendor-2.2.45.tar.xz) = 5393f73a31da082aa8ce77bf4e8b75bb0d2d74630daa6cd0d4ae9a39f4dbdaaf8434cb25431b8152fb109230eb00b462359de878c323652e280d7d307c37f89f From 35709ca98f120c0555f5a67d24fc928e03894394 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 23:23:14 +0200 Subject: [PATCH 106/120] Rebuilt for Python 3.14 From b99a4454321ea0d59b0e251f7667873dbae121b4 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 23 Jun 2025 20:27:48 +0800 Subject: [PATCH 107/120] Update to 2.2.46 upstream release Upstream tag: v2.2.46 Upstream commit: e7fc66d4 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 3 +++ README.packit | 2 +- nmstate.spec | 4 ++-- sources | 6 +++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 03c5193..596e160 100644 --- a/.gitignore +++ b/.gitignore @@ -142,3 +142,6 @@ /nmstate-2.2.45.tar.gz /nmstate-2.2.45.tar.gz.asc /nmstate-vendor-2.2.45.tar.xz +/nmstate-2.2.46.tar.gz +/nmstate-2.2.46.tar.gz.asc +/nmstate-vendor-2.2.46.tar.xz diff --git a/README.packit b/README.packit index 7e268b5..e9ea630 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.8.0.post1.dev15+g39511efc. +The file was generated using packit 1.9.0.post1.dev2+gf07f9cb0. diff --git a/nmstate.spec b/nmstate.spec index 716b2b3..4c7b6c8 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.45 +Version: 2.2.46 Release: %autorelease Summary: Declarative network manager API License: Apache-2.0 AND LGPL-2.1-or-later @@ -38,7 +38,7 @@ BuildRequires: (crate(uuid/v4) >= 1.1 with crate(uuid/v4) < 2.0) BuildRequires: (crate(uuid/v5) >= 1.1 with crate(uuid/v5) < 2.0) BuildRequires: (crate(zbus/default) >= 5.1 with crate(zbus/default) < 6.0) BuildRequires: (crate(zvariant/default) >= 5.1 with crate(zvariant/default) < 6.0) -BuildRequires: (crate(nix/default) >= 0.26 with crate(nix/default) < 0.27) +BuildRequires: (crate(nix/default) >= 0.30 with crate(nix/default) < 0.31) BuildRequires: (crate(toml/default) >= 0.8 with crate(toml/default) < 0.9) BuildRequires: (crate(tokio/default) >= 1.3 with crate(tokio/default) < 2.0) BuildRequires: (crate(tokio/net) >= 1.3 with crate(tokio/net) < 2.0) diff --git a/sources b/sources index 178cbd3..45ca4c4 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (nmstate-2.2.45.tar.gz) = 0e3927be5b1cd36eeaf015c36b9baf06f7fd309390d82587b412e868f9b23e2bd5d66a8e63bd4fd8d4ceb64d0633af7375f5d118f86575f76093a6f4b8a4c4b8 -SHA512 (nmstate-2.2.45.tar.gz.asc) = b1effbc1173fe71f7644d797bd5f0d277ce86c92f3b10cfe07073dfc7c7e893b974e6b5876042e6fd0efac9846eaa6ab4560f89b48b6f2d482c8d4e03e455d4a +SHA512 (nmstate-2.2.46.tar.gz) = 7c274a65fa05c58218e7f227032cfbcd619b8b4c05c67d98ae621bddff3fe0670ccaf090a60c27aa8232200ab1c7dc8c4a1ad03a36ff172af21d43c7e510a8c9 +SHA512 (nmstate-2.2.46.tar.gz.asc) = 72c56b20efcf79d4cb85854f0ba065bde0b1d2587fecfab752fdde39bfc0ea3d1ae9695ba0193030dc7737d21e259aa55f708eff5fa273dbd9fb17d7be89e529 SHA512 (nmstate.gpg) = 37452e2588d036ab3042d2d06503d678108b2f01c2320b1a5d641c0ba3396cd38971a583d3fac939ebb80d9fa90a62208c9d8b4f6199cd861e9107ff6ddb4f20 -SHA512 (nmstate-vendor-2.2.45.tar.xz) = 5393f73a31da082aa8ce77bf4e8b75bb0d2d74630daa6cd0d4ae9a39f4dbdaaf8434cb25431b8152fb109230eb00b462359de878c323652e280d7d307c37f89f +SHA512 (nmstate-vendor-2.2.46.tar.xz) = b406d37bc82adad8da7faf78ec8730a668dcf76cac93c27354a0a7da95d5c7ae4faa9bc3ec5bfcf9750545d8b0dc1ef5aa4ee67c2707be57403924a4ab750bd3 From c219b9935e299435b7b7d7c5383c58d74155d016 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 10 Jul 2025 19:35:17 +0000 Subject: [PATCH 108/120] Update to 2.2.47 upstream release - Resolves: rhbz#2379363 Upstream tag: v2.2.47 Upstream commit: 6d01ecf6 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 3 +++ README.packit | 2 +- nmstate.spec | 2 +- sources | 6 +++--- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 596e160..1629018 100644 --- a/.gitignore +++ b/.gitignore @@ -145,3 +145,6 @@ /nmstate-2.2.46.tar.gz /nmstate-2.2.46.tar.gz.asc /nmstate-vendor-2.2.46.tar.xz +/nmstate-2.2.47.tar.gz +/nmstate-2.2.47.tar.gz.asc +/nmstate-vendor-2.2.47.tar.xz diff --git a/README.packit b/README.packit index e9ea630..dde2a46 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.9.0.post1.dev2+gf07f9cb0. +The file was generated using packit 1.9.0.post1.dev4+g48b4c222. diff --git a/nmstate.spec b/nmstate.spec index 4c7b6c8..520bb88 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.46 +Version: 2.2.47 Release: %autorelease Summary: Declarative network manager API License: Apache-2.0 AND LGPL-2.1-or-later diff --git a/sources b/sources index 45ca4c4..ef4a157 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (nmstate-2.2.46.tar.gz) = 7c274a65fa05c58218e7f227032cfbcd619b8b4c05c67d98ae621bddff3fe0670ccaf090a60c27aa8232200ab1c7dc8c4a1ad03a36ff172af21d43c7e510a8c9 -SHA512 (nmstate-2.2.46.tar.gz.asc) = 72c56b20efcf79d4cb85854f0ba065bde0b1d2587fecfab752fdde39bfc0ea3d1ae9695ba0193030dc7737d21e259aa55f708eff5fa273dbd9fb17d7be89e529 +SHA512 (nmstate-2.2.47.tar.gz) = e1f7628590b2925053a92f104484e3aa110395b9cf8f1c18283df291b290f9b75782f786b728bc8a45e5dc137664835df48c50a2cce5140194b92feba2629e22 +SHA512 (nmstate-2.2.47.tar.gz.asc) = 847b7e410785bc861f640c4d8cb2fbf5c1d927d0496ab5454996082b54255fecd115613e83a7d9ae67221bef9e0eb48c779e82c6f69a54f4c34aa37c9b1d5ad3 SHA512 (nmstate.gpg) = 37452e2588d036ab3042d2d06503d678108b2f01c2320b1a5d641c0ba3396cd38971a583d3fac939ebb80d9fa90a62208c9d8b4f6199cd861e9107ff6ddb4f20 -SHA512 (nmstate-vendor-2.2.46.tar.xz) = b406d37bc82adad8da7faf78ec8730a668dcf76cac93c27354a0a7da95d5c7ae4faa9bc3ec5bfcf9750545d8b0dc1ef5aa4ee67c2707be57403924a4ab750bd3 +SHA512 (nmstate-vendor-2.2.47.tar.xz) = d79731688277bc744125e2976bea19915cfb0414b237d924be22632499041e0e36819e53bc1ba5a5c20b01922418ee98211e5fc3ffe2003159890153d7105eba From 10a99f73541d9bba1751d2bfbbb7c5e894f7a64f Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Fri, 11 Jul 2025 10:07:53 +0800 Subject: [PATCH 109/120] test: Include error message Signed-off-by: Gris Ge --- tests/cli_query_reapply.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/cli_query_reapply.sh b/tests/cli_query_reapply.sh index 50cba9d..492857d 100755 --- a/tests/cli_query_reapply.sh +++ b/tests/cli_query_reapply.sh @@ -2,6 +2,8 @@ TMP_FILE=$(mktemp /tmp/nmstate.XXXXXX.yaml) -nmstatectl show > $TMP_FILE 2>/dev/null +nmstatectl show > $TMP_FILE -nmstatectl set $TMP_FILE 2>/dev/null +cat $TMP_FILE + +nmstatectl set $TMP_FILE 2>&1 From 80fe03c3497e4184a5c7896450972740c466352d Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Fri, 11 Jul 2025 23:55:19 +0800 Subject: [PATCH 110/120] Upgrade to 2.2.48 Signed-off-by: Gris Ge --- .gitignore | 3 +++ nmstate.spec | 2 +- sources | 8 ++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1629018..d2e09f1 100644 --- a/.gitignore +++ b/.gitignore @@ -148,3 +148,6 @@ /nmstate-2.2.47.tar.gz /nmstate-2.2.47.tar.gz.asc /nmstate-vendor-2.2.47.tar.xz +/nmstate-2.2.48.tar.gz +/nmstate-2.2.48.tar.gz.asc +/nmstate-vendor-2.2.48.tar.xz diff --git a/nmstate.spec b/nmstate.spec index 520bb88..b6f8762 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.47 +Version: 2.2.48 Release: %autorelease Summary: Declarative network manager API License: Apache-2.0 AND LGPL-2.1-or-later diff --git a/sources b/sources index ef4a157..952177a 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (nmstate-2.2.47.tar.gz) = e1f7628590b2925053a92f104484e3aa110395b9cf8f1c18283df291b290f9b75782f786b728bc8a45e5dc137664835df48c50a2cce5140194b92feba2629e22 -SHA512 (nmstate-2.2.47.tar.gz.asc) = 847b7e410785bc861f640c4d8cb2fbf5c1d927d0496ab5454996082b54255fecd115613e83a7d9ae67221bef9e0eb48c779e82c6f69a54f4c34aa37c9b1d5ad3 -SHA512 (nmstate.gpg) = 37452e2588d036ab3042d2d06503d678108b2f01c2320b1a5d641c0ba3396cd38971a583d3fac939ebb80d9fa90a62208c9d8b4f6199cd861e9107ff6ddb4f20 -SHA512 (nmstate-vendor-2.2.47.tar.xz) = d79731688277bc744125e2976bea19915cfb0414b237d924be22632499041e0e36819e53bc1ba5a5c20b01922418ee98211e5fc3ffe2003159890153d7105eba +SHA512 (nmstate-2.2.48.tar.gz) = 56b6810abb9ebbc1d98b8428f85367fc24748551d78963c4fab48a896e1cc656927c0eee102a218a519f4eb557e2e435a50a9745c393d8b2644d7a88fca5606e +SHA512 (nmstate-2.2.48.tar.gz.asc) = 8527ea6d8e816d556eb9702a3fdcf02fda0ceb72a6439e4cc3015f934074addcaa437e701841c111699b9e800c16c4797f2e376cbb9dd4a73bb0eef1a0daa5a6 +SHA512 (nmstate.gpg) = e465239bc2a037457c5cb105f69cb033c092708285689f906b5e40cae01e12629bec1cdee7eb6aa3a327e4fc93dfd5ce0e006b295fe5ced8df039f9098cef0bc +SHA512 (nmstate-vendor-2.2.48.tar.xz) = f646d16b757694f561084a9161562fe36aee34b9f08f15da884ab588030b6f77c157310194d98f21a31c94d1ac037a54aa597307577dcd94948e84ad9ff2a4b3 From e14d59ed1055f30181849d8813a723ae1dc40b81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=8D=C3=B1igo=20Huguet?= Date: Fri, 11 Jul 2025 09:46:39 +0200 Subject: [PATCH 111/120] python: use pyproject macros MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Macros based on directly calling to setup.py (%py3_*) has been deprecated and will be removed in the future. Macros based on pyproject.toml (%pyproject_*) should be used now. See https://fedoraproject.org/wiki/Changes/DeprecateSetuppyMacros. Switch to the new macros. Signed-off-by: Íñigo Huguet --- nmstate.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/nmstate.spec b/nmstate.spec index b6f8762..fc4ba4b 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -15,7 +15,6 @@ Source3: %{url}/releases/download/v%{version}/%{srcname}-vendor-%{version # https://issues.redhat.com/browse/RHEL-52890 Requires: (nmstate-libs%{?_isa} = %{version}-%{release} if nmstate-libs) BuildRequires: python3-devel -BuildRequires: python3-setuptools BuildRequires: gnupg2 BuildRequires: systemd-devel BuildRequires: systemd-rpm-macros @@ -47,6 +46,11 @@ BuildRequires: (crate(tokio/signal) >= 1.3 with crate(tokio/signal) < 2.0) BuildRequires: (crate(once_cell/default) >= 1.12 with crate(once_cell/default) < 2.0) %endif +%generate_buildrequires +pushd rust/src/python >/dev/null +%pyproject_buildrequires +popd >/dev/null + %description Nmstate is a library with an accompanying command line tool that manages host networking settings in a declarative manner and aimed to satisfy enterprise @@ -182,7 +186,7 @@ pushd rust popd pushd rust/src/python -%py3_build +%pyproject_wheel popd %install @@ -193,7 +197,7 @@ env SKIP_PYTHON_INSTALL=1 \ %make_install pushd rust/src/python -%py3_install +%pyproject_install popd %if ! 0%{?rhel} @@ -239,7 +243,7 @@ popd %files -n python3-%{libname} %license LICENSE %{python3_sitelib}/%{libname} -%{python3_sitelib}/%{srcname}-*.egg-info/ +%{python3_sitelib}/%{srcname}-*.dist-info/ %files static %{_libdir}/libnmstate.a From ce71231b52856fab91f52044e1d7ff82f9c9d6c8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:52:25 +0000 Subject: [PATCH 112/120] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From ba8c42c768e759dc7281bf4e2a060fbf831863c2 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 1 Aug 2025 13:12:37 +0000 Subject: [PATCH 113/120] Update to 2.2.49 upstream release - Resolves: rhbz#2385933 Upstream tag: v2.2.49 Upstream commit: 30da87be Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 3 +++ README.packit | 2 +- nmstate.spec | 2 +- sources | 6 +++--- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d2e09f1..991696e 100644 --- a/.gitignore +++ b/.gitignore @@ -151,3 +151,6 @@ /nmstate-2.2.48.tar.gz /nmstate-2.2.48.tar.gz.asc /nmstate-vendor-2.2.48.tar.xz +/nmstate-2.2.49.tar.gz +/nmstate-2.2.49.tar.gz.asc +/nmstate-vendor-2.2.49.tar.xz diff --git a/README.packit b/README.packit index dde2a46..3ad54d6 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.9.0.post1.dev4+g48b4c222. +The file was generated using packit 1.11.0. diff --git a/nmstate.spec b/nmstate.spec index fc4ba4b..0f68083 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.48 +Version: 2.2.49 Release: %autorelease Summary: Declarative network manager API License: Apache-2.0 AND LGPL-2.1-or-later diff --git a/sources b/sources index 952177a..a154339 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (nmstate-2.2.48.tar.gz) = 56b6810abb9ebbc1d98b8428f85367fc24748551d78963c4fab48a896e1cc656927c0eee102a218a519f4eb557e2e435a50a9745c393d8b2644d7a88fca5606e -SHA512 (nmstate-2.2.48.tar.gz.asc) = 8527ea6d8e816d556eb9702a3fdcf02fda0ceb72a6439e4cc3015f934074addcaa437e701841c111699b9e800c16c4797f2e376cbb9dd4a73bb0eef1a0daa5a6 +SHA512 (nmstate-2.2.49.tar.gz) = 6ae7504f6b95740faa52db0fbf93f518e58884f51c29277c28eb2472d77c44de8aa916eb32205341627640d04d6fe0bd387ab8bef906bc950560139e2a926d9f +SHA512 (nmstate-2.2.49.tar.gz.asc) = 0ae41fb6486df49ea4f954eaa73a17085bb100928fa82aa46602f5ab701cd7816159777643af6b32bb59f91b601cc8ef1b3cbddd4914d8afec9eac152c10dca4 SHA512 (nmstate.gpg) = e465239bc2a037457c5cb105f69cb033c092708285689f906b5e40cae01e12629bec1cdee7eb6aa3a327e4fc93dfd5ce0e006b295fe5ced8df039f9098cef0bc -SHA512 (nmstate-vendor-2.2.48.tar.xz) = f646d16b757694f561084a9161562fe36aee34b9f08f15da884ab588030b6f77c157310194d98f21a31c94d1ac037a54aa597307577dcd94948e84ad9ff2a4b3 +SHA512 (nmstate-vendor-2.2.49.tar.xz) = c400c81381d024cb200a750efaa79e417a752a4908181667532c467f36854c7c6debe81cdbadb3e10c53dd06c7983fa99809aea1c8cecdc757a9241ab12f0e58 From f960cf8bdae9c36f4e991f05c62981f66ebaba65 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 13:02:31 +0200 Subject: [PATCH 114/120] Rebuilt for Python 3.14.0rc2 bytecode From a6c562ce45dca98ebb4a01c378cfed0deae4f0d0 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 27 Aug 2025 10:36:33 +0800 Subject: [PATCH 115/120] Update to 2.2.50 upstream release - Resolves: rhbz#2391026 Upstream tag: v2.2.50 Upstream commit: 13aa57ed Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 3 +++ README.packit | 2 +- nmstate.spec | 4 ++-- sources | 6 +++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 991696e..1d56b6a 100644 --- a/.gitignore +++ b/.gitignore @@ -154,3 +154,6 @@ /nmstate-2.2.49.tar.gz /nmstate-2.2.49.tar.gz.asc /nmstate-vendor-2.2.49.tar.xz +/nmstate-2.2.50.tar.gz +/nmstate-2.2.50.tar.gz.asc +/nmstate-vendor-2.2.50.tar.xz diff --git a/README.packit b/README.packit index 3ad54d6..fb341a1 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.11.0. +The file was generated using packit 1.11.0.post1.dev7+gfdcdf3a32. diff --git a/nmstate.spec b/nmstate.spec index 0f68083..a0e2478 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.49 +Version: 2.2.50 Release: %autorelease Summary: Declarative network manager API License: Apache-2.0 AND LGPL-2.1-or-later @@ -38,7 +38,7 @@ BuildRequires: (crate(uuid/v5) >= 1.1 with crate(uuid/v5) < 2.0) BuildRequires: (crate(zbus/default) >= 5.1 with crate(zbus/default) < 6.0) BuildRequires: (crate(zvariant/default) >= 5.1 with crate(zvariant/default) < 6.0) BuildRequires: (crate(nix/default) >= 0.30 with crate(nix/default) < 0.31) -BuildRequires: (crate(toml/default) >= 0.8 with crate(toml/default) < 0.9) +BuildRequires: (crate(toml/default) >= 0.9 with crate(toml/default) < 1.0) BuildRequires: (crate(tokio/default) >= 1.3 with crate(tokio/default) < 2.0) BuildRequires: (crate(tokio/net) >= 1.3 with crate(tokio/net) < 2.0) BuildRequires: (crate(tokio/rt) >= 1.3 with crate(tokio/rt) < 2.0) diff --git a/sources b/sources index a154339..42a8b57 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (nmstate-2.2.49.tar.gz) = 6ae7504f6b95740faa52db0fbf93f518e58884f51c29277c28eb2472d77c44de8aa916eb32205341627640d04d6fe0bd387ab8bef906bc950560139e2a926d9f -SHA512 (nmstate-2.2.49.tar.gz.asc) = 0ae41fb6486df49ea4f954eaa73a17085bb100928fa82aa46602f5ab701cd7816159777643af6b32bb59f91b601cc8ef1b3cbddd4914d8afec9eac152c10dca4 +SHA512 (nmstate-2.2.50.tar.gz) = f3045d40d4e03f32638255012e0569b6c5e8631b9b691b3aaad957de331bce604b58a4bc8d2274c0844d22adade106abb8c3f7a90ad742bcc91ac438b554683b +SHA512 (nmstate-2.2.50.tar.gz.asc) = 7fc0f0d7aa08b84ccb225ff86846a37a4c3e1267ca0d5cbae39f3eced24ebe3264c952ebc4ba973b188c302c1442da007c8090e56fd5242e9194ddf3434e0e48 SHA512 (nmstate.gpg) = e465239bc2a037457c5cb105f69cb033c092708285689f906b5e40cae01e12629bec1cdee7eb6aa3a327e4fc93dfd5ce0e006b295fe5ced8df039f9098cef0bc -SHA512 (nmstate-vendor-2.2.49.tar.xz) = c400c81381d024cb200a750efaa79e417a752a4908181667532c467f36854c7c6debe81cdbadb3e10c53dd06c7983fa99809aea1c8cecdc757a9241ab12f0e58 +SHA512 (nmstate-vendor-2.2.50.tar.xz) = 701304897580d4b6ac2b75da202ef975555d3af38ee1ef226811c93bcb1fd58ca022bde5218614e437071f761f461220577c3ba1a162825d9a7fef008a16bfc1 From e7c2375e1fcacdc48cda2b9496843d38870b2886 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Thu, 18 Sep 2025 21:40:18 +0800 Subject: [PATCH 116/120] Upgrade to 2.2.52 Signed-off-by: Gris Ge --- .gitignore | 3 +++ nmstate.spec | 5 +++-- sources | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1d56b6a..7503250 100644 --- a/.gitignore +++ b/.gitignore @@ -157,3 +157,6 @@ /nmstate-2.2.50.tar.gz /nmstate-2.2.50.tar.gz.asc /nmstate-vendor-2.2.50.tar.xz +/nmstate-2.2.52.tar.gz +/nmstate-2.2.52.tar.gz.asc +/nmstate-vendor-2.2.52.tar.xz diff --git a/nmstate.spec b/nmstate.spec index a0e2478..cc653db 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.50 +Version: 2.2.52 Release: %autorelease Summary: Declarative network manager API License: Apache-2.0 AND LGPL-2.1-or-later @@ -28,7 +28,7 @@ BuildRequires: (crate(chrono/default) >= 0.4 with crate(chrono/default) < 0.5) BuildRequires: (crate(env_logger/default) >= 0.11 with crate(env_logger/default) < 0.12) BuildRequires: (crate(libc/default) >= 0.2 with crate(libc/default) < 0.3) BuildRequires: (crate(log/default) >= 0.4 with crate(log/default) < 0.5) -BuildRequires: (crate(nispor/default) >= 1.2.24 with crate(nispor/default) < 2.0) +BuildRequires: (crate(nispor/default) >= 1.2.27 with crate(nispor/default) < 2.0) BuildRequires: (crate(serde/default) >= 1.0 with crate(serde/default) < 2.0) BuildRequires: (crate(serde/derive) >= 1.0 with crate(serde/derive) < 2.0) BuildRequires: (crate(serde_json/default) >= 1.0 with crate(serde_json/default) < 2.0) @@ -43,6 +43,7 @@ BuildRequires: (crate(tokio/default) >= 1.3 with crate(tokio/default) < 2.0) BuildRequires: (crate(tokio/net) >= 1.3 with crate(tokio/net) < 2.0) BuildRequires: (crate(tokio/rt) >= 1.3 with crate(tokio/rt) < 2.0) BuildRequires: (crate(tokio/signal) >= 1.3 with crate(tokio/signal) < 2.0) +BuildRequires: (crate(tokio/time) >= 1.3 with crate(tokio/time) < 2.0) BuildRequires: (crate(once_cell/default) >= 1.12 with crate(once_cell/default) < 2.0) %endif diff --git a/sources b/sources index 42a8b57..6dcac2f 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (nmstate-2.2.50.tar.gz) = f3045d40d4e03f32638255012e0569b6c5e8631b9b691b3aaad957de331bce604b58a4bc8d2274c0844d22adade106abb8c3f7a90ad742bcc91ac438b554683b -SHA512 (nmstate-2.2.50.tar.gz.asc) = 7fc0f0d7aa08b84ccb225ff86846a37a4c3e1267ca0d5cbae39f3eced24ebe3264c952ebc4ba973b188c302c1442da007c8090e56fd5242e9194ddf3434e0e48 +SHA512 (nmstate-2.2.52.tar.gz) = d7badf43c9c471d17a792da274f63d39daff0d67580f0ab819cffbccaaca3a1f21d33944001a57ceab4b251a8d361729c990e698f6f7708d9e8e77c106d39984 +SHA512 (nmstate-2.2.52.tar.gz.asc) = 4264c8f7bf841909730e4aec187ddab7416c4a443dce679a5fa5c61fac9032c31aa43d85488fe9146d8747008624750efa58bee923cd30288ef2c1e1655ff612 +SHA512 (nmstate-vendor-2.2.52.tar.xz) = 0699857e3c617cd2df264c01c30678c3c0eea180422d08bf774b42ce108e06bf94a92b8152a5836f24b390c3ae9ee898454e23a42ea30afa9e8a395ad8e813f4 SHA512 (nmstate.gpg) = e465239bc2a037457c5cb105f69cb033c092708285689f906b5e40cae01e12629bec1cdee7eb6aa3a327e4fc93dfd5ce0e006b295fe5ced8df039f9098cef0bc -SHA512 (nmstate-vendor-2.2.50.tar.xz) = 701304897580d4b6ac2b75da202ef975555d3af38ee1ef226811c93bcb1fd58ca022bde5218614e437071f761f461220577c3ba1a162825d9a7fef008a16bfc1 From bdb03f4c306d77c6a576b8e746285cfc90f9efa8 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:33:05 +0200 Subject: [PATCH 117/120] Rebuilt for Python 3.14.0rc3 bytecode From 23abcc69eed89d6535232d48ebeb06900e95add4 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 20 Oct 2025 16:42:02 +0000 Subject: [PATCH 118/120] Update to 2.2.54 upstream release - Resolves: rhbz#2405107 Upstream tag: v2.2.54 Upstream commit: 5a034cb5 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 3 +++ nmstate.spec | 2 +- sources | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7503250..8c87030 100644 --- a/.gitignore +++ b/.gitignore @@ -160,3 +160,6 @@ /nmstate-2.2.52.tar.gz /nmstate-2.2.52.tar.gz.asc /nmstate-vendor-2.2.52.tar.xz +/nmstate-2.2.54.tar.gz +/nmstate-2.2.54.tar.gz.asc +/nmstate-vendor-2.2.54.tar.xz diff --git a/nmstate.spec b/nmstate.spec index cc653db..e505c87 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.52 +Version: 2.2.54 Release: %autorelease Summary: Declarative network manager API License: Apache-2.0 AND LGPL-2.1-or-later diff --git a/sources b/sources index 6dcac2f..fbde385 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (nmstate-2.2.52.tar.gz) = d7badf43c9c471d17a792da274f63d39daff0d67580f0ab819cffbccaaca3a1f21d33944001a57ceab4b251a8d361729c990e698f6f7708d9e8e77c106d39984 -SHA512 (nmstate-2.2.52.tar.gz.asc) = 4264c8f7bf841909730e4aec187ddab7416c4a443dce679a5fa5c61fac9032c31aa43d85488fe9146d8747008624750efa58bee923cd30288ef2c1e1655ff612 -SHA512 (nmstate-vendor-2.2.52.tar.xz) = 0699857e3c617cd2df264c01c30678c3c0eea180422d08bf774b42ce108e06bf94a92b8152a5836f24b390c3ae9ee898454e23a42ea30afa9e8a395ad8e813f4 +SHA512 (nmstate-2.2.54.tar.gz) = ebb2150fefd8694a3986d4ca01568920a69380af960572539de589fd6065eb163b854f8734cc52a3e46bebbce2c930b4b655f977b81bf7c04fca962d0081ed9a +SHA512 (nmstate-2.2.54.tar.gz.asc) = 9d0da33b85d54af4293d7cd20608f3f653c89887e312a20c31661d9aab84b60f52ccdc3d525615c2d3e58f0cc50a93467c2a99c0e4687a7d53d5050c7934c16a SHA512 (nmstate.gpg) = e465239bc2a037457c5cb105f69cb033c092708285689f906b5e40cae01e12629bec1cdee7eb6aa3a327e4fc93dfd5ce0e006b295fe5ced8df039f9098cef0bc +SHA512 (nmstate-vendor-2.2.54.tar.xz) = ee6e808d00087dc4ba476bf512eb2413deb7a0879bfa1f03d01b71d54f6c014baa2c0c5fb38a11ac0e1ba116e215b556d0a96db16ada9e71238872d2906dedd6 From 0ca843f2ec6b6e5f211ab19d595ae95ebfc2000b Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 12 Nov 2025 08:47:25 +0000 Subject: [PATCH 119/120] Update to 2.2.55 upstream release - Resolves: rhbz#2414345 Upstream tag: v2.2.55 Upstream commit: 4d343091 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 3 +++ README.packit | 2 +- nmstate.spec | 2 +- sources | 6 +++--- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 8c87030..6111c36 100644 --- a/.gitignore +++ b/.gitignore @@ -163,3 +163,6 @@ /nmstate-2.2.54.tar.gz /nmstate-2.2.54.tar.gz.asc /nmstate-vendor-2.2.54.tar.xz +/nmstate-2.2.55.tar.gz +/nmstate-2.2.55.tar.gz.asc +/nmstate-vendor-2.2.55.tar.xz diff --git a/README.packit b/README.packit index fb341a1..e03362b 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.11.0.post1.dev7+gfdcdf3a32. +The file was generated using packit 1.12.0.post1.dev13+gd51655c23. diff --git a/nmstate.spec b/nmstate.spec index e505c87..b75f7e6 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.54 +Version: 2.2.55 Release: %autorelease Summary: Declarative network manager API License: Apache-2.0 AND LGPL-2.1-or-later diff --git a/sources b/sources index fbde385..6983c26 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (nmstate-2.2.54.tar.gz) = ebb2150fefd8694a3986d4ca01568920a69380af960572539de589fd6065eb163b854f8734cc52a3e46bebbce2c930b4b655f977b81bf7c04fca962d0081ed9a -SHA512 (nmstate-2.2.54.tar.gz.asc) = 9d0da33b85d54af4293d7cd20608f3f653c89887e312a20c31661d9aab84b60f52ccdc3d525615c2d3e58f0cc50a93467c2a99c0e4687a7d53d5050c7934c16a +SHA512 (nmstate-2.2.55.tar.gz) = 4879266dcf550cc3dd3f118d3dc84b90157c1858fcb2c90934a3c23a07afe1e6e2b983e2bd545f42446ca031da0e0fbf5530b94b32b44d15125eeeed19aff60b +SHA512 (nmstate-2.2.55.tar.gz.asc) = c311a5f2512719892e16c371d530292e25c8a477cb84b420515f772e9c716214d288026b298c5aca1b784f9b42c3112b7871dd1969f61b0f350e83a5a76735b0 SHA512 (nmstate.gpg) = e465239bc2a037457c5cb105f69cb033c092708285689f906b5e40cae01e12629bec1cdee7eb6aa3a327e4fc93dfd5ce0e006b295fe5ced8df039f9098cef0bc -SHA512 (nmstate-vendor-2.2.54.tar.xz) = ee6e808d00087dc4ba476bf512eb2413deb7a0879bfa1f03d01b71d54f6c014baa2c0c5fb38a11ac0e1ba116e215b556d0a96db16ada9e71238872d2906dedd6 +SHA512 (nmstate-vendor-2.2.55.tar.xz) = 770fe12d8bc20314da3d4697b4b662e3c33d22d6e5755aacee43b5f82ddcd54a95910646f840c070649ea1a7305d2008691c2590f43f36213698c74e18a31fb8 From 7d49e3addca9b88d768dfa3279d4b980be141b09 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Tue, 9 Dec 2025 20:51:02 +0800 Subject: [PATCH 120/120] Upgrade to 2.2.57 Signed-off-by: Gris Ge --- .gitignore | 3 +++ nmstate.spec | 6 ++++-- sources | 6 +++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6111c36..229737a 100644 --- a/.gitignore +++ b/.gitignore @@ -166,3 +166,6 @@ /nmstate-2.2.55.tar.gz /nmstate-2.2.55.tar.gz.asc /nmstate-vendor-2.2.55.tar.xz +/nmstate-2.2.57.tar.gz +/nmstate-2.2.57.tar.gz.asc +/nmstate-vendor-2.2.57.tar.xz diff --git a/nmstate.spec b/nmstate.spec index b75f7e6..172d11c 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -2,7 +2,7 @@ %define libname libnmstate Name: nmstate -Version: 2.2.55 +Version: 2.2.57 Release: %autorelease Summary: Declarative network manager API License: Apache-2.0 AND LGPL-2.1-or-later @@ -24,7 +24,9 @@ BuildRequires: rust-toolset BuildRequires: rust-packaging BuildRequires: (crate(clap/cargo) >= 3.1 with crate(clap/cargo) < 4.0) BuildRequires: (crate(clap/default) >= 3.1 with crate(clap/default) < 4.0) -BuildRequires: (crate(chrono/default) >= 0.4 with crate(chrono/default) < 0.5) +BuildRequires: (crate(time/std) >= 0.3 with crate(time/std) < 0.4) +BuildRequires: (crate(time/formatting) >= 0.3 with crate(time/formatting) < 0.4) +BuildRequires: (crate(time/parsing) >= 0.3 with crate(time/parsing) < 0.4) BuildRequires: (crate(env_logger/default) >= 0.11 with crate(env_logger/default) < 0.12) BuildRequires: (crate(libc/default) >= 0.2 with crate(libc/default) < 0.3) BuildRequires: (crate(log/default) >= 0.4 with crate(log/default) < 0.5) diff --git a/sources b/sources index 6983c26..93fcb0a 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (nmstate-2.2.55.tar.gz) = 4879266dcf550cc3dd3f118d3dc84b90157c1858fcb2c90934a3c23a07afe1e6e2b983e2bd545f42446ca031da0e0fbf5530b94b32b44d15125eeeed19aff60b -SHA512 (nmstate-2.2.55.tar.gz.asc) = c311a5f2512719892e16c371d530292e25c8a477cb84b420515f772e9c716214d288026b298c5aca1b784f9b42c3112b7871dd1969f61b0f350e83a5a76735b0 +SHA512 (nmstate-2.2.57.tar.gz) = b203455ce70e8c2f0e0d67d0b57ded8da1a8a6492bc636412b4682d15453cdb694cf33b1c84498ab50e3a42a79d3a763ef3316943b356ccab5f858df03fd0a63 +SHA512 (nmstate-2.2.57.tar.gz.asc) = 972de00f4b4e18410c5aa6a6d23606ceda496c18747f7ba95e6602f21f24f8b3eaffe1d3e82aaf3e529592989f12ce1198b40c8b83abb6b7d108666b56ec7359 SHA512 (nmstate.gpg) = e465239bc2a037457c5cb105f69cb033c092708285689f906b5e40cae01e12629bec1cdee7eb6aa3a327e4fc93dfd5ce0e006b295fe5ced8df039f9098cef0bc -SHA512 (nmstate-vendor-2.2.55.tar.xz) = 770fe12d8bc20314da3d4697b4b662e3c33d22d6e5755aacee43b5f82ddcd54a95910646f840c070649ea1a7305d2008691c2590f43f36213698c74e18a31fb8 +SHA512 (nmstate-vendor-2.2.57.tar.xz) = 88c69f1f20367acd858b25bb0e834ae7b21b4291d90b0ed62dd33c9a427f845b98fa56ba6b8d4228bc6c807f2293d77f4cd6ed7a568e6ceff19c875ef3bea6dd