webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-03 18:41:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
Conflicts:
	doc/language_issues.nl
	doc/language_issues.tr
This commit is contained in:
Michael Tremer
2014-05-09 01:31:43 +02:00
parent c80303cd45 a257ce6b8d
commit 03d0b8c7e8
92 changed files with 7609 additions and 3886 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/common/armv5tel/initscripts
View File

@@ -115,6 +115,7 @@ etc/rc.d/init.d/squid
etc/rc.d/init.d/sshd
#etc/rc.d/init.d/sslh
etc/rc.d/init.d/static-routes
#etc/rc.d/init.d/stunnel
etc/rc.d/init.d/swap
etc/rc.d/init.d/sysctl
etc/rc.d/init.d/sysklogd

2
config/rootfiles/common/armv5tel/linux-kirkwood
View File

@@ -1394,6 +1394,8 @@ lib/modules/KVER-ipfire-kirkwood
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/libertas_tf
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/libertas_uap
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/libertas_uap/uap8xxx.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/mac80211_hwsim.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/mwifiex
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/mwifiex/mwifiex.ko

2
config/rootfiles/common/armv5tel/linux-multi
View File

@@ -1356,6 +1356,8 @@ lib/modules/KVER-ipfire-multi
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/libertas_tf
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/libertas_uap
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/libertas_uap/uap8xxx.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/mac80211_hwsim.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/mwifiex
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/mwifiex/mwifiex.ko

2
config/rootfiles/common/armv5tel/linux-rpi
View File

@@ -1125,6 +1125,8 @@ lib/modules/KVER-ipfire-rpi
#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/libertas_tf
#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/libertas_uap
#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/libertas_uap/uap8xxx.ko
#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/mwifiex
#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/mwifiex/mwifiex.ko
#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/mwifiex/mwifiex_sdio.ko

1
config/rootfiles/common/i586/initscripts
View File

@@ -117,6 +117,7 @@ etc/rc.d/init.d/squid
etc/rc.d/init.d/sshd
#etc/rc.d/init.d/sslh
etc/rc.d/init.d/static-routes
#etc/rc.d/init.d/stunnel
etc/rc.d/init.d/swap
etc/rc.d/init.d/sysctl
etc/rc.d/init.d/sysklogd

20
config/rootfiles/common/i586/linux
View File

@@ -1299,9 +1299,6 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/misc/ics932s401.ko
#lib/modules/KVER-ipfire/kernel/drivers/misc/lis3lv02d
#lib/modules/KVER-ipfire/kernel/drivers/misc/lis3lv02d/lis3lv02d.ko
#lib/modules/KVER-ipfire/kernel/drivers/misc/mei
#lib/modules/KVER-ipfire/kernel/drivers/misc/mei/mei-me.ko
#lib/modules/KVER-ipfire/kernel/drivers/misc/mei/mei.ko
#lib/modules/KVER-ipfire/kernel/drivers/misc/pch_phub.ko
#lib/modules/KVER-ipfire/kernel/drivers/misc/ti-st
#lib/modules/KVER-ipfire/kernel/drivers/misc/ti-st/st_drv.ko
@@ -1651,6 +1648,8 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_tf
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_uap
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_uap/uap8xxx.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/mac80211_hwsim.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/mwifiex
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/mwifiex/mwifiex.ko
@@ -2191,12 +2190,17 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/w1/slaves/w1_therm.ko
#lib/modules/KVER-ipfire/kernel/drivers/w1/wire.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/acquirewdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/advantechwdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/alim1535_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/alim7101_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/cpu5wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/eurotechwdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/f71808e_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/geodewdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/hpwdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/i6300esb.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/iTCO_vendor_support.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/iTCO_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/ib700wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/ibmasr.ko
@@ -2205,11 +2209,20 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/it87_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/machzwd.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/nv_tco.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/pc87413_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/pcwd_pci.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/pcwd_usb.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/retu_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sbc60xxwdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sbc7240_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sbc8360.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sbc_epx_c3.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sbc_fitpc2_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sc1200wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sc520_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sch311x_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/scx200_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/smsc37b787_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/softdog.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sp5100_tco.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/via_wdt.ko
@@ -2218,6 +2231,7 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/w83697ug_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/w83877f_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/w83977f_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/wafer5823wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/wdt_pci.ko
#lib/modules/KVER-ipfire/kernel/fs
#lib/modules/KVER-ipfire/kernel/fs/btrfs

