.gitignore

@@ -1,18 +1,2 @@
-SOURCES/nmstate-1.4.2.tar.gz
-SOURCES/nmstate-vendor-1.4.2.tar.xz
-SOURCES/nmstate.gpg
-/nmstate-1.4.2.tar.gz
-/nmstate-vendor-1.4.2.tar.xz
-/nmstate-1.4.3.tar.gz
-/nmstate-1.4.3.tar.gz.asc
-/nmstate-vendor-1.4.3.tar.xz
-/nmstate-1.4.4.tar.gz
-/nmstate-1.4.4.tar.gz.asc
-/nmstate-vendor-1.4.4.tar.xz
-/nmstate.gpg
-/nmstate-1.4.5.tar.gz
-/nmstate-1.4.5.tar.gz.asc
-/nmstate-vendor-1.4.5.tar.xz
-/nmstate-1.4.6.tar.gz
-/nmstate-1.4.6.tar.gz.asc
-/nmstate-vendor-1.4.6.tar.xz
+SOURCES/nmstate-1.4.5.tar.gz
+SOURCES/nmstate-vendor-1.4.5.tar.xz

.nmstate.metadata

@@ -0,0 +1,2 @@
+cd4f8e938eabaf7e70fb251c06e477ba3bc9d8c8 SOURCES/nmstate-1.4.5.tar.gz
+4735ef08c31684624a7844832cc2ba20e67983f6 SOURCES/nmstate-vendor-1.4.5.tar.xz

0001-clib-Use-build.rs-to-fix-SONAME.patch

@@ -1,60 +0,0 @@
-From 0b530d4c8e75f60015d13c225b1c634389fbe798 Mon Sep 17 00:00:00 2001
-From: Gris Ge <fge@redhat.com>
-Date: Fri, 17 May 2024 13:12:14 +0800
-Subject: [PATCH] clib: Use build.rs to fix SONAME
-
-Use [`cargo:rustc-cdylib-link-arg`][1] to `build.rs` to fix the SONAME issue
-of cargo.
-
-Removed workarounds in rpm spec and `.cargo/config.toml`.
-
-Changed Makefile to place `-lnmstate` after the source file to fix
-compile issue on ubuntu 20.04 old gcc.
-
-[1]: https://doc.rust-lang.org/cargo/reference/build-scripts.html#rustc-cdylib-link-arg
-
-Signed-off-by: Gris Ge <fge@redhat.com>
----
- rust/.cargo/config.toml  | 3 ---
- rust/src/clib/Cargo.toml | 1 +
- rust/src/clib/build.rs   | 6 ++++++
- 3 files changed, 7 insertions(+), 3 deletions(-)
- create mode 100644 rust/src/clib/build.rs
-
-diff --git a/rust/.cargo/config.toml b/rust/.cargo/config.toml
-index 018e59d4..ca6c72f7 100644
---- a/rust/.cargo/config.toml
-+++ b/rust/.cargo/config.toml
-@@ -1,5 +1,2 @@
--[build]
--rustflags = "-Clink-arg=-Wl,-soname=libnmstate.so.1"
--
- [target.x86_64-unknown-linux-gnu]
- runner = 'sudo -E'
-diff --git a/rust/src/clib/Cargo.toml b/rust/src/clib/Cargo.toml
-index 462757ca..0eb00922 100644
---- a/rust/src/clib/Cargo.toml
-+++ b/rust/src/clib/Cargo.toml
-@@ -6,6 +6,7 @@ authors = ["Gris Ge <fge@redhat.com>"]
- license = "Apache-2.0"
- edition = "2018"
- rust-version = "1.58"
-+build = "build.rs"
- 
- [lib]
- name = "nmstate"
-diff --git a/rust/src/clib/build.rs b/rust/src/clib/build.rs
-new file mode 100644
-index 00000000..74ad7e48
---- /dev/null
-+++ b/rust/src/clib/build.rs
-@@ -0,0 +1,6 @@
-+// SPDX-License-Identifier: Apache-2.0
-+
-+fn main() {
-+    #[cfg(target_os = "linux")]
-+    println!("cargo:rustc-cdylib-link-arg=-Wl,-soname=libnmstate.so.1");
-+}
--- 
-2.45.1
-

