[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 73f3a190967e454fb51fafb363ea2d78715277ea

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit f781d0713821cb6be61093770ee43d492615364f
Author: Michael Tautschnig <michael at l03.thnet>
Date:   Sun Sep 7 17:25:56 2008 +0200

    Use lsb's status_of_proc function in init scripts
    
    - Replace custom status command handling code in init scripts by the one
      suggested in #483285
    - Bumped lsb-base versioned dependencies to >= 3.2-13 to have status_of_proc
      available
    - Added changelog entry
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 2dc3f63..2443100 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+clamav (0.94.dfsg-2) unstable; urgency=low
+
+  [ Michael Tautschnig ]
+  * Use lsb's status_of_proc function to determine the status of the process
+    and return with according exit codes (closes: #486076)
+  
+ -- Stephen Gran <sgran at debian.org>  Sun, 07 Sep 2008 17:25:34 +0200
+
 clamav (0.94.dfsg-1) unstable; urgency=low
 
   * New upstream version (closes: #497662, #497773)
diff --git a/debian/clamav-daemon.init.in b/debian/clamav-daemon.init.in
index 89848ed..bfa3e10 100644
--- a/debian/clamav-daemon.init.in
+++ b/debian/clamav-daemon.init.in
@@ -134,16 +134,8 @@ case "$1" in
   fi
   ;;
   status)
-  case "$RUNNING" in
-    0) log_success_msg "$NAME is running."
-    ;;
-    1) log_warning_msg "$NAME is not running, but pidfile $THEPIDIFILE exists."
-    ;;
-    3) log_failure_msg "$NAME is not running."
-    ;;
-    *) log_failure_msg "$NAME is unknown."
-    ;;
-  esac
+  status_of_proc "$DAEMON" "$NAME"
+  exit $?
   ;;
   restart|force-reload)
   $0 stop
diff --git a/debian/clamav-freshclam.init.in b/debian/clamav-freshclam.init.in
index f936cb5..8248c13 100644
--- a/debian/clamav-freshclam.init.in
+++ b/debian/clamav-freshclam.init.in
@@ -145,16 +145,8 @@ case "$1" in
   skip)
   ;;
   status)
-  case "$RUNNING" in
-    0) log_success_msg "$NAME is running."
-    ;;
-    1) log_warning_msg "$NAME is not running, but pidfile $PIDFILE exists."
-    ;;
-    3) log_failure_msg "$NAME is not running."
-    ;;
-    *) log_failure_msg "$NAME is unknown."
-    ;;
-  esac
+  status_of_proc "$DAEMON" "$NAME"
+  exit $?
   ;;
   *)
   log_failure_msg "Usage: $0 {no-daemon|start|stop|restart|force-reload|reload-log|skip|status}" >&2
diff --git a/debian/clamav-milter.init.in b/debian/clamav-milter.init.in
index d9307e4..32c0422 100644
--- a/debian/clamav-milter.init.in
+++ b/debian/clamav-milter.init.in
@@ -160,16 +160,8 @@ case "$1" in
   $0 start
   ;;
   status)
-  case "$RUNNING" in
-    0) log_success_msg "$BASENAME is running."
-    ;;
-    1) log_warning_msg "$BASENAME is not running, but pidfile $PIDFILE exists."
-    ;;
-    3) log_failure_msg "$BASENAME is not running."
-    ;;
-    *) log_failure_msg "$BASENAME is unknown."
-    ;;
-  esac
+  status_of_proc "$DAEMON" "$NAME"
+  exit $?
   ;;
   *)
   log_failure_msg "Usage: $0 {start|stop|restart|force-reload|status}" >&2
diff --git a/debian/control b/debian/control
index 86cc8b7..51518ab 100644
--- a/debian/control
+++ b/debian/control
@@ -123,7 +123,7 @@ Description: anti-virus utility for Unix - library
 
 Package: clamav-daemon
 Architecture: any
-Depends: ${shlibs:Depends}, clamav-base(>= ${source:Version}), clamav-freshclam | clamav-data, lsb-base (>> 3.0), ucf
+Depends: ${shlibs:Depends}, clamav-base(>= ${source:Version}), clamav-freshclam | clamav-data, lsb-base (>= 3.2-13), ucf
 Suggests: daemon, clamav-docs
 Description: anti-virus utility for Unix - scanner daemon
  Clam AntiVirus is an anti-virus toolkit for Unix. The main purpose of
@@ -162,7 +162,7 @@ Architecture: any
 Conflicts: clamav-data, libclamav3, libclamav2
 Provides: clamav-data
 Suggests: clamav-docs
-Depends: ${misc:Depends}, clamav-base (>= ${source:Version}), ${shlibs:Depends} , debianutils (>= 1.6), ucf (>= 0.28), logrotate, lsb-base (>> 3.0)
+Depends: ${misc:Depends}, clamav-base (>= ${source:Version}), ${shlibs:Depends} , debianutils (>= 1.6), ucf (>= 0.28), logrotate, lsb-base (>= 3.2-13)
 Description: anti-virus utility for Unix - virus database update utility
  Clam AntiVirus is an anti-virus toolkit for Unix. The main purpose of
  this software is the integration with mail servers (attachment
@@ -181,7 +181,7 @@ Architecture: any
 Suggests: daemon, clamav-docs
 Priority: extra
 Recommends: clamav-daemon
-Depends: ${shlibs:Depends}, clamav-base (>= ${source:Version}), clamav-freshclam | clamav-data, lsb-base (>> 3.0)
+Depends: ${shlibs:Depends}, clamav-base (>= ${source:Version}), clamav-freshclam | clamav-data, lsb-base (>= 3.2-13)
 Description: anti-virus utility for Unix - sendmail integration
  Clam AntiVirus is an anti-virus toolkit for Unix. The main purpose of
  this software is the integration with mail servers (attachment

-- 
Debian repository for ClamAV