[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6619-gb05f4aa

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit b05f4aaa6bb0bfe8c84ec25b7ed853741a52a32e
Author: Michael Tautschnig <mt at debian.org>
Date:   Wed Dec 1 16:06:50 2010 +0100

    Match dfsg-tarball

diff --git a/README b/README
index 92acf44..fdc7be4 100644
--- a/README
+++ b/README
@@ -1574,7 +1574,7 @@ Noteworthy changes in this version:
 -) documentation:
     + new Spanish documentation on ClamAV and Sendmail integration by
       Erick Ivaan Lopez Carreon
-    + included clamdoc.pdf Turkish translation by yavuz kaya and �brahim erken
+    + included clamdoc.pdf Turkish translation by yavuz kaya and Ýbrahim erken
     + included clamav-mirror-howto.pdf by Luca Gibelli
     + included clamd+daemontools HOWTO by Jesse D. Guardiani
     + included signatures.pdf
diff --git a/contrib/cleanup-partial.pl b/contrib/cleanup-partial.pl
deleted file mode 100755
index 1346f71..0000000
--- a/contrib/cleanup-partial.pl
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/perl
-
-# ---- Settings ----
-# TemporaryDirectory in clamd.conf
-my $TMPDIR='/tmp';
-# How long to wait for next part of RFC1341 message (seconds)
-my $cleanup_interval=3600;
-
-# ---- End of Settings ----
-
-my $partial_dir = "$TMPDIR/clamav-partial";
-#  if there is no partial directory, nothing to clean up
-opendir(DIR, $partial_dir) || exit 0;
-
-my $cleanup_threshold = time - $cleanup_interval;
-while(my $file = readdir(DIR)) {
-	next unless $file =~ m/^clamav-partial-([0-9]+)_[0-9a-f]{32}-[0-9]+$/;
-	my $filetime = $1;
-	unlink "$partial_dir/$file" unless $filetime > $cleanup_threshold;
-}
-closedir DIR;
diff --git a/contrib/safe_clamd/safe_clamd b/contrib/safe_clamd/safe_clamd
deleted file mode 100755
index a5aba8c..0000000
--- a/contrib/safe_clamd/safe_clamd
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/sh 
-
-# safe_clamd - a script to start clamd and restart if it dies unexpectedly
-# Please report bugs at https://wwws.clamav.net/bugzilla/show_bug.cgi?id=2026
-# Usage:
-# start with ./safe_clamd
-# stop by sending a TERM signal to the safe_clamd process
-
-{
-####################### CONFIGURATION #######################
-# path to clamd.conf
-CLAMDCONF='/usr/local/etc/clamd.conf'
-# path to clamd binary
-CLAMDBIN='/usr/local/sbin/clamd'
-# interval between checks
-SLEEPINTERVAL=3
-# after a successful restart, sleep for $THROTTLE secs before attempting to restart clamd again
-THROTTLE=30
-##################### END CONFIGURATION #####################
-
-# Do not touch anything below this line, unless you know what you are doing
-trap "signalClamd HUP" SIGHUP
-trap "signalClamd TERM" SIGTERM
-trap "signalClamd USR2" SIGUSR2
-
-getPid() {
-	PIDFILE=`grep ^PidFile $CLAMDCONF | sed -e 's/^PidFile\s*//'`
-	if [ -z "PIDFILE" ]
-	then
-		# missing PidFile directive
-		echo "Please enable the PidFile directive in $CLAMDCONF. See man clamd.conf for more info."
-		exit 1
-	fi
-	CLAMDPID=`cat $PIDFILE 2>/dev/null | grep -Eo '^[0-9]+$'` 
-	if [ -z "$CLAMDPID" ]
-	then
-		# empty pidfile
-		CLAMDPID=0
-		return
-	fi
-	if ps p $CLAMDPID | grep -v grep | grep $CLAMDBIN > /dev/null
-	then 
-		# good pid
-		return
-	fi
-	# invalid pid
-	CLAMDPID=0
-}
-
-startClamd() {
-	rm -f $PIDFILE 
-	if test -f $PIDFILE
-	then 
-		echo "ERROR: cannot remove $PIDFILE" 
-		exit 1 
-	else
-		$CLAMDBIN $args
-		if [ $? -ne 0 ]
-		then
-			exit $?
-		fi
-		sleep $THROTTLE
-	fi 
-}
-
-signalClamd() {
-	getPid
-	if [ $CLAMDPID -gt 0 ]; then
-		echo "Sending $1 to pid $CLAMDPID..."
-		kill -$1 $CLAMDPID
-	else
-		echo "$CLAMDBIN is not running."
-	fi
-	if [ "$1" == "TERM" ]; then
-		echo Exiting $0 ...
-		exit
-	fi
-}
-
-args=$@
-
-# start clamd
-# if it start successfully, enter loop
-# every 5 secs, find pid, verify it belongs to clamd, kill -0 
-# restart it if dead
-while [ true ]; do
-	if test -r "$CLAMDCONF" 
-	then 
-		if test	-x "$CLAMDBIN"
-		then
-			# retrieve pid
-			getPid
-			# pid found?
-			if [ $CLAMDPID -gt 0 ]
-			then
-				if kill -0 $CLAMDPID > /dev/null 2>/dev/null
-	      			then 
-					# pid is alive, sleep before next check
-					sleep $SLEEPINTERVAL
-	    			else
-					# stale pid
-					rm -f $PIDFILE
-					startClamd
-	    			fi
-			else
-				# pid does not belong to clamd 
-				startClamd
-			fi 
-		else	
-			echo $CLAMDBIN not found
-			exit 1
-		fi 
-	else
-		echo $CLAMDCONF not found
-		exit 1
-	fi
-done
-
-} &
diff --git a/database/daily.cvd b/database/daily.cvd
index 7dd9871..8fea507 100644
Binary files a/database/daily.cvd and b/database/daily.cvd differ
diff --git a/database/main.cvd b/database/main.cvd
index 4f8dc32..89b0cc8 100644
Binary files a/database/main.cvd and b/database/main.cvd differ

-- 
Debian repository for ClamAV