From 485424a6c3b94cb69c9fb05e277eaad28dbd9c55 Mon Sep 17 00:00:00 2001
From: adz <x12@adz.garden>
Date: Fri, 17 Nov 2023 12:06:26 +0100
Subject: [PATCH] Install openssl with vendored flag to fix parts of our
 cross-compilation pipeline

---
 .github/workflows/release.yml | 11 +++++++----
 Cargo.lock                    | 23 +++++++++++++++++------
 Cargo.toml                    |  7 +++++++
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4d82054..18dfbdb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,10 +32,13 @@ jobs:
             os: macos-latest
           - target: x86_64-apple-darwin # # 64-bit macOS (10.7+, Lion+)
             os: macos-latest
-          - target: x86_64-pc-windows-gnu # 64-bit MinGW (Windows 7+)
-            os: windows-latest
-          - target: x86_64-pc-windows-msvc # 64-bit MSVC (Windows 7+)
-            os: windows-latest
+          # Windows builds are currently not working because of openssl
+          # cross-compilation issues.
+          # See related issue: https://github.com/p2panda/fishy/issues/12
+          # - target: x86_64-pc-windows-gnu # 64-bit MinGW (Windows 7+)
+          #   os: windows-latest
+          # - target: x86_64-pc-windows-msvc # 64-bit MSVC (Windows 7+)
+          #   os: windows-latest
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
diff --git a/Cargo.lock b/Cargo.lock
index 79fde6d..ce744b9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -599,7 +599,7 @@ checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
 
 [[package]]
 name = "fishy"
-version = "0.1.0"
+version = "0.2.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -610,6 +610,7 @@ dependencies = [
  "gql_client",
  "hex",
  "indicatif",
+ "openssl",
  "p2panda-rs",
  "path-clean",
  "serde",
@@ -1174,11 +1175,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssl"
-version = "0.10.55"
+version = "0.10.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d"
+checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.3.3",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -1204,14 +1205,24 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
+[[package]]
+name = "openssl-src"
+version = "300.1.6+3.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439fac53e092cd7442a3660c85dde4643ab3b5bd39040912388dcdabf6b88085"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "openssl-sys"
-version = "0.9.90"
+version = "0.9.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6"
+checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9"
 dependencies = [
  "cc",
  "libc",
+ "openssl-src",
  "pkg-config",
  "vcpkg",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 92141e0..c8903e5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,3 +34,10 @@ serde = { version = "1.0.174", features = ["derive"] }
 tokio = { version = "1.29.1", features = ["macros", "rt"] }
 toml = "0.7.6"
 topological-sort = "0.2.2"
+
+# `openssl` is required with `vendored` feature, to support cross-compilation
+# (for example in our CI release pipeline)
+# See related issue: https://github.com/p2panda/fishy/issues/12
+[dependencies.openssl]
+version = "0.10.59"
+features = ["vendored"]