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

config/rootfiles/packages/clamav

@@ -8,14 +8,18 @@ usr/bin/sigtool
 #usr/lib/libclamav.a
 #usr/lib/libclamav.la
 usr/lib/libclamav.so
-usr/lib/libclamav.so.4
-usr/lib/libclamav.so.4.0.4
+usr/lib/libclamav.so.5
+usr/lib/libclamav.so.5.0.1
+#usr/lib/libclamunrar.a
+#usr/lib/libclamunrar.la
 usr/lib/libclamunrar.so
-usr/lib/libclamunrar.so.4
-usr/lib/libclamunrar.so.4.0.4
+usr/lib/libclamunrar.so.5
+usr/lib/libclamunrar.so.5.0.1
+#usr/lib/libclamunrar_iface.a
+#usr/lib/libclamunrar_iface.la
 usr/lib/libclamunrar_iface.so
-usr/lib/libclamunrar_iface.so.4
-usr/lib/libclamunrar_iface.so.4.0.4
+usr/lib/libclamunrar_iface.so.5
+usr/lib/libclamunrar_iface.so.5.0.1
 #usr/lib/pkgconfig/libclamav.pc
 usr/sbin/clamd
 usr/share/clamav

doc/packages-list.txt

@@ -61,7 +61,7 @@
 * ccache-2.4
 * cdrtools-2.01
 * centerim-4.22.1
-* clamav-0.93.3
+* clamav-0.94
 * cmake-2.4.8
 * collectd-4.4.2
 * coreutils-5.96

lfs/clamav

@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.93.3
+VER        = 0.94
 
 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    = 5
+PAK_VER    = 6
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 06d87fbece062e5c0661ee07703208c9
+$(DL_FILE)_MD5 = d3f6d5fff2db81950491749166ab0ffa
 
 install : $(TARGET)
 

lfs/videolan

@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = videolan
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = "libshout libmpeg2 libmad libdvbpsi directfb ffmpeg"