This repository was archived by the owner on Mar 26, 2026. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2
Expand file tree
/
Copy path0001-Patch-windows-dependencies-across-workspace.patch
More file actions
297 lines (273 loc) · 7.79 KB
/
0001-Patch-windows-dependencies-across-workspace.patch
File metadata and controls
297 lines (273 loc) · 7.79 KB
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
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
From 66c8648cc96c66dce3de852c306fc535873270ee Mon Sep 17 00:00:00 2001
From: Rodolfo Olivieri <rodolfo.olivieri3@gmail.com>
Date: Wed, 4 Feb 2026 08:14:50 -0300
Subject: [PATCH 1/4] Patch windows dependencies across workspace
Removed the following windows dependencies across the crates workspaces
members as they are platform specific (windows)
* winapi
* winreg
Removed a few features from keyring crate due to being specific to
windows/apple
* keyring features (apple-native, windows-native)
Removed the vendored feature from keyring crate as it statically link
against the dbus library
* keyring features (vendored)
---
Cargo.lock | 101 +--------------------------------
crates/goose-bench/Cargo.toml | 3 -
crates/goose-cli/Cargo.toml | 3 -
crates/goose-server/Cargo.toml | 3 -
crates/goose/Cargo.toml | 5 +-
5 files changed, 3 insertions(+), 112 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index e2808819b..1d99b76fd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1945,7 +1945,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "708b509edf7889e53d7efb0ffadd994cc6c2345ccb62f55cfd6b0682165e4fa6"
dependencies = [
"dbus",
- "openssl",
"zeroize",
]
@@ -2547,21 +2546,6 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
[[package]]
name = "form_urlencoded"
version = "1.2.2"
@@ -2926,7 +2910,6 @@ dependencies = [
"v_htmlescape",
"webbrowser",
"which 8.0.0",
- "winapi",
"wiremock",
"zip 0.6.6",
]
@@ -2984,7 +2967,6 @@ dependencies = [
"tokio",
"tracing",
"tracing-subscriber",
- "winapi",
]
[[package]]
@@ -3031,7 +3013,6 @@ dependencies = [
"urlencoding",
"uuid",
"webbrowser",
- "winapi",
]
[[package]]
@@ -3123,7 +3104,6 @@ dependencies = [
"url",
"utoipa",
"uuid",
- "winreg 0.55.0",
"wiremock",
]
@@ -4024,13 +4004,8 @@ version = "3.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eebcc3aff044e5944a8fbaf69eb277d11986064cba30c468730e8b9909fb551c"
dependencies = [
- "byteorder",
"dbus-secret-service",
"log",
- "openssl",
- "security-framework 2.11.1",
- "security-framework 3.5.1",
- "windows-sys 0.60.2",
"zeroize",
]
@@ -4067,7 +4042,6 @@ version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "328c4789d42200f1eeec05bd86c9c13c7f091d2ba9a6ea35acdf51f31bc0f043"
dependencies = [
- "cc",
"pkg-config",
]
@@ -4959,60 +4933,12 @@ dependencies = [
"pathdiff",
]
-[[package]]
-name = "openssl"
-version = "0.10.75"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328"
-dependencies = [
- "bitflags 2.10.0",
- "cfg-if",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.114",
-]
-
[[package]]
name = "openssl-probe"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
-[[package]]
-name = "openssl-src"
-version = "300.5.5+3.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f1787d533e03597a7934fd0a765f0d28e94ecc5fb7789f8053b1e699a56f709"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.111"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321"
-dependencies = [
- "cc",
- "libc",
- "openssl-src",
- "pkg-config",
- "vcpkg",
-]
-
[[package]]
name = "opentelemetry"
version = "0.27.1"
@@ -5968,7 +5894,7 @@ dependencies = [
"wasm-bindgen-futures",
"web-sys",
"webpki-roots 0.25.4",
- "winreg 0.50.0",
+ "winreg",
]
[[package]]
@@ -6264,7 +6190,7 @@ dependencies = [
"openssl-probe",
"rustls-pki-types",
"schannel",
- "security-framework 3.5.1",
+ "security-framework",
]
[[package]]
@@ -6459,19 +6385,6 @@ version = "3.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca"
-[[package]]
-name = "security-framework"
-version = "2.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
-dependencies = [
- "bitflags 2.10.0",
- "core-foundation 0.9.4",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
[[package]]
name = "security-framework"
version = "3.5.1"
@@ -9160,16 +9073,6 @@ dependencies = [
"windows-sys 0.48.0",
]
-[[package]]
-name = "winreg"
-version = "0.55.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97"
-dependencies = [
- "cfg-if",
- "windows-sys 0.59.0",
-]
-
[[package]]
name = "winsafe"
version = "0.0.19"
diff --git a/crates/goose-bench/Cargo.toml b/crates/goose-bench/Cargo.toml
index 76a694958..e1a73215d 100644
--- a/crates/goose-bench/Cargo.toml
+++ b/crates/goose-bench/Cargo.toml
@@ -27,6 +27,3 @@ include_dir = "0.7.4"
once_cell = "1.19"
regex = { workspace = true }
dotenvy = "0.15.7"
-
-[target.'cfg(target_os = "windows")'.dependencies]
-winapi = { version = "0.3", features = ["wincred"] }
diff --git a/crates/goose-cli/Cargo.toml b/crates/goose-cli/Cargo.toml
index 824225baa..1e85d2318 100644
--- a/crates/goose-cli/Cargo.toml
+++ b/crates/goose-cli/Cargo.toml
@@ -57,9 +57,6 @@ open = "5.3.2"
urlencoding = "2.1"
clap_complete = "4.5.62"
-[target.'cfg(target_os = "windows")'.dependencies]
-winapi = { version = "0.3", features = ["wincred"] }
-
[features]
# disables the update command
disable-update = []
diff --git a/crates/goose-server/Cargo.toml b/crates/goose-server/Cargo.toml
index 6e2073822..e3009b882 100644
--- a/crates/goose-server/Cargo.toml
+++ b/crates/goose-server/Cargo.toml
@@ -46,9 +46,6 @@ fs2 = "0.4.3"
rustls = { version = "0.23", features = ["ring"] }
uuid = { version = "1.19.0", features = ["v4"] }
-[target.'cfg(windows)'.dependencies]
-winreg = { version = "0.55.0" }
-
[[bin]]
name = "goosed"
path = "src/main.rs"
diff --git a/crates/goose/Cargo.toml b/crates/goose/Cargo.toml
index 1e99d7be8..e1a7c6abf 100644
--- a/crates/goose/Cargo.toml
+++ b/crates/goose/Cargo.toml
@@ -57,7 +57,7 @@ opentelemetry = "0.27"
opentelemetry-appender-tracing = "0.27"
opentelemetry_sdk = { version = "0.27", features = ["rt-tokio", "metrics"] }
opentelemetry-otlp = { version = "0.27", features = ["http-proto", "reqwest-client"] }
-keyring = { version = "3.6.2", features = ["apple-native", "windows-native", "sync-secret-service", "vendored"] }
+keyring = { version = "3.6.2", features = ["sync-secret-service"] }
serde_yaml = "0.9.34"
once_cell = "1.20.2"
etcetera = { workspace = true }
@@ -101,9 +101,6 @@ which = { workspace = true}
boa_engine = "0.21.0"
unbinder = "0.1.7"
-[target.'cfg(target_os = "windows")'.dependencies]
-winapi = { version = "0.3", features = ["wincred"] }
-
[dev-dependencies]
serial_test = { workspace = true }
mockall = "0.13.1"
--
2.53.0