Development September 2020

development@lists.ipfire.org

10 participants
55 discussions

[PATCH] iptables: Update to 1.8.5
by Adolf Belka 17 Sep '20

17 Sep '20

- Update iptables from version 1.8.3 to 1.8.5 See: https://www.netfilter.org/projects/iptables/files/changes-iptables-1.8.5.txt Supporting request from Peter Müller Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> --- config/rootfiles/common/iptables | 16 +++++----------- lfs/iptables | 4 ++-- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/config/rootfiles/common/iptables b/config/rootfiles/common/iptables index 0f8f1cf8c..f8f669014 100644 --- a/config/rootfiles/common/iptables +++ b/config/rootfiles/common/iptables @@ -10,14 +10,10 @@ lib/libip6tc.so.2.0.0 lib/libipq.so lib/libipq.so.0 lib/libipq.so.0.0.0 -#lib/libiptc.la -lib/libiptc.so -lib/libiptc.so.0 -lib/libiptc.so.0.0.0 #lib/libxtables.la lib/libxtables.so lib/libxtables.so.12 -lib/libxtables.so.12.2.0 +lib/libxtables.so.12.3.0 #lib/xtables lib/xtables/libip6t_DNAT.so lib/xtables/libip6t_DNPT.so @@ -130,6 +126,7 @@ lib/xtables/libxt_tos.so lib/xtables/libxt_u32.so lib/xtables/libxt_udp.so sbin/ip6tables +sbin/ip6tables-apply #sbin/ip6tables-legacy #sbin/ip6tables-legacy-restore #sbin/ip6tables-legacy-save @@ -170,19 +167,16 @@ sbin/xtables-legacy-multi #usr/share/man/man3/ipq_set_mode.3 #usr/share/man/man3/ipq_set_verdict.3 #usr/share/man/man3/libipq.3 +usr/share/man/man8/ip6tables-apply.8 #usr/share/man/man8/ip6tables-restore.8 #usr/share/man/man8/ip6tables-save.8 -#usr/share/man/man8/ip6tables-translate.8 #usr/share/man/man8/ip6tables.8 +usr/share/man/man8/iptables-apply.8 #usr/share/man/man8/iptables-extensions.8 #usr/share/man/man8/iptables-restore.8 #usr/share/man/man8/iptables-save.8 -#usr/share/man/man8/iptables-translate.8 #usr/share/man/man8/iptables.8 #usr/share/man/man8/nfnl_osf.8 -#usr/share/man/man8/xtables-legacy.8 -#usr/share/man/man8/xtables-monitor.8 -#usr/share/man/man8/xtables-nft.8 -#usr/share/man/man8/xtables-translate.8 #usr/share/xtables usr/share/xtables/pf.os + diff --git a/lfs/iptables b/lfs/iptables index e2012ecb6..afe452f10 100644 --- a/lfs/iptables +++ b/lfs/iptables @@ -24,7 +24,7 @@ include Config -VER = 1.8.3 +VER = 1.8.5 THISAPP = iptables-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -41,7 +41,7 @@ objects = $(DL_FILE) \ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) netfilter-layer7-v2.23.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.23.tar.gz -$(DL_FILE)_MD5 = 29de711d15c040c402cf3038c69ff513 +$(DL_FILE)_MD5 = 42cfa96d4ac5eb93ee7ed8dd85cfe8fb netfilter-layer7-v2.23.tar.gz_MD5 = 10910b6173d18e426cb56ae7e1300eeb install : $(TARGET) -- 2.28.0

2 3

Core Update 149 (testing) feedback
by Adolf Belka 17 Sep '20

17 Sep '20

Hallo all, Have been running Core Update 149 on by test bed system. Everything that I have in place is running fine with no problems, although my IPFire setups are always kept fairly minimal. Haven't been able to test OpenVPN yet as I am still working to get this running on my test bed, although I have got it running fine on my production system. Hope to have it fully functioning in my test bed system before long so future core updates will be able to include it in my evaluation and feedback. Regards, Adolf Belka

2 1

[PATCH 1/2] knot: Update to 3.0.0
by Matthias Fischer 17 Sep '20

17 Sep '20

