[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/etch-volatile, updated. debian/0.95+dfsg-1-243-g0ab4ae8
Stephen Gran
steve at lobefin.net
Sun Jun 14 11:07:59 UTC 2009
The following commit has been merged in the debian/etch-volatile branch:
commit 0ab4ae83471c2681e4c2f31ca00708df40d86a25
Author: Stephen Gran <steve at lobefin.net>
Date: Sun Jun 14 12:07:57 2009 +0100
Fix start-stop-daemon call
Signed-off-by: Stephen Gran <steve at lobefin.net>
diff --git a/debian/clamav-daemon.init.in b/debian/clamav-daemon.init.in
index 8bb522e..76fc2ab 100644
--- a/debian/clamav-daemon.init.in
+++ b/debian/clamav-daemon.init.in
@@ -91,7 +91,7 @@ case "$1" in
OPTIND=1
if [ -z "$RUN_SUPERVISED" ] ; then
log_daemon_msg "Starting $DESC" "$NAME "
- start-stop-daemon -c $User --exec $DAEMON
+ start-stop-daemon --start -c $User --exec $DAEMON
ret=$?
else
log_daemon_msg "Starting $DESC" "$NAME (supervised) "
diff --git a/debian/clamav-freshclam.init.in b/debian/clamav-freshclam.init.in
index 1ef6788..9d57995 100644
--- a/debian/clamav-freshclam.init.in
+++ b/debian/clamav-freshclam.init.in
@@ -99,7 +99,7 @@ case "$1" in
log_end_msg 255
exit 0
fi
- start-stop-daemon -c "$DatabaseOwner" --exec $DAEMON -- -d --quiet
+ start-stop-daemon --start -c "$DatabaseOwner" --exec $DAEMON -- -d --quiet
log_end_msg $?
;;
stop)
diff --git a/debian/clamav-freshclam.init.in.orig b/debian/clamav-freshclam.init.in.orig
deleted file mode 100644
index ed57f80..0000000
--- a/debian/clamav-freshclam.init.in.orig
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/bin/sh
-
-### BEGIN INIT INFO
-# Provides: clamav-freshclam
-# Required-Start: $syslog
-# Should-Start: clamav-daemon
-# Required-Stop:
-# Should-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 6
-# Short-Description: ClamAV virus database updater
-# Description: Clam AntiVirus virus database updater
-### END INIT INFO
-
-DAEMON=/usr/bin/freshclam
-NAME=freshclam
-DESC="ClamAV virus database updater"
-[ -x $DAEMON ] || exit 0
-
-CLAMAV_CONF_FILE=/etc/clamav/clamd.conf
-FRESHCLAM_CONF_FILE=/etc/clamav/freshclam.conf
-PIDFILE=/var/run/clamav/freshclam.pid
-[ -f /var/lib/clamav/interface ] && INTERFACE=`cat /var/lib/clamav/interface`
-
-<<<<<<< HEAD:debian/clamav-freshclam.init.in
-. /lib/lsb/init-functions
-
-status_of_proc()
-{
- status="0"
- DAEMON="$1"
- NAME="$2"
-
- pidofproc "$DAEMON" >/dev/null || status="$?"
- if [ "$status" = 0 ]; then
- log_success_msg "$NAME is running"
- exit 0
- else
- log_failure_msg "$NAME is not running"
- exit $status
- fi
-}
-
-=======
->>>>>>> debian/unstable:debian/clamav-freshclam.init.in
-#COMMON-FUNCTIONS#
-
-. /lib/lsb/init-functions
-
-slurp_config "$FRESHCLAM_CONF_FILE"
-
-[ -n "$PidFile" ] && PIDFILE="$PidFile"
-[ -n "$DataBaseDirectory" ] || DataBaseDirectory=/var/run/clamav
-
-make_dir "$DataBaseDirectory"
-make_dir $(dirname "$PidFile")
-
-if [ -f "$PIDFILE" ]; then
- PID=`pidofproc -p $PIDFILE $DAEMON`
- RUNNING=$?
-else
- PID=`pidofproc $DAEMON`
- RUNNING=$?
-fi
-
-handle_iface()
-{
- OPTIND=1
- if [ "$1" = "stop" ] && [ "$RUNNING" != 0 ]; then
- return 1
- elif [ "$1" = "start" ] && [ "$RUNNING" = 0 ]; then
- return 1
- else
- return 0
- fi
-
- IS_UP=0
- MATCH=0
- for inet in $INTERFACE; do
- route | grep -q "$inet" && IS_UP=`expr "$IS_UP" + 1`
- [ "$inet" = "$IFACE" ] && MATCH=1
- done
-
- if [ -n "$INTERFACE" ]; then # Want if-up.d handling
- if [ -n "$IFACE" ]; then # Called by if-up.d - for us
- if [ "$MATCH" = '1' ]; then # IFACE is ours
- if [ "$IS_UP" = '1' ]; then # and is only one up
- return 0
- else # Either not up, or others are up
- return 1
- fi
- else # IFACE is not ours
- return 1
- fi
- else # Not called by if-up.d && $1='(stop|start)'
- return 1
- fi
- else # No if-up.d handling - just return
- return 0
- fi
-}
-
-handle_iface $1 || exit 0
-
-[ -z "$UpdateLogFile" ] && UpdateLogFile=/var/log/clamav/freshclam.log
-[ -z "$DatabaseDirectory" ] && DatabaseDirectory=/var/lib/clamav/
-[ -n "$DatabaseOwner" ] || DatabaseOwner=clamav
-
-case "$1" in
- no-daemon)
- su "$DatabaseOwner" -p -s /bin/sh -c "freshclam -l $UpdateLogFile --datadir $DatabaseDirectory"
- ;;
- start)
- OPTIND=1
- log_daemon_msg "Starting $DESC" "$NAME"
- # If user wants it run from cron, we only accept no-daemon and stop
- if [ -f /etc/cron.d/clamav-freshclam ]; then
- log_warning_msg "Not starting $NAME - cron option selected"
- log_warning_msg "Run the init script with the 'no-daemon' option"
- log_end_msg 255
- exit 0
- fi
- start-stop-daemon -c "$DatabaseOwner" --exec $DAEMON -- -d --quiet
- log_end_msg $?
- ;;
- stop)
- OPTIND=1
- log_daemon_msg "Stopping $DESC" "$NAME"
- if [ -n "$PID" ]; then
- kill -15 -"$PID"
- ret=$?
- sleep 1
- if kill -0 "$PID" 2>/dev/null; then
- ret=$?
- log_progress_msg "Waiting . "
- cnt=0
- while kill -0 "$PID" 2>/dev/null; do
- ret=$?
- cnt=`expr "$cnt" + 1`
- if [ "$cnt" -gt 15 ]; then
- kill -9 "$PID"
- ret=$?
- break
- fi
- sleep 2
- log_progress_msg ". "
- done
- fi
- else
- killproc -p $PIDFILE $DAEMON
- ret=$?
- fi
- log_end_msg $ret
- ;;
- restart|force-reload)
- $0 stop
- $0 start
- ;;
- reload-log)
- OPTIND=1
- log_daemon_msg "Reloading $DESC" "$NAME"
- if [ "$RUNNING" = 0 ] && [ -n "$PID" ]; then
- kill -HUP $PID
- fi
- log_end_msg $?
- ;;
- skip)
- ;;
- status)
- status_of_proc "$DAEMON" "$NAME"
- exit $?
- ;;
- *)
- log_failure_msg "Usage: $0 {no-daemon|start|stop|restart|force-reload|reload-log|skip|status}" >&2
- exit 1
- ;;
-esac
-
-exit 0
-
diff --git a/debian/clamav-milter.init.in b/debian/clamav-milter.init.in
index cc2b1b3..28afcca 100644
--- a/debian/clamav-milter.init.in
+++ b/debian/clamav-milter.init.in
@@ -119,7 +119,7 @@ case "$1" in
fi
if [ -z "$RUN_SUPERVISED" ] ; then
log_daemon_msg "Starting $DESC" "$BASENAME"
- start-stop-daemon -c $User --exec $DAEMON
+ start-stop-daemon --start -c $User --exec $DAEMON
ret=$?
else
log_daemon_msg "Starting $DESC" "$BASENAME (supervised)"
diff --git a/debian/clamav-milter.init.in.orig b/debian/clamav-milter.init.in.orig
deleted file mode 100644
index 7561c78..0000000
--- a/debian/clamav-milter.init.in.orig
+++ /dev/null
@@ -1,227 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: clamav-milter
-# Required-Start: $syslog
-# Should-Start: clamav-daemon
-# Required-Stop:
-# Should-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 6
-# Short-Description: ClamAV virus milter
-# Description: Clam AntiVirus milter interface
-### END INIT INFO
-
-# edit /etc/default/clamav-milter for options
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/clamav-milter
-DESC="Sendmail milter plugin for ClamAV"
-BASENAME=clamav-milter
-CLAMAVCONF=/etc/clamav/clamav-milter.conf
-DEFAULT=/etc/default/clamav-milter
-SUPERVISOR=/usr/bin/daemon
-SUPERVISORPIDFILE="/var/run/clamav/daemon-clamav-milter.pid"
-SUPERVISORARGS="-F $SUPERVISORPIDFILE --name=$BASENAME --respawn"
-CLAMAVDAEMONUPGRADE="/var/run/clamav-daemon-being-upgraded"
-
-[ -x "$DAEMON" ] || exit 0
-[ ! -r $DEFAULT ] || . $DEFAULT
-
-#COMMON-FUNCTIONS#
-
-. /lib/lsb/init-functions
-
-status_of_proc()
-{
- status="0"
- DAEMON="$1"
- NAME="$2"
-
- pidofproc "$DAEMON" >/dev/null || status="$?"
- if [ "$status" = 0 ]; then
- log_success_msg "$NAME is running"
- exit 0
- else
- log_failure_msg "$NAME is not running"
- exit $status
- fi
-}
-
-if [ ! -f "$CLAMAVCONF" ]; then
- log_failure_msg "There is no configuration file for clamav-milter."
- log_failure_msg "Please either dpkg-reconfigure $DESC, or copy the example from"
- log_failure_msg "/usr/share/doc/clamav-milter/examples/ to $CLAMAVCONF and run"
- log_failure_msg "'/etc/init.d/clamav-milter start'"
- exit 0
-fi
-
-slurp_config "$CLAMAVCONF"
-[ -n "$User" ] || User=clamav
-
-if [ -n "$Example" ]; then
- log_failure_msg "$DESC is not configured."
- log_failure_msg "Please edit $CLAMAVCONF and run '/etc/init.d/clamav-milter start'"
- exit 0
-fi
-
-if [ -z "$PidFile" ]; then
- PIDFILE=/var/run/clamav/clamav-milter.pid
-else
- PIDFILE="$PidFile"
-fi
-
-if [ -z "$MilterSocket" ]; then
- SOCKET=local:/var/run/clamav/clamav-milter.ctl
-else
- SOCKET="$MilterSocket"
-fi
-
-case "$SOCKET" in
- /*)
- SOCKET_PATH="$SOCKET"
- SOCKET="local:$SOCKET"
- ;;
- *)
- SOCKET_PATH=`echo $SOCKET | sed -e s/local\://`
- # If the socket is type inet: we don't care - we can't rm -f that later :)
- ;;
-esac
-
-if is_true "$Foreground"; then
- if [ ! -x "$SUPERVISOR" ] ; then
- log_failure_msg "Foreground specified, but $SUPERVISOR not found"
- exit 0
- else
- RUN_SUPERVISED=1
- SUPERVISOR_EXEC="$DAEMON $OPTIONS --pidfile $PIDFILE $SOCKET"
- fi
-fi
-
-if [ -z "$RUN_SUPERVISED" ] ; then
- if [ -f "$PIDFILE" ]; then
- PID=`pidofproc -p $PIDFILE $DAEMON`
- RUNNING=$?
- else
- PID=`pidofproc $DAEMON`
- RUNNING=$?
- fi
-else
- [ -e "$SUPERVISORPIDFILE" ] && PID=`sed 's/[^0-9]//g' $SUPERVISORPIDFILE`
-fi
-
-[ "$PID" = '1' ] && unset PID
-[ -n "$User" ] || User=clamav
-[ -n "$DataBaseDirectory" ] || DataBaseDirectory=/var/run/clamav
-
-make_dir "$DataBaseDirectory"
-if [ "${SOCKET_PATH#inet}" = "${SOCKET_PATH}" ]; then
- make_dir $(dirname "$SOCKET_PATH")
- chown $User $(dirname "$SOCKET_PATH")
-fi
-
-make_dir $(dirname "$PIDFILE")
-chown $User $(dirname "$PIDFILE")
-
-case "$1" in
- start)
- OPTIND=1
- if [ -n "$PID" ]; then
- PID=`echo $PID | sed 's/[^0-9]//g'`
- if kill -0 $PID; then
- log_failure_msg "$DAEMON already running"
- exit 1
- fi
- fi
- if [ -e "$CLAMAVDAEMONUPGRADE" ] && [ "$RESTART_AFTER_CLAMD" = 'yes' ]; then
- touch $CLAMAVDAEMONUPGRADE.milter-restart
- log_warning_msg "clamd may be required to run $DAEMON, clamav-milter will be restarted by clamav-daemon"
- exit 0
- fi
- if [ -z "$RUN_SUPERVISED" ] ; then
- log_daemon_msg "Starting $DESC" "$BASENAME"
-<<<<<<< HEAD:debian/clamav-milter.init.in
- su "$User" -p -s /bin/sh -c ". /lib/lsb/init-functions && start_daemon $DAEMON $OPTIONS --pidfile $PIDFILE $SOCKET" > /dev/null
-=======
- start-stop-daemon -c $User --exec $DAEMON
->>>>>>> debian/unstable:debian/clamav-milter.init.in
- ret=$?
- else
- log_daemon_msg "Starting $DESC" "$BASENAME (supervised)"
- $SUPERVISOR $SUPERVISORARGS -X "$SUPERVISOR_EXEC"
- ret=$?
- fi
- if [ $ret = 0 ] && [ "$USE_POSTFIX" = 'yes' ] && [ "${SOCKET_PATH#inet}" = "${SOCKET_PATH}" ]; then
- cnt=0
- until [ -e "$SOCKET_PATH" ] ; do
- cnt=`expr "$cnt" + 1`
- if [ "$cnt" -gt 15 ]; then
- break
- fi
- sleep 2
- done
- if [ -e "$SOCKET_PATH" ]; then
- chmod g+w $SOCKET_PATH
- chgrp postfix $SOCKET_PATH
- else
- log_warning_msg "Socket not created. Investigate"
- fi
- fi
- log_end_msg $ret
- ;;
- stop)
- OPTIND=1
- log_daemon_msg "Stopping $DESC" "$BASENAME"
- if [ -n "$PID" ]; then
- PID=`echo $PID | sed 's/[^0-9]//g'`
- kill -15 -"$PID" 2>/dev/null || true
- ret=$?
- sleep 2
- if kill -0 "$PID" 2>/dev/null; then
- ret=$?
- log_progress_msg "Waiting . "
- cnt=0
- while kill -0 "$PID" 2>/dev/null; do
- ret=$?
- cnt=`expr "$cnt" + 1`
- if [ "$cnt" -gt 15 ]; then
- kill -9 -"$PID"
- ret=$?
- break
- fi
- sleep 2
- log_progress_msg ". "
- done
- fi
- else
- if [ -z "$RUN_SUPERVISED" ] ; then
- killproc -p $PIDFILE $DAEMON
- ret=$?
- else
- killproc -p $SUPERVISORPIDFILE
- ret=$?
- fi
- fi
- if [ -n "$ret" ]; then
- log_end_msg $ret
- else
- log_end_msg $?
- fi
- [ -e "$SOCKET_PATH" ] && rm -f $SOCKET_PATH
- [ -e "$PIDFILE" ] && rm -f $PIDFILE
- ;;
- force-reload | restart)
- $0 stop
- sleep 2
- $0 start
- ;;
- status)
- status_of_proc "$DAEMON" "$NAME"
- exit $?
- ;;
- *)
- log_failure_msg "Usage: $0 {start|stop|restart|force-reload|status}" >&2
- exit 1
- ;;
-esac
-
-exit 0
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list