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

This commit is contained in:
Michael Tremer
2013-07-14 12:48:29 +02:00
51 changed files with 2906 additions and 128 deletions

View File

@@ -1431,6 +1431,7 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi
srv/web/ipfire/cgi-bin/wakeonlan.cgi
srv/web/ipfire/cgi-bin/webaccess.cgi
srv/web/ipfire/cgi-bin/wireless.cgi
srv/web/ipfire/cgi-bin/wirelessclient.cgi
srv/web/ipfire/cgi-bin/xtaccess.cgi
srv/web/ipfire/html
var/updatecache

View File

@@ -64,6 +64,7 @@ etc/rc.d/init.d/network-vlans
etc/rc.d/init.d/networking/any
etc/rc.d/init.d/networking/blue
etc/rc.d/init.d/networking/dhcpcd.exe
etc/rc.d/init.d/networking/functions.network
etc/rc.d/init.d/networking/green
etc/rc.d/init.d/networking/orange
etc/rc.d/init.d/networking/red
@@ -94,6 +95,7 @@ etc/rc.d/init.d/networking/red.up/98-leds
etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
etc/rc.d/init.d/networking/red.up/99-fireinfo
etc/rc.d/init.d/networking/red.up/99-pakfire-update
etc/rc.d/init.d/networking/wpa_supplicant.exe
#etc/rc.d/init.d/nfs-server
etc/rc.d/init.d/ntp
#etc/rc.d/init.d/nut
@@ -132,6 +134,7 @@ etc/rc.d/init.d/upnpd
#etc/rc.d/init.d/vsftpd
#etc/rc.d/init.d/watchdog
#etc/rc.d/init.d/winbind
etc/rc.d/init.d/wlanclient
#etc/rc.d/init.d/xinetd
#etc/rc.d/rc0.d
#etc/rc.d/rc0.d/K01imspetor
@@ -149,6 +152,7 @@ etc/rc.d/rc0.d/K49cyrus-sasl
etc/rc.d/rc0.d/K78snort
etc/rc.d/rc0.d/K79leds
etc/rc.d/rc0.d/K80network
etc/rc.d/rc0.d/K82wlanclient
#etc/rc.d/rc0.d/K84bluetooth
#etc/rc.d/rc0.d/K85messagebus
etc/rc.d/rc0.d/K85tmpfs
@@ -165,6 +169,7 @@ etc/rc.d/rc3.d/S10sysklogd
#etc/rc.d/rc3.d/S16bluetooth
#etc/rc.d/rc3.d/S18cpufreq
etc/rc.d/rc3.d/S19smartenabler
etc/rc.d/rc3.d/S19wlanclient
etc/rc.d/rc3.d/S20network
etc/rc.d/rc3.d/S21leds
etc/rc.d/rc3.d/S24cyrus-sasl
@@ -195,6 +200,7 @@ etc/rc.d/rc6.d/K49cyrus-sasl
etc/rc.d/rc6.d/K78snort
etc/rc.d/rc6.d/K79leds
etc/rc.d/rc6.d/K80network
etc/rc.d/rc6.d/K82wlanclient
#etc/rc.d/rc6.d/K84bluetooth
#etc/rc.d/rc6.d/K85messagebus
etc/rc.d/rc6.d/K85tmpfs

View File

@@ -36,6 +36,7 @@ var/ipfire/ethernet
#var/ipfire/ethernet/scanned_nics
#var/ipfire/ethernet/settings
#var/ipfire/ethernet/vlans
#var/ipfire/ethernet/wireless
#var/ipfire/extrahd
#var/ipfire/extrahd/bin
var/ipfire/extrahd/bin/extrahd.pl

View File

