From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 4558108c4d1ed68b7f47287239b529b0cf909109
Date: Fri, 06 May 2016 11:05:11 +0100
Message-ID: <20160506100511.E7D4F1078E81@git01.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7278359486485873891=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============7278359486485873891==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  4558108c4d1ed68b7f47287239b529b0cf909109 (commit)
      from  fe6e5e03d53d80117abde47c9965c82cbc25ddcc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4558108c4d1ed68b7f47287239b529b0cf909109
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri May 6 11:22:05 2016 +0200

    clamav: rework initskript
    
    display download wait, increase time to 15min and
    remove tmp files at freshclam terminate.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 lfs/clamav                    |  2 +-
 src/initscripts/init.d/clamav | 25 ++++++++++++++++++++-----
 2 files changed, 21 insertions(+), 6 deletions(-)

Difference in files:
diff --git a/lfs/clamav b/lfs/clamav
index a286017..8911619 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = 32
+PAK_VER    = 33
 
 DEPS       = ""
 
diff --git a/src/initscripts/init.d/clamav b/src/initscripts/init.d/clamav
index 5b31e02..fa080a6 100644
--- a/src/initscripts/init.d/clamav
+++ b/src/initscripts/init.d/clamav
@@ -9,17 +9,31 @@ case "$1" in
 		if [ $(basename $0) == "clamav" ]; then 
 			boot_mesg "Starting Clamav Definition Updater..."
 			loadproc /usr/bin/freshclam -d -c 10
-		
-			boot_mesg "Starting Clamav Daemon..."
+
 			COUNTER=0
-			while [ "$COUNTER" -lt "30" ]; do
+			while [ "$COUNTER" -lt "61" ]; do
 				[ -e "/usr/share/clamav/main.cvd" ] && \
 					[ -e "/usr/share/clamav/daily.cvd" ] || \
 					[ -e "/usr/share/clamav/daily.cld" ] && \
 				break
-				sleep 5
+				if [ "$COUNTER" -lt "1" ]; then
+					boot_mesg -n "Download db "
+				else
+					boot_mesg -n "."
+				fi
+				sleep 15
 				COUNTER=$(($COUNTER + 1))
 			done
+			if [ "$COUNTER" -gt "0" ]; then
+				boot_mesg
+			fi
+			if [ "$COUNTER" -gt "60" ]; then
+				boot_mesg "Download takes longer than 15min check freshclam status!"
+				echo_failure;
+				exit 1;
+			fi
+
+			boot_mesg "Starting Clamav Daemon..."
 			loadproc /usr/sbin/clamd
 		else
 			boot_mesg "Starting Clamav in background..."
@@ -32,7 +46,8 @@ case "$1" in
 	stop)
 		boot_mesg "Stopping Clamav Definition Updater..."
 		killproc /usr/bin/freshclam
-		
+		rm -rf /usr/share/clamav/*.tmp
+
 		boot_mesg "Stopping Clamav Daemon..."
 		killproc /usr/sbin/clamd
 		;;


hooks/post-receive
--
IPFire 2.x development tree

--===============7278359486485873891==--