From 4a0744275590200931a42974ce4b492b07236ec9 Mon Sep 17 00:00:00 2001
From: Trevor Batley <trevor@batley.id.au>
Date: Sat, 30 Mar 2024 18:28:36 +1100
Subject: [PATCH] use setuidgid and multilog from /usr/bin [SME: 12566]

---
 root/var/service/qpsmtpd/log/run  | 8 ++++----
 root/var/service/sqpsmtpd/log/run | 4 ++--
 smeserver-qpsmtpd.spec            | 5 ++++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/root/var/service/qpsmtpd/log/run b/root/var/service/qpsmtpd/log/run
index 2ca34df..1ab7947 100755
--- a/root/var/service/qpsmtpd/log/run
+++ b/root/var/service/qpsmtpd/log/run
@@ -30,14 +30,14 @@ fi
 
 if [ $status = "enabled" ]; then
  exec                                   \
-    /usr/local/bin/setuidgid smelog     \
-    /usr/local/bin/multilog t s5000000  \
+    /usr/bin/setuidgid smelog     \
+    /usr/bin/multilog t s5000000  \
     n${num:-10}				\
     !/usr/local/bin/qplogsumm.pl /var/log/qpsmtpd
 else
  exec                                   \
-    /usr/local/bin/setuidgid smelog     \
-    /usr/local/bin/multilog t s5000000  \
+    /usr/bin/setuidgid smelog     \
+    /usr/bin/multilog t s5000000  \
     n${num:-10}				\
     /var/log/qpsmtpd
 fi
diff --git a/root/var/service/sqpsmtpd/log/run b/root/var/service/sqpsmtpd/log/run
index 663e96c..a591840 100755
--- a/root/var/service/sqpsmtpd/log/run
+++ b/root/var/service/sqpsmtpd/log/run
@@ -24,7 +24,7 @@
 num=`/sbin/e-smith/config getprop sqpsmtpd KeepLogFiles`
 
 exec					\
-    /usr/local/bin/setuidgid smelog	\
-    /usr/local/bin/multilog t s5000000	\
+    /usr/bin/setuidgid smelog	\
+    /usr/bin/multilog t s5000000	\
     n${num:-10}				\
     /var/log/sqpsmtpd
diff --git a/smeserver-qpsmtpd.spec b/smeserver-qpsmtpd.spec
index 6922853..f2b6c2c 100644
--- a/smeserver-qpsmtpd.spec
+++ b/smeserver-qpsmtpd.spec
@@ -4,7 +4,7 @@ Summary: SME Server qpsmtpd module
 %define name smeserver-qpsmtpd
 Name: %{name}
 %define version 11.0.0
-%define release 3
+%define release 4
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -47,6 +47,9 @@ AutoReqProv: no
 SME Server qpsmtpd smtpd module
 
 %changelog
+* Sat Mar 30 2024 Trevor Batley <trevor@batley.id.au> 11.0.0-4.sme
+- use setuidgid and multilog from /usr/bin [SME: 12566]
+
 * Sat Mar 23 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-3.sme
 - fix missing provides smeserver-smtpd  [SME: 12521]