CVS commit: pkgsrc/net/mosquitto

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Fri Dec 31 09:57:36 UTC 2021

Modified Files:
        pkgsrc/net/mosquitto: Makefile distinfo
        pkgsrc/net/mosquitto/patches: patch-lib_net__mosq.c
            patch-mosquitto.conf patch-src_CMakeLists.txt

Log Message:
mosquitto: Update to 2.0.14

pkgsrc changes:
---------------
  * Update patches to remove offsets.

upstream changes:
-----------------
2.0.14 - 2021-11-17
===================

Broker:
- Fix bridge not respecting receive-maximum when reconnecting with MQTT v5.

Client library:
- Fix mosquitto_topic_matches_sub2() not using the length parameters.
  Closes #2364.
- Fix incorrect subscribe_callback in mosquittopp.h. Closes #2367.

2.0.13 - 2021-10-27
===================

Broker:
- Fix `max_keepalive` option not being able to be set to 0.
- Fix LWT messages not being delivered if `per_listener_settings` was set to
  true. Closes #2314.
- Various fixes around inflight quota management. Closes #2306.
- Fix problem parsing config files with Windows line endings. Closes #2297.
- Don't send retained messages when a shared subscription is made.
- Fix log being truncated in Windows.
- Fix client id not showing in log on failed connections, where possible.
- Fix broker sending duplicate CONNACK on failed MQTT v5 reauthentication.
  Closes #2339.
- Fix mosquitto_plugin.h not including mosquitto_broker.h. Closes #2350.

Client library:
- Initialise sockpairR/W to invalid in `mosquitto_reinitialise()` to avoid
  closing invalid sockets in `mosquitto_destroy()` on error. Closes #2326.

Clients:
- Fix date format in mosquitto_sub output. Closes #2353.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/net/mosquitto/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/mosquitto/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/mosquitto/patches/patch-lib_net__mosq.c
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/mosquitto/patches/patch-mosquitto.conf
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/mosquitto/Makefile
diff -u pkgsrc/net/mosquitto/Makefile:1.26 pkgsrc/net/mosquitto/Makefile:1.27
--- pkgsrc/net/mosquitto/Makefile:1.26  Thu Sep  2 13:53:44 2021
+++ pkgsrc/net/mosquitto/Makefile       Fri Dec 31 09:57:35 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2021/09/02 13:53:44 gdt Exp $
+# $NetBSD: Makefile,v 1.27 2021/12/31 09:57:35 triaxx Exp $
 
-DISTNAME=      mosquitto-2.0.12
+DISTNAME=      mosquitto-2.0.14
 CATEGORIES=    net
 MASTER_SITES=  https://mosquitto.org/files/source/
 

Index: pkgsrc/net/mosquitto/distinfo
diff -u pkgsrc/net/mosquitto/distinfo:1.22 pkgsrc/net/mosquitto/distinfo:1.23
--- pkgsrc/net/mosquitto/distinfo:1.22  Tue Oct 26 11:06:01 2021
+++ pkgsrc/net/mosquitto/distinfo       Fri Dec 31 09:57:35 2021
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.22 2021/10/26 11:06:01 nia Exp $
+$NetBSD: distinfo,v 1.23 2021/12/31 09:57:35 triaxx Exp $
 
-BLAKE2s (mosquitto-2.0.12.tar.gz) = 39359e9ddd8ea6a422f07e66b97f1204a0b5063bc03224ee36b309e67b87c07f
-SHA512 (mosquitto-2.0.12.tar.gz) = acf80980f124073fd2fdd99981bde840654fb40a6b6f1d6ef483e35880b45d029cfa9390a98753de6476f4ade068266cb4c6e3c753a0362c0309a5745ac4ebab
-Size (mosquitto-2.0.12.tar.gz) = 783859 bytes
+BLAKE2s (mosquitto-2.0.14.tar.gz) = 23628d8cd06b94846933da5cac079bf755db11b4b5c0da5c8aad8dd75cd66e60
+SHA512 (mosquitto-2.0.14.tar.gz) = a9e4f41b9af679b30318570e86a465546024651373df10e3b132f4593b89d22d0dbac01bb7371a57132ba030a2e73971c612acb5c9ac12f5ccd06aa38d9444c2
+Size (mosquitto-2.0.14.tar.gz) = 787414 bytes
 SHA1 (patch-lib_CMakeLists.txt) = 81981f812dc38572e727a9a5dfb427b80476702d
-SHA1 (patch-lib_net__mosq.c) = a38294cdfea98f2da0879ea93373c5f04aebdb20
-SHA1 (patch-mosquitto.conf) = 737e950d5225c8d8e4ca22c9824c4846a0b224ee
-SHA1 (patch-src_CMakeLists.txt) = 76a3c560929aabce943b25bf9d2cefa173b792b0
+SHA1 (patch-lib_net__mosq.c) = 620c6c3db23a7f72e2097fab9782fb379374013c
+SHA1 (patch-lib_strings__mosq.c) = afa4e5313abe6c428189aa01b86cf7ce8462b41e
+SHA1 (patch-mosquitto.conf) = 6091113365a7c1d3d726af30fee682abafc40ab0
+SHA1 (patch-src_CMakeLists.txt) = d0425fd674f2cd1a992a36e616dc8b29e130550b

