Merge branch 'master' into next

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

diff --combined config/rootfiles/oldcore/131/filelists/files
index 810c67b1e4950fb8daea2ef3f394f9702f1f3fa7,aa842b73c9a9f0b3816be23bff4d1ddc225e7842..aa842b73c9a9f0b3816be23bff4d1ddc225e7842
--- 1/config/rootfiles/oldcore/131/filelists/files
--- 2/config/rootfiles/core/131/filelists/files
+++ b/config/rootfiles/oldcore/131/filelists/files
@@@ -19,6 -19,7 +19,7 @@@ srv/web/ipfire/cgi-bin/logs.cgi/ids.da
  srv/web/ipfire/cgi-bin/logs.cgi/log.dat
  srv/web/ipfire/cgi-bin/ovpnmain.cgi
  srv/web/ipfire/cgi-bin/remote.cgi
+ srv/web/ipfire/cgi-bin/services.cgi
  srv/web/ipfire/cgi-bin/vpnmain.cgi
  usr/local/bin/ipsec-interfaces
  usr/local/bin/sshctrl

diff --combined 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
@@@ -76,7 -76,6 +76,7 @@@ $wlanapsettings{'HTCAPS'} = ''
  $wlanapsettings{'VHTCAPS'} = '';
  $wlanapsettings{'NOSCAN'} = 'off';
  $wlanapsettings{'CLIENTISOLATION'} = 'off';
 +$wlanapsettings{'IEEE80211W'} = 'off';
  
  &General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings);
  &Header::getcgihash(\%wlanapsettings);
@@@ -258,10 -257,6 +258,10 @@@ $checked{'CLIENTISOLATION'}{'off'} = ''
  $checked{'CLIENTISOLATION'}{'on'} = '';
  $checked{'CLIENTISOLATION'}{$wlanapsettings{'CLIENTISOLATION'}} = "checked='checked'";
  
 +$checked{'IEEE80211W'}{'off'} = '';
 +$checked{'IEEE80211W'}{'on'} = '';
 +$checked{'IEEE80211W'}{$wlanapsettings{'IEEE80211W'}} = "checked='checked'";
 +
  $selected{'ENC'}{$wlanapsettings{'ENC'}} = "selected='selected'";
  $selected{'CHANNEL'}{$wlanapsettings{'CHANNEL'}} = "selected='selected'";
  $selected{'COUNTRY'}{$wlanapsettings{'COUNTRY'}} = "selected='selected'";
@@@ -275,7 -270,7 +275,7 @@@ if ( -d '/sys/class/net/mon.'.$wlanapse
  }
  
  my @channellist_cmd;
 -my @channellist;
 +my @channellist = (0);
  
  if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
  my $wiphy = `iw dev $wlanapsettings{'INTERFACE'} info | grep wiphy | cut -d" " -f2`;
@@@ -290,7 -285,7 +290,7 @@@ $_ =~ /(.*) \[(\d+)(.*)\]/
  $channel = $2;chomp $channel;
  if ( $channel =~ /\d+/ ){push(@temp,$channel + 0);}
  }
 -@channellist = @temp;
 +push(@channellist, @temp);
  } else {
  @channellist_cmd = `iwlist $monwlaninterface channel|tail -n +2 2>/dev/null`;
  # get available channels
@@@ -301,7 -296,7 +301,7 @@@ $_ =~ /(.*)Channel (\d+)(.*):/
  $channel = $2;chomp $channel;
  if ( $channel =~ /\d+/ ){push(@temp,$channel + 0);}
  }
 -@channellist = @temp;
 +push(@channellist, @temp);
  }
  
  my @countrylist_cmd = `regdbdump /usr/lib/crda/regulatory.bin 2>/dev/null`;
@@@ -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
@@@ -419,13 -414,7 +417,13 @@@ if ( scalar @channellist > 0 )
  END
  ;
        foreach $channel (@channellist){
 -              print "<option $selected{'CHANNEL'}{$channel}>$channel</option>";
 +              print "<option $selected{'CHANNEL'}{$channel}>";
 +              if ($channel eq 0) {
 +                      print "- $Lang::tr{'wlanap auto'} -";
 +              } else {
 +                      print $channel;
 +              }
 +              print "</option>";
        }
        print "</select></td></tr>"
  } else {
@@@ -448,17 -437,6 +446,17 @@@ print<<EN
        </select>
  </td></tr>
  <tr><td width='25%' class='base'>Passphrase:&nbsp;</td><td class='base' colspan='3'><input type='text' name='PWD' size='30' value='$wlanapsettings{'PWD'}' /></td></tr>
 +<tr>
 +      <td width='25%' class='base'>$Lang::tr{'wlanap management frame protection'}:&nbsp;</td>
 +      <td class='base' colspan="3">
 +              <label>
 +                      $Lang::tr{'on'} <input type='radio' name='IEEE80211W' value='on' $checked{'IEEE80211W'}{'on'} />
 +              </label> |
 +              <label>
 +                      <input type='radio' name='IEEE80211W' value='off' $checked{'IEEE80211W'}{'off'} /> $Lang::tr{'off'}
 +              </label>
 +      </td>
 +</tr>
  <tr><td colspan='4'><br></td></tr>
  END
  ;
@@@ -622,7 -600,6 +620,7 @@@ ieee80211n=
  wmm_enabled=1
  ht_capab=$wlanapsettings{'HTCAPS'}
  vht_capab=$wlanapsettings{'VHTCAPS'}
 +vht_oper_chwidth=1
  END
  ;
  
@@@ -639,6 -616,7 +637,6 @@@ logger_syslog=-
  logger_syslog_level=$wlanapsettings{'SYSLOGLEVEL'}
  logger_stdout=-1
  logger_stdout_level=$wlanapsettings{'DEBUG'}
 -dump_file=/tmp/hostapd.dump
  auth_algs=1
  ctrl_interface=/var/run/hostapd
  ctrl_interface_group=0
@@@ -683,13 -661,6 +681,13 @@@ EN
  
   }
  
 + # Management Frame Protection (802.11w)
 + if ($wlanapsettings{'IEEE80211W'} eq "on") {
 +      print CONFIGFILE "ieee80211w=2\n";
 + } else {
 +      print CONFIGFILE "ieee80211w=0\n";
 + }
 +
   if ( $wlanapsettings{'ENC'} eq 'wpa1'){
        print CONFIGFILE <<END
  ######################### wpa hostapd configuration ############################

diff --combined 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       = ""