update to mosquitto-2.0.12

This commit is contained in:
sthen 2021-09-02 13:13:50 +00:00
parent 1f8dc567bf
commit d6b2588dca
6 changed files with 11 additions and 36 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.46 2021/06/10 08:38:48 sthen Exp $
# $OpenBSD: Makefile,v 1.47 2021/09/02 13:13:50 sthen Exp $
COMMENT = opensource MQTT broker
V = 2.0.11
V = 2.0.12
DISTNAME = mosquitto-$V
SHARED_LIBS += mosquitto 2.0 # 1.5

View File

@ -1,2 +1,2 @@
SHA256 (mosquitto-2.0.11.tar.gz) = ezanGYvOhc8xsTL1xu423PXa34b7doUB6x4RzpXU94o=
SIZE (mosquitto-2.0.11.tar.gz) = 760325
SHA256 (mosquitto-2.0.12.tar.gz) = Mc8AZctDHW9OV6X01WZj6DnJ0Xc2Lv+JWC18/eGRyTM=
SIZE (mosquitto-2.0.12.tar.gz) = 783859

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-lib_options_c,v 1.2 2021/06/10 08:38:48 sthen Exp $
https://github.com/eclipse/mosquitto/issues/2198
Index: lib/options.c
--- lib/options.c.orig
+++ lib/options.c
@@ -392,7 +392,7 @@ int mosquitto_opts_set(struct mosquitto *mosq, enum mo
#ifdef WITH_TLS
mosq->ssl_ctx = (SSL_CTX *)value;
if(mosq->ssl_ctx){
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
SSL_CTX_up_ref(mosq->ssl_ctx);
#else
CRYPTO_add(&(mosq->ssl_ctx)->references, 1, CRYPTO_LOCK_SSL_CTX);
@@ -500,7 +500,7 @@ int mosquitto_void_option(struct mosquitto *mosq, enum
#ifdef WITH_TLS
mosq->ssl_ctx = (SSL_CTX *)value;
if(mosq->ssl_ctx){
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
SSL_CTX_up_ref(mosq->ssl_ctx);
#else
CRYPTO_add(&(mosq->ssl_ctx)->references, 1, CRYPTO_LOCK_SSL_CTX);

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-mosquitto_conf,v 1.8 2021/03/08 15:35:57 sthen Exp $
$OpenBSD: patch-mosquitto_conf,v 1.9 2021/09/02 13:13:50 sthen Exp $
Index: mosquitto.conf
--- mosquitto.conf.orig
+++ mosquitto.conf
@@ -187,7 +187,7 @@
@@ -199,7 +199,7 @@
# If run as a non-root user, this setting has no effect.
# Note that on Windows this has no effect and so mosquitto should be started by
# the user you wish it to run as.
@ -12,7 +12,7 @@ Index: mosquitto.conf
# =================================================================
# Listeners
@@ -448,7 +448,7 @@
@@ -460,7 +460,7 @@
# Note that if the broker is running as a Windows service it will default to
# "log_dest none" and neither stdout nor stderr logging is available.
# Use "log_dest none" if you wish to disable logging.

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-test_broker_Makefile,v 1.6 2021/06/10 08:38:48 sthen Exp $
$OpenBSD: patch-test_broker_Makefile,v 1.7 2021/09/02 13:13:50 sthen Exp $
don't terminate make if these result in an error exit code
Index: test/broker/Makefile
--- test/broker/Makefile.orig
+++ test/broker/Makefile
@@ -156,8 +156,8 @@ test : test-compile 01 02 03 04 05 06 07 08 09 10 11 1
@@ -142,8 +142,8 @@ msg_sequence_test:
ifeq ($(WITH_TLS),yes)
./08-ssl-bridge.py
./08-ssl-connect-cert-auth-crl.py

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-test_broker_c_Makefile,v 1.7 2021/01/29 16:08:27 sthen Exp $
$OpenBSD: patch-test_broker_c_Makefile,v 1.8 2021/09/02 13:13:50 sthen Exp $
Index: test/broker/c/Makefile
--- test/broker/c/Makefile.orig
+++ test/broker/c/Makefile
@@ -34,7 +34,7 @@ ${PLUGINS} : %.so: %.c
@@ -35,7 +35,7 @@ ${PLUGINS} : %.so: %.c
${TESTS} : %.test: %.c