Merging upstream version 1.74.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 37 insertions, 37 deletions

diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml
index 0e189a6d4..440304416 100644
--- a/src/tools/cargo/Cargo.toml
+++ b/src/tools/cargo/Cargo.toml
@@ -11,15 +11,18 @@ exclude = [
 ]
 
 [workspace.package]
+rust-version = "1.72.0"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 
 [workspace.dependencies]
-anyhow = "1.0.72"
-base64 = "0.21.2"
-bytesize = "1.2"
+anstream = "0.6.3"
+anstyle = "1.0.4"
+anyhow = "1.0.75"
+base64 = "0.21.3"
+bytesize = "1.3"
 cargo = { path = "" }
-cargo-credential = { version = "0.3.0", path = "credential/cargo-credential" }
+cargo-credential = { version = "0.4.0", path = "credential/cargo-credential" }
 cargo-credential-libsecret = { version = "0.3.1", path = "credential/cargo-credential-libsecret" }
 cargo-credential-wincred = { version = "0.3.0", path = "credential/cargo-credential-wincred" }
 cargo-credential-macos-keychain = { version = "0.3.0", path = "credential/cargo-credential-macos-keychain" }
@@ -27,20 +30,20 @@ cargo-platform = { path = "crates/cargo-platform", version = "0.1.4" }
 cargo-test-macro = { path = "crates/cargo-test-macro" }
 cargo-test-support = { path = "crates/cargo-test-support" }
 cargo-util = { version = "0.2.6", path = "crates/cargo-util" }
-cargo_metadata = "0.14.0"
-clap = "4.3.19"
+cargo_metadata = "0.17.0"
+clap = "4.4.6"
+color-print = "0.3.4"
 core-foundation = { version = "0.9.3", features = ["mac_os_10_7_support"] }
-crates-io = { version = "0.38.0", path = "crates/crates-io" }
+crates-io = { version = "0.39.0", path = "crates/crates-io" }
 criterion = { version = "0.5.1", features = ["html_reports"] }
 curl = "0.4.44"
-curl-sys = "0.4.65"
-filetime = "0.2.21"
-flate2 = { version = "1.0.26", default-features = false, features = ["zlib"] }
-fwdansi = "1.1.0"
-git2 = "0.17.2"
-git2-curl = "0.18.0"
-gix = { version = "0.45.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] }
-gix-features-for-configuration-only = { version = "0.30.0", package = "gix-features", features = [ "parallel" ] }
+curl-sys = "0.4.68"
+filetime = "0.2.22"
+flate2 = { version = "1.0.27", default-features = false, features = ["zlib"] }
+git2 = "0.18.0"
+git2-curl = "0.19.0"
+gix = { version = "0.54.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
+gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
 glob = "0.3.1"
 handlebars = { version = "3.5.5", features = ["dir_source"] }
 hex = "0.4.3"
@@ -53,15 +56,14 @@ im-rc = "15.1.0"
 indexmap = "2"
 itertools = "0.10.0"
 jobserver = "0.1.26"
-lazy_static = "1.4.0"
 lazycell = "1.3.0"
-libc = "0.2.147"
-libgit2-sys = "0.15.2"
+libc = "0.2.148"
+libgit2-sys = "0.16.1"
 libloading = "0.8.0"
-memchr = "2.5.0"
+memchr = "2.6.2"
 miow = "0.6.0"
 opener = "0.6.1"
-openssl ="0.10.55"
+openssl ="0.10.57"
 os_info = "3.7.0"
 pasetors = { version = "0.6.7", features = ["v3", "paserk", "std", "serde"] }
 pathdiff = "0.2"
@@ -75,36 +77,35 @@ rustfix = "0.6.1"
 same-file = "1.0.6"
 security-framework = "2.9.2"
 semver = { version = "1.0.18", features = ["serde"] }
-serde = "1.0.171"
+serde = "1.0.188"
+serde-untagged = "0.1.1"
 serde-value = "0.7.0"
 serde_ignored = "0.1.9"
-serde_json = "1.0.104"
+serde_json = "1.0.105"
 sha1 = "0.10.5"
 sha2 = "0.10.7"
 shell-escape = "0.1.5"
-snapbox = { version = "0.4.11", features = ["diff", "path"] }
-strip-ansi-escapes = "0.1.1"
-syn = { version = "2.0.28", features = ["extra-traits", "full"] }
-tar = { version = "0.4.39", default-features = false }
-tempfile = "3.7.0"
-termcolor = "1.2.0"
-thiserror = "1.0.44"
+snapbox = { version = "0.4.13", features = ["diff", "path"] }
+syn = { version = "2.0.29", features = ["extra-traits", "full"] }
+tar = { version = "0.4.40", default-features = false }
+tempfile = "3.8.0"
+thiserror = "1.0.47"
 time = { version = "0.3", features = ["parsing", "formatting", "serde"] }
 toml = "0.7.6"
 toml_edit = "0.19.14"
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
-unicase = "2.6.0"
+unicase = "2.7.0"
 unicode-width = "0.1.10"
 unicode-xid = "0.2.4"
-url = "2.4.0"
+url = "2.4.1"
 varisat = "0.2.2"
 walkdir = "2.3.3"
 windows-sys = "0.48"
 
 [package]
 name = "cargo"
-version = "0.74.0"
+version = "0.75.0"
 edition.workspace = true
 license.workspace = true
 homepage = "https://crates.io"
@@ -119,6 +120,8 @@ name = "cargo"
 path = "src/cargo/lib.rs"
 
 [dependencies]
+anstream.workspace = true
+anstyle.workspace = true
 anyhow.workspace = true
 base64.workspace = true
 bytesize.workspace = true
@@ -128,6 +131,7 @@ cargo-credential-libsecret.workspace = true
 cargo-credential-macos-keychain.workspace = true
 cargo-credential-wincred.workspace = true
 cargo-util.workspace = true
+color-print.workspace = true
 clap = { workspace = true, features = ["wrap_help"] }
 crates-io.workspace = true
 curl = { workspace = true, features = ["http2"] }
@@ -162,16 +166,15 @@ rand.workspace = true
 rustfix.workspace = true
 semver.workspace = true
 serde = { workspace = true, features = ["derive"] }
+serde-untagged.workspace = true
 serde-value.workspace = true
 serde_ignored.workspace = true
 serde_json = { workspace = true, features = ["raw_value"] }
 sha1.workspace = true
 shell-escape.workspace = true
-strip-ansi-escapes.workspace = true
 syn.workspace = true
 tar.workspace = true
 tempfile.workspace = true
-termcolor.workspace = true
 time.workspace = true
 toml.workspace = true
 toml_edit.workspace = true
@@ -186,9 +189,6 @@ walkdir.workspace = true
 [target.'cfg(not(windows))'.dependencies]
 openssl = { workspace = true, optional = true }
 
-[target.'cfg(windows)'.dependencies]
-fwdansi.workspace = true
-
 [target.'cfg(windows)'.dependencies.windows-sys]
 workspace = true
 features = [