This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via 8190e95105d0398862f0be73b6b4e4fbd8b27214 (commit) via ee788c9e4607e6dca23baee4292d1be0dff27dfb (commit) via ec3573fc83603317b0e9dd195426d8947a1c25f2 (commit) from 40228ef46f523a151affc034e0510aa9075e2f3f (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 8190e95105d0398862f0be73b6b4e4fbd8b27214 Author: Christian Schmidt christian.schmidt@ipfire.org Date: Wed Aug 18 11:26:51 2010 +0200

Added latest changes to core40.

commit ee788c9e4607e6dca23baee4292d1be0dff27dfb Author: Christian Schmidt christian.schmidt@ipfire.org Date: Wed Aug 18 11:26:27 2010 +0200

Upgraded clamav to latest stable.

commit ec3573fc83603317b0e9dd195426d8947a1c25f2 Author: Christian Schmidt christian.schmidt@ipfire.org Date: Wed Aug 18 11:25:38 2010 +0200

Change QoS Port Field to enter Port Ranges.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/core/40/filelists/files | 1 + config/rootfiles/core/40/update.sh | 7 ++++++- config/rootfiles/packages/clamav | 6 +++--- doc/packages-list.txt | 2 +- html/cgi-bin/qos.cgi | 4 ++-- lfs/clamav | 6 +++--- 6 files changed, 16 insertions(+), 10 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/40/filelists/files b/config/rootfiles/core/40/filelists/files index 79518f2..188e539 100644 --- a/config/rootfiles/core/40/filelists/files +++ b/config/rootfiles/core/40/filelists/files @@ -8,6 +8,7 @@ etc/rc.d/init.d/dnsmasq etc/rc.d/init.d/functions srv/web/ipfire/cgi-bin/dhcp.cgi srv/web/ipfire/cgi-bin/time.cgi +srv/web/ipfire/cgi-bin/qos.cgi usr/lib/python2.7/ipaddr.pyc usr/lib/python2.7/site-packages/drv_libxml2.py usr/lib/python2.7/site-packages/libxml2.py diff --git a/config/rootfiles/core/40/update.sh b/config/rootfiles/core/40/update.sh index 11e0395..16a7dec 100644 --- a/config/rootfiles/core/40/update.sh +++ b/config/rootfiles/core/40/update.sh @@ -41,7 +41,12 @@ rm -rf /usr/lib/python2.4 #Update Language cache perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"

-# +# Change var lock size to 8MB +grep -v "/var/lock" /etc/fstab > /tmp/fstab.tmp +mv /tmp/fstab.tmp /etc/fstab +echo non /var/lock tmpfs defaults,size=8M 0 0 >> /etc/fstab + + #Rebuild module dep's depmod 2.6.32.15-ipfire depmod 2.6.32.15-ipfire-xen diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index 4e05795..10d15ac 100644 --- 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 7cec76a..ef64f05 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -65,7 +65,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.15-ipfire diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 1beb9e3..26e0eef 100644 --- 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 fdc44ad..c680f96 100644 --- 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)

hooks/post-receive -- IPFire 2.x development tree