CVS commit: pkgsrc/net/mosquitto

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat Mar  8 13:59:13 UTC 2025

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

Log Message:
net/mosquitto: Fix capath in example config

capath being set without cert/key is an error, and thus should not be
on in a default config.

Clean up old comments about the config file.  (The syslog/pidfile plan
has been working for years with no complaints.)


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/net/mosquitto/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/net/mosquitto/distinfo
cvs rdiff -u -r1.7 -r1.8 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.41 pkgsrc/net/mosquitto/Makefile:1.42
--- pkgsrc/net/mosquitto/Makefile:1.41  Thu Mar  6 19:46:24 2025
+++ pkgsrc/net/mosquitto/Makefile       Sat Mar  8 13:59:13 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2025/03/06 19:46:24 gdt Exp $
+# $NetBSD: Makefile,v 1.42 2025/03/08 13:59:13 gdt Exp $
 
 DISTNAME=      mosquitto-2.0.21
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  https://mosquitto.org/files/source/
 

Index: pkgsrc/net/mosquitto/distinfo
diff -u pkgsrc/net/mosquitto/distinfo:1.37 pkgsrc/net/mosquitto/distinfo:1.38
--- pkgsrc/net/mosquitto/distinfo:1.37  Thu Mar  6 19:46:24 2025
+++ pkgsrc/net/mosquitto/distinfo       Sat Mar  8 13:59:13 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.37 2025/03/06 19:46:24 gdt Exp $
+$NetBSD: distinfo,v 1.38 2025/03/08 13:59:13 gdt Exp $
 
 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) = 62276757cc6402476554e89ef459a0750cd3d23d
+SHA1 (patch-mosquitto.conf) = ac304038543f8cd84f06a748c3e538f32186f942
 SHA1 (patch-src_CMakeLists.txt) = ad906a507fcd39ac4fdcf98afde75ff715101698

Index: pkgsrc/net/mosquitto/patches/patch-mosquitto.conf
diff -u pkgsrc/net/mosquitto/patches/patch-mosquitto.conf:1.7 pkgsrc/net/mosquitto/patches/patch-mosquitto.conf:1.8
--- pkgsrc/net/mosquitto/patches/patch-mosquitto.conf:1.7       Thu Mar  6 19:46:24 2025
+++ pkgsrc/net/mosquitto/patches/patch-mosquitto.conf   Sat Mar  8 13:59:13 2025
@@ -1,11 +1,14 @@
-$NetBSD: patch-mosquitto.conf,v 1.7 2025/03/06 19:46:24 gdt Exp $
+$NetBSD: patch-mosquitto.conf,v 1.8 2025/03/08 13:59:13 gdt Exp $
 
-Log to syslog, instead of (perhaps) not logging.
+Align pid_file to pkgsrc norms.
 
-\todo Figure out what happens if port is not defined, and why we set it.
+Provide a dir for capath, but do not set it.  (In mosquitto, having a
+key/cert for the server is linked to having a CA, and to treating
+clients with a certificate from a known CA as authorized.  This is
+complicated, and not about pkgsrc, and this change does not intend to
+step into the situation.)
 
-\todo Think about pidfile; because this can be run in various modes
-that seems like it should perhaps be command-line, not config.
+Log to syslog, instead of (perhaps) not logging.
 
 --- mosquitto.conf.orig        2025-03-06 16:25:31.000000000 +0000
 +++ mosquitto.conf
@@ -23,7 +26,7 @@ that seems like it should perhaps be com
  # capath is not supported for websockets.
  #cafile
 -#capath
-+capath @SSLCERTS@
++#capath @SSLCERTS@
  
  
  # If require_certificate is true, you may set use_identity_as_username to true