diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch new file mode 100644 index 00000000000..ace10e77029 --- /dev/null +++ b/srcpkgs/cargo/patches/downgrade-git2.patch @@ -0,0 +1,67 @@ +diff --git a/Cargo.lock b/Cargo.lock +index cc0cb9a..f6de424 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1006,11 +1006,11 @@ dependencies = [ + + [[package]] + name = "git2" +-version = "0.18.0" ++version = "0.17.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "12ef350ba88a33b4d524b1d1c79096c9ade5ef8c59395df0e60d1e1889414c0e" ++checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" + dependencies = [ +- "bitflags 2.3.3", ++ "bitflags 1.3.2", + "libc", + "libgit2-sys", + "log", +@@ -1021,9 +1021,9 @@ dependencies = [ + + [[package]] + name = "git2-curl" +-version = "0.19.0" ++version = "0.18.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3" ++checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c" + dependencies = [ + "curl", + "git2", +@@ -2003,9 +2003,9 @@ checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" + + [[package]] + name = "libgit2-sys" +-version = "0.16.1+1.7.1" ++version = "0.15.2+1.6.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" ++checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" + dependencies = [ + "cc", + "libc", +diff --git a/Cargo.toml b/Cargo.toml +index 4403044..1d50590 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -40,8 +40,8 @@ curl = "0.4.44" + 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" ++git2 = "0.17.2" ++git2-curl = "0.18.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" +@@ -58,7 +58,7 @@ itertools = "0.10.0" + jobserver = "0.1.26" + lazycell = "1.3.0" + libc = "0.2.148" +-libgit2-sys = "0.16.1" ++libgit2-sys = "0.15.2" + libloading = "0.8.0" + memchr = "2.6.2" + miow = "0.6.0" diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template index 315a204429f..208c18818d5 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,8 +1,8 @@ # Template file for 'cargo' pkgname=cargo -version=1.73.0 +version=1.74.0 revision=1 -_cargo_revision=0.74.0 +_cargo_revision=0.75.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=a7ed5ec806f2b334f194380584e17538cc173ef18ec3fba4d7967dc5c1bd7565 +checksum=d6b9512bca4b4d692a242188bfe83e1b696c44903007b7b48a56b287d01c063b replaces="cargo-tree>=0" build_options="static bindist"