diff --git a/Dockerfile b/Dockerfile index 0826833..f468fe7 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" \ @@ -31,21 +31,17 @@ RUN \ protobuf-dev \ qt5-qtbase-dev -COPY patches/implicit_bool_cast.patch /tmp/murmur/ - 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 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 && \ 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(); - } - }