From: Jan Paul Tuecking Date: Fri, 20 Aug 2010 12:29:07 +0000 (+0200) Subject: Merge branch 'master' of ssh://earl@git.ipfire.org/pub/git/ipfire-2.x X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=821b6a65649391e6b36b729e24e1c183c8693dc9;hp=d97b2de4a135b323612a0d7c24760ce9f9ff5040 Merge branch 'master' of ssh://earl@git.ipfire.org/pub/git/ipfire-2.x --- diff --git a/config/rootfiles/core/40/filelists/files b/config/rootfiles/core/40/filelists/files index 79518f2dc..883eb86e2 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 @@ -18,3 +19,4 @@ lib/modules/2.6.32.15-ipfire/kernel/drivers/usb/serial/option.ko lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/usb/serial/option.ko lib/modules/2.6.32.15-ipfire/kernel/drivers/usb/serial/usbserial.ko lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/usb/serial/usbserial.ko +usr/sbin/openvpn diff --git a/config/rootfiles/core/40/update.sh b/config/rootfiles/core/40/update.sh index 11e039594..887820032 100644 --- a/config/rootfiles/core/40/update.sh +++ b/config/rootfiles/core/40/update.sh @@ -26,7 +26,7 @@ # #Stop services - +/usr/local/bin/openvpnctrl -k # #Extract files extract_files @@ -36,12 +36,18 @@ rm -rf /usr/lib/python2.4 # #Start services +/usr/local/bin/openvpnctrl -s # #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 4e057953e..10d15ac14 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 f72d1f765..b6f9f881d 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 @@ -264,7 +264,7 @@ * openmailadmin-1.0.0 * openssh-5.4p1 * openssl-0.9.8o -* openvpn-2.1.1 +* openvpn-2.1.2 * p7zip_4.65 * pam_mysql-0.7RC1 * patch-2.5.4 @@ -316,7 +316,7 @@ * squashfs-lzma-cvs20100214 * squid-2.7.STABLE9 * squidGuard-1.4.1 -* squidclamav-5.3 +* squidclamav-5.4 * sshfs-fuse-2.2 * sslh-1.7a * streamripper-1.63.5 diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 1beb9e336..26e0eef50 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -1117,10 +1117,10 @@ END print <  $Lang::tr{'source port'}: - +   $Lang::tr{'destination port'}: - +   $Lang::tr{'source ip'}: diff --git a/lfs/clamav b/lfs/clamav index fdc44adf1..c680f9683 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) diff --git a/lfs/openvpn b/lfs/openvpn index b7d651f3a..8c8ad7111 100644 --- a/lfs/openvpn +++ b/lfs/openvpn @@ -24,7 +24,7 @@ include Config -VER = 2.1.1 +VER = 2.1.2 THISAPP = openvpn-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b273ed2b5ec8616fb9834cde8634bce7 +$(DL_FILE)_MD5 = 543a30dafcdefe1d67c0e47b80741755 install : $(TARGET) diff --git a/lfs/squidclamav b/lfs/squidclamav index e718f5d04..662594af0 100644 --- a/lfs/squidclamav +++ b/lfs/squidclamav @@ -24,7 +24,7 @@ include Config -VER = 5.3 +VER = 5.4 THISAPP = squidclamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = squidclamav -PAK_VER = 12 +PAK_VER = 13 DEPS = "clamav" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 39f4b98294782039840b2052eab543e2 +$(DL_FILE)_MD5 = e2adab89b1d46ace78b4ec5200dd1285 install : $(TARGET)