Skip to content

Commit 1e85f94

Browse files
authored
update zip to 4.2.0 (#8425)
zip 2.6.x was yanked, which causes r-a in Omicron to be somewhat sad (see oxidecomputer/tufaceous#31 for example output). Along with omicron, we also pull in updates to tufaceous and support-bundle-viewer. The versions were yanked due to breaking semver (and republished as zip version 3 and 4), but we already made our code compatible with zip 2.6 (oxidecomputer/tufaceous#25) so this upgrade involves no code changes.
1 parent 1b4b019 commit 1e85f94

File tree

4 files changed

+53
-38
lines changed

4 files changed

+53
-38
lines changed

Cargo.lock

Lines changed: 38 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ wicketd-client = { path = "clients/wicketd-client" }
754754
xshell = "0.2.7"
755755
zerocopy = "0.8.26"
756756
zeroize = { version = "1.8.1", features = ["zeroize_derive", "std"] }
757-
zip = { version = "2.6.1", default-features = false, features = ["deflate","bzip2"] }
757+
zip = { version = "4.2.0", default-features = false, features = ["deflate","bzip2"] }
758758
zone = { version = "0.3.1", default-features = false, features = ["async"] }
759759

760760
# newtype-uuid is set to default-features = false because we don't want to

dev-tools/reconfigurator-cli/tests/output/target-release-stdout

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ INFO added artifact, name: fake-host, kind: host_phase_1, version: 1.0.0, hash:
3131
INFO added artifact, name: fake-host, kind: host_phase_2, version: 1.0.0, hash: f3dd0c7a1bd4500ea0d8bcf67581f576d47752b2f1998a4cb0f0c3155c483008, length: 1048576
3232
INFO added artifact, name: fake-trampoline, kind: trampoline_phase_1, version: 1.0.0, hash: 9b7575cad720f017e936fe5994fc4e21fe040acaaf83c2edd86132aa3d667c7b, length: 524288
3333
INFO added artifact, name: fake-trampoline, kind: trampoline_phase_2, version: 1.0.0, hash: f355fb8429a7e0f0716dad035f9a06c799168d6c0ffcde85b1a96fef21d4b53e, length: 1048576
34-
INFO added artifact, name: zone1, kind: zone, version: 1.0.0, hash: 584bcfabf852d22ca322ca92076836cc8c9aa0489bc4132fef345271f2a00daf, length: 6612
35-
INFO added artifact, name: zone2, kind: zone, version: 1.0.0, hash: 4063276e4ce47896848da87c83a9e28949c104d92581d62e50bea7ff7a8cfe1c, length: 6613
34+
INFO added artifact, name: zone1, kind: zone, version: 1.0.0, hash: 3a20f7bf38820060363fc61ba4437e5bbd1c2500d91321417ab49687a255a30a, length: 11907
35+
INFO added artifact, name: zone2, kind: zone, version: 1.0.0, hash: a283b1343cc77beffdb610979bb9cafc66e5f14c142b070481e0be7ada588b79, length: 11909
3636
INFO added artifact, name: fake-psc-sp, kind: psc_sp, version: 1.0.0, hash: f896cf5b19ca85864d470ad8587f980218bff3954e7f52bbd999699cd0f9635b, length: 744
3737
INFO added artifact, name: fake-psc-rot, kind: psc_rot_image_a, version: 1.0.0, hash: 179eb660ebc92e28b6748b6af03d9f998d6131319edd4654a1e948454c62551b, length: 750
3838
INFO added artifact, name: fake-psc-rot, kind: psc_rot_image_b, version: 1.0.0, hash: 179eb660ebc92e28b6748b6af03d9f998d6131319edd4654a1e948454c62551b, length: 750
@@ -60,8 +60,8 @@ target release: 1.0.0 (system-update-v1.0.0.zip)
6060
artifact: f3dd0c7a1bd4500ea0d8bcf67581f576d47752b2f1998a4cb0f0c3155c483008 host_phase_2 (fake-host version 1.0.0)
6161
artifact: 9b7575cad720f017e936fe5994fc4e21fe040acaaf83c2edd86132aa3d667c7b trampoline_phase_1 (fake-trampoline version 1.0.0)
6262
artifact: f355fb8429a7e0f0716dad035f9a06c799168d6c0ffcde85b1a96fef21d4b53e trampoline_phase_2 (fake-trampoline version 1.0.0)
63-
artifact: 584bcfabf852d22ca322ca92076836cc8c9aa0489bc4132fef345271f2a00daf zone (zone1 version 1.0.0)
64-
artifact: 4063276e4ce47896848da87c83a9e28949c104d92581d62e50bea7ff7a8cfe1c zone (zone2 version 1.0.0)
63+
artifact: 3a20f7bf38820060363fc61ba4437e5bbd1c2500d91321417ab49687a255a30a zone (zone1 version 1.0.0)
64+
artifact: a283b1343cc77beffdb610979bb9cafc66e5f14c142b070481e0be7ada588b79 zone (zone2 version 1.0.0)
6565
artifact: f896cf5b19ca85864d470ad8587f980218bff3954e7f52bbd999699cd0f9635b psc_sp (fake-psc-sp version 1.0.0)
6666
artifact: 179eb660ebc92e28b6748b6af03d9f998d6131319edd4654a1e948454c62551b psc_rot_image_a (fake-psc-rot version 1.0.0)
6767
artifact: 179eb660ebc92e28b6748b6af03d9f998d6131319edd4654a1e948454c62551b psc_rot_image_b (fake-psc-rot version 1.0.0)
@@ -124,8 +124,8 @@ target release: 1.0.0 (system-update-v1.0.0.zip)
124124
artifact: f3dd0c7a1bd4500ea0d8bcf67581f576d47752b2f1998a4cb0f0c3155c483008 host_phase_2 (fake-host version 1.0.0)
125125
artifact: 9b7575cad720f017e936fe5994fc4e21fe040acaaf83c2edd86132aa3d667c7b trampoline_phase_1 (fake-trampoline version 1.0.0)
126126
artifact: f355fb8429a7e0f0716dad035f9a06c799168d6c0ffcde85b1a96fef21d4b53e trampoline_phase_2 (fake-trampoline version 1.0.0)
127-
artifact: 584bcfabf852d22ca322ca92076836cc8c9aa0489bc4132fef345271f2a00daf zone (zone1 version 1.0.0)
128-
artifact: 4063276e4ce47896848da87c83a9e28949c104d92581d62e50bea7ff7a8cfe1c zone (zone2 version 1.0.0)
127+
artifact: 3a20f7bf38820060363fc61ba4437e5bbd1c2500d91321417ab49687a255a30a zone (zone1 version 1.0.0)
128+
artifact: a283b1343cc77beffdb610979bb9cafc66e5f14c142b070481e0be7ada588b79 zone (zone2 version 1.0.0)
129129
artifact: f896cf5b19ca85864d470ad8587f980218bff3954e7f52bbd999699cd0f9635b psc_sp (fake-psc-sp version 1.0.0)
130130
artifact: 179eb660ebc92e28b6748b6af03d9f998d6131319edd4654a1e948454c62551b psc_rot_image_a (fake-psc-rot version 1.0.0)
131131
artifact: 179eb660ebc92e28b6748b6af03d9f998d6131319edd4654a1e948454c62551b psc_rot_image_b (fake-psc-rot version 1.0.0)

workspace-hack/Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ ed25519-dalek = { version = "2.1.1", features = ["digest", "pkcs8", "rand_core"]
4949
either = { version = "1.15.0", features = ["use_std"] }
5050
elliptic-curve = { version = "0.13.8", features = ["ecdh", "hazmat", "pem", "std"] }
5151
ff = { version = "0.13.0", default-features = false, features = ["alloc"] }
52-
flate2 = { version = "1.1.2" }
52+
flate2 = { version = "1.1.2", features = ["zlib-rs"] }
5353
foldhash = { version = "0.1.5" }
5454
form_urlencoded = { version = "1.2.1" }
5555
fs-err = { version = "3.1.1", default-features = false, features = ["tokio"] }
@@ -64,6 +64,7 @@ generic-array = { version = "0.14.7", default-features = false, features = ["mor
6464
getrandom-6f8ce4dd05d13bba = { package = "getrandom", version = "0.2.15", default-features = false, features = ["js", "rdrand", "std"] }
6565
group = { version = "0.13.0", default-features = false, features = ["alloc"] }
6666
hashbrown = { version = "0.15.4" }
67+
heck = { version = "0.4.1" }
6768
hickory-proto = { version = "0.25.2", features = ["serde", "text-parsing"] }
6869
hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
6970
hyper = { version = "1.6.0", features = ["full"] }
@@ -72,7 +73,7 @@ indexmap = { version = "2.9.0", features = ["serde"] }
7273
inout = { version = "0.1.3", default-features = false, features = ["std"] }
7374
ipnet = { version = "2.11.0", features = ["serde"] }
7475
ipnetwork = { version = "0.21.1", features = ["schemars", "serde"] }
75-
itertools-93f6ce9d446188ac = { package = "itertools", version = "0.10.5" }
76+
itertools = { version = "0.10.5" }
7677
lalrpop-util = { version = "0.19.12" }
7778
lazy_static = { version = "1.5.0", default-features = false, features = ["spin_no_std"] }
7879
libc = { version = "0.2.174", features = ["extra_traits"] }
@@ -146,8 +147,8 @@ x509-cert = { version = "0.2.5" }
146147
zerocopy-c38e5c1d305a1b54 = { package = "zerocopy", version = "0.8.26", default-features = false, features = ["derive"] }
147148
zerocopy-ca01ad9e24f5d932 = { package = "zerocopy", version = "0.7.35", features = ["derive", "simd"] }
148149
zeroize = { version = "1.8.1", features = ["std", "zeroize_derive"] }
150+
zip-164d15cefe24d7eb = { package = "zip", version = "4.2.0", default-features = false, features = ["bzip2", "deflate", "zstd"] }
149151
zip-3b31131e45eafb45 = { package = "zip", version = "0.6.6", default-features = false, features = ["bzip2", "deflate"] }
150-
zip-f595c2ba2a3f28df = { package = "zip", version = "2.6.1", default-features = false, features = ["bzip2", "deflate", "zstd"] }
151152

152153
[build-dependencies]
153154
ahash = { version = "0.8.11" }
@@ -182,7 +183,7 @@ ed25519-dalek = { version = "2.1.1", features = ["digest", "pkcs8", "rand_core"]
182183
either = { version = "1.15.0", features = ["use_std"] }
183184
elliptic-curve = { version = "0.13.8", features = ["ecdh", "hazmat", "pem", "std"] }
184185
ff = { version = "0.13.0", default-features = false, features = ["alloc"] }
185-
flate2 = { version = "1.1.2" }
186+
flate2 = { version = "1.1.2", features = ["zlib-rs"] }
186187
foldhash = { version = "0.1.5" }
187188
form_urlencoded = { version = "1.2.1" }
188189
fs-err = { version = "3.1.1", default-features = false, features = ["tokio"] }
@@ -197,6 +198,7 @@ generic-array = { version = "0.14.7", default-features = false, features = ["mor
197198
getrandom-6f8ce4dd05d13bba = { package = "getrandom", version = "0.2.15", default-features = false, features = ["js", "rdrand", "std"] }
198199
group = { version = "0.13.0", default-features = false, features = ["alloc"] }
199200
hashbrown = { version = "0.15.4" }
201+
heck = { version = "0.4.1" }
200202
hickory-proto = { version = "0.25.2", features = ["serde", "text-parsing"] }
201203
hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
202204
hyper = { version = "1.6.0", features = ["full"] }
@@ -205,7 +207,7 @@ indexmap = { version = "2.9.0", features = ["serde"] }
205207
inout = { version = "0.1.3", default-features = false, features = ["std"] }
206208
ipnet = { version = "2.11.0", features = ["serde"] }
207209
ipnetwork = { version = "0.21.1", features = ["schemars", "serde"] }
208-
itertools-93f6ce9d446188ac = { package = "itertools", version = "0.10.5" }
210+
itertools = { version = "0.10.5" }
209211
lalrpop-util = { version = "0.19.12" }
210212
lazy_static = { version = "1.5.0", default-features = false, features = ["spin_no_std"] }
211213
libc = { version = "0.2.174", features = ["extra_traits"] }
@@ -281,8 +283,8 @@ x509-cert = { version = "0.2.5" }
281283
zerocopy-c38e5c1d305a1b54 = { package = "zerocopy", version = "0.8.26", default-features = false, features = ["derive"] }
282284
zerocopy-ca01ad9e24f5d932 = { package = "zerocopy", version = "0.7.35", features = ["derive", "simd"] }
283285
zeroize = { version = "1.8.1", features = ["std", "zeroize_derive"] }
286+
zip-164d15cefe24d7eb = { package = "zip", version = "4.2.0", default-features = false, features = ["bzip2", "deflate", "zstd"] }
284287
zip-3b31131e45eafb45 = { package = "zip", version = "0.6.6", default-features = false, features = ["bzip2", "deflate"] }
285-
zip-f595c2ba2a3f28df = { package = "zip", version = "2.6.1", default-features = false, features = ["bzip2", "deflate", "zstd"] }
286288

287289
[target.x86_64-unknown-linux-gnu.dependencies]
288290
bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.9.0", default-features = false, features = ["std"] }
@@ -350,7 +352,6 @@ getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3.1", default
350352
hyper-rustls = { version = "0.27.7", features = ["http2", "ring", "webpki-tokio"] }
351353
hyper-util = { version = "0.1.14", features = ["client-proxy", "client-proxy-system", "full"] }
352354
indicatif = { version = "0.17.11", features = ["rayon"] }
353-
itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12.1" }
354355
mio = { version = "1.0.2", features = ["net", "os-ext"] }
355356
rustix = { version = "0.38.37", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
356357
toml_edit-cdcf2f9584511fe6 = { package = "toml_edit", version = "0.19.15", features = ["serde"] }
@@ -365,7 +366,6 @@ getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3.1", default
365366
hyper-rustls = { version = "0.27.7", features = ["http2", "ring", "webpki-tokio"] }
366367
hyper-util = { version = "0.1.14", features = ["client-proxy", "client-proxy-system", "full"] }
367368
indicatif = { version = "0.17.11", features = ["rayon"] }
368-
itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12.1" }
369369
mio = { version = "1.0.2", features = ["net", "os-ext"] }
370370
rustix = { version = "0.38.37", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
371371
toml_edit-cdcf2f9584511fe6 = { package = "toml_edit", version = "0.19.15", features = ["serde"] }

0 commit comments

Comments
 (0)