From: Jean-Marc Pigeon (Delson) <jmp@safe.ca>
Date: Thu, 17 Jul 2025 19:52:33 +0000 (-0400)
Subject: Ready to do test on mailpostg
X-Git-Tag: tag-0.14~70
X-Git-Url: https://jmp-git.ovh.safe.ca/?a=commitdiff_plain;h=41a2289fc762b70bc98489dd4a87ad21857fde5a;p=jmp%2Fmailleur

Ready to do test on mailpostg
---

diff --git a/linux/osukiss/mailleur b/linux/osukiss/mailleur
index a03ee71..a6298ab 100644
--- a/linux/osukiss/mailleur
+++ b/linux/osukiss/mailleur
@@ -42,6 +42,7 @@ case "$1" in
     )
     	/usr/share/$APPNAME/linux/osukiss/receiver $1
     	/usr/share/$APPNAME/linux/osukiss/scanner $1
+    	/usr/share/$APPNAME/linux/osukiss/sender $1
     	/usr/share/$APPNAME/linux/osukiss/sorter $1
         ;;
 
diff --git a/linux/osukiss/receiver b/linux/osukiss/receiver
index 9c958cc..656e9cf 100644
--- a/linux/osukiss/receiver
+++ b/linux/osukiss/receiver
@@ -48,13 +48,13 @@ case "$1" in
       exit 1;
       fi
     log_info_msg "Starting ${DAEMON} Server..."
-    start_daemon -f /usr/sbin/${DAEMON} $OPTIONS
+    start_daemon -f /usr/libexec/$APNAME/${DAEMON} $OPTIONS
     evaluate_retval
     ;;
 
   stop)
     log_info_msg "Stopping ${DAEMON} Server..."
-    killproc -p ${DAEMON_PID} /usr/sbin/${DAEMON}
+    killproc -p ${DAEMON_PID} /usr/libexec/$APNAME/${DAEMON}
     evaluate_retval
     rm -fr ${DAEMON_PID}
     ;;
diff --git a/linux/osukiss/scanner b/linux/osukiss/scanner
index bee4ead..1c31539 100644
--- a/linux/osukiss/scanner
+++ b/linux/osukiss/scanner
@@ -48,13 +48,13 @@ case "$1" in
       exit 1;
       fi
     log_info_msg "Starting ${DAEMON} Server..."
-    start_daemon -f /usr/sbin/${DAEMON} $OPTIONS
+    start_daemon -f /usr/libexec/$APNAME/${DAEMON} $OPTIONS
     evaluate_retval
     ;;
 
   stop)
     log_info_msg "Stopping ${DAEMON} Server..."
-    killproc -p ${DAEMON_PID} /usr/sbin/${DAEMON}
+    killproc -p ${DAEMON_PID} /usr/libexec/$APNAME/${DAEMON}
     evaluate_retval
     rm -fr ${DAEMON_PID}
     ;;
diff --git a/linux/osukiss/sender b/linux/osukiss/sender
new file mode 100644
index 0000000..7936d64
--- /dev/null
+++ b/linux/osukiss/sender
@@ -0,0 +1,105 @@
+#!/bin/sh
+#=================================================================
+# Begin receiver
+#
+# Description : Start mailleur sender daemon
+# chkconfig: 2345 94 12
+#
+#=================================================================
+
+### BEGIN INIT INFO
+# Provides:            $sender
+# Should-Start:
+# Required-Stop:       sendsignals
+# Should-Stop:
+# Default-Start:       3 4 5
+# Default-Stop:        0 1 2 6
+# Short-Description:   Starts sender daemon.
+# Description:         Starts sender daemon.
+# X-LFS-Provided-By:   LFS
+### END INIT INFO
+
+. /lib/lsb/init-functions
+
+APPNAME=mailleur
+DAEMON=sender
+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 receiver daemon
+#--------------------------------------------------------------
+mng_daemon ()
+
+{
+case "$1" in
+  start)
+    mkdir -p /run/$APPNAME/
+    chown $APPNAME:mail /run/$APPNAME/
+    /usr/lib/$APPNAME/support/starting.sh osukiss
+    if [ $? != 0 ] ; then
+      exit 1;
+      fi
+    log_info_msg "Starting ${DAEMON} Server..."
+    start_daemon -f /usr/libexec/$APPNAME/${DAEMON} $OPTIONS
+    evaluate_retval
+    ;;
+
+  stop)
+    log_info_msg "Stopping ${DAEMON} Server..."
+    killproc -p ${DAEMON_PID} /usr/libexec/$APNAME/${DAEMON}
+    evaluate_retval
+    rm -fr ${DAEMON_PID}
+    ;;
+
+ esac
+}
+
+case "$1" in
+      start	\
+    | stop	\
+    )
+	mng_daemon $1
+        ;;
+
+    reload)
+        log_info_msg "Reloading ${DAEMON} Server..."
+        pid=`cat ${DAEMON_PID} 2>/dev/null`
+
+        if [ -n "${pid}" ]; then
+           kill -HUP "${pid}"
+        else
+           (exit 1)
+        fi
+
+        evaluate_retval
+        ;;
+
+    restart)
+        $0 stop
+        sleep 1
+        $0 start
+        ;;
+
+    condrestart)
+        pid=`cat ${DAEMON_PID} 2>/dev/null`
+        if [ -n "${pid}"  -a -d /proc/$pid ]; then
+	  $0 restart
+	  fi
+        ;;
+
+
+    *)
+        echo "Usage: $0 {start|stop|reload|restart}"
+        exit 1
+        ;;
+esac
+
+
+
diff --git a/linux/osukiss/sorter b/linux/osukiss/sorter
index 122b1f5..0ad63d2 100644
--- a/linux/osukiss/sorter
+++ b/linux/osukiss/sorter
@@ -48,13 +48,13 @@ case "$1" in
       exit 1;
       fi
     log_info_msg "Starting ${DAEMON} Server..."
-    start_daemon -f /usr/sbin/${DAEMON} $OPTIONS
+    start_daemon -f /usr/libexec/$APNAME/${DAEMON} $OPTIONS
     evaluate_retval
     ;;
 
   stop)
     log_info_msg "Stopping ${DAEMON} Server..."
-    killproc -p ${DAEMON_PID} /usr/sbin/${DAEMON}
+    killproc -p ${DAEMON_PID} /usr/libexec/$APNAME/${DAEMON}
     evaluate_retval
     rm -fr ${DAEMON_PID}
     ;;
diff --git a/mailleur.spec.in b/mailleur.spec.in
index 467316b..37a36c6 100644
--- a/mailleur.spec.in
+++ b/mailleur.spec.in
@@ -37,6 +37,7 @@ search about email exchange within time and transaction context.
 %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/scanner
+%attr(0754,root,root) %{_datadir}/%{name}/linux/osukiss/sender
 %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}
@@ -69,7 +70,7 @@ if [ "$1" = 0 ]; then
   case "$OS" in
     "sysv"	|				\
     "osukiss"	)
-      for action in %{name} receiver sorter
+      for action in %{name} receiver scanner sender sorter 
 	do
         %{_initrddir}/${action} stop > /dev/null 2>&1 || :
         %{_sbindir}/chkconfig --del ${action} 
@@ -120,7 +121,7 @@ if [ "$1" = 1 ]; then
   case "$OS" in
     "sysv"	|					\
     "osukiss"	)
-      for action in %{name} receiver sorter
+      for action in %{name} receiver scanner sender sorter 
 	do
         %{__ln_s}					\
 		%{_datadir}/%{name}/linux/$OS/${action}	\