webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 03:07:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next

Browse Source
This commit is contained in:
Michael Tremer
2013-07-16 12:04:00 +02:00
parent 82efdd4f22 15f78770b1
commit f4dd02f2b6
49 changed files with 2173 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/common/misc-progs
View File

@@ -3,6 +3,7 @@ usr/local/bin/addonctrl
usr/local/bin/backupctrl
#usr/local/bin/clamavctrl
usr/local/bin/dhcpctrl
usr/local/bin/dnsmasqctrl
usr/local/bin/extrahdctrl
usr/local/bin/fireinfoctrl
usr/local/bin/getconntracktable

2
config/rootfiles/common/snort
View File

@@ -3,6 +3,7 @@ etc/snort/rules
#etc/snort/rules/classification.config
#etc/snort/rules/reference.config
etc/snort/snort.conf
etc/snort/snort.conf.template
etc/snort/unicode.map
usr/bin/u2boat
usr/bin/u2spewfoo
@@ -179,7 +180,6 @@ usr/sbin/snort
#usr/share/doc/snort/README.dnp3
#usr/share/doc/snort/README.dns
#usr/share/doc/snort/README.event_queue
#usr/share/doc/snort/README.file
#usr/share/doc/snort/README.filters
#usr/share/doc/snort/README.flowbits
#usr/share/doc/snort/README.frag3

46
config/rootfiles/common/usb_modeswitch_data
View File

@@ -5,20 +5,24 @@ usr/share/usb_modeswitch/03f0:002a
usr/share/usb_modeswitch/0408:f000
usr/share/usb_modeswitch/0421:060c
usr/share/usb_modeswitch/0421:0610
usr/share/usb_modeswitch/0421:0618
usr/share/usb_modeswitch/0421:061d
usr/share/usb_modeswitch/0421:0622
usr/share/usb_modeswitch/0421:0627
usr/share/usb_modeswitch/0421:062c
usr/share/usb_modeswitch/0421:0632
usr/share/usb_modeswitch/0421:0637
usr/share/usb_modeswitch/0471:1210:uMa=Philips
usr/share/usb_modeswitch/0471:1210:uMa=Wisue
usr/share/usb_modeswitch/0471:1237
usr/share/usb_modeswitch/0482:024d
usr/share/usb_modeswitch/04bb:bccd
usr/share/usb_modeswitch/04cc:225c
usr/share/usb_modeswitch/04e8:680c
usr/share/usb_modeswitch/04e8:689a
usr/share/usb_modeswitch/04e8:f000:sMo=U209
usr/share/usb_modeswitch/057c:84ff
usr/share/usb_modeswitch/05c6:0010
usr/share/usb_modeswitch/05c6:1000:sVe=GT
usr/share/usb_modeswitch/05c6:1000:sVe=Option
usr/share/usb_modeswitch/05c6:1000:uMa=AnyDATA
@@ -27,6 +31,7 @@ usr/share/usb_modeswitch/05c6:1000:uMa=DGT
usr/share/usb_modeswitch/05c6:1000:uMa=Option
usr/share/usb_modeswitch/05c6:1000:uMa=SAMSUNG
usr/share/usb_modeswitch/05c6:1000:uMa=SSE
usr/share/usb_modeswitch/05c6:1000:uMa=StrongRising
usr/share/usb_modeswitch/05c6:1000:uMa=Vertex
usr/share/usb_modeswitch/05c6:2000
usr/share/usb_modeswitch/05c6:2001
@@ -83,6 +88,7 @@ usr/share/usb_modeswitch/0af0:8700
usr/share/usb_modeswitch/0af0:8800
usr/share/usb_modeswitch/0af0:8900
usr/share/usb_modeswitch/0af0:9000
usr/share/usb_modeswitch/0af0:9200
usr/share/usb_modeswitch/0af0:c031
usr/share/usb_modeswitch/0af0:c100
usr/share/usb_modeswitch/0af0:d001
@@ -104,7 +110,7 @@ usr/share/usb_modeswitch/0cf3:20ff
usr/share/usb_modeswitch/0d46:45a1
usr/share/usb_modeswitch/0d46:45a5
usr/share/usb_modeswitch/0df7:0800
usr/share/usb_modeswitch/0e8d:0002
usr/share/usb_modeswitch/0e8d:0002:uPr=MT
usr/share/usb_modeswitch/0e8d:7109
usr/share/usb_modeswitch/0fce:d0cf
usr/share/usb_modeswitch/0fce:d0e1
@@ -115,14 +121,19 @@ usr/share/usb_modeswitch/1004:607f
usr/share/usb_modeswitch/1004:613a
usr/share/usb_modeswitch/1004:613f
usr/share/usb_modeswitch/1004:614e
usr/share/usb_modeswitch/1004:6156
usr/share/usb_modeswitch/1004:6190
usr/share/usb_modeswitch/1004:61aa
usr/share/usb_modeswitch/1004:61dd
usr/share/usb_modeswitch/1004:61e7
usr/share/usb_modeswitch/1004:61eb
usr/share/usb_modeswitch/1004:6327
usr/share/usb_modeswitch/1033:0035
usr/share/usb_modeswitch/106c:3b03
usr/share/usb_modeswitch/106c:3b05
usr/share/usb_modeswitch/106c:3b06
usr/share/usb_modeswitch/106c:3b11
usr/share/usb_modeswitch/106c:3b14
usr/share/usb_modeswitch/1076:7f40
usr/share/usb_modeswitch/109b:f009
usr/share/usb_modeswitch/1199:0fff
@@ -139,6 +150,7 @@ usr/share/usb_modeswitch/12d1:1449
usr/share/usb_modeswitch/12d1:14ad
usr/share/usb_modeswitch/12d1:14b5
usr/share/usb_modeswitch/12d1:14b7
usr/share/usb_modeswitch/12d1:14ba
usr/share/usb_modeswitch/12d1:14c1
usr/share/usb_modeswitch/12d1:14c3
usr/share/usb_modeswitch/12d1:14c4
@@ -146,24 +158,33 @@ usr/share/usb_modeswitch/12d1:14c5
usr/share/usb_modeswitch/12d1:14d1
usr/share/usb_modeswitch/12d1:14fe
usr/share/usb_modeswitch/12d1:1505
usr/share/usb_modeswitch/12d1:151a
usr/share/usb_modeswitch/12d1:1520
usr/share/usb_modeswitch/12d1:1521
usr/share/usb_modeswitch/12d1:1523
usr/share/usb_modeswitch/12d1:1526
usr/share/usb_modeswitch/12d1:1553
usr/share/usb_modeswitch/12d1:1557
usr/share/usb_modeswitch/12d1:155b
usr/share/usb_modeswitch/12d1:1805
usr/share/usb_modeswitch/12d1:1c0b
usr/share/usb_modeswitch/12d1:1c1b
usr/share/usb_modeswitch/12d1:1c24
usr/share/usb_modeswitch/12d1:1d50
usr/share/usb_modeswitch/12d1:1da1
usr/share/usb_modeswitch/12d1:1f01
usr/share/usb_modeswitch/12d1:1f03
usr/share/usb_modeswitch/12d1:1f11
usr/share/usb_modeswitch/12d1:380b
usr/share/usb_modeswitch/1307:1169
usr/share/usb_modeswitch/1410:5010
usr/share/usb_modeswitch/1410:5020
usr/share/usb_modeswitch/1410:5023
usr/share/usb_modeswitch/1410:5030
usr/share/usb_modeswitch/1410:5031
usr/share/usb_modeswitch/1410:5041
usr/share/usb_modeswitch/1410:5059
usr/share/usb_modeswitch/1410:7001
usr/share/usb_modeswitch/148e:a000
usr/share/usb_modeswitch/148f:2578
usr/share/usb_modeswitch/15eb:7153
@@ -173,6 +194,7 @@ usr/share/usb_modeswitch/16d8:6804
usr/share/usb_modeswitch/16d8:700a
usr/share/usb_modeswitch/16d8:700b
usr/share/usb_modeswitch/16d8:f000
usr/share/usb_modeswitch/1726:f00e
usr/share/usb_modeswitch/198a:0003
usr/share/usb_modeswitch/198f:bccd
usr/share/usb_modeswitch/19d2:0003
@@ -181,16 +203,20 @@ usr/share/usb_modeswitch/19d2:0026
usr/share/usb_modeswitch/19d2:0031
usr/share/usb_modeswitch/19d2:0040
usr/share/usb_modeswitch/19d2:0053
usr/share/usb_modeswitch/19d2:0083
usr/share/usb_modeswitch/19d2:0083:uPr=WCDMA
usr/share/usb_modeswitch/19d2:0101
usr/share/usb_modeswitch/19d2:0103
usr/share/usb_modeswitch/19d2:0110
usr/share/usb_modeswitch/19d2:0115
usr/share/usb_modeswitch/19d2:0120
usr/share/usb_modeswitch/19d2:0146
usr/share/usb_modeswitch/19d2:0149
usr/share/usb_modeswitch/19d2:0150
usr/share/usb_modeswitch/19d2:0154
usr/share/usb_modeswitch/19d2:0166
usr/share/usb_modeswitch/19d2:0169
usr/share/usb_modeswitch/19d2:0266
usr/share/usb_modeswitch/19d2:0325
usr/share/usb_modeswitch/19d2:1001
usr/share/usb_modeswitch/19d2:1007
@@ -203,9 +229,13 @@ usr/share/usb_modeswitch/19d2:1179
usr/share/usb_modeswitch/19d2:1201
usr/share/usb_modeswitch/19d2:1216
usr/share/usb_modeswitch/19d2:1224
usr/share/usb_modeswitch/19d2:1227
usr/share/usb_modeswitch/19d2:1514
usr/share/usb_modeswitch/19d2:1517
usr/share/usb_modeswitch/19d2:1520
usr/share/usb_modeswitch/19d2:1523
usr/share/usb_modeswitch/19d2:1528
usr/share/usb_modeswitch/19d2:1542
usr/share/usb_modeswitch/19d2:2000
usr/share/usb_modeswitch/19d2:bccd
usr/share/usb_modeswitch/19d2:ffde
@@ -216,6 +246,7 @@ usr/share/usb_modeswitch/1a8d:1000
usr/share/usb_modeswitch/1a8d:2000
usr/share/usb_modeswitch/1ab7:5700
usr/share/usb_modeswitch/1b7d:0700
usr/share/usb_modeswitch/1bbb:000f
usr/share/usb_modeswitch/1bbb:00ca
usr/share/usb_modeswitch/1bbb:f000
usr/share/usb_modeswitch/1bbb:f017
@@ -226,6 +257,7 @@ usr/share/usb_modeswitch/1c9e:9200
usr/share/usb_modeswitch/1c9e:9800
usr/share/usb_modeswitch/1c9e:98ff
usr/share/usb_modeswitch/1c9e:9e00
usr/share/usb_modeswitch/1c9e:9e08
usr/share/usb_modeswitch/1c9e:f000
usr/share/usb_modeswitch/1da5:f000
usr/share/usb_modeswitch/1dd6:1000
@@ -237,16 +269,28 @@ usr/share/usb_modeswitch/1ee8:0009
usr/share/usb_modeswitch/1ee8:0013
usr/share/usb_modeswitch/1ee8:0040
usr/share/usb_modeswitch/1ee8:004a
usr/share/usb_modeswitch/1ee8:0054
usr/share/usb_modeswitch/1ee8:0060
usr/share/usb_modeswitch/1ee8:0063
usr/share/usb_modeswitch/1ee8:0068
usr/share/usb_modeswitch/1f28:0021
usr/share/usb_modeswitch/1fac:0032
usr/share/usb_modeswitch/1fac:0130
usr/share/usb_modeswitch/1fac:0150
usr/share/usb_modeswitch/1fac:0151
usr/share/usb_modeswitch/2001:a706
usr/share/usb_modeswitch/2001:a707
usr/share/usb_modeswitch/2001:a708
usr/share/usb_modeswitch/2001:a805
usr/share/usb_modeswitch/2001:a80b
usr/share/usb_modeswitch/201e:1023
usr/share/usb_modeswitch/201e:2009
usr/share/usb_modeswitch/2020:0002
usr/share/usb_modeswitch/2020:f00e
usr/share/usb_modeswitch/2077:1000
usr/share/usb_modeswitch/2077:f000
usr/share/usb_modeswitch/21f5:1000
usr/share/usb_modeswitch/22de:6801
usr/share/usb_modeswitch/22de:6803
usr/share/usb_modeswitch/22f4:0021
usr/share/usb_modeswitch/230d:0001

