Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

This commit is contained in:
Michael Tremer
2008-11-30 00:47:49 +01:00
6 changed files with 33 additions and 23 deletions

View File

@@ -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

View File

@@ -62,7 +62,7 @@
* 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
* coreutils-5.96
@@ -196,7 +196,7 @@
* 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
* mpd-0.13.2

View File

@@ -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)

View File

@@ -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)

View File

@@ -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 "10" ]; do
[ -e "/usr/share/clamav/main.cvd" ] && \
[ -e "/usr/share/clamav/daily.cvd" ] && \
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)

View File

@@ -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/*.ini.tmp 2>/dev/null
HOME=/opt/mldonkey /opt/mldonkey/mlnet >/dev/null 2>&1 &
evaluate_retval
;;