From 3b5afaed9b3f3396bef2ca3449d158671dc5f7e2 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 28 Nov 2008 21:16:51 +0100 Subject: [PATCH 1/5] Updated clamav to 0.94.2 --- config/rootfiles/packages/clamav | 6 +++--- doc/packages-list.txt | 1 + lfs/clamav | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index 6a0406bf5..d4ed7d0f8 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -9,17 +9,17 @@ usr/bin/sigtool #usr/lib/libclamav.la usr/lib/libclamav.so usr/lib/libclamav.so.5 -usr/lib/libclamav.so.5.0.3 +usr/lib/libclamav.so.5.0.4 #usr/lib/libclamunrar.a #usr/lib/libclamunrar.la usr/lib/libclamunrar.so usr/lib/libclamunrar.so.5 -usr/lib/libclamunrar.so.5.0.3 +usr/lib/libclamunrar.so.5.0.4 #usr/lib/libclamunrar_iface.a #usr/lib/libclamunrar_iface.la usr/lib/libclamunrar_iface.so usr/lib/libclamunrar_iface.so.5 -usr/lib/libclamunrar_iface.so.5.0.3 +usr/lib/libclamunrar_iface.so.5.0.4 #usr/lib/pkgconfig/libclamav.pc usr/sbin/clamd usr/share/clamav diff --git a/doc/packages-list.txt b/doc/packages-list.txt index f9ca8acc0..9b4092676 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -63,6 +63,7 @@ * cdrtools-2.01 * centerim-4.22.1 * clamav-0.94.1 +* clamav-0.94.2 * cmake-2.4.8 * collectd-4.5.1 * coreutils-5.96 diff --git a/lfs/clamav b/lfs/clamav index ad0cb8c04..d82acf388 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@ include Config -VER = 0.94.1 +VER = 0.94.2 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 7 +PAK_VER = 8 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = dbe6820ff98f5a6f67a03e3ad63fa90b +$(DL_FILE)_MD5 = 1181e6d62341b84708f126cc353f7ebf install : $(TARGET) From 0cd466ee4e3c8b0fdd33a101764d560a66ce0dec Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 29 Nov 2008 12:01:48 +0100 Subject: [PATCH 2/5] Fix clamav initskript & incrase time for pattern download --- doc/packages-list.txt | 1 - src/initscripts/init.d/clamav | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 9b4092676..e4cb4ed8c 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -62,7 +62,6 @@ * ccache-2.4 * cdrtools-2.01 * centerim-4.22.1 -* clamav-0.94.1 * clamav-0.94.2 * cmake-2.4.8 * collectd-4.5.1 diff --git a/src/initscripts/init.d/clamav b/src/initscripts/init.d/clamav index 1eb499ae2..0d223b103 100644 --- a/src/initscripts/init.d/clamav +++ b/src/initscripts/init.d/clamav @@ -11,9 +11,9 @@ case "$1" in boot_mesg "Starting Clamav Daemon..." COUNTER=0 - while [ "$COUNTER" -lt "10" ]; do + while [ "$COUNTER" -lt "30" ]; do [ -e "/usr/share/clamav/main.cvd" ] && \ - [ -e "/usr/share/clamav/daily.cvd" ] && \ + [ -e "/usr/share/clamav/daily.cld" ] && \ break sleep 5 COUNTER=$(($COUNTER + 1)) From cb101bcfe05f0d1699c9265b44a4c0014a4f4297 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 29 Nov 2008 13:55:40 +0100 Subject: [PATCH 3/5] Updated mldonkey to 2.6.9 and fixed some possible errors in initscript. --- lfs/mldonkey | 6 +++--- src/initscripts/init.d/mldonkey | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lfs/mldonkey b/lfs/mldonkey index 1d22f404a..868a6aa61 100644 --- a/lfs/mldonkey +++ b/lfs/mldonkey @@ -24,7 +24,7 @@ include Config -VER = 2.9.2 +VER = 2.9.6 THISAPP = mldonkey-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mldonkey -PAK_VER = 1 +PAK_VER = 2 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 457564a0baedabe262254de660420c1c +$(DL_FILE)_MD5 = 5da87678449bf87ce0c78f37e7871eb9 install : $(TARGET) diff --git a/src/initscripts/init.d/mldonkey b/src/initscripts/init.d/mldonkey index ef0918ac4..aee02a083 100644 --- a/src/initscripts/init.d/mldonkey +++ b/src/initscripts/init.d/mldonkey @@ -18,6 +18,8 @@ case "${1}" in start) boot_mesg "Starting mldonkey..." + chown mldonkey.mldonkey /opt/mldonkey -R &>/dev/null + rm -f /opt/mldonkey/.mldonkey/*tmp* 2>/dev/null HOME=/opt/mldonkey /opt/mldonkey/mlnet >/dev/null 2>&1 & evaluate_retval ;; From 2c4909ab099176b419f66a80ae47ddcb0a032d51 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 29 Nov 2008 15:15:21 +0100 Subject: [PATCH 4/5] Small fixes on mldonkey and clamav initskript --- doc/packages-list.txt | 1 + src/initscripts/init.d/clamav | 2 +- src/initscripts/init.d/mldonkey | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/packages-list.txt b/doc/packages-list.txt index e4cb4ed8c..59d6d4f80 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -197,6 +197,7 @@ * mkinitcpio-0.5.9 * mktemp-1.5 * mldonkey-2.9.2 +* mldonkey-2.9.6 * module-init-tools-3.5 * mpc-0.12.1 * mpd-0.13.2 diff --git a/src/initscripts/init.d/clamav b/src/initscripts/init.d/clamav index 0d223b103..7484938bf 100644 --- a/src/initscripts/init.d/clamav +++ b/src/initscripts/init.d/clamav @@ -13,7 +13,7 @@ case "$1" in COUNTER=0 while [ "$COUNTER" -lt "30" ]; do [ -e "/usr/share/clamav/main.cvd" ] && \ - [ -e "/usr/share/clamav/daily.cld" ] && \ + [ -e "/usr/share/clamav/daily.c*d" ] && \ break sleep 5 COUNTER=$(($COUNTER + 1)) diff --git a/src/initscripts/init.d/mldonkey b/src/initscripts/init.d/mldonkey index aee02a083..52a0a8bca 100644 --- a/src/initscripts/init.d/mldonkey +++ b/src/initscripts/init.d/mldonkey @@ -19,7 +19,7 @@ case "${1}" in start) boot_mesg "Starting mldonkey..." chown mldonkey.mldonkey /opt/mldonkey -R &>/dev/null - rm -f /opt/mldonkey/.mldonkey/*tmp* 2>/dev/null + rm -f /opt/mldonkey/.mldonkey/*.ini.tmp 2>/dev/null HOME=/opt/mldonkey /opt/mldonkey/mlnet >/dev/null 2>&1 & evaluate_retval ;; From bfa65be8c7fb9ee0ff8fba27bf50cdafd7daa32e Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 29 Nov 2008 18:44:40 +0100 Subject: [PATCH 5/5] clamav initskript boot's clamav in background now --- doc/packages-list.txt | 1 - src/initscripts/init.d/clamav | 32 ++++++++++++++++++++------------ 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 59d6d4f80..25678aca7 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -196,7 +196,6 @@ * misc-progs * mkinitcpio-0.5.9 * mktemp-1.5 -* mldonkey-2.9.2 * mldonkey-2.9.6 * module-init-tools-3.5 * mpc-0.12.1 diff --git a/src/initscripts/init.d/clamav b/src/initscripts/init.d/clamav index 7484938bf..5b31e0289 100644 --- a/src/initscripts/init.d/clamav +++ b/src/initscripts/init.d/clamav @@ -6,19 +6,27 @@ case "$1" in start) - boot_mesg "Starting Clamav Definition Updater..." - loadproc /usr/bin/freshclam -d -c 10 + 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 - [ -e "/usr/share/clamav/main.cvd" ] && \ - [ -e "/usr/share/clamav/daily.c*d" ] && \ - break - sleep 5 - COUNTER=$(($COUNTER + 1)) - done - loadproc /usr/sbin/clamd + boot_mesg "Starting Clamav Daemon..." + COUNTER=0 + while [ "$COUNTER" -lt "30" ]; do + [ -e "/usr/share/clamav/main.cvd" ] && \ + [ -e "/usr/share/clamav/daily.cvd" ] || \ + [ -e "/usr/share/clamav/daily.cld" ] && \ + break + sleep 5 + COUNTER=$(($COUNTER + 1)) + done + loadproc /usr/sbin/clamd + else + boot_mesg "Starting Clamav in background..." + /etc/init.d/clamav start > /dev/tty12 < /dev/tty12 & + echo_ok; + exit 0; + fi ;; stop)