For details see: https://www.knot-dns.cz/2020-09-09-version-300.html Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/knot | 8 ++++---- lfs/knot | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/rootfiles/common/knot b/config/rootfiles/common/knot index 960f14d0a..f352543b3 100644 --- a/config/rootfiles/common/knot +++ b/config/rootfiles/common/knot @@ -4,12 +4,12 @@ usr/bin/kdig #usr/lib/libdnssec.la #usr/lib/libdnssec.lai #usr/lib/libdnssec.so -usr/lib/libdnssec.so.7 -usr/lib/libdnssec.so.7.0.0 +usr/lib/libdnssec.so.8 +usr/lib/libdnssec.so.8.0.0 #usr/lib/libknot.la #usr/lib/libknot.lai #usr/lib/libknot.so -usr/lib/libknot.so.10 -usr/lib/libknot.so.10.0.0 +usr/lib/libknot.so.11 +usr/lib/libknot.so.11.0.0 #usr/lib/libknotus.a #usr/lib/libknotus.la diff --git a/lfs/knot b/lfs/knot index 9aa5d4f6c..153a9841b 100644 --- a/lfs/knot +++ b/lfs/knot @@ -24,7 +24,7 @@ include Config -VER = 2.9.6 +VER = 3.0.0 THISAPP = knot-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ccfdc71542e767cc01174d373efb56ee +$(DL_FILE)_MD5 = a49754adf3b76db78df678f2cb87fc54 install : $(TARGET) -- 2.18.0

2 3

[PATCH] python: update to 2.7.18
by Arne Fitzenreiter 17 Sep '20

