Development February 2018

development@lists.ipfire.org

14 participants
33 discussions

Question regarding package updates, applying patches, and building
by Peter Müller 17 Jun '18

17 Jun '18

Hello, while trying to update entire packages in IPFire (some of them are outdated) and to fix some bugs, I ran into a couple of questions: (a) How to update entire packages? As far as I understood, to every package belongs a file in lfs/[package_name], containing information about how to build, apply patches to it, and so on. It seems like packages are downloaded from https://source.ipfire.org/ , but it did not became clear to me how to upload a new version of a package to this server. Of course, the download URL can be changed manually, but that seems rather ugly to me. Unfortunately, I was unable to find a sort of tutorial in the wiki for this issue. (b) How to apply patches to downloaded packages with changed filenames? As discussed in December (https://wiki.ipfire.org/devel/telco/2017-12-04), I am supposed to have a look at the DEFAULT cipher suite in OpenSSL. To change this value, the .tar.gz file needs to be downloaded and unpacked first. After that, the file "ssl/ssl.h" needs to be changed. The patch at src/patches/openssl-1.0.2h-weak-ciphers.patch does something similar: diff -Naur openssl-1.0.2h.org/ssl/ssl.h openssl-1.0.2h/ssl/ssl.h --- openssl-1.0.2h.org/ssl/ssl.h 2016-05-03 15:44:42.000000000 +0200 +++ openssl-1.0.2h/ssl/ssl.h 2016-05-03 18:49:10.393302264 +0200 @@ -338,7 +338,7 @@ * The following cipher list is used by default. It also is substituted when * an application-defined cipher list string starts with 'DEFAULT'. */ -# define SSL_DEFAULT_CIPHER_LIST "ALL:!EXPORT:!LOW:!aNULL:!eNULL:!SSLv2" +# define SSL_DEFAULT_CIPHER_LIST "ALL:!EXPORT:!LOW:!aNULL:!eNULL:!SSLv2:!RC2:!DES" /* * As of OpenSSL 1.0.0, ssl_create_cipher_list() in ssl/ssl_ciph.c always * starts with a reasonable order, and all we have to do for DEFAULT is But where does the file openssl-[...].org came from? (c) How to build the distribution partly? In the past, I handed in some patches to allow remote syslogging via TCP, too. After some struggles (settings are written by a C program, not the CGI file itself), I modified syslogdctrl.c, and the changes were shipped. (See https://bugzilla.ipfire.org/show_bug.cgi?id=11540 for details.) But since this program now crashes with a segfault on my machine (*sigh*), it seems like my patch contained some errors. However, building the entire distribution is somewhat time-consuming and not worth the effort for a probably small error. Is there any way of just building this C program, and omit the rest? Thanks in advance! Best regards, Peter Müller

2 3

Planning out Core Update 117
by Michael Tremer 12 May '18

12 May '18

Hello, so the big Core Update 115 has been shipped last week. Core Update 116 is coming today. So the next one should be a little bit calmer please :) I do not have anything so far except some smaller bug fixes here and there. Does anyone have anything big? It doesn't have to be another big update. We could also just improve IPFire where ever it is needed with loads of smaller changes and start working on 3 and other sub-projects that are floating around... Best, -Michael

5 31

[PATCH v2] show RNGD status at WebUI service page, too
by Peter Müller 27 Mar '18

27 Mar '18

Also show the status of the hardware random number generator ("RNGD") at the services.cgi page in the WebUI. Before, this was only shown at the entropy.cgi page, which was a bit inconsistent. Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> --- html/cgi-bin/services.cgi | 4 +++- src/initscripts/system/rngd | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi index 64fdbba05..eaaa5298a 100644 --- a/html/cgi-bin/services.cgi +++ b/html/cgi-bin/services.cgi @@ -56,6 +56,7 @@ my %servicenames =( $Lang::tr{'secure shell server'} => 'sshd', $Lang::tr{'vpn'} => 'charon', $Lang::tr{'web proxy'} => 'squid', + $Lang::tr{'random number generator daemon'} => 'rngd', 'OpenVPN' => 'openvpn' ); @@ -74,7 +75,8 @@ my %link =( "$Lang::tr{'intrusion detection system'} (GREEN)" => "<a href=\'ids.cgi\'>$Lang::tr{'intrusion detection system'} (GREEN)</a>", "$Lang::tr{'intrusion detection system'} (RED)" => "<a href=\'ids.cgi\'>$Lang::tr{'intrusion detection system'} (RED)</a>", "$Lang::tr{'intrusion detection system'} (ORANGE)" => "<a href=\'ids.cgi\'>$Lang::tr{'intrusion detection system'} (ORANGE)</a>", - "$Lang::tr{'intrusion detection system'} (BLUE)" => "<a href=\'ids.cgi\'>$Lang::tr{'intrusion detection system'} (BLUE)</a>" + "$Lang::tr{'intrusion detection system'} (BLUE)" => "<a href=\'ids.cgi\'>$Lang::tr{'intrusion detection system'} (BLUE)</a>", + "$Lang::tr{'random number generator daemon'}" => "<a href=\'entropy.cgi\'>$Lang::tr{'random number generator daemon'}</a>" ); my $lines=0; # Used to count the outputlines to make different bgcolor diff --git a/src/initscripts/system/rngd b/src/initscripts/system/rngd index df4aa7da2..9abcf6a79 100644 --- a/src/initscripts/system/rngd +++ b/src/initscripts/system/rngd @@ -30,10 +30,16 @@ case "${1}" in boot_mesg "Starting Random Number Generator Daemon..." if pidofproc /usr/sbin/rngd &>/dev/null; then + # Make sure PID file is readable. + test -f /run/rngd.pid && chmod 755 /run/rngd.pid + # Is already running. echo_ok else loadproc /usr/sbin/rngd --no-tpm=1 + + # Make sure PID file is readable. + test -f /run/rngd.pid && chmod 755 /run/rngd.pid fi ;; -- 2.13.6

2 1

Testing squid 4.0.23 - grsec denied kernel module auto-load of nf_conntrack_netlink by uid 23
by Matthias Fischer 11 Mar '18

11 Mar '18