Index: pkgsrc/net/mosquitto/patches/patch-lib_net__mosq.c
diff -u pkgsrc/net/mosquitto/patches/patch-lib_net__mosq.c:1.1 pkgsrc/net/mosquitto/patches/patch-lib_net__mosq.c:1.2
--- pkgsrc/net/mosquitto/patches/patch-lib_net__mosq.c:1.1      Sat Jul 20 23:09:27 2019
+++ pkgsrc/net/mosquitto/patches/patch-lib_net__mosq.c  Fri Dec 31 09:57:36 2021
@@ -1,12 +1,8 @@
-$NetBSD: patch-lib_net__mosq.c,v 1.1 2019/07/20 23:09:27 gdt Exp $
+$NetBSD: patch-lib_net__mosq.c,v 1.2 2021/12/31 09:57:36 triaxx Exp $
 
-Work around lack of strnlen on older NetBSD.
-
-Not sent upstream becaus POSIX requires strnlen.
-
---- lib/net_mosq.c.orig        2019-04-26 16:07:59.000000000 +0000
+--- lib/net_mosq.c.orig        2021-11-17 00:28:35.000000000 +0000
 +++ lib/net_mosq.c
-@@ -69,6 +69,13 @@ Contributors:
+@@ -77,6 +77,13 @@ Contributors:
  #include "time_mosq.h"
  #include "util_mosq.h"
  

Index: pkgsrc/net/mosquitto/patches/patch-mosquitto.conf
diff -u pkgsrc/net/mosquitto/patches/patch-mosquitto.conf:1.4 pkgsrc/net/mosquitto/patches/patch-mosquitto.conf:1.5
--- pkgsrc/net/mosquitto/patches/patch-mosquitto.conf:1.4       Mon Feb  1 16:43:54 2021
+++ pkgsrc/net/mosquitto/patches/patch-mosquitto.conf   Fri Dec 31 09:57:36 2021
@@ -1,5 +1,4 @@
-$NetBSD: patch-mosquitto.conf,v 1.4 2021/02/01 16:43:54 triaxx Exp $
-
+$NetBSD: patch-mosquitto.conf,v 1.5 2021/12/31 09:57:36 triaxx Exp $
 Log to syslog, instead of (perhaps) not logging.
 
 \todo Figure out what happens if port is not defined, and why we set it.
@@ -9,7 +8,7 @@ that seems like it should perhaps be com
 
 --- mosquitto.conf.orig        2021-01-11 16:49:40.000000000 +0000
 +++ mosquitto.conf
-@@ -148,7 +148,7 @@
+@@ -165,7 +165,7 @@
  # This should be set to /var/run/mosquitto/mosquitto.pid if mosquitto is
  # being run automatically on boot with an init script and
  # start-stop-daemon or similar.
@@ -18,7 +17,7 @@ that seems like it should perhaps be com
  
  # Set to true to queue messages with QoS 0 when a persistent client is
  # disconnected. These messages are included in the limit imposed by
-@@ -340,7 +340,7 @@
+@@ -357,7 +357,7 @@
  # certificate files must have ".crt" as the file ending and you must run
  # "openssl rehash <path to capath>" each time you add/remove a certificate.
  #cafile
@@ -27,7 +26,7 @@ that seems like it should perhaps be com
  
  
  # If require_certificate is true, you may set use_identity_as_username to true
-@@ -448,7 +448,7 @@
+@@ -465,7 +465,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.

Index: pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt
diff -u pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt:1.5 pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt:1.6
--- pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt:1.5   Wed Aug 19 23:33:39 2020
+++ pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt       Fri Dec 31 09:57:36 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.5 2020/08/19 23:33:39 gdt Exp $
+$NetBSD: patch-src_CMakeLists.txt,v 1.6 2021/12/31 09:57:36 triaxx Exp $
 
 \todo Explain this change
 
@@ -6,7 +6,7 @@ $NetBSD: patch-src_CMakeLists.txt,v 1.5 
 
 --- src/CMakeLists.txt.orig    2020-08-19 13:55:03.000000000 +0000
 +++ src/CMakeLists.txt
-@@ -187,9 +187,9 @@ target_link_libraries(mosquitto ${MOSQ_L
+@@ -213,9 +213,9 @@ target_link_libraries(mosquitto ${MOSQ_L
  if (UNIX)
        if (APPLE)
                set_target_properties(mosquitto PROPERTIES LINK_FLAGS "-Wl,-exported_symbols_list -Wl,${mosquitto_SOURCE_DIR}/src/linker-macosx.syms")