From f867336834832dad5ea23772760c6b1e405811a8 Mon Sep 17 00:00:00 2001 From: Wes Date: Mon, 16 Mar 2026 17:39:52 -0700 Subject: [PATCH 1/2] Vendor OpenSSL for Staged git2 --- Cargo.lock | 10 ++++++++++ apps/staged/src-tauri/Cargo.lock | 10 ++++++++++ crates/git-diff/Cargo.toml | 2 +- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 0b76c892..00add978 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1354,6 +1354,15 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" +[[package]] +name = "openssl-src" +version = "300.5.5+3.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f1787d533e03597a7934fd0a765f0d28e94ecc5fb7789f8053b1e699a56f709" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.111" @@ -1362,6 +1371,7 @@ checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] diff --git a/apps/staged/src-tauri/Cargo.lock b/apps/staged/src-tauri/Cargo.lock index d4a3c44a..4cde4b33 100644 --- a/apps/staged/src-tauri/Cargo.lock +++ b/apps/staged/src-tauri/Cargo.lock @@ -3101,6 +3101,15 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" +[[package]] +name = "openssl-src" +version = "300.5.5+3.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f1787d533e03597a7934fd0a765f0d28e94ecc5fb7789f8053b1e699a56f709" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.111" @@ -3109,6 +3118,7 @@ checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] diff --git a/crates/git-diff/Cargo.toml b/crates/git-diff/Cargo.toml index af1b7a63..bf744749 100644 --- a/crates/git-diff/Cargo.toml +++ b/crates/git-diff/Cargo.toml @@ -7,7 +7,7 @@ description = "Git diff computation: file listing, content diffing, and alignmen [dependencies] serde = { version = "1.0", features = ["derive"] } thiserror = "2.0" -git2 = "0.20" +git2 = { version = "0.20", features = ["vendored-openssl"] } [dev-dependencies] tempfile = "3.0" From 9da8a2a7a4fca56b54bfbd521b8821e76052af84 Mon Sep 17 00:00:00 2001 From: Wes Date: Mon, 16 Mar 2026 17:41:12 -0700 Subject: [PATCH 2/2] Update differ lockfile for vendored OpenSSL --- apps/differ/src-tauri/Cargo.lock | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/apps/differ/src-tauri/Cargo.lock b/apps/differ/src-tauri/Cargo.lock index 0840d66b..33efe954 100644 --- a/apps/differ/src-tauri/Cargo.lock +++ b/apps/differ/src-tauri/Cargo.lock @@ -2074,6 +2074,15 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" +[[package]] +name = "openssl-src" +version = "300.5.5+3.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f1787d533e03597a7934fd0a765f0d28e94ecc5fb7789f8053b1e699a56f709" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.111" @@ -2082,6 +2091,7 @@ checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ]