From 3598c41f07947abca27be2ee95fc5cafd7abb895 Mon Sep 17 00:00:00 2001
From: Dorian Zedler <dorian@itsblue.de>
Date: Sun, 5 Feb 2023 12:44:39 +0100
Subject: [PATCH] Feat: use newer openssl libs

---
 Dockerfile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5a001b4..1be6fb7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ARG QT_VERSION="5.15.5"
 ARG ANDROID_PLATFORM_VERSION="android-29"
 ARG ANDROID_BUILDTOOLS_VERSION="29.0.2"
 ARG ANDROID_NDK_VERSION="21.3.6528147"
-ARG OPENSSL_VERSION="1.1.1l_1.0.2u"
+ARG OPENSSL_VERSION="aef7ae2"
 
 WORKDIR /workspace
 
@@ -27,14 +27,18 @@ RUN echo "**** setup environment ****" && \
     echo "**** download Qt and android-cli-tools ****" && \
     wget -O qt-everywhere.tar.xz ${QT_EVERYWHERE_URL} && \
     wget -O android-cli-tools.zip ${ANDROID_CLI_TOOLS_URL} && \
-    wget -O android_openssl.tar.gz ${ANDROID_OPENSSL_URL} && \
     \
     echo "**** extract Qt and android-cli-tools ****" && \
     mkdir qt-everywhere && \
     tar -xf qt-everywhere.tar.xz --strip-components=1 -C ./qt-everywhere && \
     unzip android-cli-tools.zip && \
-    mkdir -p /usr/lib/android-sdk/android_openssl && \
-    tar -xf android_openssl.tar.gz --strip-components=1 -C /usr/lib/android-sdk/android_openssl && \
+    mkdir -p /usr/lib/android-sdk && \
+    \
+    echo "**** download prebuilt openssl libs ****" && \
+    git clone https://github.com/KDAB/android_openssl.git /usr/lib/android-sdk/android_openssl && \
+    cd /usr/lib/android-sdk/android_openssl && \
+    git checkout "${OPENSSL_VERSION}" && \
+    git pull && \
     \
     echo "**** install android sdk ****" && \
     echo "y" | ./cmdline-tools/bin/sdkmanager --sdk_root=/usr/lib/android-sdk --install "platform-tools" "platforms;${ANDROID_PLATFORM_VERSION}" "build-tools;${ANDROID_BUILDTOOLS_VERSION}" "ndk;${ANDROID_NDK_VERSION}" && \