1368
config/rootfiles/common/libsigc++
View File

File diff suppressed because it is too large Load Diff

48
config/rootfiles/common/libtorrent
View File

@@ -1,48 +0,0 @@
#usr/include/torrent
#usr/include/torrent/bitfield.h
#usr/include/torrent/chunk_manager.h
#usr/include/torrent/common.h
#usr/include/torrent/connection_manager.h
#usr/include/torrent/data
#usr/include/torrent/data/block.h
#usr/include/torrent/data/block_list.h
#usr/include/torrent/data/block_transfer.h
#usr/include/torrent/data/file.h
#usr/include/torrent/data/file_list.h
#usr/include/torrent/data/file_list_iterator.h
#usr/include/torrent/data/file_manager.h
#usr/include/torrent/data/file_utils.h
#usr/include/torrent/data/piece.h
#usr/include/torrent/data/transfer_list.h
#usr/include/torrent/download.h
#usr/include/torrent/error.h
#usr/include/torrent/event.h
#usr/include/torrent/exceptions.h
#usr/include/torrent/hash_string.h
#usr/include/torrent/http.h
#usr/include/torrent/object.h
#usr/include/torrent/object_stream.h
#usr/include/torrent/path.h
#usr/include/torrent/peer
#usr/include/torrent/peer/client_info.h
#usr/include/torrent/peer/client_list.h
#usr/include/torrent/peer/peer.h
#usr/include/torrent/peer/peer_info.h
#usr/include/torrent/peer/peer_list.h
#usr/include/torrent/poll.h
#usr/include/torrent/poll_epoll.h
#usr/include/torrent/poll_kqueue.h
#usr/include/torrent/poll_select.h
#usr/include/torrent/rate.h
#usr/include/torrent/resume.h
#usr/include/torrent/torrent.h
#usr/include/torrent/tracker.h
#usr/include/torrent/tracker_list.h
#usr/lib/libtorrent.la
#usr/lib/libtorrent.so
#usr/lib/libtorrent.so.11
#usr/lib/libtorrent.so.11.0.6
#usr/lib/pkgconfig/libtorrent.pc
#usr/include/torrent/dht_manager.h
#usr/include/torrent/peer/connection_list.h
#usr/include/torrent/throttle.h

5
config/rootfiles/common/strongswan
View File

@@ -58,6 +58,7 @@ etc/strongswan.d/charon/updown.conf
etc/strongswan.d/charon/x509.conf
etc/strongswan.d/charon/xauth-eap.conf
etc/strongswan.d/charon/xauth-generic.conf
etc/strongswan.d/charon/xauth-noauth.conf
etc/strongswan.d/charon/xcbc.conf
etc/strongswan.d/starter.conf
etc/strongswan.d/tools.conf
@@ -134,17 +135,18 @@ usr/lib/ipsec/plugins/libstrongswan-updown.so
usr/lib/ipsec/plugins/libstrongswan-x509.so
usr/lib/ipsec/plugins/libstrongswan-xauth-eap.so
usr/lib/ipsec/plugins/libstrongswan-xauth-generic.so
usr/lib/ipsec/plugins/libstrongswan-xauth-noauth.so
usr/lib/ipsec/plugins/libstrongswan-xcbc.so
#usr/libexec/ipsec
usr/libexec/ipsec/_copyright
usr/libexec/ipsec/_updown
usr/libexec/ipsec/_updown_espmark
usr/libexec/ipsec/charon
usr/libexec/ipsec/openac
usr/libexec/ipsec/scepclient
usr/libexec/ipsec/starter
usr/libexec/ipsec/stroke
usr/sbin/ipsec
#usr/share/man/man1/pki---acert.1
#usr/share/man/man1/pki---gen.1
#usr/share/man/man1/pki---issue.1
#usr/share/man/man1/pki---keyid.1
@@ -212,6 +214,7 @@ usr/sbin/ipsec
#usr/share/strongswan/templates/config/plugins/x509.conf
#usr/share/strongswan/templates/config/plugins/xauth-eap.conf
#usr/share/strongswan/templates/config/plugins/xauth-generic.conf
#usr/share/strongswan/templates/config/plugins/xauth-noauth.conf
#usr/share/strongswan/templates/config/plugins/xcbc.conf
#usr/share/strongswan/templates/config/strongswan.conf
#usr/share/strongswan/templates/config/strongswan.d

