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

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>

html/cgi-bin/credits.cgi

@@ -66,44 +66,46 @@ Christian Schmidt,
 Alexander Marx,
 Matthias Fischer,
 Stefan Schantl,
-Jan Paul Tuecking,
+Jan Paul Tücking,
 Jonatan Schlag,
-Dirk Wagner,
-Marcel Lorenz,
 Erik Kapfer,
 Peter Müller,
+Dirk Wagner,
+Marcel Lorenz,
 Alf Høgemark,
 Ben Schweikert,
 Peter Pfeiffer,
 Daniel Glanzmann,
 Heiner Schmeling,
-Timo Eissler,
 Daniel Weismüller,
+Timo Eissler,
 Jan Lentfer,
 Marcus Scholz,
 Ersan Yildirim,
 Joern-Ingo Weigert,
 Alfred Haas,
+Wolfgang Apolinarski,
 Lars Schuhmacher,
 Rene Zingel,
 Sascha Kilian,
-Wolfgang Apolinarski,
 Ronald Wiesinger,
 Stephan Feddersen,
-Daniel Weismueller,
 Justin Luth,
 Michael Eitelwein,
 Bernhard Bitsch,
 Dominik Hassler,
 Larsen,
 Gabriel Rolland,
+Stéphane Pautrel,
 Anton D. Seliverstov,
 Bernhard Bittner,
 David Kleuker,
 Hans Horsten,
 Jakub Ratajczak,
 Jorrit de Jonge,
+Jörn-Ingo Weigert,
 Przemek Zdroik,
+Alexander Rudolf Gruber,
 Andrew Bellows,
 Axel Gembe,
 Bernhard Held,
@@ -118,7 +120,6 @@ Heino Gutschmidt,
 Jan Behrens,
 Jochen Kauz,
 Julian McConnell,
-Jörn-Ingo Weigert,
 Kay-Michael Köhler,
 Kim Wölfel,
 Logan Schmidt,
@@ -129,76 +130,11 @@ Robert Möker,
 Stefan Ernst,
 Stefan Ferstl,
 Thomas Ebert,
+Tim FitzGeorge,
 Timmothy Wilson,
 Umberto Parma
 	<!-- END -->
 </p>
-
-<ul style="list-style: none">
-	<li>
-		Michael Tremer
-		(<a href='mailto:michael.tremer\@ipfire.org'>michael.tremer\@ipfire.org</a>)
-	</li>
-	<li>
-		Arne Fitzenreiter
-		(<a href='mailto:arne.fitzenreiter\@ipfire.org'>arne.fitzenreiter\@ipfire.org</a>)
-	</li>
-	<li>
-		Stefan Schantl
-		(<a href='mailto:stefan.schantl\@ipfire.org'>stefan.schantl\@ipfire.org</a>)
-	</li>
-	<li>
-		Alexander Marx
-		(<a href='mailto:alexander.marx\@ipfire.org'>alexander.marx\@ipfire.org</a>)
-	</li>
-</ul>
-
-<p>
-	<strong>Community Developers:</strong>
-</p>
-
-<ul style="list-style: none">
-	<li>
-		Christian Schmidt
-		(<a href='mailto:christian.schmidt\@ipfire.org'>christian.schmidt\@ipfire.org</a>)
-	</li>
-	<li>
-		Jan Paul T&uuml;cking
-		(<a href='mailto:jan.tuecking\@ipfire.org'>jan.tuecking\@ipfire.org</a>)
-	</li>
-	<li>
-		Heiner Schmeling
-		(<a href='mailto:heiner.schmeling\@ipfire.org'>heiner.schmeling\@ipfire.org</a>)
-	</li>
-	<li>
-		Ronald Wiesinger
-		(<a href='mailto:ronald.wiesinger\@ipfire.org'>ronald.wiesinger\@ipfire.org</a>)
-	</li>
-	<li>
-		Silvio Rechenbach
-		(<a href='mailto:silvio.rechenbach\@ipfire.org'>silvio.rechenbach\@ipfire.org</a>)
-	</li>
-	<li>
-		Dirk Wagner
-		(<a href='mailto:dirk.wagner\@ipfire.org'>dirk.wagner\@ipfire.org</a>)
-	</li>
-	<li>
-		Erik Kapfer
-		(<a href='mailto:erik.kapfer\@ipfire.org'>erik.kapfer\@ipfire.org</a>)
-	</li>
-	<li>
-		Alfred Haas
-		(<a href='mailto:alfred.haas\@ipfire.org'>alfred.haas\@ipfire.org</a>)
-	</li>
-	<li>
-		Peter Pfeiffer
-		(<a href='mailto:peter.pfeifer\@ipfire.org'>peter.pfeifer\@ipfire.org</a>)
-	</li>
-	<li>
-		Peter Sch&auml;lchli
-		(<a href='mailto:peter.schaelchli\@ipfire.org'>peter.schaelchli\@ipfire.org</a>)
-	</li>
-</ul>
 END
 ;
 &Header::closebox();

