use setuidgid and multilog from /usr/bin [SME: 12566]

- fix missing provides smeserver-smtpd  [SME: 12521]

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

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

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 2
+%define release 4
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -28,10 +28,11 @@ Obsoletes: e-smith-obtuse-smtpd
 Obsoletes: e-smith-qmail-smtpd
 Obsoletes: e-smith-mailfront
 Obsoletes: e-smith-ssl-mailfront
+Provides: smeserver-smtpd
 Provides: e-smith-smtpd
-Obsoletes: e-smith-qpsmtpd
+Obsoletes: e-smith-qpsmtpd < %{version}
 Provides: e-smith-qpsmtpd
-Obsoletes: smeserver-qpsmtpd-tnef2mime
+Obsoletes: smeserver-qpsmtpd-tnef2mime < %{version}
 Provides: smeserver-qpsmtpd-tnef2mime
 Requires: smeserver-base >= 4.15.2
 Requires: perl-Convert-TNEF
@@ -46,6 +47,12 @@ 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]
+
 * Sat Mar 23 2024 Brian Read <brianr@koozali.org>11.0.0-2.sme
 - Change Requires: e-smith- to Requires:smeserver-