From 37fbd915e31d0ad5e869eac3920874355fd3cd8c Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Wed, 16 Oct 2024 20:28:05 +0100 Subject: [PATCH 1/2] Bump docker version --- docker/2.0-openssl/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/2.0-openssl/Dockerfile b/docker/2.0-openssl/Dockerfile index 18a2a353f..47b1cf63a 100644 --- a/docker/2.0-openssl/Dockerfile +++ b/docker/2.0-openssl/Dockerfile @@ -3,8 +3,8 @@ FROM alpine:3.20 LABEL maintainer="Roger Light " \ description="Eclipse Mosquitto MQTT Broker" -ENV VERSION=2.0.19 \ - DOWNLOAD_SHA256=33af3637f119a61c509c01d2f8f6cc3d8be76f49e850132f2860af142abf82a9 \ +ENV VERSION=2.0.20 \ + DOWNLOAD_SHA256=ebd07d89d2a446a7f74100ad51272e4a8bf300b61634a7812e19f068f2759de8 \ GPG_KEYS=A0D6EEA1DCAE49A635A3B2F0779B22DFB3E717B7 \ LWS_VERSION=4.2.1 \ LWS_SHA256=842da21f73ccba2be59e680de10a8cce7928313048750eb6ad73b6fa50763c51 From d24d8348879055a70460aa072b0e7e65e5702fc9 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 31 Oct 2024 23:10:01 +0000 Subject: [PATCH 2/2] Fix the libdir location in the pkgconf files In some distributions libraries are installed into lib64 rather than lib for 64 bit architectures so use the cmake variable like we already do for the prefix to ensure that's correct for all distributions. Signed-off-by: Peter Robinson --- libmosquitto.pc.in | 2 +- libmosquittopp.pc.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libmosquitto.pc.in b/libmosquitto.pc.in index 101a125f4..2d8c1a83a 100644 --- a/libmosquitto.pc.in +++ b/libmosquitto.pc.in @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} includedir=${prefix}/include -libdir=${exec_prefix}/lib +libdir=@CMAKE_INSTALL_LIBDIR@ Name: mosquitto Description: mosquitto MQTT library (C bindings) diff --git a/libmosquittopp.pc.in b/libmosquittopp.pc.in index 6070f44f5..ae93e88df 100644 --- a/libmosquittopp.pc.in +++ b/libmosquittopp.pc.in @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} includedir=${prefix}/include -libdir=${exec_prefix}/lib +libdir=@CMAKE_INSTALL_LIBDIR@ Name: mosquittopp Description: mosquitto MQTT library (C++ bindings)