html/cgi-bin/hardwaregraphs.cgi

@@ -71,6 +71,10 @@ if ( $querry[0] =~ "hwtemp"){
 	print "Content-type: image/png\n\n";
 	binmode(STDOUT);
 	&Graphs::updatehddgraph($querry[0],$querry[1]);
+}elsif ( $querry[0] =~ "nvme?" ){
+	print "Content-type: image/png\n\n";
+	binmode(STDOUT);
+	&Graphs::updatehddgraph($querry[0],$querry[1]);
 }else{
 	&Header::showhttpheaders();
 	&Header::openpage($Lang::tr{'hardware graphs'}, 1, '');
@@ -93,7 +97,7 @@ if ( $querry[0] =~ "hwtemp"){
 		&General::writehash("${General::swroot}/sensors/settings", \%sensorsettings);
 	}
 
-	my @disks = `ls -1 /sys/block | grep -E '^sd' | sort | uniq`;
+	my @disks = `ls -1 /sys/block | grep -E '^sd|^nvme' | sort | uniq`;
 
 	foreach (@disks){
 		my $disk = $_;

html/cgi-bin/media.cgi

@@ -45,9 +45,9 @@ my @querry = split(/\?/,$ENV{'QUERY_STRING'});
 $querry[0] = '' unless defined $querry[0];
 $querry[1] = 'hour' unless defined $querry[1];
 
-my @devices = `ls -1 /sys/block | grep -E '^sd|^mmcblk|^xvd|^vd|^md' | sort | uniq`;
+my @devices = `ls -1 /sys/block | grep -E '^sd|^mmcblk|^nvme|^xvd|^vd|^md' | sort | uniq`;
 
-if ( $querry[0] =~ "sd?" || $querry[0] =~ "mmcblk?" || $querry[0] =~ "xvd??" || $querry[0] =~ "vd?" || $querry[0] =~ "md*" ){
+if ( $querry[0] =~ "sd?" || $querry[0] =~ "mmcblk?" || $querry[0] =~ "nvme?n?" || $querry[0] =~ "xvd??" || $querry[0] =~ "vd?" || $querry[0] =~ "md*" ){
 	print "Content-type: image/png\n\n";
 	binmode(STDOUT);
 	

html/cgi-bin/pakfire.cgi

@@ -278,20 +278,6 @@ print <<END;
 	</table>
 END
 
-&Header::closebox();
-&Header::openbox("100%", "center", "$Lang::tr{'settings'}");
-
-print <<END;
-	<form method='post' action='$ENV{'SCRIPT_NAME'}'>
-		<table width='95%'>
-			<tr><td colspan='2' bgcolor='$color{'color20'}'><b>$Lang::tr{'basic options'}</b></td></tr>
-			<tr><td align='left' width='45%'>$Lang::tr{'pakfire update daily'}</td><td width="55%" align="left">
-          on <input type='radio' name='AUTOUPDATE' value='on' $checked{'AUTOUPDATE'}{'on'} /> |
-          <input type='radio' name='AUTOUPDATE' value='off' $checked{'AUTOUPDATE'}{'off'} /> off </td></tr>
-		</table>
-	</form>
-END
-
 &Header::closebox();
 &Header::closebigbox();
 &Header::closepage();

html/cgi-bin/wlanap.cgi

@@ -73,6 +73,8 @@ $wlanapsettings{'SYSLOGLEVEL'} = '0';
 $wlanapsettings{'DEBUG'} = '4';
 $wlanapsettings{'DRIVER'} = 'NL80211';
 $wlanapsettings{'HTCAPS'} = '';
+$wlanapsettings{'VHTCAPS'} = '';
+$wlanapsettings{'NOSCAN'} = 'off';
 
 &General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings);
 &Header::getcgihash(\%wlanapsettings);
@@ -246,6 +248,10 @@ $checked{'HIDESSID'}{'off'} = '';
 $checked{'HIDESSID'}{'on'} = '';
 $checked{'HIDESSID'}{$wlanapsettings{'HIDESSID'}} = "checked='checked'";
 
+$checked{'NOSCAN'}{'off'} = '';
+$checked{'NOSCAN'}{'on'} = '';
+$checked{'NOSCAN'}{$wlanapsettings{'NOSCAN'}} = "checked='checked'";
+
 $selected{'ENC'}{$wlanapsettings{'ENC'}} = "selected='selected'";
 $selected{'CHANNEL'}{$wlanapsettings{'CHANNEL'}} = "selected='selected'";
 $selected{'COUNTRY'}{$wlanapsettings{'COUNTRY'}} = "selected='selected'";
@@ -389,6 +395,7 @@ print<<END
 		<option value='g' $selected{'HW_MODE'}{'g'}>802.11g</option>
 		<option value='an' $selected{'HW_MODE'}{'an'}>802.11an</option>
 		<option value='gn' $selected{'HW_MODE'}{'gn'}>802.11gn</option>
+		<option value='ac' $selected{'HW_MODE'}{'ac'}>802.11ac</option>
 	</select>
 </td></tr>
 END
@@ -413,6 +420,7 @@ END
 ;
 }
 print<<END
+<tr><td width='25%' class='base'>$Lang::tr{'wlanap neighbor scan'}:&nbsp;</td><td class='base' >on <input type='radio' name='NOSCAN' value='off' $checked{'NOSCAN'}{'off'} /> | <input type='radio' name='NOSCAN' value='on' $checked{'NOSCAN'}{'on'} /> off</td><td class='base' colspan='2'>$Lang::tr{'wlanap neighbor scan warning'}</td></tr>
 <tr><td colspan='4'><br></td></tr>
 <tr><td width='25%' class='base'>$Lang::tr{'wlanap encryption'}:&nbsp;</td><td class='base' colspan='3'>
 	<select name='ENC'>
@@ -428,6 +436,7 @@ END
 ;
 print <<END
 <tr><td width='25%' class='base'>HT Caps:&nbsp;</td><td class='base' colspan='3'><input type='text' name='HTCAPS' size='30' value='$wlanapsettings{'HTCAPS'}' /></td></tr>
+<tr><td width='25%' class='base'>VHT Caps:&nbsp;</td><td class='base' colspan='3'><input type='text' name='VHTCAPS' size='30' value='$wlanapsettings{'VHTCAPS'}' /></td></tr>
 <tr><td width='25%' class='base'>Tx Power:&nbsp;</td><td class='base' colspan='3'><input type='text' name='TXPOWER' size='10' value='$wlanapsettings{'TXPOWER'}' /></td></tr>
 <tr><td width='25%' class='base'>Loglevel (hostapd):&nbsp;</td><td class='base' width='25%'>
 	<select name='SYSLOGLEVEL'>
@@ -575,6 +584,17 @@ ieee80211n=1
 wmm_enabled=1
 ht_capab=$wlanapsettings{'HTCAPS'}
 END
+;
+
+ }elsif ( $wlanapsettings{'HW_MODE'} eq 'ac' ){
+	print CONFIGFILE <<END
+hw_mode=a
+ieee80211ac=1
+ieee80211n=1
+wmm_enabled=1
+ht_capab=$wlanapsettings{'HTCAPS'}
+vht_capab=$wlanapsettings{'VHTCAPS'}
+END
 ;
 
  }else{
@@ -612,6 +632,20 @@ END
 
  }
 
+ if ( $wlanapsettings{'NOSCAN'} eq 'on' ){
+	print CONFIGFILE <<END
+noscan=1
+END
+;
+
+ }else{
+ 	print CONFIGFILE <<END
+noscan=0
+END
+;
+
+ }
+
  if ( $wlanapsettings{'ENC'} eq 'wpa1'){
 	print CONFIGFILE <<END
 ######################### wpa hostapd configuration ############################