Hi, Just to keep in touch, I tested 'squid 4.0.23' yesterday - it seemed to run fine at first. But after a while I took a closer look at the logs and discovered a bunch of kernel messages within a few hours and I don't know what exactly triggered these messages: ... 132 Time(s): grsec: denied kernel module auto-load of nf_conntrack_netlink by uid 23 ... As far as I found out: "uid 23" => squid-user, and the new squid tried to 'autoload' a module which 'grsec' didn't like. Is this a correct interpretation and has anyone some useable clue how to avoid this? Besides, after going back to '3.5.27' the messages didn't came back again. '4.0.22' didn't throw these messages, too. They changed something and I don't know what it is... Thanks for all tips! Best, Matthias

2 8

Core120 update problem
by ummeegge 05 Mar '18

05 Mar '18

Hi all, am testing currently the origin/next with u.a. the updated OpenSSL- 1.1.0g and wanted to report an issue with Tor. Tor can not be started, messages do not report something but have found in error_log: [Wed Feb 28 18:24:42 2018] tor.cgi: Scalar value @pid[0] better written as $pid[0] at /srv/web/ipfire/cgi-bin/tor.cgi line 238. [Wed Feb 28 18:24:42 2018] tor.cgi: Scalar value @pid[0] better written as $pid[0] at /srv/web/ipfire/cgi-bin/tor.cgi line 247. [Wed Feb 28 18:24:42 2018] tor.cgi: "my" variable @cmds masks earlier declaration in same scope at /srv/web/ipfire/cgi-bin/tor.cgi line 952. [Wed Feb 28 18:24:42 2018] tor.cgi: Name "Header::colourgreen" used only once: possible typo at /srv/web/ipfire/cgi-bin/tor.cgi line 242. [Wed Feb 28 18:24:42 2018] tor.cgi: Name "Header::colourorange" used only once: possible typo at /srv/web/ipfire/cgi-bin/tor.cgi line 568. [Wed Feb 28 18:24:42 2018] tor.cgi: Name "Header::colouryellow" used only once: possible typo at /srv/web/ipfire/cgi-bin/tor.cgi line 35. Addon 'tor' not found. addonctrl addon (start|stop|restart|reload|status|enable|disable) [Wed Feb 28 18:24:43 2018] tor.cgi: Use of uninitialized value $pid[0] in concatenation (.) or string at /srv/web/ipfire/cgi-bin/tor.cgi line 80. [Wed Feb 28 18:24:43 2018] tor.cgi: Use of uninitialized value in addition (+) at /srv/web/ipfire/cgi-bin/tor.cgi line 85. Addon 'tor' not found. addonctrl addon (start|stop|restart|reload|status|enable|disable) [Wed Feb 28 18:24:44 2018] tor.cgi: Use of uninitialized value $pid[0] in concatenation (.) or string at /srv/web/ipfire/cgi-bin/tor.cgi line 80. [Wed Feb 28 18:24:44 2018] tor.cgi: Use of uninitialized value in addition (+) at /srv/web/ipfire/cgi-bin/tor.cgi line 85. Since tor is an addon i did installed it of course from Core 120 dev environment. -> tor -v Feb 28 18:35:20.633 [notice] Tor 0.3.2.9 (git-9e8b762fcecfece6) running on Linux with Libevent 2.1.8-stable, OpenSSL 1.1.0g, Zlib 1.2.11, Liblzma 5.2.3, and Libzstd N/A. Feb 28 18:35:20.633 [notice] Tor can't help you if you use it wrong! Learn how to be safe at https://www.torproject.org/download/download#warning Feb 28 18:35:20.633 [warn] Command-line option '-v' with no value. Failing. Feb 28 18:35:20.633 [err] Reading config failed--see warnings above. It might be great if someone can double check this. Greetings, Erik

2 3

Re: [PATCH] WIO: Fix a problem with the Network-Table-Button
by Michael Tremer 01 Mar '18

01 Mar '18

