From f78b25c02df2aa467682d1b595a18a2bc3309ce1 Mon Sep 17 00:00:00 2001
From: jdx <216188+jdx@users.noreply.github.com>
Date: Tue, 20 Aug 2024 11:59:29 -0500
Subject: [PATCH] fix: vendor git2 openssl (#2481)

I figure if we are already vending openssl we should do it here as well
---
 Cargo.toml                | 2 +-
 scripts/build-tarball.ps1 | 2 +-
 scripts/build-tarball.sh  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 0c67b08ad..5a9dabfbb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -128,7 +128,7 @@ zip = { version = "2", default-features = false, features = ["deflate"] }
 
 [target.'cfg(unix)'.dependencies]
 exec = "0.3"
-nix = {version="0.29", features=["signal", "user"]}
+nix = { version = "0.29", features = ["signal", "user"] }
 
 [build-dependencies]
 built = { version = "0.7", features = ["chrono", "git2"] }
diff --git a/scripts/build-tarball.ps1 b/scripts/build-tarball.ps1
index f5f2a493a..ea5c2747c 100755
--- a/scripts/build-tarball.ps1
+++ b/scripts/build-tarball.ps1
@@ -5,7 +5,7 @@ $Target = $args[0]
 $Version = ./scripts/get-version.ps1
 $BaseName = "mise-v$Version-$Env:OS-$Env:ARCH"
 
-cargo build --release --features openssl/vendored,git2/vendored-libgit2 --target "$Target"
+cargo build --release --features openssl/vendored,git2/vendored-libgit2,git2/vendored-openssl --target "$Target"
 mkdir -p dist/mise/bin
 cp "target/$Target/release/mise.exe" dist/mise/bin/mise.exe
 cp README.md dist/mise/README.md
diff --git a/scripts/build-tarball.sh b/scripts/build-tarball.sh
index b2a656d4b..e06922244 100755
--- a/scripts/build-tarball.sh
+++ b/scripts/build-tarball.sh
@@ -71,11 +71,11 @@ case "$os-$arch" in
 esac
 
 if command -v cross >/dev/null; then
-  cross build --profile=serious --target "$RUST_TRIPLE" --features openssl/vendored,git2/vendored-libgit2
+  cross build --profile=serious --target "$RUST_TRIPLE" --features openssl/vendored,git2/vendored-libgit2,git2/vendored-openssl
 elif command -v zig >/dev/null; then
-  cargo zigbuild --profile=serious --target "$RUST_TRIPLE" --features openssl/vendored,git2/vendored-libgit2
+  cargo zigbuild --profile=serious --target "$RUST_TRIPLE" --features openssl/vendored,git2/vendored-libgit2,git2/vendored-openssl
 else
-  cargo build --profile=serious --target "$RUST_TRIPLE" --features openssl/vendored,git2/vendored-libgit2
+  cargo build --profile=serious --target "$RUST_TRIPLE" --features openssl/vendored,git2/vendored-libgit2,git2/vendored-openssl
 fi
 mkdir -p dist/mise/bin
 mkdir -p dist/mise/man/man1