From: Jean-Marc Pigeon (Delson) Date: Wed, 16 Jul 2025 22:46:54 +0000 (-0400) Subject: renamed scarmt to scanner, spec file OK X-Git-Tag: tag-0.14~77 X-Git-Url: https://jmp-git.ovh.safe.ca/?a=commitdiff_plain;h=03069e339c581318169565f7e3b68afd80f05af5;p=jmp%2Fmailleur renamed scarmt to scanner, spec file OK --- diff --git a/Makefile.dbg b/Makefile.dbg index bf201df..e0503dd 100644 --- a/Makefile.dbg +++ b/Makefile.dbg @@ -71,7 +71,7 @@ onercvr : clean debug onescar: clean debug @ echo "Starting scanner" @ \ - bin/scarmt \ + bin/scanner \ -f \ $(DBGPAR) @@ -139,7 +139,7 @@ dorcvr : doscarmt: @ echo "Starting scanner" @ \ - bin/scarmt \ + bin/scanner \ $(DBGPAR) #to kill all remaining mailleur process @@ -147,7 +147,7 @@ killall : - kill -TERM receiver - kill -TERM sender - kill -TERM sorter - - kill -TERM scarmt + - kill -TERM scanner #-------------------------------------------------------------------- #procedure to call debugger for each main component @@ -174,7 +174,7 @@ dbgscar: clean debug @ \ gdb \ --args \ - bin/scarmt \ + bin/scanner \ -f \ $(DBGPAR) @@ -184,7 +184,7 @@ valscar: clean debug --leak-check=full \ --show-leak-kinds=$(VALKIND) \ \ - bin/scarmt \ + bin/scanner \ -f \ $(DBGPAR) diff --git a/app/Makefile b/app/Makefile index 9cfd449..59bfd67 100644 --- a/app/Makefile +++ b/app/Makefile @@ -25,7 +25,7 @@ EXE = \ chkspf \ feeder \ receiver \ - scarmt \ + scanner \ sender \ sorter \ @@ -33,7 +33,7 @@ SRC = \ chkspf.c \ feeder.c \ receiver.c \ - scarmt.c \ + scanner.c \ sender.c \ sorter.c \ @@ -41,7 +41,7 @@ OBJS = \ chkspf.o \ feeder.o \ receiver.o \ - scarmt.o \ + scanner.o \ sorter.o \ sender.o \ @@ -68,7 +68,7 @@ feeder \ @ $(LD) $(LDFLAGS) -o ../bin-util/$@ $@.o $(LIBS) receiver \ -scarmt \ +scanner \ sender \ sorter \ : toremake $(OBJS) @@ -116,7 +116,7 @@ sorter.o: sorter.c \ ../lib/unidns.h \ ../lib/subrou.h -scarmt.o: scarmt.c \ +scanner.o: scanner.c \ ../lib/devlog.h \ ../lib/devsql.h \ ../lib/gessql.h \ diff --git a/app/scarmt.c b/app/scanner.c similarity index 98% rename from app/scarmt.c rename to app/scanner.c index ca8ef6b..c011600 100644 --- a/app/scarmt.c +++ b/app/scanner.c @@ -25,7 +25,7 @@ #include "subafn.h" #include "subrou.h" -#define SCANNER "scarmt" //application name +#define SCANNER "scanner" //application name typedef struct { LOGPTR *logptr; //session log refrence pointer @@ -43,7 +43,7 @@ typedef struct { static void check_credibility(SCATYP *scanref,char **dnsbls,int num,char *rmtip) { -#define OPEP "scarmt.c:check_credibilty," +#define OPEP "scanner.c:check_credibilty," SRVTYP *srv; AFNTYP *afn; @@ -139,7 +139,7 @@ afn=afn_freeipnum(afn); static char **load_dnsbls() { -#define OPEP "scarmt.c:load_dnsbls," +#define OPEP "scanner.c:load_dnsbls," const char *blcklist="BLACKLISTER"; @@ -210,7 +210,7 @@ return dnsbls; static void doscanning(int frequency) { -#define OPEP "scarmt.c:doscanning," +#define OPEP "scanner.c:doscanning," unsigned int cycle; SCATYP scanref; @@ -318,8 +318,9 @@ dnsbls=(char **)rou_freelist((void **)dnsbls,(genfree_t)rou_freestr); int main(int argc,char *argv[]) { -#define OPEP "scarmt.c:main," +#define OPEP "scanner.c:main," #define FREQUENCY -(60*10) //10 minutes + int status; ARGTYP *params; int phase; diff --git a/linux/osukiss/mailleur b/linux/osukiss/mailleur index 2bdf58c..a03ee71 100644 --- a/linux/osukiss/mailleur +++ b/linux/osukiss/mailleur @@ -41,6 +41,7 @@ case "$1" in | stop \ ) /usr/share/$APPNAME/linux/osukiss/receiver $1 + /usr/share/$APPNAME/linux/osukiss/scanner $1 /usr/share/$APPNAME/linux/osukiss/sorter $1 ;; diff --git a/linux/osukiss/scanner b/linux/osukiss/scanner new file mode 100644 index 0000000..bee4ead --- /dev/null +++ b/linux/osukiss/scanner @@ -0,0 +1,106 @@ +#!/bin/sh +#================================================================= +# Begin sorter +# +# Description : Start mailleur sorter daemon +# chkconfig: 2345 91 17 +# +#================================================================= + +### BEGIN INIT INFO +# Provides: $scanner +# Required-Start: $ +# Should-Start: +# Required-Stop: sendsignals +# Should-Stop: +# Default-Start: 3 4 5 +# Default-Stop: 0 1 2 6 +# Short-Description: Starts sorter daemon. +# Description: Starts sorter daemon. +# X-LFS-Provided-By: LFS +### END INIT INFO + +. /lib/lsb/init-functions + +APPNAME=mailleur +DAEMON=scanner +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 sorter 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/sbin/${DAEMON} $OPTIONS + evaluate_retval + ;; + + stop) + log_info_msg "Stopping ${DAEMON} Server..." + killproc -p ${DAEMON_PID} /usr/sbin/${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|status}" + exit 1 + ;; +esac + + + diff --git a/mailleur.spec.in b/mailleur.spec.in index 703e320..49636d4 100644 --- a/mailleur.spec.in +++ b/mailleur.spec.in @@ -36,6 +36,7 @@ search about email exchange within time and transaction context. %defattr(-,root,root,-) %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/sorter %attr(0644,%{name},mail) %config(noreplace) %{_sysconfdir}/pki/%{name}/* %attr(0644,%{name},mail) %config(noreplace) %{_sysconfdir}/sysconfig/%{name} @@ -170,6 +171,7 @@ if [ "$1" = 1 ]; then #generating exec to be path of the /usr/sbin path for exe in \ receiver \ + scanner \ sender \ sorter do @@ -196,6 +198,7 @@ case "$OS" in %postun postgresql if [ "$1" = 0 ]; then rm -f %{_sbindir}/receiver + rm -f %{_sbindir}/scanner rm -f %{_sbindir}/sender rm -f %{_sbindir}/sorter fi @@ -233,12 +236,13 @@ if [ "$1" = 1 ]; then #generating exec to be path of the /usr/sbin path for exe in \ receiver \ + scanner \ sender \ sorter do %{__ln_s} -nsf \ %{_libexecdir}/%{name}/bin-mysql/$exe \ - %{_sbindir} + %{_sbindir}/ done case "$OS" in @@ -259,6 +263,7 @@ case "$OS" in %postun mysql if [ "$1" = 0 ]; then rm -f %{_sbindir}/receiver + rm -f %{_sbindir}/scanner rm -f %{_sbindir}/sender rm -f %{_sbindir}/sorter fi @@ -284,11 +289,5 @@ if [ "$1" = 0 ]; then DESTDIR="%{buildroot}" \ install -#removing default link generated by make -#%{__rm} -fr \ -# %{buildroot}%{_sbindir}/receiver\ -# %{buildroot}%{_sbindir}/sender \ -# %{buildroot}%{_sbindir}/sorter \ - #============================================================================= %changelog