From 3ce49c689ba8bea101a2daff18fe3fe8ae1af16c Mon Sep 17 00:00:00 2001
From: skobkin <skobkin@proton.me>
Date: Sun, 8 Dec 2024 17:28:10 +0000
Subject: [PATCH 1/5] Release 1.5.735, Alpine 3.21

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

diff --git a/Dockerfile b/Dockerfile
index 0826833..8154407 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-FROM alpine:3.20 as builder
+FROM alpine:3.21 as builder
 
-ARG VERSION=1.5.634
+ARG VERSION=1.5.735
 
 LABEL \
     org.label-schema.vendor="Alexey Skobkin - skobkin@proton.me" \
-- 
2.43.5


From 7f5d83c0b3bc8a4697a10fef15de72e78c78b68e Mon Sep 17 00:00:00 2001
From: skobkin <skobkin@proton.me>
Date: Sun, 8 Dec 2024 17:32:58 +0000
Subject: [PATCH 2/5] Dropping patch since it's unnecessary now.

---
 patches/implicit_bool_cast.patch | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 patches/implicit_bool_cast.patch

diff --git a/patches/implicit_bool_cast.patch b/patches/implicit_bool_cast.patch
deleted file mode 100644
index ef20337..0000000
--- a/patches/implicit_bool_cast.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-CRYPTO_get_locking_callback is defined as null in openssl
-so this is always true, but it fails to compile on musl 1.2.3
-as casting from null to bool is invalid
---- a/src/SSL.cpp
-+++ b/src/SSL.cpp
-@@ -33,7 +33,7 @@
- 	// If we detect that no locking callback is configured, we
- 	// have to set it up ourselves to allow multi-threaded use
- 	// of OpenSSL.
--	if (!CRYPTO_get_locking_callback()) {
-+	if (true) {
- 		SSLLocks::initialize();
- 	}
- }
-- 
2.43.5


From cff0f30232b91f0dde6c2ab1ea458c3d0b176209 Mon Sep 17 00:00:00 2001
From: skobkin <skobkin@proton.me>
Date: Sun, 8 Dec 2024 17:35:29 +0000
Subject: [PATCH 3/5] Removing patch application in Dockerfile

---
 Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8154407..9fe09be 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,8 +37,6 @@ RUN \
     cd /tmp/murmur && \
     mkdir build && \
     cd build && \
-    # https://bugs.gentoo.org/863452 \
-    patch ../src/SSL.cpp < ../implicit_bool_cast.patch && \
     # static build is currently unavailable
     # see https://github.com/mumble-voip/mumble/issues/5693#issuecomment-1132069719
     # -Dstatic=ON
-- 
2.43.5


From 2627af36a790b844292c4c668d43d495db0bddaf Mon Sep 17 00:00:00 2001
From: skobkin <skobkin@proton.me>
Date: Sun, 8 Dec 2024 17:35:58 +0000
Subject: [PATCH 4/5] Upgrading second build stage to Alpine 3.21 too.

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 9fe09be..6e2a966 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,7 +43,7 @@ RUN \
     cmake -Dclient=OFF -Ddbus=OFF -Dice=OFF -Dzeroconf=OFF -Dlto=ON .. && \
     make -j $(nproc)
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 RUN \
     apk update -q --no-cache && \
-- 
2.43.5


From 47f2b9fabc18b7892fa75538f498f99a0fe3cbd5 Mon Sep 17 00:00:00 2001
From: skobkin <skobkin@proton.me>
Date: Sun, 8 Dec 2024 17:37:42 +0000
Subject: [PATCH 5/5] Removing patch copying from Dockerfile

---
 Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6e2a966..f468fe7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,8 +31,6 @@ RUN \
     protobuf-dev  \
     qt5-qtbase-dev
 
-COPY patches/implicit_bool_cast.patch /tmp/murmur/
-
 RUN \
     cd /tmp/murmur && \
     mkdir build && \
-- 
2.43.5