From 12b90715f920b5942e42c973d579b87a68a89b94 Mon Sep 17 00:00:00 2001
From: Stephan Dilly <dilly.stephan@gmail.com>
Date: Mon, 7 Jun 2021 14:58:49 +0200
Subject: [PATCH] fix openssl vendoring with new resolver (#775)

* run otool in ci
* pin openssl-sys with 'vendored' feature
---
 .github/workflows/cd.yml | 1 -
 .github/workflows/ci.yml | 5 +++++
 CHANGELOG.md             | 3 +++
 Cargo.lock               | 1 +
 Makefile                 | 1 +
 asyncgit/Cargo.toml      | 4 +++-
 6 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 58bdd2c1a9..7a0455d6ff 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -28,7 +28,6 @@ jobs:
         components: clippy
 
     - name: New Resolver
-      if: matrix.rust != '1.50'
       run: |
         cargo install cargo-modify --force
         cargo modify new-resolver
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1bedeb35d2..b4564f4dc0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -78,6 +78,11 @@ jobs:
       run: |
         ls -l ./target/release/gitui.exe
 
+    - name: Binary dependencies (mac)
+      if: matrix.os == 'macos-latest'
+      run: |
+        otool -L ./target/release/gitui
+
     - name: Build MSI (windows)
       if: matrix.os == 'windows-latest'
       run: |
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0e31e5015..02ad5dfb8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## Fixed
+- openssl vendoring broken on macos ([#772](https://github.com/extrawurst/gitui/issues/772))
+
 ## [0.16.1] - 2021-06-06
 
 ## Added
diff --git a/Cargo.lock b/Cargo.lock
index c95c821f92..a23fdc7af7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -68,6 +68,7 @@ dependencies = [
  "git2",
  "invalidstring",
  "log",
+ "openssl-sys",
  "pretty_assertions",
  "rayon-core",
  "scopetime",
diff --git a/Makefile b/Makefile
index 84b14b2154..5d8b9442bd 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ build-release:
 
 release-mac: build-release
 	strip target/release/gitui
+	otool -L target/release/gitui
 	mkdir -p release
 	tar -C ./target/release/ -czvf ./release/gitui-mac.tar.gz ./gitui
 	ls -lisah ./release/gitui-mac.tar.gz
diff --git a/asyncgit/Cargo.toml b/asyncgit/Cargo.toml
index 6f555dab85..0bb8bcc75f 100644
--- a/asyncgit/Cargo.toml
+++ b/asyncgit/Cargo.toml
@@ -13,7 +13,9 @@ keywords = ["git"]
 
 [dependencies]
 scopetime = { path = "../scopetime", version = "0.1" }
-git2 = { version = "0.13", features = ["vendored-openssl"] }
+git2 = "0.13"
+# pinning to vendored openssl, using the git2 feature this gets lost with new resolver
+openssl-sys = { version = '0.9', features= ["vendored"] }
 # git2 = { path = "../../github/git2-rs", features = ["vendored-openssl"]}
 # git2 = { git="https://github.com/extrawurst/git2-rs.git", rev="513a8c9", features = ["vendored-openssl"]}
 rayon-core = "1.9"