Hi, I think you might have just forgotten to add the lfs/wio file to the commit in case you changed the version number already. Is that possible? Best, -Michael On Wed, 2018-02-28 at 13:37 +0100, Stephan Feddersen wrote: > Hello, > > oh no, these patches should be included in the release version wio-1.3.2! > > Where did I make my mistake in setting to GIT? > > Best > > Stephan > > > -----Original Message----- > > From: Michael Tremer [mailto:michael.tremer@ipfire.org] > > Sent: Wednesday, February 28, 2018 1:01 PM > > To: Stephan Feddersen <sfeddersen(a)ipfire.org>; > > development(a)lists.ipfire.org > > Subject: Re: [PATCH] WIO: Fix a problem with the Network-Table-Button > > > > Hello, > > > > none of the both patches bumps the release version. > > > > Should this be a new release already or are you just collecting patches? > > > > Best, > > -Michael > > > > On Tue, 2018-02-27 at 17:20 +0100, Stephan Feddersen via Development > > wrote: > > > --- > > > src/wio/wio.cgi | 69 > > > ++++++++++++++++++++++++++++-------------------------- > > > --- > > > 1 file changed, 34 insertions(+), 35 deletions(-) > > > > > > diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi index 8c43b04..c51910f > > > 100644 > > > --- a/src/wio/wio.cgi > > > +++ b/src/wio/wio.cgi > > > @@ -21,7 +21,7 @@ > > > # > > > # > > > > > > > > > > ########################################################## > > ############ > > > ####### > > > ## > > > # > > > -# Version: 2018/01/05 14:34:23 > > > +# Version: 2018/02/27 16:54:23 > > > # > > > # This wio.cgi is based on the Code from the IPCop WIO Addon # and > > > is extremly adapted to work with IPFire. > > > @@ -106,10 +106,10 @@ my $count = 0; > > > my $showcount = 0; > > > > > > my $arpbuttontext = "$Lang::tr{'wio_show_table_on'}"; -my > > > $clientimportbuttontext = "$Lang::tr{'wio_show_table_on'}"; -my > > > $networksearchbuttontext = "$Lang::tr{'wio_show_table_on'}"; > > > +my $clientimportbuttontext = "$Lang::tr{'wio_show_table_on'}"; my > > > +$networksearchbuttontext = "$Lang::tr{'wio_show_table_on'}"; > > > > > > -my ( $infomessage, $errormessage, $importmessage, $message ) = ''; > > > +my ( $message, $infomessage, $errormessage, $importmessage ) = ''; > > > > > > my ( $buttontext, $host, $timestamp, $ipadr, $on, $remark, $dyndns, > > > $dyndnsip, $sendemailon, $net, $dev, $iprange, $output, $write, > > > > $webinterface, > > > $sendemailoff, $pingmethode, $online, $color, $bgcolor, > > > $exitcode, > > > $id, $line, $interface, $counter, $vpnn2nip, $vpnn2nmask, $ddns, $edc, > > > @@ -280,7 +280,7 @@ if ( $wiosettings{'ACTION'} eq > > > $Lang::tr{'wio_client_add'} > > > ) { > > > > > > ## show / hide arptable > > > > > > -if ($wiosettings{'WIOGUISHOWARPTABLE'} eq 'arptable') { > > > +if ( $wiosettings{'WIOGUISHOWARPTABLE'} eq 'arptable' ) { > > > if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_show_table_off'} ) > > > { > > > $wiosettings{'WIOGUISHOWARPTABLE'} = 'off'; > > > $arpbuttontext = "$Lang::tr{'wio_show_table_on'}"; @@ - > > > > 309,11 > > > +309,11 @@ if ( $wiosettings{'WIOGUISHOWCLIENTIMPORTTABLE'} eq > > > 'clientimport' ) { if ( $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} > > > eq 'networksearch' ) { > > > if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_show_table_off'} ) > > > { > > > $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} = 'off'; > > > - $clientimportbuttontext = > > > "$Lang::tr{'wio_show_table_on'}"; > > > + $networksearchbuttontext = > > > > "$Lang::tr{'wio_show_table_on'}"; > > > } > > > else { > > > $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} = 'on'; > > > - $clientimportbuttontext = > > > "$Lang::tr{'wio_show_table_off'}"; > > > + $networksearchbuttontext = > > > > "$Lang::tr{'wio_show_table_off'}"; > > > } > > > } > > > > > > @@ -348,7 +348,7 @@ if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_add'} ) > > > > { > > > } > > > } > > > > > > -## enable / disabel client || enable / disable dyndns || enable / > > > disable sendemailon || enable / disable sendemailoff || change ip / > > > fqdn > > > +## enable / disable client || enable / disable dyndns || enable / > > > +disable > > > sendemailon || enable / disable sendemailoff || change ip / fqdn > > > > > > if ( $wiosettings{'ACTION'} eq $Lang::tr{'enable disable client'} ) { > > > $edc = 'on'; } if ( $wiosettings{'ACTION'} eq $Lang::tr{'enable > > > disable dyndns'} ) { $edd = 'on'; } @@ -983,7 +983,7 @@ for ($i=1; > > > $i<=15; $i++) { > > > print "<option $selected{'TIMEOUT'}{$_}>$_</option>\n"; > > > } > > > > > > -print" > > > +print" > > > </select> $Lang::tr{'wio sec'}</td> </tr> <tr><td > > > colspan='3'> </td></tr> @@ -1123,7 +1123,7 @@ print" > > > <td width='15%' > > > > align='center'>$Lang::tr{'wio_wanname'}</td> > > > <td width='24%' > > > align='center'>$Lang::tr{'wio_dyndns_hosts'}</td> > > > <td width='11%' align='center'>$Lang::tr{'wio image'}</td> > > > - <td width='14%' > > > > align='center'>$Lang::tr{'wio_wancheck'}</td> > > > + <td width='14%' > > > +align='center'>$Lang::tr{'wio_connected'}</td> > > > </tr> > > > <tr bgcolor='$color{'color22'}' height='20'> > > > <td align='center'>01</td> > > > @@ -1196,7 +1196,7 @@ print" > > > <td width='8%' align='center'>$Lang::tr{'type'}</td> > > > <td width='25%' > > > align='center'>$Lang::tr{'wio_common_name'}</td> > > > <td width='11%' align='center'>$Lang::tr{'wio image'}</td> > > > - <td width='14%' > > > align='center'>$Lang::tr{'wio_ovpn_connected'}</td> > > > + <td width='14%' > > > +align='center'>$Lang::tr{'wio_connected'}</td> > > > </tr> > > > "; > > > > > > @@ -1244,7 +1244,7 @@ $statustxt = "$Lang::tr{'capsclosed'}"; > > > <td align='center' height='20'> </td> > > > </tr> > > > "; > > > - > > > + > > > if ($vpnconfighash{$key}[25] && $wiosettings{'CLIENTREMARK'} eq 'on') { > > > print"<tr".($idvpn % 2?" bgcolor='$color{'color20'}'":" > > > bgcolor='$color{'color22'}'")." height='20'><td> </td><td > > > > colspan='16' > > > align='left'>$vpnconfighash{$key}[25]</td></tr>"; > > > } > > > @@ -1278,7 +1278,7 @@ print" > > > <td width='8%' align='center'>$Lang::tr{'type'}</td> > > > <td width='25%' align='center'>$Lang::tr{'common > > > > name'}</td> > > > <td width='11%' align='center'>$Lang::tr{'wio image'}</td> > > > - <td width='14%' > > > align='center'>$Lang::tr{'wio_ovpn_connected'}</td> > > > + <td width='14%' > > > +align='center'>$Lang::tr{'wio_connected'}</td> > > > </tr> > > > "; > > > > > > @@ -1310,7 +1310,6 @@ print" > > > $statustxt = "$Lang::tr{'capsclosed'}"; > > > } > > > else { > > > - > > > if ($ovpnconfighash{$key}[3] eq 'net') { > > > if (-e > > > "/var/run/$ovpnconfighash{$key}[1]n2n.pid") { > > > my @output = ""; > > > @@ -1378,7 +1377,7 @@ print" > > > if ($ovpnconfighash{$key}[25] && > > > > $wiosettings{'CLIENTREMARK'} eq > > > 'on') { > > > print"<tr".($idovpn % 2?" > > > bgcolor='$color{'color20'}'":" bgcolor='$color{'color22'}'")." > > > height='20'><td> </td><td colspan='16' > > > align='left'>$ovpnconfighash{$key}[25]</td></tr>"; > > > } > > > - > > > + > > > print"<tr height='1'><td colspan='17' > > > bgcolor='#696565'></td></tr>"; > > > $idovpn++ > > > } > > > @@ -1519,7 +1518,7 @@ my $dotip = length($ipaddresses[$a]) - > > > rindex($ipaddresses[$a],'.'); > > > if ( -e "$vpnpid" ) { > > > foreach $key (keys(%vpnconfighash)) { > > > next unless ($vpnconfighash{$key}[3] eq > > > > 'net'); > > > - > > > + > > > my $convertip = > > > &General::ipcidr2msk($vpnconfighash{$key}[11]); > > > > > > my @net = split ("/", $convertip); @@ - > > > > 1538,16 +1537,15 @@ my > > > $dotip = length($ipaddresses[$a]) - rindex($ipaddresses[$a],'.'); > > > @match = split ("/", > > > > $ovpnsettings{'DOVPN_SUBNET'}); > > > > > > if ( &General::IpInSubnet($ipaddresses[$a], > > > $match[0], $match[1]) ) { > > > - print"<td align='center'><img > > > src='$imgstatic/ovpn.png' alt='OpenVPN' title='OpenVPN' /></td>"; > > > - last SWITCH; > > > + print"<td align='center'><img > > > src='$imgstatic/ovpn.png' alt='OpenVPN' title='OpenVPN' /></td>"; > > > + last SWITCH; > > > } > > > } > > > > > > if ( %ovpnccdconfhash ne '' ) { > > > foreach $key (keys(%ovpnccdconfhash)) { > > > - > > > + > > > my $convertip = > > > &General::ipcidr2msk($ovpnccdconfhash{$key}[1]); > > > - > > > my @net = split ("/", $convertip); > > > > > > $vpnn2nip = $net[0]; > > > @@ -1557,7 +1555,6 @@ my $dotip = length($ipaddresses[$a]) - > > > rindex($ipaddresses[$a],'.'); > > > print"<td align='center'><img > > > align='middle' src='$imgstatic/ovpn.png' alt='OpenVPN' title='OpenVPN' > > > /></td>"; > > > last SWITCH; > > > } > > > - > > > } > > > } > > > > > > @@ -1567,7 +1564,7 @@ my $dotip = length($ipaddresses[$a]) - > > > rindex($ipaddresses[$a],'.'); > > > chomp ($rednet[1]); > > > my $red_netmask = > > > > General::iporsubtodec($rednet[1]); > > > my $red_netaddress = > > > Network::get_netaddress("$rednet[0]/$red_netmask"); > > > - > > > + > > > if ( &General::IpInSubnet($ipaddresses[$a], > > > $red_netaddress, $red_netmask) ) { > > > print"<td align='center' height='20'><img > > > src='$imgstatic/red.png' alt='$Lang::tr{'wio_red_lan'}' > > > title='$Lang::tr{'wio_red_lan'}' /></td>"; > > > last SWITCH; > > > @@ -2165,23 +2162,24 @@ close(FILE); > > > > > > > > > > > > > ########################################################## > > ############ > > > ####### ############################################### > > > > > > -sub SortByTunnelName > > > -{ > > > - if ($vpnconfighash{$a}[1] lt $vpnconfighash{$b}[1]) { > > > - return -1; > > > - } > > > - elsif ($vpnconfighash{$a}[1] gt $vpnconfighash{$b}[1]) { > > > - return 1; > > > - } > > > - else { > > > - return 0; > > > - } > > > +sub SortByTunnelName { > > > + > > > + if ($vpnconfighash{$a}[1] lt $vpnconfighash{$b}[1]) { > > > + return -1; > > > + } > > > + elsif ($vpnconfighash{$a}[1] gt $vpnconfighash{$b}[1]) { > > > + return 1; > > > + } > > > + else { > > > + return 0; > > > + } > > > + > > > } > > > > > > > > > > > > > ########################################################## > > ############ > > > ####### ############################################### > > > > > > -sub validSave > > > -{ > > > +sub validSave { > > > + > > > if ( $wiosettings{'IPADR'} eq '' && $wiosettings{'PINGMETHODE'} > > > eq > > > 'ip' && $wiosettings{'DYNDNS'} eq '' ) { > > > $errormessage = $Lang::tr{'wio_ip_empty'}; > > > } > > > @@ -2207,4 +2205,5 @@ sub validSave > > > if ( $wiosettings{'ID'} eq '' && ! defined($errormessage) ) { > > > $errormessage = &WIO::checkinto($wiosettings{'IPADR'}, > > > $wiosettings{'HOST'}, @current); } > > > > > > if ( $wiosettings{'REMARK'} ne '' ) { $wiosettings{'REMARK'} =~ > > > s/,/,/g; } > > > + > > > } > >