SOURCES/RHEL-13936-dns-opt-fix.patch

@@ -0,0 +1,157 @@
+From c95e26154cfe105faedb6fe6187e89da658e6d02 Mon Sep 17 00:00:00 2001
+From: Gris Ge <fge@redhat.com>
+Date: Tue, 14 Nov 2023 16:08:35 +0800
+Subject: [PATCH 1/2] dns: Fix DNS option `ndots`, `timeout` and `attempts`
+
+The `ndots`, `timeout` and `attempts` DNS options are allowed to
+hold a integer value in the format of `<opt_name>:<int>`. Previously,
+nmstate is treating them as invalid DNS option. This patch fix it.
+
+Now this YAML is supported:
+
+```yml
+dns-resolver:
+  config:
+    options:
+    - rotate
+    - ndots:9
+```
+
+Integration test cases included.
+
+Signed-off-by: Gris Ge <fge@redhat.com>
+---
+ libnmstate/dns.py | 31 ++++++++++++++++++++++++-------
+ 1 file changed, 24 insertions(+), 7 deletions(-)
+
+diff --git a/libnmstate/dns.py b/libnmstate/dns.py
+index f792b896..5bb512e8 100644
+--- a/libnmstate/dns.py
++++ b/libnmstate/dns.py
+@@ -19,14 +19,12 @@ EMPTY_DNS = {
+ REMOVE_DNS_CONFIG = {DNS.CONFIG: EMPTY_DNS}
+ 
+ 
+-SUPPORTED_DNS_OPTIONS = [
+-    "attempts",
++SUPPORTED_DNS_OPTS_NO_VALUE = [
+     "debug",
+     "edns0",
+     "inet6",
+     "ip6-bytestring",
+     "ip6-dotint",
+-    "ndots",
+     "no-aaaa",
+     "no-check-names",
+     "no-ip6-dotint",
+@@ -35,11 +33,16 @@ SUPPORTED_DNS_OPTIONS = [
+     "rotate",
+     "single-request",
+     "single-request-reopen",
+-    "timeout",
+     "trust-ad",
+     "use-vc",
+ ]
+ 
++SUPPORTED_DNS_OPTS_WITH_VALUE = [
++    "ndots",
++    "timeout",
++    "attempts",
++]
++
+ 
+ class DnsState:
+     PRIORITY_METADATA = "_priority"
+@@ -73,10 +76,24 @@ class DnsState:
+ 
+     def _canonicalize_dns_options(self):
+         for opt in self.config_options:
+-            if opt not in SUPPORTED_DNS_OPTIONS:
++            if opt.find(":") > 0:
++                opt = opt[: opt.find(":")]
++                if opt not in SUPPORTED_DNS_OPTS_WITH_VALUE:
++                    raise NmstateValueError(
++                        "Option '{}' is not supported to hold "
++                        "a value, only support these without "
++                        "value: {} and these with values: {}:n",
++                        opt,
++                        ", ".join(SUPPORTED_DNS_OPTS_NO_VALUE),
++                        ":n, ".join(SUPPORTED_DNS_OPTS_WITH_VALUE),
++                    )
++            elif opt not in SUPPORTED_DNS_OPTS_NO_VALUE:
+                 raise NmstateValueError(
+-                    f"Unsupported DNS option {opt}, only support: "
+-                    f"{', '.join(SUPPORTED_DNS_OPTIONS)}",
++                    "Option '{}' is not supported, only support these "
++                    "without value: {} and these with values: {}:n",
++                    opt,
++                    ", ".join(SUPPORTED_DNS_OPTS_NO_VALUE),
++                    ":n, ".join(SUPPORTED_DNS_OPTS_WITH_VALUE),
+                 )
+ 
+     @property
+-- 
+2.42.1
+
+
+From af07271ec5044ec092a3b66c0955636819ccde04 Mon Sep 17 00:00:00 2001
+From: Gris Ge <fge@redhat.com>
+Date: Tue, 14 Nov 2023 16:16:53 +0800
+Subject: [PATCH 2/2] dns: Fix purging DNS config
+
+When user desires:
+
+```yml
+---
+dns-resolver:
+  config:
+    search: []
+```
+
+It means user want to remove all search but preserve servers and
+options, current nmstate incorrectly treat this as purge also.
+
+This patch only treat these two as purge.
+
+```yml
+dns-resolver:
+  config: {}
+```
+
+and
+
+```yml
+dns-resolver:
+  config:
+    server: []
+    search: []
+    options: []
+```
+
+Integration test cases included.
+
+Signed-off-by: Gris Ge <fge@redhat.com>
+---
+ libnmstate/nm/dns.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/libnmstate/nm/dns.py b/libnmstate/nm/dns.py
+index 60ebbba7..b811fdb2 100644
+--- a/libnmstate/nm/dns.py
++++ b/libnmstate/nm/dns.py
+@@ -158,7 +158,11 @@ def get_dns_config_iface_names(acs_and_ipv4_profiles, acs_and_ipv6_profiles):
+     for nm_ac, ip_profile in chain(
+         acs_and_ipv6_profiles, acs_and_ipv4_profiles
+     ):
+-        if ip_profile.props.dns or ip_profile.props.dns_search:
++        if (
++            ip_profile.props.dns
++            or ip_profile.props.dns_search
++            or ip_profile.props.dns_options
++        ):
+             try:
+                 iface_name = nm_ac.get_devices()[0].get_iface()
+                 iface_names.append(iface_name)
+-- 
+2.42.1
+

SOURCES/nmstate-1.4.5.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEESP1vrlFad7SENoIch4lWe4cVzrwFAmVDid0ACgkQh4lWe4cV
+zrx26BAAqv8ec7UMDkJ7MGAXwRpMZrLQ+zjPIDlVH0HVmdvZY2g8Lx2iK9g0xHeL
+YGdVk3aL3UwQE/5Tt6qtzQ8sk76dWyveS1XxxNDLZa+TKvcGqDbxnmvOAIBJwrlD
+4Q6MNWqudJDsboGotKSAoI/xHJafFzWfHU+SSp4AHtf2xHa2KFZqmaZW5gVdYq9j
+/Zhepz8OQ+1s8/frVw1JEqKaTcw5gc0/2xNzh0MkC714Lkk4dhITHP6zh1HF/2i8
+LPIdVHMI8Ze7w4imiamr38+G3XzCQJ/6A/N6couFyJXrLgCn0Jm7Zv8t3TLW69JA
+QD/YHcFgeZmh3QRHVoNIOunG7X7eczLjy61VVXMp3F38+GWSLxK2f7DMRyzRvIxF
+uBrd9yBZ4qkSEqIG2tEBIZOPg4deDADaesyD3d5c0JROsmxkmhl9SEBk03qWtJEY
+kWhCF4tGvVp1r+W7AjS6QpqAtFXJcBQdj1qs49fgRxVGjmw2ljMQdLT6O/oSFNpS
+wzjvGhh8WvMcmStCQ0crTOeihYTyJu2PPqJ3c373EnE9xPN3cJVh+AGwV5kcpxkk
+bJF8qooJDq7MAuNqiKdXORGzG0ht16TzJ4aE+1vGFAErYZitCzU13rkW3dKIU19h
+KgFqlKXUHCS6J3KzJQszDpn+Hw8WOvcCQQ1LivcyLKHlvmTQPi4=
+=51yt
+-----END PGP SIGNATURE-----

SOURCES/nmstate.gpg

@@ -0,0 +1,99 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+i2QY7dEEs/uMRtq8C8kSWg==
+=259x
+-----END PGP PUBLIC KEY BLOCK-----

SPECS/nmstate.spec

@@ -3,7 +3,7 @@
 %define libname libnmstate
 
 Name:           nmstate
-Version:        1.4.6
+Version:        1.4.5
 Release:        2%{?dist}
 Summary:        Declarative network manager API
 License:        LGPLv2+
@@ -14,7 +14,7 @@ Source2:        https://www.nmstate.io/nmstate.gpg
 Source3:        %{url}/releases/download/v%{version}/%{srcname}-vendor-%{version}.tar.xz
 # Patches 0X are reserved to downstream only
 Patch0:         BZ_2132570-nm-reverse-IPv6-order-before-adding-them-to-setting.patch
-Patch10:        0001-clib-Use-build.rs-to-fix-SONAME.patch
+Patch10:        RHEL-13936-dns-opt-fix.patch
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  gnupg2
@@ -84,15 +84,22 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0}
 pushd rust
 # Source3 is vendored dependencies
 %cargo_prep -V 3
+
+# The cargo_prep will create `.cargo/config` which take precedence over
+# `.cargo/config.toml` shipped by upstream which fix the SONAME of cdylib.
+# To workaround that, merge upstream rustflags into cargo_prep created one.
+_FLAGS=`sed -ne 's/rustflags = "\(.\+\)"/\1/p' .cargo/config.toml`
+sed -i -e "s/rustflags = \[\(.\+\), \]$/rustflags = [\1, \"$_FLAGS\"]/" \
+    .cargo/config
+rm .cargo/config.toml
+
 popd
 
 %build
 %py3_build
 
 pushd rust
-# It is safe to ignore minimum rust version. The main blocker on MSRV is
-# toml which just increase their MSRV by a robot for no hard reason.
-%cargo_build --ignore-rust-version
+make
 popd
 
 %install
@@ -142,12 +149,6 @@ popd
 /sbin/ldconfig
 
 %changelog
-* Fri May 17 2024 Gris Ge <fge@redhat.com> - 1.4.6-2
-- Fix clib SONAME. RHEL-32218
-
-* Thu May 16 2024 Gris Ge <fge@redhat.com> - 1.4.6-1
-- Do not touch interface DNS if global DNS is used. RHEL-32218
-
 * Wed Nov 15 2023 Gris Ge <fge@redhat.com> - 1.4.5-2
 - Fix use case on purging DNS option. RHEL-13936
 

gating.yaml

@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-8
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

sources

@@ -1,4 +0,0 @@
-SHA512 (nmstate-1.4.6.tar.gz) = 1176b31b260c170a5012dffef9e8b62692b481759a3c43d516504cfd4e2cf63efe10653ef04b6d18e37446b22c217167211ccf4e844eb9e51c78810523e4665d
-SHA512 (nmstate-1.4.6.tar.gz.asc) = 97da66d646716d66967081dd7a632529d6c12196cb3b270a499c42ef6ea777e629663c8d042254e3682d418962a473119f75ab79b27cf9581dc3029c8e60004a
-SHA512 (nmstate-vendor-1.4.6.tar.xz) = 27eb64009b6f81c96b4a884e5f616799ac163f9e5162359f21b04c82b8fe2b20be44172998bcbadc1d0299c3203325b9bea819d13b337bf2e09b7a53dbb58b6f
-SHA512 (nmstate.gpg) = bfbf3620045f3c1f15eaf6877fd7407834a75d2650976f2327abd02ddb910aa34500f07a774dd17023c43dcba42a0ffc66f23cd6816fd9694acad2c5eed9e8d3

tests/cli_query_reapply.sh

@@ -1,7 +0,0 @@
-#!/bin/bash -ex
-
-TMP_FILE=$(mktemp /tmp/nmstate.XXXXXX.yaml)
-
-nmstatectl show > $TMP_FILE
-
-nmstatectl set $TMP_FILE

tests/tests.yml

@@ -1,13 +0,0 @@
-- hosts: localhost
-  roles:
-  - role: standard-test-basic
-    tags:
-    - classic
-    remote_user: root
-    tests:
-    - cli_query_reapply:
-        dir: .
-        run: ./cli_query_reapply.sh
-    required_packages:
-    - nmstate
-    - nispor