Merge branch 'rawhide' into f35

Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>

.gitignore

@@ -77,95 +77,3 @@
 /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
-/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
-/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
-/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
-/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
-/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
-/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
-/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
-/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
-/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
-/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
-/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
-/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
-/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
-/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
-/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
-/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

.packit.yaml

@@ -1,29 +0,0 @@
----
-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

README.md

@@ -1,10 +1,3 @@
 # nmstate
 
-The nmstate package
+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

README.packit

@@ -1,3 +0,0 @@
-This repository is maintained by packit.
-https://packit.dev/
-The file was generated using packit 1.12.0.post1.dev13+gd51655c23.

nmstate.spec

@@ -2,57 +2,37 @@
 %define libname libnmstate
 
 Name:           nmstate
-Version:        2.2.57
+Version:        2.1.4
-Release:        %autorelease
+Release:        1%{?dist}
 Summary:        Declarative network manager API
-License:        Apache-2.0 AND LGPL-2.1-or-later
+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
-Source3:        %{url}/releases/download/v%{version}/%{srcname}-vendor-%{version}.tar.xz
+BuildRequires:  patchelf
-# 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
 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(ipnet/default) >= 2.5 with crate(ipnet/default) < 3.0)
-BuildRequires:  (crate(clap/default) >= 3.1 with crate(clap/default) < 4.0)
-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)
-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)
-BuildRequires:  (crate(serde_yaml/default) >= 0.9 with crate(serde_yaml/default) < 1.0)
+BuildRequires:  (crate(serde_yaml/default) >= 0.8 with crate(serde_yaml/default) < 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) >= 5.1 with crate(zbus/default) < 6.0)
+BuildRequires:  (crate(zbus/default) >= 1.9 with crate(zbus/default) < 2.0)
-BuildRequires:  (crate(zvariant/default) >= 5.1 with crate(zvariant/default) < 6.0)
+BuildRequires:  (crate(zvariant/default) >= 2.10 with crate(zvariant/default) < 3.0)
-BuildRequires:  (crate(nix/default) >= 0.30 with crate(nix/default) < 0.31)
+BuildRequires:  (crate(log/default) >= 0.4 with crate(log/default) < 0.5)
-BuildRequires:  (crate(toml/default) >= 0.9 with crate(toml/default) < 1.0)
+BuildRequires:  (crate(libc/default) >= 0.2 with crate(libc/default) < 0.3)
-BuildRequires:  (crate(tokio/default) >= 1.3 with crate(tokio/default) < 2.0)
+BuildRequires:  (crate(clap/default) >= 3.1 with crate(clap/default) < 4.0)
-BuildRequires:  (crate(tokio/net) >= 1.3 with crate(tokio/net) < 2.0)
+BuildRequires:  (crate(clap/cargo) >= 3.1 with crate(clap/cargo) < 4.0)
-BuildRequires:  (crate(tokio/rt) >= 1.3 with crate(tokio/rt) < 2.0)
+BuildRequires:  (crate(ctrlc/default) >= 3.2 with crate(ctrlc/default) < 4.0)
-BuildRequires:  (crate(tokio/signal) >= 1.3 with crate(tokio/signal) < 2.0)
+BuildRequires:  (crate(env_logger/default) >= 0.9 with crate(env_logger/default) < 1.0)
-BuildRequires:  (crate(tokio/time) >= 1.3 with crate(tokio/time) < 2.0)
+BuildRequires:  (crate(nispor/default) >= 1.2.7 with crate(nispor/default) < 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
@@ -68,7 +48,7 @@ Summary:        C binding of nmstate
 Recommends:     NetworkManager
 # Avoid automatically generated profiles
 Recommends:     NetworkManager-config-server
-License:        Apache-2.0
+License:        ASL 2.0
 
 %description libs
 C binding of nmstate.
@@ -77,7 +57,7 @@ C binding of nmstate.
 Summary:        Development files for nmstate
 Group:          Development/Libraries
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
-License:        Apache-2.0
+License:        ASL 2.0
 
 %description devel
 Development files of nmstate C binding.
@@ -85,7 +65,6 @@ 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
@@ -106,16 +85,13 @@ 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.
 
-%if ! 0%{?rhel}
 %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
@@ -124,72 +100,29 @@ 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
 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
-which use "%{name}" crate with gen_conf feature.
-
-%package -n rust-%{name}+query_apply-devel
-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.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
-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
 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
-%if 0%{?rhel}
+rm .cargo/config.toml
-mv ../vendor ./
-%cargo_prep -v vendor
-%else
 %cargo_prep
-%endif
 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
-%pyproject_wheel
+%py3_build
 popd
 
 %install
@@ -198,33 +131,19 @@ 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
-%pyproject_install
+%py3_install
 popd
 
-%if ! 0%{?rhel}
 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
 
 %files
 %doc README.md
-%license LICENSE.dependencies
-%if 0%{?rhel}
-%license rust/cargo-vendor.txt
-%endif
 %doc examples/
 %{_mandir}/man8/nmstatectl.8*
 %{_mandir}/man8/nmstate-autoconf.8*
@@ -246,12 +165,11 @@ popd
 %files -n python3-%{libname}
 %license LICENSE
 %{python3_sitelib}/%{libname}
-%{python3_sitelib}/%{srcname}-*.dist-info/
+%{python3_sitelib}/%{srcname}-*.egg-info/
 
 %files static
 %{_libdir}/libnmstate.a
 
-%if ! 0%{?rhel}
 %files -n rust-%{name}-devel
 %license LICENSE
 %{cargo_registry}/%{name}-%{version}/
@@ -259,15 +177,5 @@ 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
-
-%files -n rust-%{name}+gen_revert-devel
-%ghost %{cargo_registry}/%{name}-%{version}/Cargo.toml
-%endif
-
 %changelog
 %autochangelog

sources

@@ -1,4 +1,3 @@
-SHA512 (nmstate-2.2.57.tar.gz) = b203455ce70e8c2f0e0d67d0b57ded8da1a8a6492bc636412b4682d15453cdb694cf33b1c84498ab50e3a42a79d3a763ef3316943b356ccab5f858df03fd0a63
+SHA512 (nmstate-2.1.4.tar.gz) = 698aa3f2d4ac68fe8d00ca1d984ce23f1ab8433885dcea8835d9023d4bc5313620c9064fd9c59d4bd46f111cf7ac14364ae29aa8817d553cba732e23ee4bd1e2
-SHA512 (nmstate-2.2.57.tar.gz.asc) = 972de00f4b4e18410c5aa6a6d23606ceda496c18747f7ba95e6602f21f24f8b3eaffe1d3e82aaf3e529592989f12ce1198b40c8b83abb6b7d108666b56ec7359
+SHA512 (nmstate-2.1.4.tar.gz.asc) = 3ada247852b7236111f57e70e9dd597f8df0c954d2da4a36496639aa55fc65805b3fd6fcfa006ee60d21d9de4f9c1eee9c72abb217fc8da459500d6effd8f1ce
-SHA512 (nmstate.gpg) = e465239bc2a037457c5cb105f69cb033c092708285689f906b5e40cae01e12629bec1cdee7eb6aa3a327e4fc93dfd5ce0e006b295fe5ced8df039f9098cef0bc
+SHA512 (nmstate.gpg) = 91c6b1d8aef4944520d4bdd4e90121bbbbaf772444f5eb6081cee81e17b21b66798437cdc09a117c6fc77c54d798aaa30400857aa090cb2102b47841f45cf6eb
-SHA512 (nmstate-vendor-2.2.57.tar.xz) = 88c69f1f20367acd858b25bb0e834ae7b21b4291d90b0ed62dd33c9a427f845b98fa56ba6b8d4228bc6c807f2293d77f4cd6ed7a568e6ceff19c875ef3bea6dd

tests/cli_query_reapply.sh

@@ -2,8 +2,6 @@
 
 TMP_FILE=$(mktemp /tmp/nmstate.XXXXXX.yaml)
 
-nmstatectl show > $TMP_FILE
+nmstatectl show > $TMP_FILE 2>/dev/null
 
-cat $TMP_FILE
+nmstatectl set $TMP_FILE 2>/dev/null
-
-nmstatectl set $TMP_FILE 2>&1