2 2

[ipfire] Patch notification: 1 patch updated
by Patchwork 28 Feb '18

28 Feb '18

Hello, The following patch (submitted by you) has been updated in Patchwork: * ipfire: set OpenSSL 1.1.0 DEFAULT cipher list to secure value - http://patchwork.ipfire.org/patch/1678/ - for: IPFire was: New now: Staged This email is a notification only - you do not need to respond. Happy patchworking. -- This is an automated mail sent by the Patchwork system at patchwork.ipfire.org. To stop receiving these notifications, edit your mail settings at: http://patchwork.ipfire.org/mail/

1 0

[PATCH] WIO: Fix a problem with the Network-Table-Button
by Stephan Feddersen 28 Feb '18

28 Feb '18

--- src/wio/wio.cgi | 69 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi index 8c43b04..c51910f 100644 --- a/src/wio/wio.cgi +++ b/src/wio/wio.cgi @@ -21,7 +21,7 @@ # # ############################################################################### # -# Version: 2018/01/05 14:34:23 +# Version: 2018/02/27 16:54:23 # # This wio.cgi is based on the Code from the IPCop WIO Addon # and is extremly adapted to work with IPFire. @@ -106,10 +106,10 @@ my $count = 0; my $showcount = 0; my $arpbuttontext = "$Lang::tr{'wio_show_table_on'}"; -my $clientimportbuttontext = "$Lang::tr{'wio_show_table_on'}"; -my $networksearchbuttontext = "$Lang::tr{'wio_show_table_on'}"; +my $clientimportbuttontext = "$Lang::tr{'wio_show_table_on'}"; +my $networksearchbuttontext = "$Lang::tr{'wio_show_table_on'}"; -my ( $infomessage, $errormessage, $importmessage, $message ) = ''; +my ( $message, $infomessage, $errormessage, $importmessage ) = ''; my ( $buttontext, $host, $timestamp, $ipadr, $on, $remark, $dyndns, $dyndnsip, $sendemailon, $net, $dev, $iprange, $output, $write, $webinterface, $sendemailoff, $pingmethode, $online, $color, $bgcolor, $exitcode, $id, $line, $interface, $counter, $vpnn2nip, $vpnn2nmask, $ddns, $edc, @@ -280,7 +280,7 @@ if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_client_add'} ) { ## show / hide arptable -if ($wiosettings{'WIOGUISHOWARPTABLE'} eq 'arptable') { +if ( $wiosettings{'WIOGUISHOWARPTABLE'} eq 'arptable' ) { if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_show_table_off'} ) { $wiosettings{'WIOGUISHOWARPTABLE'} = 'off'; $arpbuttontext = "$Lang::tr{'wio_show_table_on'}"; @@ -309,11 +309,11 @@ if ( $wiosettings{'WIOGUISHOWCLIENTIMPORTTABLE'} eq 'clientimport' ) { if ( $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} eq 'networksearch' ) { if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_show_table_off'} ) { $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} = 'off'; - $clientimportbuttontext = "$Lang::tr{'wio_show_table_on'}"; + $networksearchbuttontext = "$Lang::tr{'wio_show_table_on'}"; } else { $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} = 'on'; - $clientimportbuttontext = "$Lang::tr{'wio_show_table_off'}"; + $networksearchbuttontext = "$Lang::tr{'wio_show_table_off'}"; } } @@ -348,7 +348,7 @@ if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_add'} ) { } } -## enable / disabel client || enable / disable dyndns || enable / disable sendemailon || enable / disable sendemailoff || change ip / fqdn +## enable / disable client || enable / disable dyndns || enable / disable sendemailon || enable / disable sendemailoff || change ip / fqdn if ( $wiosettings{'ACTION'} eq $Lang::tr{'enable disable client'} ) { $edc = 'on'; } if ( $wiosettings{'ACTION'} eq $Lang::tr{'enable disable dyndns'} ) { $edd = 'on'; } @@ -983,7 +983,7 @@ for ($i=1; $i<=15; $i++) { print "<option $selected{'TIMEOUT'}{$_}>$_</option>\n"; } -print" +print" </select> $Lang::tr{'wio sec'}</td> </tr> <tr><td colspan='3'> </td></tr> @@ -1123,7 +1123,7 @@ print" <td width='15%' align='center'>$Lang::tr{'wio_wanname'}</td> <td width='24%' align='center'>$Lang::tr{'wio_dyndns_hosts'}</td> <td width='11%' align='center'>$Lang::tr{'wio image'}</td> - <td width='14%' align='center'>$Lang::tr{'wio_wancheck'}</td> + <td width='14%' align='center'>$Lang::tr{'wio_connected'}</td> </tr> <tr bgcolor='$color{'color22'}' height='20'> <td align='center'>01</td> @@ -1196,7 +1196,7 @@ print" <td width='8%' align='center'>$Lang::tr{'type'}</td> <td width='25%' align='center'>$Lang::tr{'wio_common_name'}</td> <td width='11%' align='center'>$Lang::tr{'wio image'}</td> - <td width='14%' align='center'>$Lang::tr{'wio_ovpn_connected'}</td> + <td width='14%' align='center'>$Lang::tr{'wio_connected'}</td> </tr> "; @@ -1244,7 +1244,7 @@ $statustxt = "$Lang::tr{'capsclosed'}"; <td align='center' height='20'> </td> </tr> "; - + if ($vpnconfighash{$key}[25] && $wiosettings{'CLIENTREMARK'} eq 'on') { print"<tr".($idvpn % 2?" bgcolor='$color{'color20'}'":" bgcolor='$color{'color22'}'")." height='20'><td> </td><td colspan='16' align='left'>$vpnconfighash{$key}[25]</td></tr>"; } @@ -1278,7 +1278,7 @@ print" <td width='8%' align='center'>$Lang::tr{'type'}</td> <td width='25%' align='center'>$Lang::tr{'common name'}</td> <td width='11%' align='center'>$Lang::tr{'wio image'}</td> - <td width='14%' align='center'>$Lang::tr{'wio_ovpn_connected'}</td> + <td width='14%' align='center'>$Lang::tr{'wio_connected'}</td> </tr> "; @@ -1310,7 +1310,6 @@ print" $statustxt = "$Lang::tr{'capsclosed'}"; } else { - if ($ovpnconfighash{$key}[3] eq 'net') { if (-e "/var/run/$ovpnconfighash{$key}[1]n2n.pid") { my @output = ""; @@ -1378,7 +1377,7 @@ print" if ($ovpnconfighash{$key}[25] && $wiosettings{'CLIENTREMARK'} eq 'on') { print"<tr".($idovpn % 2?" bgcolor='$color{'color20'}'":" bgcolor='$color{'color22'}'")." height='20'><td> </td><td colspan='16' align='left'>$ovpnconfighash{$key}[25]</td></tr>"; } - + print"<tr height='1'><td colspan='17' bgcolor='#696565'></td></tr>"; $idovpn++ } @@ -1519,7 +1518,7 @@ my $dotip = length($ipaddresses[$a]) - rindex($ipaddresses[$a],'.'); if ( -e "$vpnpid" ) { foreach $key (keys(%vpnconfighash)) { next unless ($vpnconfighash{$key}[3] eq 'net'); - + my $convertip = &General::ipcidr2msk($vpnconfighash{$key}[11]); my @net = split ("/", $convertip); @@ -1538,16 +1537,15 @@ my $dotip = length($ipaddresses[$a]) - rindex($ipaddresses[$a],'.'); @match = split ("/", $ovpnsettings{'DOVPN_SUBNET'}); if ( &General::IpInSubnet($ipaddresses[$a], $match[0], $match[1]) ) { - print"<td align='center'><img src='$imgstatic/ovpn.png' alt='OpenVPN' title='OpenVPN' /></td>"; - last SWITCH; + print"<td align='center'><img src='$imgstatic/ovpn.png' alt='OpenVPN' title='OpenVPN' /></td>"; + last SWITCH; } } if ( %ovpnccdconfhash ne '' ) { foreach $key (keys(%ovpnccdconfhash)) { - + my $convertip = &General::ipcidr2msk($ovpnccdconfhash{$key}[1]); - my @net = split ("/", $convertip); $vpnn2nip = $net[0]; @@ -1557,7 +1555,6 @@ my $dotip = length($ipaddresses[$a]) - rindex($ipaddresses[$a],'.'); print"<td align='center'><img align='middle' src='$imgstatic/ovpn.png' alt='OpenVPN' title='OpenVPN' /></td>"; last SWITCH; } - } } @@ -1567,7 +1564,7 @@ my $dotip = length($ipaddresses[$a]) - rindex($ipaddresses[$a],'.'); chomp ($rednet[1]); my $red_netmask = General::iporsubtodec($rednet[1]); my $red_netaddress = Network::get_netaddress("$rednet[0]/$red_netmask"); - + if ( &General::IpInSubnet($ipaddresses[$a], $red_netaddress, $red_netmask) ) { print"<td align='center' height='20'><img src='$imgstatic/red.png' alt='$Lang::tr{'wio_red_lan'}' title='$Lang::tr{'wio_red_lan'}' /></td>"; last SWITCH; @@ -2165,23 +2162,24 @@ close(FILE); ############################################################################################################################ -sub SortByTunnelName -{ - if ($vpnconfighash{$a}[1] lt $vpnconfighash{$b}[1]) { - return -1; - } - elsif ($vpnconfighash{$a}[1] gt $vpnconfighash{$b}[1]) { - return 1; - } - else { - return 0; - } +sub SortByTunnelName { + + if ($vpnconfighash{$a}[1] lt $vpnconfighash{$b}[1]) { + return -1; + } + elsif ($vpnconfighash{$a}[1] gt $vpnconfighash{$b}[1]) { + return 1; + } + else { + return 0; + } + } ############################################################################################################################ -sub validSave -{ +sub validSave { + if ( $wiosettings{'IPADR'} eq '' && $wiosettings{'PINGMETHODE'} eq 'ip' && $wiosettings{'DYNDNS'} eq '' ) { $errormessage = $Lang::tr{'wio_ip_empty'}; } @@ -2207,4 +2205,5 @@ sub validSave if ( $wiosettings{'ID'} eq '' && ! defined($errormessage) ) { $errormessage = &WIO::checkinto($wiosettings{'IPADR'}, $wiosettings{'HOST'}, @current); } if ( $wiosettings{'REMARK'} ne '' ) { $wiosettings{'REMARK'} =~ s/,/,/g; } + } -- 2.7.4

