CVS commit: pkgsrc/net/mosquitto

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

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Mon Feb  1 16:43:54 UTC 2021

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

Log Message:
mosquitto: Revert the deletion of ${piddir}

Mosquitto can no longer write its PID file to ${VARBASE}/run when VARBASE
is the system /var owned by root.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/mosquitto/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/mosquitto/files/mosquitto.sh
cvs rdiff -u -r1.3 -r1.4 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/distinfo
diff -u pkgsrc/net/mosquitto/distinfo:1.13 pkgsrc/net/mosquitto/distinfo:1.14
--- pkgsrc/net/mosquitto/distinfo:1.13  Fri Jan 29 13:58:20 2021
+++ pkgsrc/net/mosquitto/distinfo       Mon Feb  1 16:43:53 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2021/01/29 13:58:20 gdt Exp $
+$NetBSD: distinfo,v 1.14 2021/02/01 16:43:53 triaxx Exp $
 
 SHA1 (mosquitto-2.0.6.tar.gz) = 2b183679790d0ba65774fcb7ccab709d88dc568a
 RMD160 (mosquitto-2.0.6.tar.gz) = 29839b23fb832086b593ac1c952a6aa5fd8e72da
@@ -7,5 +7,5 @@ Size (mosquitto-2.0.6.tar.gz) = 756359 b
 SHA1 (patch-lib_CMakeLists.txt) = 81981f812dc38572e727a9a5dfb427b80476702d
 SHA1 (patch-lib_net__mosq.c) = a38294cdfea98f2da0879ea93373c5f04aebdb20
 SHA1 (patch-misc_letsencrypt_mosquitto-copy.sh) = a4d601b71f68d3f9e62d923d21c58f26558eb551
-SHA1 (patch-mosquitto.conf) = ddd2cba5d98f5b9b00fd808d839ba328591ba29f
+SHA1 (patch-mosquitto.conf) = 737e950d5225c8d8e4ca22c9824c4846a0b224ee
 SHA1 (patch-src_CMakeLists.txt) = 76a3c560929aabce943b25bf9d2cefa173b792b0

Index: pkgsrc/net/mosquitto/files/mosquitto.sh
diff -u pkgsrc/net/mosquitto/files/mosquitto.sh:1.3 pkgsrc/net/mosquitto/files/mosquitto.sh:1.4
--- pkgsrc/net/mosquitto/files/mosquitto.sh:1.3 Thu Jan 28 19:49:29 2021
+++ pkgsrc/net/mosquitto/files/mosquitto.sh     Mon Feb  1 16:43:53 2021
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: mosquitto.sh,v 1.3 2021/01/28 19:49:29 triaxx Exp $
+# $NetBSD: mosquitto.sh,v 1.4 2021/02/01 16:43:53 triaxx Exp $
 #
 # PROVIDE: mosquitto
 # REQUIRE: DAEMON
@@ -10,13 +10,21 @@
 name="mosquitto"
 rcvar=$name
 command="@PREFIX@/sbin/${name}"
-pidfile="@VARBASE@/run/${name}.pid"
+piddir="/var/run/${name}"
+pidfile="${piddir}/${name}.pid"
 config="@PKG_SYSCONFDIR@/${name}.conf"
 
 command_args="-d -c $config"
 
+start_precmd="mosquitto_precmd"
 test_cmd="mosquitto_test"
 extra_commands=""
 
+mosquitto_precmd()
+{
+    mkdir -p ${piddir}
+    chown @MOSQUITTO_USER@ ${piddir}
+}
+
 load_rc_config $name
 run_rc_command "$1"

Index: pkgsrc/net/mosquitto/patches/patch-mosquitto.conf
diff -u pkgsrc/net/mosquitto/patches/patch-mosquitto.conf:1.3 pkgsrc/net/mosquitto/patches/patch-mosquitto.conf:1.4
--- pkgsrc/net/mosquitto/patches/patch-mosquitto.conf:1.3       Thu Jan 28 19:46:24 2021
+++ pkgsrc/net/mosquitto/patches/patch-mosquitto.conf   Mon Feb  1 16:43:54 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-mosquitto.conf,v 1.3 2021/01/28 19:46:24 triaxx Exp $
+$NetBSD: patch-mosquitto.conf,v 1.4 2021/02/01 16:43:54 triaxx Exp $
 
 Log to syslog, instead of (perhaps) not logging.
 
@@ -14,7 +14,7 @@ that seems like it should perhaps be com
  # being run automatically on boot with an init script and
  # start-stop-daemon or similar.
 -#pid_file
-+pid_file @VARBASE@/run/mosquitto.pid
++pid_file @VARBASE@/run/mosquitto/mosquitto.pid
  
  # Set to true to queue messages with QoS 0 when a persistent client is
  # disconnected. These messages are included in the limit imposed by