17 Sep '20

Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> --- config/rootfiles/common/aarch64/python | 6 +++--- config/rootfiles/common/armv5tel/python | 6 +++--- config/rootfiles/common/i586/python | 6 +++--- config/rootfiles/common/x86_64/python | 6 +++--- lfs/python | 4 ++-- lfs/python-optional-src | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/config/rootfiles/common/aarch64/python b/config/rootfiles/common/aarch64/python index d4c38e32c..61d7b9844 100644 --- a/config/rootfiles/common/aarch64/python +++ b/config/rootfiles/common/aarch64/python @@ -1927,7 +1927,7 @@ usr/lib/python2.7/json/tool.pyc usr/lib/python2.7/keyword.pyc #usr/lib/python2.7/keyword.pyo #usr/lib/python2.7/lib-dynload -#usr/lib/python2.7/lib-dynload/Python-2.7.17-py2.7.egg-info +#usr/lib/python2.7/lib-dynload/Python-2.7.18-py2.7.egg-info usr/lib/python2.7/lib-dynload/_bisect.so usr/lib/python2.7/lib-dynload/_bsddb.so usr/lib/python2.7/lib-dynload/_codecs_cn.so @@ -2103,9 +2103,9 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/turtle.pyo #usr/lib/python2.7/lib2to3 #usr/lib/python2.7/lib2to3/Grammar.txt -#usr/lib/python2.7/lib2to3/Grammar2.7.17.final.0.pickle +#usr/lib/python2.7/lib2to3/Grammar2.7.18.final.0.pickle #usr/lib/python2.7/lib2to3/PatternGrammar.txt -#usr/lib/python2.7/lib2to3/PatternGrammar2.7.17.final.0.pickle +#usr/lib/python2.7/lib2to3/PatternGrammar2.7.18.final.0.pickle #usr/lib/python2.7/lib2to3/__init__.py #usr/lib/python2.7/lib2to3/__init__.pyc #usr/lib/python2.7/lib2to3/__init__.pyo diff --git a/config/rootfiles/common/armv5tel/python b/config/rootfiles/common/armv5tel/python index f7da1f66c..90f66fc84 100644 --- a/config/rootfiles/common/armv5tel/python +++ b/config/rootfiles/common/armv5tel/python @@ -1927,7 +1927,7 @@ usr/lib/python2.7/json/tool.pyc usr/lib/python2.7/keyword.pyc #usr/lib/python2.7/keyword.pyo #usr/lib/python2.7/lib-dynload -#usr/lib/python2.7/lib-dynload/Python-2.7.17-py2.7.egg-info +#usr/lib/python2.7/lib-dynload/Python-2.7.18-py2.7.egg-info usr/lib/python2.7/lib-dynload/_bisect.so usr/lib/python2.7/lib-dynload/_bsddb.so usr/lib/python2.7/lib-dynload/_codecs_cn.so @@ -2105,9 +2105,9 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/turtle.pyo #usr/lib/python2.7/lib2to3 #usr/lib/python2.7/lib2to3/Grammar.txt -#usr/lib/python2.7/lib2to3/Grammar2.7.17.final.0.pickle +#usr/lib/python2.7/lib2to3/Grammar2.7.18.final.0.pickle #usr/lib/python2.7/lib2to3/PatternGrammar.txt -#usr/lib/python2.7/lib2to3/PatternGrammar2.7.17.final.0.pickle +#usr/lib/python2.7/lib2to3/PatternGrammar2.7.18.final.0.pickle #usr/lib/python2.7/lib2to3/__init__.py #usr/lib/python2.7/lib2to3/__init__.pyc #usr/lib/python2.7/lib2to3/__init__.pyo diff --git a/config/rootfiles/common/i586/python b/config/rootfiles/common/i586/python index f7da1f66c..90f66fc84 100644 --- a/config/rootfiles/common/i586/python +++ b/config/rootfiles/common/i586/python @@ -1927,7 +1927,7 @@ usr/lib/python2.7/json/tool.pyc usr/lib/python2.7/keyword.pyc #usr/lib/python2.7/keyword.pyo #usr/lib/python2.7/lib-dynload -#usr/lib/python2.7/lib-dynload/Python-2.7.17-py2.7.egg-info +#usr/lib/python2.7/lib-dynload/Python-2.7.18-py2.7.egg-info usr/lib/python2.7/lib-dynload/_bisect.so usr/lib/python2.7/lib-dynload/_bsddb.so usr/lib/python2.7/lib-dynload/_codecs_cn.so @@ -2105,9 +2105,9 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/turtle.pyo #usr/lib/python2.7/lib2to3 #usr/lib/python2.7/lib2to3/Grammar.txt -#usr/lib/python2.7/lib2to3/Grammar2.7.17.final.0.pickle +#usr/lib/python2.7/lib2to3/Grammar2.7.18.final.0.pickle #usr/lib/python2.7/lib2to3/PatternGrammar.txt -#usr/lib/python2.7/lib2to3/PatternGrammar2.7.17.final.0.pickle +#usr/lib/python2.7/lib2to3/PatternGrammar2.7.18.final.0.pickle #usr/lib/python2.7/lib2to3/__init__.py #usr/lib/python2.7/lib2to3/__init__.pyc #usr/lib/python2.7/lib2to3/__init__.pyo diff --git a/config/rootfiles/common/x86_64/python b/config/rootfiles/common/x86_64/python index eb7f8fa18..c1d00df14 100644 --- a/config/rootfiles/common/x86_64/python +++ b/config/rootfiles/common/x86_64/python @@ -1927,7 +1927,7 @@ usr/lib/python2.7/json/tool.pyc usr/lib/python2.7/keyword.pyc #usr/lib/python2.7/keyword.pyo #usr/lib/python2.7/lib-dynload -#usr/lib/python2.7/lib-dynload/Python-2.7.17-py2.7.egg-info +#usr/lib/python2.7/lib-dynload/Python-2.7.18-py2.7.egg-info usr/lib/python2.7/lib-dynload/_bisect.so usr/lib/python2.7/lib-dynload/_bsddb.so usr/lib/python2.7/lib-dynload/_codecs_cn.so @@ -2103,9 +2103,9 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/turtle.pyo #usr/lib/python2.7/lib2to3 #usr/lib/python2.7/lib2to3/Grammar.txt -#usr/lib/python2.7/lib2to3/Grammar2.7.17.final.0.pickle +#usr/lib/python2.7/lib2to3/Grammar2.7.18.final.0.pickle #usr/lib/python2.7/lib2to3/PatternGrammar.txt -#usr/lib/python2.7/lib2to3/PatternGrammar2.7.17.final.0.pickle +#usr/lib/python2.7/lib2to3/PatternGrammar2.7.18.final.0.pickle #usr/lib/python2.7/lib2to3/__init__.py #usr/lib/python2.7/lib2to3/__init__.pyc #usr/lib/python2.7/lib2to3/__init__.pyo diff --git a/lfs/python b/lfs/python index c2638baec..5b386e298 100644 --- a/lfs/python +++ b/lfs/python @@ -26,7 +26,7 @@ include Config # If you update this make sure that you also change the VER and PAK_VER of # python-optional-src ! -VER = 2.7.17 +VER = 2.7.18 THISAPP = Python-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b3b6d2c92f42a60667814358ab9f0cfd +$(DL_FILE)_MD5 = fd6cc8ec0a78c44036f825e739f36e5a install : $(TARGET) diff --git a/lfs/python-optional-src b/lfs/python-optional-src index 2439c4899..eef3872af 100644 --- a/lfs/python-optional-src +++ b/lfs/python-optional-src @@ -24,12 +24,12 @@ include Config -VER = 2.7.17 +VER = 2.7.18 include python PROG = python-optional-src -PAK_VER = 6 +PAK_VER = 7 DEPS = dist: -- 2.17.1

