From 9aa9ff5171c63cb4c94b36d9a67c0040bee32d8e Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 21 Mar 2024 19:31:12 +0100 Subject: [PATCH] cargo: update to 1.77.0 --- srcpkgs/cargo/patches/downgrade-git2.patch | 38 +++++++++++----------- srcpkgs/cargo/template | 6 ++-- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch index c35a90d0ce555b..28b505cf78f606 100644 --- a/srcpkgs/cargo/patches/downgrade-git2.patch +++ b/srcpkgs/cargo/patches/downgrade-git2.patch @@ -1,15 +1,15 @@ diff --git a/Cargo.lock b/Cargo.lock -index 36cf880..72aca65 100644 +index d70a6b4..df78ed0 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -1025,11 +1025,11 @@ dependencies = [ +@@ -1037,11 +1037,11 @@ dependencies = [ [[package]] name = "git2" --version = "0.18.1" +-version = "0.18.2" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" +-checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd" +checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" dependencies = [ - "bitflags 2.4.1", @@ -17,7 +17,7 @@ index 36cf880..72aca65 100644 "libc", "libgit2-sys", "log", -@@ -1040,9 +1040,9 @@ dependencies = [ +@@ -1052,9 +1052,9 @@ dependencies = [ [[package]] name = "git2-curl" @@ -29,39 +29,39 @@ index 36cf880..72aca65 100644 dependencies = [ "curl", "git2", -@@ -2065,9 +2065,9 @@ checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +@@ -2066,9 +2066,9 @@ checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libgit2-sys" --version = "0.16.1+1.7.1" +-version = "0.16.2+1.7.2" +version = "0.15.2+1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" +-checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" +checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" dependencies = [ "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml -index c07b004..68c45a0 100644 +index 1d7cc85..a58c294 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -40,8 +40,8 @@ curl = "0.4.44" +@@ -44,8 +44,8 @@ curl = "0.4.44" curl-sys = "0.4.70" - filetime = "0.2.22" + filetime = "0.2.23" flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] } --git2 = "0.18.1" +-git2 = "0.18.2" -git2-curl = "0.19.0" +git2 = "0.17.2" +git2-curl = "0.18.0" - gix = { version = "0.56.0", 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" ] } + gix = { version = "0.57.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] } + gix-features-for-configuration-only = { version = "0.37.1", package = "gix-features", features = [ "parallel" ] } glob = "0.3.1" -@@ -58,7 +58,7 @@ itertools = "0.12.0" - jobserver = "0.1.27" +@@ -62,7 +62,7 @@ itertools = "0.12.0" + jobserver = "0.1.28" lazycell = "1.3.0" - libc = "0.2.150" --libgit2-sys = "0.16.1" + libc = "0.2.151" +-libgit2-sys = "0.16.2" +libgit2-sys = "0.15.2" libloading = "0.8.1" - memchr = "2.6.4" + memchr = "2.7.1" miow = "0.6.0" diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template index 4ca4a399560370..a6fb3fa68e75e3 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,8 +1,8 @@ # Template file for 'cargo' pkgname=cargo -version=1.76.0 +version=1.77.0 revision=1 -_cargo_revision=0.77.0 +_cargo_revision=0.78.0 build_helper=rust hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel" makedepends="rust libcurl-devel openssl-devel" @@ -12,7 +12,7 @@ maintainer="Enno Boland " license="MIT, Apache-2.0" homepage="https://crates.io/" distfiles="https://github.com/rust-lang/cargo/archive/refs/tags/${_cargo_revision}.tar.gz" -checksum=1c33e2feb197f848f082fdc074162328e231c2f68394e0e1d2dbbbf79c9fc3ec +checksum=9adbcd40704720174f529168cff26d3b6f74d85c152a6a0c32a16e774f7672b3 replaces="cargo-tree>=0" build_options="static bindist"