1
config/rootfiles/core/71/filelists/GeoIP Normal file
View File

@@ -0,0 +1 @@
usr/local/share/GeoIP/GeoIP.dat

6
config/rootfiles/core/71/filelists/files
View File

@@ -3,6 +3,7 @@ etc/issue
var/ipfire/general-functions.pl
var/ipfire/header.pl
var/ipfire/menu.d/10-system.menu
var/ipfire/menu.d/30-network.menu
etc/rc.d/init.d/dnsmasq
etc/rc.d/init.d/wlanclient
etc/rc.d/init.d/networking/functions.network
@@ -11,8 +12,13 @@ etc/rc.d/init.d/networking/red
etc/rc.d/rc0.d/K82wlanclient
etc/rc.d/rc3.d/S19wlanclient
etc/rc.d/rc6.d/K82wlanclient
usr/local/bin/dnsmasqctrl
usr/local/bin/wirelessclient
srv/web/ipfire/cgi-bin/dnsforward.cgi
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/pppsetup.cgi
srv/web/ipfire/cgi-bin/wirelessclient.cgi
var/ipfire/general-functions.pl
var/ipfire/langs
var/ipfire/backup/include

2
config/rootfiles/core/71/filelists/hwdata Normal file
View File

@@ -0,0 +1,2 @@
usr/share/hwdata/pci.ids
usr/share/hwdata/usb.ids

