Skip to content

Commit 445b12b

Browse files
committed
rpm: Do not remove wiremock which is now available in Fedora
This also fixes the latest introduced build errors during the RPM package build on Copr. Signed-off-by: Anderson Toshiyuki Sasaki <[email protected]>
1 parent fa7c59a commit 445b12b

File tree

2 files changed

+20
-94
lines changed

2 files changed

+20
-94
lines changed
Lines changed: 10 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
--- a/keylime/Cargo.toml 2025-08-06 10:04:19.246120602 +0200
2-
+++ b/keylime/Cargo.toml 2025-08-06 10:12:12.694471716 +0200
3-
@@ -40,14 +40,11 @@
1+
--- a/keylime/Cargo.toml 2025-09-03 13:40:50.312319072 +0200
2+
+++ b/keylime/Cargo.toml 2025-09-03 13:41:15.200337821 +0200
3+
@@ -43,7 +43,6 @@
44
tokio.workspace = true
55
uuid.workspace = true
66
zip.workspace = true
77
-zmq = {version = "0.9.2", optional = true}
88

99
[dev-dependencies]
1010
tempfile.workspace = true
11-
actix-rt.workspace = true
12-
-wiremock = {version = "0.6"}
11+
@@ -51,6 +50,5 @@
12+
wiremock = {version = "0.6"}
1313

1414
[features]
1515
+default = []
1616
testing = []
1717
-# This feature is deprecated and will be removed on next major release
1818
-with-zmq = ["zmq"]
19-
--- a/keylime-agent/Cargo.toml 2025-08-06 10:08:23.650703421 +0200
20-
+++ b/keylime-agent/Cargo.toml 2025-08-06 10:09:30.080590640 +0200
19+
--- a/keylime-agent/Cargo.toml 2025-09-03 13:40:44.826218516 +0200
20+
+++ b/keylime-agent/Cargo.toml 2025-09-03 13:44:24.357847991 +0200
2121
@@ -32,7 +32,6 @@
2222
thiserror.workspace = true
2323
uuid.workspace = true
@@ -45,50 +45,13 @@
4545

4646
[package.metadata.deb]
4747
section = "net"
48-
--- a/keylime-push-model-agent/Cargo.toml 2025-09-01 16:15:47.167875866 +0200
49-
+++ b/keylime-push-model-agent/Cargo.toml 2025-09-01 16:20:04.672419233 +0200
50-
@@ -29,14 +29,11 @@
51-
[dev-dependencies]
52-
actix-rt.workspace = true
53-
tempfile.workspace = true
54-
-wiremock = {version = "0.6"}
55-
-
56-
57-
[features]
48+
--- a/keylime-push-model-agent/Cargo.toml 2025-09-03 13:40:40.221414602 +0200
49+
+++ b/keylime-push-model-agent/Cargo.toml 2025-09-03 13:45:30.856052632 +0200
50+
@@ -36,7 +36,6 @@
5851
# The features enabled by default
5952
default = []
6053
testing = ["keylime/testing"]
6154
-legacy-python-actions = []
6255

