From f856b9fac77b1aa0c87b92bfd858eaddec58c698 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Tue, 2 Jan 2024 13:28:27 -0800 Subject: [PATCH 1/4] Update several dependencies to windows-sys 0.52. Update cap-std, rustix, io-extras, errno, fd-lock, fs-set-times, and winx to versions which use windows-sys 0.52. I started out hoping that everything could be updated to windows-sys 0.52, however tokio and mio have not yet updated to windows-sys 0.52 due to supporting an older MSRV. --- Cargo.lock | 142 +++++++++++++++++++++----------- supply-chain/audits.toml | 35 ++++++++ supply-chain/imports.lock | 167 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 298 insertions(+), 46 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 69384070836e..eaea2df30588 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -43,6 +43,15 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9d4ee0d472d1cd2e28c97dfa124b3d8d992e10eb0a035f33f5d12e3a177ba3b" +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + [[package]] name = "anes" version = "0.1.6" @@ -246,21 +255,21 @@ dependencies = [ [[package]] name = "cap-fs-ext" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b779b2d0a001c125b4584ad586268fb4b92d957bff8d26d7fe0dd78283faa814" +checksum = "88e341d15ac1029aadce600be764a1a1edafe40e03cde23285bc1d261b3a4866" dependencies = [ "cap-primitives", "cap-std", "io-lifetimes", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "cap-net-ext" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ffc30dee200c20b4dcb80572226f42658e1d9c4b668656d7cc59c33d50e396e" +checksum = "434168fe6533055f0f4204039abe3ff6d7db338ef46872a5fa39e9d5ad5ab7a9" dependencies = [ "cap-primitives", "cap-std", @@ -270,9 +279,9 @@ dependencies = [ [[package]] name = "cap-primitives" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf30c373a3bee22c292b1b6a7a26736a38376840f1af3d2d806455edf8c3899" +checksum = "fe16767ed8eee6d3f1f00d6a7576b81c226ab917eb54b96e5f77a5216ef67abb" dependencies = [ "ambient-authority", "fs-set-times", @@ -281,15 +290,15 @@ dependencies = [ "ipnet", "maybe-owned", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "winx", ] [[package]] name = "cap-rand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "577de6cff7c2a47d6b13efe5dd28bf116bd7f8f7db164ea95b7cc2640711f522" +checksum = "20e5695565f0cd7106bc3c7170323597540e772bb73e0be2cd2c662a0f8fa4ca" dependencies = [ "ambient-authority", "rand", @@ -297,9 +306,9 @@ dependencies = [ [[package]] name = "cap-std" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84bade423fa6403efeebeafe568fdb230e8c590a275fba2ba978dd112efcf6e9" +checksum = "593db20e4c51f62d3284bae7ee718849c3214f93a3b94ea1899ad85ba119d330" dependencies = [ "cap-primitives", "io-extras", @@ -309,9 +318,9 @@ dependencies = [ [[package]] name = "cap-tempfile" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b9e3348a3510c4619b4c7a7bcdef09a71221da18f266bda3ed6b9aea2c509e2" +checksum = "29d0d2d91fc0da2e0d811289a0d3518b8aba8a122fc0014f702feb3967fbe857" dependencies = [ "cap-std", "rand", @@ -321,11 +330,13 @@ dependencies = [ [[package]] name = "cap-time-ext" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f52b3c8f4abfe3252fd0a071f3004aaa3b18936ec97bdbd8763ce03aff6247" +checksum = "03261630f291f425430a36f38c847828265bc928f517cdd2004c56f4b02f002b" dependencies = [ + "ambient-authority", "cap-primitives", + "iana-time-zone", "once_cell", "rustix", "winx", @@ -382,11 +393,12 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.73" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -532,6 +544,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + [[package]] name = "cpp_demangle" version = "0.3.5" @@ -1048,12 +1066,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1082,13 +1100,13 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fd-lock" -version = "4.0.0" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0377f1edc77dbd1118507bc7a66e4ab64d2b90c66f90726dc801e73a8c68f9" +checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947" dependencies = [ "cfg-if", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1146,13 +1164,13 @@ dependencies = [ [[package]] name = "fs-set-times" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd738b84894214045e8414eaded76359b4a5773f0a0a56b16575110739cdcf39" +checksum = "033b337d725b97690d86893f9de22b67b80dcc4e9ad815f348254c38119db8fb" dependencies = [ "io-lifetimes", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1422,6 +1440,29 @@ dependencies = [ "want", ] +[[package]] +name = "iana-time-zone" +version = "0.1.59" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + [[package]] name = "id-arena" version = "2.2.1" @@ -1488,12 +1529,12 @@ dependencies = [ [[package]] name = "io-extras" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d3c230ee517ee76b1cc593b52939ff68deda3fae9e41eca426c6b4993df51c4" +checksum = "c301e73fb90e8a29e600a9f402d095765f74310d582916a952f618836a1bd1ed" dependencies = [ "io-lifetimes", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1510,13 +1551,13 @@ checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" dependencies = [ "hermit-abi", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1605,9 +1646,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.149" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libfuzzer-sys" @@ -1638,9 +1679,9 @@ checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "listenfd" @@ -2182,9 +2223,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.21" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ "bitflags 2.4.1", "errno", @@ -2192,7 +2233,7 @@ dependencies = [ "libc", "linux-raw-sys", "once_cell", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2474,9 +2515,9 @@ dependencies = [ [[package]] name = "system-interface" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27ce32341b2c0b70c144bbf35627fdc1ef18c76ced5e5e7b3ee8b5ba6b2ab6a0" +checksum = "0682e006dd35771e392a6623ac180999a9a854b1d4a6c12fb2e804941c2b1f58" dependencies = [ "bitflags 2.4.1", "cap-fs-ext", @@ -2484,7 +2525,7 @@ dependencies = [ "fd-lock", "io-lifetimes", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "winx", ] @@ -3946,6 +3987,15 @@ dependencies = [ "winch-test-macros", ] +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -4080,12 +4130,12 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winx" -version = "0.36.1" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4857cedf8371f690bb6782a3e2b065c54d1b6661be068aaf3eac8b45e813fdf8" +checksum = "f9643b83820c0cd246ecabe5fa454dd04ba4fa67996369466d0747472d337346" dependencies = [ "bitflags 2.4.1", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml index de604336d945..2b464c0521da 100644 --- a/supply-chain/audits.toml +++ b/supply-chain/audits.toml @@ -1037,6 +1037,15 @@ criteria = "safe-to-deploy" version = "0.2.4" notes = "A few tiny blocks of `unsafe` but each of them is very obviously correct." +[[audits.core-foundation-sys]] +who = "Dan Gohman " +criteria = "safe-to-deploy" +delta = "0.8.4 -> 0.8.6" +notes = """ +The changes here are all typical bindings updates: new functions, types, and +constants. I have not audited all the bindings for ABI conformance. +""" + [[audits.cpufeatures]] who = "Alex Crichton " criteria = "safe-to-deploy" @@ -1404,6 +1413,20 @@ refactorings and such. No new fundamental addition of functionality or substantially new unsafe code. """ +[[audits.iana-time-zone]] +who = "Dan Gohman " +criteria = "safe-to-deploy" +version = "0.1.59" +notes = """ +I also manually ran windows-bindgen and confirmed that the output matches +the bindings checked into the repo. +""" + +[[audits.iana-time-zone-haiku]] +who = "Dan Gohman " +criteria = "safe-to-deploy" +version = "0.1.2" + [[audits.id-arena]] who = "Nick Fitzgerald " criteria = "safe-to-deploy" @@ -1560,6 +1583,12 @@ criteria = "safe-to-deploy" delta = "0.2.148 -> 0.2.149" notes = "Lots of new functions and constants for new platforms and nothing out of the ordinary for what one would expect of the `libc` crate." +[[audits.libc]] +who = "Dan Gohman " +criteria = "safe-to-deploy" +delta = "0.2.149 -> 0.2.151" +notes = "More new functions, types, and constants, as is usual for the `libc` crate, as well as various minor code cleanups." + [[audits.libfuzzer-sys]] who = "Nick Fitzgerald " criteria = "safe-to-run" @@ -3435,6 +3464,12 @@ user-id = 189 # Andrew Gallant (BurntSushi) start = "2020-01-11" end = "2024-07-15" +[[trusted.windows-core]] +criteria = "safe-to-deploy" +user-id = 64539 # Kenny Kerr (kennykerr) +start = "2021-11-15" +end = "2025-01-02" + [[trusted.windows-sys]] criteria = "safe-to-deploy" user-id = 64539 # Kenny Kerr (kennykerr) diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock index 273d81f0a185..c7107d7aee42 100644 --- a/supply-chain/imports.lock +++ b/supply-chain/imports.lock @@ -691,6 +691,13 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.cap-fs-ext]] +version = "2.0.1" +when = "2024-01-02" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.cap-net-ext]] version = "2.0.0" when = "2023-06-30" @@ -698,6 +705,13 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.cap-net-ext]] +version = "2.0.1" +when = "2024-01-02" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.cap-primitives]] version = "2.0.0" when = "2023-06-30" @@ -705,6 +719,13 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.cap-primitives]] +version = "2.0.1" +when = "2024-01-02" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.cap-rand]] version = "2.0.0" when = "2023-06-30" @@ -712,6 +733,13 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.cap-rand]] +version = "2.0.1" +when = "2024-01-02" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.cap-std]] version = "2.0.0" when = "2023-06-30" @@ -719,6 +747,13 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.cap-std]] +version = "2.0.1" +when = "2024-01-02" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.cap-tempfile]] version = "2.0.0" when = "2023-06-30" @@ -726,6 +761,13 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.cap-tempfile]] +version = "2.0.1" +when = "2024-01-02" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.cap-time-ext]] version = "2.0.0" when = "2023-06-30" @@ -733,6 +775,13 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.cap-time-ext]] +version = "2.0.1" +when = "2024-01-02" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.clap]] version = "4.3.12" when = "2023-07-14" @@ -761,6 +810,13 @@ user-id = 6743 user-login = "epage" user-name = "Ed Page" +[[publisher.core-foundation-sys]] +version = "0.8.4" +when = "2023-04-03" +user-id = 5946 +user-login = "jrmuizel" +user-name = "Jeff Muizelaar" + [[publisher.cranelift]] version = "0.101.2" when = "2023-10-26" @@ -1088,6 +1144,13 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.errno]] +version = "0.3.8" +when = "2023-11-28" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.fd-lock]] version = "4.0.0" when = "2023-06-30" @@ -1095,6 +1158,13 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.fd-lock]] +version = "4.0.2" +when = "2023-12-29" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.filecheck]] version = "0.5.0" when = "2020-03-17" @@ -1109,6 +1179,13 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.fs-set-times]] +version = "0.20.1" +when = "2023-12-01" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.hashbrown]] version = "0.14.0" when = "2023-06-05" @@ -1137,6 +1214,13 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.io-extras]] +version = "0.18.1" +when = "2023-12-01" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.io-lifetimes]] version = "2.0.2" when = "2023-06-30" @@ -1151,6 +1235,13 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.is-terminal]] +version = "0.4.10" +when = "2023-12-28" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.itoa]] version = "1.0.1" when = "2021-12-12" @@ -1179,6 +1270,13 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.linux-raw-sys]] +version = "0.4.12" +when = "2023-11-30" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.memchr]] version = "2.5.0" when = "2022-04-30" @@ -1249,6 +1347,13 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.rustix]] +version = "0.38.28" +when = "2023-12-09" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.ryu]] version = "1.0.9" when = "2021-12-12" @@ -1325,6 +1430,13 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.system-interface]] +version = "0.26.1" +when = "2024-01-02" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.target-lexicon]] version = "0.12.3" when = "2022-02-01" @@ -2293,6 +2405,13 @@ when = "2023-12-01" user-id = 73222 user-login = "wasmtime-publish" +[[publisher.windows-core]] +version = "0.52.0" +when = "2023-11-15" +user-id = 64539 +user-login = "kennykerr" +user-name = "Kenny Kerr" + [[publisher.windows-sys]] version = "0.48.0" when = "2023-03-31" @@ -2426,6 +2545,13 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.winx]] +version = "0.36.3" +when = "2023-12-01" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.wit-bindgen]] version = "0.13.0" when = "2023-10-18" @@ -2706,6 +2832,16 @@ who = "David Cook " criteria = "safe-to-deploy" version = "0.7.1" +[[audits.mozilla.wildcard-audits.core-foundation-sys]] +who = "Bobby Holley " +criteria = "safe-to-deploy" +user-id = 5946 # Jeff Muizelaar (jrmuizel) +start = "2020-10-14" +end = "2023-05-04" +renew = false +notes = "I've reviewed every source contribution that was neither authored nor reviewed by Mozilla." +aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" + [[audits.mozilla.wildcard-audits.unicode-segmentation]] who = "Manish Goregaokar " criteria = "safe-to-deploy" @@ -2733,6 +2869,25 @@ end = "2024-05-03" notes = "All code written or reviewed by Manish" aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" +[[audits.mozilla.audits.android_system_properties]] +who = "Nicolas Silva " +criteria = "safe-to-deploy" +version = "0.1.2" +notes = "I wrote this crate, reviewed by jimb. It is mostly a Rust port of some C++ code we already ship." +aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" + +[[audits.mozilla.audits.android_system_properties]] +who = "Mike Hommey " +criteria = "safe-to-deploy" +delta = "0.1.2 -> 0.1.4" +aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" + +[[audits.mozilla.audits.android_system_properties]] +who = "Mike Hommey " +criteria = "safe-to-deploy" +delta = "0.1.4 -> 0.1.5" +aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" + [[audits.mozilla.audits.autocfg]] who = "Josh Stone " criteria = "safe-to-deploy" @@ -2804,6 +2959,18 @@ criteria = "safe-to-deploy" delta = "1.3.0 -> 1.4.0" aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" +[[audits.mozilla.audits.cc]] +who = "Mike Hommey " +criteria = "safe-to-deploy" +delta = "1.0.73 -> 1.0.78" +aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" + +[[audits.mozilla.audits.cc]] +who = "Jan-Erik Rediger " +criteria = "safe-to-deploy" +delta = "1.0.78 -> 1.0.83" +aggregated-from = "https://raw.githubusercontent.com/mozilla/glean/main/supply-chain/audits.toml" + [[audits.mozilla.audits.crypto-common]] who = "Mike Hommey " criteria = "safe-to-deploy" From 677599cfa07306577429ab2b3071b42741dcba7d Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Tue, 2 Jan 2024 15:23:06 -0800 Subject: [PATCH 2/4] Link the C++ examples with CoreFoundation. This is needed due to the iana-time-zone support. prtest:full --- examples/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 32343ddae679..d903beca4506 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -22,6 +22,7 @@ function(CREATE_TARGET TARGET TARGET_PATH) target_include_directories(wasmtime-${TARGET} PUBLIC wasmtime) target_link_libraries(wasmtime-${TARGET} PUBLIC wasmtime) + target_link_libraries(wasmtime-${TARGET} "-framework CoreFoundation") add_test(NAME ${TARGET}-c COMMAND $ WORKING_DIRECTORY ../..) endfunction() From abf0c62d8f57391d5ce95747815c10e5174eae2f Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Tue, 2 Jan 2024 15:30:16 -0800 Subject: [PATCH 3/4] Fix compilation on non-Apple platfoms. --- examples/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index d903beca4506..9022fefa4e85 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -22,7 +22,9 @@ function(CREATE_TARGET TARGET TARGET_PATH) target_include_directories(wasmtime-${TARGET} PUBLIC wasmtime) target_link_libraries(wasmtime-${TARGET} PUBLIC wasmtime) - target_link_libraries(wasmtime-${TARGET} "-framework CoreFoundation") + if(APPLE) + target_link_libraries(wasmtime-${TARGET} "-framework CoreFoundation") + endif() add_test(NAME ${TARGET}-c COMMAND $ WORKING_DIRECTORY ../..) endfunction() From b08689f562487ed2999885a0ddea14077b83ddc8 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Tue, 2 Jan 2024 15:32:08 -0800 Subject: [PATCH 4/4] Fix compilation on Apple platforms. --- examples/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 9022fefa4e85..e4330951434d 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -23,7 +23,7 @@ function(CREATE_TARGET TARGET TARGET_PATH) target_include_directories(wasmtime-${TARGET} PUBLIC wasmtime) target_link_libraries(wasmtime-${TARGET} PUBLIC wasmtime) if(APPLE) - target_link_libraries(wasmtime-${TARGET} "-framework CoreFoundation") + target_link_libraries(wasmtime-${TARGET} PRIVATE "-framework CoreFoundation") endif() add_test(NAME ${TARGET}-c COMMAND $ WORKING_DIRECTORY ../..) endfunction()