1
config/rootfiles/core/71/filelists/oinkmaster Symbolic link
View File

@@ -0,0 +1 @@
../../../common/oinkmaster

1
config/rootfiles/core/71/filelists/snort Symbolic link
View File

@@ -0,0 +1 @@
../../../common/snort

1
config/rootfiles/core/71/filelists/squid Symbolic link
View File

@@ -0,0 +1 @@
../../../common/squid

1
config/rootfiles/core/71/filelists/usb_modeswitch Symbolic link
View File

@@ -0,0 +1 @@
../../../common/usb_modeswitch

1
config/rootfiles/core/71/filelists/usb_modeswitch_data Symbolic link
View File

@@ -0,0 +1 @@
../../../common/usb_modeswitch_data

14
config/rootfiles/core/71/update.sh
View File

@@ -32,8 +32,17 @@ do
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
done
#
# Backup snort.conf
cp -f /etc/snort/snort.conf /etc/snort/snort.conf.backup
#
#Stop services
/etc/init.d/snort stop
#
#Remove old usb-modeswitch file
rm /usr/share/usb_modeswitch/0e8d:0002
#
#Extract files
@@ -44,8 +53,13 @@ extract_files
touch /var/ipfire/ethernet/wireless
chown nobody:nobody /var/ipfire/ethernet/wireless
#
# Import active rules to new snort.conf
grep "^include $RULE_PATH" /etc/snort/snort.conf.backup >> /etc/snort/snort.conf
#
#Start services
/etc/init.d/snort start
#
#Update Language cache