From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 26 Apr 2019 17:39:55 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.23-core133~174
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=20c7552e0d1453e90cd069a83c712ff29fb1cbc7

Merge branch 'master' into next

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

20c7552e0d1453e90cd069a83c712ff29fb1cbc7
diff --cc html/cgi-bin/wlanap.cgi
index 06ce05bfb4,abee0c3cbb..04b2a94911
--- a/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 14932cccb7,c2830b88a4..ce399df754
--- a/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       = ""