[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/etch-volatile, updated. debian/0.95+dfsg-1-168-g6d880b0

[Michael Meskes]

The following commit has been merged in the debian/etch-volatile branch:
commit 6d880b0cce9da0c26a41e4877c1eabac071365aa
Author: Michael Meskes <meskes at debian.org>
Date:   Tue May 12 15:38:07 2009 +0200

    Defined status_of_proc()

diff --git a/debian/changelog b/debian/changelog
index ac8d412..6a80032 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+clamav (0.95.1+dfsg-0volatile3) UNRELEASED; urgency=low
+
+  * Defined status_of_proc() that is not available in etch (closes: #527903)
+
+ -- Michael Meskes <meskes at debian.org>  Tue, 12 May 2009 15:36:59 +0200
+
 clamav (0.95.1+dfsg-0volatile2) etch-volatile; urgency=low
 
   * Fix wrong variable name in milter init script
diff --git a/debian/clamav-freshclam.init.in b/debian/clamav-freshclam.init.in
index 55f8ff4..a02b029 100644
--- a/debian/clamav-freshclam.init.in
+++ b/debian/clamav-freshclam.init.in
@@ -24,6 +24,22 @@ PIDFILE=/var/run/clamav/freshclam.pid
 
 . /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
+}
+
 #COMMON-FUNCTIONS#
 
 slurp_config "$FRESHCLAM_CONF_FILE"
diff --git a/debian/clamav-milter.init.in b/debian/clamav-milter.init.in
index f88c569..0fe2fda 100644
--- a/debian/clamav-milter.init.in
+++ b/debian/clamav-milter.init.in
@@ -29,6 +29,22 @@ CLAMAVDAEMONUPGRADE="/var/run/clamav-daemon-being-upgraded"
 
 . /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"

-- 
Debian repository for ClamAV