diff --git a/packer/Cargo.lock b/packer/Cargo.lock index f790aec70..2d8152a4c 100644 --- a/packer/Cargo.lock +++ b/packer/Cargo.lock @@ -69,37 +69,13 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.7.3" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "block-padding", - "byte-tools", - "byteorder", "generic-array", ] -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - -[[package]] -name = "byteorder" -version = "1.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" - [[package]] name = "cc" version = "1.0.52" @@ -162,6 +138,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +[[package]] +name = "cpuid-bool" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" + [[package]] name = "crossbeam-channel" version = "0.5.0" @@ -222,15 +204,15 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "993a608597367c6377b258c25d7120740f00ed23a2252b729b1932dd7866f908" +checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" [[package]] name = "digest" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ "generic-array", ] @@ -274,12 +256,6 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - [[package]] name = "filetime" version = "0.2.9" @@ -319,11 +295,12 @@ checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" [[package]] name = "generic-array" -version = "0.12.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" +checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" dependencies = [ "typenum", + "version_check", ] [[package]] @@ -420,9 +397,9 @@ checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" [[package]] name = "opaque-debug" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "pkg-config" @@ -577,18 +554,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.122" +version = "1.0.123" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "974ef1bd2ad8a507599b336595454081ff68a9599b4890af7643c0c0ed73a62c" +checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.122" +version = "1.0.123" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dee1f300f838c8ac340ecb0112b3ac472464fa67e87292bdb3dfc9c49128e17" +checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" dependencies = [ "proc-macro2", "quote", @@ -608,9 +585,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.8.15" +version = "0.8.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "971be8f6e4d4a47163b405a3df70d14359186f9ab0f3a3ec37df144ca1ce089f" +checksum = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23" dependencies = [ "dtoa", "linked-hash-map", @@ -620,13 +597,14 @@ dependencies = [ [[package]] name = "sha2" -version = "0.8.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" +checksum = "fa827a14b29ab7f44778d14a88d3cb76e949c45083f7dbfa507d0cb699dc12de" dependencies = [ "block-buffer", + "cfg-if 1.0.0", + "cpuid-bool", "digest", - "fake-simd", "opaque-debug", ] @@ -658,13 +636,12 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.30" +version = "0.4.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "489997b7557e9a43e192c527face4feacc78bfbe6eed67fd55c4c9e381cba290" +checksum = "0313546c01d59e29be4f09687bcb4fb6690cec931cc3607b6aec7a0e417f4cc6" dependencies = [ "filetime", "libc", - "redox_syscall", "xattr", ] @@ -730,6 +707,12 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" +[[package]] +name = "version_check" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" + [[package]] name = "wasi" version = "0.9.0+wasi-snapshot-preview1" diff --git a/packer/Cargo.toml b/packer/Cargo.toml index a80770500..ba038bd2f 100644 --- a/packer/Cargo.toml +++ b/packer/Cargo.toml @@ -12,14 +12,14 @@ edition = "2018" [dependencies] clap = "2.33.3" shellexpand = "2.1.0" -tar = "0.4.30" -serde = { version = "1.0.122", features = ["derive"] } -serde_yaml = "0.8.15" +tar = "0.4.32" +serde = { version = "1.0.123", features = ["derive"] } +serde_yaml = "0.8.16" anyhow = "1.0.38" -sha2 = "^0.8.1" -data-encoding = "2.3.1" +sha2 = "0.9.3" +data-encoding = "2.3.2" serde_json = "1.0.61" -rayon = "1.4.1" +rayon = "1.5.0" indicatif = "0.15.0" xz2 = "0.1.6" diff --git a/packer/src/main.rs b/packer/src/main.rs index cc0109c17..a051d08d8 100644 --- a/packer/src/main.rs +++ b/packer/src/main.rs @@ -105,7 +105,6 @@ fn pack_platform( ) -> Result<()> { let base_dir = match platform { Platform::Mac => path::Path::new(dist_dir).join("mac"), - // TODO: Verify this. Platform::Linux => path::Path::new(dist_dir).join("linux-unpacked"), Platform::Windows => path::Path::new(dist_dir).join("win-unpacked"), }; @@ -133,7 +132,7 @@ fn sha256_digest(mut reader: &mut R) -> Result { let mut sha256 = Sha256::new(); std::io::copy(&mut reader, &mut sha256)?; - let hash = sha256.result(); + let hash = sha256.finalize(); Ok(HashSum(data_encoding::HEXLOWER.encode(&hash))) } diff --git a/packer/src/tarsum.rs b/packer/src/tarsum.rs index b9852da7e..82145bf2e 100644 --- a/packer/src/tarsum.rs +++ b/packer/src/tarsum.rs @@ -30,9 +30,9 @@ pub fn tarsum(reader: R) -> Result { let mut digest = sha2::Sha256::new(); for (_, file_hash) in map { - digest.input(file_hash.0); + digest.update(file_hash.0); } - let hash = digest.result(); + let hash = digest.finalize(); Ok(types::HashSum(data_encoding::HEXLOWER.encode(&hash))) } @@ -40,7 +40,7 @@ fn digest_file(reader: &mut R) -> io::Result { use sha2::Digest; let mut digest = sha2::Sha256::new(); io::copy(reader, &mut digest)?; - let hash = digest.result(); + let hash = digest.finalize(); Ok(types::HashSum(data_encoding::HEXLOWER.encode(&hash))) }