2 1

[PATCH] Add tool to format rootfiles
by Jonatan Schlag 17 Sep '20

17 Sep '20

There are some rules which files should be definitely not included in a rootfile. Applying these rules by hand is error prone and annoying. So I wrote these simple command, because computer can apply these rules faster and better than humans :-; It removes all lines starting with '-' and comment out all lines which point to files which should not be included in the distribution. This list needs to be extended, but I think this is a good starting point to make the creating of rootfiles easier. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- make.sh | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/make.sh b/make.sh index 4a9dd3cb6..909d4a4de 100755 --- a/make.sh +++ b/make.sh @@ -1895,6 +1895,41 @@ downloadsrc) fi cd - >/dev/null 2>&1 ;; +format-rootfile) + if [ ! -f $2 ]; then + echo -n "'$2' is not a regular file" + beautify message FAIL + exit 1 + fi + + ROOTFILE_TO_FORMAT="$2" + + # Remove all .so files in /usr/lib + sed -i '/^\+usr\/lib\/.*\.so$/s/+/#/g' "$ROOTFILE_TO_FORMAT" + + # Remove all .a files in /usr/lib + sed -i '/^\+usr\/lib\/.*\.a$/s/+/#/g' "$ROOTFILE_TO_FORMAT" + + + # Remove all .la files in /usr/lib + sed -i '/^\+usr\/lib\/.*\.la$/s/+/#/g' "$ROOTFILE_TO_FORMAT" + + # Remove all .hpp files in /usr/include + sed -i '/^\+usr\/include\/.*\.hpp$/s/+/#/g' "$ROOTFILE_TO_FORMAT" + + # Remove all .h files in /usr/include + sed -i '/^\+usr\/include\/.*\.h$/s/+/#/g' "$ROOTFILE_TO_FORMAT" + + # Remove all .ipp files in /usr/include + sed -i '/^\+usr\/include\/.*\.ipp$/s/+/#/g' "$ROOTFILE_TO_FORMAT" + + # Remove all .m4 files in /usr/share/aclocal + sed -i '/^\+usr\/share\/aclocal\/.*\.h$/s/+/#/g' "$ROOTFILE_TO_FORMAT" + + # Remove all lines starting with - + sed -i '/^-.*$/d' "$ROOTFILE_TO_FORMAT" + +;; toolchain) # Clear screen ${INTERACTIVE} && clear @@ -1990,7 +2025,7 @@ find-dependencies) exec "${BASEDIR}/tools/find-dependencies" "${BASEDIR}/build" "$@" ;; *) - echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain|update-contributors|find-dependencies}" + echo "Usage: $0 {build|changelog|clean|format-rootfile|gettoolchain|downloadsrc|shell|sync|toolchain|update-contributors|find-dependencies}" cat doc/make.sh-usage ;; esac -- 2.20.1

3 6

[PATCH] logwatch: Added upstream patch for Bug #12242
by Matthias Fischer 16 Sep '20

16 Sep '20

Added upstream patch from: https://sourceforge.net/p/logwatch/mailman/message/37106642/ and https://sourceforge.net/p/logwatch/mailman/message/37106883/ Fixes the display of "Unknown Entries: reuse_lease: ... " in dhpcd-logs. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/logwatch | 1 + ...logwatch-7.5.4-dhcpd_reuse_lease_entries.patch | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch diff --git a/lfs/logwatch b/lfs/logwatch index 509201743..abf1ba02f 100644 --- a/lfs/logwatch +++ b/lfs/logwatch @@ -73,6 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && sed -e "s/^TEMPDIR=.*/TEMPDIR=\"\/tmp\"/g" -i install_logwatch.sh cd $(DIR_APP)/lib && patch < $(DIR_SRC)/src/patches/logwatch/logwatch-7.3.6-date_manip6.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch @cd $(DIR_APP) && chmod 755 install_logwatch.sh cd $(DIR_APP) && yes "" | ./install_logwatch.sh diff --git a/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch b/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch new file mode 100644 index 000000000..a66170ae5 --- /dev/null +++ b/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch @@ -0,0 +1,15 @@ +diff --git a/scripts/services/dhcpd b/scripts/services/dhcpd +index 87312f7..bb5cd4c 100644 +--- a/scripts/services/dhcpd ++++ b/scripts/services/dhcpd +@@ -79,7 +79,9 @@ while (my $line = <STDIN>) { + ($line =~ /^Solicit message from/) or + ($line =~ /^Sending Advertise to/) or + ($line =~ /^pool [0-9a-f]+ /) or +- ($line =~ /^[^ ]* file: /) ++ ($line =~ /^[^ ]* file: /) or ++ ($line =~ /^reuse_lease: lease age \d+ $secs$ under \d+\% threshold, reply with unaltered, existing lease for/) or ++ 0 # noop, but makes diffs easier when appending ignore statements + ) { + # Ignore these lines + } elsif ($line =~ s/Listening on\s+//) { -- 2.18.0

