* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1ba481b3f4d9e31a8d02cdec447e7bff12631318
@ 2020-11-11 18:31 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2020-11-11 18:31 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 53729 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 1ba481b3f4d9e31a8d02cdec447e7bff12631318 (commit)
via 358e42ffbf5e8dd58e3f5c71afe2a90a05ce8754 (commit)
via 4dc8de6f2230a77634d2a43cfc0231d9369dfeea (commit)
via 7b82ca1fc831af523f612cd9635fc45aa3a8e6ca (commit)
via 81f80af9877eec84bf51e14290bb89782ba8fc96 (commit)
via 2293e1de0bef48e607ff4701bad07863d9ed57ee (commit)
via 66c9d821d6252d3c0c50b2dcd37910002c8dcdf5 (commit)
from d08452c5055cccc9cb5c2a0dedf661cf50d28679 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1ba481b3f4d9e31a8d02cdec447e7bff12631318
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Nov 11 18:30:45 2020 +0000
Run "./make.sh lang"
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 358e42ffbf5e8dd58e3f5c71afe2a90a05ce8754
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Wed Nov 11 15:17:59 2020 +0100
langs: add changed strings to German and English translations
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4dc8de6f2230a77634d2a43cfc0231d9369dfeea
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Wed Nov 11 15:15:18 2020 +0100
ipinfo.cgi: display AS information as well
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7b82ca1fc831af523f612cd9635fc45aa3a8e6ca
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Wed Nov 11 15:14:09 2020 +0100
location-functions.pl: add functions for fetching AS information
The second version of this patch only unifies the licence banner, but
leaves GPLv2 untouched. In addition, functions have been changed to use
a script-wide location database handle, as introduced in commit
b62d7e0cc71cc1ff23d66dd8baf0f5f3c5c7a29b.
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 81f80af9877eec84bf51e14290bb89782ba8fc96
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Nov 11 15:53:39 2020 +0000
core153: Ship rules.pl
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2293e1de0bef48e607ff4701bad07863d9ed57ee
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Nov 3 11:48:09 2020 +0100
rules.pl: apply location filter to ppp0 if configured
In order to prevent collateral damage to internal traffic, commit
c69c820025c21713cdb77eae3dd4fa61ca71b5fb introduced applying location
block on red0 as a sanity check.
On systems configured to use PPPoE, however, traffic appears on the ppp0
interface instead. This patch checks if a system is configured to use
this connection method, and applies the location filter to this
interface. red0 is used otherwise.
Fixes: #12519
Cc: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 66c9d821d6252d3c0c50b2dcd37910002c8dcdf5
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Wed Nov 11 14:45:06 2020 +0100
spectre-meltdown-checker: update to 0.44
Full changelog as per https://github.com/speed47/spectre-meltdown-checker/releases/tag/v0.44 :
feat: add support for SRBDS related vulnerabilities
feat: add zstd kernel decompression (#370)
enh: arm: add experimental support for binary arm images
enh: rsb filling: no longer need the 'strings' tool to check for kernel support in live mode
fix: fwdb: remove Intel extract tempdir on exit
fix: has_vmm: ignore kernel threads when looking for a hypervisor (fixes #278)
fix: fwdb: use the commit date as the intel fwdb version
fix: fwdb: update Intel's repository URL
fix: arm64: cve-2017-5753: kernels 4.19+ use a different nospec macro
fix: on CPU parse info under FreeBSD
chore: github: add check run on pull requests
chore: fwdb: update to v165.20201021+i20200616
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/cfgroot/location-functions.pl | 68 +++++++++-----
config/firewall/rules.pl | 9 +-
config/rootfiles/core/153/filelists/files | 1 +
doc/language_issues.en | 9 +-
doc/language_issues.es | 5 ++
doc/language_issues.fr | 5 ++
doc/language_issues.it | 5 ++
doc/language_issues.nl | 5 ++
doc/language_issues.pl | 5 ++
doc/language_issues.ru | 5 ++
doc/language_issues.tr | 5 ++
doc/language_missings | 28 ++++++
html/cgi-bin/dns.cgi | 2 +-
html/cgi-bin/ipinfo.cgi | 142 +++++++++++++++++++-----------
html/cgi-bin/remote.cgi | 4 +-
langs/de/cgi-bin/de.pl | 9 +-
langs/en/cgi-bin/en.pl | 8 +-
langs/es/cgi-bin/es.pl | 2 +-
langs/fr/cgi-bin/fr.pl | 2 +-
langs/it/cgi-bin/it.pl | 2 +-
langs/nl/cgi-bin/nl.pl | 2 +-
langs/pl/cgi-bin/pl.pl | 2 +-
langs/ru/cgi-bin/ru.pl | 2 +-
langs/tr/cgi-bin/tr.pl | 2 +-
lfs/spectre-meltdown-checker | 6 +-
25 files changed, 239 insertions(+), 96 deletions(-)
Difference in files:
diff --git a/config/cfgroot/location-functions.pl b/config/cfgroot/location-functions.pl
index fdf2c6efe..b7465c5ef 100644
--- a/config/cfgroot/location-functions.pl
+++ b/config/cfgroot/location-functions.pl
@@ -1,25 +1,23 @@
#!/usr/bin/perl -w
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire is free software; you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation; either version 2 of the License, or #
-# (at your option) any later version. #
-# #
-# IPFire is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2015 - 2020 IPFire Team <info(a)ipfire.org>. #
-# #
-############################################################################
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> #
+# #
+# 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 #
+# the Free Software Foundation, either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
package Location::Functions;
@@ -86,7 +84,7 @@ sub verify ($) {
}
#
-## Function to the the country code of a given address.
+## Function to get the country code of a given address.
#
sub lookup_country_code($$) {
my ($address) = @_;
@@ -236,6 +234,32 @@ sub address_has_flags($) {
return @flags;
}
+#
+## Function to get the Autonomous System Number of a given address.
+#
+sub lookup_asn($) {
+ my ($address) = @_;
+
+ # Lookup the given address.
+ my $asn = &Location::lookup_asn($db_handle, $address);
+
+ # Return the number of the Autonomous System
+ return $asn;
+}
+
+#
+## Function to get the name of an Autonomous System.
+#
+sub get_as_name($) {
+ my ($asn) = @_;
+
+ # Fetch the name of this AS...
+ my $as_name = &Location::get_as_name($db_handle, $asn);
+
+ # Return the name of the Autonomous System
+ return $as_name;
+}
+
# Custom END declaration which will be executed when perl
# ends, to release the database handle to libloc.
END {
diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl
index c2641a92d..bc6187052 100644
--- a/config/firewall/rules.pl
+++ b/config/firewall/rules.pl
@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> #
# #
# 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 #
@@ -628,8 +628,11 @@ sub locationblock {
return;
}
- # Only check the RED interface
- if ($defaultNetworks{'RED_DEV'} ne "") {
+ # Only check the RED interface, which is ppp0 in case of RED_TYPE being
+ # set to "PPPOE", and red0 in case of RED_TYPE not being empty otherwise.
+ if ($defaultNetworks{'RED_TYPE'} eq "PPPOE") {
+ run("$IPTABLES -A LOCATIONBLOCK ! -i ppp0 -j RETURN");
+ } elsif ($defaultNetworks{'RED_DEV'} ne "") {
run("$IPTABLES -A LOCATIONBLOCK ! -i $defaultNetworks{'RED_DEV'} -j RETURN");
}
diff --git a/config/rootfiles/core/153/filelists/files b/config/rootfiles/core/153/filelists/files
index 9fe5a0adf..fddb5d68a 100644
--- a/config/rootfiles/core/153/filelists/files
+++ b/config/rootfiles/core/153/filelists/files
@@ -18,5 +18,6 @@ srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/remote.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
+usr/lib/firewall/rules.pl
var/ipfire/location-functions.pl
var/ipfire/langs
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 4cff0c6cb..a5f2b2f81 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -324,12 +324,14 @@ WARNING: untranslated string: april = April
WARNING: untranslated string: are you sure = Are you sure?
WARNING: untranslated string: arp table entries = ARP Table Entries
WARNING: untranslated string: artist = Artist
+WARNING: untranslated string: asn lookup failed = AS lookup failed
WARNING: untranslated string: atm device = Device:
WARNING: untranslated string: atm settings = ATM settings
WARNING: untranslated string: attention = ATTENTION
WARNING: untranslated string: august = August
WARNING: untranslated string: authentication = Authentication:
WARNING: untranslated string: automatic = Automatic
+WARNING: untranslated string: autonomous system = Autonomous System
WARNING: untranslated string: average = Average
WARNING: untranslated string: back = Back
WARNING: untranslated string: backup = Backup
@@ -1127,7 +1129,9 @@ WARNING: untranslated string: ip address outside subnets = IP Address outside su
WARNING: untranslated string: ip alias added = External IP alias added
WARNING: untranslated string: ip alias changed = External IP alias changed
WARNING: untranslated string: ip alias removed = External IP alias removed
-WARNING: untranslated string: ip info = IP Information
+WARNING: untranslated string: ip basic info = Basic IP information
+WARNING: untranslated string: ip info = IP information for
+WARNING: untranslated string: ip info for = unknown string
WARNING: untranslated string: ipfire has now rebooted = IPFire is rebooting now.
WARNING: untranslated string: ipfire has now shutdown = IPFire is shutting down now.
WARNING: untranslated string: ipfire side is invalid = IPFire side is invalid.
@@ -1187,7 +1191,6 @@ WARNING: untranslated string: loged in at = Logged in at
WARNING: untranslated string: logging server = Logging Server
WARNING: untranslated string: loginlogout = Login/Logout
WARNING: untranslated string: logs = logs
-WARNING: untranslated string: lookup failed = Reverse lookup failed
WARNING: untranslated string: low = Low
WARNING: untranslated string: mac address = MAC Address
WARNING: untranslated string: mac address deleted = Successfully deleted!
@@ -1485,6 +1488,7 @@ WARNING: untranslated string: proxy reports monthly = Monthly reports
WARNING: untranslated string: proxy reports today = Today
WARNING: untranslated string: proxy reports weekly = Weekly reports
WARNING: untranslated string: ptr = PTR
+WARNING: untranslated string: ptr lookup failed = Reverse lookup failed
WARNING: untranslated string: pulse = Pulse
WARNING: untranslated string: pulse dial = Pulse dial:
WARNING: untranslated string: qos enter bandwidths = You will need to enter your downstream and upstream bandwidth!
@@ -2087,6 +2091,7 @@ WARNING: untranslated string: website = Website
WARNING: untranslated string: wednesday = Wednesday
WARNING: untranslated string: week = Week
WARNING: untranslated string: weeks = Weeks
+WARNING: untranslated string: whois results from = WHOIS results from
WARNING: untranslated string: winbind daemon = Winbind Daemon
WARNING: untranslated string: wireless = Wireless
WARNING: untranslated string: wireless config added = Wireless config added
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 8d6041ce5..1f743310c 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -821,8 +821,10 @@ WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Pro
WARNING: untranslated string: advproxy wpad view pac = Open PAC File
WARNING: untranslated string: age second = second
WARNING: untranslated string: application layer gateways = Application Layer Gateways
+WARNING: untranslated string: asn lookup failed = AS lookup failed
WARNING: untranslated string: atm device = Device:
WARNING: untranslated string: attention = ATTENTION
+WARNING: untranslated string: autonomous system = Autonomous System
WARNING: untranslated string: bit = bit
WARNING: untranslated string: block = Block
WARNING: untranslated string: broken = Broken
@@ -1218,6 +1220,8 @@ WARNING: untranslated string: invalid input for mode = Invalid input for mode
WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
+WARNING: untranslated string: ip basic info = Basic IP information
+WARNING: untranslated string: ip info for = unknown string
WARNING: untranslated string: ipsec = IPsec
WARNING: untranslated string: ipsec connection = IPsec Connection
WARNING: untranslated string: ipsec interface mode gre = GRE
@@ -1466,6 +1470,7 @@ WARNING: untranslated string: vpn wait = WAITING
WARNING: untranslated string: vpn weak = Weak
WARNING: untranslated string: vulnerability = Vulnerability
WARNING: untranslated string: vulnerable = Vulnerable
+WARNING: untranslated string: whois results from = WHOIS results from
WARNING: untranslated string: winbind daemon = Winbind Daemon
WARNING: untranslated string: wireless network = WiFi Network
WARNING: untranslated string: wlan client = Wireless client
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index f4ed28c7d..885c9b23c 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -877,6 +877,8 @@ WARNING: translation string unused: zoneconf val ppp assignment error
WARNING: translation string unused: zoneconf val vlan amount assignment error
WARNING: translation string unused: zoneconf val vlan tag assignment error
WARNING: translation string unused: zoneconf val zoneslave amount error
+WARNING: untranslated string: asn lookup failed = AS lookup failed
+WARNING: untranslated string: autonomous system = Autonomous System
WARNING: untranslated string: dns enable safe-search youtube = Include YouTube in Safe Search
WARNING: untranslated string: fwhost cust locationgrp = unknown string
WARNING: untranslated string: fwhost err hostip = unknown string
@@ -909,7 +911,10 @@ 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: ip basic info = Basic IP information
+WARNING: untranslated string: ip info for = unknown string
WARNING: untranslated string: pakfire ago = ago.
WARNING: untranslated string: route config changed = unknown string
WARNING: untranslated string: routing config added = unknown string
WARNING: untranslated string: routing config changed = unknown string
+WARNING: untranslated string: whois results from = WHOIS results from
diff --git a/doc/language_issues.it b/doc/language_issues.it
index 08b07080e..9cea1cd16 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -899,6 +899,8 @@ WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to wor
WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
WARNING: untranslated string: advproxy wpad view pac = Open PAC File
WARNING: untranslated string: application layer gateways = Application Layer Gateways
+WARNING: untranslated string: asn lookup failed = AS lookup failed
+WARNING: untranslated string: autonomous system = Autonomous System
WARNING: untranslated string: block = Block
WARNING: untranslated string: broken = Broken
WARNING: untranslated string: bytes = unknown string
@@ -1048,6 +1050,8 @@ WARNING: untranslated string: invalid input for mode = Invalid input for mode
WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
+WARNING: untranslated string: ip basic info = Basic IP information
+WARNING: untranslated string: ip info for = unknown string
WARNING: untranslated string: ipsec connection = IPsec Connection
WARNING: untranslated string: ipsec interface mode gre = GRE
WARNING: untranslated string: ipsec interface mode none = - None (Default) -
@@ -1172,6 +1176,7 @@ WARNING: untranslated string: vpn wait = WAITING
WARNING: untranslated string: vpn weak = Weak
WARNING: untranslated string: vulnerability = Vulnerability
WARNING: untranslated string: vulnerable = Vulnerable
+WARNING: untranslated string: whois results from = WHOIS results from
WARNING: untranslated string: winbind daemon = Winbind Daemon
WARNING: untranslated string: wireless network = WiFi Network
WARNING: untranslated string: wlan client anonymous identity = Anonymous Identity
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index bde5daf3c..11fea04e6 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -892,7 +892,9 @@ WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to wor
WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
WARNING: untranslated string: advproxy wpad view pac = Open PAC File
WARNING: untranslated string: application layer gateways = Application Layer Gateways
+WARNING: untranslated string: asn lookup failed = AS lookup failed
WARNING: untranslated string: atm device = Device:
+WARNING: untranslated string: autonomous system = Autonomous System
WARNING: untranslated string: block = Block
WARNING: untranslated string: broken = Broken
WARNING: untranslated string: bytes = unknown string
@@ -1058,6 +1060,8 @@ WARNING: untranslated string: invalid input for mode = Invalid input for mode
WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
+WARNING: untranslated string: ip basic info = Basic IP information
+WARNING: untranslated string: ip info for = unknown string
WARNING: untranslated string: ipsec connection = IPsec Connection
WARNING: untranslated string: ipsec interface mode gre = GRE
WARNING: untranslated string: ipsec interface mode none = - None (Default) -
@@ -1213,6 +1217,7 @@ WARNING: untranslated string: vpn wait = WAITING
WARNING: untranslated string: vpn weak = Weak
WARNING: untranslated string: vulnerability = Vulnerability
WARNING: untranslated string: vulnerable = Vulnerable
+WARNING: untranslated string: whois results from = WHOIS results from
WARNING: untranslated string: winbind daemon = Winbind Daemon
WARNING: untranslated string: wireless network = WiFi Network
WARNING: untranslated string: wlan client anonymous identity = Anonymous Identity
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 8d6041ce5..1f743310c 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -821,8 +821,10 @@ WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Pro
WARNING: untranslated string: advproxy wpad view pac = Open PAC File
WARNING: untranslated string: age second = second
WARNING: untranslated string: application layer gateways = Application Layer Gateways
+WARNING: untranslated string: asn lookup failed = AS lookup failed
WARNING: untranslated string: atm device = Device:
WARNING: untranslated string: attention = ATTENTION
+WARNING: untranslated string: autonomous system = Autonomous System
WARNING: untranslated string: bit = bit
WARNING: untranslated string: block = Block
WARNING: untranslated string: broken = Broken
@@ -1218,6 +1220,8 @@ WARNING: untranslated string: invalid input for mode = Invalid input for mode
WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
+WARNING: untranslated string: ip basic info = Basic IP information
+WARNING: untranslated string: ip info for = unknown string
WARNING: untranslated string: ipsec = IPsec
WARNING: untranslated string: ipsec connection = IPsec Connection
WARNING: untranslated string: ipsec interface mode gre = GRE
@@ -1466,6 +1470,7 @@ WARNING: untranslated string: vpn wait = WAITING
WARNING: untranslated string: vpn weak = Weak
WARNING: untranslated string: vulnerability = Vulnerability
WARNING: untranslated string: vulnerable = Vulnerable
+WARNING: untranslated string: whois results from = WHOIS results from
WARNING: untranslated string: winbind daemon = Winbind Daemon
WARNING: untranslated string: wireless network = WiFi Network
WARNING: untranslated string: wlan client = Wireless client
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 6235f33fd..ae2ae4a46 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -822,8 +822,10 @@ WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Pro
WARNING: untranslated string: advproxy wpad view pac = Open PAC File
WARNING: untranslated string: age second = second
WARNING: untranslated string: application layer gateways = Application Layer Gateways
+WARNING: untranslated string: asn lookup failed = AS lookup failed
WARNING: untranslated string: atm device = Device:
WARNING: untranslated string: attention = ATTENTION
+WARNING: untranslated string: autonomous system = Autonomous System
WARNING: untranslated string: bit = bit
WARNING: untranslated string: block = Block
WARNING: untranslated string: broken = Broken
@@ -1211,6 +1213,8 @@ WARNING: untranslated string: invalid input for mode = Invalid input for mode
WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
+WARNING: untranslated string: ip basic info = Basic IP information
+WARNING: untranslated string: ip info for = unknown string
WARNING: untranslated string: ipsec = IPsec
WARNING: untranslated string: ipsec connection = IPsec Connection
WARNING: untranslated string: ipsec interface mode gre = GRE
@@ -1459,6 +1463,7 @@ WARNING: untranslated string: vpn wait = WAITING
WARNING: untranslated string: vpn weak = Weak
WARNING: untranslated string: vulnerability = Vulnerability
WARNING: untranslated string: vulnerable = Vulnerable
+WARNING: untranslated string: whois results from = WHOIS results from
WARNING: untranslated string: winbind daemon = Winbind Daemon
WARNING: untranslated string: wireless network = WiFi Network
WARNING: untranslated string: wlan client = Wireless client
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index b61f3740a..3f3353abe 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -884,6 +884,8 @@ WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL
WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>.
WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
WARNING: untranslated string: advproxy wpad view pac = Open PAC File
+WARNING: untranslated string: asn lookup failed = AS lookup failed
+WARNING: untranslated string: autonomous system = Autonomous System
WARNING: untranslated string: broken = Broken
WARNING: untranslated string: bytes = unknown string
WARNING: untranslated string: cpu frequency = CPU frequency
@@ -981,6 +983,8 @@ WARNING: untranslated string: invalid input for interface mtu = Invalid input to
WARNING: untranslated string: invalid input for local ip address = Invalid input for local IP address
WARNING: untranslated string: invalid input for mode = Invalid input for mode
WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
+WARNING: untranslated string: ip basic info = Basic IP information
+WARNING: untranslated string: ip info for = unknown string
WARNING: untranslated string: ipsec connection = IPsec Connection
WARNING: untranslated string: ipsec interface mode gre = GRE
WARNING: untranslated string: ipsec interface mode none = - None (Default) -
@@ -1052,6 +1056,7 @@ WARNING: untranslated string: vpn subjectaltname missing = SubjectAlternativeNam
WARNING: untranslated string: vpn wait = WAITING
WARNING: untranslated string: vulnerability = Vulnerability
WARNING: untranslated string: vulnerable = Vulnerable
+WARNING: untranslated string: whois results from = WHOIS results from
WARNING: untranslated string: winbind daemon = Winbind Daemon
WARNING: untranslated string: wlanap 802.11w disabled = Disabled
WARNING: untranslated string: wlanap 802.11w enforced = Enforced
diff --git a/doc/language_missings b/doc/language_missings
index 638a7cc42..9c914912f 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -97,9 +97,11 @@
< age sminute
< age ssecond
< application layer gateways
+< asn lookup failed
< Async logging enabled
< atm device
< attention
+< autonomous system
< bit
< block
< broken
@@ -580,6 +582,7 @@
< invalid input for valid till days
< invalid ip or hostname
< invalid logserver protocol
+< ip basic info
< ipsec
< ipsec connection
< ipsec interface mode gre
@@ -870,6 +873,7 @@
< vulnerability
< vulnerable
< Weekly
+< whois results from
< winbind daemon
< wireless network
< wlanap
@@ -949,12 +953,16 @@
# Checking cgi-bin translations for language: fr #
############################################################################
< ansi t1.483
+< asn lookup failed
+< autonomous system
< bewan adsl pci st
< bewan adsl usb
< dns enable safe-search youtube
< g.dtm
< g.lite
+< ip basic info
< upload fcdsl.o
+< whois results from
############################################################################
# Checking cgi-bin translations for language: it #
############################################################################
@@ -976,6 +984,8 @@
< advproxy wpad title
< advproxy wpad view pac
< application layer gateways
+< asn lookup failed
+< autonomous system
< block
< broken
< Captive
@@ -1156,6 +1166,7 @@
< invalid input for valid till days
< invalid ip or hostname
< invalid logserver protocol
+< ip basic info
< ipsec connection
< ipsec interface mode gre
< ipsec interface mode none
@@ -1282,6 +1293,7 @@
< vulnerability
< vulnerable
< Weekly
+< whois results from
< winbind daemon
< wireless network
< wlanap
@@ -1347,7 +1359,9 @@
< advproxy wpad title
< advproxy wpad view pac
< application layer gateways
+< asn lookup failed
< atm device
+< autonomous system
< block
< broken
< capabilities
@@ -1547,6 +1561,7 @@
< invalid input for valid till days
< invalid ip or hostname
< invalid logserver protocol
+< ip basic info
< ipsec connection
< ipsec interface mode gre
< ipsec interface mode none
@@ -1708,6 +1723,7 @@
< vulnerability
< vulnerable
< Weekly
+< whois results from
< winbind daemon
< wireless network
< wlanap
@@ -1784,8 +1800,10 @@
< age sminute
< age ssecond
< application layer gateways
+< asn lookup failed
< atm device
< attention
+< autonomous system
< bit
< block
< broken
@@ -2258,6 +2276,7 @@
< invalid input for valid till days
< invalid ip or hostname
< invalid logserver protocol
+< ip basic info
< ipsec
< ipsec connection
< ipsec interface mode gre
@@ -2542,6 +2561,7 @@
< vulnerability
< vulnerable
< Weekly
+< whois results from
< winbind daemon
< wireless network
< wlanap
@@ -2651,8 +2671,10 @@
< age sminute
< age ssecond
< application layer gateways
+< asn lookup failed
< atm device
< attention
+< autonomous system
< bit
< block
< broken
@@ -3131,6 +3153,7 @@
< invalid input for valid till days
< invalid ip or hostname
< invalid logserver protocol
+< ip basic info
< ipsec
< ipsec connection
< ipsec interface mode gre
@@ -3414,6 +3437,7 @@
< vulnerable
< week-graph
< Weekly
+< whois results from
< winbind daemon
< wireless network
< wlanap
@@ -3502,6 +3526,8 @@
< advproxy wpad notice
< advproxy wpad title
< advproxy wpad view pac
+< asn lookup failed
+< autonomous system
< broken
< Captive delete logo
< cpu frequency
@@ -3572,6 +3598,7 @@
< invalid input for local ip address
< invalid input for mode
< invalid ip or hostname
+< ip basic info
< ipsec connection
< ipsec interface mode gre
< ipsec interface mode none
@@ -3640,6 +3667,7 @@
< vulnerability
< vulnerable
< Weekly
+< whois results from
< winbind daemon
< wlanap 802.11w disabled
< wlanap 802.11w enforced
diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi
index 5c3ca875d..337166ccf 100755
--- a/html/cgi-bin/dns.cgi
+++ b/html/cgi-bin/dns.cgi
@@ -625,7 +625,7 @@ END
$rdns = gethostbyaddr($iaddr, AF_INET);
}
- if (!$rdns) { $rdns = $Lang::tr{'lookup failed'}; }
+ if (!$rdns) { $rdns = $Lang::tr{'ptr lookup failed'}; }
# Mark ISP name servers as disabled
if ($id <= 2 && $enabled eq "disabled") {
diff --git a/html/cgi-bin/ipinfo.cgi b/html/cgi-bin/ipinfo.cgi
index ecc7c436c..1b7ceeadc 100644
--- a/html/cgi-bin/ipinfo.cgi
+++ b/html/cgi-bin/ipinfo.cgi
@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> #
# #
# 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 #
@@ -32,12 +32,16 @@ require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
require "${General::swroot}/location-functions.pl";
+# Load colours for current theme...
+my %color = ();
+my %mainsettings = ();
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+
my %cgiparams=();
&Header::showhttpheaders();
-&Header::openpage($Lang::tr{'ip info'}, 1, '');
-&Header::openbigbox('100%', 'left');
my @lines=();
my $extraquery='';
@@ -57,17 +61,37 @@ my $whois_server = "whois.arin.net";
my $addr = CGI::param("ip") || "";
if (&General::validip($addr)) {
+ # Write HTML page header...
+ &Header::openpage($Lang::tr{'ip info for'} . ' ' . $addr, 1, '');
+ &Header::openbigbox('100%', 'left');
+
my $iaddr = inet_aton($addr);
my $hostname = gethostbyaddr($iaddr, AF_INET);
- if (!$hostname) { $hostname = $Lang::tr{'lookup failed'}; }
+ if (!$hostname) { $hostname = $Lang::tr{'ptr lookup failed'}; }
- # enumerate location information for IP address...
+ # Enumerate location information for IP address...
my $ccode = &Location::Functions::lookup_country_code($addr);
+ my $cname = &Location::Functions::get_full_country_name($ccode);
my @network_flags = &Location::Functions::address_has_flags($addr);
# Try to get the continent of the country code.
my $continent = &Location::Functions::get_continent_code($ccode);
+ # Enumerate Autonomous System details for IP address...
+ my $asn = &Location::Functions::lookup_asn($addr);
+ my $as_name;
+ if ($asn) {
+ $as_name = &Location::Functions::get_as_name($asn);
+
+ # In case we have found an AS name, make output more readable...
+ if ($as_name) {
+ $as_name = "- " . $as_name;
+ }
+ $asn = "AS" . $asn;
+ } else {
+ $asn = $Lang::tr{'asn lookup failed'};
+ }
+
# Check if a whois server for the continent is known.
if($whois_servers_by_continent{$continent}) {
# Use it.
@@ -76,6 +100,62 @@ if (&General::validip($addr)) {
my $flag_icon = &Location::Functions::get_flag_icon($ccode);
+ &Header::openbox('100%', 'left', $Lang::tr{'ip basic info'});
+
+ print <<END;
+ <center>
+ <table class="tbl" width='100%'>
+ <tr>
+ <td bgcolor='$color{'color22'}'><strong>$Lang::tr{'country'}</strong></td>
+ <td bgcolor='$color{'color22'}'>$cname <a href='country.cgi#$ccode'><img src="$flag_icon" border="0" alt="$cname" title="$cname" /></td>
+ </tr>
+ <tr>
+ <td bgcolor='$color{'color20'}'><strong>$Lang::tr{'ptr'}</strong></td>
+ <td bgcolor='$color{'color20'}'>$hostname</td>
+ </tr>
+ <tr>
+ <td bgcolor='$color{'color22'}'><strong>$Lang::tr{'autonomous system'}</strong></td>
+ <td bgcolor='$color{'color22'}'>$asn $as_name</td>
+ </tr>
+END
+
+ # Check if the address has a flag.
+ if (@network_flags) {
+ # Get amount of flags for this network.
+ my $flags_amount = @network_flags;
+ my $processed_flags;
+
+ # Loop through the array of network_flags.
+ foreach my $network_flag (@network_flags) {
+ # Increment value of processed flags.
+ $processed_flags++;
+
+ # Get the network flag name.
+ my $network_flag_name = &Location::Functions::get_full_country_name($network_flag);
+
+ # Colorize columns.
+ my $col;
+ if ($processed_flags % 2) {
+ $col = "bgcolor='$color{'color20'}'"; }
+ else {
+ $col = "bgcolor='$color{'color22'}'";
+ }
+
+ # Write table row...
+ print <<END;
+ <tr>
+ <td $col><strong>$network_flag_name</strong></td>
+ <td $col>$Lang::tr{'yes'}</td>
+ </tr>
+END
+ }
+ }
+
+ print " </table>\n";
+ print " </center>\n";
+
+ &Header::closebox();
+
my $sock = new IO::Socket::INET ( PeerAddr => $whois_server, PeerPort => 43, Proto => 'tcp');
if ($sock)
{
@@ -107,53 +187,7 @@ if (&General::validip($addr)) {
@lines = ( "$Lang::tr{'unable to contact'} $whois_server" );
}
- &Header::openbox('100%', 'left', $addr . " <a href='country.cgi#$ccode'><img src='$flag_icon' border='0' align='absmiddle' alt='$ccode' title='$ccode' /></a> (" . $hostname . ') : '.$whois_server);
-
- # Check if the address has a flag.
- if (@network_flags) {
- # Get amount of flags for this network.
- my $flags_amount = @network_flags;
- my $processed_flags;
-
- # The message string which will be displayed.
- my $message_string = "This address is marked as";
-
- # Loop through the array of network_flags.
- foreach my $network_flag (@network_flags) {
- # Increment value of processed flags.
- $processed_flags++;
-
- # Get the network flag name.
- my $network_flag_name = &Location::Functions::get_full_country_name($network_flag);
-
- # Add the flag name to the message string.
- $message_string = "$message_string" . " $network_flag_name";
-
- # Check if multiple flags are set for this network.
- if ($flags_amount gt "1") {
- # Check if the the current flag is the next-to-last one.
- if ($processed_flags eq $flags_amount - 1) {
- $message_string = "$message_string" . " and ";
-
- # Check if the current flag it the last one.
- } elsif ($processed_flags eq $flags_amount) {
- # The message is finished add a dot for ending the sentence.
- $message_string = "$message_string" . ".";
-
- # Otherwise add a simple comma to the message string.
- } else {
- $message_string = "$message_string" . ", ";
- }
- } else {
- # Nothing special to do, simple add a dot to finish the sentence.
- $message_string = "$message_string" . ".";
- }
- }
-
- # Display the generated notice.
- print "<h3>$message_string</h3>\n";
- print "<br>\n";
- }
+ &Header::openbox('100%', 'left', $Lang::tr{'whois results from'} . " " . $whois_server);
print "<pre>\n";
foreach my $line (@lines) {
@@ -162,6 +196,10 @@ if (&General::validip($addr)) {
print "</pre>\n";
&Header::closebox();
} else {
+ # Open HTML page header in case of invalid IP addresses
+ &Header::openpage($Lang::tr{'ip info'}, 1, '');
+ &Header::openbigbox('100%', 'left');
+
&Header::openbox('100%', 'left', $Lang::tr{'invalid ip'});
print <<EOF;
<p style="text-align: center;">
diff --git a/html/cgi-bin/remote.cgi b/html/cgi-bin/remote.cgi
index a27e10de9..31e4f4085 100644
--- a/html/cgi-bin/remote.cgi
+++ b/html/cgi-bin/remote.cgi
@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> #
# #
# 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 #
@@ -293,7 +293,7 @@ sub printactivelogins()
# get rDNS...
my $iaddr = inet_aton($remoteip);
my $rdns = gethostbyaddr($iaddr, AF_INET);
- if (!$rdns) { $rdns = $Lang::tr{'lookup failed'}; };
+ if (!$rdns) { $rdns = $Lang::tr{'ptr lookup failed'}; };
my $table_colour = ($id++ % 2) ? $color{'color22'} : $color{'color20'};
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 4a2a9e2e0..afd7b9522 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -444,6 +444,7 @@
'are you sure' => 'Sind Sie sicher?',
'arp table entries' => 'Einträge der ARP-Tabelle',
'artist' => 'Künstler',
+'asn lookup failed' => 'AS-Auflösung gescheitert',
'atm device' => 'Device:',
'atm settings' => 'ATM-Einstellungen',
'attemps' => 'Versuche',
@@ -451,6 +452,7 @@
'august' => 'August',
'authentication' => 'Authentifizierung:',
'automatic' => 'Automatisch',
+'autonomous system' => 'Autonomes System',
'available updates' => 'Verfügbare Updates:',
'average' => 'Durchschnitt',
'avoid dod' => 'Benutzen Sie diese Option nicht mit Dial on Demand! Wird hauptsächlich verwendet, wenn Ihr IPFire sich hinter einem Router befindet. Ihre ROTE IP muss sich innerhalb eines der drei reservierten Netzwerkbereiche befinden z.B. 10/8, 172.16/12, 192.168/16.',
@@ -1503,7 +1505,9 @@
'ip alias added' => 'Externer IP-Alias hinzugefügt',
'ip alias changed' => 'Externer IP-Alias geändert',
'ip alias removed' => 'Externer IP-Alias entfernt',
-'ip info' => 'IP-Information',
+'ip basic info' => 'Grundlegende IP-Informationen',
+'ip info' => 'IP-Informationen',
+'ip info for' => 'IP-Informationen für',
'ipfire has now rebooted' => 'IPFire wird neu gestartet.',
'ipfire has now shutdown' => 'IPFire wird heruntergefahren.',
'ipfire side' => 'IPFire Seite:',
@@ -1595,7 +1599,6 @@
'logging server' => 'Protokollierungsserver',
'loginlogout' => 'Login/Logout',
'logs' => 'Protokolldateien',
-'lookup failed' => 'Reverse Lookup gescheitert',
'loosedirectorychecking' => 'Loose directorychecking',
'low' => 'Niedrig',
'ls_dhcpd' => 'DHCP-Server:',
@@ -2068,6 +2071,7 @@
'proxy reports weekly' => 'Wöchentliche Berichte',
'psk' => 'PSK',
'ptr' => 'PTR',
+'ptr lookup failed' => 'Reverse Lookup gescheitert',
'pulse' => 'Puls',
'pulse dial' => 'Pulswahl:',
'qos add subclass' => 'Unterklasse hinzufügen',
@@ -2863,6 +2867,7 @@
'week-graph' => 'Woche',
'weekly firewallhits' => 'wöchentliche Firewalltreffer',
'weeks' => 'Wochen',
+'whois results from' => 'WHOIS-Ergebnisse von',
'wildcards' => 'Wildcards',
'wins server' => 'WINS-Server',
'wins support' => 'WINS-Support',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 1151da08d..8e293d5c1 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -443,6 +443,7 @@
'are you sure' => 'Are you sure?',
'arp table entries' => 'ARP Table Entries',
'artist' => 'Artist',
+'asn lookup failed' => 'AS lookup failed',
'atm device' => 'Device:',
'atm settings' => 'ATM settings',
'attemps' => 'Attempts',
@@ -450,6 +451,7 @@
'august' => 'August',
'authentication' => 'Authentication:',
'automatic' => 'Automatic',
+'autonomous system' => 'Autonomous System',
'available updates' => 'Available updates:',
'average' => 'Average',
'avoid dod' => 'Do not use this option with Dial on Demand! Mainly used if your IPFire is behind a router. Your RED IP must be inside one of the three reserved network numbers e.g. 10/8, 172.16/12, 192.168/16',
@@ -1531,7 +1533,8 @@
'ip alias added' => 'External IP alias added',
'ip alias changed' => 'External IP alias changed',
'ip alias removed' => 'External IP alias removed',
-'ip info' => 'IP Information',
+'ip basic info' => 'Basic IP information',
+'ip info' => 'IP information for',
'ipfire has now rebooted' => 'IPFire is rebooting now.',
'ipfire has now shutdown' => 'IPFire is shutting down now.',
'ipfire side' => 'IPFire side:',
@@ -1623,7 +1626,6 @@
'logging server' => 'Logging Server',
'loginlogout' => 'Login/Logout',
'logs' => 'logs',
-'lookup failed' => 'Reverse lookup failed',
'loosedirectorychecking' => 'Loosedirectorychecking',
'low' => 'Low',
'ls_dhcpd' => 'DHCP Server:',
@@ -2099,6 +2101,7 @@
'proxy reports weekly' => 'Weekly reports',
'psk' => 'PSK',
'ptr' => 'PTR',
+'ptr lookup failed' => 'Reverse lookup failed',
'pulse' => 'Pulse',
'pulse dial' => 'Pulse dial:',
'qos add subclass' => 'Add subclass',
@@ -2907,6 +2910,7 @@
'week-graph' => 'Week',
'weekly firewallhits' => 'weekly firewallhits',
'weeks' => 'Weeks',
+'whois results from' => 'WHOIS results from',
'wildcards' => 'Wildcards',
'winbind daemon' => 'Winbind Daemon',
'wins server' => 'Wins Server',
diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index ae155d26b..93a15bba0 100644
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -1096,7 +1096,6 @@
'logging server' => 'Servidor de conexión',
'loginlogout' => 'Login/Logout',
'logs' => 'registros',
-'lookup failed' => 'Falló la búsqueda reversiva',
'loosedirectorychecking' => 'Chequeo de loosedirectory',
'low' => 'Bajo',
'ls_dhcpd' => 'Servidor DHCP:',
@@ -1450,6 +1449,7 @@
'proxy port' => 'Puerto de proxy',
'proxy reconfigure' => 'Grabar y Recargar',
'psk' => 'PSK',
+'ptr lookup failed' => 'Falló la búsqueda reversiva',
'pulse' => 'Pulso',
'pulse dial' => 'Marcaro por pulsos:',
'qos add subclass' => 'Añadir subclase',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index b5232db8c..a2d27939c 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -1627,7 +1627,6 @@
'logging server' => 'Serveur de connexion',
'loginlogout' => 'Connexion/Quitter',
'logs' => 'Journaux',
-'lookup failed' => 'La recherche inversée a échouée',
'loosedirectorychecking' => 'Echec de la vérification du répertoire',
'low' => 'Bas',
'ls_dhcpd' => 'Serveur DHCP :',
@@ -2105,6 +2104,7 @@
'proxy reports weekly' => 'Rapports hebdomadaires',
'psk' => 'PSK',
'ptr' => 'PTR',
+'ptr lookup failed' => 'La recherche inversée a échouée',
'pulse' => 'Impulsion',
'pulse dial' => 'Numérotation par impulsions :',
'qos add subclass' => 'Ajouter une sous-classe',
diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl
index ada8887ac..14436de4b 100644
--- a/langs/it/cgi-bin/it.pl
+++ b/langs/it/cgi-bin/it.pl
@@ -1409,7 +1409,6 @@
'logging server' => 'Logging Server',
'loginlogout' => 'Login/Logout',
'logs' => 'Gestione Log',
-'lookup failed' => 'Reverse lookup failed',
'loosedirectorychecking' => 'Loosedirectorychecking',
'low' => 'Basso',
'ls_dhcpd' => 'DHCP Server:',
@@ -1844,6 +1843,7 @@
'proxy reports today' => 'Oggi',
'proxy reports weekly' => 'Weekly reports',
'psk' => 'PSK',
+'ptr lookup failed' => 'Reverse lookup failed',
'pulse' => 'Pulse',
'pulse dial' => 'Pulse dial:',
'qos add subclass' => 'Add subclass',
diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl
index bbd5a3f3d..53341a6f8 100644
--- a/langs/nl/cgi-bin/nl.pl
+++ b/langs/nl/cgi-bin/nl.pl
@@ -1389,7 +1389,6 @@
'logging server' => 'Loggingserver',
'loginlogout' => 'Login/Logout',
'logs' => 'logs',
-'lookup failed' => 'Reverse lookup mislukt',
'loosedirectorychecking' => 'Loosedirectorychecking',
'low' => 'Laag',
'ls_dhcpd' => 'DHCP Server:',
@@ -1798,6 +1797,7 @@
'proxy reports today' => 'Vandaag',
'proxy reports weekly' => 'Wekelijkse rapporten',
'psk' => 'PSK',
+'ptr lookup failed' => 'Reverse lookup mislukt',
'pulse' => 'Puls',
'pulse dial' => 'Pulskiezen:',
'qos add subclass' => 'Voeg sub-klasse toe',
diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl
index e85173021..63c8a1793 100644
--- a/langs/pl/cgi-bin/pl.pl
+++ b/langs/pl/cgi-bin/pl.pl
@@ -1095,7 +1095,6 @@
'logging server' => 'Serwer logowania',
'loginlogout' => 'Zalogowanie/wylogowanie',
'logs' => 'logi',
-'lookup failed' => 'Reverse lookup failed',
'loosedirectorychecking' => 'Loosedirectorychecking',
'low' => 'Niski',
'ls_dhcpd' => 'Serwer DHCP:',
@@ -1462,6 +1461,7 @@
'proxy port' => 'Port Proxy',
'proxy reconfigure' => 'Zapisz i zładuj',
'psk' => 'PSK',
+'ptr lookup failed' => 'Reverse lookup failed',
'pulse' => 'Pulse',
'pulse dial' => 'Pulse dial:',
'qos add subclass' => 'Dodaj podklasę',
diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl
index 371394474..4f69dc47a 100644
--- a/langs/ru/cgi-bin/ru.pl
+++ b/langs/ru/cgi-bin/ru.pl
@@ -1088,7 +1088,6 @@
'logging server' => 'Сервер Логов',
'loginlogout' => 'Login/Logout',
'logs' => 'Логи',
-'lookup failed' => 'Reverse lookup failed',
'loosedirectorychecking' => 'Loosedirectorychecking',
'low' => 'Low',
'ls_dhcpd' => 'DHCP сервер:',
@@ -1457,6 +1456,7 @@
'proxy port' => 'Порт Proxy',
'proxy reconfigure' => 'Сохранить и перезапустить',
'psk' => 'PSK',
+'ptr lookup failed' => 'Reverse lookup failed',
'pulse' => 'Импульсный',
'pulse dial' => 'Импульсный набор:',
'qos add subclass' => 'Добавить подкласс',
diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl
index da868a312..34e8bdcf7 100644
--- a/langs/tr/cgi-bin/tr.pl
+++ b/langs/tr/cgi-bin/tr.pl
@@ -1539,7 +1539,6 @@
'logging server' => 'Günlük Sunucusu',
'loginlogout' => 'Giriş/Çıkış',
'logs' => 'Günlükler',
-'lookup failed' => 'Ters arama başarısız',
'loosedirectorychecking' => 'Serbest Dizin Denetimi',
'low' => 'Düşük',
'ls_dhcpd' => 'DHCP Sunucusu:',
@@ -1992,6 +1991,7 @@
'proxy reports today' => 'Bugün',
'proxy reports weekly' => 'Haftalık rapor',
'psk' => 'PSK',
+'ptr lookup failed' => 'Ters arama başarısız',
'pulse' => 'Darbe',
'pulse dial' => 'Darbeli arama:',
'qos add subclass' => 'Alt sınıf ekle',
diff --git a/lfs/spectre-meltdown-checker b/lfs/spectre-meltdown-checker
index 2bf34f590..063ef727e 100644
--- a/lfs/spectre-meltdown-checker
+++ b/lfs/spectre-meltdown-checker
@@ -24,7 +24,7 @@
include Config
-VER = 0.43
+VER = 0.44
THISAPP = spectre-meltdown-checker-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = spectre-meltdown-checker
-PAK_VER = 4
+PAK_VER = 5
DEPS =
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 05cd2e53edbdcccfc072a66fafa4ea38
+$(DL_FILE)_MD5 = 7bfa5b00ce9dc9400887b9bbb9748a22
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-11-11 18:31 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-11 18:31 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1ba481b3f4d9e31a8d02cdec447e7bff12631318 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox