webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-26 10:52:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://earl@git.ipfire.org/pub/git/ipfire-2.x

Browse Source
This commit is contained in:
Jan Paul Tuecking
2010-08-20 14:29:07 +02:00
parent d97b2de4a1 1f10d162dc
commit 821b6a6564
8 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/core/40/filelists/files
View File

@@ -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

10
config/rootfiles/core/40/update.sh
View File

@@ -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

6
config/rootfiles/packages/clamav
View File

@@ -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

6
doc/packages-list.txt
View File

@@ -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

4
html/cgi-bin/qos.cgi
View File

@@ -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'}' />

6
lfs/clamav
View File

@@ -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)

4
lfs/openvpn
View File

@@ -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)

6
lfs/squidclamav
View File

@@ -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)