1 0

[PATCH] logwatch: Update to 7.5.4
by Matthias Fischer 16 Sep '20

16 Sep '20

Sorry, there is no changelog available. For a better overview I moved 'logwatch-7.3.6-date_manip6.patch' to a directory of its own. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/logwatch | 10 ++++++---- .../{ => logwatch}/logwatch-7.3.6-date_manip6.patch | 0 2 files changed, 6 insertions(+), 4 deletions(-) rename src/patches/{ => logwatch}/logwatch-7.3.6-date_manip6.patch (100%) diff --git a/lfs/logwatch b/lfs/logwatch index a980b1b40..509201743 100644 --- a/lfs/logwatch +++ b/lfs/logwatch @@ -1,7 +1,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 # @@ -24,7 +24,7 @@ include Config -VER = 7.5.3 +VER = 7.5.4 THISAPP = logwatch-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8bcf3edc5a4687c8aad1b9c01e2be54b +$(DL_FILE)_MD5 = 47b35a8e5efc415b4a775415255b8d1f install : $(TARGET) @@ -71,7 +71,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && sed -e "s/^TEMPDIR=.*/TEMPDIR=\"\/tmp\"/g" -i install_logwatch.sh - cd $(DIR_APP)/lib && patch < $(DIR_SRC)/src/patches/logwatch-7.3.6-date_manip6.patch + + cd $(DIR_APP)/lib && patch < $(DIR_SRC)/src/patches/logwatch/logwatch-7.3.6-date_manip6.patch + @cd $(DIR_APP) && chmod 755 install_logwatch.sh cd $(DIR_APP) && yes "" | ./install_logwatch.sh diff --git a/src/patches/logwatch-7.3.6-date_manip6.patch b/src/patches/logwatch/logwatch-7.3.6-date_manip6.patch similarity index 100% rename from src/patches/logwatch-7.3.6-date_manip6.patch rename to src/patches/logwatch/logwatch-7.3.6-date_manip6.patch -- 2.18.0

1 0

[PATCH] guardian: Update french translation
by Stefan Schantl 16 Sep '20

16 Sep '20

From: Stéphane Pautrel <steph78630(a)gmail.com> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- config/guardian/guardian.fr.pl | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/config/guardian/guardian.fr.pl b/config/guardian/guardian.fr.pl index 0e71baeea..b938a39fb 100644 --- a/config/guardian/guardian.fr.pl +++ b/config/guardian/guardian.fr.pl @@ -2,7 +2,6 @@ %tr, 'guardian' => 'Gardien', -'guardian alertfile' => 'Fichier d\'alerte', 'guardian block a host' => 'Bloquer l\'hôte ', 'guardian block httpd brute-force' => 'Détection force brute httpd', 'guardian block owncloud brute-force' => 'Détection force brute Owncloud', @@ -13,13 +12,11 @@ 'guardian blocktime' => 'Temps de blocage (secondes) ', 'guardian common settings' => 'Paramètres communs', 'guardian configuration' => 'Configuration du gardien', -'guardian daemon' => 'Service', +'guardian daemon' => 'Statut :', 'guardian empty input' => 'Saisie vide : Veuillez saisir une adresse d\'hôte ou un sous-réseau valide.', -'guardian enabled' => 'Activer le gardien ', +'guardian enabled' => 'Activer le service ', 'guardian firewallaction' => 'Action du pare-feu ', 'guardian ignored hosts' => 'Hôtes ignorés', -'guardian ignorefile' => 'Fichier d\'ignorés', -'guardian interface' => 'Interface', 'guardian invalid address or subnet' => 'Adresse hôte ou sous-réseau invalide.', 'guardian invalid blockcount' => 'Nombre de blocages non valide : Veuillez proposer un nombre plus grand que zéro.', 'guardian invalid blocktime' => 'Temps de blocage invalide : Veuillez proposer un nombre plus grand que zéro.', @@ -40,9 +37,6 @@ 'guardian priolevel_low' => '3 - Bas', 'guardian priolevel_very_low' => '4 - Très bas', 'guardian service' => 'Service Gardien', -'guardian priority level' => 'Niveau de priorité (Snort) ', -'guardian timelimit' => 'Délai maximum', -'guardian watch snort alertfile' => 'Surveiller le fichier d\'alerte Snort', ); -- 2.20.1

