Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package netavark for openSUSE:Factory
checked in at 2025-03-20 19:23:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/netavark (Old)
and /work/SRC/openSUSE:Factory/.netavark.new.2696 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netavark"
Thu Mar 20 19:23:34 2025 rev:18 rq:1254308 version:1.14.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/netavark/netavark.changes 2025-02-18
19:09:01.064275175 +0100
+++ /work/SRC/openSUSE:Factory/.netavark.new.2696/netavark.changes
2025-03-20 19:23:38.886305015 +0100
@@ -1,0 +2,15 @@
+Wed Mar 19 05:31:40 UTC 2025 - madhankumar.chellamu...@suse.com
+
+- Update to version 1.14.1:
+ * Release v1.14.1
+ * Release notes for v1.14.0
+ * Fix detect of Firewalld's StrictForwardPorts property
+ * test/001-basic: Make commit test optional
+ * cirrus: do not build debug bins
+ * Makefile: do not rebuild if nothing changed
+ * Makefile: uninstall netavark-firewalld-reload.service
+ * docs/Makefile: several fixes
+ * Makefile: build docs by default
+ * Makefile: do not build twice
+
+-------------------------------------------------------------------
Old:
----
netavark-1.14.0.tar.gz
New:
----
netavark-1.14.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ netavark.spec ++++++
--- /var/tmp/diff_new_pack.WPRDyZ/_old 2025-03-20 19:23:44.042518119 +0100
+++ /var/tmp/diff_new_pack.WPRDyZ/_new 2025-03-20 19:23:44.054518615 +0100
@@ -19,7 +19,7 @@
%define major_minor %((v=%{version}; echo ${v%.*}))
Name: netavark
-Version: 1.14.0
+Version: 1.14.1
Release: 0
Summary: Container network stack
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.WPRDyZ/_old 2025-03-20 19:23:44.874552506 +0100
+++ /var/tmp/diff_new_pack.WPRDyZ/_new 2025-03-20 19:23:44.902553663 +0100
@@ -3,7 +3,7 @@
<param name="url">https://github.com/containers/netavark.git</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="scm">git</param>
- <param name="revision">v1.14.0</param>
+ <param name="revision">v1.14.1</param>
<param name="match-tag">*</param>
<param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param>
<param name="versionrewrite-replacement">\1</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.WPRDyZ/_old 2025-03-20 19:23:45.070560607 +0100
+++ /var/tmp/diff_new_pack.WPRDyZ/_new 2025-03-20 19:23:45.102561929 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/containers/netavark.git</param>
- <param
name="changesrevision">2af90449f3758592b7c390fde85c83c32bc84bd1</param></service></servicedata>
+ <param
name="changesrevision">8711e83883b5b3f683d84d847cdd196cb9550352</param></service></servicedata>
(No newline at EOF)
++++++ netavark-1.14.0.tar.gz -> netavark-1.14.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netavark-1.14.0/.cirrus.yml
new/netavark-1.14.1/.cirrus.yml
--- old/netavark-1.14.0/.cirrus.yml 2025-02-10 15:09:08.000000000 +0100
+++ new/netavark-1.14.1/.cirrus.yml 2025-03-17 19:01:26.000000000 +0100
@@ -22,6 +22,7 @@
AARDVARK_DNS_URL:
"https://api.cirrus-ci.com/v1/artifact/github/containers/aardvark-dns/success/binary.zip?branch=${AARDVARK_DNS_BRANCH}";
FEDORA_NETAVARK_AARCH64_AMI: "fedora-netavark-aws-arm64-${IMAGE_SUFFIX}"
EC2_INST_TYPE: "t4g.xlarge"
+ NETAVARK_UPSTREAM: "1"
gcp_credentials:
ENCRYPTED[d6efdb7d6d4c61e3831df2193ca6348bb02f26cd931695f69d41930b1965f7dab72a838ca0902f6ed8cde66c7deddae2]
@@ -257,10 +258,8 @@
API_URL_BASE:
"https://api.cirrus-ci.com/v1/artifact/build/${CIRRUS_BUILD_ID}";
EXP_BINS: >-
netavark
- netavark.debug
netavark.info
netavark.aarch64-unknown-linux-gnu
- netavark.debug.aarch64-unknown-linux-gnu
netavark.info.aarch64-unknown-linux-gnu
clone_script: *noop
bin_cache: *ro_bin_cache
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netavark-1.14.0/Cargo.lock
new/netavark-1.14.1/Cargo.lock
--- old/netavark-1.14.0/Cargo.lock 2025-02-10 15:09:08.000000000 +0100
+++ new/netavark-1.14.1/Cargo.lock 2025-03-17 19:01:26.000000000 +0100
@@ -1433,7 +1433,7 @@
[[package]]
name = "netavark"
-version = "1.14.0"
+version = "1.14.1"
dependencies = [
"anyhow",
"chrono",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netavark-1.14.0/Cargo.toml
new/netavark-1.14.1/Cargo.toml
--- old/netavark-1.14.0/Cargo.toml 2025-02-10 15:09:08.000000000 +0100
+++ new/netavark-1.14.1/Cargo.toml 2025-03-17 19:01:26.000000000 +0100
@@ -1,6 +1,6 @@
[package]
name = "netavark"
-version = "1.14.0"
+version = "1.14.1"
edition = "2021"
authors = ["github.com/containers"]
license = "Apache-2.0"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netavark-1.14.0/Makefile new/netavark-1.14.1/Makefile
--- old/netavark-1.14.0/Makefile 2025-02-10 15:09:08.000000000 +0100
+++ new/netavark-1.14.1/Makefile 2025-03-17 19:01:26.000000000 +0100
@@ -29,6 +29,8 @@
CARGO_TARGET_DIR ?= targets
export CARGO_TARGET_DIR # 'cargo' is sensitive to this env. var. value.
+SOURCES = src/** Cargo.toml Cargo.lock
+
ifdef debug
$(info debug is $(debug))
# These affect both $(CARGO_TARGET_DIR) layout and contents
@@ -41,7 +43,7 @@
endif
.PHONY: all
-all: build
+all: build docs
bin:
mkdir -p $@
@@ -50,12 +52,13 @@
mkdir -p $@
.PHONY: build
-build: build_netavark build_proxy_client
+build: bin/netavark
-.PHONY: build_netavark
-build_netavark: bin $(CARGO_TARGET_DIR)
+bin/netavark: $(SOURCES) bin $(CARGO_TARGET_DIR)
$(CARGO) build $(release)
- cp $(CARGO_TARGET_DIR)/$(profile)/netavark bin/netavark$(if
$(debug),.debug,)
+ cp $(CARGO_TARGET_DIR)/$(profile)/netavark bin/netavark
+ cp $(CARGO_TARGET_DIR)/$(profile)/netavark-dhcp-proxy-client
bin/netavark-dhcp-proxy-client
+
.PHONY: examples
examples: bin $(CARGO_TARGET_DIR)
@@ -104,10 +107,12 @@
.PHONY: uninstall
uninstall:
+ $(MAKE) -C docs uninstall
rm -f $(DESTDIR)$(LIBEXECPODMAN)/netavark
rm -f $(PREFIX)/share/man/man1/netavark*.1
rm -f ${DESTDIR}${SYSTEMDDIR}/netavark-dhcp-proxy.service
rm -f ${DESTDIR}${SYSTEMDDIR}/netavark-dhcp-proxy.socket
+ rm -f ${DESTDIR}${SYSTEMDDIR}/netavark-firewalld-reload.service
.PHONY: test
test: unit integration
@@ -152,8 +157,3 @@
.PHONY: help
help:
@echo "usage: make $(prog) [debug=1]"
-
-.PHONY: build_proxy_client
-build_proxy_client: bin $(CARGO_TARGET_DIR)
- $(CARGO) build --bin netavark-dhcp-proxy-client $(release)
- cp $(CARGO_TARGET_DIR)/$(profile)/netavark-dhcp-proxy-client
bin/netavark-dhcp-proxy-client$(if $(debug),.debug,)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netavark-1.14.0/RELEASE_NOTES.md
new/netavark-1.14.1/RELEASE_NOTES.md
--- old/netavark-1.14.0/RELEASE_NOTES.md 2025-02-10 15:09:08.000000000
+0100
+++ new/netavark-1.14.1/RELEASE_NOTES.md 2025-03-17 19:01:26.000000000
+0100
@@ -1,5 +1,11 @@
# Release Notes
+## v1.14.1
+
+* Fixed an issue where the Makefile did not install the
`netavark-firewalld(7)` man page.
([#1179](https://github.com/containers/netavark/issues/1179))
+* Fixed the detection of Firewalld's StrictForwardPorts property.
+* Upstream tests no longer check for the commit sha in the version output by
default so downstream tests on packaged versions without the commit info can
pass.
+
## v1.14.0
* bridge: Add support for a new option called `mode`. When set to `unmanaged`
only the veth pair and ip addresses are setup. The bridge must exist and no
firewall or sysctl setting will be configured in this mode.
([#1090](https://github.com/containers/netavark/issues/1090))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netavark-1.14.0/contrib/cirrus/runner.sh
new/netavark-1.14.1/contrib/cirrus/runner.sh
--- old/netavark-1.14.0/contrib/cirrus/runner.sh 2025-02-10
15:09:08.000000000 +0100
+++ new/netavark-1.14.1/contrib/cirrus/runner.sh 2025-03-17
19:01:26.000000000 +0100
@@ -19,9 +19,9 @@
_run_build() {
# Assume we're on a fast VM, compile everything needed by the
# rest of CI since subsequent tasks may have limited resources.
- make all debug=1
make build_unit # reuses some debug binaries
make all # optimized/non-debug binaries
+ make examples # build the examples binaries needed by the integration tests
# This will get scooped up and become part of the artifact archive.
# Identify where the binary came from to benefit downstream consumers.
cat | tee bin/netavark.info << EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netavark-1.14.0/docs/Makefile
new/netavark-1.14.1/docs/Makefile
--- old/netavark-1.14.0/docs/Makefile 2025-02-10 15:09:08.000000000 +0100
+++ new/netavark-1.14.1/docs/Makefile 2025-03-17 19:01:26.000000000 +0100
@@ -17,12 +17,17 @@
$(GO) install github.com/cpuguy83/go-md2man/v2@latest
.PHONY: install
-install:
+install: docs
install -d ${DESTDIR}/${MANDIR}/man1
install -m 0644 *.1 ${DESTDIR}/${MANDIR}/man1
install -d ${DESTDIR}/${MANDIR}/man7
install -m 0644 *.7 ${DESTDIR}/${MANDIR}/man7
+.PHONY: uninstall
+uninstall:
+ rm -f ${DESTDIR}/${MANDIR}/man1/*.1
+ rm -f ${DESTDIR}/${MANDIR}/man7/*.7
+
.PHONY: clean
clean:
- $(RM) *.1
+ $(RM) *.1 *.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netavark-1.14.0/src/firewall/firewalld.rs
new/netavark-1.14.1/src/firewall/firewalld.rs
--- old/netavark-1.14.0/src/firewall/firewalld.rs 2025-02-10
15:09:08.000000000 +0100
+++ new/netavark-1.14.1/src/firewall/firewalld.rs 2025-03-17
19:01:26.000000000 +0100
@@ -1062,7 +1062,35 @@
"Get",
&("org.fedoraproject.FirewallD1.config", "StrictForwardPorts"),
) {
- Ok(b) => b.body().deserialize().unwrap_or(false),
+ Ok(b) => {
+ let variant_str: String = match b.body().deserialize::<Value>() {
+ Ok(v) => match v.downcast::<String>() {
+ Ok(s) => s,
+ Err(e) => {
+ warn!(
+ "couldn't downcast StrictForwardPorts value to
string: {}",
+ e
+ );
+ return false;
+ }
+ },
+ Err(e) => {
+ warn!("couldn't retrieve StrictForwardPorts property: {}",
e);
+ return false;
+ }
+ };
+ match variant_str.to_lowercase().as_str() {
+ "yes" => true,
+ "no" => false,
+ other => {
+ warn!(
+ "unexpected value from StrictForwardPorts property:
{}",
+ other
+ );
+ false
+ }
+ }
+ }
Err(_) => {
// Assume any error is related to the property not existing
// (As it will not on older firewalld versions)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netavark-1.14.0/test/001-basic.bats
new/netavark-1.14.1/test/001-basic.bats
--- old/netavark-1.14.0/test/001-basic.bats 2025-02-10 15:09:08.000000000
+0100
+++ new/netavark-1.14.1/test/001-basic.bats 2025-03-17 19:01:26.000000000
+0100
@@ -12,7 +12,9 @@
run_netavark version
json="$output"
assert_json "$json" ".version" =~ "^1\.[0-9]+\.[0-9]+(-rc[0-9]|-dev)?"
"correct version"
- assert_json "$json" ".commit" =~ "[0-9a-f]{40}" "shows commit sha"
+ if [ -n "$NETAVARK_UPSTREAM" ]; then
+ assert_json "$json" ".commit" =~ "[0-9a-f]{40}" "shows commit sha"
+ fi
assert_json "$json" ".build_time" =~ "20.*" "show build date"
assert_json "$json" ".target" =~ ".*" "contains target string"
}
++++++ netavark.obsinfo ++++++
--- /var/tmp/diff_new_pack.WPRDyZ/_old 2025-03-20 19:23:46.222608220 +0100
+++ /var/tmp/diff_new_pack.WPRDyZ/_new 2025-03-20 19:23:46.298611362 +0100
@@ -1,5 +1,5 @@
name: netavark
-version: 1.14.0
-mtime: 1739196548
-commit: 2af90449f3758592b7c390fde85c83c32bc84bd1
+version: 1.14.1
+mtime: 1742234486
+commit: 8711e83883b5b3f683d84d847cdd196cb9550352
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/netavark/vendor.tar.gz
/work/SRC/openSUSE:Factory/.netavark.new.2696/vendor.tar.gz differ: char 27,
line 1