16
config/rootfiles/common/usb_modeswitch_data
View File

@@ -43,6 +43,7 @@ usr/share/usb_modeswitch/05c6:6503
usr/share/usb_modeswitch/05c6:9024
usr/share/usb_modeswitch/05c6:f000
usr/share/usb_modeswitch/05c7:1000
usr/share/usb_modeswitch/0685:2000
usr/share/usb_modeswitch/072f:100d
usr/share/usb_modeswitch/07d1:a800
usr/share/usb_modeswitch/07d1:a804
@@ -174,6 +175,8 @@ usr/share/usb_modeswitch/12d1:1553
usr/share/usb_modeswitch/12d1:1557
usr/share/usb_modeswitch/12d1:155b
usr/share/usb_modeswitch/12d1:156a
usr/share/usb_modeswitch/12d1:157c
usr/share/usb_modeswitch/12d1:157d
usr/share/usb_modeswitch/12d1:1805
usr/share/usb_modeswitch/12d1:1c0b
usr/share/usb_modeswitch/12d1:1c1b
@@ -188,6 +191,10 @@ usr/share/usb_modeswitch/12d1:1f16
usr/share/usb_modeswitch/12d1:1f17
usr/share/usb_modeswitch/12d1:1f18
usr/share/usb_modeswitch/12d1:1f19
usr/share/usb_modeswitch/12d1:1f1b
usr/share/usb_modeswitch/12d1:1f1c
usr/share/usb_modeswitch/12d1:1f1d
usr/share/usb_modeswitch/12d1:1f1e
usr/share/usb_modeswitch/12d1:380b
usr/share/usb_modeswitch/1307:1169
usr/share/usb_modeswitch/1410:5010
@@ -228,25 +235,34 @@ usr/share/usb_modeswitch/19d2:0166
usr/share/usb_modeswitch/19d2:0169
usr/share/usb_modeswitch/19d2:0266
usr/share/usb_modeswitch/19d2:0304
usr/share/usb_modeswitch/19d2:0318
usr/share/usb_modeswitch/19d2:0325
usr/share/usb_modeswitch/19d2:1001
usr/share/usb_modeswitch/19d2:1007
usr/share/usb_modeswitch/19d2:1009
usr/share/usb_modeswitch/19d2:1013
usr/share/usb_modeswitch/19d2:1017
usr/share/usb_modeswitch/19d2:1030
usr/share/usb_modeswitch/19d2:1171
usr/share/usb_modeswitch/19d2:1175
usr/share/usb_modeswitch/19d2:1179
usr/share/usb_modeswitch/19d2:1201
usr/share/usb_modeswitch/19d2:1207
usr/share/usb_modeswitch/19d2:1210
usr/share/usb_modeswitch/19d2:1216
usr/share/usb_modeswitch/19d2:1219
usr/share/usb_modeswitch/19d2:1224
usr/share/usb_modeswitch/19d2:1225
usr/share/usb_modeswitch/19d2:1227
usr/share/usb_modeswitch/19d2:1233
usr/share/usb_modeswitch/19d2:1238
usr/share/usb_modeswitch/19d2:1511
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:1536
usr/share/usb_modeswitch/19d2:1542
usr/share/usb_modeswitch/19d2:2000
usr/share/usb_modeswitch/19d2:2004