From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. b0b6367633f5bd75818e10ecd0f121988a7765ff Date: Wed, 29 Nov 2017 12:07:53 +0000 Message-ID: <20171129120754.088F31081BCF@git01.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6179531029544316451==" List-Id: --===============6179531029544316451== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 b0b6367633f5bd75818e10ecd0f121988a7765ff (commit) via 297110d460e4b91cd15877cd5fe0fe64a27c6c33 (commit) via 2aec53386a363ecc155316d25c0660027843cb37 (commit) via 5b4be0f18fd2f83dd5a5f29a18a4aa03fc70a020 (commit) via a7fd6293ef36ee8c4076f3cc414fb6fc853bf479 (commit) via e15d5f25c6af51b9bd1c1e1cf757eab22c113759 (commit) via fb6446d2920bf763b9fa83062157aa103a3d24a7 (commit) via 877caaf5c6e0ad0a0c4714d85843ad1970de5e80 (commit) via f62c07033c83261f7a367b547722ef503fba2f16 (commit) via d49f6fdca9e4a52ad32bf45033ec0d6afd7d460b (commit) via 545ddb9360d9d19e4feaf3d1703d2e28c03503d1 (commit) via 7f7b7b24b02a2351266281a8c3d1f91e4b16689a (commit) via 0545cba708080afc0f991f1051a4d47b93231257 (commit) via 6bd3a13121c8087bc2062ab9999c3c6fc5f12727 (commit) from e5af95135bb9b34e37e11c97abdd64449b7313ce (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 b0b6367633f5bd75818e10ecd0f121988a7765ff Author: Michael Tremer Date: Wed Nov 29 12:06:01 2017 +0000 core117: Ship updated netexternal.cgi =20 Signed-off-by: Michael Tremer commit 297110d460e4b91cd15877cd5fe0fe64a27c6c33 Author: Peter M=C3=BCller Date: Wed Nov 15 22:49:00 2017 +0100 add GeoIP and rDNS information to used nameservers =20 Add GeoIP and rDNS information to DNS nameserver list at netexternal.cgi =20 Use newly implemented GeoIP function in /var/ipfire/geoip-functions.pl =20 Signed-off-by: Peter M=C3=BCller Signed-off-by: Michael Tremer commit 2aec53386a363ecc155316d25c0660027843cb37 Author: Michael Tremer Date: Wed Nov 29 12:04:05 2017 +0000 core117: Ship updated ids.dat =20 Signed-off-by: Michael Tremer commit 5b4be0f18fd2f83dd5a5f29a18a4aa03fc70a020 Author: Peter M=C3=BCller Date: Tue Nov 21 20:27:45 2017 +0100 show IDS rule names correctly in WebUI log =20 The WebUI IDS log did not display the rule name for alerts where a signature with a five digit number was triggered (some Emerging Threats signatures are using them). =20 Changing the regular expression so it will match on five digit SIDs, too. =20 Fixes #11519. =20 Signed-off-by: Peter M=C3=BCller Signed-off-by: Michael Tremer commit a7fd6293ef36ee8c4076f3cc414fb6fc853bf479 Author: Michael Tremer Date: Wed Nov 29 12:02:50 2017 +0000 core117: Ship updated index.cgi =20 Signed-off-by: Michael Tremer commit e15d5f25c6af51b9bd1c1e1cf757eab22c113759 Author: Peter M=C3=BCller Date: Fri Nov 24 20:28:02 2017 +0100 link to DNS server status page on index.cgi =20 Show a link to the DNS server status at netexternal.cgi on index.cgi in WebUI. =20 For the lazy ones... :-) =20 Signed-off-by: Peter M=C3=BCller Signed-off-by: Michael Tremer commit fb6446d2920bf763b9fa83062157aa103a3d24a7 Author: Peter M=C3=BCller Date: Fri Nov 24 20:32:55 2017 +0100 correct wrong headline at hardwaregraphs.cgi =20 The page description (title and headline) should print "hardware graphs" instead of only mentioning HDDs. =20 Signed-off-by: Peter M=C3=BCller Signed-off-by: Michael Tremer commit 877caaf5c6e0ad0a0c4714d85843ad1970de5e80 Author: Michael Tremer Date: Wed Nov 29 12:00:33 2017 +0000 core117: Ship updated netother.cgi =20 Signed-off-by: Michael Tremer commit f62c07033c83261f7a367b547722ef503fba2f16 Author: Michael Tremer Date: Wed Nov 29 12:00:13 2017 +0000 Update translations =20 Signed-off-by: Michael Tremer commit d49f6fdca9e4a52ad32bf45033ec0d6afd7d460b Author: Peter M=C3=BCller Date: Fri Nov 24 20:39:34 2017 +0100 translate 'firewall hits' at netother.cgi =20 Also translate 'firewall hits' at the network status (other) page in WebUI. =20 Signed-off-by: Peter M=C3=BCller Signed-off-by: Michael Tremer commit 545ddb9360d9d19e4feaf3d1703d2e28c03503d1 Author: Michael Tremer Date: Wed Nov 29 11:59:08 2017 +0000 core117: Ship updated credits.cgi =20 Signed-off-by: Michael Tremer commit 7f7b7b24b02a2351266281a8c3d1f91e4b16689a Author: Peter M=C3=BCller Date: Tue Nov 28 20:41:53 2017 +0100 update links to www.ipfire.org at credits.cgi =20 The links to the IPFire homepage in the credits.cgi file should point to the HTTPS version of the site now. =20 Signed-off-by: Peter M=C3=BCller Signed-off-by: Michael Tremer commit 0545cba708080afc0f991f1051a4d47b93231257 Author: Michael Tremer Date: Wed Nov 29 11:57:37 2017 +0000 captive: Escape any special characters in title on PDF vouchers =20 Signed-off-by: Michael Tremer commit 6bd3a13121c8087bc2062ab9999c3c6fc5f12727 Author: Michael Tremer Date: Wed Nov 29 11:54:37 2017 +0000 make.sh: Create /tools_${arch} link only when building a toolchain =20 Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/117/filelists/files | 6 ++++++ doc/language_issues.de | 1 + doc/language_issues.en | 1 + doc/language_issues.es | 6 ++++++ doc/language_issues.fr | 6 ++++++ doc/language_issues.it | 6 ++++++ doc/language_issues.nl | 6 ++++++ doc/language_issues.pl | 6 ++++++ doc/language_issues.ru | 6 ++++++ doc/language_issues.tr | 6 ++++++ doc/language_missings | 20 ++++++++++++++++++++ html/cgi-bin/captive.cgi | 2 +- html/cgi-bin/credits.cgi | 4 ++-- html/cgi-bin/hardwaregraphs.cgi | 2 +- html/cgi-bin/index.cgi | 2 +- html/cgi-bin/logs.cgi/ids.dat | 2 +- html/cgi-bin/netexternal.cgi | 27 ++++++++++++++++++++++++++- html/cgi-bin/netother.cgi | 2 +- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + make.sh | 26 +++++++++++++------------- 21 files changed, 118 insertions(+), 21 deletions(-) Difference in files: diff --git a/config/rootfiles/core/117/filelists/files b/config/rootfiles/cor= e/117/filelists/files index eafb9f1..b3e570a 100644 --- a/config/rootfiles/core/117/filelists/files +++ b/config/rootfiles/core/117/filelists/files @@ -5,12 +5,18 @@ etc/rc.d/init.d/apache etc/ssl/certs/ca-bundle.crt etc/ssl/certs/ca-bundle.trust.crt opt/pakfire/lib/functions.pl +srv/web/ipfire/cgi-bin/captive.cgi srv/web/ipfire/cgi-bin/country.cgi +srv/web/ipfire/cgi-bin/credits.cgi +srv/web/ipfire/cgi-bin/index.cgi srv/web/ipfire/cgi-bin/logs.cgi/config.dat srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat +srv/web/ipfire/cgi-bin/logs.cgi/ids.dat srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat +srv/web/ipfire/cgi-bin/netexternal.cgi +srv/web/ipfire/cgi-bin/netother.cgi srv/web/ipfire/cgi-bin/routing.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/html/themes/darkdos/include/functions.pl diff --git a/doc/language_issues.de b/doc/language_issues.de index 0443130..0c7f36f 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -295,6 +295,7 @@ WARNING: translation string unused: geoipblock country na= me WARNING: translation string unused: geoipblock flag WARNING: translation string unused: green interface WARNING: translation string unused: gz with key +WARNING: translation string unused: harddisk temperature graphs WARNING: translation string unused: hint WARNING: translation string unused: host WARNING: translation string unused: host configuration diff --git a/doc/language_issues.en b/doc/language_issues.en index eebb5d6..48a85d0 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -321,6 +321,7 @@ WARNING: translation string unused: geoipblock country na= me WARNING: translation string unused: geoipblock flag WARNING: translation string unused: green interface WARNING: translation string unused: gz with key +WARNING: translation string unused: harddisk temperature graphs WARNING: translation string unused: hint WARNING: translation string unused: host WARNING: translation string unused: host configuration diff --git a/doc/language_issues.es b/doc/language_issues.es index 4ade5d5..f030fda 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -245,6 +245,7 @@ WARNING: translation string unused: geoipblock country na= me WARNING: translation string unused: geoipblock flag WARNING: translation string unused: green interface WARNING: translation string unused: gz with key +WARNING: translation string unused: harddisk temperature graphs WARNING: translation string unused: hint WARNING: translation string unused: host WARNING: translation string unused: host configuration @@ -1020,11 +1021,13 @@ WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout WARNING: untranslated string: invalid input for valid till days +WARNING: untranslated string: invalid logserver protocol WARNING: untranslated string: ipsec WARNING: untranslated string: ipsec network WARNING: untranslated string: last WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime +WARNING: untranslated string: log server protocol WARNING: untranslated string: mac filter WARNING: untranslated string: masquerade blue WARNING: untranslated string: masquerade green @@ -1112,6 +1115,7 @@ WARNING: untranslated string: proxy reports today WARNING: untranslated string: proxy reports weekly WARNING: untranslated string: qos enter bandwidths WARNING: untranslated string: random number generator daemon +WARNING: untranslated string: rdns WARNING: untranslated string: red1 WARNING: untranslated string: required field WARNING: untranslated string: route config changed @@ -1134,6 +1138,7 @@ WARNING: untranslated string: system has hwrng WARNING: untranslated string: system has rdrand WARNING: untranslated string: system information WARNING: untranslated string: ta key +WARNING: untranslated string: tcp more reliable WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes @@ -1184,6 +1189,7 @@ WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes WARNING: untranslated string: twelve hours WARNING: untranslated string: two weeks +WARNING: untranslated string: udp less overhead WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all diff --git a/doc/language_issues.fr b/doc/language_issues.fr index eae0337..2c5fc31 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -243,6 +243,7 @@ WARNING: translation string unused: generatereport WARNING: translation string unused: genkey WARNING: translation string unused: green interface WARNING: translation string unused: gz with key +WARNING: translation string unused: harddisk temperature graphs WARNING: translation string unused: hint WARNING: translation string unused: host WARNING: translation string unused: host configuration @@ -1036,11 +1037,13 @@ WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout WARNING: untranslated string: invalid input for valid till days +WARNING: untranslated string: invalid logserver protocol WARNING: untranslated string: ipsec WARNING: untranslated string: ipsec network WARNING: untranslated string: last WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime +WARNING: untranslated string: log server protocol WARNING: untranslated string: mac filter WARNING: untranslated string: masquerade blue WARNING: untranslated string: masquerade green @@ -1124,6 +1127,7 @@ WARNING: untranslated string: proxy reports today WARNING: untranslated string: proxy reports weekly WARNING: untranslated string: qos enter bandwidths WARNING: untranslated string: random number generator daemon +WARNING: untranslated string: rdns WARNING: untranslated string: red1 WARNING: untranslated string: required field WARNING: untranslated string: route config changed @@ -1147,6 +1151,7 @@ WARNING: untranslated string: system has hwrng WARNING: untranslated string: system has rdrand WARNING: untranslated string: system information WARNING: untranslated string: ta key +WARNING: untranslated string: tcp more reliable WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes @@ -1197,6 +1202,7 @@ WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes WARNING: untranslated string: twelve hours WARNING: untranslated string: two weeks +WARNING: untranslated string: udp less overhead WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all diff --git a/doc/language_issues.it b/doc/language_issues.it index 13508b6..805bc12 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -293,6 +293,7 @@ WARNING: translation string unused: generatereport WARNING: translation string unused: genkey WARNING: translation string unused: green interface WARNING: translation string unused: gz with key +WARNING: translation string unused: harddisk temperature graphs WARNING: translation string unused: hint WARNING: translation string unused: host WARNING: translation string unused: host configuration @@ -837,6 +838,8 @@ WARNING: untranslated string: incoming compression in byt= es per second WARNING: untranslated string: incoming overhead in bytes per second WARNING: untranslated string: info messages WARNING: untranslated string: invalid input for valid till days +WARNING: untranslated string: invalid logserver protocol +WARNING: untranslated string: log server protocol WARNING: untranslated string: masquerade blue WARNING: untranslated string: masquerade green WARNING: untranslated string: masquerade orange @@ -856,6 +859,7 @@ WARNING: untranslated string: ovpn add conf WARNING: untranslated string: pptp netconfig WARNING: untranslated string: pptp peer WARNING: untranslated string: pptp route +WARNING: untranslated string: rdns WARNING: untranslated string: required field WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added @@ -864,8 +868,10 @@ WARNING: untranslated string: routing table WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join domain WARNING: untranslated string: search +WARNING: untranslated string: tcp more reliable WARNING: untranslated string: twelve hours WARNING: untranslated string: two weeks +WARNING: untranslated string: udp less overhead WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 74590a2..6567084 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -292,6 +292,7 @@ WARNING: translation string unused: generatereport WARNING: translation string unused: genkey WARNING: translation string unused: green interface WARNING: translation string unused: gz with key +WARNING: translation string unused: harddisk temperature graphs WARNING: translation string unused: hint WARNING: translation string unused: host WARNING: translation string unused: host configuration @@ -853,6 +854,8 @@ WARNING: untranslated string: incoming compression in byt= es per second WARNING: untranslated string: incoming overhead in bytes per second WARNING: untranslated string: info messages WARNING: untranslated string: invalid input for valid till days +WARNING: untranslated string: invalid logserver protocol +WARNING: untranslated string: log server protocol WARNING: untranslated string: masquerade blue WARNING: untranslated string: masquerade green WARNING: untranslated string: masquerade orange @@ -897,6 +900,7 @@ WARNING: untranslated string: pptp netconfig WARNING: untranslated string: pptp peer WARNING: untranslated string: pptp route WARNING: untranslated string: random number generator daemon +WARNING: untranslated string: rdns WARNING: untranslated string: required field WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added @@ -910,8 +914,10 @@ WARNING: untranslated string: show tls-auth key WARNING: untranslated string: software version WARNING: untranslated string: source ip country WARNING: untranslated string: ta key +WARNING: untranslated string: tcp more reliable WARNING: untranslated string: twelve hours WARNING: untranslated string: two weeks +WARNING: untranslated string: udp less overhead WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 4ade5d5..f030fda 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -245,6 +245,7 @@ WARNING: translation string unused: geoipblock country na= me WARNING: translation string unused: geoipblock flag WARNING: translation string unused: green interface WARNING: translation string unused: gz with key +WARNING: translation string unused: harddisk temperature graphs WARNING: translation string unused: hint WARNING: translation string unused: host WARNING: translation string unused: host configuration @@ -1020,11 +1021,13 @@ WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout WARNING: untranslated string: invalid input for valid till days +WARNING: untranslated string: invalid logserver protocol WARNING: untranslated string: ipsec WARNING: untranslated string: ipsec network WARNING: untranslated string: last WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime +WARNING: untranslated string: log server protocol WARNING: untranslated string: mac filter WARNING: untranslated string: masquerade blue WARNING: untranslated string: masquerade green @@ -1112,6 +1115,7 @@ WARNING: untranslated string: proxy reports today WARNING: untranslated string: proxy reports weekly WARNING: untranslated string: qos enter bandwidths WARNING: untranslated string: random number generator daemon +WARNING: untranslated string: rdns WARNING: untranslated string: red1 WARNING: untranslated string: required field WARNING: untranslated string: route config changed @@ -1134,6 +1138,7 @@ WARNING: untranslated string: system has hwrng WARNING: untranslated string: system has rdrand WARNING: untranslated string: system information WARNING: untranslated string: ta key +WARNING: untranslated string: tcp more reliable WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes @@ -1184,6 +1189,7 @@ WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes WARNING: untranslated string: twelve hours WARNING: untranslated string: two weeks +WARNING: untranslated string: udp less overhead WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 6468d5f..68e7b93 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -239,6 +239,7 @@ WARNING: translation string unused: generatereport WARNING: translation string unused: genkey WARNING: translation string unused: green interface WARNING: translation string unused: gz with key +WARNING: translation string unused: harddisk temperature graphs WARNING: translation string unused: hint WARNING: translation string unused: host WARNING: translation string unused: host configuration @@ -1022,11 +1023,13 @@ WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout WARNING: untranslated string: invalid input for valid till days +WARNING: untranslated string: invalid logserver protocol WARNING: untranslated string: ipsec WARNING: untranslated string: ipsec network WARNING: untranslated string: last WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime +WARNING: untranslated string: log server protocol WARNING: untranslated string: mac filter WARNING: untranslated string: masquerade blue WARNING: untranslated string: masquerade green @@ -1108,6 +1111,7 @@ WARNING: untranslated string: proxy reports today WARNING: untranslated string: proxy reports weekly WARNING: untranslated string: qos enter bandwidths WARNING: untranslated string: random number generator daemon +WARNING: untranslated string: rdns WARNING: untranslated string: red1 WARNING: untranslated string: required field WARNING: untranslated string: route config changed @@ -1129,6 +1133,7 @@ WARNING: untranslated string: support donation WARNING: untranslated string: system has hwrng WARNING: untranslated string: system has rdrand WARNING: untranslated string: ta key +WARNING: untranslated string: tcp more reliable WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes @@ -1179,6 +1184,7 @@ WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes WARNING: untranslated string: twelve hours WARNING: untranslated string: two weeks +WARNING: untranslated string: udp less overhead WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all diff --git a/doc/language_issues.tr b/doc/language_issues.tr index ade6c89..b4f6279 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -301,6 +301,7 @@ WARNING: translation string unused: geoipblock country na= me WARNING: translation string unused: geoipblock flag WARNING: translation string unused: green interface WARNING: translation string unused: gz with key +WARNING: translation string unused: harddisk temperature graphs WARNING: translation string unused: hint WARNING: translation string unused: host WARNING: translation string unused: host configuration @@ -792,17 +793,22 @@ WARNING: untranslated string: guardian service WARNING: untranslated string: guardian watch snort alertfile WARNING: untranslated string: ike lifetime should be between 1 and 8 hours WARNING: untranslated string: info messages +WARNING: untranslated string: invalid logserver protocol +WARNING: untranslated string: log server protocol WARNING: untranslated string: no data WARNING: untranslated string: one hour WARNING: untranslated string: one month WARNING: untranslated string: one week WARNING: untranslated string: one year +WARNING: untranslated string: rdns WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: tcp more reliable WARNING: untranslated string: twelve hours WARNING: untranslated string: two weeks +WARNING: untranslated string: udp less overhead WARNING: untranslated string: unlimited WARNING: untranslated string: uplink bit rate WARNING: untranslated string: vpn broken diff --git a/doc/language_missings b/doc/language_missings index 2fc918c..80ea6a6 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -449,12 +449,14 @@ < invalid input for dpd delay < invalid input for dpd timeout < invalid input for valid till days +< invalid logserver protocol < ipsec < ipsec network < ipsec no connections < last < least preferred < lifetime +< log server protocol < mac filter < masquerade blue < masquerade green @@ -542,6 +544,7 @@ < proxy reports weekly < qos enter bandwidths < random number generator daemon +< rdns < red1 < required field < samba join a domain @@ -560,6 +563,7 @@ < system has rdrand < system information < ta key +< tcp more reliable < tor < tor 0 =3D disabled < tor accounting @@ -615,6 +619,7 @@ < tor use exit nodes < twelve hours < two weeks +< udp less overhead < unblock < unblock all < uncheck all @@ -1140,12 +1145,14 @@ < invalid input for dpd delay < invalid input for dpd timeout < invalid input for valid till days +< invalid logserver protocol < ipsec < ipsec network < ipsec no connections < last < least preferred < lifetime +< log server protocol < mac filter < masquerade blue < masquerade green @@ -1249,6 +1256,7 @@ < proxy reports weekly < qos enter bandwidths < random number generator daemon +< rdns < red1 < required field < samba join a domain @@ -1267,6 +1275,7 @@ < system has rdrand < system information < ta key +< tcp more reliable < tor < tor 0 =3D disabled < tor accounting @@ -1322,6 +1331,7 @@ < tor use exit nodes < twelve hours < two weeks +< udp less overhead < unblock < unblock all < uncheck all @@ -1826,12 +1836,14 @@ < invalid input for dpd delay < invalid input for dpd timeout < invalid input for valid till days +< invalid logserver protocol < ipsec < ipsec network < ipsec no connections < last < least preferred < lifetime +< log server protocol < mac filter < masquerade blue < masquerade green @@ -1921,6 +1933,7 @@ < proxy reports weekly < qos enter bandwidths < random number generator daemon +< rdns < red1 < required field < samba join a domain @@ -1937,6 +1950,7 @@ < system has hwrng < system has rdrand < ta key +< tcp more reliable < tor < tor 0 =3D disabled < tor accounting @@ -1992,6 +2006,7 @@ < tor use exit nodes < twelve hours < two weeks +< udp less overhead < unblock < unblock all < uncheck all @@ -2503,12 +2518,14 @@ < invalid input for dpd delay < invalid input for dpd timeout < invalid input for valid till days +< invalid logserver protocol < ipsec < ipsec network < ipsec no connections < last < least preferred < lifetime +< log server protocol < mac filter < masquerade blue < masquerade green @@ -2596,6 +2613,7 @@ < proxy reports weekly < qos enter bandwidths < random number generator daemon +< rdns < red1 < required field < samba join a domain @@ -2612,6 +2630,7 @@ < system has hwrng < system has rdrand < ta key +< tcp more reliable < tor < tor 0 =3D disabled < tor accounting @@ -2667,6 +2686,7 @@ < tor use exit nodes < twelve hours < two weeks +< udp less overhead < unblock < unblock all < uncheck all diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi index 113c29f..f3bb28c 100755 --- a/html/cgi-bin/captive.cgi +++ b/html/cgi-bin/captive.cgi @@ -757,7 +757,7 @@ sub generate_pdf() { $f_subheadline->translate($cx, ($y + $h - $cy) / 2.4 + $cy); =20 if ($settings{'TITLE'}) { - $f_headline->text_center($settings{'TITLE'}); + $f_headline->text_center(decode("utf8", $settings{'TITLE'})); $f_subheadline->text_center(decode("utf8", $Lang::tr{'Captive WiFi coupo= n'})); } else { $f_headline->text_center(decode("utf8", $Lang::tr{'Captive WiFi coupon'}= )); diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index f370e80..7cda402 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -41,7 +41,7 @@ print <$Lang::tr{'donation-text'}