6356
[package.metadata.deb]
6457
section = "net"
65-
--- a/keylime-push-model-agent/src/state_machine.rs 2025-08-06 10:16:06.677153521 +0200
66-
+++ b/keylime-push-model-agent/src/state_machine.rs 2025-08-06 10:18:49.944060220 +0200
67-
@@ -287,6 +287,7 @@
68-
69-
#[cfg(test)]
70-
#[cfg(feature = "testing")]
71-
+#[cfg(feature = "with-wiremock")]
72-
mod tpm_tests {
73-
use super::*;
74-
use crate::attestation::{AttestationClient, NegotiationConfig};
75-
--- a/keylime-push-model-agent/src/attestation.rs 2025-08-06 10:21:35.514185935 +0200
76-
+++ b/keylime-push-model-agent/src/attestation.rs 2025-08-06 10:22:19.399032540 +0200
77-
@@ -210,6 +210,7 @@
78-
}
79-
80-
#[cfg(test)]
81-
+#[cfg(feature = "with-wiremock")]
82-
mod tests {
83-
use super::*;
84-
use std::fs::File;
85-
--- a/keylime/src/resilient_client.rs 2025-08-06 11:11:57.994406294 +0200
86-
+++ b/keylime/src/resilient_client.rs 2025-08-06 11:12:25.077633103 +0200
87-
@@ -186,6 +186,7 @@
88-
}
89-
90-
#[cfg(test)]
91-
+#[cfg(feature = "with-wiremock")]
92-
mod tests {
93-
use super::*;
94-
use reqwest::header;
Lines changed: 10 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
--- a/keylime/Cargo.toml 2025-08-06 10:04:19.246120602 +0200
2-
+++ b/keylime/Cargo.toml 2025-08-06 10:12:12.694471716 +0200
3-
@@ -40,14 +40,11 @@
1+
--- a/keylime/Cargo.toml 2025-09-03 13:40:50.312319072 +0200
2+
+++ b/keylime/Cargo.toml 2025-09-03 13:41:15.200337821 +0200
3+
@@ -43,7 +43,6 @@
44
tokio.workspace = true
55
uuid.workspace = true
66
zip.workspace = true
77
-zmq = {version = "0.9.2", optional = true}
88

99
[dev-dependencies]
1010
tempfile.workspace = true
11-
actix-rt.workspace = true
12-
-wiremock = {version = "0.6"}
11+
@@ -51,6 +50,5 @@
12+
wiremock = {version = "0.6"}
1313

1414
[features]
1515
+default = []
1616
testing = []
1717
-# This feature is deprecated and will be removed on next major release
1818
-with-zmq = ["zmq"]
19-
--- a/keylime-agent/Cargo.toml 2025-08-06 10:08:23.650703421 +0200
20-
+++ b/keylime-agent/Cargo.toml 2025-08-06 10:09:30.080590640 +0200
19+
--- a/keylime-agent/Cargo.toml 2025-09-03 13:40:44.826218516 +0200
20+
+++ b/keylime-agent/Cargo.toml 2025-09-03 13:44:24.357847991 +0200
2121
@@ -32,7 +32,6 @@
2222
thiserror.workspace = true
2323
uuid.workspace = true
@@ -45,50 +45,13 @@
4545

4646
[package.metadata.deb]
4747
section = "net"
48-
--- a/keylime-push-model-agent/Cargo.toml 2025-09-01 16:15:47.167875866 +0200
49-
+++ b/keylime-push-model-agent/Cargo.toml 2025-09-01 16:20:04.672419233 +0200
50-
@@ -29,14 +29,11 @@
51-
[dev-dependencies]
52-
actix-rt.workspace = true
53-
tempfile.workspace = true
54-
-wiremock = {version = "0.6"}
55-
-
56-
57-
[features]
48+
--- a/keylime-push-model-agent/Cargo.toml 2025-09-03 13:40:40.221414602 +0200
49+
+++ b/keylime-push-model-agent/Cargo.toml 2025-09-03 13:45:30.856052632 +0200
50+
@@ -36,7 +36,6 @@
5851
# The features enabled by default
5952
default = []
6053
testing = ["keylime/testing"]
6154
-legacy-python-actions = []
6255

6356
[package.metadata.deb]
6457
section = "net"
65-
--- a/keylime-push-model-agent/src/state_machine.rs 2025-08-06 10:16:06.677153521 +0200
66-
+++ b/keylime-push-model-agent/src/state_machine.rs 2025-08-06 10:18:49.944060220 +0200
67-
@@ -287,6 +287,7 @@
68-
69-
#[cfg(test)]
70-
#[cfg(feature = "testing")]
71-
+#[cfg(feature = "with-wiremock")]
72-
mod tpm_tests {
73-
use super::*;
74-
use crate::attestation::{AttestationClient, NegotiationConfig};
75-
--- a/keylime-push-model-agent/src/attestation.rs 2025-08-06 10:21:35.514185935 +0200
76-
+++ b/keylime-push-model-agent/src/attestation.rs 2025-08-06 10:22:19.399032540 +0200
77-
@@ -210,6 +210,7 @@
78-
}
79-
80-
#[cfg(test)]
81-
+#[cfg(feature = "with-wiremock")]
82-
mod tests {
83-
use super::*;
84-
use std::fs::File;
85-
--- a/keylime/src/resilient_client.rs 2025-08-06 11:11:57.994406294 +0200
86-
+++ b/keylime/src/resilient_client.rs 2025-08-06 11:12:25.077633103 +0200
87-
@@ -186,6 +186,7 @@
88-
}
89-
90-
#[cfg(test)]
91-
+#[cfg(feature = "with-wiremock")]
92-
mod tests {
93-
use super::*;
94-
use reqwest::header;

0 commit comments

Comments
 (0)