CVS commit: pkgsrc/net/mosquitto

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Mar  6 19:46:24 UTC 2025

Modified Files:
        pkgsrc/net/mosquitto: Makefile distinfo
        pkgsrc/net/mosquitto/patches: patch-mosquitto.conf

Log Message:
net/mosquitto: Update to 2.0.21

Upstream changes, less bugfixes and non-pkgsrc platforms.

2.0.21 - 2025-03-06
===================

Security:
- Fix leak on malicious SUBSCRIBE by authenticated client.
  Closes eclipse #248.
- Further fix for CVE-2023-28366.

Broker:
- Add `retain_expiry_interval` option to fix expired retained message not
  being removed from memory if they are not subscribed to. Closes #3221.

Apps:
- mosquitto_ctrl dynsec now also allows `-i` to specify a clientid as well as
  `-c`. This matches the documentation which states `-i`. Closes #3219.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/net/mosquitto/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/net/mosquitto/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/mosquitto/patches/patch-mosquitto.conf

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.40 pkgsrc/net/mosquitto/Makefile:1.41
--- pkgsrc/net/mosquitto/Makefile:1.40  Thu Oct 17 00:04:25 2024
+++ pkgsrc/net/mosquitto/Makefile       Thu Mar  6 19:46:24 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2024/10/17 00:04:25 gdt Exp $
+# $NetBSD: Makefile,v 1.41 2025/03/06 19:46:24 gdt Exp $
 
-DISTNAME=      mosquitto-2.0.20
+DISTNAME=      mosquitto-2.0.21
 CATEGORIES=    net
 MASTER_SITES=  https://mosquitto.org/files/source/
 

Index: pkgsrc/net/mosquitto/distinfo
diff -u pkgsrc/net/mosquitto/distinfo:1.36 pkgsrc/net/mosquitto/distinfo:1.37
--- pkgsrc/net/mosquitto/distinfo:1.36  Thu Oct 17 22:37:29 2024
+++ pkgsrc/net/mosquitto/distinfo       Thu Mar  6 19:46:24 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.36 2024/10/17 22:37:29 gdt Exp $
+$NetBSD: distinfo,v 1.37 2025/03/06 19:46:24 gdt Exp $
 
-BLAKE2s (mosquitto-2.0.20.tar.gz) = 6f1e88d554640c64e5f3d7580f9fdfd07f72f518dedde4fac51ef7b0b0c86aa0
-SHA512 (mosquitto-2.0.20.tar.gz) = 4c16ff0ad0e9c6fe5c65ec5a82bef123d9e6490f42658d646e1fad60f098530b7cbbd743460c52d4dec8bc27698c84a557bd539b35ac6c81444539822a544c4c
-Size (mosquitto-2.0.20.tar.gz) = 799972 bytes
+BLAKE2s (mosquitto-2.0.21.tar.gz) = 187ec09757dcca65da0e805d02f8ff426b71116d2fceaf4e578ab37d1ff0d68e
+SHA512 (mosquitto-2.0.21.tar.gz) = 3acc093ef709c3f0f9d837abbb9e39e4e4ed60488c6180e2da733d65b19107f607c1fb89592d39a14faea531c8689227232e7cb13f3f58cb5ee43dad317c7cd6
+Size (mosquitto-2.0.21.tar.gz) = 804168 bytes
 SHA1 (patch-lib_CMakeLists.txt) = a1b1327c81eefc13fcb5249697f7a6bc3c94e308
-SHA1 (patch-mosquitto.conf) = 3aa9b02d8bfefa140814c2c70e120331a58a5e11
+SHA1 (patch-mosquitto.conf) = 62276757cc6402476554e89ef459a0750cd3d23d
 SHA1 (patch-src_CMakeLists.txt) = ad906a507fcd39ac4fdcf98afde75ff715101698

Index: pkgsrc/net/mosquitto/patches/patch-mosquitto.conf
diff -u pkgsrc/net/mosquitto/patches/patch-mosquitto.conf:1.6 pkgsrc/net/mosquitto/patches/patch-mosquitto.conf:1.7
--- pkgsrc/net/mosquitto/patches/patch-mosquitto.conf:1.6       Mon Aug 19 19:11:36 2024
+++ pkgsrc/net/mosquitto/patches/patch-mosquitto.conf   Thu Mar  6 19:46:24 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-mosquitto.conf,v 1.6 2024/08/19 19:11:36 wiz Exp $
+$NetBSD: patch-mosquitto.conf,v 1.7 2025/03/06 19:46:24 gdt Exp $
 
 Log to syslog, instead of (perhaps) not logging.
 
@@ -7,9 +7,9 @@ Log to syslog, instead of (perhaps) not 
 \todo Think about pidfile; because this can be run in various modes
 that seems like it should perhaps be command-line, not config.
 
---- mosquitto.conf.orig        2021-01-11 16:49:40.000000000 +0000
+--- mosquitto.conf.orig        2025-03-06 16:25:31.000000000 +0000
 +++ mosquitto.conf
-@@ -165,7 +165,7 @@
+@@ -167,7 +167,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,16 +18,16 @@ 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
-@@ -357,7 +357,7 @@
- # certificate files must have ".crt" as the file ending and you must run
+@@ -361,7 +361,7 @@
  # "openssl rehash <path to capath>" each time you add/remove a certificate.
+ # capath is not supported for websockets.
  #cafile
 -#capath
 +capath @SSLCERTS@
  
  
  # If require_certificate is true, you may set use_identity_as_username to true
-@@ -465,7 +465,7 @@
+@@ -469,7 +469,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.