diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5551c304..a4eb81bfd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -153,7 +153,7 @@ jobs: target: - aarch64-linux-android - aarch64-unknown-linux-gnu - #- aarch64-unknown-linux-musl + - aarch64-unknown-linux-musl steps: - name: Install Rust uses: actions-rs/toolchain@v1 diff --git a/Cargo.lock b/Cargo.lock index b352e6df0..097c1a53f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,19 +28,19 @@ dependencies = [ [[package]] name = "android-logd-logger" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e4060d910a7ba63769526d9d263b0264e8be2f268f9ab1bc03d021c34cfb50" +checksum = "1505b39397466d64fcdceaf87c7c6719cd7c0e81f7026c3765170618c0bebbe6" dependencies = [ "bytes", - "env_logger 0.9.3", + "env_logger", "lazy_static", "libc", "log", "parking_lot", - "redox_syscall", + "redox_syscall 0.3.5", "thiserror", - "time 0.2.27", + "time", "winapi", ] @@ -64,9 +64,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" dependencies = [ "backtrace", ] @@ -90,18 +90,18 @@ checksum = "e4655ae1a7b0cdf149156f780c5bf3f1352bc53cbd9e0a361a7ef7b22947e965" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] name = "async-trait" -version = "0.1.64" +version = "0.1.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" +checksum = "86ea188f25f0255d8f92797797c97ebf5631fa88178beb1a46fdf5622c9a00e4" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.3", ] [[package]] @@ -145,12 +145,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base-x" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" - [[package]] name = "base64" version = "0.13.1" @@ -193,9 +187,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.63.0" +version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" +checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" dependencies = [ "bitflags 1.3.2", "cexpr", @@ -208,7 +202,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn", + "syn 1.0.107", ] [[package]] @@ -288,9 +282,9 @@ checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "bytesize" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c58ec36aac5066d5ca17df51b3e70279f5670a72102f5752cb7e7c856adfc70" +checksum = "38fcc2979eff34a4b84e1cf9a1e3da42a7d44b3b690a40cdcb23e3d556cfb2e5" [[package]] name = "camino" @@ -319,14 +313,14 @@ dependencies = [ "atty", "cargo-subcommand", "cargo_metadata", - "clap 4.1.4", + "clap 4.1.11", "human_bytes", "humantime", "northstar-runtime", "serde", "tempfile", "termcolor", - "toml", + "toml 0.7.3", ] [[package]] @@ -340,16 +334,16 @@ dependencies = [ [[package]] name = "cargo-subcommand" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c21a74582435d41c48615c1ca63606d311113f0450d3ff7a2b147e6b9f3b97" +checksum = "1898fe3af1534e8c90d4695c1f39d2d01e21fa4268cc941d769ae895bf8cdac6" dependencies = [ - "clap 4.1.4", + "clap 4.1.11", "current_platform", "dunce", "glob", "serde", - "toml", + "toml 0.5.11", ] [[package]] @@ -360,7 +354,7 @@ checksum = "08a1ec454bc3eead8719cb56e15dbbfecdbc14e4b3a3ae4936cc6e31f5fc0d07" dependencies = [ "camino", "cargo-platform", - "semver 1.0.16", + "semver", "serde", "serde_json", "thiserror", @@ -389,9 +383,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cgroups-rs" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d5761f3a351b92e0e02a31ca418190bb323edb0d4fce0109b6dba673dc3fdc1" +checksum = "5b098e7c3a70d03c288fa0a96ccf13e770eb3d78c4cc0e1549b3c13215d5f965" dependencies = [ "libc", "log", @@ -442,11 +436,11 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.4" +version = "4.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" +checksum = "42dfd32784433290c51d92c438bb72ea5063797fc3cc9a21a8c4346bebbb2098" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.0.2", "clap_derive", "clap_lex", "is-terminal", @@ -457,24 +451,24 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.1.1" +version = "4.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6540eedc41f8a5a76cf3d8d458057dcdf817be4158a55b5f861f7a5483de75" +checksum = "37686beaba5ac9f3ab01ee3172f792fc6ffdd685bfb9e63cfef02c0571a4e8e1" dependencies = [ - "clap 4.1.4", + "clap 4.1.11", ] [[package]] name = "clap_derive" -version = "4.1.0" +version = "4.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" +checksum = "fddf67631444a3a3e3e5ac51c36a5e01335302de677bd78759eaa90ab1f46644" dependencies = [ "heck 0.4.1", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -516,12 +510,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "const_fn" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" - [[package]] name = "core-foundation-sys" version = "0.8.3" @@ -638,7 +626,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn", + "syn 1.0.107", ] [[package]] @@ -655,7 +643,7 @@ checksum = "ebf883b7aacd7b2aeb2a7b338648ee19f57c140d4ee8e52c68979c6b2f7f2263" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -679,7 +667,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn", + "syn 1.0.107", ] [[package]] @@ -690,7 +678,7 @@ checksum = "b36230598a2d5de7ec1c6f51f72d8a99a9208daff41de2084d06e3fd3ea56685" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -734,12 +722,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - [[package]] name = "dunce" version = "1.0.3" @@ -781,16 +763,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "log", - "regex", -] - [[package]] name = "env_logger" version = "0.10.0" @@ -855,9 +827,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84" +checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549" dependencies = [ "futures-channel", "futures-core", @@ -870,9 +842,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" +checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" dependencies = [ "futures-core", "futures-sink", @@ -880,15 +852,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" +checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" [[package]] name = "futures-executor" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e" +checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" dependencies = [ "futures-core", "futures-task", @@ -897,9 +869,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" +checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" [[package]] name = "futures-lite" @@ -918,32 +890,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" +checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] name = "futures-sink" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" +checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" [[package]] name = "futures-task" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" +checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" [[package]] name = "futures-util" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" +checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" dependencies = [ "futures-channel", "futures-core", @@ -1482,13 +1454,13 @@ version = "0.7.1-pre" dependencies = [ "android-logd-logger", "anyhow", - "clap 4.1.4", - "env_logger 0.10.0", + "clap 4.1.11", + "env_logger", "log", "nix 0.26.2", "northstar-runtime", "tokio", - "toml", + "toml 0.7.3", ] [[package]] @@ -1508,7 +1480,7 @@ version = "0.7.1-pre" dependencies = [ "anyhow", "base64 0.21.0", - "clap 4.1.4", + "clap 4.1.11", "clap_complete", "futures", "humantime", @@ -1535,7 +1507,7 @@ dependencies = [ "async-trait", "base64 0.21.0", "bincode", - "bindgen 0.63.0", + "bindgen 0.64.0", "bitflags 2.0.2", "byteorder", "bytes", @@ -1564,7 +1536,7 @@ dependencies = [ "proptest", "rand_core 0.6.4", "rlimit", - "semver 1.0.16", + "semver", "serde", "serde_json", "serde_plain", @@ -1579,7 +1551,7 @@ dependencies = [ "tokio-eventfd", "tokio-test", "tokio-util", - "toml", + "toml 0.7.3", "url", "uuid", "validator", @@ -1593,10 +1565,10 @@ version = "0.7.1-pre" dependencies = [ "anyhow", "base64 0.21.0", - "clap 4.1.4", + "clap 4.1.11", "colored", "ed25519-dalek", - "env_logger 0.10.0", + "env_logger", "log", "northstar-runtime", "tempfile", @@ -1608,8 +1580,8 @@ name = "northstar-stress" version = "0.7.1-pre" dependencies = [ "anyhow", - "clap 4.1.4", - "env_logger 0.10.0", + "clap 4.1.11", + "env_logger", "futures", "humantime", "itertools", @@ -1627,7 +1599,7 @@ name = "northstar-tests" version = "0.7.1-pre" dependencies = [ "anyhow", - "env_logger 0.10.0", + "env_logger", "futures", "lazy_static", "log", @@ -1649,7 +1621,7 @@ version = "0.7.1-pre" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.3", ] [[package]] @@ -1733,7 +1705,7 @@ checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", "windows-sys 0.45.0", ] @@ -1771,7 +1743,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1834,7 +1806,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.107", "version_check", ] @@ -1857,9 +1829,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.51" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" dependencies = [ "unicode-ident", ] @@ -1899,9 +1871,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quote" -version = "1.0.23" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] @@ -2012,6 +1984,15 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "redox_users" version = "0.4.3" @@ -2019,7 +2000,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom 0.2.8", - "redox_syscall", + "redox_syscall 0.2.16", "thiserror", ] @@ -2049,15 +2030,6 @@ version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - [[package]] name = "rlimit" version = "0.9.1" @@ -2079,15 +2051,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - [[package]] name = "rustix" version = "0.36.8" @@ -2144,53 +2107,38 @@ version = "0.0.1" [[package]] name = "semver" -version = "0.9.0" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" dependencies = [ "serde", ] -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - [[package]] name = "serde" -version = "1.0.152" +version = "1.0.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.3", ] [[package]] name = "serde_json" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" +checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" dependencies = [ "itoa 1.0.5", "ryu", @@ -2206,11 +2154,20 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +dependencies = [ + "serde", +] + [[package]] name = "serde_with" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d904179146de381af4c93d3af6ca4984b3152db687dacb9c3c35e86f39809c" +checksum = "85456ffac572dc8826334164f2fb6fb40a7c766aebe195a2a21ee69ee2885ecf" dependencies = [ "base64 0.13.1", "chrono", @@ -2219,26 +2176,26 @@ dependencies = [ "serde", "serde_json", "serde_with_macros", - "time 0.3.17", + "time", ] [[package]] name = "serde_with_macros" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1966009f3c05f095697c537312f5415d1e3ed31ce0a56942bac4c771c5c335e" +checksum = "7cbcd6104f8a4ab6af7f6be2a0da6be86b9de3c401f6e86bb856ab2af739232f" dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] name = "serde_yaml" -version = "0.9.17" +version = "0.9.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb06d4b6cdaef0e0c51fa881acb721bed3c924cfaa71d9c94a3b771dfdf6567" +checksum = "f82e6c8c047aa50a7328632d067bcae6ef38772a79e28daf32f735e0e4f3dd10" dependencies = [ "indexmap", "itoa 1.0.5", @@ -2247,21 +2204,6 @@ dependencies = [ "unsafe-libyaml", ] -[[package]] -name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - [[package]] name = "sha2" version = "0.9.9" @@ -2341,70 +2283,12 @@ dependencies = [ "winapi", ] -[[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check", -] - [[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_derive", - "syn", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "serde_json", - "sha1", - "syn", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - [[package]] name = "strsim" version = "0.8.0" @@ -2438,7 +2322,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -2457,7 +2341,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn", + "syn 1.0.107", ] [[package]] @@ -2477,6 +2361,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8234ae35e70582bfa0f1fedffa6daa248e41dd045310b19800c4a36382c8f60" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "synstructure" version = "0.12.6" @@ -2485,22 +2380,21 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", "unicode-xid", ] [[package]] name = "tempfile" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" dependencies = [ "cfg-if", "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", + "redox_syscall 0.2.16", + "rustix", + "windows-sys 0.42.0", ] [[package]] @@ -2529,7 +2423,7 @@ version = "0.0.1" dependencies = [ "anyhow", "caps", - "clap 4.1.4", + "clap 4.1.11", "nix 0.26.2", "thiserror", ] @@ -2545,22 +2439,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.3", ] [[package]] @@ -2573,21 +2467,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "time" -version = "0.2.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" -dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb", - "time-macros 0.1.1", - "version_check", - "winapi", -] - [[package]] name = "time" version = "0.3.17" @@ -2597,7 +2476,7 @@ dependencies = [ "itoa 1.0.5", "serde", "time-core", - "time-macros 0.2.6", + "time-macros", ] [[package]] @@ -2606,16 +2485,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" -[[package]] -name = "time-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - [[package]] name = "time-macros" version = "0.2.6" @@ -2625,19 +2494,6 @@ dependencies = [ "time-core", ] -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "standback", - "syn", -] - [[package]] name = "tinyvec" version = "1.6.0" @@ -2714,14 +2570,14 @@ checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] name = "tokio-stream" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" dependencies = [ "futures-core", "pin-project-lite", @@ -2764,6 +2620,40 @@ dependencies = [ "serde", ] +[[package]] +name = "toml" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc18466501acd8ac6a3f615dd29a3438f8ca6bb3b19537138b3106e575621274" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "tracing" version = "0.1.37" @@ -2784,7 +2674,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -2903,9 +2793,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "unsafe-libyaml" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc7ed8ba44ca06be78ea1ad2c3682a43349126c8818054231ee6f4748012aed2" +checksum = "ad2024452afd3874bf539695e04af6732ba06517424dbf958fdb16a01f3bef6c" [[package]] name = "url" @@ -2956,7 +2846,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn", + "syn 1.0.107", "validator_types", ] @@ -2967,7 +2857,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3" dependencies = [ "proc-macro2", - "syn", + "syn 1.0.107", ] [[package]] @@ -3036,7 +2926,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.107", "wasm-bindgen-shared", ] @@ -3058,7 +2948,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3181,6 +3071,15 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +[[package]] +name = "winnow" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d020b441f92996c80d94ae9166e8501e59c7bb56121189dc9eab3bd8216966" +dependencies = [ + "memchr", +] + [[package]] name = "zeroize" version = "1.5.7" @@ -3198,7 +3097,7 @@ checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", "synstructure", ] diff --git a/cargo-npk/Cargo.toml b/cargo-npk/Cargo.toml index 3b2ed2897..accb35a58 100644 --- a/cargo-npk/Cargo.toml +++ b/cargo-npk/Cargo.toml @@ -5,15 +5,15 @@ edition = "2021" license = "Apache-2.0" [dependencies] -anyhow = "1.0.66" +anyhow = "1.0.70" atty = "0.2.14" -cargo-subcommand = { version = "0.9.0", features = ["clap"] } -cargo_metadata = "0.15.1" -clap = { version = "4.0.25", features = ["derive"] } +cargo-subcommand = { version = "0.11.0", features = ["clap"] } +cargo_metadata = "0.15.3" +clap = { version = "4.1.11", features = ["derive"] } human_bytes = "0.4.1" humantime = "2.1.0" northstar-runtime = { version = "^0.7.1-pre", path = "../northstar-runtime", features = ["npk"] } -serde = { version = "1.0.147", features = ["derive"] } -tempfile = "3.3.0" -termcolor = "1.1.3" -toml = "0.5.9" +serde = { version = "1.0.158", features = ["derive"] } +tempfile = "3.4.0" +termcolor = "1.2.0" +toml = "0.7.3" diff --git a/deny.toml b/deny.toml index 361aad20a..24a53c602 100644 --- a/deny.toml +++ b/deny.toml @@ -33,9 +33,7 @@ yanked = "warn" notice = "warn" # A list of advisory IDs to ignore. Note that ignored advisories will still # output a note when they are encountered. -ignore = [ - "RUSTSEC-2023-0018" -] +ignore = [] # Threshold for security vulnerabilities, any vulnerability with a CVSS score # lower than the range specified will be ignored. Note that ignored advisories # will still output a note when they are encountered. diff --git a/examples/console/Cargo.toml b/examples/console/Cargo.toml index 9d81596b2..28b7449e3 100644 --- a/examples/console/Cargo.toml +++ b/examples/console/Cargo.toml @@ -6,8 +6,8 @@ edition = "2021" license = "Apache-2.0" [dependencies] -anyhow = { version = "1.0.66", features = ["backtrace"] } -tokio = { version = "1.25.0", features = ["macros", "rt", "net"] } +anyhow = { version = "1.0.70", features = ["backtrace"] } +tokio = { version = "1.26.0", features = ["macros", "rt", "net"] } northstar-client = { path = "../../northstar-client" } [package.metadata.npk] @@ -20,4 +20,4 @@ use_cross = true use_cross = true [package.metadata.npk.target.'aarch64-linux-android'] -use_cross = true \ No newline at end of file +use_cross = true diff --git a/examples/cpueater/Cargo.toml b/examples/cpueater/Cargo.toml index 390952d57..f44f209e0 100644 --- a/examples/cpueater/Cargo.toml +++ b/examples/cpueater/Cargo.toml @@ -15,4 +15,4 @@ use_cross = true use_cross = true [package.metadata.npk.target.'aarch64-linux-android'] -use_cross = true \ No newline at end of file +use_cross = true diff --git a/examples/crashing/Cargo.toml b/examples/crashing/Cargo.toml index ca25e102d..7ca51df6f 100644 --- a/examples/crashing/Cargo.toml +++ b/examples/crashing/Cargo.toml @@ -15,4 +15,4 @@ use_cross = true use_cross = true [package.metadata.npk.target.'aarch64-linux-android'] -use_cross = true \ No newline at end of file +use_cross = true diff --git a/examples/hello-resource/Cargo.toml b/examples/hello-resource/Cargo.toml index db2f81533..c332d598e 100644 --- a/examples/hello-resource/Cargo.toml +++ b/examples/hello-resource/Cargo.toml @@ -15,4 +15,4 @@ use_cross = true use_cross = true [package.metadata.npk.target.'aarch64-linux-android'] -use_cross = true \ No newline at end of file +use_cross = true diff --git a/examples/memeater/Cargo.toml b/examples/memeater/Cargo.toml index 0dfb19649..262692575 100644 --- a/examples/memeater/Cargo.toml +++ b/examples/memeater/Cargo.toml @@ -15,4 +15,4 @@ use_cross = true use_cross = true [package.metadata.npk.target.'aarch64-linux-android'] -use_cross = true \ No newline at end of file +use_cross = true diff --git a/examples/persistence/Cargo.toml b/examples/persistence/Cargo.toml index 06823490c..7c0aa16be 100644 --- a/examples/persistence/Cargo.toml +++ b/examples/persistence/Cargo.toml @@ -15,4 +15,4 @@ use_cross = true use_cross = true [package.metadata.npk.target.'aarch64-linux-android'] -use_cross = true \ No newline at end of file +use_cross = true diff --git a/examples/redis-client/Cargo.toml b/examples/redis-client/Cargo.toml index 36cd3ef92..76f2cdbd9 100644 --- a/examples/redis-client/Cargo.toml +++ b/examples/redis-client/Cargo.toml @@ -6,9 +6,9 @@ edition = "2021" license = "Apache-2.0" [dependencies] -bytes = "1.2.1" +bytes = "1.4.0" mini-redis = "0.4.1" -tokio = { version = "1.23.0", features = ["macros", "rt", "net"] } +tokio = { version = "1.26.0", features = ["macros", "rt", "net"] } [package.metadata.npk] manifest = "manifest.yaml" diff --git a/examples/redis-server/Cargo.toml b/examples/redis-server/Cargo.toml index 7007911fb..8736868fb 100644 --- a/examples/redis-server/Cargo.toml +++ b/examples/redis-server/Cargo.toml @@ -7,7 +7,7 @@ license = "Apache-2.0" [dependencies] mini-redis = "0.4.1" -tokio = { version = "1.23.0", features = ["macros", "rt", "net", "signal"] } +tokio = { version = "1.26.0", features = ["macros", "rt", "net", "signal"] } [package.metadata.npk] manifest = "manifest.yaml" diff --git a/examples/seccomp/Cargo.toml b/examples/seccomp/Cargo.toml index 223733ef0..f0a81c82a 100644 --- a/examples/seccomp/Cargo.toml +++ b/examples/seccomp/Cargo.toml @@ -15,4 +15,4 @@ use_cross = true use_cross = true [package.metadata.npk.target.'aarch64-linux-android'] -use_cross = true \ No newline at end of file +use_cross = true diff --git a/examples/test-container/Cargo.toml b/examples/test-container/Cargo.toml index 295fc18fc..f6f52f40c 100644 --- a/examples/test-container/Cargo.toml +++ b/examples/test-container/Cargo.toml @@ -6,11 +6,11 @@ edition = "2021" license = "Apache-2.0" [dependencies] -anyhow = { version = "1.0.66", features = ["backtrace"] } -caps = "0.5.4" -clap = { version = "4.0.18", features = ["derive"] } +anyhow = { version = "1.0.70", features = ["backtrace"] } +caps = "0.5.5" +clap = { version = "4.1.11", features = ["derive"] } nix = { version = "0.26.2", default-features = false, features = ["process", "user"] } -thiserror = "1.0.37" +thiserror = "1.0.40" [package.metadata.npk] manifest = "manifest.yaml" @@ -22,4 +22,4 @@ use_cross = true use_cross = true [package.metadata.npk.target.'aarch64-linux-android'] -use_cross = true \ No newline at end of file +use_cross = true diff --git a/examples/token-client/Cargo.toml b/examples/token-client/Cargo.toml index 3c40b4ad0..c225e24e5 100644 --- a/examples/token-client/Cargo.toml +++ b/examples/token-client/Cargo.toml @@ -6,12 +6,12 @@ edition = "2021" license = "Apache-2.0" [dependencies] -anyhow = { version = "1.0.66", features = ["backtrace"] } +anyhow = { version = "1.0.70", features = ["backtrace"] } base64 = "0.21.0" -futures = { version = "0.3.24", default-features = false } +futures = { version = "0.3.27", default-features = false } northstar-client= { path = "../../northstar-client" } -tokio = { version = "1.25.2", features = ["macros", "rt", "net"] } -tokio-util = { version = "0.7.4", features = ["codec"] } +tokio = { version = "1.26.0", features = ["macros", "rt", "net"] } +tokio-util = { version = "0.7.7", features = ["codec"] } [package.metadata.npk] manifest = "manifest.yaml" @@ -23,4 +23,4 @@ use_cross = true use_cross = true [package.metadata.npk.target.'aarch64-linux-android'] -use_cross = true \ No newline at end of file +use_cross = true diff --git a/examples/token-server/Cargo.toml b/examples/token-server/Cargo.toml index e29a87364..62ab07067 100644 --- a/examples/token-server/Cargo.toml +++ b/examples/token-server/Cargo.toml @@ -6,10 +6,10 @@ edition = "2021" license = "Apache-2.0" [dependencies] -anyhow = { version = "1.0.66", features = ["backtrace"] } +anyhow = { version = "1.0.70", features = ["backtrace"] } base64 = "0.21.0" northstar-client = { path = "../../northstar-client" } -tokio = { version = "1.22.0", features = ["macros", "rt", "net"] } +tokio = { version = "1.26.0", features = ["macros", "rt", "net"] } [package.metadata.npk] manifest = "manifest.yaml" diff --git a/northstar-client/Cargo.toml b/northstar-client/Cargo.toml index 3ef1bf31d..4cd243910 100644 --- a/northstar-client/Cargo.toml +++ b/northstar-client/Cargo.toml @@ -9,9 +9,9 @@ readme = "../README.md" repository = "https://github.com/esrlabs/northstar" [dependencies] -anyhow = { version = "1.0.66", features = ["backtrace"] } -futures = "0.3.24" +anyhow = { version = "1.0.70", features = ["backtrace"] } +futures = "0.3.27" northstar-runtime = { version = "^0.7.1-pre", path = "../northstar-runtime", features = ["api"] } -thiserror = "1.0.37" -tokio = "1.25.0" +thiserror = "1.0.40" +tokio = "1.26.0" diff --git a/northstar-nstar/Cargo.toml b/northstar-nstar/Cargo.toml index e41ba63e8..93c887cd4 100644 --- a/northstar-nstar/Cargo.toml +++ b/northstar-nstar/Cargo.toml @@ -9,11 +9,11 @@ readme = "../README.md" repository = "https://github.com/esrlabs/northstar" [dependencies] -anyhow = { version = "1.0.66", features = ["backtrace"] } +anyhow = { version = "1.0.70", features = ["backtrace"] } base64 = "0.21.0" -clap = { version = "4.0.18", features = ["derive"] } -clap_complete = "4.0.3" -futures = { version = "0.3.24", default-features = false } +clap = { version = "4.1.11", features = ["derive"] } +clap_complete = "4.1.5" +futures = { version = "0.3.27", default-features = false } humantime = "2.1.0" itertools = "0.10.5" northstar-client = { version = "^0.7.1-pre", path = "../northstar-client" } @@ -21,9 +21,9 @@ northstar-runtime = { version = "^0.7.1-pre", path = "../northstar-runtime", fea pin-project-lite = "0.2.9" prettytable-rs = "0.10.0" regex = "1.7.1" -serde = "1.0.148" -serde_json = "1.0.87" -serde_yaml = "0.9.17" -tokio = { version = "1.25.0", features = ["fs", "io-std", "io-util", "macros", "net", "rt", "time"] } -tokio-util = "0.7.4" +serde = "1.0.158" +serde_json = "1.0.94" +serde_yaml = "0.9.19" +tokio = { version = "1.26.0", features = ["fs", "io-std", "io-util", "macros", "net", "rt", "time"] } +tokio-util = "0.7.7" url = "2.3.1" diff --git a/northstar-runtime/Cargo.toml b/northstar-runtime/Cargo.toml index 8a890abe3..15f808f4a 100644 --- a/northstar-runtime/Cargo.toml +++ b/northstar-runtime/Cargo.toml @@ -11,19 +11,19 @@ repository = "https://github.com/esrlabs/northstar" rust-version = "1.63.0" [dependencies] -anyhow = { version = "1.0.66", features = ["backtrace"] } +anyhow = { version = "1.0.70", features = ["backtrace"] } async-stream = { version = "0.3.4", optional = true } -async-trait = { version = "0.1.58", optional = true } +async-trait = { version = "0.1.67", optional = true } base64 = { version = "0.21.0", optional = true } bincode = { version = "1.3.3", optional = true } bitflags = "2.0.2" byteorder = { version = "1.4.3", optional = true } -bytes = { version = "1.2.1", optional = true } -bytesize = { version = "1.1.0", optional = true } +bytes = { version = "1.4.0", optional = true } +bytesize = { version = "1.2.0", optional = true } caps = { version = "0.5.5", optional = true } -cgroups-rs = { version = "0.3.0", features = ["serde"], optional = true } +cgroups-rs = { version = "0.3.2", features = ["serde"], optional = true } ed25519-dalek = { version = "1.0.1", optional = true } -futures = { version = "0.3.24", default-features = true, optional = true } +futures = { version = "0.3.27", default-features = true, optional = true } hex = { version = "0.4.3", optional = true } hmac = { version = "0.12.1", features = ["reset"], optional = true } humanize-rs = { version = "0.1.5", optional = true } @@ -36,28 +36,28 @@ libc = { version = "0.2.140", optional = true } log = { version = "0.4.17", features = [ "serde", "max_level_trace", "release_max_level_debug"] } loopdev = { version = "0.4.0", optional = true } memchr = "2.5.0" -memfd = { version = "0.6.1", optional = true } +memfd = { version = "0.6.2", optional = true } memoffset = { version = "0.8.0", optional = true } nanoid = { version = "0.4.0", optional = true } nix = { version = "0.26.2", default-features = false, features = ["fs", "sched", "ioctl", "mount", "term", "uio", "socket", "net", "signal", "user"], optional = true } pkg-version = { version = "1.0.0", optional = true } rand_core = { version = "0.6.4", features = ["getrandom"], optional = true } -rlimit = { version = "0.9.0", optional = true } -semver = { version = "1.0.14", features = ["serde"] } -serde = { version = "1.0.148", features = ["derive", "rc"] } -serde_json = { version = "1.0.87", optional = true } +rlimit = { version = "0.9.1", optional = true } +semver = { version = "1.0.17", features = ["serde"] } +serde = { version = "1.0.158", features = ["derive", "rc"] } +serde_json = { version = "1.0.94", optional = true } serde_plain = { version = "1.0.1", optional = true } -serde_with = { version = "2.2.0", optional = true } -serde_yaml = { version = "0.9.17", optional = true } +serde_with = { version = "2.3.1", optional = true } +serde_yaml = { version = "0.9.19", optional = true } sha2 = { version = "0.10.6", optional = true } strum = { version = "0.24.1", optional = true } strum_macros = { version = "0.24.3", optional = true } -tempfile = { version = "3.3.0", optional = true } -thiserror = "1.0.37" -tokio = { version = "1.25.0", features = ["fs", "io-std", "io-util", "macros", "process", "rt-multi-thread", "sync", "time", "net"], optional = true } +tempfile = { version = "3.4.0", optional = true } +thiserror = "1.0.40" +tokio = { version = "1.26.0", features = ["fs", "io-std", "io-util", "macros", "process", "rt-multi-thread", "sync", "time", "net"], optional = true } tokio-eventfd = { version = "0.2.0", optional = true } -tokio-util = { version = "0.7.4", features = ["codec", "io"], optional = true } -toml = { version = "0.5.9", optional = true } +tokio-util = { version = "0.7.7", features = ["codec", "io"], optional = true } +toml = { version = "0.7.3", optional = true } url = { version = "2.3.1", features = ["serde"], optional = true } uuid = { version = "1.3.0", features = ["v4"], optional = true } validator = { version = "0.16.0", features = ["derive"], optional = true } @@ -72,17 +72,17 @@ runtime = ["api", "async-stream", "async-trait", "bincode", "bytesize", "caps", seccomp = ["bindgen", "caps", "lazy_static", "memoffset", "nix", "npk"] [dev-dependencies] -anyhow = { version = "1.0.66", features = ["backtrace"] } -memfd = "0.6.1" -proptest = "1.0.0" -serde_json = "1.0.87" -tokio = { version = "1.25.0", features = ["test-util"] } +anyhow = { version = "1.0.70", features = ["backtrace"] } +memfd = "0.6.2" +proptest = "1.1.0" +serde_json = "1.0.94" +tokio = { version = "1.26.0", features = ["test-util"] } tokio-test = "0.4.2" -toml = "0.5.9" +toml = "0.7.3" [build-dependencies] -anyhow = { version = "1.0.66", features = ["backtrace"] } -bindgen = { version = "0.63.0", default-features = false, features = ["runtime"], optional = true } +anyhow = { version = "1.0.70", features = ["backtrace"] } +bindgen = { version = "0.64.0", default-features = false, features = ["runtime"], optional = true } [package.metadata.docs.rs] features = ["api", "npk", "runtime", "seccomp"] diff --git a/northstar-runtime/src/npk/manifest/mod.rs b/northstar-runtime/src/npk/manifest/mod.rs index 195d432e3..5e3c8d48a 100644 --- a/northstar-runtime/src/npk/manifest/mod.rs +++ b/northstar-runtime/src/npk/manifest/mod.rs @@ -142,19 +142,24 @@ impl Manifest { /// Read a manifest from `reader`. pub fn from_reader(mut reader: R) -> Result { - let mut buf = Vec::new(); - reader.read_to_end(&mut buf).map_err(Error::Io)?; - Manifest::from_slice(&buf) + let mut buf = String::new(); + reader + .read_to_string(&mut buf) + .map_err(Error::Io) + .and_then(|_| Manifest::from_str(&buf)) } +} + +impl FromStr for Manifest { + type Err = Error; - /// Read a manifest from `slice`. - pub fn from_slice(s: &[u8]) -> Result { - let manifest: Manifest = if let Ok(manifest) = serde_yaml::from_slice(s) { + fn from_str(s: &str) -> Result { + let manifest: Manifest = if let Ok(manifest) = serde_yaml::from_str(s) { manifest - } else if let Ok(manifest) = serde_json::from_slice(s) { + } else if let Ok(manifest) = serde_json::from_str(s) { manifest } else { - toml::from_slice(s)? + toml::de::from_str(s).map_err(Error::TomlDe)? }; manifest.validate().map_err(Error::Validation)?; @@ -162,14 +167,6 @@ impl Manifest { } } -impl FromStr for Manifest { - type Err = Error; - - fn from_str(s: &str) -> Result { - Manifest::from_slice(s.as_bytes()) - } -} - impl ToString for Manifest { #[allow(clippy::unwrap_used)] fn to_string(&self) -> String { diff --git a/northstar-sextant/Cargo.toml b/northstar-sextant/Cargo.toml index d6685992d..51f3f15b8 100644 --- a/northstar-sextant/Cargo.toml +++ b/northstar-sextant/Cargo.toml @@ -9,13 +9,13 @@ readme = "README.md" repository = "https://github.com/esrlabs/northstar" [dependencies] -anyhow = { version = "1.0.66", features = ["backtrace"] } +anyhow = { version = "1.0.70", features = ["backtrace"] } base64 = "0.21.0" -clap = { version = "4.0.18", features = ["derive"] } +clap = { version = "4.1.11", features = ["derive"] } colored = "2.0.0" ed25519-dalek = "1.0.1" env_logger = "0.10.0" log = "0.4.17" northstar-runtime = { version = "^0.7.1-pre", path = "../northstar-runtime", features = ["npk"] } -tempfile = "3.3.0" +tempfile = "3.4.0" zip = { version = "0.6.4", default-features = false } diff --git a/northstar-stress/Cargo.toml b/northstar-stress/Cargo.toml index 470a3cf2d..9fb302e98 100644 --- a/northstar-stress/Cargo.toml +++ b/northstar-stress/Cargo.toml @@ -8,16 +8,16 @@ readme = "README.md" repository = "https://github.com/esrlabs/northstar" [dependencies] -anyhow = { version = "1.0.66", features = ["backtrace"] } -clap = { version = "4.0.18", features = ["derive"] } +anyhow = { version = "1.0.70", features = ["backtrace"] } +clap = { version = "4.1.11", features = ["derive"] } env_logger = "0.10.0" -futures = { version = "0.3.24", default-features = false } +futures = { version = "0.3.27", default-features = false } humantime = "2.1.0" itertools = "0.10.5" log = "0.4.17" northstar-client = { path = "../northstar-client" } rand = "0.8.5" -tokio = { version = "1.25.0", features = ["rt-multi-thread", "macros", "net", "time", "signal"] } -tokio-stream = { version = "0.1.11", features = ["time"] } -tokio-util = "0.7.4" +tokio = { version = "1.26.0", features = ["rt-multi-thread", "macros", "net", "time", "signal"] } +tokio-stream = { version = "0.1.12", features = ["time"] } +tokio-util = "0.7.7" url = { version = "2.3.1", features = ["serde"] } diff --git a/northstar-tests/Cargo.toml b/northstar-tests/Cargo.toml index 6c85e006e..767fd3b68 100644 --- a/northstar-tests/Cargo.toml +++ b/northstar-tests/Cargo.toml @@ -6,18 +6,18 @@ edition = "2021" license = "Apache-2.0" [dependencies] -anyhow = { version = "1.0.66", features = ["backtrace"] } +anyhow = { version = "1.0.70", features = ["backtrace"] } env_logger = "0.10.0" -futures = { version = "0.3.24", default-features = false } +futures = { version = "0.3.27", default-features = false } lazy_static = "1.4.0" log = "0.4.17" -memfd = "0.6.1" +memfd = "0.6.2" nanoid = "0.4.0" nix = { version = "0.26.2", default-features = false } northstar-client = { path = "../northstar-client" } northstar-runtime = { path = "../northstar-runtime", features = ["api", "runtime"] } northstar-tests-derive = { path = "northstar-tests-derive" } regex = "1.7.1" -tempfile = "3.3.0" -tokio = { version = "1.25.0", features = ["fs", "time"] } +tempfile = "3.4.0" +tokio = { version = "1.26.0", features = ["fs", "time"] } url = "2.3.1" diff --git a/northstar-tests/northstar-tests-derive/Cargo.toml b/northstar-tests/northstar-tests-derive/Cargo.toml index 32b88b852..f6205f1a8 100644 --- a/northstar-tests/northstar-tests-derive/Cargo.toml +++ b/northstar-tests/northstar-tests-derive/Cargo.toml @@ -8,6 +8,6 @@ license = "Apache-2.0" proc-macro = true [dependencies] -proc-macro2 = "1.0.51" -quote = "1.0.21" -syn = { version = "1.0.107", features = ["full"] } +proc-macro2 = "1.0.52" +quote = "1.0.26" +syn = { version = "2.0.3", features = ["full"] } diff --git a/northstar/Cargo.toml b/northstar/Cargo.toml index 645e0af43..fe1db7e40 100644 --- a/northstar/Cargo.toml +++ b/northstar/Cargo.toml @@ -10,16 +10,16 @@ repository = "https://github.com/esrlabs/northstar" default-run = "northstar" [dependencies] -anyhow = { version = "1.0.66", features = ["backtrace"] } -clap = { version = "4.0.18", features = ["derive"] } +anyhow = { version = "1.0.70", features = ["backtrace"] } +clap = { version = "4.1.11", features = ["derive"] } log = "0.4.17" nix = { version = "0.26.2", default-features = false, features = ["sched", "mount"] } northstar-runtime = { version = "^0.7.1-pre", path = "../northstar-runtime", features = ["runtime", "rexec"] } -tokio = { version = "1.25.0", features = ["rt-multi-thread", "macros", "signal"] } -toml = "0.5.9" +tokio = { version = "1.26.0", features = ["rt-multi-thread", "macros", "signal"] } +toml = "0.7.3" [target.'cfg(not(target_os = "android"))'.dependencies] env_logger = "0.10.0" [target.'cfg(target_os = "android")'.dependencies] -android-logd-logger = "0.3.2" +android-logd-logger = "0.3.3"