From patchwork Wed Aug 5 12:23:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3294 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BM9kr0MYqz3x0n for ; Wed, 5 Aug 2020 12:23:16 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BM9kp5b1GznG; Wed, 5 Aug 2020 12:23:14 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BM9kp3KtXz2yCC; Wed, 5 Aug 2020 12:23:14 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BM9kn2V8zz2xnM for ; Wed, 5 Aug 2020 12:23:13 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BM9kn1CXczm2; Wed, 5 Aug 2020 12:23:13 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1596630193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5Q2Xw8Eg47LgAxcigMErK1DjRi7Vp/R+DJYK7FllbgI=; b=FKm3QFdzjD/bQl7k+kGKtVxV9IFp+ws33FYz7q1YYkiIU1qks8TOjPqZo88n7PPssSHdzS 25GSzeKZOkmW8rDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1596630193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5Q2Xw8Eg47LgAxcigMErK1DjRi7Vp/R+DJYK7FllbgI=; b=ASj182cSDaWE0yNijqyUH9C6FXilXmogqv/C6Tsq6gQXF/QWibg2X+BoPAEZ/wKJGLoMLd Zbct7h7ngGWhGLwHylIIEZwxA4kTAqdMI/Acs+rasmO/UfoxwqFUV5lq/BNEZL7JqimNEX Ibu5MEkp71lOT6IJl9+LUHC07OfVxCXcKmmbXFGSLBCQruP5OGbgihBxazZEVIlwMb3r9p Pq/7HukM9d8gmqbU6sQNX+G2qQ7TjprNoy4eZwcLRMW2cWrOO6X449CBhSTHfuz0exctt9 /JO/iXnmpHc2JED5XIEnfEXM1b5yUi/vF1seal0/l0fY1+Qc7i3OabgXatd8Fw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 2/2] index.cgi: Show a note to people who are running IPFire on i?86 Date: Wed, 5 Aug 2020 12:23:07 +0000 Message-Id: <20200805122307.2381-2-michael.tremer@ipfire.org> In-Reply-To: <20200805122307.2381-1-michael.tremer@ipfire.org> References: <20200805122307.2381-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- doc/language_issues.en | 1 + doc/language_issues.es | 1 + doc/language_issues.fr | 1 + doc/language_issues.it | 1 + doc/language_issues.nl | 1 + doc/language_issues.pl | 1 + doc/language_issues.ru | 1 + doc/language_issues.tr | 1 + doc/language_missings | 7 +++++++ html/cgi-bin/index.cgi | 6 ++++++ langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 12 files changed, 23 insertions(+) diff --git a/doc/language_issues.en b/doc/language_issues.en index ca3b1bbdb..40cba2292 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -1182,6 +1182,7 @@ WARNING: untranslated string: last = Last WARNING: untranslated string: last activity = Last Activity WARNING: untranslated string: lease expires = Lease expires WARNING: untranslated string: least preferred = least preferred +WARNING: untranslated string: legacy architecture warning = You are running IPFire on a legacy architecture and it is recommended to upgrade WARNING: untranslated string: legend = Legend WARNING: untranslated string: lifetime = Lifetime: WARNING: untranslated string: linkq = Link Quality diff --git a/doc/language_issues.es b/doc/language_issues.es index 016bcd5e5..f7431f692 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1154,6 +1154,7 @@ WARNING: untranslated string: ipsec settings = IPsec Settings WARNING: untranslated string: itlb multihit = iTLB MultiHit WARNING: untranslated string: last = Last WARNING: untranslated string: least preferred = least preferred +WARNING: untranslated string: legacy architecture warning = You are running IPFire on a legacy architecture and it is recommended to upgrade WARNING: untranslated string: lifetime = Lifetime: WARNING: untranslated string: local ip address = Local IP Address WARNING: untranslated string: log server protocol = protocol: diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 9c7456d71..597883693 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -838,6 +838,7 @@ WARNING: untranslated string: guardian logtarget_file = unknown string WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string +WARNING: untranslated string: legacy architecture warning = You are running IPFire on a legacy architecture and it is recommended to upgrade WARNING: untranslated string: pakfire ago = ago. WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string diff --git a/doc/language_issues.it b/doc/language_issues.it index c3291c0b2..c943da739 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -983,6 +983,7 @@ WARNING: untranslated string: ipsec mode tunnel = Tunnel WARNING: untranslated string: ipsec routing table entries = IPsec Routing Table Entries WARNING: untranslated string: ipsec settings = IPsec Settings WARNING: untranslated string: itlb multihit = iTLB MultiHit +WARNING: untranslated string: legacy architecture warning = You are running IPFire on a legacy architecture and it is recommended to upgrade WARNING: untranslated string: local ip address = Local IP Address WARNING: untranslated string: location = Location WARNING: untranslated string: locationblock = Location Block diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 49a9c6d20..7496d647c 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -992,6 +992,7 @@ WARNING: untranslated string: ipsec mode tunnel = Tunnel WARNING: untranslated string: ipsec routing table entries = IPsec Routing Table Entries WARNING: untranslated string: ipsec settings = IPsec Settings WARNING: untranslated string: itlb multihit = iTLB MultiHit +WARNING: untranslated string: legacy architecture warning = You are running IPFire on a legacy architecture and it is recommended to upgrade WARNING: untranslated string: local ip address = Local IP Address WARNING: untranslated string: location = Location WARNING: untranslated string: locationblock = Location Block diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 016bcd5e5..f7431f692 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1154,6 +1154,7 @@ WARNING: untranslated string: ipsec settings = IPsec Settings WARNING: untranslated string: itlb multihit = iTLB MultiHit WARNING: untranslated string: last = Last WARNING: untranslated string: least preferred = least preferred +WARNING: untranslated string: legacy architecture warning = You are running IPFire on a legacy architecture and it is recommended to upgrade WARNING: untranslated string: lifetime = Lifetime: WARNING: untranslated string: local ip address = Local IP Address WARNING: untranslated string: log server protocol = protocol: diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 4bf922e62..a3eb33669 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1149,6 +1149,7 @@ WARNING: untranslated string: ipsec settings = IPsec Settings WARNING: untranslated string: itlb multihit = iTLB MultiHit WARNING: untranslated string: last = Last WARNING: untranslated string: least preferred = least preferred +WARNING: untranslated string: legacy architecture warning = You are running IPFire on a legacy architecture and it is recommended to upgrade WARNING: untranslated string: lifetime = Lifetime: WARNING: untranslated string: local ip address = Local IP Address WARNING: untranslated string: location = Location diff --git a/doc/language_issues.tr b/doc/language_issues.tr index f02493545..60a646e5f 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -916,6 +916,7 @@ WARNING: untranslated string: ipsec mode tunnel = Tunnel WARNING: untranslated string: ipsec routing table entries = IPsec Routing Table Entries WARNING: untranslated string: ipsec settings = IPsec Settings WARNING: untranslated string: itlb multihit = iTLB MultiHit +WARNING: untranslated string: legacy architecture warning = You are running IPFire on a legacy architecture and it is recommended to upgrade WARNING: untranslated string: local ip address = Local IP Address WARNING: untranslated string: meltdown = Meltdown WARNING: untranslated string: mitigated = Mitigated diff --git a/doc/language_missings b/doc/language_missings index 913970113..3fbaad77b 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -575,6 +575,7 @@ < itlb multihit < last < least preferred +< legacy architecture warning < lifetime < local ip address < log server protocol @@ -921,6 +922,7 @@ < bewan adsl usb < g.dtm < g.lite +< legacy architecture warning < upload fcdsl.o ############################################################################ # Checking cgi-bin translations for language: it # @@ -1127,6 +1129,7 @@ < ipsec routing table entries < ipsec settings < itlb multihit +< legacy architecture warning < local ip address < location < locationblock @@ -1501,6 +1504,7 @@ < ipsec routing table entries < ipsec settings < itlb multihit +< legacy architecture warning < local ip address < location < locationblock @@ -2200,6 +2204,7 @@ < itlb multihit < last < least preferred +< legacy architecture warning < lifetime < local ip address < location @@ -3056,6 +3061,7 @@ < itlb multihit < last < least preferred +< legacy architecture warning < lifetime < local ip address < location @@ -3474,6 +3480,7 @@ < ipsec routing table entries < ipsec settings < itlb multihit +< legacy architecture warning < local ip address < meltdown < mitigated diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 945a5b68c..8e7207d0c 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -545,6 +545,12 @@ if ( ! -e "/var/ipfire/main/send_profile") { $warnmessage .= "
  • $Lang::tr{'fireinfo please enable'}
    • "; } +# Legacy architecture +my ($sysname, $nodename, $release, $version, $machine) = &POSIX::uname(); +if ($machine =~ m/^i?86$/) { + $warnmessage .= "
  • $Lang::tr{'legacy architecture warning'}
    • "; +} + # Memory usage warning my @free = `/usr/bin/free`; $free[1] =~ m/(\d+)/; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index b01e75eb5..7a626d616 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1549,6 +1549,7 @@ 'lateprompting' => 'Late prompting', 'lease expires' => 'Zuordnung verfällt', 'least preferred' => 'weniger präferiert', +'legacy architecture warning' => 'Sie betreiben IPFire auf einer überholten Architektur und ein Update ist empfohlen', 'legend' => 'Legende', 'length' => 'Länge', 'lifetime' => 'Lebensdauer:', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 7e3bbec89..2badc4c48 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1573,6 +1573,7 @@ 'lateprompting' => 'Lateprompting', 'lease expires' => 'Lease expires', 'least preferred' => 'least preferred', +'legacy architecture warning' => 'You are running IPFire on a legacy architecture and it is recommended to upgrade', 'legend' => 'Legend', 'length' => 'Length', 'lifetime' => 'Lifetime:',