Merge branch 'master' into next

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --cc config/rootfiles/oldcore/131/filelists/files
Simple merge

diff --cc html/cgi-bin/wlanap.cgi
index 06ce05bfb445f1c11305dabaddd0d236e7e126c0,abee0c3cbb156697177802ef221a4940d7854c56..04b2a94911ae4093171fbefc9aeb8364f38a391f
--- 1/html/cgi-bin/wlanap.cgi
--- 2/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@@ -384,12 -379,12 +384,10 @@@ print <<EN
  <table width='80%' cellspacing='0' class='tbl' border='0'>
  <tr><th bgcolor='$color{'color20'}' colspan='4' align='left'><strong>$Lang::tr{'wlanap wlan settings'}</strong></th></tr>
  <tr><td colspan='4'><br></td></tr>
 -<tr><td width='25%' class='base'>SSID:&nbsp;</td><td class='base' colspan='3'><input type='text' name='SSID' size='30' value='$wlanapsettings{'SSID'}' /></td></tr>
 +<tr><td width='25%' class='base'>$Lang::tr{'wlanap ssid'}:&nbsp;</td><td class='base' colspan='3'><input type='text' name='SSID' size='30' value='$wlanapsettings{'SSID'}' /></td></tr>
  <!--SSID Broadcast: on => HIDESSID: off -->
 -<tr><td width='25%' class='base'>SSID Broadcast:&nbsp;</td><td class='base' colspan='3'>on <input type='radio' name='HIDESSID' value='off' $checked{'HIDESSID'}{'off'} /> | <input type='radio' name='HIDESSID' value='on' $checked{'HIDESSID'}{'on'} /> off</td></tr>
 -<tr><td width='25%' class='base'>Client Isolation:&nbsp;</td><td class='base' colspan='3'>on <input type='radio' name='CLIENTISOLATION' value='on' $checked{'CLIENTISOLATION'}{'on'} /> | <input type='radio' name='CLIENTISOLATION' value='off' $checked{'CLIENTISOLATION'}{'off'} /> off</td></tr>
 -
 -
 +<tr><td width='25%' class='base'>$Lang::tr{'wlanap broadcast ssid'}:&nbsp;</td><td class='base' colspan='3'>$Lang::tr{'on'} <input type='radio' name='HIDESSID' value='off' $checked{'HIDESSID'}{'off'} /> | <input type='radio' name='HIDESSID' value='on' $checked{'HIDESSID'}{'on'} /> $Lang::tr{'off'}</td></tr>
 +<tr><td width='25%' class='base'>$Lang::tr{'wlanap client isolation'}:&nbsp;</td><td class='base' colspan='3'>$Lang::tr{'on'} <input type='radio' name='CLIENTISOLATION' value='on' $checked{'CLIENTISOLATION'}{'on'} /> | <input type='radio' name='CLIENTISOLATION' value='off' $checked{'CLIENTISOLATION'}{'off'} /> $Lang::tr{'off'}</td></tr>
- 
- 
  <tr><td width='25%' class='base'>$Lang::tr{'wlanap country'}:&nbsp;</td><td class='base' colspan='3'>
        <select name='COUNTRY'>
  END

diff --cc lfs/hostapd
index 14932cccb7249b9538bca6b0ebc01fbfd38339cf,c2830b88a46db47353210f5bacfe5262cfd75dcc..ce399df754aa3056fc509fe89633f7a02ce62145
--- 1/lfs/hostapd
--- 2/lfs/hostapd
+++ b/lfs/hostapd
@@@ -32,7 -32,7 +32,7 @@@ DL_FROM    = $(URL_IPFIRE
  DIR_APP    = $(DIR_SRC)/$(THISAPP)
  TARGET     = $(DIR_INFO)/$(THISAPP)
  PROG       = hostapd
- PAK_VER    = 48
 -PAK_VER    = 46
++PAK_VER    = 47
  
  DEPS       = ""