fix(deps): update rust crate zbus to v5

Based on patch provided by NoisyCoil in
https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=1093690;filename=update-zbus.patch;msg=5

Signed-off-by: Reinhard Tartler <[email protected]>
Signed-off-by: Paul Holzinger <[email protected]>

Author: siretart

Cargo.lock

@@ -43,7 +43,7 @@ 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"

Cargo.toml

@@ -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());