1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
|
From: NoisyCoil <noisycoil@tutanota.com>
Date: Tue, 21 Jan 2025 01:23:45 +0100
Subject: [PATCH] Bump zbus dependency to v5
---
Cargo.toml | 2 +-
src/commands/firewalld_reload.rs | 2 +-
src/error/mod.rs | 8 ++++++++
src/firewall/firewalld.rs | 12 ++++++------
4 files changed, 16 insertions(+), 8 deletions(-)
Index: netavark/Cargo.toml
===================================================================
--- netavark.orig/Cargo.toml
+++ netavark/Cargo.toml
@@ -43,7 +43,7 @@ serde-value = "0.7.0"
serde_json = "1.0.136"
sysctl = "0.5.5"
url = "2.5.2"
-zbus = { version = "4.3.1" }
+zbus = { version = "5.3.0" }
nix = { version = "0.29.0", features = ["sched", "signal", "user"] }
rand = "0.8.5"
sha2 = "0.10.8"
Index: netavark/src/commands/firewalld_reload.rs
===================================================================
--- netavark.orig/src/commands/firewalld_reload.rs
+++ netavark/src/commands/firewalld_reload.rs
@@ -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},
Index: netavark/src/error/mod.rs
===================================================================
--- netavark.orig/src/error/mod.rs
+++ netavark/src/error/mod.rs
@@ -192,6 +192,14 @@ impl From<zbus::zvariant::Error> for Net
}
}
+// 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)
Index: netavark/src/firewall/firewalld.rs
===================================================================
--- netavark.orig/src/firewall/firewalld.rs
+++ netavark/src/firewall/firewalld.rs
@@ -191,9 +191,9 @@ impl firewall::FirewallDriver for Firewa
))
}
};
- 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 Firewa
))
}
};
- 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 Firewa
))
}
};
- 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 Firewa
))
}
};
- 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());
|
