From 7c8ae120456c633dcfcc94b3501b76d0c48c7569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20W=C3=B3jcik?= <maciej@defguard.net>
Date: Mon, 9 Feb 2026 13:21:59 +0100
Subject: [PATCH 1/3] add missing openssl dependency to cross setup

---
 Cross.toml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cross.toml b/Cross.toml
index 6484d442..15f97d8c 100644
--- a/Cross.toml
+++ b/Cross.toml
@@ -1,23 +1,23 @@
 [target.x86_64-unknown-linux-gnu]
-pre-build = ["apt-get update && apt-get install --assume-yes unzip ",
+pre-build = ["apt-get update && apt-get install --assume-yes unzip libssl-dev:$CROSS_DEB_ARCH",
 "PB_REL='https://github.com/protocolbuffers/protobuf/releases'",
 "PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip",
 "unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr"]
 
 [target.armv7-unknown-linux-gnueabihf]
-pre-build = ["apt-get update && apt-get install --assume-yes unzip ",
+pre-build = ["apt-get update && apt-get install --assume-yes unzip libssl-dev:$CROSS_DEB_ARCH",
 "PB_REL='https://github.com/protocolbuffers/protobuf/releases'",
 "PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip",
 "unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr"]
 
 [target.aarch64-unknown-linux-gnu]
-pre-build = ["apt-get update && apt-get install --assume-yes unzip ",
+pre-build = ["apt-get update && apt-get install --assume-yes unzip libssl-dev libssl-dev:$CROSS_DEB_ARCH",
 "PB_REL='https://github.com/protocolbuffers/protobuf/releases'",
 "PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip",
 "unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr"]
 
 [target.x86_64-unknown-freebsd]
-pre-build = ["apt-get update && apt-get install --assume-yes unzip ",
+pre-build = ["apt-get update && apt-get install --assume-yes unzip libssl-dev",
 "PB_REL='https://github.com/protocolbuffers/protobuf/releases'",
 "PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip",
 "unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr"]

From 45fb5c1bc3246951deb1af68f9bdbc8d20bc0fe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20W=C3=B3jcik?= <maciej@defguard.net>
Date: Mon, 9 Feb 2026 13:22:36 +0100
Subject: [PATCH 2/3] pin toolchain

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ba7c3186..3c25e4ea 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -96,7 +96,7 @@ jobs:
       - name: Install Rust stable
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.89.0 # "stable" causes rust-lld: error on aarch64-linux
           target: ${{ matrix.target }}
           override: true
 

From dc6eeb1d9ab111e66c759fc014620948c989650a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20W=C3=B3jcik?= <maciej@defguard.net>
Date: Mon, 9 Feb 2026 13:52:46 +0100
Subject: [PATCH 3/3] try again

---
 Cross.toml | 43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/Cross.toml b/Cross.toml
index 15f97d8c..ce22ddb6 100644
--- a/Cross.toml
+++ b/Cross.toml
@@ -1,23 +1,34 @@
 [target.x86_64-unknown-linux-gnu]
-pre-build = ["apt-get update && apt-get install --assume-yes unzip libssl-dev:$CROSS_DEB_ARCH",
-"PB_REL='https://github.com/protocolbuffers/protobuf/releases'",
-"PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip",
-"unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr"]
+pre-build = [
+  "dpkg --add-architecture $CROSS_DEB_ARCH",
+  "apt-get update && apt-get install --assume-yes unzip libssl-dev:$CROSS_DEB_ARCH",
+  "PB_REL='https://github.com/protocolbuffers/protobuf/releases'",
+  "PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip",
+  "unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr"
+]
 
 [target.armv7-unknown-linux-gnueabihf]
-pre-build = ["apt-get update && apt-get install --assume-yes unzip libssl-dev:$CROSS_DEB_ARCH",
-"PB_REL='https://github.com/protocolbuffers/protobuf/releases'",
-"PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip",
-"unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr"]
+pre-build = [
+  "dpkg --add-architecture $CROSS_DEB_ARCH",
+  "apt-get update && apt-get install --assume-yes unzip libssl-dev:$CROSS_DEB_ARCH",
+  "PB_REL='https://github.com/protocolbuffers/protobuf/releases'",
+  "PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip",
+  "unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr"
+]
 
 [target.aarch64-unknown-linux-gnu]
-pre-build = ["apt-get update && apt-get install --assume-yes unzip libssl-dev libssl-dev:$CROSS_DEB_ARCH",
-"PB_REL='https://github.com/protocolbuffers/protobuf/releases'",
-"PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip",
-"unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr"]
+pre-build = [
+  "dpkg --add-architecture $CROSS_DEB_ARCH",
+  "apt-get update && apt-get install --assume-yes unzip libssl-dev libssl-dev:$CROSS_DEB_ARCH",
+  "PB_REL='https://github.com/protocolbuffers/protobuf/releases'",
+  "PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip",
+  "unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr"
+]
 
 [target.x86_64-unknown-freebsd]
-pre-build = ["apt-get update && apt-get install --assume-yes unzip libssl-dev",
-"PB_REL='https://github.com/protocolbuffers/protobuf/releases'",
-"PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip",
-"unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr"]
+pre-build = [
+  "apt-get update && apt-get install --assume-yes unzip libssl-dev",
+  "PB_REL='https://github.com/protocolbuffers/protobuf/releases'",
+  "PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip",
+  "unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr"
+]