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

diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index 6a0406bf5df9ac8c32482575633edfdd601a753d..d4ed7d0f8a593a368f3d61f4584350b08a06eab4 100644 (file)
--- 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 f9ca8acc0d455e9e723191c313d09bad728da053..25678aca7cd357d1917c35c557b4baa89673df05 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -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

diff --git a/lfs/clamav b/lfs/clamav
index ad0cb8c0403ba2c80d32c5e94a40d19425508ea6..d82acf388cc9b148fdbb3653c558f434a0375dc5 100644 (file)
--- 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)
 

diff --git a/lfs/mldonkey b/lfs/mldonkey
index 1d22f404abca648021db1965bac67026e75ca300..868a6aa617a48c71256569b45344efe48b7c30bb 100644 (file)
--- 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/clamav b/src/initscripts/init.d/clamav
index 1eb499ae2f25a1a613b72df38302337998cf8e4d..5b31e02890b2bd6c5f98532ee8f981d45f4d10d3 100644 (file)
--- 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 "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)

diff --git a/src/initscripts/init.d/mldonkey b/src/initscripts/init.d/mldonkey
index ef0918ac4763c0c7fcecca4b0b33116b0615a310..52a0a8bca5f2332d8ac4a56dac8c220245634255 100644 (file)
--- 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/*.ini.tmp 2>/dev/null
                HOME=/opt/mldonkey /opt/mldonkey/mlnet >/dev/null 2>&1 &
                evaluate_retval
                ;;