From ecb4f2940aef1d63ca9d491abb2b424f58cd6dfc Mon Sep 17 00:00:00 2001
From: "Jean-Marc Pigeon (Delson)" <jmp@safe.ca>
Date: Thu, 26 Jun 2025 16:45:37 -0400
Subject: [PATCH] Improving receiver and sorter start using script mailleur

---
 linux/osukiss/mailleur | 57 ++++++++++++++++++++++++++++++++++++++++++
 linux/osukiss/receiver |  4 +--
 linux/osukiss/sorter   |  2 +-
 mailleur.spec.in       | 14 +++++------
 4 files changed, 67 insertions(+), 10 deletions(-)
 create mode 100644 linux/osukiss/mailleur

diff --git a/linux/osukiss/mailleur b/linux/osukiss/mailleur
new file mode 100644
index 0000000..f1344a6
--- /dev/null
+++ b/linux/osukiss/mailleur
@@ -0,0 +1,57 @@
+#!/bin/sh
+#=================================================================
+# Begin receiver
+#
+# Description : Start mailleur receiver daemon
+# chkconfig: 2345 94 12
+#
+#=================================================================
+
+### BEGIN INIT INFO
+# Provides:            $mailler
+# Required-Start:      $network $dovecot
+# Should-Start:
+# Required-Stop:       sendsignals
+# Should-Stop:
+# Default-Start:       3 4 5
+# Default-Stop:        0 1 2 6
+# Short-Description:   Starts mailleur reciever and sorter  daemon.
+# Description:         Starts mailleur needed daemon.
+# X-LFS-Provided-By:   LFS
+### END INIT INFO
+
+. /lib/lsb/init-functions
+
+APPNAME=mailleur
+DAEMON=receiver
+DAEMON_PID=/run/${APPNAME}/${DAEMON}.lock
+
+# Some functions to make the below more readable
+
+#loading load configuration file
+if [ -f  /etc/sysconfig/$APPNAME ] ; then
+  . /etc/sysconfig/$APPNAME
+fi
+
+#--------------------------------------------------------------
+#to start all mailleur daemon
+#--------------------------------------------------------------
+case "$1" in
+      condrestart	\
+      reload		\
+      restart		\
+      start		\
+    | stop		\
+    )
+    	/usr/share/$APPNAME/linux/osukiss/receiver $1
+    	/usr/share/$APPNAME/linux/osukiss/sorter $1
+        ;;
+
+    *)
+        echo "Usage: $0 {start|stop|reload|condrestart|restart}"
+        exit 1
+        ;;
+esac
+
+
+
diff --git a/linux/osukiss/receiver b/linux/osukiss/receiver
index ba02d74..9c958cc 100644
--- a/linux/osukiss/receiver
+++ b/linux/osukiss/receiver
@@ -34,7 +34,7 @@ if [ -f  /etc/sysconfig/$APPNAME ] ; then
 fi
 
 #--------------------------------------------------------------
-#to start clement daemon
+#to start receiver daemon
 #--------------------------------------------------------------
 mng_daemon ()
 
@@ -97,7 +97,7 @@ case "$1" in
 
 
     *)
-        echo "Usage: $0 {start|stop|reload|restart|status}"
+        echo "Usage: $0 {start|stop|reload|restart}"
         exit 1
         ;;
 esac
diff --git a/linux/osukiss/sorter b/linux/osukiss/sorter
index 1f2bea2..122b1f5 100644
--- a/linux/osukiss/sorter
+++ b/linux/osukiss/sorter
@@ -34,7 +34,7 @@ if [ -f  /etc/sysconfig/$APPNAME ] ; then
 fi
 
 #--------------------------------------------------------------
-#to start clement daemon
+#to start sorter daemon
 #--------------------------------------------------------------
 mng_daemon ()
 
diff --git a/mailleur.spec.in b/mailleur.spec.in
index 3562422..ff2877c 100644
--- a/mailleur.spec.in
+++ b/mailleur.spec.in
@@ -34,8 +34,9 @@ search about email exchange within time and transaction context.
 #-----------------------------------------------------------------------------
 %files			
 %defattr(-,root,root,-)
-%attr(0755,root,root) %{_datadir}/%{name}/linux/osukiss/receiver
-%attr(0755,root,root) %{_datadir}/%{name}/linux/osukiss/sorter
+%attr(0754,root,root) %{_datadir}/%{name}/linux/osukiss/%{name}
+%attr(0754,root,root) %{_datadir}/%{name}/linux/osukiss/receiver
+%attr(0754,root,root) %{_datadir}/%{name}/linux/osukiss/sorter
 %attr(0644,%{name},mail) %config(noreplace) %{_sysconfdir}/pki/%{name}/*
 %attr(0644,%{name},mail) %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %attr(0644,%{name},mail) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
@@ -67,7 +68,7 @@ if [ "$1" = 0 ]; then
   case "$OS" in
     "sysv"	|				\
     "osukiss"	)
-      for action in receiver sorter
+      for action in %{name}
 	do
         %{_initrddir}/${action} stop > /dev/null 2>&1 || :
         %{_sbindir}/chkconfig --del ${action} 
@@ -118,7 +119,7 @@ if [ "$1" = 1 ]; then
   case "$OS" in
     "sysv"	|					\
     "osukiss"	)
-      for action in receiver sorter
+      for action in %{name}
 	do
         %{__ln_s}					\
 		%{_datadir}/%{name}/linux/$OS/${action}	\
@@ -134,7 +135,7 @@ if [ "$1" = 1 ]; then
 case "$OS" in
   "sysv"	|					\
   "osukiss"	)
-    for action in receiver sorter
+    for action in %{name}
       do
       %{_sbindir}/chkconfig --add ${action}
       %{_sysconfdir}/rc.d/init.d/${action} condrestart > /dev/null 2>&1 || :
@@ -185,8 +186,7 @@ if [ "$1" = 1 ]; then
 
 %postun			postgresql
 if [ "$1" = 0 ]; then
-  rm -f %{_sbindir}/receiver
-  rm -f %{_sbindir}/sender
+  rm -f %{_sbindir}/%{name}
   fi
 
 #=============================================================================
-- 
2.47.3