From 5e93e714e94f1f1517ff1b70b5fd59dd2195175f Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Fri, 9 Feb 2018 22:48:11 +0100
Subject: [PATCH] switch to r-user

---
 mosquitto/mosquitto.conf |  2 +-
 mosquitto/mosquitto.spec |  6 +++---
 mosquitto/rc.mosquitto   | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mosquitto/mosquitto.conf b/mosquitto/mosquitto.conf
index 99ff86fc34..973396fc3f 100644
--- a/mosquitto/mosquitto.conf
+++ b/mosquitto/mosquitto.conf
@@ -4,7 +4,7 @@
 
 #   global settings
 pid_file             @l_prefix@/var/mosquitto/run/mosquitto.pid
-user                 @l_nusr@
+user                 @l_rusr@
 
 #   logging
 log_dest             file @l_prefix@/var/mosquitto/log/mosquitto.log
diff --git a/mosquitto/mosquitto.spec b/mosquitto/mosquitto.spec
index 657bdfd94c..783d7408ba 100644
--- a/mosquitto/mosquitto.spec
+++ b/mosquitto/mosquitto.spec
@@ -32,7 +32,7 @@ Class:        EVAL
 Group:        Networking
 License:      EPL
 Version:      1.4.14
-Release:      20180208
+Release:      20180209
 
 #   list of sources
 Source0:      http://mosquitto.org/files/source/mosquitto-%{version}.tar.gz
@@ -122,8 +122,8 @@ PreReq:       openssl, libwebsockets, ares
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
         '%config %{l_prefix}/etc/mosquitto/*' \
-        '%dir %attr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/mosquitto' \
-        '%dir %attr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/mosquitto/*'
+        '%dir %attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/mosquitto' \
+        '%dir %attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/mosquitto/*'
 
 %files -f files
 
diff --git a/mosquitto/rc.mosquitto b/mosquitto/rc.mosquitto
index dd98ab3cea..fb45df2e5f 100644
--- a/mosquitto/rc.mosquitto
+++ b/mosquitto/rc.mosquitto
@@ -20,7 +20,7 @@
         [ -f $mosquitto_pidfile ] && kill -$1 `cat $mosquitto_pidfile`
     }
 
-%status -u @l_nusr@ -o
+%status -u @l_rusr@ -o
     mosquitto_usable="unknown"
     mosquitto_active="no"
     rcService mosquitto enable yes && \
@@ -29,28 +29,28 @@
     echo "mosquitto_usable=\"$mosquitto_usable\""
     echo "mosquitto_active=\"$mosquitto_active\""
 
-%start -u @l_nusr@
+%start -u @l_rusr@
     rcService mosquitto enable yes || exit 0
     rcService mosquitto active yes && exit 0
     @l_prefix@/sbin/mosquitto -d -c $mosquitto_cfgfile $mosquitto_flags
 
-%stop -u @l_nusr@
+%stop -u @l_rusr@
     rcService mosquitto enable yes || exit 0
     rcService mosquitto active no  && exit 0
     mosquitto_signal TERM
     sleep 2
     rm -f $mosquitto_pidfile >/dev/null 2>&1 || true
 
-%restart -u @l_nusr@
+%restart -u @l_rusr@
     rcService mosquitto enable yes || exit 0
     rcService mosquitto active no  && exit 0
     rc mosquitto stop start
 
-%daily -u @l_nusr@
+%daily -u @l_rusr@
     rcService mosquitto enable yes || exit 0
     shtool rotate -f \
         -n ${mosquitto_log_numfiles} -s ${mosquitto_log_minsize} -d \
-        -z ${mosquitto_log_complevel} -m 664 -o @l_nusr@ -g @l_ngrp@ \
+        -z ${mosquitto_log_complevel} -m 664 -o @l_rusr@ -g @l_rgrp@ \
         -P "${mosquitto_log_prolog}" \
         -E "${mosquitto_log_epilog}; rc mosquitto restart" \
         $mosquitto_logfile