rpms/nmstate
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: rpms:rawhide
Branches Tags
rpms:rawhide
rpms:f42
rpms:f43
rpms:main
rpms:f41
rpms:f40
rpms:f39
rpms:f38
rpms:f37
rpms:f36
rpms:f35
rpms:f34
rpms:f33
rpms:f32
rpms:f31
rpms:epel7
rpms:f29
rpms:f30
rpms:f28
rpms:tests
..
compare: rpms:f38
Branches Tags
rpms:f42
rpms:f43
rpms:main
rpms:rawhide
rpms:f41
rpms:f40
rpms:f39
rpms:f38
rpms:f37
rpms:f36
rpms:f35
rpms:f34
rpms:f33
rpms:f32
rpms:f31
rpms:epel7
rpms:f29
rpms:f30
rpms:f28
rpms:tests

7 commits
rawhide ... f38

Author SHA1 Message Date
Gris Ge
b06bb6d3bc Merge branch 'rawhide' into f38 2024-04-01 21:54:43 +08:00
Gris Ge
c93910c0e1 Merge branch 'rawhide' into f38 2024-03-18 13:37:56 +08:00
Gris Ge
fef4e1519f Merge branch 'rawhide' into f38 2023-12-15 21:57:20 +08:00
Packit
e8d27ab1c5 [packit] 2.2.15 upstream release 
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-f38-update-pull_from_upstream
```
 2023-08-25 00:44:09 +00:00
Gris Ge
29ef1b46d8 Merge branch 'rawhide' into f38 2023-07-24 11:49:45 +08:00
Gris Ge
a1276e7733 Merge branch 'rawhide' into f38 2023-06-05 18:28:12 +08:00
Packit
2ebd6e00e2 [packit] 2.2.12 upstream release 
Upstream tag: v2.2.12
Upstream commit: 71dd2292
 2023-06-01 22:49:30 +00:00
9 changed files with 44 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

57
.gitignore vendored
View file

@ -112,60 +112,3 @@
/nmstate-2.2.26.tar.gz /nmstate-2.2.26.tar.gz
/nmstate-2.2.26.tar.gz.asc /nmstate-2.2.26.tar.gz.asc
/nmstate-vendor-2.2.26.tar.xz /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

9
README.md
View file

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

2
README.packit
View file

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

BIN
nmstate-2.2.14.tar.gz Normal file
View file

Binary file not shown.

16
nmstate-2.2.14.tar.gz.asc Normal file
View file

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEESP1vrlFad7SENoIch4lWe4cVzrwFAmTBLkYACgkQh4lWe4cV
zrz7BxAA4FnTzJ1tCX16zJgOYoWYAw8I5p2DD6YdYb/3C/7Pg8SL11B9m7cSlukF
LmJJ0ezhsaSGFeuxBm1go1/eMk/9RZrSySPNuYghwvNc7nrwOjd780juZwrEjfZL
do/NErnX5d0pxMOC18xwUXin/0L/GAEzGs4kPIVV62SmwuuIKVrrbR0J7xRiiw4V
sOS2CUzJSd3EWpUa6VDmvQzhEdb+vfoijaUPges4SxJnTo79SW3DhIjtMyDF/muf
NhykV+ZkIvzODcXO9ltATgJnmFFFmOGGnWyGkLgHLWE1xN8DUSvxLHLqCl/DIOof
RYi3stkIAe2V6GhOQZWYJua5FMtnoBp9NvRy2DID7VZ+gcQ8Or8T9LehprJPgFCO
UiRog95f5CeyO5uO7ofjuvin0rYrCfSCgNLDUxr3Qn0pM9c25t+TvWqqp0CgW9IU
zkpWcfsvAlcCxFxJebiY3vvjcK/ZV7EqL/vXXnNeOm7kSzBLqf9zkcJMMjNXwmJX
HZy2+PcUQ204bunwvkhebCCbdppO7VcYj+AuWAghE32elujn7jXbRf9pHDE4zCzW
XHCeCuSDSGSN8XdJPeccLlQDgT8Z8LIU6gfgVShJzrOw7/FiF8N6AenWN3PgGRuE
mZGvjrO1DPUdnMQm4l3Qlypi8x8P4iAUH9tazHHierC9xY1GWho=
=jIEB
-----END PGP SIGNATURE-----

BIN
nmstate-vendor-2.2.14.tar.xz Normal file
View file

Binary file not shown.

60
nmstate.spec
View file

@ -2,7 +2,7 @@
%define libname libnmstate %define libname libnmstate
Name: nmstate Name: nmstate
Version: 2.2.57 Version: 2.2.26
Release: %autorelease Release: %autorelease
Summary: Declarative network manager API Summary: Declarative network manager API
License: Apache-2.0 AND LGPL-2.1-or-later License: Apache-2.0 AND LGPL-2.1-or-later
@ -11,10 +11,8 @@ Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.g
Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc
Source2: https://nmstate.io/nmstate.gpg Source2: https://nmstate.io/nmstate.gpg
Source3: %{url}/releases/download/v%{version}/%{srcname}-vendor-%{version}.tar.xz 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-devel
BuildRequires: python3-setuptools
BuildRequires: gnupg2 BuildRequires: gnupg2
BuildRequires: systemd-devel BuildRequires: systemd-devel
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
@ -24,36 +22,24 @@ BuildRequires: rust-toolset
BuildRequires: rust-packaging BuildRequires: rust-packaging
BuildRequires: (crate(clap/cargo) >= 3.1 with crate(clap/cargo) < 4.0) 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(clap/default) >= 3.1 with crate(clap/default) < 4.0)
BuildRequires: (crate(time/std) >= 0.3 with crate(time/std) < 0.4) BuildRequires: (crate(chrono/default) >= 0.4 with crate(chrono/default) < 0.5)
BuildRequires: (crate(time/formatting) >= 0.3 with crate(time/formatting) < 0.4) BuildRequires: (crate(ctrlc/default) >= 3.2 with crate(ctrlc/default) < 4.0)
BuildRequires: (crate(time/parsing) >= 0.3 with crate(time/parsing) < 0.4) 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(libc/default) >= 0.2 with crate(libc/default) < 0.3)
BuildRequires: (crate(log/default) >= 0.4 with crate(log/default) < 0.5) 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(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/default) >= 1.0 with crate(serde/default) < 2.0)
BuildRequires: (crate(serde/derive) >= 1.0 with crate(serde/derive) < 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_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.9 with crate(serde_yaml/default) < 1.0)
BuildRequires: (crate(uuid/v4) >= 1.1 with crate(uuid/v4) < 2.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(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(nix/default) >= 0.26 with crate(nix/default) < 0.27)
BuildRequires: (crate(toml/default) >= 0.9 with crate(toml/default) < 1.0) 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)
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 %endif
%generate_buildrequires
pushd rust/src/python >/dev/null
%pyproject_buildrequires
popd >/dev/null
%description %description
Nmstate is a library with an accompanying command line tool that manages host Nmstate is a library with an accompanying command line tool that manages host
networking settings in a declarative manner and aimed to satisfy enterprise networking settings in a declarative manner and aimed to satisfy enterprise
@ -144,9 +130,9 @@ Summary: Rust crate of nmstate with query_apply feature
BuildArch: noarch BuildArch: noarch
License: Apache-2.0 License: Apache-2.0
# https://bugzilla.redhat.com/show_bug.cgi?id=2161128 # https://bugzilla.redhat.com/show_bug.cgi?id=2161128
Requires: (crate(nispor/default) >= 1.2.17 with crate(nispor/default) < 2.0) Requires: (crate(nispor/default) >= 1.2.12 with crate(nispor/default) < 2.0)
Requires: (crate(nix/default) >= 0.26 with crate(nix/default) < 0.27) Requires: (crate(nix/default) >= 0.24 with crate(nix/default) < 0.25)
Requires: (crate(zbus/default) >= 5.1 with crate(zbus/default) < 6.0) Requires: (crate(zbus/default) >= 1.9 with crate(zbus/default) < 2.0)
%description -n rust-%{name}+query_apply-devel %description -n rust-%{name}+query_apply-devel
This package contains library source intended for building other packages This package contains library source intended for building other packages
@ -189,7 +175,7 @@ pushd rust
popd popd
pushd rust/src/python pushd rust/src/python
%pyproject_wheel %py3_build
popd popd
%install %install
@ -200,21 +186,15 @@ env SKIP_PYTHON_INSTALL=1 \
%make_install %make_install
pushd rust/src/python pushd rust/src/python
%pyproject_install %py3_install
popd popd
%if ! 0%{?rhel} %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 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 %cargo_install
popd popd
%endif %endif
@ -246,7 +226,7 @@ popd
%files -n python3-%{libname} %files -n python3-%{libname}
%license LICENSE %license LICENSE
%{python3_sitelib}/%{libname} %{python3_sitelib}/%{libname}
%{python3_sitelib}/%{srcname}-*.dist-info/ %{python3_sitelib}/%{srcname}-*.egg-info/
%files static %files static
%{_libdir}/libnmstate.a %{_libdir}/libnmstate.a

8
sources
View file

@ -1,4 +1,4 @@
SHA512 (nmstate-2.2.57.tar.gz) = b203455ce70e8c2f0e0d67d0b57ded8da1a8a6492bc636412b4682d15453cdb694cf33b1c84498ab50e3a42a79d3a763ef3316943b356ccab5f858df03fd0a63 SHA512 (nmstate-2.2.26.tar.gz) = 52ff3f35ea514018be2dec5d83cc42ad3ed13cf93c6ac72b838ff4218e51d364abbc3f0b33feb9971cda2bc9eb8f76374c0fe66b614f311a71196900117a83fd
SHA512 (nmstate-2.2.57.tar.gz.asc) = 972de00f4b4e18410c5aa6a6d23606ceda496c18747f7ba95e6602f21f24f8b3eaffe1d3e82aaf3e529592989f12ce1198b40c8b83abb6b7d108666b56ec7359 SHA512 (nmstate-2.2.26.tar.gz.asc) = a1cebb3221a7222188b41e348201364189b0c3b35de4964ec5fb83a13b0976bbb17fc831662bfbbf0b9461288c146551c56c6d57862dc4333d848f19ce4194e5
SHA512 (nmstate.gpg) = e465239bc2a037457c5cb105f69cb033c092708285689f906b5e40cae01e12629bec1cdee7eb6aa3a327e4fc93dfd5ce0e006b295fe5ced8df039f9098cef0bc SHA512 (nmstate.gpg) = bfbf3620045f3c1f15eaf6877fd7407834a75d2650976f2327abd02ddb910aa34500f07a774dd17023c43dcba42a0ffc66f23cd6816fd9694acad2c5eed9e8d3
SHA512 (nmstate-vendor-2.2.57.tar.xz) = 88c69f1f20367acd858b25bb0e834ae7b21b4291d90b0ed62dd33c9a427f845b98fa56ba6b8d4228bc6c807f2293d77f4cd6ed7a568e6ceff19c875ef3bea6dd SHA512 (nmstate-vendor-2.2.26.tar.xz) = 80cbb3e73a55ae602edb3f4538ef87f1b441d149e7bed53fad60828f811d19450d4882a86521c0147d5d9a932c6d5b9595803d919ab1bc7622d29a36c289446a

6
tests/cli_query_reapply.sh
View file

@ -2,8 +2,6 @@
TMP_FILE=$(mktemp /tmp/nmstate.XXXXXX.yaml) 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