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

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit 3a6b82b8a49c52c67ce1a1a88002e940612fc8d2
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:24 2008 +0100

    Revert "Wrap evaluations of [ $variable = true ] in calls to to_lower()"
    
    This reverts commit 65fed75b92a404faebca067aad9613cb9da8d5b8.

diff --git a/debian/changelog b/debian/changelog
index 3939b21..7c9c3fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,8 @@
 clamav (0.93~dfsg-2) unstable; urgency=low
 
   * Remove dpatch dependency - we keep the code in a patch system.
-  * Wrap evaluations of [ $variable = true ] in calls to to_lower()
-  * Add is_true function to catch the 7 bajillion variants of something being
-    true (closes: #483874)
 
- -- Stephen Gran <sgran at debian.org>  Sat, 31 May 2008 22:28:57 +0100
+ -- Stephen Gran <sgran at debian.org>  Tue, 29 Apr 2008 01:44:41 +0100
 
 clamav (0.93~dfsg-1) unstable; urgency=low
 
diff --git a/debian/clamav-daemon.init.in b/debian/clamav-daemon.init.in
index 89848ed..b0f3d0f 100644
--- a/debian/clamav-daemon.init.in
+++ b/debian/clamav-daemon.init.in
@@ -49,7 +49,7 @@ if [ -n "$Example" ]; then
   exit 0
 fi
 
-if is_true "$Foreground"; then
+if [ "$Foreground" = 'true' ]; then
   if [ ! -x "$SUPERVISOR" ] ; then
      log_failure_msg "Foreground specified, but $SUPERVISORNAME not found"
      exit 0
diff --git a/debian/clamav-freshclam.postinst.in b/debian/clamav-freshclam.postinst.in
index c2d9b27..270885d 100644
--- a/debian/clamav-freshclam.postinst.in
+++ b/debian/clamav-freshclam.postinst.in
@@ -171,7 +171,7 @@ CompressLocalDatabase $CompressLocalDatabase
 EOF
 
   if [ -n "$notify" ] ;then
-    if [ -n "$NotifyClamd" ] && is_true "$NotifyClamd" != "true" ]; then
+    if [ -n "$NotifyClamd" ] && [ "$NotifyClamd" != "true" ]; then
       echo "NotifyClamd $NotifyClamd" >> $DEBCONFILE
     else
       echo "NotifyClamd /etc/clamav/clamd.conf" >> $DEBCONFILE
diff --git a/debian/clamav-milter.init.in b/debian/clamav-milter.init.in
index d9307e4..a4e518f 100644
--- a/debian/clamav-milter.init.in
+++ b/debian/clamav-milter.init.in
@@ -47,7 +47,7 @@ case "$SOCKET" in
   ;;
 esac
 
-if is_true "$Foreground"; then
+if [ "$Foreground" = 'true' ]; then
   if [ ! -x "$SUPERVISOR" ] ; then
      log_failure_msg "Foreground specified, but $SUPERVISOR not found"
      exit 0
diff --git a/debian/common_functions b/debian/common_functions
index 446e2bb..08624b1 100644
--- a/debian/common_functions
+++ b/debian/common_functions
@@ -7,20 +7,6 @@ else
 fi
 }
 
-to_lower()
-{
-  word="$1"
-  lcword=$(echo "$word" | tr A-Z a-z)
-  echo "$lcword"
-}
-
-is_true()
-{
-  var="$1"
-  lcvar=$(to_lower "$var")
-  return $([ 'true' = "$lcvar" ] || [ 'yes' = "$lcvar" ] || [ 1 = "$lcvar" ])
-}
-
 ucf_cleanup()
 {
   # This only does something if I've fucked up before

-- 
Debian repository for ClamAV