From b00815cdcbca0dd5b5644462fa3339090996d737 Mon Sep 17 00:00:00 2001
From: Trevor Batley <trevor@batley.id.au>
Date: Sat, 30 Mar 2024 09:32:52 +1100
Subject: [PATCH] change directory for *uidgid and multilog to /usr/bin

---
 root/var/service/tinydns/control/1 | 2 +-
 root/var/service/tinydns/log/run   | 4 ++--
 root/var/service/tinydns/run       | 2 +-
 smeserver-tinydns.spec             | 5 ++++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/root/var/service/tinydns/control/1 b/root/var/service/tinydns/control/1
index 8eaaf47..0917311 100644
--- a/root/var/service/tinydns/control/1
+++ b/root/var/service/tinydns/control/1
@@ -1,4 +1,4 @@
 #! /bin/sh
 
 /sbin/e-smith/expand-template /var/service/tinydns/root/data
-cd "/var/service/tinydns/root" && /usr/local/bin/tinydns-data
+cd "/var/service/tinydns/root" && /usr/bin/tinydns-data
diff --git a/root/var/service/tinydns/log/run b/root/var/service/tinydns/log/run
index 9e8f266..553572c 100644
--- a/root/var/service/tinydns/log/run
+++ b/root/var/service/tinydns/log/run
@@ -22,6 +22,6 @@
 #----------------------------------------------------------------------
 
 exec 					\
-    /usr/local/bin/setuidgid dnslog 	\
-    /usr/local/bin/multilog t s5000000  \
+    /usr/bin/setuidgid dnslog 	\
+    /usr/bin/multilog t s5000000  \
     /var/log/tinydns
diff --git a/root/var/service/tinydns/run b/root/var/service/tinydns/run
index 0a8c41d..deb6bf1 100644
--- a/root/var/service/tinydns/run
+++ b/root/var/service/tinydns/run
@@ -4,5 +4,5 @@ exec 2>&1
 exec envdir ./env sh -c '
  exec envuidgid dns \
  softlimit -d "$DATALIMIT" \
- /usr/local/bin/tinydns
+ /usr/bin/tinydns
 '
diff --git a/smeserver-tinydns.spec b/smeserver-tinydns.spec
index b694d52..8a11adc 100644
--- a/smeserver-tinydns.spec
+++ b/smeserver-tinydns.spec
@@ -4,7 +4,7 @@ Summary: smeserver module to configure tinydns
 %define name smeserver-tinydns
 Name: %{name}
 %define version 11.0.0
-%define release 2
+%define release 3
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -24,6 +24,9 @@ Provides: e-smith-tinydns
 AutoReqProv: no
 
 %changelog
+* Sat Mar 30 2024 Trevor Batley <trevor@batley.id.au> 11.0.0-3.sme
+- change directory for *uidgid and multilog to /usr/bin [SME: 12566]
+
 * Sat Mar 23 2024 Brian Read <brianr@koozali.org>11.0.0-2.sme
 - Change Requires: e-smith- to Requires:smeserver-