2 1

[PATCH] Language files: Clarify menu entries and page titles for VPN connections.
by Stefan Schantl 16 Sep '20

16 Sep '20

These pages for RW and N2N statistics only show handle for OpenVPN connections. Fixes #12476. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- langs/de/cgi-bin/de.pl | 6 +++--- langs/en/cgi-bin/en.pl | 4 ++-- langs/tr/cgi-bin/tr.pl | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index ef4e4e6c8..17b11e213 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -2836,9 +2836,9 @@ 'vpn start action add' => 'Auf Verbindungseingang warten', 'vpn start action route' => 'Bei Bedarf', 'vpn start action start' => 'Immer An', -'vpn statistic n2n' => 'VPN: Netz-zu-Netz-Statistik', -'vpn statistic rw' => 'VPN: Roadwarrior-Statistik', -'vpn statistics n2n' => 'VPN: Netz-zu-Netz-Statistiken', +'vpn statistic n2n' => 'OpenVPN: Netz-zu-Netz-Statistik', +'vpn statistic rw' => 'OpenVPN: Roadwarrior-Statistik', +'vpn statistics n2n' => 'OpenVPN: Netz-zu-Netz-Statistiken', 'vpn subjectaltname' => 'SubjectAlternativeName', 'vpn subjectaltname missing' => 'SubjectAlternativeName darf nicht leer bleiben.', 'vpn wait' => 'WARTE', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 0b1b304a9..24b93659c 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2870,8 +2870,8 @@ 'vpn start action add' => 'Wait for connection initiation', 'vpn start action route' => 'On Demand', 'vpn start action start' => 'Always On', -'vpn statistic n2n' => 'VPN: Net-to-Net Statistics', -'vpn statistic rw' => 'VPN: Roadwarrior Statistics', +'vpn statistic n2n' => 'OpenVPN: Net-to-Net Statistics', +'vpn statistic rw' => 'OpenVPN: Roadwarrior Statistics', 'vpn subjectaltname' => 'SubjectAlternativeName', 'vpn subjectaltname missing' => 'SubjectAlternativeName cannot be emtpy.', 'vpn wait' => 'WAITING', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index ea2047609..2a583963a 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -2750,8 +2750,8 @@ 'vpn start action' => 'Hareketi Başlat', 'vpn start action route' => 'İstek Üzerine', 'vpn start action start' => 'Her Zaman', -'vpn statistic n2n' => 'Ağdan Ağa VPN İstatistiği', -'vpn statistic rw' => 'Roadwarrior VPN İstatistiği', +'vpn statistic n2n' => 'Ağdan Ağa OpenVPN İstatistiği', +'vpn statistic rw' => 'Roadwarrior OpenVPN İstatistiği', 'vpn subjectaltname' => 'Alternatif konu adı', 'vpn watch' => 'Karşı eş IP değiştirdiğinde (dyndns) ağdan-ağa VPN bağlantısını yeniden başlat. Bu DPD ye yardımcı olur.', 'vpn weak' => 'Hafta', -- 2.20.1

2 1

[PATCH] location: Fix message sting if the database has been recently updated
by Stefan Schantl 16 Sep '20

16 Sep '20

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- src/python/location.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/location.in b/src/python/location.in index 8cdd140..3ba209d 100644 --- a/src/python/location.in +++ b/src/python/location.in @@ -413,7 +413,7 @@ class CLI(object): # Check if the database has recently been updated if t >= (now - delta): log.info( - _("The datase has recently be updated recently (%s)") % \ + _("The database has been updated recently(%s)") % \ format_timedelta(now - t), ) return 3 -- 2.20.1

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development September 2020