From 326a764de66971d2c78d2e45225d8985ca4ac3be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alf=20H=C3=B8gemark?= Date: Sat, 1 Mar 2014 14:32:52 +0100 Subject: [PATCH 01/35] firewalllog*.cgi and country.cgi: Use language strings, and align graphs Put the piechart for firewalllog* in the center of the page horisontally, this looks visually better. Add language string for count and details submit button. Add language strings for country.cgi. Make html validate for country.cgi. --- html/cgi-bin/country.cgi | 59 +++++++++++------------ html/cgi-bin/logs.cgi/firewalllogip.dat | 10 ++-- html/cgi-bin/logs.cgi/firewalllogport.dat | 10 ++-- langs/de/cgi-bin/de.pl | 6 +++ langs/en/cgi-bin/en.pl | 6 +++ 5 files changed, 49 insertions(+), 42 deletions(-) diff --git a/html/cgi-bin/country.cgi b/html/cgi-bin/country.cgi index db6c07496..76035fb46 100644 --- a/html/cgi-bin/country.cgi +++ b/html/cgi-bin/country.cgi @@ -36,18 +36,18 @@ require "${General::swroot}/header.pl"; &Header::showhttpheaders(); -&Header::openpage('Country Codes', 1, ''); -&Header::openbigbox('100%', 'LEFT'); +&Header::openpage($Lang::tr{'countries'}, 1, ''); +&Header::openbigbox('100%', 'left'); -&Header::openbox('100%', 'LEFT', 'Flags & Country Codes:'); -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; +&Header::openbox('100%', 'left', $Lang::tr{'country codes and flags'}); +print "
FlagCode$Lang::tr{'country'} FlagCode$Lang::tr{'country'}
"; +print ""; +print ""; +print ""; +print ""; +print ""; +print ""; +print ""; @flaglist = <$flagdir/*>; @@ -69,39 +69,34 @@ foreach $flag (@flaglistfiles) if($fcode eq 'tp') { $country = 'East Timor'; } if($fcode eq 'yu') { $country = 'Yugoslavia'; } if ($lines % 2) { - print ""; print ""; print "\n"; -} -else { - $lines2++; - if($lines2 % 2) { - print ""; - $col="bgcolor='${Header::table2colour}'"; - } else { - print ""; - $col="bgcolor='${Header::table1colour}'"; } - print ""; - print ""; - print ""; + else { + $lines2++; + if($lines2 % 2) { + $col="style='background-color:${Header::table2colour};'"; + } else { + $col="style='background-color:${Header::table1colour};'"; + } + print ""; + print ""; + print ""; + print ""; + print ""; } } -print "
$Lang::tr{'flag'}$Lang::tr{'countrycode'}$Lang::tr{'country'} $Lang::tr{'flag'}$Lang::tr{'countrycode'}$Lang::tr{'country'}
$flagcode"; + print "$flagcode$flagcode$country
$flagcode"; - print "$flagcode$country 
$flagcode$flagcode$country 
"; +print ""; &Header::closebox(); &Header::closebigbox(); print < - - - - -
$Lang::tr{'back'}
+
+$Lang::tr{'back'}
END ; diff --git a/html/cgi-bin/logs.cgi/firewalllogip.dat b/html/cgi-bin/logs.cgi/firewalllogip.dat index e4e845198..07bcc77f8 100644 --- a/html/cgi-bin/logs.cgi/firewalllogip.dat +++ b/html/cgi-bin/logs.cgi/firewalllogip.dat @@ -397,9 +397,9 @@ if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) { print FILE $myimage->png; close(FILE); ##################################################### - print "
"; + print "
"; print ""; - print "
"; + print ""; } print < $Lang::tr{'ip address'} $Lang::tr{'country'} -Count +$Lang::tr{'count'} $Lang::tr{'percentage'} END @@ -439,10 +439,10 @@ for($s=0;$s<$lines;$s++) my $fcode = lc($ccode); $color++; - print "
"; + print "
"; print "$key[$s]"; if ( $fcode ne "" ){ - print "$ccode";} + print "$ccode";} else { print "";} print "$value[$s]"; diff --git a/html/cgi-bin/logs.cgi/firewalllogport.dat b/html/cgi-bin/logs.cgi/firewalllogport.dat index 9f7ce3a11..5b0db6231 100644 --- a/html/cgi-bin/logs.cgi/firewalllogport.dat +++ b/html/cgi-bin/logs.cgi/firewalllogport.dat @@ -400,17 +400,17 @@ if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) { print FILE $myimage->png; close(FILE); ##################################################### - print "
"; + print "
"; print ""; - print "
"; + print ""; } print < + - + END @@ -437,7 +437,7 @@ for($s=0;$s<$lines;$s++) print ""; $color++; - print ""; + print ""; print ""; print ""; print ""; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index e951b68b5..ea56e7275 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -564,7 +564,11 @@ 'could not open installed updates file' => 'Datei mit Update-Liste konnte nicht geöffnet werden', 'could not open update information file' => 'Datei mit den Update-Information konnte nicht geöffnet werden. Die Update-Datei ist beschädigt.', 'could not retrieve common name from certificate' => 'Der Gemeinsame Name (CN) konnte nicht aus dem Zertifikat gelesen werden.', +'count' => 'Anzahl', +'countries' => 'Länder', 'country' => 'Land', +'countrycode' => 'Kennung', +'country codes and flags' => 'Länder und Länderkennungen', 'cpu frequency per' => 'CPU-Frequenz pro', 'cpu idle usage' => 'Leerlauf CPU-Nutzung', 'cpu interrupt usage' => 'Interrupt CPU-Nutzung', @@ -644,6 +648,7 @@ 'destination port numbers' => 'Zielport muß ein(e) gültige(r) Portnummer oder Portbereich sein.', 'destination port overlaps' => 'Der Zielportbereich überlappt einen bereits bestehenden Portbereich.', 'detail level' => 'Detaillierungsgrad', +'details' => 'Mehr', 'device' => 'Gerät', 'devices on blue' => 'Geräte auf Blau', 'dhcp advopt add' => 'DHCP Option hinzufügen', @@ -898,6 +903,7 @@ 'fixed ip lease added' => 'Feste IP-Zuordnung hinzugefügt', 'fixed ip lease modified' => 'Feste IP-Zuordnung geändert', 'fixed ip lease removed' => 'Feste IP-Zuordnung gelöscht', +'flag' => 'Flagge', 'force update' => 'Aktualisierung erzwingen', 'force user' => 'Standardbenutzer für das UNIX Dateisystem', 'forward firewall' => 'Firewall', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index d8cfdc771..27b8b09cf 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -585,7 +585,11 @@ 'could not open installed updates file' => 'Could not open installed updates file', 'could not open update information file' => 'Could not open update information file. The update file is corrupt.', 'could not retrieve common name from certificate' => 'Could not retrieve common name from certificate.', +'count' => 'Count', +'countries' => 'Countries', 'country' => 'Country', +'countrycode' => 'Code', +'country codes and flags' => 'Country Codes and Flags:', 'cpu frequency per' => 'CPU frequency per', 'cpu idle usage' => 'Idle CPU Usage', 'cpu interrupt usage' => 'Interrupt CPU Usage', @@ -666,6 +670,7 @@ 'destination port numbers' => 'Destination port must be a valid port number or port range.', 'destination port overlaps' => 'Destination port range overlaps an existing port range.', 'detail level' => 'Detail level', +'details' => 'Details', 'device' => 'Device', 'devices on blue' => 'Devices on BLUE', 'dhcp advopt add' => 'Add a DHCP option', @@ -924,6 +929,7 @@ 'fixed ip lease added' => 'Fixed IP lease added', 'fixed ip lease modified' => 'Fixed IP lease modified', 'fixed ip lease removed' => 'Fixed IP lease removed', +'flag' => 'Flag', 'force update' => 'Force update', 'force user' => 'force all new file to user', 'forward firewall' => 'Firewall', From 014b284e5f3dc1eb87b1198e717cffa28dc70771 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 11 Mar 2014 18:03:59 +0100 Subject: [PATCH 02/35] beep: Update to 1.3. --- config/rootfiles/core/76/filelists/beep | 1 + lfs/beep | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 120000 config/rootfiles/core/76/filelists/beep diff --git a/config/rootfiles/core/76/filelists/beep b/config/rootfiles/core/76/filelists/beep new file mode 120000 index 000000000..6db094efa --- /dev/null +++ b/config/rootfiles/core/76/filelists/beep @@ -0,0 +1 @@ +../../../common/beep \ No newline at end of file diff --git a/lfs/beep b/lfs/beep index dc0d22c41..437677b73 100644 --- a/lfs/beep +++ b/lfs/beep @@ -24,7 +24,7 @@ include Config -VER = 1.2.2 +VER = 1.3 THISAPP = beep-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = d541419fd7e5642952d7b48cbb40c712 +$(DL_FILE)_MD5 = 49c340ceb95dbda3f97b2daafac7892a install : $(TARGET) From 09d7ae9471547ea9ab42a77339666a3e5353caf3 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 11 Mar 2014 21:47:16 +0100 Subject: [PATCH 03/35] linux: Remove disabling of loading the pcspkr module. --- lfs/linux | 3 --- src/patches/linux-2.6.30-no-pcspkr-modalias.patch | 12 ------------ 2 files changed, 15 deletions(-) delete mode 100644 src/patches/linux-2.6.30-no-pcspkr-modalias.patch diff --git a/lfs/linux b/lfs/linux index 1993cc8aa..7ffb345e8 100644 --- a/lfs/linux +++ b/lfs/linux @@ -127,9 +127,6 @@ ifneq "$(KCFG)" "-headers" cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.7-disable-compat_vdso.patch endif - # Disable pcspeaker autoload - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.30-no-pcspkr-modalias.patch - # Remove ACPI Blacklist message cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6-silence-acpi-blacklist.patch diff --git a/src/patches/linux-2.6.30-no-pcspkr-modalias.patch b/src/patches/linux-2.6.30-no-pcspkr-modalias.patch deleted file mode 100644 index 439269cef..000000000 --- a/src/patches/linux-2.6.30-no-pcspkr-modalias.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c -index 34f4d2e..3e40c70 100644 ---- a/drivers/input/misc/pcspkr.c -+++ b/drivers/input/misc/pcspkr.c -@@ -24,7 +24,6 @@ - MODULE_AUTHOR("Vojtech Pavlik "); - MODULE_DESCRIPTION("PC Speaker beeper driver"); - MODULE_LICENSE("GPL"); --MODULE_ALIAS("platform:pcspkr"); - - static int pcspkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value) - { From 38cacce21b42d9e7c079e646096e486ac706e546 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 13 Mar 2014 12:45:56 +0100 Subject: [PATCH 04/35] samba: update to 3.6.23. --- lfs/samba | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lfs/samba b/lfs/samba index 13110d562..4f5375c07 100644 --- a/lfs/samba +++ b/lfs/samba @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team # +# Copyright (C) 2007-2014 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 3.6.22 +VER = 3.6.23 THISAPP = samba-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 56 +PAK_VER = 57 DEPS = "cups" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 59add4bb178ebc188d857bc13a508c0b +$(DL_FILE)_MD5 = 2f7aee1dc5d31aefcb364600915b31dc install : $(TARGET) From b3c53248d97ee083fcf43cc5ff745396be06ca1a Mon Sep 17 00:00:00 2001 From: Alexander Marx Date: Thu, 13 Mar 2014 13:53:39 +0100 Subject: [PATCH 05/35] Firewall: When delting an OpenVPN or IPSec connection, the rules are only colored yellow and the firewallrules are reloaded automatically --- html/cgi-bin/firewall.cgi | 20 -------------------- html/cgi-bin/ovpnmain.cgi | 2 +- html/cgi-bin/vpnmain.cgi | 2 +- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 7bcb07964..82684e06f 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -2375,26 +2375,18 @@ END if($$hash{$key}[3] eq 'ipsec_net_src'){ if(&fwlib::get_ipsec_net_ip($host,11) eq ''){ $coloryellow='on'; - &disable_rule($key); - $$hash{$key}[2]=''; } }elsif($$hash{$key}[3] eq 'ovpn_net_src'){ if(&fwlib::get_ovpn_net_ip($host,1) eq ''){ $coloryellow='on'; - &disable_rule($key); - $$hash{$key}[2]=''; } }elsif($$hash{$key}[3] eq 'ovpn_n2n_src'){ if(&fwlib::get_ovpn_n2n_ip($host,27) eq ''){ $coloryellow='on'; - &disable_rule($key); - $$hash{$key}[2]=''; } }elsif($$hash{$key}[3] eq 'ovpn_host_src'){ if(&fwlib::get_ovpn_host_ip($host,33) eq ''){ $coloryellow='on'; - &disable_rule($key); - $$hash{$key}[2]=''; } } } @@ -2402,26 +2394,18 @@ END if($$hash{$key}[5] eq 'ipsec_net_tgt'){ if(&fwlib::get_ipsec_net_ip($host,11) eq ''){ $coloryellow='on'; - &disable_rule($key); - $$hash{$key}[2]=''; } }elsif($$hash{$key}[5] eq 'ovpn_net_tgt'){ if(&fwlib::get_ovpn_net_ip($host,1) eq ''){ $coloryellow='on'; - &disable_rule($key); - $$hash{$key}[2]=''; } }elsif($$hash{$key}[5] eq 'ovpn_n2n_tgt'){ if(&fwlib::get_ovpn_n2n_ip($host,27) eq ''){ $coloryellow='on'; - &disable_rule($key); - $$hash{$key}[2]=''; } }elsif($$hash{$key}[5] eq 'ovpn_host_tgt'){ if(&fwlib::get_ovpn_host_ip($host,33) eq ''){ $coloryellow='on'; - &disable_rule($key); - $$hash{$key}[2]=''; } } } @@ -2429,15 +2413,11 @@ END foreach my $netgroup (sort keys %customgrp){ if(($$hash{$key}[4] eq $customgrp{$netgroup}[0] || $$hash{$key}[6] eq $customgrp{$netgroup}[0]) && $customgrp{$netgroup}[2] eq 'none'){ $coloryellow='on'; - &disable_rule($key); - $$hash{$key}[2]=''; } } foreach my $srvgroup (sort keys %customservicegrp){ if($$hash{$key}[15] eq $customservicegrp{$srvgroup}[0] && $customservicegrp{$srvgroup}[2] eq 'none'){ $coloryellow='on'; - &disable_rule($key); - $$hash{$key}[2]=''; } } $$hash{'ACTIVE'}=$$hash{$key}[2]; diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index fa801a9ec..d8fc89327 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -2159,7 +2159,7 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') { } else { $errormessage = $Lang::tr{'invalid key'}; } - + &General::firewall_reload(); ### ### Download PKCS12 file diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index af836da8f..627b19159 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -1225,7 +1225,7 @@ END } else { $errormessage = $Lang::tr{'invalid key'}; } - + &General::firewall_reload(); ### ### Choose between adding a host-net or net-net connection ### From c6df357fd4fefe2a8285ec92e38bd40361fe788e Mon Sep 17 00:00:00 2001 From: Alexander Marx Date: Thu, 13 Mar 2014 13:53:39 +0100 Subject: [PATCH 06/35] Firewall: When delting an OpenVPN or IPSec connection, the rules are only colored yellow and the firewallrules are reloaded automatically --- html/cgi-bin/firewall.cgi | 20 -------------------- html/cgi-bin/ovpnmain.cgi | 2 +- html/cgi-bin/vpnmain.cgi | 2 +- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 7bcb07964..82684e06f 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -2375,26 +2375,18 @@ END if($$hash{$key}[3] eq 'ipsec_net_src'){ if(&fwlib::get_ipsec_net_ip($host,11) eq ''){ $coloryellow='on'; - &disable_rule($key); - $$hash{$key}[2]=''; } }elsif($$hash{$key}[3] eq 'ovpn_net_src'){ if(&fwlib::get_ovpn_net_ip($host,1) eq ''){ $coloryellow='on'; - &disable_rule($key); - $$hash{$key}[2]=''; } }elsif($$hash{$key}[3] eq 'ovpn_n2n_src'){ if(&fwlib::get_ovpn_n2n_ip($host,27) eq ''){ $coloryellow='on'; - &disable_rule($key); - $$hash{$key}[2]=''; } }elsif($$hash{$key}[3] eq 'ovpn_host_src'){ if(&fwlib::get_ovpn_host_ip($host,33) eq ''){ $coloryellow='on'; - &disable_rule($key); - $$hash{$key}[2]=''; } } } @@ -2402,26 +2394,18 @@ END if($$hash{$key}[5] eq 'ipsec_net_tgt'){ if(&fwlib::get_ipsec_net_ip($host,11) eq ''){ $coloryellow='on'; - &disable_rule($key); - $$hash{$key}[2]=''; } }elsif($$hash{$key}[5] eq 'ovpn_net_tgt'){ if(&fwlib::get_ovpn_net_ip($host,1) eq ''){ $coloryellow='on'; - &disable_rule($key); - $$hash{$key}[2]=''; } }elsif($$hash{$key}[5] eq 'ovpn_n2n_tgt'){ if(&fwlib::get_ovpn_n2n_ip($host,27) eq ''){ $coloryellow='on'; - &disable_rule($key); - $$hash{$key}[2]=''; } }elsif($$hash{$key}[5] eq 'ovpn_host_tgt'){ if(&fwlib::get_ovpn_host_ip($host,33) eq ''){ $coloryellow='on'; - &disable_rule($key); - $$hash{$key}[2]=''; } } } @@ -2429,15 +2413,11 @@ END foreach my $netgroup (sort keys %customgrp){ if(($$hash{$key}[4] eq $customgrp{$netgroup}[0] || $$hash{$key}[6] eq $customgrp{$netgroup}[0]) && $customgrp{$netgroup}[2] eq 'none'){ $coloryellow='on'; - &disable_rule($key); - $$hash{$key}[2]=''; } } foreach my $srvgroup (sort keys %customservicegrp){ if($$hash{$key}[15] eq $customservicegrp{$srvgroup}[0] && $customservicegrp{$srvgroup}[2] eq 'none'){ $coloryellow='on'; - &disable_rule($key); - $$hash{$key}[2]=''; } } $$hash{'ACTIVE'}=$$hash{$key}[2]; diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index fa801a9ec..d8fc89327 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -2159,7 +2159,7 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') { } else { $errormessage = $Lang::tr{'invalid key'}; } - + &General::firewall_reload(); ### ### Download PKCS12 file diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index af836da8f..627b19159 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -1225,7 +1225,7 @@ END } else { $errormessage = $Lang::tr{'invalid key'}; } - + &General::firewall_reload(); ### ### Choose between adding a host-net or net-net connection ### From 4d81e0f3812fc272b2515a631a2e98c4ae76a42b Mon Sep 17 00:00:00 2001 From: Alexander Marx Date: Thu, 13 Mar 2014 15:09:01 +0100 Subject: [PATCH 07/35] VPN Checksubnets: Now the remote subnets (OpenVPN/IPSec) are checked. If they are defined elsewhere, there's a warningmessage displayed --- config/cfgroot/general-functions.pl | 79 +++++++++++++++++++++-------- html/cgi-bin/ovpnmain.cgi | 19 ++++++- html/cgi-bin/vpnmain.cgi | 27 ++++++---- langs/de/cgi-bin/de.pl | 3 ++ langs/en/cgi-bin/en.pl | 5 +- 5 files changed, 99 insertions(+), 34 deletions(-) diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 386b0479f..adfba5489 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -506,24 +506,46 @@ sub validipandmask sub checksubnets { - my %ccdconfhash=(); - my @ccdconf=(); - my $ccdname=$_[0]; - my $ccdnet=$_[1]; + my %ccdconfhash=(); + my %ovpnconfhash=(); + my %vpnconf=(); + my %ipsecconf=(); + my %ownnet=(); + my %ovpnconf=(); + my @ccdconf=(); + my $ccdname=$_[0]; + my $ccdnet=$_[1]; + my $ownnet=$_[2]; my $errormessage; my ($ip,$cidr)=split(/\//,$ccdnet); $cidr=&iporsubtocidr($cidr); + #get OVPN-Subnet (dynamic range) - my %ovpnconf=(); &readhash("${General::swroot}/ovpn/settings", \%ovpnconf); my ($ovpnip,$ovpncidr)= split (/\//,$ovpnconf{'DOVPN_SUBNET'}); $ovpncidr=&iporsubtocidr($ovpncidr); + #check if we try to use same network as ovpn server if ("$ip/$cidr" eq "$ovpnip/$ovpncidr") { $errormessage=$errormessage.$Lang::tr{'ccd err isovpnnet'}."
"; return $errormessage; } - #check if we use a network-name/subnet that already exists + + #check if we try to use same network as another ovpn N2N + if($ownnet ne 'ovpn'){ + &readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ovpnconfhash); + foreach my $key (keys %ovpnconfhash) { + if ($ovpnconfhash{$key}[3] eq 'net'){ + my @ovpnnet=split (/\//,$ovpnconfhash{$key}[11]); + if (&IpInSubnet($ip,$ovpnnet[0],&iporsubtodec($ovpnnet[1]))){ + $errormessage=$errormessage.$Lang::tr{'ccd err isovpnn2n'}." $ovpnconfhash{$key}[1]
"; + return $errormessage; + } + } + } + } + + #check if we use a network-name/subnet (static-ovpn) that already exists &readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); foreach my $key (keys %ccdconfhash) { @ccdconf=split(/\//,$ccdconfhash{$key}[1]); @@ -535,32 +557,45 @@ sub checksubnets my ($newip,$newsub) = split(/\//,$ccdnet); if (&IpInSubnet($newip,$ccdconf[0],&iporsubtodec($ccdconf[1]))) { - $errormessage=$errormessage.$Lang::tr{'ccd err issubnet'}."
"; + $errormessage=$errormessage.$Lang::tr{'ccd err issubnet'}." $ccdconfhash{$key}[0]
"; return $errormessage; } } + #check if we use a ipsec right network which is already defined - my %ipsecconf=(); - &General::readhasharray("${General::swroot}/vpn/config", \%ipsecconf); - foreach my $key (keys %ipsecconf){ - if ($ipsecconf{$key}[11] ne ''){ - my ($ipsecip,$ipsecsub) = split (/\//, $ipsecconf{$key}[11]); - $ipsecsub=&iporsubtodec($ipsecsub); - if($ipsecconf{$key}[1] ne $ccdname){ - if ( &IpInSubnet ($ip,$ipsecip,$ipsecsub) ){ - $errormessage=$Lang::tr{'ccd err isipsecnet'}." Name: $ipsecconf{$key}[1]"; - return $errormessage; + if($ownnet ne 'ipsec'){ + &General::readhasharray("${General::swroot}/vpn/config", \%ipsecconf); + foreach my $key (keys %ipsecconf){ + if ($ipsecconf{$key}[11] ne ''){ + my ($ipsecip,$ipsecsub) = split (/\//, $ipsecconf{$key}[11]); + $ipsecsub=&iporsubtodec($ipsecsub); + if($ipsecconf{$key}[1] ne $ccdname){ + if ( &IpInSubnet ($ip,$ipsecip,$ipsecsub) ){ + $errormessage=$Lang::tr{'ccd err isipsecnet'}." Name: $ipsecconf{$key}[1]"; + return $errormessage; + } } } } } + + #check if we use the ipsec RW Network (if defined) + &readhash("${General::swroot}/vpn/settings", \%vpnconf); + if ($vpnconf{'RW_NET'} ne ''){ + my ($ipsecrwnet,$ipsecrwsub)=split (/\//, $vpnconf{'RW_NET'}); + if (&IpInSubnet($ip,$ipsecrwnet,&iporsubtodec($ipsecrwsub))) + { + $errormessage=$errormessage.$Lang::tr{'ccd err isipsecrw'}."
"; + return $errormessage; + } + } + #check if we use one of ipfire's networks (green,orange,blue) - my %ownnet=(); &readhash("${General::swroot}/ethernet/settings", \%ownnet); - if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ownnet{'GREEN_NETADDRESS'},$ip,&iporsubtodec($cidr))){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;} - if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ownnet{'ORANGE_NETADDRESS'},$ip,&iporsubtodec($cidr))){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;} - if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ownnet{'BLUE_NETADDRESS'},$ip,&iporsubtodec($cidr))){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;} - if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ownnet{'RED_NETADDRESS'},$ip,&iporsubtodec($cidr))){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;} + if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'GREEN_NETADDRESS'},&iporsubtodec($ownnet{'GREEN_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;} + if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'ORANGE_NETADDRESS'},&iporsubtodec($ownnet{'ORANGE_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;} + if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'BLUE_NETADDRESS'},&iporsubtodec($ownnet{'BLUE_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;} + if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'RED_NETADDRESS'},&iporsubtodec($ownnet{'RED_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;} } diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index d8fc89327..c315e9e5e 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -3509,8 +3509,13 @@ if ($cgiparams{'TYPE'} eq 'net') { unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; - } - + } + #Check if remote subnet is used elsewhere + my ($n2nip,$n2nsub)=split("/",$cgiparams{'REMOTE_SUBNET'}); + $warnmessage=&General::checksubnets('',$n2nip,'ovpn'); + if ($warnmessage){ + $warnmessage=$Lang::tr{'remote subnet'}." ($cgiparams{'REMOTE_SUBNET'})
".$warnmessage; + } } # if (($cgiparams{'TYPE'} eq 'net') && ($cgiparams{'SIDE'} !~ /^(left|right)$/)) { @@ -4569,6 +4574,16 @@ END &Header::closebox(); } + if ($warnmessage) { + &Header::openbox('100%', 'LEFT', $Lang::tr{'warning messages'}); + print "$warnmessage
"; + print "$Lang::tr{'fwdfw warn1'}
"; + &Header::closebox(); + print"
"; + &Header::closepage(); + exit 0; + } + my $sactive = "
$Lang::tr{'port'}count$Lang::tr{'count'} $Lang::tr{'percentage'}
$key[$s]$value[$s]$percent
$Lang::tr{'stopped'}
"; my $srunning = "no"; my $activeonrun = ""; diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 627b19159..8324ae771 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -1225,7 +1225,7 @@ END } else { $errormessage = $Lang::tr{'invalid key'}; } - &General::firewall_reload(); + ### ### Choose between adding a host-net or net-net connection ### @@ -1407,14 +1407,13 @@ END goto VPNCONF_ERROR; } -#temporary disabled (BUG 10294) -# if ($cgiparams{'TYPE'} eq 'net'){ -# $errormessage=&General::checksubnets($cgiparams{'NAME'},$cgiparams{'REMOTE_SUBNET'}); -# if ($errormessage ne ''){ -# goto VPNCONF_ERROR; -# } -# -# } + if ($cgiparams{'TYPE'} eq 'net'){ + $warnmessage=&General::checksubnets('',$cgiparams{'REMOTE_SUBNET'},'ipsec'); + if ($warnmessage ne ''){ + $warnmessage=$Lang::tr{'remote subnet'}." ($cgiparams{'REMOTE_SUBNET'}) ".$warnmessage; + } + } + if ($cgiparams{'AUTH'} eq 'psk') { if (! length($cgiparams{'PSK'}) ) { $errormessage = $Lang::tr{'pre-shared key is too short'}; @@ -2612,6 +2611,16 @@ EOF &Header::closebox(); } + if ($warnmessage) { + &Header::openbox('100%', 'left', $Lang::tr{'warning messages'}); + print "$warnmessage
"; + print "$Lang::tr{'fwdfw warn1'}
"; + &Header::closebox(); + print"
"; + &Header::closepage(); + exit 0; + } + &Header::openbox('100%', 'left', $Lang::tr{'global settings'}); print < diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index e951b68b5..90222c425 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -481,7 +481,9 @@ 'ccd err iroute' => 'Netzadresse für Route ungültig.', 'ccd err irouteexist' => 'Diese Route wird bereits verwendet.', 'ccd err isipsecnet' => 'Diese Subnetzadresse wird bereits für ein IPsec-Netzwerk verwendet.', +'ccd err isipsecrw' => 'Diese Subnetzadresse wird bereits für das IPsec-RW Netz verwendet.', 'ccd err isovpnnet' => 'Subnetzadresse wird für bereits für den OpenVPN-Server verwendet!', +'ccd err isovpnn2n' => 'Subnetzadresse wird für bereits für ein OpenVPN N2N verwendet.', 'ccd err issubnet' => 'Subnetzadresse wird bereits verwendet.', 'ccd err name' => 'Es muss ein Name angegeben werden.', 'ccd err nameexist' => 'Name existiert bereits.', @@ -1005,6 +1007,7 @@ 'fwdfw use srcport' => 'Quellport:', 'fwdfw use srv' => 'Zielport:', 'fwdfw useless rule' => 'Diese Regel ist nicht sinnvoll.', +'fwdfw warn1' => 'Dies kann dazu führen, dass Firewallregeln auf Netze angewendet werden, für die sie nicht gedacht sind.', 'fwdfw wd_fri' => 'Fr', 'fwdfw wd_mon' => 'Mo', 'fwdfw wd_sat' => 'Sa', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index d8cfdc771..f614f58f2 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -499,8 +499,10 @@ 'ccd err invalidnet' => 'Invalid IP address. Format: 192.168.0.0/24 or 192.168.0.0/255.255.255.0.', 'ccd err iroute' => 'Network address for route is invalid.', 'ccd err irouteexist' => 'This route is already in use.', -'ccd err isipsecnet' => 'The given subnet address already used by an IPsec network.', +'ccd err isipsecnet' => 'The given subnet address is already used by an IPsec network.', +'ccd err isipsecrw' => 'The given subnet address is already used by the IPsec rw network.', 'ccd err isovpnnet' => 'Subnet address already in use for OpenVPN Server.', +'ccd err isovpnn2n' => 'Subnet address already in use for an OpenVPN N2N.', 'ccd err issubnet' => 'Subnet address already in use.', 'ccd err name' => 'Please choose a name.', 'ccd err nameexist' => 'Name already exists.', @@ -1031,6 +1033,7 @@ 'fwdfw use srcport' => 'Source port:', 'fwdfw use srv' => 'Destination port:', 'fwdfw useless rule' => 'This rule is useless.', +'fwdfw warn1' => 'This might lead to firewallrules which are applied to networks for which they are not intended to be.', 'fwdfw wd_fri' => 'Fri', 'fwdfw wd_mon' => 'Mon', 'fwdfw wd_sat' => 'Sat', From 03b08c08f0be261f47335ebf6e608b4b5d6d153a Mon Sep 17 00:00:00 2001 From: Alexander Marx Date: Thu, 13 Mar 2014 15:27:01 +0100 Subject: [PATCH 08/35] VPN Checksubnets: Buttons are now Language Strings --- html/cgi-bin/ovpnmain.cgi | 2 +- html/cgi-bin/vpnmain.cgi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index c315e9e5e..877e09cb1 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -4579,7 +4579,7 @@ END print "$warnmessage
"; print "$Lang::tr{'fwdfw warn1'}
"; &Header::closebox(); - print"
"; + print"
"; &Header::closepage(); exit 0; } diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 8324ae771..5affdd851 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -1410,7 +1410,7 @@ END if ($cgiparams{'TYPE'} eq 'net'){ $warnmessage=&General::checksubnets('',$cgiparams{'REMOTE_SUBNET'},'ipsec'); if ($warnmessage ne ''){ - $warnmessage=$Lang::tr{'remote subnet'}." ($cgiparams{'REMOTE_SUBNET'}) ".$warnmessage; + $warnmessage=$Lang::tr{'remote subnet'}." ($cgiparams{'REMOTE_SUBNET'})
".$warnmessage; } } @@ -2616,7 +2616,7 @@ EOF print "$warnmessage
"; print "$Lang::tr{'fwdfw warn1'}
"; &Header::closebox(); - print"
"; + print"
"; &Header::closepage(); exit 0; } From 84004f0538945215dda2b52fe2f664274dc884ce Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 13 Mar 2014 15:27:14 +0100 Subject: [PATCH 09/35] Add link to entropy page and show if there is hardware support available. --- config/menu/20-status.menu | 6 ++++++ html/cgi-bin/entropy.cgi | 36 ++++++++++++++++++++++++++++++++++++ langs/de/cgi-bin/de.pl | 5 +++++ langs/en/cgi-bin/en.pl | 5 +++++ 4 files changed, 52 insertions(+) diff --git a/config/menu/20-status.menu b/config/menu/20-status.menu index c0b780a06..8899310aa 100644 --- a/config/menu/20-status.menu +++ b/config/menu/20-status.menu @@ -46,6 +46,12 @@ 'title' => "$Lang::tr{'hardware graphs'}", 'enabled' => 1, }; + $substatus->{'61.entropy'} = { + 'caption' => "$Lang::tr{'entropy'}", + 'uri' => '/cgi-bin/entropy.cgi', + 'title' => "$Lang::tr{'entropy graphs'}", + 'enabled' => 1, + }; $substatus->{'71.connections'} = { 'caption' => $Lang::tr{'connections'}, 'uri' => '/cgi-bin/connections.cgi', diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi index 9362e78be..bd3de82f8 100755 --- a/html/cgi-bin/entropy.cgi +++ b/html/cgi-bin/entropy.cgi @@ -48,6 +48,42 @@ if ( $querry[0] ne~ "") { &Graphs::makegraphbox("entropy.cgi", "day", '', 350); &Header::closebox(); + # Check for hardware support. + my $message; + my $message_colour = $Header::colourred; + if (&has_hwrng()) { + $message = $Lang::tr{'system has hwrng'}; + $message_colour = $Header::colourgreen; + } elsif (&has_rdrand()) { + $message = $Lang::tr{'system has rdrand'}; + $message_colour = $Header::colourgreen; + } else { + $message = $Lang::tr{'no hardware random number generator'}; + } + + &Header::openbox('100%', 'center', $Lang::tr{'hardware support'}); + print <$message

+EOF + &Header::closebox(); + &Header::closebigbox(); &Header::closepage(); } + +sub has_hwrng() { + return (-c "/dev/hwrng"); +} + +sub has_rdrand() { + open(FILE, "/proc/cpuinfo") or return 0; + my @cpuinfo = ; + close(FILE); + + my @result = grep(/rdrand/, @cpuinfo); + if (@result) { + return 1; + } + + return 0; +} diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index e951b68b5..cf1430403 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -813,6 +813,7 @@ 'enter ack class' => 'Legen Sie hier die ACK-Klasse fest
und klicken Sie danach auf Speichern.', 'enter data' => 'Geben Sie die Daten ein
und klicken Sie danach auf Speichern.', 'entropy' => 'Entropie', +'entropy graphs' => 'Entropiegraphen', 'err bk 1' => 'Fehler beim Erzeugen des Archivs', 'err bk 10 password' => 'Fehler beim Datensicherungs-Passwort', 'err bk 2 key' => 'Fehler beim Erzeugen der Schlüsseldatei', @@ -1131,6 +1132,7 @@ 'harddisk temperature' => 'Festplattentemperatur', 'harddisk temperature graphs' => 'HDD-Diagramme', 'hardware graphs' => 'Hardware-Diagramme', +'hardware support' => 'Hardware-Unterstützung', 'hdd temperature in' => 'Festplattentemperatur in', 'help' => 'Hilfe', 'high' => 'Hoch', @@ -1506,6 +1508,7 @@ 'no eciadsl synch.bin file' => 'Keine ECI ADSL Datei synch.bin vorhanden. Bitte hochladen.', 'no filter pass' => 'Legen Sie hier die Standardklassen fest durch die nicht-gefilterte Pakete gehen.', 'no fritzdsl driver' => 'Kein Fritz!DSL-Treiber vorhanden. Bitte hochladen.', +'no hardware random number generator' => 'Dieses System hat keine Entropiequelle.', 'no information available' => 'Keine Informationen verfügbar.', 'no log selected' => 'kein Log ausgewählt', 'no modem selected' => 'Kein Modem ausgewählt', @@ -1976,6 +1979,8 @@ 'swap usage per' => 'Nutzung von Auslagerungsspeicher (Swap) pro', 'system' => 'System', 'system graphs' => 'System-Diagramme', +'system has hwrng' => 'Dieses System hat einen Hardware-Zufallszahlengenerator.', +'system has rdrand' => 'Dieses System unterstützt Intel(R) RDRAND.', 'system information' => 'Systeminformationen', 'system log viewer' => 'Betrachter der System-Logdateien', 'system logs' => 'System-Logdateien', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index d8cfdc771..02b1a4383 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -839,6 +839,7 @@ 'enter ack class' => 'Enter the ACK- Class
and then press Save.', 'enter data' => 'Enter your settings
and then press Save.', 'entropy' => 'Entropy', +'entropy graphs' => 'Entropy Graphs', 'err bk 1' => 'Error creating archive', 'err bk 10 password' => 'Error with backup password', 'err bk 2 key' => 'Error creating key file', @@ -1159,6 +1160,7 @@ 'harddisk temperature' => 'Harddisk Temperature', 'harddisk temperature graphs' => 'HDD Graphs', 'hardware graphs' => 'Hardware Graphs', +'hardware support' => 'Hardware Support', 'hdd temperature in' => 'Harddisk temperature in', 'help' => 'Help', 'high' => 'High', @@ -1535,6 +1537,7 @@ 'no eciadsl synch.bin file' => 'No ECI ADSL synch.bin file. Please upload.', 'no filter pass' => 'Enter the standard class for non-filtered packets.', 'no fritzdsl driver' => 'No Fritz!DSL driver. Please upload.', +'no hardware random number generator' => 'This system has no source for entropy.', 'no information available' => 'No information available.', 'no log selected' => 'No log selected', 'no modem selected' => 'No modem selected', @@ -2011,6 +2014,8 @@ 'swap usage per' => 'Swap usage per', 'system' => 'System', 'system graphs' => 'System Graphs', +'system has hwrng' => 'This system has got a hardware random number generator.', +'system has rdrand' => 'This system has got support for Intel(R) RDRAND.', 'system information' => 'System Information', 'system log viewer' => 'System Log Viewer', 'system logs' => 'System Logs', From 9d870c49eb75331f75bd84daeb6bed658d8a1b90 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 13 Mar 2014 15:29:53 +0100 Subject: [PATCH 10/35] entropy graph: Remove trend line. --- config/cfgroot/graphs.pl | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 81b6fa4e7..4942c98c8 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -1140,7 +1140,6 @@ sub updateentropygraph { "-t $Lang::tr{'entropy'}", "-v $Lang::tr{'bit'}", "DEF:entropy=$mainsettings{'RRDLOG'}/collectd/localhost/entropy/entropy.rrd:entropy:AVERAGE", - "CDEF:entropytrend=entropy,43200,TREND", "LINE3:entropy#ff0000:" . sprintf("%-15s", $Lang::tr{'entropy'}), "VDEF:entrmin=entropy,MINIMUM", "VDEF:entrmax=entropy,MAXIMUM", @@ -1148,7 +1147,6 @@ sub updateentropygraph { "GPRINT:entrmax:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'maximum'}), "GPRINT:entrmin:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'minimum'}), "GPRINT:entravg:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'average'}) . "\\n", - "LINE3:entropytrend#000000", ); RRDs::graph (@command); From fd24071f657fff2dfa8f878b8eef5d6a1dcf20d8 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 13 Mar 2014 15:37:05 +0100 Subject: [PATCH 11/35] Update translations. --- doc/language_issues.de | 2 ++ doc/language_issues.en | 2 ++ doc/language_issues.es | 12 ++++++++++-- doc/language_issues.fr | 12 ++++++++++-- doc/language_issues.nl | 12 ++++++++++-- doc/language_issues.pl | 12 ++++++++++-- doc/language_issues.ru | 12 ++++++++++-- doc/language_issues.tr | 12 ++++++++++++ doc/language_missings | 40 ++++++++++++++++++++++++++++++++++++++++ langs/de/cgi-bin/de.pl | 6 +++--- langs/en/cgi-bin/en.pl | 4 ++-- 11 files changed, 111 insertions(+), 15 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index 881d31827..94cf2ceee 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -206,6 +206,8 @@ WARNING: translation string unused: from warn email bad WARNING: translation string unused: fwdfw MODE1 WARNING: translation string unused: fwdfw MODE2 WARNING: translation string unused: fwdfw addrule +WARNING: translation string unused: fwdfw err nosrcip +WARNING: translation string unused: fwdfw err notgtip WARNING: translation string unused: fwdfw err prot_port1 WARNING: translation string unused: fwdfw final_rule WARNING: translation string unused: fwdfw from diff --git a/doc/language_issues.en b/doc/language_issues.en index 611a0decb..b69be53af 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -228,6 +228,8 @@ WARNING: translation string unused: from warn email bad WARNING: translation string unused: fwdfw MODE1 WARNING: translation string unused: fwdfw MODE2 WARNING: translation string unused: fwdfw addrule +WARNING: translation string unused: fwdfw err nosrcip +WARNING: translation string unused: fwdfw err notgtip WARNING: translation string unused: fwdfw err prot_port1 WARNING: translation string unused: fwdfw final_rule WARNING: translation string unused: fwdfw from diff --git a/doc/language_issues.es b/doc/language_issues.es index 636b05f1e..8ff311df9 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -593,6 +593,8 @@ WARNING: untranslated string: ccd err invalidname WARNING: untranslated string: ccd err invalidnet WARNING: untranslated string: ccd err irouteexist WARNING: untranslated string: ccd err isipsecnet +WARNING: untranslated string: ccd err isipsecrw +WARNING: untranslated string: ccd err isovpnn2n WARNING: untranslated string: ccd err isovpnnet WARNING: untranslated string: ccd err issubnet WARNING: untranslated string: ccd err name @@ -627,6 +629,7 @@ WARNING: untranslated string: dnsforward edit an entry WARNING: untranslated string: dnsforward entries WARNING: untranslated string: dnsforward forward_server WARNING: untranslated string: dnsforward zone +WARNING: untranslated string: downlink WARNING: untranslated string: dpd delay WARNING: untranslated string: dpd timeout WARNING: untranslated string: drop action @@ -637,6 +640,7 @@ WARNING: untranslated string: drop outgoing WARNING: untranslated string: emerging rules WARNING: untranslated string: encryption WARNING: untranslated string: entropy +WARNING: untranslated string: entropy graphs WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled WARNING: untranslated string: fireinfo is enabled @@ -679,9 +683,7 @@ WARNING: untranslated string: fwdfw dnat porterr WARNING: untranslated string: fwdfw dnat porterr2 WARNING: untranslated string: fwdfw edit WARNING: untranslated string: fwdfw err nosrc -WARNING: untranslated string: fwdfw err nosrcip WARNING: untranslated string: fwdfw err notgt -WARNING: untranslated string: fwdfw err notgtip WARNING: untranslated string: fwdfw err prot_port WARNING: untranslated string: fwdfw err remark WARNING: untranslated string: fwdfw err ruleexists @@ -727,6 +729,7 @@ WARNING: untranslated string: fwdfw use nat WARNING: untranslated string: fwdfw use srcport WARNING: untranslated string: fwdfw use srv WARNING: untranslated string: fwdfw useless rule +WARNING: untranslated string: fwdfw warn1 WARNING: untranslated string: fwdfw wd_fri WARNING: untranslated string: fwdfw wd_mon WARNING: untranslated string: fwdfw wd_sat @@ -801,6 +804,7 @@ WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome WARNING: untranslated string: grouptype +WARNING: untranslated string: hardware support WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout @@ -814,6 +818,7 @@ WARNING: untranslated string: maximum WARNING: untranslated string: minimum WARNING: untranslated string: minute WARNING: untranslated string: most preferred +WARNING: untranslated string: no hardware random number generator WARNING: untranslated string: notice WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used @@ -860,6 +865,8 @@ WARNING: untranslated string: snat new source ip address WARNING: untranslated string: ssh WARNING: untranslated string: static routes WARNING: untranslated string: support donation +WARNING: untranslated string: system has hwrng +WARNING: untranslated string: system has rdrand WARNING: untranslated string: system information WARNING: untranslated string: tor WARNING: untranslated string: tor accounting @@ -909,6 +916,7 @@ WARNING: untranslated string: tor traffic limit hard WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: uplink WARNING: untranslated string: uptime load average WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: visit us at diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 30cc1f1f7..69f260de5 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -603,6 +603,8 @@ WARNING: untranslated string: ccd err invalidname WARNING: untranslated string: ccd err invalidnet WARNING: untranslated string: ccd err irouteexist WARNING: untranslated string: ccd err isipsecnet +WARNING: untranslated string: ccd err isipsecrw +WARNING: untranslated string: ccd err isovpnn2n WARNING: untranslated string: ccd err isovpnnet WARNING: untranslated string: ccd err issubnet WARNING: untranslated string: ccd err name @@ -638,6 +640,7 @@ WARNING: untranslated string: dnsforward edit an entry WARNING: untranslated string: dnsforward entries WARNING: untranslated string: dnsforward forward_server WARNING: untranslated string: dnsforward zone +WARNING: untranslated string: downlink WARNING: untranslated string: dpd delay WARNING: untranslated string: dpd timeout WARNING: untranslated string: drop action @@ -648,6 +651,7 @@ WARNING: untranslated string: drop outgoing WARNING: untranslated string: emerging rules WARNING: untranslated string: encryption WARNING: untranslated string: entropy +WARNING: untranslated string: entropy graphs WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled WARNING: untranslated string: fireinfo is enabled @@ -690,9 +694,7 @@ WARNING: untranslated string: fwdfw dnat porterr WARNING: untranslated string: fwdfw dnat porterr2 WARNING: untranslated string: fwdfw edit WARNING: untranslated string: fwdfw err nosrc -WARNING: untranslated string: fwdfw err nosrcip WARNING: untranslated string: fwdfw err notgt -WARNING: untranslated string: fwdfw err notgtip WARNING: untranslated string: fwdfw err prot_port WARNING: untranslated string: fwdfw err remark WARNING: untranslated string: fwdfw err ruleexists @@ -738,6 +740,7 @@ WARNING: untranslated string: fwdfw use nat WARNING: untranslated string: fwdfw use srcport WARNING: untranslated string: fwdfw use srv WARNING: untranslated string: fwdfw useless rule +WARNING: untranslated string: fwdfw warn1 WARNING: untranslated string: fwdfw wd_fri WARNING: untranslated string: fwdfw wd_mon WARNING: untranslated string: fwdfw wd_sat @@ -812,6 +815,7 @@ WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome WARNING: untranslated string: grouptype +WARNING: untranslated string: hardware support WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout @@ -825,6 +829,7 @@ WARNING: untranslated string: maximum WARNING: untranslated string: minimum WARNING: untranslated string: minute WARNING: untranslated string: most preferred +WARNING: untranslated string: no hardware random number generator WARNING: untranslated string: notice WARNING: untranslated string: ntp common settings WARNING: untranslated string: ntp sync @@ -868,6 +873,8 @@ WARNING: untranslated string: snort working WARNING: untranslated string: ssh WARNING: untranslated string: static routes WARNING: untranslated string: support donation +WARNING: untranslated string: system has hwrng +WARNING: untranslated string: system has rdrand WARNING: untranslated string: system information WARNING: untranslated string: tor WARNING: untranslated string: tor accounting @@ -917,6 +924,7 @@ WARNING: untranslated string: tor traffic limit hard WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: uplink WARNING: untranslated string: upload new ruleset WARNING: untranslated string: uptime load average WARNING: untranslated string: urlfilter file ext block diff --git a/doc/language_issues.nl b/doc/language_issues.nl index e04aae319..59c9ecbbf 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -591,6 +591,8 @@ WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent WARNING: untranslated string: bit WARNING: untranslated string: bytes +WARNING: untranslated string: ccd err isipsecrw +WARNING: untranslated string: ccd err isovpnn2n WARNING: untranslated string: ccd iroute2 WARNING: untranslated string: dead peer detection WARNING: untranslated string: default ip @@ -603,6 +605,7 @@ WARNING: untranslated string: dnsforward edit an entry WARNING: untranslated string: dnsforward entries WARNING: untranslated string: dnsforward forward_server WARNING: untranslated string: dnsforward zone +WARNING: untranslated string: downlink WARNING: untranslated string: dpd delay WARNING: untranslated string: dpd timeout WARNING: untranslated string: drop action @@ -612,6 +615,7 @@ WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing WARNING: untranslated string: encryption WARNING: untranslated string: entropy +WARNING: untranslated string: entropy graphs WARNING: untranslated string: firewall rules WARNING: untranslated string: first WARNING: untranslated string: fw default drop @@ -637,9 +641,7 @@ WARNING: untranslated string: fwdfw dnat porterr WARNING: untranslated string: fwdfw dnat porterr2 WARNING: untranslated string: fwdfw edit WARNING: untranslated string: fwdfw err nosrc -WARNING: untranslated string: fwdfw err nosrcip WARNING: untranslated string: fwdfw err notgt -WARNING: untranslated string: fwdfw err notgtip WARNING: untranslated string: fwdfw err prot_port WARNING: untranslated string: fwdfw err remark WARNING: untranslated string: fwdfw err ruleexists @@ -685,6 +687,7 @@ WARNING: untranslated string: fwdfw use nat WARNING: untranslated string: fwdfw use srcport WARNING: untranslated string: fwdfw use srv WARNING: untranslated string: fwdfw useless rule +WARNING: untranslated string: fwdfw warn1 WARNING: untranslated string: fwdfw wd_fri WARNING: untranslated string: fwdfw wd_mon WARNING: untranslated string: fwdfw wd_sat @@ -759,6 +762,7 @@ WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome WARNING: untranslated string: grouptype +WARNING: untranslated string: hardware support WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout @@ -771,6 +775,7 @@ WARNING: untranslated string: mac filter WARNING: untranslated string: maximum WARNING: untranslated string: minimum WARNING: untranslated string: most preferred +WARNING: untranslated string: no hardware random number generator WARNING: untranslated string: notice WARNING: untranslated string: openvpn network WARNING: untranslated string: ovpn mgmt in root range @@ -787,6 +792,8 @@ WARNING: untranslated string: routing table WARNING: untranslated string: snat new source ip address WARNING: untranslated string: ssh WARNING: untranslated string: support donation +WARNING: untranslated string: system has hwrng +WARNING: untranslated string: system has rdrand WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes @@ -835,6 +842,7 @@ WARNING: untranslated string: tor traffic limit hard WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: uplink WARNING: untranslated string: uptime load average WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: wlan client diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 636b05f1e..8ff311df9 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -593,6 +593,8 @@ WARNING: untranslated string: ccd err invalidname WARNING: untranslated string: ccd err invalidnet WARNING: untranslated string: ccd err irouteexist WARNING: untranslated string: ccd err isipsecnet +WARNING: untranslated string: ccd err isipsecrw +WARNING: untranslated string: ccd err isovpnn2n WARNING: untranslated string: ccd err isovpnnet WARNING: untranslated string: ccd err issubnet WARNING: untranslated string: ccd err name @@ -627,6 +629,7 @@ WARNING: untranslated string: dnsforward edit an entry WARNING: untranslated string: dnsforward entries WARNING: untranslated string: dnsforward forward_server WARNING: untranslated string: dnsforward zone +WARNING: untranslated string: downlink WARNING: untranslated string: dpd delay WARNING: untranslated string: dpd timeout WARNING: untranslated string: drop action @@ -637,6 +640,7 @@ WARNING: untranslated string: drop outgoing WARNING: untranslated string: emerging rules WARNING: untranslated string: encryption WARNING: untranslated string: entropy +WARNING: untranslated string: entropy graphs WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled WARNING: untranslated string: fireinfo is enabled @@ -679,9 +683,7 @@ WARNING: untranslated string: fwdfw dnat porterr WARNING: untranslated string: fwdfw dnat porterr2 WARNING: untranslated string: fwdfw edit WARNING: untranslated string: fwdfw err nosrc -WARNING: untranslated string: fwdfw err nosrcip WARNING: untranslated string: fwdfw err notgt -WARNING: untranslated string: fwdfw err notgtip WARNING: untranslated string: fwdfw err prot_port WARNING: untranslated string: fwdfw err remark WARNING: untranslated string: fwdfw err ruleexists @@ -727,6 +729,7 @@ WARNING: untranslated string: fwdfw use nat WARNING: untranslated string: fwdfw use srcport WARNING: untranslated string: fwdfw use srv WARNING: untranslated string: fwdfw useless rule +WARNING: untranslated string: fwdfw warn1 WARNING: untranslated string: fwdfw wd_fri WARNING: untranslated string: fwdfw wd_mon WARNING: untranslated string: fwdfw wd_sat @@ -801,6 +804,7 @@ WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome WARNING: untranslated string: grouptype +WARNING: untranslated string: hardware support WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout @@ -814,6 +818,7 @@ WARNING: untranslated string: maximum WARNING: untranslated string: minimum WARNING: untranslated string: minute WARNING: untranslated string: most preferred +WARNING: untranslated string: no hardware random number generator WARNING: untranslated string: notice WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used @@ -860,6 +865,8 @@ WARNING: untranslated string: snat new source ip address WARNING: untranslated string: ssh WARNING: untranslated string: static routes WARNING: untranslated string: support donation +WARNING: untranslated string: system has hwrng +WARNING: untranslated string: system has rdrand WARNING: untranslated string: system information WARNING: untranslated string: tor WARNING: untranslated string: tor accounting @@ -909,6 +916,7 @@ WARNING: untranslated string: tor traffic limit hard WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: uplink WARNING: untranslated string: uptime load average WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: visit us at diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 195ffc14c..c7679b7fb 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -596,6 +596,8 @@ WARNING: untranslated string: ccd err invalidname WARNING: untranslated string: ccd err invalidnet WARNING: untranslated string: ccd err irouteexist WARNING: untranslated string: ccd err isipsecnet +WARNING: untranslated string: ccd err isipsecrw +WARNING: untranslated string: ccd err isovpnn2n WARNING: untranslated string: ccd err isovpnnet WARNING: untranslated string: ccd err issubnet WARNING: untranslated string: ccd err name @@ -632,6 +634,7 @@ WARNING: untranslated string: dnsforward edit an entry WARNING: untranslated string: dnsforward entries WARNING: untranslated string: dnsforward forward_server WARNING: untranslated string: dnsforward zone +WARNING: untranslated string: downlink WARNING: untranslated string: dpd delay WARNING: untranslated string: dpd timeout WARNING: untranslated string: drop action @@ -642,6 +645,7 @@ WARNING: untranslated string: drop outgoing WARNING: untranslated string: emerging rules WARNING: untranslated string: encryption WARNING: untranslated string: entropy +WARNING: untranslated string: entropy graphs WARNING: untranslated string: extrahd because there is already a device mounted WARNING: untranslated string: extrahd cant umount WARNING: untranslated string: extrahd install or load driver @@ -674,9 +678,7 @@ WARNING: untranslated string: fwdfw dnat porterr WARNING: untranslated string: fwdfw dnat porterr2 WARNING: untranslated string: fwdfw edit WARNING: untranslated string: fwdfw err nosrc -WARNING: untranslated string: fwdfw err nosrcip WARNING: untranslated string: fwdfw err notgt -WARNING: untranslated string: fwdfw err notgtip WARNING: untranslated string: fwdfw err prot_port WARNING: untranslated string: fwdfw err remark WARNING: untranslated string: fwdfw err ruleexists @@ -722,6 +724,7 @@ WARNING: untranslated string: fwdfw use nat WARNING: untranslated string: fwdfw use srcport WARNING: untranslated string: fwdfw use srv WARNING: untranslated string: fwdfw useless rule +WARNING: untranslated string: fwdfw warn1 WARNING: untranslated string: fwdfw wd_fri WARNING: untranslated string: fwdfw wd_mon WARNING: untranslated string: fwdfw wd_sat @@ -796,6 +799,7 @@ WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome WARNING: untranslated string: grouptype +WARNING: untranslated string: hardware support WARNING: untranslated string: incoming traffic in bytes per second WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay @@ -810,6 +814,7 @@ WARNING: untranslated string: maximum WARNING: untranslated string: minimum WARNING: untranslated string: minute WARNING: untranslated string: most preferred +WARNING: untranslated string: no hardware random number generator WARNING: untranslated string: notice WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used @@ -850,6 +855,8 @@ WARNING: untranslated string: snat new source ip address WARNING: untranslated string: ssh WARNING: untranslated string: static routes WARNING: untranslated string: support donation +WARNING: untranslated string: system has hwrng +WARNING: untranslated string: system has rdrand WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes @@ -898,6 +905,7 @@ WARNING: untranslated string: tor traffic limit hard WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: uplink WARNING: untranslated string: uptime load average WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: visit us at diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 3f27ba273..abcb6ee32 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -228,6 +228,8 @@ WARNING: translation string unused: from warn email bad WARNING: translation string unused: fwdfw MODE1 WARNING: translation string unused: fwdfw MODE2 WARNING: translation string unused: fwdfw addrule +WARNING: translation string unused: fwdfw err nosrcip +WARNING: translation string unused: fwdfw err notgtip WARNING: translation string unused: fwdfw err prot_port1 WARNING: translation string unused: fwdfw final_rule WARNING: translation string unused: fwdfw from @@ -636,10 +638,13 @@ WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent WARNING: untranslated string: bit WARNING: untranslated string: bytes +WARNING: untranslated string: ccd err isipsecrw +WARNING: untranslated string: ccd err isovpnn2n WARNING: untranslated string: dead peer detection WARNING: untranslated string: default ip WARNING: untranslated string: dnat address WARNING: untranslated string: dns servers +WARNING: untranslated string: downlink WARNING: untranslated string: dpd delay WARNING: untranslated string: dpd timeout WARNING: untranslated string: drop action @@ -649,14 +654,17 @@ WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing WARNING: untranslated string: encryption WARNING: untranslated string: entropy +WARNING: untranslated string: entropy graphs WARNING: untranslated string: firewall rules WARNING: untranslated string: first WARNING: untranslated string: fwdfw dnat extport WARNING: untranslated string: fwdfw dnat nochoice WARNING: untranslated string: fwdfw dnat porterr2 WARNING: untranslated string: fwdfw hint mac +WARNING: untranslated string: fwdfw warn1 WARNING: untranslated string: fwhost err hostip WARNING: untranslated string: grouptype +WARNING: untranslated string: hardware support WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout @@ -669,6 +677,7 @@ WARNING: untranslated string: mac filter WARNING: untranslated string: maximum WARNING: untranslated string: minimum WARNING: untranslated string: most preferred +WARNING: untranslated string: no hardware random number generator WARNING: untranslated string: notice WARNING: untranslated string: openvpn network WARNING: untranslated string: ovpn mgmt in root range @@ -684,7 +693,10 @@ WARNING: untranslated string: routing table WARNING: untranslated string: snat new source ip address WARNING: untranslated string: ssh WARNING: untranslated string: support donation +WARNING: untranslated string: system has hwrng +WARNING: untranslated string: system has rdrand WARNING: untranslated string: tor directory port WARNING: untranslated string: tor errmsg invalid directory port +WARNING: untranslated string: uplink WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: wlan clients diff --git a/doc/language_missings b/doc/language_missings index 2ca9bf665..8e13c908c 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -39,6 +39,8 @@ < ccd err iroute < ccd err irouteexist < ccd err isipsecnet +< ccd err isipsecrw +< ccd err isovpnn2n < ccd err isovpnnet < ccd err issubnet < ccd err name @@ -75,6 +77,7 @@ < dnsforward forward_server < dnsforward zone < dns servers +< downlink < dpd delay < dpd timeout < drop action @@ -84,6 +87,7 @@ < drop outgoing < encryption < entropy +< entropy graphs < fireinfo ipfire version < fireinfo is disabled < fireinfo is enabled @@ -185,6 +189,7 @@ < fwdfw use nat < fwdfw use srcport < fwdfw use srv +< fwdfw warn1 < fwdfw wd_fri < fwdfw wd_mon < fwdfw wd_sat @@ -278,6 +283,7 @@ < fw settings remark < fw settings ruletable < grouptype +< hardware support < integrity < invalid input for dpd delay < invalid input for dpd timeout @@ -292,6 +298,7 @@ < minimum < minute < most preferred +< no hardware random number generator < notice < ntp common settings < ntp sync @@ -333,6 +340,8 @@ < ssh < static routes < support donation +< system has hwrng +< system has rdrand < system information < tor < tor 0 = disabled @@ -389,6 +398,7 @@ < tor use exit nodes < updxlrtr sources < updxlrtr standard view +< uplink < upload new ruleset < uptime < uptime load average @@ -483,6 +493,8 @@ < ccd err iroute < ccd err irouteexist < ccd err isipsecnet +< ccd err isipsecrw +< ccd err isovpnn2n < ccd err isovpnnet < ccd err issubnet < ccd err name @@ -518,6 +530,7 @@ < dnsforward forward_server < dnsforward zone < dns servers +< downlink < dpd delay < dpd timeout < drop action @@ -527,6 +540,7 @@ < drop outgoing < encryption < entropy +< entropy graphs < fireinfo ipfire version < fireinfo is disabled < fireinfo is enabled @@ -628,6 +642,7 @@ < fwdfw use nat < fwdfw use srcport < fwdfw use srv +< fwdfw warn1 < fwdfw wd_fri < fwdfw wd_mon < fwdfw wd_sat @@ -721,6 +736,7 @@ < fw settings remark < fw settings ruletable < grouptype +< hardware support < integrity < invalid input for dpd delay < invalid input for dpd timeout @@ -735,6 +751,7 @@ < minimum < minute < most preferred +< no hardware random number generator < notice < openvpn default < openvpn destination port used @@ -792,6 +809,8 @@ < ssh < static routes < support donation +< system has hwrng +< system has rdrand < system information < tor < tor 0 = disabled @@ -848,6 +867,7 @@ < tor use exit nodes < updxlrtr sources < updxlrtr standard view +< uplink < uptime < uptime load average < urlfilter redirect template @@ -918,6 +938,8 @@ < ccd err iroute < ccd err irouteexist < ccd err isipsecnet +< ccd err isipsecrw +< ccd err isovpnn2n < ccd err isovpnnet < ccd err issubnet < ccd err name @@ -953,6 +975,7 @@ < dnsforward forward_server < dnsforward zone < dns servers +< downlink < dpd delay < dpd timeout < drop action @@ -962,6 +985,7 @@ < drop outgoing < encryption < entropy +< entropy graphs < extrahd because there is already a device mounted < extrahd cant umount < extrahd install or load driver @@ -1055,6 +1079,7 @@ < fwdfw use nat < fwdfw use srcport < fwdfw use srv +< fwdfw warn1 < fwdfw wd_fri < fwdfw wd_mon < fwdfw wd_sat @@ -1148,6 +1173,7 @@ < fw settings remark < fw settings ruletable < grouptype +< hardware support < integrity < invalid input for dpd delay < invalid input for dpd timeout @@ -1162,6 +1188,7 @@ < minimum < minute < most preferred +< no hardware random number generator < notice < openvpn default < openvpn destination port used @@ -1204,6 +1231,8 @@ < ssh < static routes < support donation +< system has hwrng +< system has rdrand < tor < tor 0 = disabled < tor accounting @@ -1259,6 +1288,7 @@ < tor use exit nodes < updxlrtr sources < updxlrtr standard view +< uplink < uptime < uptime load average < urlfilter redirect template @@ -1330,6 +1360,8 @@ < ccd err iroute < ccd err irouteexist < ccd err isipsecnet +< ccd err isipsecrw +< ccd err isovpnn2n < ccd err isovpnnet < ccd err issubnet < ccd err name @@ -1367,6 +1399,7 @@ < dnsforward forward_server < dnsforward zone < dns servers +< downlink < dpd delay < dpd timeout < drop action @@ -1377,6 +1410,7 @@ < Edit an existing route < encryption < entropy +< entropy graphs < extrahd because there is already a device mounted < extrahd cant umount < extrahd install or load driver @@ -1471,6 +1505,7 @@ < fwdfw use nat < fwdfw use srcport < fwdfw use srv +< fwdfw warn1 < fwdfw wd_fri < fwdfw wd_mon < fwdfw wd_sat @@ -1564,6 +1599,7 @@ < fw settings remark < fw settings ruletable < grouptype +< hardware support < hour-graph < incoming traffic in bytes per second < integrity @@ -1581,6 +1617,7 @@ < minute < month-graph < most preferred +< no hardware random number generator < notice < openvpn default < openvpn destination port used @@ -1620,6 +1657,8 @@ < ssh < static routes < support donation +< system has hwrng +< system has rdrand < tor < tor 0 = disabled < tor accounting @@ -1675,6 +1714,7 @@ < tor use exit nodes < updxlrtr sources < updxlrtr standard view +< uplink < uptime < uptime load average < urlfilter redirect template diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 67aa70f7b..1042707d8 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -482,9 +482,9 @@ 'ccd err irouteexist' => 'Diese Route wird bereits verwendet.', 'ccd err isipsecnet' => 'Diese Subnetzadresse wird bereits für ein IPsec-Netzwerk verwendet.', 'ccd err isipsecrw' => 'Diese Subnetzadresse wird bereits für das IPsec-RW Netz verwendet.', -'ccd err isovpnnet' => 'Subnetzadresse wird für bereits für den OpenVPN-Server verwendet!', -'ccd err isovpnn2n' => 'Subnetzadresse wird für bereits für ein OpenVPN N2N verwendet.', -'ccd err issubnet' => 'Subnetzadresse wird bereits verwendet.', +'ccd err isovpnn2n' => 'Die Subnetzadresse wird für bereits für eine OpenVPN Netz-zu-Netz-Verbindung verwendet.', +'ccd err isovpnnet' => 'Die Subnetzadresse wird für bereits für den OpenVPN-Server verwendet.', +'ccd err issubnet' => 'Die Subnetzadresse wird bereits verwendet.', 'ccd err name' => 'Es muss ein Name angegeben werden.', 'ccd err nameexist' => 'Name existiert bereits.', 'ccd err netadr' => 'Subnetzadresse ist ungültig oder Bereich zu groß.', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index a1d52f8d2..62facdc08 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -501,8 +501,8 @@ 'ccd err irouteexist' => 'This route is already in use.', 'ccd err isipsecnet' => 'The given subnet address is already used by an IPsec network.', 'ccd err isipsecrw' => 'The given subnet address is already used by the IPsec rw network.', -'ccd err isovpnnet' => 'Subnet address already in use for OpenVPN Server.', -'ccd err isovpnn2n' => 'Subnet address already in use for an OpenVPN N2N.', +'ccd err isovpnn2n' => 'The subnet address is already in use for an OpenVPN net-to-net connection.', +'ccd err isovpnnet' => 'The subnet address is already in use for the OpenVPN server.', 'ccd err issubnet' => 'Subnet address already in use.', 'ccd err name' => 'Please choose a name.', 'ccd err nameexist' => 'Name already exists.', From dadffbf738474d649b7177d56acedbad51d6e603 Mon Sep 17 00:00:00 2001 From: Alexander Marx Date: Thu, 13 Mar 2014 15:35:14 +0100 Subject: [PATCH 12/35] fwhost.cgi: disable "use warnings" --- html/cgi-bin/fwhosts.cgi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index 049233c43..2d128f55d 100644 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -21,7 +21,8 @@ use strict; # enable only the following on debugging purpose -use warnings; +#use warnings; + use Sort::Naturally; use CGI::Carp 'fatalsToBrowser'; no warnings 'uninitialized'; From 2b6c5f257980b0f9e4d31f26ac1945092a45df6a Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 13 Mar 2014 15:43:52 +0100 Subject: [PATCH 13/35] ipfire theme: Fix default setting for hostname in title. --- html/html/themes/ipfire/include/functions.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl index f71181e63..0c47cd456 100644 --- a/html/html/themes/ipfire/include/functions.pl +++ b/html/html/themes/ipfire/include/functions.pl @@ -110,7 +110,7 @@ sub openpage { &genmenu(); my $headline = "IPFire"; - if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') { + if (($settings{'WINDOWWITHHOSTNAME'} eq 'on') || ($settings{'WINDOWWITHHOSTNAME'} eq '')) { $headline = "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}"; } From d5e94f72f6fe617f5b1653eaa24fbe0fdc3dde3b Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 15 Mar 2014 15:08:37 +0100 Subject: [PATCH 14/35] sudo: Update to 1.8.10p1. --- config/rootfiles/common/sudo | 79 +++++++++++++++++++++++++++++--- config/rootfiles/core/76/exclude | 1 + lfs/sudo | 18 +++++--- 3 files changed, 86 insertions(+), 12 deletions(-) diff --git a/config/rootfiles/common/sudo b/config/rootfiles/common/sudo index 4aa763ef7..c904fc337 100644 --- a/config/rootfiles/common/sudo +++ b/config/rootfiles/common/sudo @@ -1,10 +1,77 @@ etc/sudoers +etc/sudoers.d usr/bin/sudo usr/bin/sudoedit -usr/lib/sudo_noexec.la -usr/lib/sudo_noexec.so -#usr/man/man5/sudoers.5 -#usr/man/man8/sudo.8 -#usr/man/man8/sudoedit.8 -#usr/man/man8/visudo.8 +usr/bin/sudoreplay +#usr/include/sudo_plugin.h +usr/lib/sudo +usr/lib/sudo/group_file.so +usr/lib/sudo/sudo_noexec.so +usr/lib/sudo/sudoers.so +usr/lib/sudo/system_group.so usr/sbin/visudo +#usr/share/doc/sudo +#usr/share/doc/sudo/CONTRIBUTORS +#usr/share/doc/sudo/ChangeLog +#usr/share/doc/sudo/HISTORY +#usr/share/doc/sudo/LICENSE +#usr/share/doc/sudo/NEWS +#usr/share/doc/sudo/README +#usr/share/doc/sudo/TROUBLESHOOTING +#usr/share/doc/sudo/UPGRADE +#usr/share/doc/sudo/sample.pam +#usr/share/doc/sudo/sample.sudo.conf +#usr/share/doc/sudo/sample.sudoers +#usr/share/doc/sudo/sample.syslog.conf +#usr/share/locale/ca/LC_MESSAGES/sudo.mo +#usr/share/locale/cs/LC_MESSAGES/sudo.mo +#usr/share/locale/cs/LC_MESSAGES/sudoers.mo +#usr/share/locale/da/LC_MESSAGES/sudo.mo +#usr/share/locale/da/LC_MESSAGES/sudoers.mo +#usr/share/locale/de/LC_MESSAGES/sudo.mo +#usr/share/locale/de/LC_MESSAGES/sudoers.mo +#usr/share/locale/eo/LC_MESSAGES/sudo.mo +#usr/share/locale/eo/LC_MESSAGES/sudoers.mo +#usr/share/locale/es/LC_MESSAGES/sudo.mo +#usr/share/locale/eu/LC_MESSAGES/sudo.mo +#usr/share/locale/eu/LC_MESSAGES/sudoers.mo +#usr/share/locale/fi/LC_MESSAGES/sudo.mo +#usr/share/locale/fi/LC_MESSAGES/sudoers.mo +#usr/share/locale/fr/LC_MESSAGES/sudo.mo +#usr/share/locale/gl/LC_MESSAGES/sudo.mo +#usr/share/locale/hr/LC_MESSAGES/sudo.mo +#usr/share/locale/hr/LC_MESSAGES/sudoers.mo +#usr/share/locale/it/LC_MESSAGES/sudo.mo +#usr/share/locale/it/LC_MESSAGES/sudoers.mo +#usr/share/locale/ja/LC_MESSAGES/sudo.mo +#usr/share/locale/ja/LC_MESSAGES/sudoers.mo +#usr/share/locale/lt/LC_MESSAGES/sudoers.mo +#usr/share/locale/nl/LC_MESSAGES/sudo.mo +#usr/share/locale/nl/LC_MESSAGES/sudoers.mo +#usr/share/locale/pl/LC_MESSAGES/sudo.mo +#usr/share/locale/pl/LC_MESSAGES/sudoers.mo +#usr/share/locale/pt_BR/LC_MESSAGES/sudo.mo +#usr/share/locale/pt_BR/LC_MESSAGES/sudoers.mo +#usr/share/locale/ru/LC_MESSAGES/sudo.mo +#usr/share/locale/sl/LC_MESSAGES/sudo.mo +#usr/share/locale/sl/LC_MESSAGES/sudoers.mo +#usr/share/locale/sr/LC_MESSAGES/sudo.mo +#usr/share/locale/sr/LC_MESSAGES/sudoers.mo +#usr/share/locale/sv/LC_MESSAGES/sudo.mo +#usr/share/locale/sv/LC_MESSAGES/sudoers.mo +#usr/share/locale/tr/LC_MESSAGES/sudo.mo +#usr/share/locale/tr/LC_MESSAGES/sudoers.mo +#usr/share/locale/uk/LC_MESSAGES/sudo.mo +#usr/share/locale/uk/LC_MESSAGES/sudoers.mo +#usr/share/locale/vi/LC_MESSAGES/sudo.mo +#usr/share/locale/vi/LC_MESSAGES/sudoers.mo +#usr/share/locale/zh_CN/LC_MESSAGES/sudo.mo +#usr/share/locale/zh_CN/LC_MESSAGES/sudoers.mo +#usr/share/man/man5/sudo.conf.5 +#usr/share/man/man5/sudoers.5 +#usr/share/man/man8/sudo.8 +#usr/share/man/man8/sudo_plugin.8 +#usr/share/man/man8/sudoedit.8 +#usr/share/man/man8/sudoreplay.8 +#usr/share/man/man8/visudo.8 +var/lib/sudo diff --git a/config/rootfiles/core/76/exclude b/config/rootfiles/core/76/exclude index a468d0a61..18e9b4d24 100644 --- a/config/rootfiles/core/76/exclude +++ b/config/rootfiles/core/76/exclude @@ -9,6 +9,7 @@ etc/shadow etc/ssh/ssh_config etc/ssh/sshd_config etc/ssl/openssl.cnf +etc/sudoers etc/sysconfig/firewall.local etc/sysconfig/rc.local etc/udev/rules.d/30-persistent-network.rules diff --git a/lfs/sudo b/lfs/sudo index 15463c50d..7c3feabb7 100644 --- a/lfs/sudo +++ b/lfs/sudo @@ -24,7 +24,7 @@ include Config -VER = 1.6.8p12 +VER = 1.8.10p1 THISAPP = sudo-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b29893c06192df6230dd5f340f3badf5 +$(DL_FILE)_MD5 = 1d9c2bc5aaf02608343d17b9a666e8e1 install : $(TARGET) @@ -70,10 +70,16 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-envvar_fix-1.patch - cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/lib \ - --enable-noargs-shell --with-ignore-dot --with-all-insults \ - --enable-shell-sets-home && \ + cd $(DIR_APP) && \ + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib \ + --with-logging=syslog \ + --with-logfac=authpriv \ + --with-env-editor \ + --with-ignore-dot \ + --with-tty-tickets \ + --with-passpromt="[sudo] password for %p: " cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) From 835a1e2863fac9065690b5a79c0ca120f398e533 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 16 Mar 2014 16:02:18 +0100 Subject: [PATCH 15/35] tzdata: Update to 2014a. --- config/rootfiles/common/tzdata | 32 +++++++++----------------------- lfs/tzdata | 34 +++++++++++++++++++++------------- 2 files changed, 30 insertions(+), 36 deletions(-) diff --git a/config/rootfiles/common/tzdata b/config/rootfiles/common/tzdata index 7362a0f8a..2ffb7b56e 100644 --- a/config/rootfiles/common/tzdata +++ b/config/rootfiles/common/tzdata @@ -281,6 +281,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/Asia/Kashgar #usr/share/zoneinfo/Asia/Kathmandu #usr/share/zoneinfo/Asia/Katmandu ++usr/share/zoneinfo/Asia/Khandyga #usr/share/zoneinfo/Asia/Kolkata #usr/share/zoneinfo/Asia/Krasnoyarsk #usr/share/zoneinfo/Asia/Kuala_Lumpur @@ -304,9 +305,6 @@ usr/share/zoneinfo #usr/share/zoneinfo/Asia/Qyzylorda #usr/share/zoneinfo/Asia/Rangoon #usr/share/zoneinfo/Asia/Riyadh -#usr/share/zoneinfo/Asia/Riyadh87 -#usr/share/zoneinfo/Asia/Riyadh88 -#usr/share/zoneinfo/Asia/Riyadh89 #usr/share/zoneinfo/Asia/Saigon #usr/share/zoneinfo/Asia/Sakhalin #usr/share/zoneinfo/Asia/Samarkand @@ -325,6 +323,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/Asia/Ulaanbaatar #usr/share/zoneinfo/Asia/Ulan_Bator #usr/share/zoneinfo/Asia/Urumqi ++usr/share/zoneinfo/Asia/Ust-Nera #usr/share/zoneinfo/Asia/Vientiane #usr/share/zoneinfo/Asia/Vladivostok #usr/share/zoneinfo/Asia/Yakutsk @@ -440,6 +439,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/Europe/Brussels #usr/share/zoneinfo/Europe/Bucharest #usr/share/zoneinfo/Europe/Budapest ++usr/share/zoneinfo/Europe/Busingen #usr/share/zoneinfo/Europe/Chisinau #usr/share/zoneinfo/Europe/Copenhagen #usr/share/zoneinfo/Europe/Dublin @@ -524,10 +524,6 @@ usr/share/zoneinfo #usr/share/zoneinfo/Mexico/BajaNorte #usr/share/zoneinfo/Mexico/BajaSur #usr/share/zoneinfo/Mexico/General -#usr/share/zoneinfo/Mideast -#usr/share/zoneinfo/Mideast/Riyadh87 -#usr/share/zoneinfo/Mideast/Riyadh88 -#usr/share/zoneinfo/Mideast/Riyadh89 #usr/share/zoneinfo/NZ #usr/share/zoneinfo/NZ-CHAT #usr/share/zoneinfo/Navajo @@ -886,6 +882,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Asia/Kashgar #usr/share/zoneinfo/posix/Asia/Kathmandu #usr/share/zoneinfo/posix/Asia/Katmandu ++usr/share/zoneinfo/posix/Asia/Khandyga #usr/share/zoneinfo/posix/Asia/Kolkata #usr/share/zoneinfo/posix/Asia/Krasnoyarsk #usr/share/zoneinfo/posix/Asia/Kuala_Lumpur @@ -909,9 +906,6 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Asia/Qyzylorda #usr/share/zoneinfo/posix/Asia/Rangoon #usr/share/zoneinfo/posix/Asia/Riyadh -#usr/share/zoneinfo/posix/Asia/Riyadh87 -#usr/share/zoneinfo/posix/Asia/Riyadh88 -#usr/share/zoneinfo/posix/Asia/Riyadh89 #usr/share/zoneinfo/posix/Asia/Saigon #usr/share/zoneinfo/posix/Asia/Sakhalin #usr/share/zoneinfo/posix/Asia/Samarkand @@ -930,6 +924,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Asia/Ulaanbaatar #usr/share/zoneinfo/posix/Asia/Ulan_Bator #usr/share/zoneinfo/posix/Asia/Urumqi ++usr/share/zoneinfo/posix/Asia/Ust-Nera #usr/share/zoneinfo/posix/Asia/Vientiane #usr/share/zoneinfo/posix/Asia/Vladivostok #usr/share/zoneinfo/posix/Asia/Yakutsk @@ -1045,6 +1040,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Europe/Brussels #usr/share/zoneinfo/posix/Europe/Bucharest #usr/share/zoneinfo/posix/Europe/Budapest ++usr/share/zoneinfo/posix/Europe/Busingen #usr/share/zoneinfo/posix/Europe/Chisinau #usr/share/zoneinfo/posix/Europe/Copenhagen #usr/share/zoneinfo/posix/Europe/Dublin @@ -1093,7 +1089,6 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Europe/Zagreb #usr/share/zoneinfo/posix/Europe/Zaporozhye #usr/share/zoneinfo/posix/Europe/Zurich -#usr/share/zoneinfo/posix/Factory #usr/share/zoneinfo/posix/GB #usr/share/zoneinfo/posix/GB-Eire #usr/share/zoneinfo/posix/GMT @@ -1129,10 +1124,6 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Mexico/BajaNorte #usr/share/zoneinfo/posix/Mexico/BajaSur #usr/share/zoneinfo/posix/Mexico/General -#usr/share/zoneinfo/posix/Mideast -#usr/share/zoneinfo/posix/Mideast/Riyadh87 -#usr/share/zoneinfo/posix/Mideast/Riyadh88 -#usr/share/zoneinfo/posix/Mideast/Riyadh89 #usr/share/zoneinfo/posix/NZ #usr/share/zoneinfo/posix/NZ-CHAT #usr/share/zoneinfo/posix/Navajo @@ -1491,6 +1482,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Asia/Kashgar #usr/share/zoneinfo/right/Asia/Kathmandu #usr/share/zoneinfo/right/Asia/Katmandu ++usr/share/zoneinfo/right/Asia/Khandyga #usr/share/zoneinfo/right/Asia/Kolkata #usr/share/zoneinfo/right/Asia/Krasnoyarsk #usr/share/zoneinfo/right/Asia/Kuala_Lumpur @@ -1514,9 +1506,6 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Asia/Qyzylorda #usr/share/zoneinfo/right/Asia/Rangoon #usr/share/zoneinfo/right/Asia/Riyadh -#usr/share/zoneinfo/right/Asia/Riyadh87 -#usr/share/zoneinfo/right/Asia/Riyadh88 -#usr/share/zoneinfo/right/Asia/Riyadh89 #usr/share/zoneinfo/right/Asia/Saigon #usr/share/zoneinfo/right/Asia/Sakhalin #usr/share/zoneinfo/right/Asia/Samarkand @@ -1535,6 +1524,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Asia/Ulaanbaatar #usr/share/zoneinfo/right/Asia/Ulan_Bator #usr/share/zoneinfo/right/Asia/Urumqi ++usr/share/zoneinfo/right/Asia/Ust-Nera #usr/share/zoneinfo/right/Asia/Vientiane #usr/share/zoneinfo/right/Asia/Vladivostok #usr/share/zoneinfo/right/Asia/Yakutsk @@ -1650,6 +1640,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Europe/Brussels #usr/share/zoneinfo/right/Europe/Bucharest #usr/share/zoneinfo/right/Europe/Budapest ++usr/share/zoneinfo/right/Europe/Busingen #usr/share/zoneinfo/right/Europe/Chisinau #usr/share/zoneinfo/right/Europe/Copenhagen #usr/share/zoneinfo/right/Europe/Dublin @@ -1698,7 +1689,6 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Europe/Zagreb #usr/share/zoneinfo/right/Europe/Zaporozhye #usr/share/zoneinfo/right/Europe/Zurich -#usr/share/zoneinfo/right/Factory #usr/share/zoneinfo/right/GB #usr/share/zoneinfo/right/GB-Eire #usr/share/zoneinfo/right/GMT @@ -1734,10 +1724,6 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Mexico/BajaNorte #usr/share/zoneinfo/right/Mexico/BajaSur #usr/share/zoneinfo/right/Mexico/General -#usr/share/zoneinfo/right/Mideast -#usr/share/zoneinfo/right/Mideast/Riyadh87 -#usr/share/zoneinfo/right/Mideast/Riyadh88 -#usr/share/zoneinfo/right/Mideast/Riyadh89 #usr/share/zoneinfo/right/NZ #usr/share/zoneinfo/right/NZ-CHAT #usr/share/zoneinfo/right/Navajo diff --git a/lfs/tzdata b/lfs/tzdata index edf5ff22d..c36b7a34f 100644 --- a/lfs/tzdata +++ b/lfs/tzdata @@ -24,15 +24,18 @@ include Config -VER = 2012h -TZDATA_VER = 2012h -TZCODE_VER = 2012h +VER = 2014a +TZDATA_VER = $(VER) +TZCODE_VER = $(VER) THISAPP = tzdata-$(VER) DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) +FILES = africa antarctica asia australasia europe \ + northamerica southamerica pacificnew etcetera backward + ############################################################################### # Top-level Rules ############################################################################### @@ -42,8 +45,8 @@ objects = tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz tzdata$(TZDATA_VER).tar.gz = $(DL_FROM)/tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz = $(DL_FROM)/tzcode$(TZCODE_VER).tar.gz -tzdata$(TZDATA_VER).tar.gz_MD5 = b937335e087fb85b7f8e3ce33e69184b -tzcode$(TZCODE_VER).tar.gz_MD5 = 44b3b6c3e50240ac44f16437040a7ba2 +tzdata$(TZDATA_VER).tar.gz_MD5 = 423a11bcffc10dda578058cf1587d048 +tzcode$(TZCODE_VER).tar.gz_MD5 = 77ccbb720f0f2076f12dff6ded70eb98 install : $(TARGET) @@ -77,16 +80,21 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) tar axf $(DIR_DL)/tzdata$(TZDATA_VER).tar.gz -C $(DIR_APP) tar axf $(DIR_DL)/tzcode$(TZCODE_VER).tar.gz -C $(DIR_APP) - cd $(DIR_APP) && make TOPDIR=/usr ETCDIR=/tmp LIBDIR=/tmp MANDIR=/tmp \ - TZDIR=/usr/share/zoneinfo all - cd $(DIR_APP) && make TOPDIR=/usr ETCDIR=/tmp LIBDIR=/tmp MANDIR=/tmp \ - TZDIR=/usr/share/zoneinfo install + cd $(DIR_APP) && mkdir -pv zoneinfo/{,posix,right} + cd $(DIR_APP) && zic -y ./yearistype -d zoneinfo \ + -L /dev/null -p GMT $(FILES) + cd $(DIR_APP) && zic -y ./yearistype -d zoneinfo/posix \ + -L /dev/null $(FILES) + cd $(DIR_APP) && zic -y ./yearistype -d zoneinfo/right \ + -L /dev/null $(FILES) + + rm -rf /usr/share/zoneinfo + cd $(DIR_APP) && cp -prd zoneinfo /usr/share + cd $(DIR_APP) && install -p -m 644 zone.tab iso3166.tab \ + /usr/share/zoneinfo - -mkdir -pv /usr/share/zoneinfo - mv -v /usr/share/zoneinfo-posix /usr/share/zoneinfo/posix - mv -v /usr/share/zoneinfo-leaps /usr/share/zoneinfo/right rm -vf /usr/share/zoneinfo/localtime - cp -vf /usr/share/zoneinfo/GMT /etc/localtime + @rm -rf $(DIR_APP) @$(POSTBUILD) From 17eabb6587e53570f518aa968e0f935dd5b3bb12 Mon Sep 17 00:00:00 2001 From: Ersan Yildirim Date: Mon, 17 Mar 2014 12:38:22 +0100 Subject: [PATCH 16/35] Update Turkish translation. --- doc/language_issues.tr | 54 +------- langs/tr/cgi-bin/tr.pl | 299 ++++++++++++++++++++++++----------------- 2 files changed, 177 insertions(+), 176 deletions(-) diff --git a/doc/language_issues.tr b/doc/language_issues.tr index abcb6ee32..93da78a27 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -214,6 +214,7 @@ WARNING: translation string unused: firewall log viewer WARNING: translation string unused: firmware WARNING: translation string unused: firmware upload WARNING: translation string unused: force update +WARNING: translation string unused: forward firewall WARNING: translation string unused: forwarding rule added WARNING: translation string unused: forwarding rule removed WARNING: translation string unused: forwarding rule updated @@ -243,7 +244,6 @@ WARNING: translation string unused: fwdfw std network WARNING: translation string unused: fwdfw till WARNING: translation string unused: fwdfw time WARNING: translation string unused: fwdfw xt access -WARNING: translation string unused: fwhost addrule WARNING: translation string unused: fwhost attention WARNING: translation string unused: fwhost blue WARNING: translation string unused: fwhost changeremark @@ -303,6 +303,7 @@ WARNING: translation string unused: invalid upstream proxy username or password WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side +WARNING: translation string unused: ipsec no connections WARNING: translation string unused: iptable rules WARNING: translation string unused: isdn WARNING: translation string unused: isdn settings @@ -633,70 +634,19 @@ WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs -WARNING: untranslated string: addons -WARNING: untranslated string: advproxy errmsg proxy ports equal -WARNING: untranslated string: advproxy proxy port transparent -WARNING: untranslated string: bit WARNING: untranslated string: bytes WARNING: untranslated string: ccd err isipsecrw WARNING: untranslated string: ccd err isovpnn2n -WARNING: untranslated string: dead peer detection -WARNING: untranslated string: default ip -WARNING: untranslated string: dnat address -WARNING: untranslated string: dns servers -WARNING: untranslated string: downlink -WARNING: untranslated string: dpd delay -WARNING: untranslated string: dpd timeout -WARNING: untranslated string: drop action -WARNING: untranslated string: drop action1 -WARNING: untranslated string: drop action2 -WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing -WARNING: untranslated string: encryption -WARNING: untranslated string: entropy WARNING: untranslated string: entropy graphs -WARNING: untranslated string: firewall rules -WARNING: untranslated string: first -WARNING: untranslated string: fwdfw dnat extport -WARNING: untranslated string: fwdfw dnat nochoice -WARNING: untranslated string: fwdfw dnat porterr2 -WARNING: untranslated string: fwdfw hint mac WARNING: untranslated string: fwdfw warn1 WARNING: untranslated string: fwhost err hostip -WARNING: untranslated string: grouptype WARNING: untranslated string: hardware support -WARNING: untranslated string: integrity -WARNING: untranslated string: invalid input for dpd delay -WARNING: untranslated string: invalid input for dpd timeout -WARNING: untranslated string: ipsec -WARNING: untranslated string: ipsec network WARNING: untranslated string: last -WARNING: untranslated string: least preferred -WARNING: untranslated string: lifetime -WARNING: untranslated string: mac filter -WARNING: untranslated string: maximum -WARNING: untranslated string: minimum -WARNING: untranslated string: most preferred WARNING: untranslated string: no hardware random number generator -WARNING: untranslated string: notice -WARNING: untranslated string: openvpn network -WARNING: untranslated string: ovpn mgmt in root range -WARNING: untranslated string: ovpn no connections -WARNING: untranslated string: ovpn port in root range -WARNING: untranslated string: p2p block -WARNING: untranslated string: p2p block save notice -WARNING: untranslated string: red1 WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table -WARNING: untranslated string: snat new source ip address -WARNING: untranslated string: ssh -WARNING: untranslated string: support donation WARNING: untranslated string: system has hwrng WARNING: untranslated string: system has rdrand -WARNING: untranslated string: tor directory port -WARNING: untranslated string: tor errmsg invalid directory port -WARNING: untranslated string: uplink -WARNING: untranslated string: urlfilter redirect template -WARNING: untranslated string: wlan clients diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index 6bb470a58..0ea9593f1 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -89,6 +89,7 @@ 'add xtaccess' => 'Harici Erişim Ekle', 'add-route' => 'Basma ek yolu', 'added from dhcp lease list' => 'DHCP kira listeden eklendi', +'addons' => 'Eklentiler', 'admin user password has been changed' => 'Yönetici kullanıcı şifresi değiştirildi.', 'admin users' => 'Yetkili kullanıcı hakları ile kullanıcı', 'administrator user password' => 'Admin kullanıcı parolası:', @@ -178,7 +179,7 @@ 'advproxy access' => 'Erişim', 'advproxy admin mail' => 'Önbellek yönetici e-postası', 'advproxy advanced proxy' => 'Gelişmiş Vekil Sunucu', -'advproxy advanced web proxy' => 'Gelişmiş Web Vekil Sunucusu', +'advproxy advanced web proxy' => 'Gelişmiş web vekil sunucusu', 'advproxy advanced web proxy configuration' => 'Gelişmiş web vekil sunucu ayarları', 'advproxy allowed subnets' => 'İzin verilen alt ağlar (her satırda bir tane)', 'advproxy allowed web browsers' => 'Web erişimi için izin verilen istemciler', @@ -244,6 +245,7 @@ 'advproxy errmsg password length 1' => 'Parola en az olmalıdır ', 'advproxy errmsg password length 2' => ' karakter', 'advproxy errmsg passwords different' => 'Parolalar eşleşmiyor', +'advproxy errmsg proxy ports equal' => 'Vekil sunucu ve şeffaf bağlantı noktaları eşit olamaz.', 'advproxy errmsg radius port' => 'Geçersiz RADIUS bağlantı noktası numarası', 'advproxy errmsg radius secret' => 'RADIUS paylaşılan gizli kod gerekli', 'advproxy errmsg radius server' => 'RADIUS Sunucusu için geçersiz IP adresi', @@ -281,6 +283,7 @@ 'advproxy on' => 'Vekil sunucu', 'advproxy privacy' => 'Gizlilik', 'advproxy proxy port' => 'Vekil sunucu bağlantı noktası', +'advproxy proxy port transparent' => 'Şeffaf bağlantı noktası', 'advproxy ram cache size' => 'Bellek önbellek boyutu (MB)', 'advproxy redirector children' => 'Filtre işlemlerinin sayısı', 'advproxy reset' => 'Yeniden Başlat', @@ -314,7 +317,7 @@ 'advproxy update information' => 'Yüklenebilir güncelleştirilmiş bir sürümü vardır. Daha fazla bilgi için http://www.advproxy.net adresini ziyaret edebilirsiniz.', 'advproxy update notification' => 'Güncelleme bildirimi!', 'advproxy upstream password' => 'Gönderim parolası', -'advproxy upstream proxy' => 'Gönderim Vekili', +'advproxy upstream proxy' => 'Gönderim vekili', 'advproxy upstream proxy host:port' => 'Gönderim vekili (makine adı:bağlantı noktası)', 'advproxy upstream username' => 'Gönderim kullanıcı adı', 'advproxy url filter' => 'URL filtre', @@ -338,11 +341,11 @@ 'aliases not active' => 'KIRMIZI arabiriminiz STATİK olmadıkça takma adlar aktif olmayacaktır', 'all' => 'Tümü', 'all interfaces' => 'Tüm Arabirimler', -'all services' => 'Tüm Hizmetler', +'all services' => 'Tüm hizmetler', 'all updates installed' => 'Tüm güncellemeler kuruldu', 'allmsg' => 'tümünü göster', 'alt dialup' => 'Çevirmeli Bağlantı', -'alt home' => 'Ana sayfa', +'alt home' => 'Ana Sayfa', 'alt information' => 'Bilgi', 'alt logs' => 'Günlükler', 'alt ovpn' => 'OpenVPN', @@ -357,12 +360,12 @@ 'april' => 'Nisan', 'archive not exist' => 'Yapılandırma arşivi yok', 'are you sure' => 'Emin misiniz?', -'arp table entries' => 'ARP Tablosu Girdileri:', +'arp table entries' => 'ARP tablosu girdileri:', 'artist' => 'Sanatçı', 'attemps' => 'Girişim', 'attention' => 'DİKKAT', 'august' => 'Ağustos', -'authentication' => 'Kimlik Doğrulama:', +'authentication' => 'Kimlik doğrulama:', 'automatic' => 'Otomatik', 'available updates' => 'Mevcut güncellemeler:', 'average' => 'Ortalama', @@ -397,7 +400,7 @@ 'backup to floppy' => 'Diskete yedekle', 'backupaddon' => 'Eklenti Yedekleme', 'backupprofile' => 'Yeniden bağlanma başarısız durumda. Profile geçin', -'backups' => 'yedekler', +'backups' => 'Yedekler', 'backupwarning' => 'Eklenti yedeklemesi için lütfen önce geri yükleme yedeklemesi oluşturun. İndirme zamanı verilen orjinal dosya ile devam edin.', 'bad characters in' => 'Yablış karakterler ', 'bad characters in script field' => 'Komut alanındaki yanlış karakterler', @@ -409,11 +412,12 @@ 'bandwidth usage' => 'bant genişliği kullanımı (harici)', 'bandwitherror' => 'QoS aktifken bant genişliği ayarları değiştiremezsiniz. İlk önce QoS devre dışı bırakın.

', 'bandwithsettings' => 'Bant genişliği ayarları', -'basic options' => 'Temel Seçenekler', -'beep when ppp connects or disconnects' => 'IPFire bağlanırken veya kapatılırken beep sesi çıkar.', +'basic options' => 'Temel seçenekler', +'beep when ppp connects or disconnects' => 'IPFire bağlanırken veya kapatılırken ses çıkar.', 'behind a proxy' => 'Bir vekil sunucu arkasında:', 'bewan adsl pci st' => 'KALDIRILACAK', 'bewan adsl usb' => 'KALDIRILACAK', +'bit' => 'Bit', 'bitrate' => 'Bit hızı', 'bleeding rules' => 'Bleeding Edge Snort Rules', 'blue' => 'MAVİ', @@ -436,7 +440,7 @@ 'cached swap' => 'takas alanı önbelleği', 'calamaris available reports' => 'Mevcut raporlar', 'calamaris byte unit' => 'Bayt birimi', -'calamaris create report' => 'Rapor oluştur', +'calamaris create report' => 'Rapor Oluştur', 'calamaris enable content report' => 'İçerik raporunu aktifleştir', 'calamaris enable distribution histogram' => 'Dağıtım histogramını aktifleştir', 'calamaris enable domain report' => 'Etki alanı raporunu aktifleştir', @@ -455,7 +459,7 @@ 'calamaris number of requesting hosts' => 'Talep eden ana bilgisayarların sayısı', 'calamaris performance options' => 'Performans seçenekleri', 'calamaris proxy reports' => 'Vekil Sunucu Raporları', -'calamaris refresh list' => 'Listeyi yenile', +'calamaris refresh list' => 'Listeyi Yenile', 'calamaris report interval (in minutes)' => 'Rapor aralığı (dakikada)', 'calamaris report options' => 'Rapor seçenekleri', 'calamaris report period' => 'Rapor süresi', @@ -513,7 +517,7 @@ 'ccd iroutehint' => 'Dikkat! Bu ayarları değiştirirseniz, değişikliklerin etkili olduğu OpenVPN sunucusunu yeniden başlatmanız gerekir!', 'ccd modify' => 'Ağı değiştir', 'ccd name' => 'Ad', -'ccd net' => 'Statik IP adres havuzu', +'ccd net' => 'Statik ip adres havuzu', 'ccd noaddnet' => 'OpenVPN sunucusu durdurulduğunda sadece yeni bir statik ağ ekleyebilirsiniz.', 'ccd none' => 'Yok', 'ccd routes' => 'Yönlendir:', @@ -521,7 +525,7 @@ 'ccd used' => 'Kullanılan adresler', 'cert' => 'Sertifika', 'certificate' => 'Sertifika', -'certificate authorities' => 'Sertifika Yetkilileri', +'certificate authorities' => 'Sertifika yetkilileri', 'certificate does not have a valid ca associated with it' => 'Sertifika ile ilişkili geçerli bir CA yok.', 'certificate file move failed' => 'Sertifika dosyası taşıması başarısız oldu', 'cfg restart' => 'Bir yeniden başlatma, yapılandırma arşivi geri yükledikten sonra önerilmektedir.', @@ -560,7 +564,7 @@ 'connection closed' => 'Bağlı değil...', 'connection debugging' => 'Hata ayıklama bağlantısı', 'connection status and controlc' => 'Bağlantı durumu ve kontrol:', -'connection tracking' => 'IPTablo Bağlantı Takibi', +'connection tracking' => 'IPTablo bağlantı takibi', 'connection type' => 'Bağlantı Türü', 'connection type is invalid' => 'Geçersiz bağlantı türü.', 'connections' => 'Bağlantılar', @@ -617,7 +621,7 @@ 'dat without key' => 'Şifreli bir arşiv anahtarı olmadan geri yüklenemez.', 'date' => 'Tarih', 'date not in logs' => 'Sorgulanan gün için hiçbir günlük yok', -'day' => 'gün', +'day' => 'Gün', 'day after' => 'Bir gün sonra', 'day before' => 'Bir gün önce', 'day-graph' => 'gün', @@ -631,12 +635,14 @@ 'ddns hostname removed' => 'Dinamik DNS ana bilgisayar adı kaldırıldı', 'ddns minimize updates' => 'Güncellemeleri azalt: Güncellemelerden önce, sunucu adı \'[host.]domain\' için dns IP adresini KIRMIZI IP ile karşılaştır.', 'ddns noip prefix' => 'Grup yönteminde ip-yok seçeneğini kullanmak için ana bilgisayar adı öneki: %', -'deactivate' => 'devre dışı', +'deactivate' => 'Devre dışı', 'deactivate user' => 'kullanıcı devre dışı', +'dead peer detection' => 'Sonlanmış Eş Algılama', 'debugme' => 'Henüz uygulanmadı', 'december' => 'Aralık', 'deep scan directories' => 'Ardışık tarama', 'def lease time' => 'Varsayılan Kira Zamanı', +'default ip' => 'Varsayılan IP adresi', 'default lease time' => 'Varsayılan kira zamanı (dakika):', 'default networks' => 'Varsayılan ağlar', 'default renewal time' => 'Varsayılan Yenileme Zamanı', @@ -669,7 +675,7 @@ 'dhcp advopt definition' => 'Açıklama', 'dhcp advopt definition exists' => 'Açıklama seçeneği zaten var. Bunu sadece düzenleyebilir veya kaldırabilirsiniz.', 'dhcp advopt edit' => 'DHCP seçeneğini düzenle', -'dhcp advopt help' => 'Liste seçenekleri', +'dhcp advopt help' => 'Liste Seçenekleri', 'dhcp advopt list' => 'Ek DHCP seçenekleri', 'dhcp advopt modified' => 'DHCP seçeneği düzeltildi', 'dhcp advopt name' => 'Seçenek adı', @@ -708,16 +714,17 @@ 'disk access per' => 'erişim başına disk', 'disk usage' => 'Disk kullanımı', 'display' => 'Görünüm', -'display charset' => 'Karakterleri Göster', +'display charset' => 'Karakterleri göster', 'display hostname in window title' => 'Pencere başlığında ana bilgisayar adını göster', 'display traffic at home' => 'Başlangıç sayfasının üzerinde hesaplanan trafiği göster', 'display webinterface effects' => 'Efektleri aktifleştir', 'dl client arch' => 'İstemci paketlerini indir (zip)', -'dmz' => 'Açık bölge', +'dmz' => 'AÇIK BÖLGE', 'dmz pinhole configuration' => 'Açık bölge yapılandırma', 'dmz pinhole rule added' => 'Açık bölge kuralı eklendi; Açık bölge yeniden başlatılıyor', 'dmz pinhole rule removed' => 'Açık bölge kuralı silindi; Açık bölge yeniden başlatılıyor', 'dmzpinholes for same net not necessary' => 'Açık bölge aynı ağ için gerekli değildir. Farklı kaynak veya hedef ağ seçin.', +'dnat address' => 'Harici IP adresi', 'dns address deleted' => 'Başarıyla silindi!', 'dns address deleted txt' => 'DNS-Sunucusu adresleri başarıyla silindi.
Değişikliklerin aktifleştirilmesi için yeniden başlatın!', 'dns address done' => 'DNS-Sunucusu adresi ayarları kaydedilecektir.', @@ -736,8 +743,9 @@ 'dns saved' => 'Başarıyla kaydedildi!', 'dns saved txt' => 'Girilen iki DNS sunucu adresi başarılı bir şekilde kaydedildi.
Değişikliklerin aktifleştirielebilmesi için yeniden başlatın!', 'dns server' => 'DNS Sunucusu', +'dns servers' => 'DNS sunucuları', 'dns title' => 'Etki Alanı Ad Sistemi', -'dnsforward' => 'DNS yönlendirmesi', +'dnsforward' => 'DNS Yönlendirmesi', 'dnsforward add a new entry' => 'Yeni bir kayıt ekle:', 'dnsforward configuration' => 'İleri DNS yapılandırması', 'dnsforward edit an entry' => 'Varolan bir kaydı düzenle:', @@ -745,8 +753,8 @@ 'dnsforward forward_server' => 'Ad sunucusu', 'dnsforward zone' => 'Bölge', 'do not log this port list' => 'Otorumdan hemen önce bu bağlantı noktaları listesini bırak (günlük boyutunu küçültür)', -'dod' => 'Çevirmeli Bağlantı Üzerinden Talep', -'dod for dns' => 'DNS için çevirmeli bağlantı üzerinden talep:', +'dod' => 'Çevirmeli bağlantı üzerinden talep et', +'dod for dns' => 'DNS için çevirmeli bağlantı üzerinden talep et:', 'dod not compatible with ddns' => 'Talep edilen çevirmeli ağ dinamik dns hizmetleri ile uyumlu değildir', 'dod waiting' => 'Çevirmeli bağlantı üzerindeki talep bekleniyor', 'domain' => 'Etki alanı', @@ -758,19 +766,26 @@ 'donation-link' => 'https://www.paypal.com/en_US/GB/i/btn/btn_donateCC_LG.gif', 'donation-text' => 'IPFire boş zamanlarında gönüllüer tarafından geliştirlmektedir. Bu projeyi ayakta tutmak için eğer bize destek olmak isterseniz küçük bir bağıştan mutluluk duyarız.', 'done' => 'Yap', -'dos charset' => 'DOS Karakterleri', +'dos charset' => 'DOS karakterleri', 'down and up speed' => 'Gönderme hızı düştüğünde Kaydet düğmesine basın.', +'downlink' => 'İndirme bağlantısı', 'downlink speed' => 'İndirme bağlantı hızı (kbit/san)', 'downlink std class' => 'Standart indirme bağlantısı sınıfı', 'download' => 'İndir', 'download ca certificate' => 'CA sertifikası indir', 'download certificate' => 'Sertifika indir', 'download host certificate' => 'Ana bilgisayar belgesi indir', -'download new ruleset' => 'Yeni kural kümesi indir', +'download new ruleset' => 'Yeni Kural Kümesi İndir', 'download pkcs12 file' => 'PKCS12 dosyasını indir', 'download root certificate' => 'Root sertifikasını indir', 'dpd action' => 'Hareketsiz eş algılama eylemi', +'dpd delay' => 'Gecikme', +'dpd timeout' => 'Zaman Aşımı', 'driver' => 'Sürücü', +'drop action' => '"Engellenmiş" biçimdeki (iletilen) güvenlik duvarının varsayılan davranışı', +'drop action1' => '"Engellenmiş" biçimdeki (giden) güvenlik duvarının varsayılan davranışı', +'drop action2' => 'Güvenlik duvarı (giriş) varsayılan davranışı', +'drop forward' => 'İletilen paket günlüklerini reddet', 'drop input' => 'Günlük giriş paketlerini reddet', 'drop newnotsyn' => 'Sync paketleri olmayan yeni günlükleri reddet', 'drop output' => 'Günlük çıkış paketlerini reddet', @@ -819,9 +834,11 @@ 'enabledtitle' => 'Aktif', 'encapsulation' => 'Kapsülleme', 'encrypted' => 'Şifre', +'encryption' => 'Şifreleme:', 'end address' => 'Bitiş adresi:', 'enter ack class' => 'ACK-Sınıfı girin
ve sonra Kaydet düğmesine basın.', 'enter data' => 'Ayarları girin
ve sonra Kaydet düğmesine basın.', +'entropy' => 'Entropy', 'err bk 1' => 'Arşiv oluşturma hatası', 'err bk 10 password' => 'Yedek parolası oluşturma hatası', 'err bk 2 key' => 'Anahtar dosyası oluşturulama hatası', @@ -849,7 +866,7 @@ 'expires' => 'Bitiş tarihi', 'export' => 'Dışarı Aktar', 'exportkey' => 'PSK dışarı aktar', -'external access' => 'Harici Erişim', +'external access' => 'Harici erişim', 'external access configuration' => 'Harici erişim yapılandırması', 'external access rule added' => 'Harici erişim kuralı eklendi. Erişim denetleyicisi yeniden başlatılıyor.', 'external access rule changed' => 'Harici erişim kuralı değiştirildi. Erişim denetleyicisi yeniden başlatılıyor.', @@ -858,7 +875,7 @@ 'extrahd' => 'Yedek Diskler', 'extrahd because there is already a device mounted' => ', çünkü bu aygıt bağlandı', 'extrahd cant umount' => 'Ayrılamadı', -'extrahd detected drives' => 'algılanan diskler', +'extrahd detected drives' => 'Algılanan diskler', 'extrahd install or load driver' => 'Aygıtınız buradaki listede yoksa sürücüsünü kurmanız veya yüklemeniz gerekir.
Aygıtınızı görüyor fakat bölümlerini göremiyorsanız önce bunları oluşturmak zorundasınız.', 'extrahd maybe the device is in use' => '. Belki aygıt kullanımda', 'extrahd to' => '-', @@ -877,17 +894,17 @@ 'fireinfo is disabled' => 'Güvenlik duvarı bilgisi devre dışı', 'fireinfo is enabled' => 'Güvenlik duvarı bilgisi aktif', 'fireinfo is submitted' => 'Profiliniz güvenlik duvarı bilgi hizmetine gönderildi.', -'fireinfo is submitted button' => 'Hayır artık profilimi göndermek istemiyorum', +'fireinfo is submitted button' => 'Hayır Artık Profilimi Göndermek İstemiyorum', 'fireinfo kernel version' => 'Çekirdek sürümü', 'fireinfo not submitted' => 'Profiliniz güvenlik duvarı bilgi hizmetlerine henüz gönderilmemiştir.', -'fireinfo not submitted button' => 'Evet profilimi şimdi gönder', +'fireinfo not submitted button' => 'Evet Profilimi Şimdi Gönder', 'fireinfo pakfire version' => 'Pakfire sürümü', 'fireinfo please enable' => 'Lütfen güvenlik duvarı bilgi hizmetini aktifleştirin.', 'fireinfo settings' => 'Güvenlik duvarı bilgi ayarları', 'fireinfo system version' => 'Sistem sürümü', 'fireinfo why descr1' => 'Bu seçeneği aktifleştirmek IPFire gelişimi için çok önemlidir.', 'fireinfo why descr2' => 'Bunun ', -'fireinfo why enable' => 'Neden güvenlik duvarı bilgi hizmetini aktifleştirmeliy im?', +'fireinfo why enable' => 'Neden güvenlik duvarı bilgi hizmetini aktifleştirmeliyim?', 'fireinfo why read more' => 'nedenleri hakkında bilgi için tıklayın.', 'fireinfo your profile id' => 'Profil kimliğiniz', 'firewall' => 'Güvenlik Duvarı', @@ -899,14 +916,17 @@ 'firewall logs' => 'Güvenlik Duvarı Günlükleri', 'firewall logs ip' => 'Gd-Günlük Grafikleri (IP)', 'firewall logs port' => 'Gd-Günlük Grafikleri (Port)', +'firewall rules' => 'Güvenlik duvarı kuralları', 'firewallhits' => 'güvenlik duvarı kaydı', 'firmware' => 'Yazılım', 'firmware upload' => 'Yazılım/Sürücü Yükle', +'first' => 'İlk', 'fixed ip lease added' => 'Sabit IP kirası eklendi', 'fixed ip lease modified' => 'Sabit IP kirası güncellendi', 'fixed ip lease removed' => 'Sabit IP kirası kaldırıldı', 'force update' => 'Zorla güncelleştir', 'force user' => 'kullanıcıya tüm yeni dosyaları zorla', +'forward firewall' => 'Güvenlik Duvarı', 'forwarding rule added' => 'Yönlendirme kuralı eklendi. Yeniden başlatmayı gönder.', 'forwarding rule removed' => 'Yönlendirme kuralı kaldırıldı. Yeniden başlatmayı gönder.', 'forwarding rule updated' => 'Yönlendirme kuralı güncellendi. Yeniden başlatmayı gönder.', @@ -924,9 +944,9 @@ 'from email user' => 'Gönderen e-posta kullanıcısı', 'from warn email bad' => 'Gönderen e-posta adresi geçerli değil', 'fw blue' => 'MAVİ arabirim için güvenlik duvarı seçenekleri', -'fw default drop' => 'Güvenlik duvarı ilkesi', +'fw default drop' => 'Güvenlik duvarı yöntemleri', 'fw logging' => 'Güvenlik duvarı günlüğü', -'fw settings' => 'Düvenlik duvarı ayarları', +'fw settings' => 'Güvenlik duvarı ayarları', 'fw settings color' => 'Kural tablosunda renkleri göster', 'fw settings dropdown' => 'Kural oluşturulan sitedeki tüm ağları göster', 'fw settings remark' => 'Kural tablosunda açıklamaları göster', @@ -938,21 +958,24 @@ 'fwdfw REJECT' => 'REDDET', 'fwdfw action' => 'Eylem', 'fwdfw additional' => 'Ek ayarlar', -'fwdfw addrule' => 'Kural Ekle/Düzenle:', +'fwdfw addrule' => 'Kural Ekle/Düzenle::', 'fwdfw all icmp' => 'Tüm ICMP türleri', 'fwdfw change' => 'Güncelle', 'fwdfw copy' => 'Kopyala', 'fwdfw delete' => 'Sil', 'fwdfw dnat' => 'Hedef NAT (Bağlantı noktası yönlendirme)', 'fwdfw dnat error' => 'DNAT için bir tek ana bilgisayar seçmeniz gerekir. Gruplara veya ağlara izin verilmez.', -'fwdfw dnat porterr' => 'NAT için tek bir bağlantı noktası veya bağlantı noktası aralığı (tcp/udp) seçmek zorundasınız', +'fwdfw dnat extport' => 'Harici bağlantı noktası kaynak NAT kurallarını kullanırken boş olmak zorundadır.', +'fwdfw dnat nochoice' => 'Lütfen NAT bölümünden kaynak NAT veya hedef NAT seçin.', +'fwdfw dnat porterr' => 'NAT için tek bir bağlantı noktası veya bağlantı noktası aralığı (tcp/udp) seçmek zorundasınız.', +'fwdfw dnat porterr2' => 'Hiçbir hedef bağlantı noktası tanımlamdan harici bir bağlantı noktası (NAT) kullanamazsınız.', 'fwdfw edit' => 'Düzenle', 'fwdfw err nosrc' => 'Bir kaynak seçilmedi.', 'fwdfw err nosrcip' => 'Lütfen bir kaynak IP adresi belirtin.', 'fwdfw err notgt' => 'Bir hedef seçilmedi.', 'fwdfw err notgtip' => 'Lütfen bir hedef IP adresi belirtin.', 'fwdfw err prot_port' => 'Seçilen kuuralla kaynak veya hedef bağlantı noktasına izin verilmez', -'fwdfw err prot_port1' => 'TCP veya UDP kuralı için kaynak veya hedef bağlantı noktası kullanırken seçmek zorunda ', +'fwdfw err prot_port1' => 'TCP veya UDP kuralı için kaynak veya hedef bağlantı noktası kullanırken seçmek zorunda', 'fwdfw err remark' => 'Açıklama içinde geçersiz karakterler.', 'fwdfw err ruleexists' => 'Bu kural zaten var.', 'fwdfw err same' => 'Kaynak ve hedef aynı.', @@ -968,6 +991,7 @@ 'fwdfw from' => 'Kimden:', 'fwdfw hint ip1' => 'Son oluşturulan kurallar hiçbir zaman eşleşmemelidir çünkü kaynak ve hedefin alt ağları çakışabilir', 'fwdfw hint ip2' => 'Bu kuralın mantıklı olup olmadığını bir kez daha kontrol edin: ', +'fwdfw hint mac' => 'Kod oluşturma sırasında görmezden gelinecek MAC adresleri.', 'fwdfw iface' => 'Arayüz', 'fwdfw ipsec network' => 'IPsec ağları:', 'fwdfw log' => 'Günlük', @@ -977,18 +1001,17 @@ 'fwdfw movedown' => 'Aşağı taşı', 'fwdfw moveup' => 'Yukarı taşı', 'fwdfw natport used' => 'NAPT için verilen bağlantı noktası başka bir DNAT kural tarafından zaten kullanılıyor.', -'fwdfw newrule' => 'Yeni kural', +'fwdfw newrule' => 'Yeni Kural', 'fwdfw p2p txt' => 'P2P ağlarına erişim izni Ver/Verme.', 'fwdfw pol allow' => 'İzin Verildi', 'fwdfw pol block' => 'Engellendi', 'fwdfw pol text' => 'Yerel ağlardan bağlantılar için varsayılan günvenlik duvarı davranışını ayarlar. Tüm yeni bağlantılara izin verebilir veya varsayılan olarak engelleyebilirsiniz. Yerel ağlar arasındaki bağlantılar ayrıca sonraki biçimde engellenir.', -'fwdfw pol text1' => 'Güvenlik duvarı tarafından başlatılan bağlantıları için varsayılan güvenlik duvarı davranışını ayarlar. -Dikkat! Kendinizi engelleyebilirsiniz.', +'fwdfw pol text1' => 'Güvenlik duvarı tarafından başlatılan bağlantıları için varsayılan güvenlik duvarı davranışını ayarlar. Dikkat! Kendinizi engelleyebilirsiniz.', 'fwdfw pol title' => 'Varsayılan güvenlik duvarı davranışı', 'fwdfw prot41' => 'IPv6 Kuşatması (Kural 41)', 'fwdfw prot41 short' => 'IPv6 Kuşatması', 'fwdfw red' => 'KIRMIZI', -'fwdfw reread' => 'Değişiklikleri uygula', +'fwdfw reread' => 'Değişiklikleri Uygula', 'fwdfw rule action' => 'Eylem kuralı:', 'fwdfw rule activate' => 'Kuralı etkinleştir', 'fwdfw rulepos' => 'Kural konumu', @@ -998,13 +1021,13 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'fwdfw sourceip' => 'Kaynak adresi (MAC/IP adresi veya ağı):', 'fwdfw std network' => 'Standart ağlar:', 'fwdfw target' => 'Hedef', -'fwdfw targetip' => 'Hedef adresi (MAC/IP adresi veya ağ):', +'fwdfw targetip' => 'Hedef adres (MAC/IP adresi veya ağı):', 'fwdfw till' => 'Son zaman:', 'fwdfw time' => 'Zaman Kısıtlamaları', 'fwdfw timeframe' => 'Zaman kısıtlamalarını kullan', 'fwdfw toggle' => 'Etkinleştirin veya devre dışı bırakın', 'fwdfw togglelog' => 'Günlüğü etkinleştirin veya devre dışı bırakın', -'fwdfw use nat' => 'Ağ Adresi Çevirisi kullanın (NAT)', +'fwdfw use nat' => 'Ağ adres dönüştürücüsünü kullanın (NAT)', 'fwdfw use srcport' => 'Kaynak bağlantı noktası:', 'fwdfw use srv' => 'Hedef bağlantı noktası:', 'fwdfw useless rule' => 'Bu kural geçersiz.', @@ -1020,7 +1043,6 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'fwhost addgrpname' => 'Grup adı:', 'fwhost addhost' => 'Yeni bir ana bilgisayar ekle:', 'fwhost addnet' => 'Yeni bir ağ ekle:', -'fwhost addrule' => 'Kural ekle/düzenle:', 'fwhost addservice' => 'Hizmet ekle:', 'fwhost addservicegrp' => 'Yeni bir hizmet grubu ekle:', 'fwhost any' => 'Herhangi', @@ -1035,7 +1057,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'fwhost cust grp' => 'Ağ/Ana Bilgisayar Grupları:', 'fwhost cust net' => 'Ağlar:', 'fwhost cust service' => 'Hizmetler:', -'fwhost cust srvgrp' => 'Hizmet Grupları:', +'fwhost cust srvgrp' => 'Hizmet grupları:', 'fwhost deleted' => 'Silindi', 'fwhost empty' => 'Tanımlı kurallar yok', 'fwhost err addr' => 'Geçersiz IP adresi veya alt ağ', @@ -1076,13 +1098,13 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'fwhost ipadr' => 'IP adresi:', 'fwhost ipsec host' => 'IPsec istemcileri:', 'fwhost ipsec net' => 'IPsec ağları:', -'fwhost menu' => 'Güvenlik Duvarı grupları', +'fwhost menu' => 'Güvenlik Duvarı Gurupları', 'fwhost netaddress' => 'Ağ adresi', 'fwhost newgrp' => 'Ağ/Ana Bilgisayar Grupları', 'fwhost newhost' => 'Ana Bilgisayarlar', 'fwhost newnet' => 'Ağlar', 'fwhost newservice' => 'Hizmetler', -'fwhost newservicegrp' => 'Hizmet grupları', +'fwhost newservicegrp' => 'Hizmet Gurupları', 'fwhost orange' => 'Turuncu', 'fwhost ovpn_n2n' => 'Ağdan-Ağa OpenVPN', 'fwhost port' => 'Bağlantı Noktası', @@ -1098,13 +1120,13 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'fwhost wo subnet' => '(alt ağ olmadan)', 'g.dtm' => 'KALDIRILACAK', 'g.lite' => 'KALDIRILACAK', -'gateway' => 'Ağ Geçidi', +'gateway' => 'Ağ geçidi', 'gateway ip' => 'Ağ Geçidi IP Adresi', 'gen static key' => 'Statik bir anahtar oluştur', 'generate' => 'Yönetici/Sunucu Sertifikası Oluştur', 'generate a certificate' => 'Sertifika oluştur:', 'generate iso' => 'ISO oluştur', -'generate root/host certificates' => 'Yönetici/Sunucu sertifikası oluştur', +'generate root/host certificates' => 'Yönetici/Sunucu Sertifikası Oluştur', 'generate tripwire keys and init' => 'tripwire anahtarları ve init oluştur', 'generatekeys' => 'Anahtar Oluştur', 'generatepolicy' => 'Yeni kural oluştur', @@ -1117,10 +1139,11 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'gpl license agreement' => 'Lisans Sözleşmesi', 'gpl please read carefully the general public license and accept it below' => 'Dikkatlice Genel Kamu Lisansını okuyup kabul edin', 'gpl unofficial translation of the general public license v3' => 'Resmi olmayan sürüm-3 Genel Kamu Lisansı çevirisi', -'graph' => 'Grafiği', +'graph' => 'grafiği', 'graph per' => '-', 'green' => 'YEŞİL', 'green interface' => 'Yeşil Arabirim', +'grouptype' => 'Gurup türü:', 'guaranteed bandwith' => 'Garantili bant genişliği', 'guardian alertfile' => 'Uyarı dosyası', 'guardian configuration' => 'Koruyucu Yapılandırması', @@ -1171,7 +1194,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'ids preprocessor' => 'IDS önişlemcisi', 'ids rules license' => 'Sourcefire VRT Sertifikalı Kurallarından yararlanmak için kayıt olmanız gerekmektedir', 'ids rules license1' => '.', -'ids rules license2' => 'Lisans kabulü için siteyi ziyaret ede veya e-posta ile aktifleştirin. Sonra ', +'ids rules license2' => 'Lisans kabulü için siteyi ziyaret edin veya e-posta ile aktifleştirin. Sonra ', 'ids rules license3' => 'adresine gidin. Önce "Kod Oluştur" düğmesine basın ve sonra aşağıdaki alana 40 karakterlik Onikcode kodunu kopyalayın.', 'ids rules update' => 'Snort kuralları güncelleştirme', 'iface' => 'Iface', @@ -1198,11 +1221,12 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'installed' => 'Yüklenenler', 'installed updates' => 'Yüklenen güncellemeler:', 'instant update' => 'Hızlı Güncelle', +'integrity' => 'Bütünlük:', 'interface' => 'Ara birim', 'interfaces' => 'Ara birim', 'internet' => 'İNTERNET', 'intrusion detection' => 'Saldırı Tespiti', -'intrusion detection system' => 'Saldırı Tespit Sistemi', +'intrusion detection system' => 'Saldırı tespit sistemi', 'intrusion detection system log viewer' => 'Saldırı Tespit Sistemi Günlük Görüntüleyicisi', 'intrusion detection system rules' => 'saldırı tespit sistemi kuralları', 'intrusion detection system2' => 'Saldırı Tespit Sistemi:', @@ -1225,6 +1249,8 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'invalid input for dhcp dns' => 'DHCP DNS için geçersiz giriş.', 'invalid input for dhcp domain' => 'DHCP etki alanı için geçersiz giriş.', 'invalid input for dhcp wins' => 'DHCP WINS için geçersiz giriş.', +'invalid input for dpd delay' => 'DPD gecikmesi için geçersiz giriş.', +'invalid input for dpd timeout' => 'DPD zamanaşımı için geçersiz giriş.', 'invalid input for e-mail address' => 'E-posta adresi için geçersiz giriş.', 'invalid input for esp keylife' => 'ESP anahtar ömrü için geçersiz giriş.', 'invalid input for hostname' => 'Ana bilgisayar adı için geçersiz giriş.', @@ -1281,9 +1307,12 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'ipfire side is invalid' => 'Geçersiz IPFire yan listesi.', 'ipfires hostname' => 'IPFire ana bilgisayar adı', 'ipinfo' => 'IP bilgi', +'ipsec' => 'IPsec', +'ipsec network' => 'IPsec ağ', +'ipsec no connections' => 'Aktif hiçbir IPsec bağlantısı yok', 'iptable rules' => 'IPTablo kuralları', -'iptmangles' => 'IPTablo Sıkıştırmaları', -'iptnats' => 'IPTablo Ağ Adres Çevrimi', +'iptmangles' => 'IPTablo sıkıştırmaları', +'iptnats' => 'IPTablo ağ adres çevrimi', 'ipts' => 'IPTablolar', 'isdn' => 'ISDN', 'isdn settings' => 'Ek ISDN ayarları:', @@ -1300,14 +1329,16 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'key stuff' => '2. Anahtarlar ve Sertifikalar', 'keyreset' => 'Anahtarları Sıfırla', 'keys' => 'anahtarlar', -'lan' => 'LAN', +'lan' => 'YEREL AĞ', 'lang' => 'tr', 'languagepurpose' => 'IPFire sistemini görüntülemek istediğiniz dili seçin:', 'last activity' => 'Son Etkinlik', 'lateprompting' => 'Geç istenen', 'lease expires' => 'Kiralama süresi', +'least preferred' => 'az tercih edilen', 'legend' => 'Açıklamalar', -'length' => 'Süresi', +'length' => 'Süre', +'lifetime' => 'Yaşam süresi:', 'line' => 'Satırı', 'linkq' => 'bağlantı kalitesi', 'load printer' => 'Yazıcı Yükle', @@ -1317,19 +1348,19 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'local ntp server specified but not enabled' => 'Belirtilen yerel NTP sunucusu etkin değil', 'local subnet' => 'Yerel Alt Ağ:', 'local subnet is invalid' => 'Geçersiz yerel alt ağ.', -'local vpn hostname/ip' => 'Yerel VPN Ana Bilgisayar Adı/IP', +'local vpn hostname/ip' => 'Yerel VPN ana bilgisayar adı/ip', 'localkey' => 'yerel Anahtar', 'localkeyfile' => 'Yerel Anahtar Dosyası', 'log' => 'Günlük:', 'log enabled' => 'Günlük Aktif', -'log level' => 'Günlük Seviyesi', +'log level' => 'Günlük seviyesi', 'log lines per page' => 'Sayfa başına satır', 'log server address' => 'Syslog sunucusu:', 'log settings' => 'Günlük Ayarları', 'log summaries' => 'Günlük özetleri', 'log summary' => 'Günlük Özetleri', 'log var messages' => '/var/log/messages için ayarlar:', -'log view' => 'Günlük Kaydı', +'log view' => 'Günlük kaydı', 'log viewer' => 'Günlük görüntüleyici', 'log viewing options' => 'Günlük görüntüleme seçenekleri', 'log-options' => 'Günlük dosya seçenekleri', @@ -1337,7 +1368,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'logging' => 'Günlük', 'logging server' => 'Günlük Sunucusu', 'loginlogout' => 'Giriş/Çıkış', -'logs' => 'günlükler', +'logs' => 'Günlükler', 'lookup failed' => 'Ters arama başarısız', 'loosedirectorychecking' => 'Serbest Dizin Denetimi', 'low' => 'Düşük', @@ -1363,8 +1394,9 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'mac address recon' => 'Yeniden bağlanmaya çalışılıyor!', 'mac address saved' => 'Başarıyla kaydedildi!', 'mac address saved txt' => 'MAC adresi başarıyla kaydedildi. Fakat değişiklikler sadece yeniden başlattıktan sonra veya yeniden bağlandıktan sonra yürürlüğe girecektir.', -'mac address title' => 'Orta Erişim Kontrolü Adresi', +'mac address title' => 'MAC adresi atayın', 'mac desc' => 'Burada red0 üzerindeki MAC adresini değiştirebilirsiniz. Adres onaltılık (0-9,a-f) bir tanımlama arasında olmalıdır.
Örneğin: 00-01-02-0e-b8-d6 veya 00:01:02:0e:b8:d6.', +'mac filter' => 'MAC filtre', 'mac new' => 'Yeni MAC adresi:', 'mac1 new' => 'Yeni MAC adresi 1 (vdsl-inet):', 'mac2 new' => 'Yeni MAC adresi 2 (vdsl-iptv):', @@ -1374,11 +1406,11 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'main page' => 'Ana sayfa', 'manage ovpn' => '5. Tünel Yönetimi:', 'manage printers' => 'yazıcıları yönet', -'manage shares' => 'Paylaşım Yönetimi', +'manage shares' => 'Paylaşım yönetimi', 'manual' => 'El ile', 'manual control and status' => 'El ile kontrol ve durum:', 'manually' => 'El ile', -'map to guest' => 'Ziyaretçi Haritası', +'map to guest' => 'Ziyaretçi haritası', 'march' => 'Mart', 'marked' => 'İşaretli', 'max bandwith' => 'En fazla bant genişliği', @@ -1391,6 +1423,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'max size' => 'En fazla nesne boyutu (KB):', 'max throughput' => 'En fazla hacmi', 'maximal' => 'En fazla', +'maximum' => 'En fazla', 'maximum retries' => 'En fazla yeniden deneme:', 'may' => 'Mayıs', 'mbmon display' => 'Görüntü', @@ -1405,10 +1438,10 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'mbmon volt' => 'voltaj', 'meaning' => 'anlam', 'media' => 'Medya', -'media information' => 'medya bilgisi', +'media information' => 'Medya bilgisi', 'medium' => 'Orta', 'memory' => 'Bellek', -'memory information' => 'bellek bilgisi', +'memory information' => 'Bellek bilgisi', 'memory usage per' => 'bellek başına kullanım - ', 'messages logging' => '/var/log/messages için günlük ayarları', 'method' => 'Yöntem:', @@ -1416,6 +1449,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'min delay' => 'En az gecikme', 'min size' => 'En az nesne boyutu (KB):', 'minimal' => 'En az', +'minimum' => 'En az', 'minute' => 'dakika', 'minutes' => 'dakika', 'misc-options' => 'Çeşitli seçenekler', @@ -1434,7 +1468,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'modify' => 'Düzenle', 'modulation' => 'Geçiş', 'monday' => 'Pazartesi', -'month' => 'ay', +'month' => 'Ay', 'month-graph' => 'ay', 'monthly firewallhits' => 'aylık güvenlik duvarı kaydı', 'monthly start day bad' => 'Aylık başlangıç ​​günü doğru değil', @@ -1444,6 +1478,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'monthly volume start day short' => 'İlk gün', 'months' => 'ay', 'more' => 'daha', +'most preferred' => 'En çok tercih edilen', 'mount' => 'Bağla', 'mounted on' => 'Bağlı', 'mpfire' => 'IPFire için Media Player', @@ -1469,7 +1504,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'net to net vpn' => 'Ağdan-Ağa Sanal Özel Ağ', 'net traffic newversion' => 'Yeni Ağ-Trafik sürümü var:', 'net-traffic configuration' => 'Ağ-Trafik Yapılandırması', -'netbios name' => 'Netbios Adı', +'netbios name' => 'Netbios adı', 'netmask' => 'Ağ Maskesi', 'network' => 'Ağ', 'network added' => 'Özel ağ eklendi', @@ -1513,6 +1548,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'not running' => 'çalışmıyor', 'not set' => 'ayarlanmamış', 'notes' => 'Notlar', +'notice' => 'Dikkat', 'november' => 'Kasım', 'ntp common settings' => 'Genel ayarlar', 'ntp configuration' => 'NTP yapılandırması', @@ -1545,6 +1581,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'openvpn fragment allowed with udp' => 'UDP kuralı kullanırken sadece parça kullanılmasına izin verilir.', 'openvpn log' => 'OpenVPN Günlük', 'openvpn mssfix allowed with udp' => 'UDP kuralı kullanırken sadece "mssfix" ile kullanılmasına izin verilir.', +'openvpn network' => 'OpenVPN ağları', 'openvpn prefix local subnet' => 'Önek gösterimi kullanımı yerel alt ağ için desteklenmez. Lütfen 255.255.255.0 gibi alt ağ maskeleri girin.', 'openvpn prefix openvpn subnet' => 'Önek gösterimi kullanımı OpenVPN alt ağ için desteklenmez. Lütfen 255.255.255.0 gibi alt ağ maskeleri girin', 'openvpn prefix remote subnet' => 'Önek gösterimi kullanımı uzak alt ağ için desteklenmez. Lütfen 255.255.255.0 gibi alt ağ maskeleri girin', @@ -1559,10 +1596,10 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'or' => 'veya', 'orange' => 'TURUNCU', 'organization cant be empty' => 'Kuruluş boş olamaz.', -'organization name' => 'Kuruluş Adı', +'organization name' => 'Kuruluş adı', 'organization too long' => 'Kuruluş adı çok uzun. Kuruluş adı 60 karakterden çok olmamalıdır.', 'original' => 'Orijinal', -'os level' => 'OS Seviyesi', +'os level' => 'OS seviyesi', 'other' => 'Diğer', 'other countries' => 'Diğer ülkelers', 'other login script' => 'Diğer oturum açma komut dosyası', @@ -1602,6 +1639,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'ovpn errmsg green already pushed' => 'Yeşil ağ için her zaman bir yol ayarla', 'ovpn errmsg invalid ip or mask' => 'Geçersiz ağ adresi veya alt ağ maskesi', 'ovpn log' => 'OVPN-Günlük', +'ovpn mgmt in root range' => 'Bağlantı noktası numarası 1024 ya da daha yüksek bir numara olmalıdır.', 'ovpn mtu-disc' => 'MTU algılama', 'ovpn mtu-disc and mtu not 1500' => 'MTU algılama 1500 MTU olmasını gerektirir.', 'ovpn mtu-disc maybe' => 'İsteğe Bağlı', @@ -1609,9 +1647,11 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'ovpn mtu-disc off' => 'Devre dışı', 'ovpn mtu-disc with mssfix or fragment' => 'MTU algılama mssfix veya parçası ile kullanılamaz.', 'ovpn mtu-disc yes' => 'Zorunlu', +'ovpn no connections' => 'Hiçbir aktif OpenVPN bağlantısı yok', 'ovpn on blue' => 'MAVİ üzerindeki OpenVPN', 'ovpn on orange' => 'TURUNCU üzerindeki OpenVPN', 'ovpn on red' => 'KIRMIZI üzerindeki OpenVPN', +'ovpn port in root range' => '1024 ya da daha yüksek bir bağlantı noktası numarası gereklidir..', 'ovpn routes push' => 'Yollar (her satırda bir tane) örneğin 192.168.10.0/255.255.255.0 192.168.20.0/24', 'ovpn routes push options' => 'Yol baskı seçenekleri', 'ovpn server status' => 'Güncel OpenVPN sunucu durumu:', @@ -1634,25 +1674,27 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'ovpn_processprioVH' => 'Çok yüksek', 'ovpnstatus log' => 'OVPN-Durum-Günlük', 'ovpnsys log' => 'OVPN-Durum-Günlük', +'p2p block' => 'P2P Ağları', +'p2p block save notice' => 'Yaptığınız değişiklikleri uygulamak için güvenlik duvarı kural ayarlarını lütfen yeniden yükleyin.', 'package failed to install' => 'Paket yüklenemedi.', 'pagerefresh' => 'Sayfa yenileniyor. Lütfen bekleyin.', 'pakfire accept all' => 'Tüm paketleri yüklemek istiyor musunuz?', 'pakfire ago' => 'önce yapıldı.', -'pakfire available addons' => 'Mevcut Eklentiler:', -'pakfire configuration' => 'Pakfire Yapılandırması', +'pakfire available addons' => 'Mevcut eklentiler:', +'pakfire configuration' => 'Pakfire yapılandırması', 'pakfire core update auto' => 'Otomatik olarak çekirdek ve eklenti güncelleştirmelerini yükle:', 'pakfire core update level' => 'Çekirdek-Güncelleme-Seviyesi', 'pakfire health check' => 'Yansımanın ulaşılabilir olup olmadığını kontrol et (ping):', 'pakfire install description' => 'Aşağıdaki listeden bir veya daha fazla öğeyi seçtikten sonra
eklemek için artı simgesine tıklayınız.', 'pakfire install package' => 'Aşağıdaki paketleri yüklemek istediniz: ', -'pakfire installed addons' => 'Kurulu Eklentiler:', +'pakfire installed addons' => 'Kurulu eklentiler:', 'pakfire last core list update' => 'Son çekirdek listesi güncellemesi', 'pakfire last package update' => 'Son paket listesi güncellemesi', 'pakfire last serverlist update' => 'Son sunucu listesi güncellemesi', 'pakfire last update' => 'Son güncelleme', 'pakfire possible dependency' => ' Yüklenemesi gereken paketlerin yüklenebilmesi için buradaki paketlere ihtiyaç duyulabilir.', 'pakfire register' => 'Pakfire-sunucusuna kayıt:', -'pakfire system state' => 'Sistem Durumu', +'pakfire system state' => 'Sistem durumu', 'pakfire uninstall description' => 'Aşağıdaki listeden bir veya daha fazla öğeyi seçtikten sonra
kaldırmak için eksi simgesine tıklayınız.', 'pakfire uninstall package' => 'Aşağıdaki paketleri kaldırmak istiyorum: ', 'pakfire update daily' => 'Günlük güncellemeleri ara:', @@ -1704,7 +1746,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'printing' => 'Yazdırılıyor', 'printing options' => 'yazdırma seçenekleri', 'priority' => 'Öncelik', -'processes' => 'işlemler', +'processes' => 'İşlemler', 'profile' => 'Profil', 'profile deleted' => 'Silinen profiller: ', 'profile has errors' => 'Profil hataları', @@ -1714,7 +1756,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'profile saved' => 'Kaydedilen profiller: ', 'profiles' => 'Profiller:', 'proto' => 'Kural', -'protocol' => 'Kural: ', +'protocol' => 'Kural ', 'proxy' => 'Vekil sunucu', 'proxy access graphs' => 'Vekil sunucu erişim grafiği', 'proxy admin password' => 'Önbellek yönetici parolası', @@ -1753,8 +1795,9 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'rebooting' => 'Yeniden Başlat', 'rebooting ipfire' => 'IPFire\'ı Yeniden Başlat', 'reconnect' => 'Yeniden Bağlan', -'reconnection' => 'Yeniden Bağlan', +'reconnection' => 'Yeniden bağlan', 'red' => 'İnternet', +'red1' => 'KIRMIZI', 'references' => 'Referanslar', 'refresh' => 'Yenile', 'refresh index page while connected' => 'Index.cgi sayfası bağlandığında yenile', @@ -1774,7 +1817,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'removable device advice' => 'Bir aygıt takıp yenileyin. Aygıtı kullanmadan önce seçip bağlayın. Çıkarmadan önce de ayırın.', 'remove' => 'Kaldır', 'remove ca certificate' => 'CA sertifikasını kaldır', -'remove x509' => 'x509 kaldır', +'remove x509' => 'X509 Kaldır', 'repeat' => 'Tekrar', 'reportfile' => 'Dosya raporu', 'reportlevel' => 'Seviye raporu', @@ -1791,7 +1834,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'restart' => 'Yeniden Başlat', 'restart ovpn server' => 'OpenVPN sunucusunu yeniden başlat', 'restore' => 'Geri Yükle', -'restore defaults' => 'Varsayılanı geri yükle', +'restore defaults' => 'Varsayılanı Geri Yükle', 'restore hardware settings' => 'Donanım ayarlarını geri yükle', 'restore settings' => 'Ayarları Sıfırla', 'reverse sort' => 'Ters kronolojik sıralama', @@ -1801,20 +1844,20 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'root user password' => 'Root parolası', 'route subnet is invalid' => 'Alt ağda geçersiz ek basma yolu', 'router ip' => 'Yönlendirici IP adresi:', -'routing table entries' => 'Yönlendirici Tablo Girdileri:', +'routing table entries' => 'Yönlendirici tablo girdileri:', 'rsvd dst port overlap' => 'IPFire için ayrılmış bağlantı noktası ile örtüşen hedef bağlantı noktası aralığı:', 'rsvd src port overlap' => 'IPFire için ayrılmış bağlantı noktası ile örtüşen kaynak bağlantı noktası aralığı:', 'rules already up to date' => 'Kurallar zaten yüklenmiş.', 'running' => 'ÇALIŞIYOR', 'safe removal of umounted device' => 'Bağlantısı kesilen aygıtı güvenli bir şekilde kaldırabilirsiniz', 'samba' => 'Samba', -'samba status' => 'Samba Durumu', +'samba status' => 'Samba durumu', 'saturday' => 'Cumartesi', 'save' => 'Kaydet', 'save config' => 'ayarları kaydet', 'save error' => 'Yapılandırma arşiv dosyası kaydedilemiyor.', 'save settings' => 'Ayarları kaydet', -'save-adv-options' => 'Gelişmiş seçenekleri kaydet', +'save-adv-options' => 'Gelişmiş Seçenekleri Kaydet', 'script name' => 'Komut adı:', 'secondary dns' => 'İkincil DNS:', 'secondary ntp server' => 'İkincil NTP sunucusu', @@ -1823,7 +1866,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'section' => 'Bölüm', 'secure shell server' => 'Güvenli Kabuk Sunucusu', 'security' => 'Güvenlik', -'security options' => 'Güvenlik Seçenekleri', +'security options' => 'Güvenlik seçenekleri', 'select' => 'Seç', 'select dest net' => 'Bir ağ hedefi seçin.', 'select media' => 'Ortamı seç
(çıkartılabilir ortam için sadece FAT desteklenir)', @@ -1836,7 +1879,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'serial' => 'Dizi', 'server reserved' => 'Bağlantı adı sunucusu ayrılmıştır, izin verilmez.', 'server restart' => 'OpenVPN sunucu çalışırken herhangi bir değişikliği kaydetmek mümkün değildir.', -'server string' => 'Sunucu Dizisi', +'server string' => 'Sunucu dizisi', 'service' => 'Hizmet', 'service added' => 'Özel ağ hizmeti eklendi', 'service name' => 'Hizmet adı:', @@ -1846,8 +1889,8 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'services' => 'Hizmetler', 'services settings' => 'Güvenlik Duvarı - Hizmet Ayarları', 'set' => 'ayar', -'set time now' => 'Zamanı şimdi ayarla', -'set time now help' => 'Herhangi bir zamanda eşitleme etkinliği sırasında (hatta yinelenen bir program kullanılırken) Şimdi zamanı ayarla düğmesine basın. Bir eşitleme olmadan önce beş dakika veya daha fazla beklemek zorunda olduğunuzu unutmayın.', +'set time now' => 'Zamanı Şimdi Ayarla', +'set time now help' => 'Herhangi bir zamanda eşitleme etkinliği sırasında (hatta yinelenen bir program kullanılırken) Zamanı şimdi ayarla düğmesine basın. Bir eşitleme olmadan önce beş dakika veya daha fazla beklemek zorunda olduğunuzu unutmayın.', 'settings' => 'Ayarlar', 'shaping add options' => 'Hizmet ekle', 'shaping list options' => 'Trafik şekillendirme hizmetleri', @@ -1858,7 +1901,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'show areas' => 'alanları göster', 'show ca certificate' => 'CA sertifikalarını göster', 'show certificate' => 'Sertifika göster', -'show crl' => 'Sertifika iptal listesini göster', +'show crl' => 'Sertifika İptal Listesini Göster', 'show host certificate' => 'Ana bilgisayar sertifikalarını göster', 'show last x lines' => 'Son x satırlarını göster', 'show lines' => 'Satırları göster', @@ -1885,6 +1928,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'smbstop' => 'Samba\'yı durdur', 'smtphost' => 'SMTP ana bilgisayarı', 'smtpport' => 'SMTP bağlantı noktası numarası', +'snat new source ip address' => 'Yeni kaynak IP adresi', 'snort hits' => 'Saldırı kuralları için toplam aktif sayı', 'snort working' => 'Snort çalışıyor ... Tüm işlemler başarıyla tamamlanana kadar bekleyin.', 'socket options' => 'Soket seçenekleri', @@ -1912,10 +1956,11 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'srcprt range overlaps' => 'Kaynak bağlantı noktası aralığı önceden tanımlanmış bir bağlantı noktası ile çakışıyor.', 'srcprt within existing' => 'Kaynak bağlantı noktası önceden tanımlanmış bağlantı noktası aralığı içinde.', 'ssdmz pinholes' => 'Açık Bölge (DMZ)', -'ssh access' => 'SSH Erişimi', +'ssh' => 'SSH', +'ssh access' => 'SSH erişimi', 'ssh access tip' => 'IPFire SSH varsayılan bağlantı noktası olarak 222 kullanmıyor!', 'ssh fingerprint' => 'Parmak izi', -'ssh host keys' => 'SSH Sunucu Anahtarı', +'ssh host keys' => 'SSH sunucu anahtarları', 'ssh is disabled' => 'SSH devre dışı bırakıldı. Durduruluyor.', 'ssh is enabled' => 'SSH aktifleştirildi. Yeniden başlatılıyor.', 'ssh key' => 'Anahtar', @@ -1946,7 +1991,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'static routes' => 'Statik Yollar', 'status' => 'Durum', 'status information' => 'Durum bilgisi', -'status ovpn' => '4. OpenVPN Durumu / Yapılandırma:', +'status ovpn' => 'OpenVPN', 'std classes' => 'Standart sınıflar', 'stop' => 'Dur', 'stop ovpn server' => 'OpenVPN Sunucusunu Durdur', @@ -1960,16 +2005,17 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'successfully refreshed updates list' => 'Başarıyla güncellemeler listesi yenilendi.', 'summaries kept' => 'Günlük özetlerini tut:', 'sunday' => 'Pazar', +'support donation' => 'Lütfen bağışta bulunarak IPFire projesine destek olun', 'swap' => 'takas alanı', 'swap usage per' => 'takas alanı kullanımı - ', 'system' => 'Sistem', 'system graphs' => 'Sistem Grafikleri', -'system information' => 'Sistem bilgisi', +'system information' => 'Sistem Bilgisi', 'system log viewer' => 'Sistem Günlük Görüntüleyicisi', 'system logs' => 'Sistem Günlükleri', 'system status information' => 'Sistem Durum Bilgisi', 'telephone not set' => 'Telefon ayarlanmamış.', -'template' => 'Ön ayar', +'template' => 'Ön Ayar', 'template warning' => 'QoS kurmak için iki seçeneğiniz vardır. İlk olarak kaydet düğmesine basıp kendi sınıf ve kurallarınızı oluşturabilirsiniz. İkinci olarak ise ön ayar düğmesine basıp sınıf ve kurallar için bir şablonun kurulmasını sağlayın. ', 'test' => 'test', 'test email could not be sent' => 'Test e-posta gönderilemedi', @@ -2012,20 +2058,22 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'tor accounting period daily' => 'günlük', 'tor accounting period monthly' => 'aylık', 'tor accounting period weekly' => 'haftalık', -'tor acls' => 'Erişim Kontrolü', +'tor acls' => 'Erişim kontrolü', 'tor allowed subnets' => 'İzin verilen alt ağlar (her satırda bir tane)', 'tor bandwidth burst' => 'En büyük ayırma', 'tor bandwidth rate' => 'En büyük oran', -'tor bandwidth settings' => 'Bant Genişliği Ayarları', +'tor bandwidth settings' => 'Bant genişliği ayarları', 'tor bandwidth unlimited' => 'sınırsız', 'tor bridge enabled' => 'Tor köprüsünü etkinleştir', -'tor common settings' => 'Genel Ayarlar', -'tor configuration' => 'Tor Yapılandırması', +'tor common settings' => 'Genel ayarlar', +'tor configuration' => 'Tor yapılandırması', 'tor connected relays' => 'Bağlı aktarımlar', -'tor contact info' => 'İletişim Bilgileri', +'tor contact info' => 'İletişim bilgileri', 'tor daemon' => 'Artalan süreci', -'tor enabled' => 'Tor Aktif', +'tor directory port' => 'Dizin bağlantı noktası', +'tor enabled' => 'Tor aktif', 'tor errmsg invalid accounting limit' => 'Geçersiz hesap sınırı', +'tor errmsg invalid directory port' => 'Geçersiz dizin bağlantı noktası', 'tor errmsg invalid ip or mask' => 'Geçersiz IP alt ağı', 'tor errmsg invalid node id' => 'Geçersiz düğüm kimliği (ID)', 'tor errmsg invalid relay address' => 'Geçersiz aktarma adresi', @@ -2034,10 +2082,10 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'tor errmsg invalid socks port' => 'Geçersiz SOCKS bağlantı noktası', 'tor exit country' => 'Ülçe çıkışı', 'tor exit country any' => 'Herhangi bir ülke', -'tor exit nodes' => 'Çıkış Düğümleri', +'tor exit nodes' => 'Çıkış düğümleri', 'tor relay address' => 'Aktarma adresleri', -'tor relay configuration' => 'Tor Aktarma Yapılandırması', -'tor relay enabled' => 'Tor Aktarma Aktif', +'tor relay configuration' => 'Tor aktarma yapılandırması', +'tor relay enabled' => 'Tor aktarma aktif', 'tor relay external address' => 'Aktarım dış adresi', 'tor relay fingerprint' => 'Aktarım parmak izi', 'tor relay mode' => 'Aktarım biçimi', @@ -2047,7 +2095,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'tor relay mode relay' => 'Sadece aktarım', 'tor relay nickname' => 'Aktarım takma adı', 'tor relay port' => 'Aktarım bağlantı noktası', -'tor service' => 'Tor Servisi', +'tor service' => 'Tor servisi', 'tor socks port' => 'SOCKS bağlantı noktası', 'tor stats' => 'İstatistik', 'tor traffic limit hard' => 'Trafik sınırına ulaşıldı.', @@ -2094,7 +2142,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'unable to contact' => 'Bağlantı Kurulamadı', 'unencrypted' => 'Şifresiz', 'uninstall' => 'Kaldır', -'unix charset' => 'UNIX Karakterleri', +'unix charset' => 'UNIX karakterleri', 'unix group' => ' UNIX kullanıcı grubu', 'unix password sync' => 'Unix Parola Eşitleme', 'unix shell' => 'UNIX Kabuğu', @@ -2173,7 +2221,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'updxlrtr total data from cache' => 'Önbellekten teslim edilen toplam veri (bayt)', 'updxlrtr total files' => 'Önbellekteki toplam dosya', 'updxlrtr unknown' => 'Bilinmeyen', -'updxlrtr update accelerator' => 'Güncelleme Hızlandırıcısı', +'updxlrtr update accelerator' => 'Güncelleme hızlandırıcısı', 'updxlrtr update information' => 'Yüklenebilir bir güncelleştirime sürümü var. Daha fazla bilgi için http://update-accelerator.advproxy.net adresini ziyaret edin.', 'updxlrtr update notification' => 'Güncelleme bildirimi!', 'updxlrtr used by' => 'Kullanan', @@ -2182,16 +2230,17 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'updxlrtr weekly' => 'haftalık', 'updxlrtr year' => 'Bir yıl', 'upgrade' => 'yükselt', +'uplink' => 'Yükleme bağlantısı', 'uplink speed' => 'Yükleme hızı (kbit/san)', 'uplink std class' => 'Standart yükleme hızı sınıf', 'upload' => 'Yükle', 'upload a certificate' => 'Sertifikası yükle:', 'upload a certificate request' => 'Sertifika isteği yükle:', -'upload ca certificate' => 'CA sertifikası yükle', +'upload ca certificate' => 'CA Sertifikası Yükle', 'upload fcdsl.o' => 'KALDIRILACAK', 'upload file' => 'Dosya yükle', 'upload new ruleset' => 'Yeni kurallar yükle', -'upload p12 file' => 'PKCS12 dosyası yükle', +'upload p12 file' => 'PKCS12 Dosyası Yükle', 'upload static key' => 'Statik bir anahtar yükle', 'upload successful' => 'Yükleme başarılı.', 'upload synch.bin' => 'synch.bin yükle', @@ -2217,17 +2266,17 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'urlfilter assigned users' => 'Atanan kullanıcılar', 'urlfilter automatic blacklist update' => 'Otomatik olarak kara listeyi güncelleştir', 'urlfilter automatic update schedule' => 'Otomatik olarak güncelleştirme zamanı', -'urlfilter back to main page' => 'Ana sayfaya geri dön', +'urlfilter back to main page' => 'Ana Sayfaya Geri Dön', 'urlfilter background image' => 'UrlFilter arka plan resmi', 'urlfilter background text' => 'Engellenen sayfanın altında özel bir arkaplan görüntüsü kullanmak için .jpg dosyası yükleme', -'urlfilter backup' => 'Yedek dosyası oluştur', +'urlfilter backup' => 'Yedek Dosyası Oluştur', 'urlfilter backup error' => 'Yedek dosyası oluşturulamıyor', 'urlfilter backup settings' => 'Yedek URL filtre ayarları', 'urlfilter banned clients' => 'Yasaklanan IP adresleri', 'urlfilter blacklist age 1' => 'Son kara liste başarıyla güncellendi', 'urlfilter blacklist age 2' => 'gün önce', 'urlfilter blacklist category name' => 'Kara liste kategori adı', -'urlfilter blacklist editor' => 'Kara liste düzenleyicisi', +'urlfilter blacklist editor' => 'Kara Liste Düzenleyicisi', 'urlfilter blacklist editor info' => 'Kara liste dosyanızı oluturma ve düzenleme', 'urlfilter blacklist name' => 'Kara liste adı', 'urlfilter blacklist update' => 'Kara listeyi güncelleştir', @@ -2260,7 +2309,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'urlfilter custom url' => 'Özel kaynak URL adresi', 'urlfilter custom url required' => 'Gerekli özel kaynak URL', 'urlfilter custom whitelist' => 'Özel beyaz liste', -'urlfilter daily' => 'günlük', +'urlfilter daily' => 'Günlük', 'urlfilter disabled' => 'Kapalı', 'urlfilter domains' => 'Etki alanı (her satırda bir tane)', 'urlfilter dont restart urlfilter' => 'URL filtreyi yeniden başlatma', @@ -2283,7 +2332,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'urlfilter enabled' => 'Aktif:', 'urlfilter example' => 'Örneğin: www.etkialani.com', 'urlfilter example ads' => 'Örneğin: www.etkialani.com/reklam/', -'urlfilter export blacklist' => 'Kara listeyi dışarı aktar', +'urlfilter export blacklist' => 'Kara Listeyi Dışarı Aktar', 'urlfilter export error' => 'Dışarı aktarma dosyası dosyası oluşturulamıyor', 'urlfilter expressions' => 'İfadeler (her satırda bir tane)', 'urlfilter file ext block' => 'Engellenen dosya uzantısı', @@ -2294,16 +2343,16 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'urlfilter friday' => 'Cum', 'urlfilter from' => 'Başlangıç', 'urlfilter hourly' => 'Saatlik', -'urlfilter import blacklist' => 'Kara listeyi al', +'urlfilter import blacklist' => 'Kara Listeyi Al', 'urlfilter import text' => 'Önceden kaydedilmiş *.tar.gz uzantılı kara liste düzenleyici dosyasını yüklemek için aşağıdan seçin', -'urlfilter install blacklist' => 'Kara listeye yükle', +'urlfilter install blacklist' => 'Kara Listeye Yükle', 'urlfilter install information' => 'Yeni kara liste otomatik olarak oluşturulup veritabanları için derlenecektir. Kara liste boyutuna bağlı olarak güncelleme işlemi birkaç dakika zaman alabilir. URL filtreyi yeniden başlatmadan önce bu görevin muhakkak bitirilmesini bekleyin.', 'urlfilter invalid content' => 'Dosya squidGuard uyumlu kara liste değil', 'urlfilter invalid import file' => 'Dosya geçerli URL filtre kara liste düzenleyicisi dosyası değil', 'urlfilter invalid ip or mask error' => 'Geçersiz IP adresi veya ağ maskesi', 'urlfilter invalid restore file' => 'Bu dosya geçerli bir URL filtre yedek dosyası değil', 'urlfilter invalid user error' => 'Geçersiz kullanıcı adı', -'urlfilter load blacklist' => 'Kara liste dosyasını yükle', +'urlfilter load blacklist' => 'Kara Liste Dosyasını Yükle', 'urlfilter local file redirection' => 'Yeniden yerel dosyaya yönlendir', 'urlfilter log' => 'urlfiltre günlükleri', 'urlfilter log summary' => 'URL filtre kaydı için toplam sayı', @@ -2311,13 +2360,13 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'urlfilter logs' => 'URL Filtre Günlükleri', 'urlfilter maintenance' => 'URL filtre bakımı', 'urlfilter manage local file repository' => 'Yerel dosya deposunu yönetin', -'urlfilter manage repository' => 'Depoyu yönet', +'urlfilter manage repository' => 'Depoyu Yönet', 'urlfilter minutes' => 'dakika', 'urlfilter mode allow' => 'İzin ver', 'urlfilter mode block' => 'Engelle', 'urlfilter mon' => 'P', 'urlfilter monday' => 'Pzt', -'urlfilter monthly' => 'aylık', +'urlfilter monthly' => 'Aylık', 'urlfilter msg text 1' => '1. mesaj satırı', 'urlfilter msg text 2' => '2. mesaj satırı', 'urlfilter msg text 3' => '3. mesaj satırı', @@ -2327,6 +2376,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'urlfilter quota restart message' => 'Not: URL filtrenin yeniden başlatılması tüm kullanıcılar için zaman sayaçlarını sıfırlar', 'urlfilter quota time error' => 'Zaman kotası için geçersiz değer', 'urlfilter quota user error' => 'En az bir kullanıcı adı gereklidir', +'urlfilter redirect template' => 'Sayfa şablonuna yönlendir', 'urlfilter redirectpage' => 'Bu URL adresine yönlendir', 'urlfilter remove file' => 'Deposundan dosyayı kaldır', 'urlfilter renewal' => 'Yenile', @@ -2336,7 +2386,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'urlfilter restart' => 'URL filtreyi yeniden başlat', 'urlfilter restart message' => 'Değişen URL filtre kurallarının aktifleştirilmesi için yeniden başlatılmalıdır', 'urlfilter restart notification' => 'Değişen kuralları aktifleştir', -'urlfilter restore' => 'Yedek dosyasını içeri aktar', +'urlfilter restore' => 'Yedek Dosyasını İçeri Aktar', 'urlfilter restore results' => 'Sonuçları geri yükle', 'urlfilter restore settings' => 'URL filtre ayarlarını geri yükle', 'urlfilter restore success' => 'URL filtre yapılandırması geri yüklendi. URL filtresi yeni ayarlarını aktifleştirmek için yeniden başlatılması gerekir.', @@ -2345,12 +2395,12 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'urlfilter sat' => 'C', 'urlfilter saturday' => 'Cmt', 'urlfilter save and restart' => 'Kaydet ve Yeniden Başlat', -'urlfilter save schedule' => 'Güncelleme ayarlarını kaydet', +'urlfilter save schedule' => 'Güncelleme Ayarlarını Kaydet', 'urlfilter select blacklist' => 'Mevcut kara listeyi seçin', 'urlfilter select multi' => 'Birden çok kategori seçmek için Ctrl tuşuna basın', 'urlfilter select source' => 'İndirmek için kaynağı seçin', -'urlfilter set time constraints' => 'Zaman kısıtlamalarını ayarla', -'urlfilter set user quota' => 'Kullanıcı kotasını ayarla', +'urlfilter set time constraints' => 'Zaman Kısıtlamalarını Ayarla', +'urlfilter set user quota' => 'Kullanıcı Kotasını Ayarla', 'urlfilter show category' => 'Engellenen sayfada kategori göster', 'urlfilter show dnserror' => '"DNS Hatası" URL adreslerini engellemek için kullan', 'urlfilter show ip' => 'Engellenen sayfada IP göster', @@ -2374,12 +2424,12 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'urlfilter unfiltered clients' => 'Yasaksız IP adresleri', 'urlfilter update information' => 'Yüklenebilir güncelleştirilmiş bir sürümü var. Daha fazla bilgi için http://www.urlfilter.net adresini ziyaret edin.', 'urlfilter update notification' => 'Güncelleme bildirimi!', -'urlfilter update now' => 'Şimdi güncelle', +'urlfilter update now' => 'Şimdi Güncelle', 'urlfilter update results' => 'Kara liste güncelleştirme sonuçları', 'urlfilter update rule' => 'Güncelle', 'urlfilter upload background' => 'Resim yükle', -'urlfilter upload blacklist' => 'Kara liste dosyası yükle', -'urlfilter upload file' => 'Dosya yükle', +'urlfilter upload blacklist' => 'Kara Liste Dosyası Yükle', +'urlfilter upload file' => 'Dosya Yükle', 'urlfilter upload file information 1' => 'Not', 'urlfilter upload file information 2' => 'URL filtre depo değişikliklerini aktifleştirmek için yeniden başlatılması gerekir.', 'urlfilter upload file text' => 'Yerel depoya dosya eklemek için aşağıdan bir dosya yükleyin', @@ -2396,7 +2446,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'urlfilter wed' => 'Ç', 'urlfilter wednesday' => 'Çar', 'urlfilter weekday error' => 'Seçilmiş en az bir gün olmalıdır', -'urlfilter weekly' => 'haftalık', +'urlfilter weekly' => 'Haftalık', 'urlfilter whitelist always allowed' => 'Yasaklı istemciler için özel beyaz liste izini', 'urlfilter wrong filetype' => 'Uzantısı .tar.gz olan dosya yok', 'usb modem on acm0' => 'ACM0 üzerindeki USB Modem', @@ -2472,11 +2522,11 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'weeks' => 'hafta', 'wildcards' => 'Joker karakterler', 'wins server' => 'Wins Sunucusu', -'wins support' => 'Wins Desteği', +'wins support' => 'Wins desteği', 'wireless' => 'KABLOSUZ AĞ', 'wireless config added' => 'Kablosuz ağ yapılandırma eklendi', 'wireless config changed' => 'Kablosuz ağ yapılandırma değiştirildi', -'wireless configuration' => 'Kablosuz Ağ ayarları', +'wireless configuration' => 'Kablosuz ağ ayarları', 'wlan client' => 'Kablosuz istemci', 'wlan client advanced settings' => 'Gelişmiş ayarlar', 'wlan client and' => 've', @@ -2507,7 +2557,8 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'wlan client wpa mode ccmp ccmp' => 'CCMP-CCMP', 'wlan client wpa mode ccmp tkip' => 'CCMP-TKIP', 'wlan client wpa mode tkip tkip' => 'TKIP-TKIP', -'wlanap access point' => 'Erişim Noktası', +'wlan clients' => 'Kablosuz istemciler', +'wlanap access point' => 'Access Point', 'wlanap channel' => 'Kanal', 'wlanap country' => 'Ülke Kodu', 'wlanap debugging' => 'Hata ayıklama', @@ -2529,7 +2580,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'wlanap wlan settings' => 'WLan Ayarları', 'wlanap wlan status' => 'WLan Durumu', 'wol wakeup' => 'Kalk', -'workgroup' => 'Çalışma Grubu', +'workgroup' => 'Çalışma grubu', 'written bytes' => 'yazılan bayt', 'xtaccess all error' => 'Bu bağlantı noktası yönlendirme kaydı yapıldığında tüm harici erişim ayarlanamaz.', 'xtaccess bad transfert' => 'Bir bağlantı noktası hedef aralığı belirtirseniz, kaynak aralığı ile aynı olmalıdır!', From a72ae687c6779a280fe2da176550471b8b3b1771 Mon Sep 17 00:00:00 2001 From: Alexander Marx Date: Mon, 17 Mar 2014 07:22:24 +0100 Subject: [PATCH 17/35] Firewall: Bugfix: Remark in hostgroups and servicegroups was not changeable Another Bugfix: Layout of hostgroups was broken when more than 1 vpn connection is defined. There where dropdownboxes for every vpn connection instead of only one --- html/cgi-bin/fwhosts.cgi | 86 +++++++++++++++++++++++++++++----------- 1 file changed, 63 insertions(+), 23 deletions(-) diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index 2d128f55d..042fdde0c 100644 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -1236,7 +1236,7 @@ END

$Lang::tr{'remark'}: - +


@@ -1256,7 +1256,7 @@ END - END foreach my $network (sort keys %defaultNetworks) { @@ -1285,7 +1285,7 @@ END - "; END foreach my $key (sort { ncmp($customnetwork{$a}[0],$customnetwork{$b}[0]) } keys %customnetwork) { print""; @@ -1302,7 +1302,7 @@ END - "; END foreach my $key (sort { ncmp($customhost{$a}[0],$customhost{$b}[0]) } keys %customhost) { print""; @@ -1322,7 +1322,7 @@ END - "; END foreach my $key (sort { ncmp($ccdnet{$a}[0],$ccdnet{$b}[0]) } keys %ccdnet) { @@ -1331,10 +1331,17 @@ END print""; } #OVPN clients + my @ovpn_clients=(); foreach my $key (sort { ncmp($ccdhost{$a}[0],$ccdhost{$b}[0]) } keys %ccdhost) { if ($ccdhost{$key}[33] ne ''){ - print< - " if ($show eq ''); END - $show='1'; - print""; + foreach(@ovpn_clients){ + print""; } + print""; } - if ($show eq '1'){$show='';print"";} #OVPN n2n networks + my @OVPN_N2N=(); foreach my $key (sort { ncmp($ccdhost{$a}[1],$ccdhost{$b}[1]) } keys %ccdhost) { if($ccdhost{$key}[3] eq 'net'){ - print< - " END - $show='1'; - print""; + foreach(@OVPN_N2N){ + print""; } + print""; } - if ($show eq '1'){$show='';print"";} #IPsec networks + my @IPSEC_N2N=(); foreach my $key (sort { ncmp($ipsecconf{$a}[0],$ipsecconf{$b}[0]) } keys %ipsecconf) { if ($ipsecconf{$key}[3] eq 'net'){ - print< - " END - $show='1'; - print""; + foreach(@IPSEC_N2N){ + print""; } } - if ($show eq '1'){$show='';print"";} + print""; print""; print""; print"

"; @@ -1479,9 +1500,28 @@ END print<
$Lang::tr{'fwhost addgrpname'}
-
$Lang::tr{'remark'}: -
-
+ +
+ + $Lang::tr{'remark'}: + + + + + + + + + + + + + +
+ + + +
END } if($fwhostsettings{'updatesrvgrp'} eq 'on'){ From 2a07aa9d9c4c1968a1072147107d889a1a8aae5e Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 17 Mar 2014 14:17:44 +0100 Subject: [PATCH 18/35] dialctrl: Remove defunct script. --- config/cron/crontab | 3 - config/rootfiles/common/armv5tel/initscripts | 2 - config/rootfiles/common/i586/initscripts | 2 - config/rootfiles/common/stage2 | 1 - config/rootfiles/core/76/update.sh | 9 + html/cgi-bin/index.cgi | 2 - lfs/initscripts | 4 - src/scripts/dialctrl.pl | 201 ------------------- 8 files changed, 9 insertions(+), 215 deletions(-) delete mode 100644 src/scripts/dialctrl.pl diff --git a/config/cron/crontab b/config/cron/crontab index 3b70df44e..92c3a78ba 100644 --- a/config/cron/crontab +++ b/config/cron/crontab @@ -50,9 +50,6 @@ HOME=/ %weekly * 3-5 /var/ipfire/updatexlrator/autocheck/cron.weekly %monthly * 3-5 * /var/ipfire/updatexlrator/autocheck/cron.monthly -# Reset Dialup Statistics -&bootrun 0 0 1 * * /usr/local/bin/dialctrl.pl reset - # fireinfo %nightly,random * 23-4 /usr/bin/sendprofile >/dev/null 2>&1 diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index bf4dd529a..4716b9726 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -74,7 +74,6 @@ etc/rc.d/init.d/networking/red.down/10-ipsec etc/rc.d/init.d/networking/red.down/10-miniupnpd etc/rc.d/init.d/networking/red.down/10-ovpn etc/rc.d/init.d/networking/red.down/20-RL-firewall -etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl #etc/rc.d/init.d/networking/red.up etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq @@ -89,7 +88,6 @@ etc/rc.d/init.d/networking/red.up/40-ipac etc/rc.d/init.d/networking/red.up/50-ipsec etc/rc.d/init.d/networking/red.up/50-ovpn 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 diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 3b91181d0..07a39f463 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -76,7 +76,6 @@ etc/rc.d/init.d/networking/red.down/10-ipsec etc/rc.d/init.d/networking/red.down/10-miniupnpd etc/rc.d/init.d/networking/red.down/10-ovpn etc/rc.d/init.d/networking/red.down/20-RL-firewall -etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl #etc/rc.d/init.d/networking/red.up etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq @@ -91,7 +90,6 @@ etc/rc.d/init.d/networking/red.up/40-ipac etc/rc.d/init.d/networking/red.up/50-ipsec etc/rc.d/init.d/networking/red.up/50-ovpn 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 diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index a2b1cfab4..87649e972 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -81,7 +81,6 @@ usr/local/bin/backupiso usr/local/bin/connscheduler usr/local/bin/consort.sh usr/local/bin/convert-ovpn -usr/local/bin/dialctrl.pl usr/local/bin/hddshutdown usr/local/bin/httpscert usr/local/bin/makegraphs diff --git a/config/rootfiles/core/76/update.sh b/config/rootfiles/core/76/update.sh index 150045bfe..43c4c3f07 100644 --- a/config/rootfiles/core/76/update.sh +++ b/config/rootfiles/core/76/update.sh @@ -110,6 +110,9 @@ add_to_backup var/ipfire/{dmzholes,portfw,outgoing,xtaccess} add_to_backup etc/inittab add_to_backup etc/fstab add_to_backup usr/share/usb_modeswitch +add_to_backup etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl +add_to_backup etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl +add_to_backup usr/local/bin/dialctrl.pl # Backup the files tar cJvf /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \ @@ -141,6 +144,12 @@ rm -rf /lib/modules # Remove old usb_modeswitch_data rm -rf /usr/share/usb_modeswitch +# Remove dialctrl.pl script +rm -f \ + /etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl \ + /etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl \ + /usr/local/bin/dialctrl.pl + # # Remove old udev rules. # diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 2ce403001..53adeacce 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -228,8 +228,6 @@ END #Dial profiles if ( $netsettings{'RED_TYPE'} ne "STATIC" && $netsettings{'RED_TYPE'} ne "DHCP" ){ - # The dialctrl.pl script outputs html - print `/usr/local/bin/dialctrl.pl show`; if ( ( $pppsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ ) ) { print < diff --git a/lfs/initscripts b/lfs/initscripts index 28387f349..02f97431a 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -185,13 +185,9 @@ $(TARGET) : /etc/rc.d/init.d/networking/red.up/23-RS-snort ln -sf ../../../../../usr/local/bin/qosctrl \ /etc/rc.d/init.d/networking/red.up/24-RS-qos - ln -sf ../../../../../usr/local/bin/dialctrl.pl \ - /etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl ln -sf ../../squid /etc/rc.d/init.d/networking/red.up/27-RS-squid ln -sf ../../dnsmasq /etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq ln -sf ../../firewall /etc/rc.d/init.d/networking/red.down/20-RL-firewall - ln -sf ../../../../../usr/local/bin/dialctrl.pl \ - /etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl for i in green blue orange; do \ ln -sf any /etc/rc.d/init.d/networking/$$i; \ diff --git a/src/scripts/dialctrl.pl b/src/scripts/dialctrl.pl deleted file mode 100644 index b0abab7b1..000000000 --- a/src/scripts/dialctrl.pl +++ /dev/null @@ -1,201 +0,0 @@ -#!/usr/bin/perl -# -# Dialup Statistics for IPFire -# based on SilverStar's work on -# http://goodymuc.go.funpic.de -# - -require '/var/ipfire/general-functions.pl'; -require "${General::swroot}/lang.pl"; -require "${General::swroot}/header.pl"; - -($sec,$min,$hour,$mday,$mon,$year,$wday,$ydat,$isdst)=localtime(); - $jahr=$year; - $monat=$mon+1; - $tag=$mday; - $jahr=$year; - -$jahr=$year +1900; - -if (length($monat) == 1) -{ - $monat="0$monat"; -} -if(length($tag) == 1) -{ - $tag="0$tag"; -} -if(length($hour) == 1) -{ - $hour="0$hour"; -} -if(length($min) == 1) -{ - $min="0$min"; -} -if(length($sec) == 1) -{ - $sec="0$sec"; -} - -my $s_date = $tag."/".$monat."/".$jahr; -my $s_time = $hour.":".$min.":".$sec; -my $file_log = "/var/log/counter/dialup.log"; -my $file_connect = "/var/log/counter/connect"; -my $file_reset = "/var/log/counter/reset"; - -if ($ARGV[0] eq 'up') { - if (! -e "$file_log") { - &new; - } else { - open(CONNECT,">$file_connect"); - close(CONNECT); - open(COUNTER,"<$file_log"); - $line = ; - ($start,$update,$up,$down,$rec,$on,$bit) = split(/\|/,$line); - close(COUNTER); - $up++; - $update = $s_date." on ".$s_time; - open(COUNTER,">$file_log"); - print COUNTER "$start\|$update\|$up\|$down\|$rec\|$on\|$bit"; - close(COUNTER); - } -} - -if ($ARGV[0] eq 'down') { - if (! -e "$file_log") { - &new; - } else { - open(COUNTER,"<$file_log"); - $line = ; - ($start,$update,$up,$down,$rec,$on,$bit) = split(/\|/,$line); - close(COUNTER); - $on =~ /(\d+)d\s+(\d+)h\s+(\d+)m\s+(\d+)s/; - $d1 = $1; $h1 = $2; $m1 = $3; $s1 = $4; - $con = &General::age("$file_connect"); - $con =~ /(\d+)d\s+(\d+)h\s+(\d+)m\s+(\d+)s/; - $d2 = $1; $h2 = $2; $m2 = $3; $s2 = $4; - $sum_d = ($d1 + $d2) * 86400; - $sum_h = ($h1 + $h2) * 3600; - $sum_m = ($m1 + $m2) * 60; - $sum_s = ($s1 + $s2); - $sum_1 = $sum_d + $sum_h + $sum_m + $sum_s; - $d = int($sum_1 / 86400); - $totalhours = int($sum_1 / 3600); - $h = $totalhours % 24; - $totalmins = int($sum_1 / 60); - $m = $totalmins % 60; - $s = $sum_1 % 60; - $on = "${d}d ${h}h ${m}m ${s}s"; - $down++; - $update = $s_date." on ".$s_time; - open(COUNTER,">$file_log"); - print COUNTER "$start\|$update\|$up\|$down\|$rec\|$on\|$bit"; - close(COUNTER); - } -} - -if ($ARGV[0] eq 'rec') { - if (! -e "$file_log") { - &new; - } else { - open(COUNTER,"<$file_log"); - $line = ; - ($start,$update,$up,$down,$rec,$on,$bit) = split(/\|/,$line); - close(COUNTER); - $rec++; - $update = $s_date." on ".$s_time; - open(COUNTER,">$file_log"); - print COUNTER "$start\|$update\|$up\|$down\|$rec\|$on\|$bit"; - close(COUNTER); - } -} - -elsif ($ARGV[0] eq 'show') { -if (! -e "$file_log") { - &new; - } -else { - open(COUNTER,"<$file_log"); - $line = ; - ($start,$update,$up,$down,$rec,$on,$bit) = split(/\|/,$line); - $on =~ /(\d+)d\s+(\d+)h\s+(\d+)m\s+(\d+)s/; - $d1 = $1; $h1 = $2; $m1 = $3; $s1 = $4; - close(COUNTER); - if ( ! -e "${General::swroot}/red/active") { - $timecon = "0d 0h 0m 0s"; - } else { - $timecon = &General::age("$file_connect"); - } - $timecon =~ /(\d+)d\s+(\d+)h\s+(\d+)m\s+(\d+)s/; - $d2 = $1; $h2 = $2; $m2 = $3; $s2 = $4; - $timeres = &General::age("$file_reset"); - $timeres =~ /(\d+)d\s+(\d+)h\s+(\d+)m\s+(\d+)s/; - $d3 = $1; $h3 = $2; $m3 = $3; $s3 = $4; - $sum_d1 = ($d1 + $d2) * 86400; - $sum_h1 = ($h1 + $h2) * 3600; - $sum_m1 = ($m1 + $m2) * 60; - $sum_s1 = ($s1 + $s2); - $sum_1 = $sum_d1 + $sum_h1 + $sum_m1 + $sum_s1; - $sum_d2 = $d3 * 86400; - $sum_h2 = $h3 * 3600; - $sum_m2 = $m3 * 60; - $sum_s2 = $s3; - $sum_2 = $sum_d2 + $sum_h2 + $sum_m2 + $sum_s2; - $d = int($sum_1 / 86400); - $totalhours = int($sum_1 / 3600); - $h = $totalhours % 24; - $totalmins = int($sum_1 / 60); - $m = $totalmins % 60; - $s = $sum_1 % 60; - $current = "${d}d ${h}h ${m}m ${s}s"; - $ontime = ( $sum_1 * 100 ) / $sum_2; - if ($ontime >= 99.95) { - $ontime = sprintf("%.0f", $ontime); - } - elsif ($ontime <= 0.05) { - $ontime = sprintf("%.0f", $ontime); - } - else { - $ontime = sprintf("%.1f", $ontime); - } - -print <$Lang::tr{'since'} $update - - - -
$Lang::tr{'connections'}: $up$Lang::tr{'disconnects'}: $down$Lang::tr{'attemps'}: $rec
$Lang::tr{'total connection time'}:$current ~ $ontime%
-END -; - } -} - -elsif ($ARGV[0] eq 'reset') { - &new; -} - -elsif ($ARGV[0] eq '') { - print "\nDont run on the console...\n\n"; -} - -exit 0; - -sub new { - open(COUNTER,">$file_log"); - $start = $s_date." on ".$s_time; - $update = "‹no action since clearing›"; - $up = "0"; - $down = "0"; - $rec = "0"; - $on = "0d 0h 0m"; - $bit = "0"; - print COUNTER "$start\|$update\|$up\|$down\|$rec\|$on\|$bit"; - close(COUNTER); - open(CONNECT,">$file_connect"); - print CONNECT "0"; - close(CONNECT); - open(RESET,">$file_reset"); - print RESET "0"; - close(RESET); -} From c2a1af7545c52edc9354e778acecb6370ea15d48 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 17 Mar 2014 15:47:28 +0100 Subject: [PATCH 19/35] firewall: rules.pl: Sanitise source and destination IP addresses. Those variables are now empty if source or destination are unspecified. --- config/firewall/rules.pl | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index 51ddb446a..5b3383125 100755 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -39,6 +39,7 @@ my $CHAIN_NAT_SOURCE = "NAT_SOURCE"; my $CHAIN_NAT_DESTINATION = "NAT_DESTINATION"; my $CHAIN_MANGLE_NAT_DESTINATION_FIX = "NAT_DESTINATION"; my @VALID_CHAINS = ($CHAIN_INPUT, $CHAIN_FORWARD, $CHAIN_OUTPUT); +my @ANY_ADDRESSES = ("0.0.0.0/0.0.0.0", "0.0.0.0/0", "0/0"); my @PROTOCOLS = ("tcp", "udp", "icmp", "igmp", "ah", "esp", "gre", "ipv6", "ipip"); my @PROTOCOLS_WITH_PORTS = ("tcp", "udp"); @@ -255,6 +256,16 @@ sub buildrules { # Skip invalid rules. next if (!$source || !$destination || ($destination eq "none")); + # Sanitize source. + if ($source ~~ @ANY_ADDRESSES) { + $source = ""; + } + + # Sanitize destination. + if ($destination ~~ @ANY_ADDRESSES) { + $destination = ""; + } + # Array with iptables arguments. my @options = (); @@ -268,12 +279,15 @@ sub buildrules { my @source_options = (); if ($source =~ /mac/) { push(@source_options, $source); - } else { + } elsif ($source) { push(@source_options, ("-s", $source)); } # Prepare destination options. - my @destination_options = ("-d", $destination); + my @destination_options = (); + if ($destination) { + push(@destination_options, ("-d", $destination)); + } # Add time constraint options. push(@options, @time_options); From 5cf8c8c12382d77b07fbcb1b8916d78d2806cc74 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 17 Mar 2014 17:39:47 +0100 Subject: [PATCH 20/35] firewall: Fix DNAT rules between internal zones. --- config/firewall/rules.pl | 43 +++++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index 5b3383125..0b6ac72b3 100755 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -294,12 +294,12 @@ sub buildrules { my $firewall_is_in_source_subnet = 0; if ($source) { - $firewall_is_in_source_subnet = &firewall_is_in_subnet($source); + $firewall_is_in_source_subnet = &firewall_is_in_subnet($source, 0); } # Process NAT rules. if ($NAT) { - my $nat_address = &get_nat_address($$hash{$key}[29]); + my $nat_address = &get_nat_address($$hash{$key}[29], $source); # Skip NAT rules if the NAT address is unknown # (i.e. no internet connection has been established, yet). @@ -308,7 +308,10 @@ sub buildrules { # Destination NAT if ($NAT_MODE eq "DNAT") { # Make port-forwardings useable from the internal networks. - &add_dnat_mangle_rules($nat_address, @options); + my @internal_addresses = &get_internal_firewall_ip_addresses(); + unless ($nat_address ~~ @internal_addresses) { + &add_dnat_mangle_rules($nat_address, @options); + } my @nat_options = @options; push(@nat_options, @source_options); @@ -394,12 +397,21 @@ sub get_alias { sub get_nat_address { my $zone = shift; + my $source = shift; # Any static address of any zone. if ($zone eq "RED" || $zone eq "GREEN" || $zone eq "ORANGE" || $zone eq "BLUE") { return $defaultNetworks{$zone . "_ADDRESS"}; } elsif ($zone eq "Default IP") { + if ($source) { + my $firewall_ip = &firewall_is_in_subnet($source, 1); + + if ($firewall_ip) { + return $firewall_ip; + } + } + return &get_external_address(); } else { @@ -809,25 +821,42 @@ sub make_log_limit_options { return @options; } +sub get_internal_firewall_ip_addresses { + my @addresses = (); + + for my $zone ("GREEN", "BLUE", "ORANGE") { + next unless (exists $defaultNetworks{$zone . "_ADDRESS"}); + + my $zone_address = $defaultNetworks{$zone . "_ADDRESS"}; + push(@addresses, $zone_address); + } + + return @addresses; +} + sub firewall_is_in_subnet { my $subnet = shift; + my $use_orange = shift; my ($net_address, $net_mask) = split("/", $subnet); if (!$net_mask) { return 0; } + my @zones = ("GREEN", "BLUE"); + if ($use_orange) { + push(@zones, "ORANGE"); + } + # ORANGE is missing here, because nothing may ever access # the firewall from this network. - foreach my $zone ("GREEN", "BLUE") { + foreach my $zone (@zones) { next unless (exists $defaultNetworks{$zone . "_ADDRESS"}); my $zone_address = $defaultNetworks{$zone . "_ADDRESS"}; if (&General::IpInSubnet($zone_address, $net_address, $net_mask)) { - return 1; + return $zone_address; } } - - return 0; } From da7a2208d3a3c4143ce9029665ad9d738e70d3b1 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 17 Mar 2014 18:03:00 +0100 Subject: [PATCH 21/35] firewall: rules.pl: Code cleanup. --- config/firewall/rules.pl | 48 ++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index 0b6ac72b3..7a8e9ba35 100755 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -294,7 +294,7 @@ sub buildrules { my $firewall_is_in_source_subnet = 0; if ($source) { - $firewall_is_in_source_subnet = &firewall_is_in_subnet($source, 0); + $firewall_is_in_source_subnet = &firewall_is_in_subnet($source); } # Process NAT rules. @@ -308,7 +308,7 @@ sub buildrules { # Destination NAT if ($NAT_MODE eq "DNAT") { # Make port-forwardings useable from the internal networks. - my @internal_addresses = &get_internal_firewall_ip_addresses(); + my @internal_addresses = &get_internal_firewall_ip_addresses(1); unless ($nat_address ~~ @internal_addresses) { &add_dnat_mangle_rules($nat_address, @options); } @@ -405,7 +405,7 @@ sub get_nat_address { } elsif ($zone eq "Default IP") { if ($source) { - my $firewall_ip = &firewall_is_in_subnet($source, 1); + my $firewall_ip = &get_internal_firewall_ip_address($source, 1); if ($firewall_ip) { return $firewall_ip; @@ -822,9 +822,15 @@ sub make_log_limit_options { } sub get_internal_firewall_ip_addresses { - my @addresses = (); + my $use_orange = shift; - for my $zone ("GREEN", "BLUE", "ORANGE") { + my @zones = ("GREEN", "BLUE"); + if ($use_orange) { + push(@zones, "ORANGE"); + } + + my @addresses = (); + for my $zone (@zones) { next unless (exists $defaultNetworks{$zone . "_ADDRESS"}); my $zone_address = $defaultNetworks{$zone . "_ADDRESS"}; @@ -834,29 +840,33 @@ sub get_internal_firewall_ip_addresses { return @addresses; } -sub firewall_is_in_subnet { +sub get_internal_firewall_ip_address { my $subnet = shift; my $use_orange = shift; my ($net_address, $net_mask) = split("/", $subnet); if (!$net_mask) { - return 0; + return; } - my @zones = ("GREEN", "BLUE"); - if ($use_orange) { - push(@zones, "ORANGE"); - } - - # ORANGE is missing here, because nothing may ever access - # the firewall from this network. - foreach my $zone (@zones) { - next unless (exists $defaultNetworks{$zone . "_ADDRESS"}); - - my $zone_address = $defaultNetworks{$zone . "_ADDRESS"}; - + my @addresses = &get_internal_firewall_ip_addresses($use_orange); + foreach my $zone_address (@addresses) { if (&General::IpInSubnet($zone_address, $net_address, $net_mask)) { return $zone_address; } } } + +sub firewall_is_in_subnet { + my $subnet = shift; + + # ORANGE is missing here, because nothing may ever access + # the firewall from this network. + my $address = &get_internal_firewall_ip_address($subnet, 0); + + if ($address) { + return 1; + } + + return 0; +} From e583643a25e2249bcc3583bdae9aed7b57663fbe Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 18 Mar 2014 00:21:38 +0100 Subject: [PATCH 22/35] kernel: add pcengines apu led support. --- config/kernel/kernel.config.i586-ipfire | 3 +- config/kernel/kernel.config.i586-ipfire-pae | 3 +- lfs/linux | 3 + src/patches/linux-3.10-apu_leds.patch | 215 ++++++++++++++++++++ 4 files changed, 222 insertions(+), 2 deletions(-) create mode 100644 src/patches/linux-3.10-apu_leds.patch diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index c7fdbd1c7..9ec9523b7 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.30-ipfire Kernel Configuration +# Linux/x86 3.10.33 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -658,6 +658,7 @@ CONFIG_EISA_NAMES=y CONFIG_SCx200=m CONFIG_SCx200HR_TIMER=m # CONFIG_OLPC is not set +CONFIG_APULED=y CONFIG_ALIX=y CONFIG_NET5501=y CONFIG_GEOS=y diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 14802522d..5fd7ab9bf 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.30-ipfire Kernel Configuration +# Linux/x86 3.10.33 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -670,6 +670,7 @@ CONFIG_EISA_PCI_EISA=y CONFIG_EISA_VIRTUAL_ROOT=y CONFIG_EISA_NAMES=y # CONFIG_SCx200 is not set +CONFIG_APULED=y # CONFIG_ALIX is not set # CONFIG_NET5501 is not set # CONFIG_GEOS is not set diff --git a/lfs/linux b/lfs/linux index 1993cc8aa..7d08e6baa 100644 --- a/lfs/linux +++ b/lfs/linux @@ -150,6 +150,9 @@ endif # cs5535audio spams syslog if no ac97 was present (geos router) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.30_cs5535audio_fix_logspam_on_geos.patch + # Add PC Engines APU led support + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10-apu_leds.patch + # Fix uevent PHYSDEVDRIVER cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.33_ipg-fix-driver-name.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs7830-fix-driver-name.patch diff --git a/src/patches/linux-3.10-apu_leds.patch b/src/patches/linux-3.10-apu_leds.patch new file mode 100644 index 000000000..53d389af1 --- /dev/null +++ b/src/patches/linux-3.10-apu_leds.patch @@ -0,0 +1,215 @@ +diff -Naur linux-3.10.33.org/arch/x86/Kconfig linux-3.10.33/arch/x86/Kconfig +--- linux-3.10.33.org/arch/x86/Kconfig 2014-03-07 06:58:45.000000000 +0100 ++++ linux-3.10.33/arch/x86/Kconfig 2014-03-17 17:02:46.703135023 +0100 +@@ -2199,6 +2199,12 @@ + - AC adapter status updates + - Battery status updates + ++config APULED ++ bool "PCEngines APU Led Support" ++ depends on DMI ++ ---help--- ++ This option enables system support for the PCEngines APU. ++ + config ALIX + bool "PCEngines ALIX System Support (LED setup)" + select GPIOLIB +diff -Naur linux-3.10.33.org/arch/x86/platform/apu/apu-led.c linux-3.10.33/arch/x86/platform/apu/apu-led.c +--- linux-3.10.33.org/arch/x86/platform/apu/apu-led.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.33/arch/x86/platform/apu/apu-led.c 2014-03-17 17:00:36.187188456 +0100 +@@ -0,0 +1,181 @@ ++/* ++ * LEDs driver for PCEngines apu ++ * ++ * Copyright (C) 2013 Christian Herzog , based on ++ * Petr Leibman's leds-alix ++ * Hardware presence check added by Arne Fitzenreiter ++ * Based on leds-wrap.c ++ * Hardware info taken from http://www.dpie.com/manuals/miniboards/kontron/KTD-S0043-0_KTA55_SoftwareGuide.pdf ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define DRVNAME "apu-led" ++#define BASEADDR (0xFED801BD) ++#define LEDON (0x8) ++#define LEDOFF (0xC8) ++ ++static struct platform_device *pdev; ++unsigned int *p1; ++unsigned int *p2; ++unsigned int *p3; ++ ++static void apu_led_set_1(struct led_classdev *led_cdev, ++ enum led_brightness value) { ++ if (value) ++ iowrite8(LEDON, p1); ++ else ++ iowrite8(LEDOFF, p1); ++} ++ ++static void apu_led_set_2(struct led_classdev *led_cdev, ++ enum led_brightness value) { ++ if (value) ++ iowrite8(LEDON, p2); ++ else ++ iowrite8(LEDOFF, p2); ++} ++ ++static void apu_led_set_3(struct led_classdev *led_cdev, ++ enum led_brightness value) { ++ if (value) ++ iowrite8(LEDON, p3); ++ else ++ iowrite8(LEDOFF, p3); ++} ++ ++static struct led_classdev apu_led_1 = { ++ .name = "apu:1", ++ .brightness_set = apu_led_set_1, ++}; ++ ++static struct led_classdev apu_led_2 = { ++ .name = "apu:2", ++ .brightness_set = apu_led_set_2, ++}; ++ ++static struct led_classdev apu_led_3 = { ++ .name = "apu:3", ++ .brightness_set = apu_led_set_3, ++}; ++ ++ ++#ifdef CONFIG_PM ++static int apu_led_suspend(struct platform_device *dev, ++ pm_message_t state) ++{ ++ led_classdev_suspend(&apu_led_1); ++ led_classdev_suspend(&apu_led_2); ++ led_classdev_suspend(&apu_led_3); ++ return 0; ++} ++ ++static int apu_led_resume(struct platform_device *dev) ++{ ++ led_classdev_resume(&apu_led_1); ++ led_classdev_resume(&apu_led_2); ++ led_classdev_resume(&apu_led_3); ++ return 0; ++} ++#else ++#define apu_led_suspend NULL ++#define apu_led_resume NULL ++#endif ++ ++static int apu_led_probe(struct platform_device *pdev) ++{ ++ int ret; ++ ++ ret = led_classdev_register(&pdev->dev, &apu_led_1); ++ if (ret == 0) ++ { ++ ret = led_classdev_register(&pdev->dev, &apu_led_2); ++ if (ret >= 0) ++ { ++ ret = led_classdev_register(&pdev->dev, &apu_led_3); ++ if (ret < 0) ++ led_classdev_unregister(&apu_led_2); ++ } ++ if (ret < 0) ++ led_classdev_unregister(&apu_led_1); ++ } ++ return ret; ++} ++ ++static int apu_led_remove(struct platform_device *pdev) ++{ ++ led_classdev_unregister(&apu_led_1); ++ led_classdev_unregister(&apu_led_2); ++ led_classdev_unregister(&apu_led_3); ++ return 0; ++} ++ ++static struct platform_driver apu_led_driver = { ++ .probe = apu_led_probe, ++ .remove = apu_led_remove, ++ .suspend = apu_led_suspend, ++ .resume = apu_led_resume, ++ .driver = { ++ .name = DRVNAME, ++ .owner = THIS_MODULE, ++ }, ++}; ++ ++static int __init apu_led_init(void) ++{ ++ int ret=0; ++ const char *vendor, *product; ++ ++ vendor = dmi_get_system_info(DMI_SYS_VENDOR); ++ if (!vendor || strcmp(vendor, "PC Engines")) ++ goto out; ++ ++ product = dmi_get_system_info(DMI_PRODUCT_NAME); ++ if (!product || strcmp(product, "APU")) ++ goto out; ++ ++ printk(KERN_INFO "%s: system is recognized as \"%s %s\"\n", ++ KBUILD_MODNAME, vendor, product); ++ ++ ret = platform_driver_register(&apu_led_driver); ++ if (ret < 0) ++ goto out; ++ ++ pdev = platform_device_register_simple(DRVNAME, -1, NULL, 0); ++ if (IS_ERR(pdev)) { ++ ret = PTR_ERR(pdev); ++ platform_driver_unregister(&apu_led_driver); ++ goto out; ++ } ++ ++ p1 = ioremap(BASEADDR, 1); ++ p2 = ioremap(BASEADDR+1, 1); ++ p3 = ioremap(BASEADDR+2, 1); ++ ++out: ++ return ret; ++} ++ ++static void __exit apu_led_exit(void) ++{ ++ platform_device_unregister(pdev); ++ platform_driver_unregister(&apu_led_driver); ++} ++ ++module_init(apu_led_init); ++module_exit(apu_led_exit); ++ ++MODULE_AUTHOR("Christian Herzog"); ++MODULE_DESCRIPTION("PCEngines apu LED driver"); ++MODULE_LICENSE("GPL"); +diff -Naur linux-3.10.33.org/arch/x86/platform/apu/Makefile linux-3.10.33/arch/x86/platform/apu/Makefile +--- linux-3.10.33.org/arch/x86/platform/apu/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.33/arch/x86/platform/apu/Makefile 2014-03-17 17:05:19.245651480 +0100 +@@ -0,0 +1 @@ ++obj-$(CONFIG_APULED) += apu-led.o +diff -Naur linux-3.10.33.org/arch/x86/platform/Makefile linux-3.10.33/arch/x86/platform/Makefile +--- linux-3.10.33.org/arch/x86/platform/Makefile 2014-03-07 06:58:45.000000000 +0100 ++++ linux-3.10.33/arch/x86/platform/Makefile 2014-03-17 14:53:15.078571307 +0100 +@@ -1,4 +1,5 @@ + # Platform specific code goes here ++obj-y += apu/ + obj-y += ce4100/ + obj-y += efi/ + obj-y += geode/ From fff24766e384c0245f2c660a7e4a422db2ee6e7b Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 18 Mar 2014 00:25:08 +0100 Subject: [PATCH 23/35] initskripts: add pcengines apu support to leds. --- src/initscripts/init.d/leds | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/initscripts/init.d/leds b/src/initscripts/init.d/leds index 52ef2705d..d75a2e96c 100644 --- a/src/initscripts/init.d/leds +++ b/src/initscripts/init.d/leds @@ -65,6 +65,11 @@ case "${1}" in setup_netdev_trigger alix:2 ${RED_DEV} rx setup_netdev_trigger alix:3 ${RED_DEV} tx + # Apu LED start + setup_heartbeat_trigger apu:1 + setup_netdev_trigger apu:2 ${RED_DEV} rx + setup_netdev_trigger apu:3 ${RED_DEV} tx + # Geos LED start setup_heartbeat_trigger geos:1 setup_netdev_trigger geos:2 ${RED_DEV} rx @@ -97,6 +102,12 @@ case "${1}" in disable_led_trigger alix:2 disable_led_trigger alix:3 + # Apu LED stop + disable_led_trigger apu:1 + enable_led apu:1 + disable_led_trigger apu:2 + disable_led_trigger apu:3 + # Geos LED stop disable_led_trigger geos:1 enable_led geos:1 From 4f92fd2aebf81cdc64b2e024593341dbaeb76611 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 18 Mar 2014 07:20:41 +0100 Subject: [PATCH 24/35] tzdata: fix rootfile. --- config/rootfiles/common/tzdata | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/config/rootfiles/common/tzdata b/config/rootfiles/common/tzdata index 2ffb7b56e..4bb0df248 100644 --- a/config/rootfiles/common/tzdata +++ b/config/rootfiles/common/tzdata @@ -281,7 +281,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/Asia/Kashgar #usr/share/zoneinfo/Asia/Kathmandu #usr/share/zoneinfo/Asia/Katmandu -+usr/share/zoneinfo/Asia/Khandyga +#usr/share/zoneinfo/Asia/Khandyga #usr/share/zoneinfo/Asia/Kolkata #usr/share/zoneinfo/Asia/Krasnoyarsk #usr/share/zoneinfo/Asia/Kuala_Lumpur @@ -323,7 +323,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/Asia/Ulaanbaatar #usr/share/zoneinfo/Asia/Ulan_Bator #usr/share/zoneinfo/Asia/Urumqi -+usr/share/zoneinfo/Asia/Ust-Nera +#usr/share/zoneinfo/Asia/Ust-Nera #usr/share/zoneinfo/Asia/Vientiane #usr/share/zoneinfo/Asia/Vladivostok #usr/share/zoneinfo/Asia/Yakutsk @@ -439,7 +439,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/Europe/Brussels #usr/share/zoneinfo/Europe/Bucharest #usr/share/zoneinfo/Europe/Budapest -+usr/share/zoneinfo/Europe/Busingen +#usr/share/zoneinfo/Europe/Busingen #usr/share/zoneinfo/Europe/Chisinau #usr/share/zoneinfo/Europe/Copenhagen #usr/share/zoneinfo/Europe/Dublin @@ -882,7 +882,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Asia/Kashgar #usr/share/zoneinfo/posix/Asia/Kathmandu #usr/share/zoneinfo/posix/Asia/Katmandu -+usr/share/zoneinfo/posix/Asia/Khandyga +#usr/share/zoneinfo/posix/Asia/Khandyga #usr/share/zoneinfo/posix/Asia/Kolkata #usr/share/zoneinfo/posix/Asia/Krasnoyarsk #usr/share/zoneinfo/posix/Asia/Kuala_Lumpur @@ -924,7 +924,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Asia/Ulaanbaatar #usr/share/zoneinfo/posix/Asia/Ulan_Bator #usr/share/zoneinfo/posix/Asia/Urumqi -+usr/share/zoneinfo/posix/Asia/Ust-Nera +#usr/share/zoneinfo/posix/Asia/Ust-Nera #usr/share/zoneinfo/posix/Asia/Vientiane #usr/share/zoneinfo/posix/Asia/Vladivostok #usr/share/zoneinfo/posix/Asia/Yakutsk @@ -1040,7 +1040,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Europe/Brussels #usr/share/zoneinfo/posix/Europe/Bucharest #usr/share/zoneinfo/posix/Europe/Budapest -+usr/share/zoneinfo/posix/Europe/Busingen +#usr/share/zoneinfo/posix/Europe/Busingen #usr/share/zoneinfo/posix/Europe/Chisinau #usr/share/zoneinfo/posix/Europe/Copenhagen #usr/share/zoneinfo/posix/Europe/Dublin @@ -1482,7 +1482,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Asia/Kashgar #usr/share/zoneinfo/right/Asia/Kathmandu #usr/share/zoneinfo/right/Asia/Katmandu -+usr/share/zoneinfo/right/Asia/Khandyga +#usr/share/zoneinfo/right/Asia/Khandyga #usr/share/zoneinfo/right/Asia/Kolkata #usr/share/zoneinfo/right/Asia/Krasnoyarsk #usr/share/zoneinfo/right/Asia/Kuala_Lumpur @@ -1524,7 +1524,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Asia/Ulaanbaatar #usr/share/zoneinfo/right/Asia/Ulan_Bator #usr/share/zoneinfo/right/Asia/Urumqi -+usr/share/zoneinfo/right/Asia/Ust-Nera +#usr/share/zoneinfo/right/Asia/Ust-Nera #usr/share/zoneinfo/right/Asia/Vientiane #usr/share/zoneinfo/right/Asia/Vladivostok #usr/share/zoneinfo/right/Asia/Yakutsk @@ -1640,7 +1640,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Europe/Brussels #usr/share/zoneinfo/right/Europe/Bucharest #usr/share/zoneinfo/right/Europe/Budapest -+usr/share/zoneinfo/right/Europe/Busingen +#usr/share/zoneinfo/right/Europe/Busingen #usr/share/zoneinfo/right/Europe/Chisinau #usr/share/zoneinfo/right/Europe/Copenhagen #usr/share/zoneinfo/right/Europe/Dublin From be0d1005fdad24d7c0eb1d16411c99048caf7fcf Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 18 Mar 2014 07:28:13 +0100 Subject: [PATCH 25/35] core76: add tzdata to update. --- config/rootfiles/core/76/filelists/tzdata | 1 + config/rootfiles/core/76/update.sh | 2 ++ 2 files changed, 3 insertions(+) create mode 120000 config/rootfiles/core/76/filelists/tzdata diff --git a/config/rootfiles/core/76/filelists/tzdata b/config/rootfiles/core/76/filelists/tzdata new file mode 120000 index 000000000..5a6e3252f --- /dev/null +++ b/config/rootfiles/core/76/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/76/update.sh b/config/rootfiles/core/76/update.sh index 43c4c3f07..a9055d320 100644 --- a/config/rootfiles/core/76/update.sh +++ b/config/rootfiles/core/76/update.sh @@ -143,6 +143,8 @@ rm -rf /lib/modules # Remove old usb_modeswitch_data rm -rf /usr/share/usb_modeswitch +# Remove old tzdata +rm -rf /usr/share/zoneinfo # Remove dialctrl.pl script rm -f \ From bb0618287b9c10fac2fd1a8386128386fa667f20 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 18 Mar 2014 18:03:14 +0100 Subject: [PATCH 26/35] openssh: Update to 6.6p1. --- lfs/openssh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/openssh b/lfs/openssh index d651162dc..bc6fa3cad 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -24,7 +24,7 @@ include Config -VER = 6.5p1 +VER = 6.6p1 THISAPP = openssh-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a084e7272b8cbd25afe0f5dce4802fef +$(DL_FILE)_MD5 = 3e9800e6bca1fbac0eea4d41baa7f239 install : $(TARGET) From 1aa5439cf14c881043dddf685a528fabf33305af Mon Sep 17 00:00:00 2001 From: Alexander Marx Date: Tue, 18 Mar 2014 15:02:55 +0100 Subject: [PATCH 27/35] Firewall: extend DNAT dropdown with auto,BLUE,ORANGE,GREEN --- html/cgi-bin/firewall.cgi | 42 +++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 82684e06f..582950b67 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -1632,25 +1632,28 @@ END END - if (%aliases) { - print <$Lang::tr{'dnat address'}: "; - } else { - print < - - -END } + #DNAT Dropdown + foreach my $network (sort keys %defaultNetworks) + { + if ($defaultNetworks{$network}{'NAME'} eq 'BLUE'||$defaultNetworks{$network}{'NAME'} eq 'GREEN' ||$defaultNetworks{$network}{'NAME'} eq 'ORANGE'){ + print ""; + } + } + print ""; print ""; #SNAT @@ -1671,19 +1674,14 @@ END foreach my $alias (sort keys %aliases) { print ""; } - - # XXX this is composed in a very ugly fashion + # SNAT Dropdown foreach my $network (sort keys %defaultNetworks) { - next if($defaultNetworks{$network}{'NAME'} eq "IPFire"); - next if($defaultNetworks{$network}{'NAME'} eq "ALL"); - next if($defaultNetworks{$network}{'NAME'} =~ /OpenVPN/i); - next if($defaultNetworks{$network}{'NAME'} =~ /IPsec/i); - - print ""; + if ($defaultNetworks{$network}{'NAME'} eq 'BLUE'||$defaultNetworks{$network}{'NAME'} eq 'GREEN' ||$defaultNetworks{$network}{'NAME'} eq 'ORANGE'){ + print ""; + } } - print < From cc77ac2364436f6dff5fa31bbe6fb0dd1f92c4fd Mon Sep 17 00:00:00 2001 From: Alexander Marx Date: Tue, 18 Mar 2014 15:13:02 +0100 Subject: [PATCH 28/35] Firewall: select right value in DNAT Dropdown --- html/cgi-bin/firewall.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 582950b67..59c4caa7e 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -1649,7 +1649,7 @@ END { if ($defaultNetworks{$network}{'NAME'} eq 'BLUE'||$defaultNetworks{$network}{'NAME'} eq 'GREEN' ||$defaultNetworks{$network}{'NAME'} eq 'ORANGE'){ print ""; } } @@ -1678,7 +1678,7 @@ END foreach my $network (sort keys %defaultNetworks) { if ($defaultNetworks{$network}{'NAME'} eq 'BLUE'||$defaultNetworks{$network}{'NAME'} eq 'GREEN' ||$defaultNetworks{$network}{'NAME'} eq 'ORANGE'){ print ""; } } From b0d9fad3f94fb73b1686c5e6a948066497638d26 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 18 Mar 2014 23:49:23 +0100 Subject: [PATCH 29/35] firewall: rules.pl: Add support for auto selection of NAT addresses. --- config/firewall/rules.pl | 46 ++++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index 7a8e9ba35..50fff3f09 100755 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -400,13 +400,14 @@ sub get_nat_address { my $source = shift; # Any static address of any zone. - if ($zone eq "RED" || $zone eq "GREEN" || $zone eq "ORANGE" || $zone eq "BLUE") { - return $defaultNetworks{$zone . "_ADDRESS"}; - - } elsif ($zone eq "Default IP") { + if ($zone eq "AUTO") { if ($source) { my $firewall_ip = &get_internal_firewall_ip_address($source, 1); + if ($firewall_ip) { + return $firewall_ip; + } + $firewall_ip = &get_matching_firewall_address($source, 1); if ($firewall_ip) { return $firewall_ip; } @@ -414,6 +415,12 @@ sub get_nat_address { return &get_external_address(); + } elsif ($zone eq "RED" || $zone eq "GREEN" || $zone eq "ORANGE" || $zone eq "BLUE") { + return $defaultNetworks{$zone . "_ADDRESS"}; + + } elsif ($zone eq "Default IP") { + return &get_external_address(); + } else { return &get_alias($zone); } @@ -845,8 +852,8 @@ sub get_internal_firewall_ip_address { my $use_orange = shift; my ($net_address, $net_mask) = split("/", $subnet); - if (!$net_mask) { - return; + if ((!$net_mask) || ($net_mask ~~ ["32", "255.255.255.255"])) { + return 0; } my @addresses = &get_internal_firewall_ip_addresses($use_orange); @@ -855,6 +862,8 @@ sub get_internal_firewall_ip_address { return $zone_address; } } + + return 0; } sub firewall_is_in_subnet { @@ -870,3 +879,28 @@ sub firewall_is_in_subnet { return 0; } + +sub get_matching_firewall_address { + my $addr = shift; + my $use_orange = shift; + + my ($address, $netmask) = split("/", $addr); + + my @zones = ("GREEN", "BLUE"); + if ($use_orange) { + push(@zones, "ORANGE"); + } + + foreach my $zone (@zones) { + next unless (exists $defaultNetworks{$zone . "_ADDRESS"}); + + my $zone_subnet = $defaultNetworks{$zone . "_NETADDRESS"}; + my $zone_mask = $defaultNetworks{$zone . "_NETMASK"}; + + if (&General::IpInSubnet($address, $zone_subnet, $zone_mask)) { + return $defaultNetworks{$zone . "_ADDRESS"}; + } + } + + return 0; +} From f89678de2fe1b9b1fa711bcd72c1e2d771a059d7 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 19 Mar 2014 07:22:49 +0100 Subject: [PATCH 30/35] hostapd: update to 2.1. --- config/hostapd/config | 3 +++ html/cgi-bin/wlanap.cgi | 3 ++- lfs/hostapd | 8 ++++---- lfs/wpa_supplicant | 6 +++--- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/config/hostapd/config b/config/hostapd/config index 6158e2cdf..a23207368 100644 --- a/config/hostapd/config +++ b/config/hostapd/config @@ -142,3 +142,6 @@ CONFIG_IEEE80211N=y # This can be used to reduce the size of the hostapd considerably if debugging # code is not needed. CONFIG_NO_STDOUT_DEBUG=y + +# IEEE 802.11ac (Very High Throughput) support +CONFIG_IEEE80211AC=y diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index 79bd0251b..c544f7338 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2005-2013 IPFire Team # +# Copyright (C) 2007-2014 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -557,6 +557,7 @@ driver=$wlanapsettings{'DRIVER_HOSTAPD'} interface=$wlanapsettings{'INTERFACE'} country_code=$wlanapsettings{'COUNTRY'} ieee80211d=1 +ieee80211h=1 channel=$wlanapsettings{'CHANNEL'} END ; diff --git a/lfs/hostapd b/lfs/hostapd index 9e01b06cf..424e40708 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team # +# Copyright (C) 2007-2014 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 2.0 +VER = 2.1 THISAPP = hostapd-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = hostapd -PAK_VER = 26 +PAK_VER = 27 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ba22e639bc57aa4035d2ea8ffa9bbbee +$(DL_FILE)_MD5 = bb9c50e87c5af6f89f387e63911effac install : $(TARGET) diff --git a/lfs/wpa_supplicant b/lfs/wpa_supplicant index 1172e602e..754bb0153 100644 --- a/lfs/wpa_supplicant +++ b/lfs/wpa_supplicant @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team # +# Copyright (C) 2007-2014 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 2.0 +VER = 2.1 THISAPP = wpa_supplicant-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 3be2ebfdcced52e00eda0afe2889839d +$(DL_FILE)_MD5 = e96b8db5a8171cd17a5b2012d6ad7cc7 install : $(TARGET) From dea9e7193c8c5ab9b480f8af9711099576c28919 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 19 Mar 2014 09:05:37 +0100 Subject: [PATCH 31/35] core76: add wpa_supplicant to update. --- config/rootfiles/core/76/filelists/wpa_supplicant | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/76/filelists/wpa_supplicant diff --git a/config/rootfiles/core/76/filelists/wpa_supplicant b/config/rootfiles/core/76/filelists/wpa_supplicant new file mode 120000 index 000000000..1d04c03c0 --- /dev/null +++ b/config/rootfiles/core/76/filelists/wpa_supplicant @@ -0,0 +1 @@ +../../../common/wpa_supplicant \ No newline at end of file From 0f0d6a5a7d4c8a8ac4c01b4f99c030a47cf56e41 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 19 Mar 2014 19:00:47 +0100 Subject: [PATCH 32/35] hostapd: change channellist and status for dfs channels. --- html/cgi-bin/wlanap.cgi | 65 ++++++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 21 deletions(-) diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index c544f7338..5b2490da0 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -258,7 +258,25 @@ if ( -d '/sys/class/net/mon.'.$wlanapsettings{'INTERFACE'} ) { $monwlaninterface = 'mon.'.$wlanapsettings{'INTERFACE'}; } -my @channellist_cmd = `iwlist $monwlaninterface channel|tail -n +2 2>/dev/null`; +my @channellist_cmd; +my @channellist; + +if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){ +my $wiphy = `iw dev $wlanapsettings{'INTERFACE'} info | grep wiphy | cut -d" " -f2`; +chomp $wiphy; + +@channellist_cmd = `iw phy phy$wiphy info | grep " MHz \\\[" | grep -v "(disabled)" | grep -v "no IBSS)" 2>/dev/null`; +# get available channels + +my @temp; +foreach (@channellist_cmd){ +$_ =~ /(.*) \[(\d+)(.*)\]/; +$channel = $2;chomp $channel; +if ( $channel =~ /\d+/ ){push(@temp,$channel);} +} +@channellist = @temp; +} else { +@channellist_cmd = `iwlist $monwlaninterface channel|tail -n +2 2>/dev/null`; # get available channels my @temp; @@ -267,7 +285,8 @@ $_ =~ /(.*)Channel (\d+)(.*):/; $channel = $2;chomp $channel; if ( $channel =~ /\d+/ ){push(@temp,$channel);} } -my @channellist = @temp; +@channellist = @temp; +} my @countrylist_cmd = `regdbdump /usr/lib/crda/regulatory.bin 2>/dev/null`; # get available country codes @@ -488,12 +507,12 @@ print < END ; - +my @status; if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){ - $status = `wlanconfig $wlanapsettings{'INTERFACE'} list`; + @status = `wlanconfig $wlanapsettings{'INTERFACE'} list`; } if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){ - $status = `iw dev $wlanapsettings{'INTERFACE'} station dump`; + @status = `iw dev $wlanapsettings{'INTERFACE'} info && iw dev $wlanapsettings{'INTERFACE'} station dump`; } print < @@ -501,33 +520,37 @@ print <$Lang::tr{'wlanap wlan status'} END ; -foreach my $nr (@channellist_cmd){ - my ($chan,$freq) = split(':',$nr); - if ($count % 2){ - $col="bgcolor='$color{'color20'}'"; - }else{ - $col="bgcolor='$color{'color22'}'"; - } - print"$chan:$freq"; - $count++; -} + +for (my $i=0;$i<$#status;$i++){ + +if (@status[$i]=~"^Station ") { $count++; } if ($count % 2){ $col="bgcolor='$color{'color20'}'"; }else{ $col="bgcolor='$color{'color22'}'"; } -if ($status){ - print"
$status
"; - $count++; + print"
@status[$i]
"; + if (! @status[$i]=~"^/t" ) { $count++; } } -for (my $i=0;$i<$#txpower_cmd;$i=$i+4){ - next if (@txpower_cmd[$i] =~ /mon/i); + $count++; + +foreach my $nr (@channellist_cmd){ if ($count % 2){ $col="bgcolor='$color{'color20'}'"; }else{ $col="bgcolor='$color{'color22'}'"; } - print "@txpower_cmd[$i]@txpower_cmd[$i+1]@txpower_cmd[$i+2]"; + print"$nr"; + $count++; +} + +for (my $i=0;$i<$#txpower_cmd;$i=$i+2){ + if ($count % 2){ + $col="bgcolor='$color{'color20'}'"; + }else{ + $col="bgcolor='$color{'color22'}'"; + } + print "@txpower_cmd[$i]"; $count++; } print "
"; From b3c0c61132512367cf30c8286880f01d0cb81ace Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 19 Mar 2014 19:03:22 +0100 Subject: [PATCH 33/35] hostapd: enable CONFIG_ACS for dfs channels. --- config/hostapd/config | 4 ++++ lfs/hostapd | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config/hostapd/config b/config/hostapd/config index a23207368..1cd76765a 100644 --- a/config/hostapd/config +++ b/config/hostapd/config @@ -145,3 +145,7 @@ CONFIG_NO_STDOUT_DEBUG=y # IEEE 802.11ac (Very High Throughput) support CONFIG_IEEE80211AC=y + +# Enable AUTO_CHANNEL_SELECTION +# This is needed for dfs (radar detection) channels +CONFIG_ACS=y diff --git a/lfs/hostapd b/lfs/hostapd index 424e40708..36343de37 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = hostapd -PAK_VER = 27 +PAK_VER = 28 DEPS = "" From 95cda2592498ead2cc02364b6d9ea6522bd562a6 Mon Sep 17 00:00:00 2001 From: Alexander Marx Date: Thu, 20 Mar 2014 16:23:47 +0100 Subject: [PATCH 34/35] Firewall: DNAT - always show right red address in dropdown. Edited language String in DNAT area: external ip address is now Firewall Interface --- html/cgi-bin/firewall.cgi | 4 +++- langs/de/cgi-bin/de.pl | 2 +- langs/en/cgi-bin/en.pl | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 59c4caa7e..436bdafd0 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -1540,6 +1540,7 @@ sub newrule $selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}} = 'selected'; $selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected'; $selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected'; + $selected{'dnat'}{$fwdfwsettings{'dnat'}} ='selected'; } } $fwdfwsettings{'oldgrp1a'}=$fwdfwsettings{'grp1'}; @@ -1637,7 +1638,7 @@ END