Merge branch 'master' into next

Conflicts:
	config/rootfiles/core/40/filelists/files
	config/rootfiles/core/40/update.sh

diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index 4e057953e9e699f77c1c421ede3a5aef3d97ee70..10d15ac146aab61ba43023282371551b1815d059 100644 (file)
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -10,15 +10,15 @@ usr/bin/sigtool
 #usr/lib/libclamav.la
 usr/lib/libclamav.so
 usr/lib/libclamav.so.6
-usr/lib/libclamav.so.6.1.3
+usr/lib/libclamav.so.6.1.4
 #usr/lib/libclamunrar.la
 usr/lib/libclamunrar.so
 usr/lib/libclamunrar.so.6
-usr/lib/libclamunrar.so.6.1.3
+usr/lib/libclamunrar.so.6.1.4
 #usr/lib/libclamunrar_iface.la
 usr/lib/libclamunrar_iface.so
 usr/lib/libclamunrar_iface.so.6
-usr/lib/libclamunrar_iface.so.6.1.3
+usr/lib/libclamunrar_iface.so.6.1.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 e281e507889d8564f6ae8cb423f75765022f1c5e..e1ed31025cdfeef2442a7568ee407c56672aa7e5 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -64,7 +64,7 @@
 * ccache-3.0pre0
 * cdrtools-2.01.01
 * centerim-4.22.1
-* clamav-0.96.1
+* clamav-0.96.2
 * cmake-2.4.8
 * collectd-4.9.1
 * compat-wireless-2.6.35-1-kmod-2.6.32.19-ipfire

diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 1beb9e3363f8de45f8bdc7cd85956b539a6f2ed5..26e0eef5084c815cfe67eee1860bde0e493e89a1 100644 (file)
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -1117,10 +1117,10 @@ END
        print <<END
                    </select><td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>$Lang::tr{'source port'}:
-                   <td width='33%' align='left'><input type='text' name='QPORT' maxlength='5' value='$qossettings{'QPORT'}' />
+                   <td width='33%' align='left'><input type='text' name='QPORT' maxlength='11' value='$qossettings{'QPORT'}' />
                    <td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>$Lang::tr{'destination port'}:
-                   <td width='33%' align='left'><input type='text' name='DPORT' maxlength='5' value='$qossettings{'DPORT'}' />
+                   <td width='33%' align='left'><input type='text' name='DPORT' maxlength='11' value='$qossettings{'DPORT'}' />
                    <td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>$Lang::tr{'source ip'}:
                    <td width='33%' align='left'><input type='text' name='QIP' maxlength='15' value='$qossettings{'QIP'}' />

diff --git a/lfs/clamav b/lfs/clamav
index fdc44adf1e0fbfc8ace22be5eb5443765e6f3364..c680f96832b7d8b2faf73f16ff8d0599ddc9dc3a 100644 (file)
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.96.1
+VER        = 0.96.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    = 12
+PAK_VER    = 13
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 38e7870db6e9ad0e569518499a6f3651
+$(DL_FILE)_MD5 = a2c2555d86868f91a01d0e2c2403bbec
 
 install : $(TARGET)