=20 @@ -54,7 +54,7 @@ END print <
- $Lang::tr{'visit us at'}: http://www.ipfire.org/ + $Lang::tr{'visit us at'}: https://www.ipfire.org/


=20 diff --git a/html/cgi-bin/hardwaregraphs.cgi b/html/cgi-bin/hardwaregraphs.cgi index 7b5a848..f5999c8 100644 --- a/html/cgi-bin/hardwaregraphs.cgi +++ b/html/cgi-bin/hardwaregraphs.cgi @@ -73,7 +73,7 @@ if ( $querry[0] =3D~ "hwtemp"){ &Graphs::updatehddgraph($querry[0],$querry[1]); }else{ &Header::showhttpheaders(); - &Header::openpage($Lang::tr{'harddisk temperature graphs'}, 1, ''); + &Header::openpage($Lang::tr{'hardware graphs'}, 1, ''); &Header::openbigbox('100%', 'left'); =20 &Header::getcgihash(\%sensorsettings); diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 6ba345d..ea91e0c 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -210,7 +210,7 @@ END print < - $Lang::tr{'dns servers'}: + $Lang::tr{'dns servers'}: $dns_servers diff --git a/html/cgi-bin/logs.cgi/ids.dat b/html/cgi-bin/logs.cgi/ids.dat index 44b3abd..98176d6 100644 --- a/html/cgi-bin/logs.cgi/ids.dat +++ b/html/cgi-bin/logs.cgi/ids.dat @@ -387,7 +387,7 @@ sub processevent } ($title,$classification,$priority,$date,$time,$srcip,$srcport,$destip,$d= estport, $sid) =3D ("n/a","n/a","n/a","n/a","n/a","n/a","n/a","n/a","n/a", "n= /a"); @refs =3D (); - $_ =3D~ m/:([0-9]{1,4})\] (.*) \[\*\*\]/; + $_ =3D~ m/:([0-9]{1,5})\] (.*) \[\*\*\]/; $title =3D &Header::cleanhtml($2,"y"); } if ($_ =3D~ m/Classification: (.*)\] \[Priority: (\d)\]/) { diff --git a/html/cgi-bin/netexternal.cgi b/html/cgi-bin/netexternal.cgi index 299612d..4393393 100644 --- a/html/cgi-bin/netexternal.cgi +++ b/html/cgi-bin/netexternal.cgi @@ -25,9 +25,12 @@ use strict; #use warnings; #use CGI::Carp 'fatalsToBrowser'; =20 +use IO::Socket; + require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; +require "${General::swroot}/geoip-functions.pl"; require "${General::swroot}/graphs.pl"; =20 my %color =3D (); @@ -99,6 +102,12 @@ if ( $querry[0] ne~ ""){ $Lang::tr{'nameserver'} + $Lang::tr{'country'} + + + $Lang::tr{'rdns'} + + $Lang::tr{'status'} @@ -139,9 +148,25 @@ END =20 my $table_colour =3D ($id++ % 2) ? $color{'color22'} : $color{'color20'}; =20 + # collect more information about name server (rDNS, GeoIP country code) + my $ccode =3D &GeoIP::lookup($nameserver); + my $flag_icon =3D &GeoIP::get_flag_icon($ccode); + + my $iaddr =3D inet_aton($nameserver); + my $rdns =3D gethostbyaddr($iaddr, AF_INET); + if (!$rdns) { $rdns =3D $Lang::tr{'lookup failed'}; } + print < - $nameserver + + $nameserver + + + =3D"$ccode" + + + $rdns + $message diff --git a/html/cgi-bin/netother.cgi b/html/cgi-bin/netother.cgi index 1809abf..dde1b60 100644 --- a/html/cgi-bin/netother.cgi +++ b/html/cgi-bin/netother.cgi @@ -67,7 +67,7 @@ if ( $querry[0] =3D~ "fwhits"){ &Header::closebox(); } =20 - &Header::openbox('100%', 'center', "Firewall Hits $Lang::tr{'graph'}"); + &Header::openbox('100%', 'center', "$Lang::tr{'firewallhits'} $Lang::tr{'gr= aph'}"); &Graphs::makegraphbox("netother.cgi","fwhits","day"); &Header::closebox(); =20 diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 672b965..92bf6f8 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1961,6 +1961,7 @@ 'quick playlist' =3D> 'Quick Playlist', 'ram' =3D> 'RAM-Speicher', 'random number generator daemon' =3D> 'Random Number Generator Daemon', +'rdns' =3D> 'rDNS', 'read bytes' =3D> 'Gelesene Bytes', 'read list' =3D> 'Liste der Leseberechtigten', 'real address' =3D> 'Reale Addresse', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index b3120dc..44696f8 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1999,6 +1999,7 @@ 'quick playlist' =3D> 'Quick Playlist', 'ram' =3D> 'RAM', 'random number generator daemon' =3D> 'Random Number Generator Daemon', +'rdns' =3D> 'rDNS', 'read bytes' =3D> 'Read Bytes', 'read list' =3D> 'list with readonly hosts', 'real address' =3D> 'Real Address', diff --git a/make.sh b/make.sh index 5f619d3..87125c0 100755 --- a/make.sh +++ b/make.sh @@ -433,19 +433,6 @@ prepareenv() { # Set LFS Directory LFS=3D$BASEDIR/build =20 - # Check ${TOOLS_DIR} symlink - if [ -h "${TOOLS_DIR}" ]; then - rm -f "${TOOLS_DIR}" - fi - - if [ ! -e "${TOOLS_DIR}" ]; then - ln -s "${BASEDIR}/build${TOOLS_DIR}" "${TOOLS_DIR}" - fi - - if [ ! -h "${TOOLS_DIR}" ]; then - exiterror "Could not create ${TOOLS_DIR} symbolic link" - fi - # Setup environment set +h LC_ALL=3DPOSIX @@ -910,6 +897,19 @@ buildtoolchain() { exiterror "Could not find GCC. You will need a working build enviroment in= order to build the toolchain." fi =20 + # Check ${TOOLS_DIR} symlink + if [ -h "${TOOLS_DIR}" ]; then + rm -f "${TOOLS_DIR}" + fi + + if [ ! -e "${TOOLS_DIR}" ]; then + ln -s "${BASEDIR}/build${TOOLS_DIR}" "${TOOLS_DIR}" + fi + + if [ ! -h "${TOOLS_DIR}" ]; then + exiterror "Could not create ${TOOLS_DIR} symbolic link" + fi + LOGFILE=3D"$BASEDIR/log/_build.toolchain.log" export LOGFILE =20 hooks/post-receive -- IPFire 2.x development tree --===============6179531029544316451==--