Merge branch 'upgrade_1.5.613' into 'master'

v1.5.613

See merge request skobkin/docker-murmur!3

.gitlab-ci.yml

@@ -11,9 +11,9 @@ variables:
 
 build:
   # https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.14.0#faccessat2
-  image: docker:20.10.12
+  image: docker:23.0.2
   services:
-    - docker:20.10.12-dind
+    - docker:23.0.2-dind
   stage: build
   script:
     - docker build -t $BUILT_IMAGE_TAG --no-cache .
@@ -23,9 +23,9 @@ build:
       - images.tar
 
 push-gitlab-registry:
-  image: docker:20.10.12
+  image: docker:23.0.2
   services:
-    - docker:20.10.12-dind
+    - docker:23.0.2-dind
   stage: push
   only:
     - tags
@@ -38,9 +38,9 @@ push-gitlab-registry:
     - docker push $IMAGE_TAG:$CI_COMMIT_TAG
 
 push-docker-hub-registry:
-  image: docker:20.10.12
+  image: docker:23.0.2
   services:
-    - docker:20.10.12-dind
+    - docker:23.0.2-dind
   stage: push
   only:
     - tags

Dockerfile

@@ -1,6 +1,6 @@
-FROM alpine:3 as builder
+FROM alpine:3.18 as builder
 
-ARG VERSION=1.4.230
+ARG VERSION=1.5.613
 
 LABEL \
     org.label-schema.vendor="Alexey Skobkin - skobkin-ru@ya.ru" \
@@ -23,18 +23,29 @@ RUN \
     tar -zxf /tmp/mumble.tar.gz --strip-components=1 -C /tmp/murmur
 
 RUN \
-    apk add -q --no-cache --no-progress boost-dev build-base cmake libcap-dev protobuf-dev qt5-qtbase-dev
+    apk add -q --no-cache --no-progress \
+    boost-dev  \
+    build-base  \
+    cmake  \
+    libcap-dev  \
+    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 .. && \
+    cmake -Dclient=OFF -Ddbus=OFF -Dice=OFF -Dzeroconf=OFF -Dlto=ON .. && \
     make -j $(nproc)
 
-FROM alpine:3
+FROM alpine:3.18
 
 RUN \
     apk update -q --no-cache && \

patches/implicit_bool_cast.patch

@@ -0,0 +1,14 @@
+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();
+ 	}
+ }