|
|
@ -1,17 +1,17 @@
|
|
|
|
From d62d7eeb071fc93a3238aa068e0220c85918f140 Mon Sep 17 00:00:00 2001
|
|
|
|
From b2a2a074e167993e5ece5219db410be24eea5cef Mon Sep 17 00:00:00 2001
|
|
|
|
From: Fabio Valentini <decathorpe@gmail.com>
|
|
|
|
From: Fabio Valentini <decathorpe@gmail.com>
|
|
|
|
Date: Sat, 21 Jan 2023 20:46:45 +0100
|
|
|
|
Date: Mon, 29 May 2023 22:43:19 +0200
|
|
|
|
Subject: [PATCH] build with vendored libgit2 unconditionally
|
|
|
|
Subject: [PATCH] build with vendored libgit2 unconditionally
|
|
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
---
|
|
|
|
build.rs | 16 ----------------
|
|
|
|
build.rs | 18 ------------------
|
|
|
|
1 file changed, 16 deletions(-)
|
|
|
|
1 file changed, 18 deletions(-)
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/build.rs b/build.rs
|
|
|
|
diff --git a/build.rs b/build.rs
|
|
|
|
index acb5aa4..526aedd 100644
|
|
|
|
index e888b94..a3ea132 100644
|
|
|
|
--- a/build.rs
|
|
|
|
--- a/build.rs
|
|
|
|
+++ b/build.rs
|
|
|
|
+++ b/build.rs
|
|
|
|
@@ -10,22 +10,6 @@ fn main() {
|
|
|
|
@@ -10,24 +10,6 @@ fn main() {
|
|
|
|
let vendored = env::var("CARGO_FEATURE_VENDORED").is_ok();
|
|
|
|
let vendored = env::var("CARGO_FEATURE_VENDORED").is_ok();
|
|
|
|
let zlib_ng_compat = env::var("CARGO_FEATURE_ZLIB_NG_COMPAT").is_ok();
|
|
|
|
let zlib_ng_compat = env::var("CARGO_FEATURE_ZLIB_NG_COMPAT").is_ok();
|
|
|
|
|
|
|
|
|
|
|
@ -19,10 +19,12 @@ index acb5aa4..526aedd 100644
|
|
|
|
- let try_to_use_system_libgit2 = !vendored && !zlib_ng_compat;
|
|
|
|
- let try_to_use_system_libgit2 = !vendored && !zlib_ng_compat;
|
|
|
|
- if try_to_use_system_libgit2 {
|
|
|
|
- if try_to_use_system_libgit2 {
|
|
|
|
- let mut cfg = pkg_config::Config::new();
|
|
|
|
- let mut cfg = pkg_config::Config::new();
|
|
|
|
|
|
|
|
- // These version ranges specifically request a version that includes
|
|
|
|
|
|
|
|
- // the SSH fixes for CVE-2023-22742 (1.5.1+ or 1.4.5+).
|
|
|
|
- if let Ok(lib) = cfg
|
|
|
|
- if let Ok(lib) = cfg
|
|
|
|
- .range_version("1.4.5".."1.5.0")
|
|
|
|
- .range_version("1.5.1".."1.6.0")
|
|
|
|
- .print_system_libs(false)
|
|
|
|
|
|
|
|
- .probe("libgit2")
|
|
|
|
- .probe("libgit2")
|
|
|
|
|
|
|
|
- .or_else(|_| cfg.range_version("1.4.5".."1.5.0").probe("libgit2"))
|
|
|
|
- {
|
|
|
|
- {
|
|
|
|
- for include in &lib.include_paths {
|
|
|
|
- for include in &lib.include_paths {
|
|
|
|
- println!("cargo:root={}", include.display());
|
|
|
|
- println!("cargo:root={}", include.display());
|
|
|
@ -35,5 +37,5 @@ index acb5aa4..526aedd 100644
|
|
|
|
|
|
|
|
|
|
|
|
if !Path::new("libgit2/src").exists() {
|
|
|
|
if !Path::new("libgit2/src").exists() {
|
|
|
|
--
|
|
|
|
--
|
|
|
|
2.39.1
|
|
|
|
2.40.1
|
|
|
|
|
|
|
|
|
|
|
|