From 889b4d779c35e2cd60b8af3aa87ee88b9159b3e0 Mon Sep 17 00:00:00 2001
From: Magnus Edenhill <magnus@edenhill.se>
Date: Wed, 10 Mar 2021 08:35:59 +0100
Subject: [PATCH] Bump to OpenSSL 1.1.1j and use Alpine:3.12 image to make sure
 latest OpenSSL is used

---
 CHANGELOG.md                     | 5 +++++
 mklove/modules/configure.libssl  | 2 +-
 packaging/alpine/build-alpine.sh | 2 +-
 win32/install-openssl.ps1        | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8ea90df..de948f8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,11 @@
    function signature is considered a bug.
    This change only affects C++ OAuth developers.
 
+## Enhancements
+
+ * Bumped to OpenSSL 1.1.1j in binary librdkafka artifacts.
+ * The binary librdkafka artifacts for Alpine are now using Alpine 3.12 and
+   OpenSSL 1.1.1j.
 
 ## Fixes
 
diff --git a/mklove/modules/configure.libssl b/mklove/modules/configure.libssl
index f31ebb9d..a83a6361 100644
--- a/mklove/modules/configure.libssl
+++ b/mklove/modules/configure.libssl
@@ -82,7 +82,7 @@ if [[ $MKL_DISTRO != osx ]]; then
     function libcrypto_install_source {
         local name=$1
         local destdir=$2
-        local ver=1.1.1i
+        local ver=1.1.1j
         local url=https://www.openssl.org/source/openssl-${ver}.tar.gz
 
         local conf_args="--openssldir=/usr/lib/ssl no-shared no-zlib no-deprecated"
diff --git a/packaging/alpine/build-alpine.sh b/packaging/alpine/build-alpine.sh
index 727aa3aa..11d2cd26 100755
--- a/packaging/alpine/build-alpine.sh
+++ b/packaging/alpine/build-alpine.sh
@@ -34,5 +34,5 @@ else
 
     mkdir -p artifacts
 
-    exec docker run -v $PWD:/v alpine:3.8 /v/packaging/alpine/$(basename $0) --in-docker $*
+    exec docker run -v $PWD:/v alpine:3.12 /v/packaging/alpine/$(basename $0) --in-docker $*
 fi
diff --git a/win32/install-openssl.ps1 b/win32/install-openssl.ps1
index 2b88d875..f8adfc49 100644
--- a/win32/install-openssl.ps1
+++ b/win32/install-openssl.ps1
@@ -1,4 +1,4 @@
-$OpenSSLVersion = "1_1_1h"
+$OpenSSLVersion = "1_1_1j"
 $OpenSSLExe = "OpenSSL-$OpenSSLVersion.exe"
 
 if (!(Test-Path("C:\OpenSSL-Win32"))) {