@@ -66,6 +66,7 @@ etc/rc.d/init.d/network-vlans
etc/rc.d/init.d/networking/any
etc/rc.d/init.d/networking/blue
etc/rc.d/init.d/networking/dhcpcd.exe
etc/rc.d/init.d/networking/functions.network
etc/rc.d/init.d/networking/green
etc/rc.d/init.d/networking/orange
etc/rc.d/init.d/networking/red
@@ -96,6 +97,7 @@ etc/rc.d/init.d/networking/red.up/98-leds
etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
etc/rc.d/init.d/networking/red.up/99-fireinfo
etc/rc.d/init.d/networking/red.up/99-pakfire-update
etc/rc.d/init.d/networking/wpa_supplicant.exe
#etc/rc.d/init.d/nfs-server
etc/rc.d/init.d/ntp
#etc/rc.d/init.d/nut
@@ -135,6 +137,7 @@ etc/rc.d/init.d/upnpd
#etc/rc.d/init.d/vsftpd
#etc/rc.d/init.d/watchdog
#etc/rc.d/init.d/winbind
etc/rc.d/init.d/wlanclient
#etc/rc.d/init.d/xinetd
#etc/rc.d/rc0.d
#etc/rc.d/rc0.d/K01imspetor
@@ -152,6 +155,7 @@ etc/rc.d/rc0.d/K49cyrus-sasl
etc/rc.d/rc0.d/K78snort
etc/rc.d/rc0.d/K79leds
etc/rc.d/rc0.d/K80network
etc/rc.d/rc0.d/K82wlanclient
#etc/rc.d/rc0.d/K84bluetooth
#etc/rc.d/rc0.d/K85messagebus
etc/rc.d/rc0.d/K85tmpfs
@@ -170,6 +174,7 @@ etc/rc.d/rc3.d/S12acpid
#etc/rc.d/rc3.d/S16bluetooth
#etc/rc.d/rc3.d/S18cpufreq
etc/rc.d/rc3.d/S19smartenabler
etc/rc.d/rc3.d/S19wlanclient
etc/rc.d/rc3.d/S20network
etc/rc.d/rc3.d/S21leds
etc/rc.d/rc3.d/S24cyrus-sasl
@@ -200,6 +205,7 @@ etc/rc.d/rc6.d/K49cyrus-sasl
etc/rc.d/rc6.d/K78snort
etc/rc.d/rc6.d/K79leds
etc/rc.d/rc6.d/K80network
etc/rc.d/rc6.d/K82wlanclient
#etc/rc.d/rc6.d/K84bluetooth
#etc/rc.d/rc6.d/K85messagebus
etc/rc.d/rc6.d/K85tmpfs

View File

@@ -5,7 +5,6 @@ bin/ping
#usr/bin/rsh
#usr/bin/talk
#usr/bin/tftp
usr/bin/whois
#usr/sbin/ftpd
#usr/sbin/inetd
#usr/sbin/rexecd

View File

@@ -0,0 +1,25 @@
etc/jwhois.conf
usr/bin/jwhois
usr/bin/whois
#usr/share/info/jwhois.info
#usr/share/locale/es/LC_MESSAGES/jwhois.mo
#usr/share/locale/fr/LC_MESSAGES/jwhois.mo
#usr/share/locale/hu/LC_MESSAGES/jwhois.mo
#usr/share/locale/id/LC_MESSAGES/jwhois.mo
#usr/share/locale/it/LC_MESSAGES/jwhois.mo
#usr/share/locale/nl/LC_MESSAGES/jwhois.mo
#usr/share/locale/pl/LC_MESSAGES/jwhois.mo
#usr/share/locale/pt_BR/LC_MESSAGES/jwhois.mo
#usr/share/locale/ro
#usr/share/locale/ro/LC_MESSAGES
#usr/share/locale/ro/LC_MESSAGES/jwhois.mo
#usr/share/locale/ru/LC_MESSAGES/jwhois.mo
#usr/share/locale/rw/LC_MESSAGES/jwhois.mo
#usr/share/locale/sv/LC_MESSAGES/jwhois.mo
#usr/share/locale/tr/LC_MESSAGES/jwhois.mo
#usr/share/locale/vi/LC_MESSAGES/jwhois.mo
#usr/share/locale/zh_TW/LC_MESSAGES/jwhois.mo
#usr/share/man/man1/jwhois.1
#usr/share/man/sv
#usr/share/man/sv/man1
#usr/share/man/sv/man1/jwhois.1

View File

@@ -35,5 +35,6 @@ usr/local/bin/timectrl
usr/local/bin/updxlratorctrl
usr/local/bin/upnpctrl
usr/local/bin/urlfilterctrl
usr/local/bin/wirelessclient
usr/local/bin/wirelessctrl
#usr/local/bin/wlanapctrl