[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/lenny-volatile, updated. debian/0.95+dfsg-1-6691-gfaf3682

[Stephen Gran]

The following commit has been merged in the debian/lenny-volatile branch:
commit faf36823d382cb9336500f57fcbc4ca6ae9e610c
Merge: 7b308c2bdf8ec946a619ea3b5785eeb693dfa469 1d89fa433645797b3af973dfbfc527be0cb20ab7
Author: Stephen Gran <steve at lobefin.net>
Date:   Tue Dec 14 19:06:41 2010 +0000

    Merge branch 'debian/lenny-volatile' of ssh://git.debian.org/git/pkg-clamav/clamav into debian/lenny-volatile

diff --combined debian/clamav-freshclam.postinst.in
index 4020ccd,47815e7..be26371
--- a/debian/clamav-freshclam.postinst.in
+++ b/debian/clamav-freshclam.postinst.in
@@@ -151,7 -151,6 +151,7 @@@ case "$1" i
      echo "$min */$cronhour * * *    $dbowner [ -x /usr/bin/freshclam ] && /usr/bin/freshclam --quiet >/dev/null" > "$FRESHCLAMTEMP"
      ucf_cleanup "$FRESHCLAMCRON"
      ucf_upgrade_check "$FRESHCLAMCRON" "$FRESHCLAMTEMP" /var/lib/ucf/cache/:etc:cron.d:clamav-freshclam
 +    rm -f "${FRESHCLAMCRON}.ucf-dist"
      rm -f "$FRESHCLAMTEMP"
    else
      if [ -e /etc/cron.d/clamav-freshclam ]; then
@@@ -177,7 -176,7 +177,7 @@@
    [ -z "$LogFileMaxSize" ] && LogFileMaxSize=0
    [ -z "$Foreground" ] && Foreground=false
    [ -z "$Debug" ] && Debug=false
-   [ -z "$DatabaseDirectory" ] && DatabaseDirectory='/var/lib/clamav/'
+   [ -z "$DatabaseDirectory" ] && DatabaseDirectory='/var/lib/clamav'
    [ -z "$DNSDatabaseInfo" ] && DNSDatabaseInfo='current.cvd.clamav.net'
    [ -z "$AllowSupplementaryGroups" ] && AllowSupplementaryGroups=false
    [ -z "$PidFile" ] && PidFile='/var/run/clamav/freshclam.pid'
@@@ -256,6 -255,11 +256,11 @@@ EO
    [ -n "$DetectionStatsCountry" ] && echo "DetectionStatsCountry $DetectionStatsCountry" >> $DEBCONFILE
    [ -n "$DetectionStatsHostID" ] && echo "DetectionStatsHostID $DetectionStatsHostID" >> $DEBCONFILE
    [ -n "$SafeBrowsing" ] && echo "SafeBrowsing $SafeBrowsing" >> $DEBCONFILE
+   if [ -n "$DatabaseCustomURL" ]; then
+     for i in $DatabaseCustomURL; do
+       echo "DatabaseCustomURL $i" >> $DEBCONFILE
+     done
+   fi
    
    ucf_cleanup "$FRESHCLAMCONFFILE"
    ucf_upgrade_check "$FRESHCLAMCONFFILE" "$DEBCONFILE" /var/lib/ucf/cache/:etc:clamav:freshclam.conf

-- 
Debian repository for ClamAV