2 1

[PATCH] set OpenSSL 1.1.0 DEFAULT cipher list to secure value
by Peter Müller 28 Feb '18

28 Feb '18

Only use secure cipher list for the OpenSSL DEFAULT list: * ECDSA is preferred over RSA since it is faster and more scalable * TLS 1.2 suites are preferred over anything older * weak ciphers such as RC4 and 3DES have been eliminated * AES-GCM is preferred over AES-CBC (known as "mac-then-encrypt" problem) * ciphers without PFS are moved to the end of the cipher list This patch leaves AES-CCM, AES-CCM8 and CHACHA20-POLY1305 suites where they are since they are considered secure and there is no need to change anything. The DEFAULT cipher list is now (output of "openssl ciphers -v"): ECDHE-ECDSA-AES256-GCM-SHA384 TLSv1.2 Kx=ECDH Au=ECDSA Enc=AESGCM(256) Mac=AEAD ECDHE-ECDSA-CHACHA20-POLY1305 TLSv1.2 Kx=ECDH Au=ECDSA Enc=CHACHA20/POLY1305(256) Mac=AEAD ECDHE-ECDSA-AES256-CCM8 TLSv1.2 Kx=ECDH Au=ECDSA Enc=AESCCM8(256) Mac=AEAD ECDHE-ECDSA-AES256-CCM TLSv1.2 Kx=ECDH Au=ECDSA Enc=AESCCM(256) Mac=AEAD ECDHE-ECDSA-AES128-GCM-SHA256 TLSv1.2 Kx=ECDH Au=ECDSA Enc=AESGCM(128) Mac=AEAD ECDHE-ECDSA-AES128-CCM8 TLSv1.2 Kx=ECDH Au=ECDSA Enc=AESCCM8(128) Mac=AEAD ECDHE-ECDSA-AES128-CCM TLSv1.2 Kx=ECDH Au=ECDSA Enc=AESCCM(128) Mac=AEAD ECDHE-ECDSA-AES256-SHA384 TLSv1.2 Kx=ECDH Au=ECDSA Enc=AES(256) Mac=SHA384 ECDHE-ECDSA-CAMELLIA256-SHA384 TLSv1.2 Kx=ECDH Au=ECDSA Enc=Camellia(256) Mac=SHA384 ECDHE-ECDSA-AES128-SHA256 TLSv1.2 Kx=ECDH Au=ECDSA Enc=AES(128) Mac=SHA256 ECDHE-ECDSA-CAMELLIA128-SHA256 TLSv1.2 Kx=ECDH Au=ECDSA Enc=Camellia(128) Mac=SHA256 ECDHE-RSA-AES256-GCM-SHA384 TLSv1.2 Kx=ECDH Au=RSA Enc=AESGCM(256) Mac=AEAD ECDHE-RSA-CHACHA20-POLY1305 TLSv1.2 Kx=ECDH Au=RSA Enc=CHACHA20/POLY1305(256) Mac=AEAD ECDHE-RSA-AES128-GCM-SHA256 TLSv1.2 Kx=ECDH Au=RSA Enc=AESGCM(128) Mac=AEAD ECDHE-RSA-AES256-SHA384 TLSv1.2 Kx=ECDH Au=RSA Enc=AES(256) Mac=SHA384 ECDHE-RSA-CAMELLIA256-SHA384 TLSv1.2 Kx=ECDH Au=RSA Enc=Camellia(256) Mac=SHA384 ECDHE-RSA-AES128-SHA256 TLSv1.2 Kx=ECDH Au=RSA Enc=AES(128) Mac=SHA256 ECDHE-RSA-CAMELLIA128-SHA256 TLSv1.2 Kx=ECDH Au=RSA Enc=Camellia(128) Mac=SHA256 DHE-RSA-AES256-GCM-SHA384 TLSv1.2 Kx=DH Au=RSA Enc=AESGCM(256) Mac=AEAD DHE-RSA-CHACHA20-POLY1305 TLSv1.2 Kx=DH Au=RSA Enc=CHACHA20/POLY1305(256) Mac=AEAD DHE-RSA-AES256-CCM8 TLSv1.2 Kx=DH Au=RSA Enc=AESCCM8(256) Mac=AEAD DHE-RSA-AES256-CCM TLSv1.2 Kx=DH Au=RSA Enc=AESCCM(256) Mac=AEAD DHE-RSA-AES128-GCM-SHA256 TLSv1.2 Kx=DH Au=RSA Enc=AESGCM(128) Mac=AEAD DHE-RSA-AES128-CCM8 TLSv1.2 Kx=DH Au=RSA Enc=AESCCM8(128) Mac=AEAD DHE-RSA-AES128-CCM TLSv1.2 Kx=DH Au=RSA Enc=AESCCM(128) Mac=AEAD DHE-RSA-AES256-SHA256 TLSv1.2 Kx=DH Au=RSA Enc=AES(256) Mac=SHA256 DHE-RSA-CAMELLIA256-SHA256 TLSv1.2 Kx=DH Au=RSA Enc=Camellia(256) Mac=SHA256 DHE-RSA-AES128-SHA256 TLSv1.2 Kx=DH Au=RSA Enc=AES(128) Mac=SHA256 DHE-RSA-CAMELLIA128-SHA256 TLSv1.2 Kx=DH Au=RSA Enc=Camellia(128) Mac=SHA256 ECDHE-ECDSA-AES256-SHA TLSv1 Kx=ECDH Au=ECDSA Enc=AES(256) Mac=SHA1 ECDHE-ECDSA-AES128-SHA TLSv1 Kx=ECDH Au=ECDSA Enc=AES(128) Mac=SHA1 ECDHE-RSA-AES256-SHA TLSv1 Kx=ECDH Au=RSA Enc=AES(256) Mac=SHA1 ECDHE-RSA-AES128-SHA TLSv1 Kx=ECDH Au=RSA Enc=AES(128) Mac=SHA1 DHE-RSA-AES256-SHA SSLv3 Kx=DH Au=RSA Enc=AES(256) Mac=SHA1 DHE-RSA-CAMELLIA256-SHA SSLv3 Kx=DH Au=RSA Enc=Camellia(256) Mac=SHA1 DHE-RSA-AES128-SHA SSLv3 Kx=DH Au=RSA Enc=AES(128) Mac=SHA1 DHE-RSA-CAMELLIA128-SHA SSLv3 Kx=DH Au=RSA Enc=Camellia(128) Mac=SHA1 AES256-GCM-SHA384 TLSv1.2 Kx=RSA Au=RSA Enc=AESGCM(256) Mac=AEAD AES256-CCM8 TLSv1.2 Kx=RSA Au=RSA Enc=AESCCM8(256) Mac=AEAD AES256-CCM TLSv1.2 Kx=RSA Au=RSA Enc=AESCCM(256) Mac=AEAD AES128-GCM-SHA256 TLSv1.2 Kx=RSA Au=RSA Enc=AESGCM(128) Mac=AEAD AES128-CCM8 TLSv1.2 Kx=RSA Au=RSA Enc=AESCCM8(128) Mac=AEAD AES128-CCM TLSv1.2 Kx=RSA Au=RSA Enc=AESCCM(128) Mac=AEAD AES256-SHA256 TLSv1.2 Kx=RSA Au=RSA Enc=AES(256) Mac=SHA256 CAMELLIA256-SHA256 TLSv1.2 Kx=RSA Au=RSA Enc=Camellia(256) Mac=SHA256 AES128-SHA256 TLSv1.2 Kx=RSA Au=RSA Enc=AES(128) Mac=SHA256 CAMELLIA128-SHA256 TLSv1.2 Kx=RSA Au=RSA Enc=Camellia(128) Mac=SHA256 AES256-SHA SSLv3 Kx=RSA Au=RSA Enc=AES(256) Mac=SHA1 CAMELLIA256-SHA SSLv3 Kx=RSA Au=RSA Enc=Camellia(256) Mac=SHA1 AES128-SHA SSLv3 Kx=RSA Au=RSA Enc=AES(128) Mac=SHA1 CAMELLIA128-SHA SSLv3 Kx=RSA Au=RSA Enc=Camellia(128) Mac=SHA1 This has been discussed at 2017-12-04 (https://wiki.ipfire.org/devel/telco/2017-12-04) and for a similar patch written for OpenSSL 1.0.x. Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> --- lfs/openssl | 3 +++ src/patches/openssl-1.1.0g-weak-ciphers.patch | 11 +++++++++++ 2 files changed, 14 insertions(+) create mode 100644 src/patches/openssl-1.1.0g-weak-ciphers.patch diff --git a/lfs/openssl b/lfs/openssl index bd7098039..6e17e79e6 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -131,6 +131,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./Configure $(CONFIGURE_OPTIONS) \ $(CFLAGS) $(LDFLAGS) + # Apply patch for changing DEFAULT cipher list (needed after configure) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.1.0g-weak-ciphers.patch + cd $(DIR_APP) && make depend cd $(DIR_APP) && make diff --git a/src/patches/openssl-1.1.0g-weak-ciphers.patch b/src/patches/openssl-1.1.0g-weak-ciphers.patch new file mode 100644 index 000000000..66dad2bee --- /dev/null +++ b/src/patches/openssl-1.1.0g-weak-ciphers.patch @@ -0,0 +1,11 @@ +--- openssl-1.1.0g-orig/include/openssl/ssl.h 2017-11-02 15:29:05.000000000 +0100 ++++ openssl-1.1.0g/include/openssl/ssl.h 2018-02-27 18:23:43.522649728 +0100 +@@ -194,7 +194,7 @@ + * The following cipher list is used by default. It also is substituted when + * an application-defined cipher list string starts with 'DEFAULT'. + */ +-# define SSL_DEFAULT_CIPHER_LIST "ALL:!COMPLEMENTOFDEFAULT:!eNULL" ++# define SSL_DEFAULT_CIPHER_LIST "kEECDH+ECDSA:kEECDH:kEDH:HIGH:+SHA:+kRSA:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!SRP:!kECDH:!IDEA:!SEED:!RC4:!kDH:!DSS" + /* + * As of OpenSSL 1.0.0, ssl_create_cipher_list() in ssl/ssl_ciph.c always + * starts with a reasonable order, and all we have to do for DEFAULT is -- 2.13.6

2 1

[PATCH] WIO: Fix some typos
by Stephan Feddersen 27 Feb '18

27 Feb '18

--- src/wio/lang/wio.de.pl | 3 +-- src/wio/lang/wio.en.pl | 29 ++++++++++++++--------------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/wio/lang/wio.de.pl b/src/wio/lang/wio.de.pl index a71aefc..2544cef 100644 --- a/src/wio/lang/wio.de.pl +++ b/src/wio/lang/wio.de.pl @@ -55,7 +55,6 @@ 'wio_msg' => 'Zustand (aktiv/inaktiv) des Clients / der Clients wird aktualisiert ...', 'wio_lanname' => 'LAN Hostname', 'wio_wanname' => 'WAN Hostname', -'wio_wancheck' => 'verbunden seit', 'wio_sc_refresh' => 'Client aktualisieren', 'wio_edit_settings' => 'Client hinzufügen:', 'wio_edit_client' => 'Client bearbeiten:', @@ -80,7 +79,7 @@ 'wio_logging' => 'Logging (/var/log/messages) aktivieren?', 'wio_no_image' => 'KEIN STATUS', 'wio_ovpn_con' => 'OpenVPN - Verbindung(en):', -'wio_ovpn_connected' => 'Verbunden seit', +'wio_connected' => 'Verbunden seit', 'wio_wan_up' => 'VERBUNDEN', 'wio_wan_down' => 'GETRENNT', 'wio_n2n' => 'Netz-zu-Netz Verbindung', diff --git a/src/wio/lang/wio.en.pl b/src/wio/lang/wio.en.pl index f981eee..be0046f 100644 --- a/src/wio/lang/wio.en.pl +++ b/src/wio/lang/wio.en.pl @@ -16,17 +16,17 @@ 'wio_import_data2' => ' import:', 'wio_import' => 'Importing', 'wio_import_info' => 'message:', -'wio_import_file' => 'Import settings from:', +'wio_import_file' => 'Import client(s) from:', 'wio_import_info_csv' => 'There are no new settings to import!', -'wio settings' => 'configuration:', +'wio settings' => 'Configuration:', 'wio enabled' => 'Enable?', 'wio min' => 'Minute(s)', 'wio cron' => 'Time interval for checking:', 'wio_ovpn_cron' => 'Time interval for checking the OpenVPN RW and IPSec Status:', -'wio_save' => 'save', +'wio_save' => 'Save', 'wio_error' => 'errormessage:', 'wio_info' => 'message:', -'wio_back' => 'back', +'wio_back' => 'Back', 'wio_use' => 'Import these settings ?', 'wio_ip_error' => 'Invalid IP Address.', 'wio_host_error' => 'Invalid Hostname.', @@ -45,17 +45,16 @@ 'wio_dyndns_refresh' => 'DynDNS Host IP update', 'wio_dyndns_on' => 'DynDNS Host enabled (click to disable)', 'wio_dyndns_off' => 'DynDNS Host disabled (click to enable)', -'wio_dyndns_info' => 'None IP registered, since apparently no connection exists in Internet. With the next connection in Internet is accomplished an actualization of the IP of the DynDNS Hostes.', +'wio_dyndns_info' => 'No IP registered, since apparently no connection exists in Internet. With the next connection in Internet is accomplished an actualization of the IP of the DynDNS Hostes.', 'wio_no_csv' => 'File has not the extension .csv', 'wio_no_csv_error' => 'Please do not use special characters or blanks in the filename.', 'wio_no_file_selected' => 'No File selected!', 'wio_import_infos' => 'Import settings:', -'wio_import_infos_csv' => 'NOTE: Only Data records with marked "Import these settings ?" are considered by importing! If data records with double IP-Addresses or Hostnames should occur, only the first data record will be imported and the other data records (with the double IP-Addresses or Hostnames) will not be considered!', +'wio_import_infos_csv' => 'NOTE: Only Data records with marked "Import these settings?" are considered by importing! If data records with double IP-Addresses or Hostnames should occur, only the first data record will be imported and the other data records (with the double IP-Addresses or Hostnames) will not be considered!', 'enable disable dyndns' => 'enable or disable DynDNS Host', -'wio_msg' => 'Condition of the examining Client(s) are updated ...', +'wio_msg' => 'Condition of the examining client(s) are updated ...', 'wio_lanname' => 'LAN Hostname', 'wio_wanname' => 'WAN Hostname', -'wio_wancheck' => 'Connected since', 'wio_sc_refresh' => 'Update client now', 'wio_edit_settings' => 'Add client:', 'wio_edit_client' => 'Edit client:', @@ -80,7 +79,7 @@ 'wio_logging' => 'Activate logging (/var/log/messages)?', 'wio_no_image' => 'NO STATUS', 'wio_ovpn_con' => 'OpenVPN - Connection(s):', -'wio_ovpn_connected' => 'Connected since', +'wio_connected' => 'Connected since', 'wio_wan_up' => 'CONNECTED', 'wio_wan_down' => 'NOT CONNECTED', 'wio_n2n' => 'Net-to-Net Connection', @@ -89,7 +88,7 @@ 'wio_mail_online_on' => 'Online email enabled (click to disable)', 'wio_mail_online_off' => 'Online email disabled (click to enable)', 'wio_mail_offline_on' => 'Offline email enabled (click to disable)', -'wio_mail_offline_off' => 'Offline emaildisabled (click to enable)', +'wio_mail_offline_off' => 'Offline email disabled (click to enable)', 'wio_mail_online' => 'Enable or disable online email', 'wio_mail_offline' => 'Enable or disable offline email', 'wio_sendemail' => 'Send email', @@ -108,8 +107,8 @@ 'wio_ip_on' => 'Send ping to IP enabled (click to enable FQDN)', 'wio_fqdn_on' => 'Send ping to FQDN enabled (click to enable IP)', 'wio_client_add' => 'Use settings', -'wio_config' => 'Configurate Client(s):', -'wio_settings_msg' => 'Configurate settings:', +'wio_config' => 'Configure Client(s):', +'wio_settings_msg' => 'Configure settings:', 'wio_settings_msg_hint' => 'Here you have to set some values to get the addon started.', 'wio_sub' => 'WIO Client-Status-Mail', 'wio timeout' => 'Ping Timeout:', @@ -132,7 +131,7 @@ 'wio_remove_client' => 'Remove client', 'wio_remove_client_hint' => 'Are you sure to delete the client?', 'wio_arp_table_entries' => 'Add client from ARP-Table:', -'wio_activ' => 'Activ', +'wio_activ' => 'Active', 'wio_check' => 'Check', 'wio_common_name' => 'Remote Host/IP', 'wio_msg_left' => 'Searching on the', @@ -154,6 +153,6 @@ 'wio_answer' => 'Answer', 'wio_answer_time' => 'Response Time', 'wio_scriptruntime' => 'Script Execution Time', -'wio_show_table_off' => 'Show table', -'wio_show_table_on' => 'Hide table', +'wio_show_table_off' => 'Hide table', +'wio_show_table_on' => 'Show table', ); -- 2.7.4

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development February 2018