Merge branch 'containers:main' into main

Author: lto-dev

.cirrus.yml

@@ -233,7 +233,7 @@ msrv_build_task:
         cpu: 2 # Do not increase, will result in scheduling delays
         memory: "8Gb"
         # When bumping the image always remember to update the README MSRV as well.
-        image: quay.io/libpod/nv-rust:1.76
+        image: quay.io/libpod/nv-rust:1.77
     script:
         - make build
 
@@ -257,10 +257,8 @@ success_task:
     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

Cargo.lock

@@ -11,7 +11,7 @@ repository = "https://github.com/containers/netavark"
 categories = ["virtualization"]
 exclude = ["/.cirrus.yml", "/.github/*", "/hack/*"]
 build = "build.rs"
-rust-version = "1.76"
+rust-version = "1.77"
 
 [package.metadata.vendor-filter]
 platforms = ["*-unknown-linux-*"]
@@ -37,13 +37,13 @@ env_logger = "0.11.6"
 ipnet = { version = "2.11.0", features = ["serde"] }
 iptables = "0.5.2"
 libc = "0.2.157"
-log = "0.4.24"
+log = "0.4.26"
 serde = { version = "1.0.213", features = ["derive"], optional = true }
 serde-value = "0.7.0"
 serde_json = "1.0.136"
 sysctl = "0.6.0"
 url = "2.5.3"
-zbus = { version = "4.3.1" }
+zbus = { version = "5.5.0" }
 nix = { version = "0.29.0", features = ["sched", "signal", "user"] }
 rand = "0.9.0"
 sha2 = "0.10.8"
@@ -72,4 +72,4 @@ tonic-build = "0.12.3"
 [dev-dependencies]
 once_cell = "1.20.3"
 rand = "0.9.0"
-tempfile = "3.16.0"
+tempfile = "3.17.1"

Cargo.toml

@@ -29,6 +29,8 @@ CARGO ?= cargo
 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 @@ else
 endif
 
 .PHONY: all
-all: build
+all: build docs
 
 bin:
 	mkdir -p $@
@@ -50,12 +52,13 @@ $(CARGO_TARGET_DIR):
 	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 @@ install: $(NV_UNIT_FILES)
 
 .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 @@ mock-rpm:
 .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,)

Makefile

@@ -24,7 +24,7 @@ Netavark is a tool for configuring networking for Linux containers. Its features
 
 ## MSRV (Minimum Supported Rust Version)
 
-v1.76
+v1.77
 
 We test that Netavark can be build on this Rust version and on some newer versions.
 All newer versions should also build, and if they do not, the issue should be

README.md

@@ -19,9 +19,9 @@ _run_noarg() {
 _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

contrib/cirrus/runner.sh

@@ -1,5 +1,5 @@
 # Source for quay.io/libpod/nv-rust
 # This version should always match the MSRV, when you update this also update
 # the version in the root README.md and Cargo.toml.
-FROM docker.io/library/rust:1.76
+FROM docker.io/library/rust:1.77
 RUN apt-get update && apt-get -y install protobuf-compiler libprotobuf-dev

contrib/container_images/Dockerfile.Rust

@@ -17,12 +17,17 @@ docs: $(patsubst %.md,%,$(wildcard *.[0-9].md))
 	$(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

docs/Makefile

@@ -3,7 +3,7 @@ use std::{
     path::Path,
 };
 
-use zbus::{blocking::Connection, proxy, CacheProperties};
+use zbus::{blocking::Connection, proxy, proxy::CacheProperties};
 
 use crate::{
     error::{ErrorWrap, NetavarkResult},

src/commands/firewalld_reload.rs

@@ -192,6 +192,14 @@ impl From<zbus::zvariant::Error> for NetavarkError {
     }
 }
 
+// map the new zvariant::signature::Error to a
+// NetavarkError::DbusVariant, like zvariant::Error
+impl From<zbus::zvariant::signature::Error> for NetavarkError {
+    fn from(err: zbus::zvariant::signature::Error) -> NetavarkError {
+        NetavarkError::DbusVariant(err.into())
+    }
+}
+
 impl From<sysctl::SysctlError> for NetavarkError {
     fn from(err: sysctl::SysctlError) -> NetavarkError {
         NetavarkError::Sysctl(err)

src/error/mod.rs

@@ -191,9 +191,9 @@ impl firewall::FirewallDriver for FirewallD {
                 ))
             }
         };
-        let mut port_forwarding_rules: Array = Array::new(sig_ssss);
-        let mut rich_rules: Array = Array::new(sig_s.clone());
-        let mut localhost_rich_rules: Array = Array::new(sig_s);
+        let mut port_forwarding_rules: Array = Array::new(&sig_ssss);
+        let mut rich_rules: Array = Array::new(&sig_s.clone());
+        let mut localhost_rich_rules: Array = Array::new(&sig_s);
 
         // Create any necessary port forwarding rule(s) and add them to the
         // policy config we grabbed above.
@@ -408,7 +408,7 @@ impl firewall::FirewallDriver for FirewallD {
                     ))
                 }
             };
-            let mut port_forwarding_rules = Array::new(sig);
+            let mut port_forwarding_rules = Array::new(&sig);
 
             let ipv4 = teardown_pf.config.container_ip_v4.map(|i| i.to_string());
             let ipv6 = teardown_pf.config.container_ip_v6.map(|i| i.to_string());
@@ -481,7 +481,7 @@ impl firewall::FirewallDriver for FirewallD {
                     ))
                 }
             };
-            let mut new_rich_rules = Array::new(sig);
+            let mut new_rich_rules = Array::new(&sig);
 
             let ipv4 = teardown_pf.config.container_ip_v4.map(|i| i.to_string());
             let ipv6 = teardown_pf.config.container_ip_v6.map(|i| i.to_string());
@@ -564,7 +564,7 @@ impl firewall::FirewallDriver for FirewallD {
                     ))
                 }
             };
-            let mut new_rich_rules = Array::new(sig);
+            let mut new_rich_rules = Array::new(&sig);
 
             let ipv4 = teardown_pf.config.container_ip_v4.map(|i| i.to_string());