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 9e870fcb76847939304402e86919c1de757c50dd (commit) via b0a707e5a1d60ce59902c89459561f157b8a1500 (commit) via 54f0daca3fbd8109215e8c9db3e79e37c9dd4f1c (commit) via 13e20ecfc5855b39ddcd48f8cd1932aa5a9b1d54 (commit) via 501defe601d39707d34d9a53609edd0e49ab713c (commit) via d8f992b349d735e9a1ed3650cfec3083b0e4c7f6 (commit) via aa4ed7637cd5a1ade4361c7c6f4a2ea72b43ca18 (commit) via 74a8a84316838aca8c4082c3777681a5ace0715f (commit) via dba1a21403fd2d80d39d07c3bc9f11abdc148760 (commit) from 1ebd84f4389a32ceec51e7ad64ca47d7de3c06be (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 9e870fcb76847939304402e86919c1de757c50dd Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Sep 30 10:30:14 2020 +0000
Update contributors
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b0a707e5a1d60ce59902c89459561f157b8a1500 Author: Stéphane Pautrel stephane.pautrel@acb78.com Date: Wed Sep 30 10:26:33 2020 +0000
Update French translation
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 54f0daca3fbd8109215e8c9db3e79e37c9dd4f1c Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Sep 30 10:01:37 2020 +0000
core151: Ship OpenSSH
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 13e20ecfc5855b39ddcd48f8cd1932aa5a9b1d54 Author: Adolf Belka ahb.ipfire@gmail.com Date: Tue Sep 29 09:21:30 2020 +0200
openssh: Update to 8.4p1
- Update openssh from version 8.3p1 to 8.4p1 See https://www.openssh.com/releasenotes.html See https://www.openssh.com/portable.html#http for mirrors for source file - No change to rootfiles - Installed on virtual ipfire testbed and ssh connection successfully operated Signed-off-by: Adolf Belka ahb.ipfire@gmail.com
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 501defe601d39707d34d9a53609edd0e49ab713c Author: Adolf Belka ahb.ipfire@gmail.com Date: Tue Sep 29 20:48:05 2020 +0200
bacula: Update to 9.6.6
- Update bacula from version 9.6.5 to 9.6.6 This is a minor bug release See https://sourceforge.net/projects/bacula/files/bacula/9.6.6/ReleaseNotes/ Source file available at https://sourceforge.net/projects/bacula/files/bacula/9.6.6/bacula-9.6.6.tar.... Signed-off-by: Adolf Belka ahb.ipfire@gmail.com
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d8f992b349d735e9a1ed3650cfec3083b0e4c7f6 Author: Adolf Belka ahb.ipfire@gmail.com Date: Tue Sep 29 20:48:29 2020 +0200
bacula: Update to backup/includes definition
- Modified backup/includes file to backup the /var/bacula/working directory contents rather than explicitly naming the state filename. State filename could be varied if user modifies the port number for the file daemon as the port number is part of the state filename Signed-off-by: Adolf Belka ahb.ipfire@gmail.com
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit aa4ed7637cd5a1ade4361c7c6f4a2ea72b43ca18 Author: Erik Kapfer ummeegge@ipfire.org Date: Tue Sep 29 10:45:27 2020 +0200
iptraf-ng: Update to version 1.2.1
Update includes several fixes and enhancements. The full overview of changes are located in here --> https://github.com/iptraf-ng/iptraf-ng/blob/master/CHANGES .
rvnamed has been merged into iptraf-ng. Fix division by zero patch has been merged into new version, patch is not needed anymore. logrotate configuration for iptraf-ng has been included.
Signed-off-by: Erik Kapfer ummeegge@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 74a8a84316838aca8c4082c3777681a5ace0715f Author: Erik Kapfer ummeegge@ipfire.org Date: Tue Sep 29 10:53:21 2020 +0200
nginx: Update to version 1.19.2
Several bugfixes and features has been integrated since version 1.17.8. A full overview of all changes are located in here --> https://github.com/nginx/nginx-releases/blob/master/CHANGES .
Signed-off-by: Erik Kapfer ummeegge@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit dba1a21403fd2d80d39d07c3bc9f11abdc148760 Author: Erik Kapfer ummeegge@ipfire.org Date: Tue Sep 29 11:17:33 2020 +0200
git: Update to version 2.28.0
Several changes s been made since version 2.12.2 . The documentation RelNotes of Git can be found in here --> https://github.com/git/git/tree/master/Documentation/RelNotes .
Signed-off-by: Erik Kapfer ummeegge@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: .mailmap | 1 + config/backup/includes/bacula | 2 +- .../iptraf-ng.logrotate} | 5 +- .../{oldcore/100 => core/151}/filelists/openssh | 0 config/rootfiles/core/151/update.sh | 1 + config/rootfiles/packages/bacula | 6 +- config/rootfiles/packages/git | 77 +++++++++++++--------- config/rootfiles/packages/iptraf-ng | 5 +- doc/language_issues.fr | 3 - doc/language_missings | 3 - html/cgi-bin/credits.cgi | 9 ++- langs/fr/cgi-bin/fr.pl | 69 +++++++++---------- lfs/bacula | 6 +- lfs/git | 8 +-- lfs/iptraf-ng | 46 +++++++------ lfs/nginx | 6 +- lfs/openssh | 4 +- .../iptraf-ng-1.1.4-tcplog_flowrate_msg.patch | 12 ---- src/patches/iptraf-ng_set_path.patch | 12 ++++ 19 files changed, 147 insertions(+), 128 deletions(-) copy config/{tor/tor.logrotate => iptraf-ng/iptraf-ng.logrotate} (56%) copy config/rootfiles/{oldcore/100 => core/151}/filelists/openssh (100%) delete mode 100644 src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch create mode 100644 src/patches/iptraf-ng_set_path.patch
Difference in files: diff --git a/.mailmap b/.mailmap index 08653c701..b8f710ddf 100644 --- a/.mailmap +++ b/.mailmap @@ -18,6 +18,7 @@ Dirk Wagner root@etch-server.wagner-budenheim.de Heiner Schmeling casemaster@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 Jan Paul Tücking earl@ipfire.org Jörn-Ingo Weigert jiweigert@ipfire.org +Jörn-Ingo Weigert jiweigert@gmail.com Michael Tremer delaco@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 Michael Tremer ipfire@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 Michael Tremer <michael.tremer.info> diff --git a/config/backup/includes/bacula b/config/backup/includes/bacula index 92bce0eba..de1d9cc48 100644 --- a/config/backup/includes/bacula +++ b/config/backup/includes/bacula @@ -1,2 +1,2 @@ /etc/bacula/bacula-fd.conf -/var/bacula/working/bacula-fd.9102.state +/var/bacula/working/ diff --git a/config/iptraf-ng/iptraf-ng.logrotate b/config/iptraf-ng/iptraf-ng.logrotate new file mode 100644 index 000000000..7a3985697 --- /dev/null +++ b/config/iptraf-ng/iptraf-ng.logrotate @@ -0,0 +1,12 @@ +/var/log/iptraf-ng/*.log { + daily + rotate 5 + compress + delaycompress + missingok + notifempty + create 0640 root root + sharedscripts + postrotate + endscript +} diff --git a/config/rootfiles/core/151/filelists/openssh b/config/rootfiles/core/151/filelists/openssh new file mode 120000 index 000000000..d8c77fd8e --- /dev/null +++ b/config/rootfiles/core/151/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/151/update.sh b/config/rootfiles/core/151/update.sh index bf151ef48..69e34ae81 100644 --- a/config/rootfiles/core/151/update.sh +++ b/config/rootfiles/core/151/update.sh @@ -51,6 +51,7 @@ ldconfig /usr/local/bin/filesystem-cleanup
# Start services +/etc/init.d/sshd restart if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then /etc/init.d/ipsec start fi diff --git a/config/rootfiles/packages/bacula b/config/rootfiles/packages/bacula index dc9179489..bb766fb07 100644 --- a/config/rootfiles/packages/bacula +++ b/config/rootfiles/packages/bacula @@ -21,13 +21,13 @@ etc/rc.d/init.d/bacula #opt/bacula #opt/bacula/log #usr/lib/bpipe-fd.so -usr/lib/libbac-9.6.5.so +usr/lib/libbac-9.6.6.so #usr/lib/libbac.la usr/lib/libbac.so -usr/lib/libbaccfg-9.6.5.so +usr/lib/libbaccfg-9.6.6.so #usr/lib/libbaccfg.la usr/lib/libbaccfg.so -usr/lib/libbacfind-9.6.5.so +usr/lib/libbacfind-9.6.6.so #usr/lib/libbacfind.la usr/lib/libbacfind.so #usr/sbin/bacula diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git index 52a2042ee..df159acb4 100644 --- a/config/rootfiles/packages/git +++ b/config/rootfiles/packages/git @@ -5,25 +5,6 @@ usr/bin/git-shell usr/bin/git-upload-archive usr/bin/git-upload-pack #usr/bin/gitk -usr/lib/perl5/site_perl/5.30.0/Error.pm -#usr/lib/perl5/site_perl/5.30.0/Git -usr/lib/perl5/site_perl/5.30.0/Git.pm -usr/lib/perl5/site_perl/5.30.0/Git/I18N.pm -usr/lib/perl5/site_perl/5.30.0/Git/IndexInfo.pm -usr/lib/perl5/site_perl/5.30.0/Git/SVN -#usr/lib/perl5/site_perl/5.30.0/Git/SVN.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Editor.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Fetcher.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/GlobSpec.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Log.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Memoize -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Memoize/YAML.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Migration.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Prompt.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Ra.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Utils.pm -#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Git -#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Git/.packlist #usr/libexec/git-core #usr/libexec/git-core/git usr/libexec/git-core/git-add @@ -37,6 +18,7 @@ usr/libexec/git-core/git-bisect usr/libexec/git-core/git-bisect--helper usr/libexec/git-core/git-blame usr/libexec/git-core/git-branch +usr/libexec/git-core/git-bugreport usr/libexec/git-core/git-bundle usr/libexec/git-core/git-cat-file usr/libexec/git-core/git-check-attr @@ -52,6 +34,7 @@ usr/libexec/git-core/git-clean usr/libexec/git-core/git-clone usr/libexec/git-core/git-column usr/libexec/git-core/git-commit +usr/libexec/git-core/git-commit-graph usr/libexec/git-core/git-commit-tree usr/libexec/git-core/git-config usr/libexec/git-core/git-count-objects @@ -70,6 +53,7 @@ usr/libexec/git-core/git-diff-index usr/libexec/git-core/git-diff-tree usr/libexec/git-core/git-difftool usr/libexec/git-core/git-difftool--helper +usr/libexec/git-core/git-env--helper usr/libexec/git-core/git-fast-export usr/libexec/git-core/git-fast-import usr/libexec/git-core/git-fetch @@ -117,6 +101,7 @@ usr/libexec/git-core/git-mergetool usr/libexec/git-core/git-mergetool--lib usr/libexec/git-core/git-mktag usr/libexec/git-core/git-mktree +usr/libexec/git-core/git-multi-pack-index usr/libexec/git-core/git-mv usr/libexec/git-core/git-name-rev usr/libexec/git-core/git-notes @@ -131,11 +116,10 @@ usr/libexec/git-core/git-prune-packed usr/libexec/git-core/git-pull usr/libexec/git-core/git-push usr/libexec/git-core/git-quiltimport +usr/libexec/git-core/git-range-diff usr/libexec/git-core/git-read-tree usr/libexec/git-core/git-rebase -usr/libexec/git-core/git-rebase--am -usr/libexec/git-core/git-rebase--interactive -usr/libexec/git-core/git-rebase--merge +usr/libexec/git-core/git-rebase--preserve-merges usr/libexec/git-core/git-receive-pack usr/libexec/git-core/git-reflog usr/libexec/git-core/git-remote @@ -151,6 +135,7 @@ usr/libexec/git-core/git-replace usr/libexec/git-core/git-request-pull usr/libexec/git-core/git-rerere usr/libexec/git-core/git-reset +usr/libexec/git-core/git-restore usr/libexec/git-core/git-rev-list usr/libexec/git-core/git-rev-parse usr/libexec/git-core/git-revert @@ -166,6 +151,7 @@ usr/libexec/git-core/git-show usr/libexec/git-core/git-show-branch usr/libexec/git-core/git-show-index usr/libexec/git-core/git-show-ref +usr/libexec/git-core/git-sparse-checkout usr/libexec/git-core/git-stage usr/libexec/git-core/git-stash usr/libexec/git-core/git-status @@ -173,6 +159,7 @@ usr/libexec/git-core/git-stripspace usr/libexec/git-core/git-submodule usr/libexec/git-core/git-submodule--helper usr/libexec/git-core/git-svn +usr/libexec/git-core/git-switch usr/libexec/git-core/git-symbolic-ref usr/libexec/git-core/git-tag usr/libexec/git-core/git-unpack-file @@ -201,6 +188,7 @@ usr/libexec/git-core/mergetools/diffuse usr/libexec/git-core/mergetools/ecmerge usr/libexec/git-core/mergetools/emerge usr/libexec/git-core/mergetools/examdiff +usr/libexec/git-core/mergetools/guiffy usr/libexec/git-core/mergetools/gvimdiff usr/libexec/git-core/mergetools/gvimdiff2 usr/libexec/git-core/mergetools/gvimdiff3 @@ -209,6 +197,7 @@ usr/libexec/git-core/mergetools/kompare usr/libexec/git-core/mergetools/meld usr/libexec/git-core/mergetools/opendiff usr/libexec/git-core/mergetools/p4merge +usr/libexec/git-core/mergetools/smerge usr/libexec/git-core/mergetools/tkdiff usr/libexec/git-core/mergetools/tortoisemerge usr/libexec/git-core/mergetools/vimdiff @@ -223,9 +212,11 @@ usr/share/git-core/templates/description #usr/share/git-core/templates/hooks usr/share/git-core/templates/hooks/applypatch-msg.sample usr/share/git-core/templates/hooks/commit-msg.sample +usr/share/git-core/templates/hooks/fsmonitor-watchman.sample usr/share/git-core/templates/hooks/post-update.sample usr/share/git-core/templates/hooks/pre-applypatch.sample usr/share/git-core/templates/hooks/pre-commit.sample +usr/share/git-core/templates/hooks/pre-merge-commit.sample usr/share/git-core/templates/hooks/pre-push.sample usr/share/git-core/templates/hooks/pre-rebase.sample usr/share/git-core/templates/hooks/pre-receive.sample @@ -247,6 +238,7 @@ usr/share/git-core/templates/info/exclude #usr/share/git-gui/lib/choose_font.tcl #usr/share/git-gui/lib/choose_repository.tcl #usr/share/git-gui/lib/choose_rev.tcl +#usr/share/git-gui/lib/chord.tcl #usr/share/git-gui/lib/class.tcl #usr/share/git-gui/lib/commit.tcl #usr/share/git-gui/lib/console.tcl @@ -308,6 +300,7 @@ usr/share/git-core/templates/info/exclude #usr/share/gitk/lib/msgs/ru.msg #usr/share/gitk/lib/msgs/sv.msg #usr/share/gitk/lib/msgs/vi.msg +#usr/share/gitk/lib/msgs/zh_cn.msg #usr/share/gitweb #usr/share/gitweb/gitweb.cgi #usr/share/gitweb/static @@ -318,6 +311,8 @@ usr/share/git-core/templates/info/exclude #usr/share/locale/bg/LC_MESSAGES/git.mo #usr/share/locale/ca/LC_MESSAGES/git.mo #usr/share/locale/de/LC_MESSAGES/git.mo +#usr/share/locale/el/LC_MESSAGES/git.mo +#usr/share/locale/es/LC_MESSAGES/git.mo #usr/share/locale/fr/LC_MESSAGES/git.mo #usr/share/locale/is/LC_MESSAGES/git.mo #usr/share/locale/it/LC_MESSAGES/git.mo @@ -325,14 +320,34 @@ usr/share/git-core/templates/info/exclude #usr/share/locale/pt_PT/LC_MESSAGES/git.mo #usr/share/locale/ru/LC_MESSAGES/git.mo #usr/share/locale/sv/LC_MESSAGES/git.mo +#usr/share/locale/tr/LC_MESSAGES/git.mo #usr/share/locale/vi/LC_MESSAGES/git.mo #usr/share/locale/zh_CN/LC_MESSAGES/git.mo -#usr/share/man/man3/Git.3 -#usr/share/man/man3/Git::I18N.3 -#usr/share/man/man3/Git::SVN::Editor.3 -#usr/share/man/man3/Git::SVN::Fetcher.3 -#usr/share/man/man3/Git::SVN::Memoize::YAML.3 -#usr/share/man/man3/Git::SVN::Prompt.3 -#usr/share/man/man3/Git::SVN::Ra.3 -#usr/share/man/man3/Git::SVN::Utils.3 -#usr/share/man/man3/private-Error.3 +#usr/share/locale/zh_TW/LC_MESSAGES/git.mo +#usr/share/perl5 +#usr/share/perl5/FromCPAN +usr/share/perl5/FromCPAN/Error.pm +#usr/share/perl5/FromCPAN/Mail +#usr/share/perl5/FromCPAN/Mail/Address.pm +#usr/share/perl5/Git +usr/share/perl5/Git.pm +usr/share/perl5/Git/I18N.pm +usr/share/perl5/Git/IndexInfo.pm +#usr/share/perl5/Git/LoadCPAN +#usr/share/perl5/Git/LoadCPAN.pm +#usr/share/perl5/Git/LoadCPAN/Error.pm +#usr/share/perl5/Git/LoadCPAN/Mail +#usr/share/perl5/Git/LoadCPAN/Mail/Address.pm +#usr/share/perl5/Git/Packet.pm +usr/share/perl5/Git/SVN +#usr/share/perl5/Git/SVN.pm +#usr/share/perl5/Git/SVN/Editor.pm +#usr/share/perl5/Git/SVN/Fetcher.pm +#usr/share/perl5/Git/SVN/GlobSpec.pm +#usr/share/perl5/Git/SVN/Log.pm +#usr/share/perl5/Git/SVN/Memoize +#usr/share/perl5/Git/SVN/Memoize/YAML.pm +#usr/share/perl5/Git/SVN/Migration.pm +#usr/share/perl5/Git/SVN/Prompt.pm +#usr/share/perl5/Git/SVN/Ra.pm +#usr/share/perl5/Git/SVN/Utils.pm diff --git a/config/rootfiles/packages/iptraf-ng b/config/rootfiles/packages/iptraf-ng index 4ad3c863d..5e59e116c 100644 --- a/config/rootfiles/packages/iptraf-ng +++ b/config/rootfiles/packages/iptraf-ng @@ -1,5 +1,4 @@ +etc/logrotate.d/iptraf-ng usr/sbin/iptraf-ng -usr/sbin/rvnamed-ng -var/lib/iptraf-ng -var/lock/iptraf-ng +#usr/share/man/man8/iptraf-ng.8 var/log/iptraf-ng diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 2589fa74b..9c7456d71 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -807,7 +807,6 @@ 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: acpitemp = ACPI - Temperatures WARNING: untranslated string: fwhost cust locationgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string WARNING: untranslated string: guardian block a host = unknown string @@ -839,8 +838,6 @@ WARNING: untranslated string: guardian logtarget_file = unknown string WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string -WARNING: untranslated string: legacy architecture warning = You are running IPFire on a legacy architecture and it is recommended to upgrade -WARNING: untranslated string: open connections = Open Connections WARNING: untranslated string: pakfire ago = ago. WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string diff --git a/doc/language_missings b/doc/language_missings index 4ec675a6a..01f95d7f9 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -919,14 +919,11 @@ ############################################################################ # Checking cgi-bin translations for language: fr # ############################################################################ -< acpitemp < ansi t1.483 < bewan adsl pci st < bewan adsl usb < g.dtm < g.lite -< legacy architecture warning -< open connections < upload fcdsl.o ############################################################################ # Checking cgi-bin translations for language: it # diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 0ea6d2e5f..fe838157f 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -67,8 +67,8 @@ Christian Schmidt, Alexander Marx, Matthias Fischer, Peter Müller, -Jan Paul Tücking, Erik Kapfer, +Jan Paul Tücking, Jonatan Schlag, Dirk Wagner, Marcel Lorenz, @@ -82,12 +82,12 @@ Stephan Feddersen, Timo Eissler, Jan Lentfer, Marcus Scholz, -Ersan Yildirim, Stéphane Pautrel, -Joern-Ingo Weigert, +Ersan Yildirim, +Jörn-Ingo Weigert, +Adolf Belka, Alexander Koch, Wolfgang Apolinarski, -Adolf Belka, Alfred Haas, Lars Schuhmacher, Rene Zingel, @@ -109,7 +109,6 @@ David Kleuker, Hans Horsten, Jakub Ratajczak, Jorrit de Jonge, -Jörn-Ingo Weigert, Przemek Zdroik, Ramax Lo, Alexander Rudolf Gruber, diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index ec51b1ba0..aa41429f6 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -31,10 +31,10 @@ 'Captive delete logo' => 'Supprimer le logo', 'Captive err doublevoucher' => 'Un coupon avec ce code existe déjà', 'Captive expire' => 'Expire', -'Captive expiry time' => 'Heure d'expiration', +'Captive expiry time' => 'Durée de validité', 'Captive export coupons' => 'Export de coupons', 'Captive generate coupons' => 'Création de coupons', -'Captive generated coupon no' => 'Nb de coupons créés', +'Captive generated coupon no' => 'Nb de coupons à créer', 'Captive genvoucher' => 'Générer un coupon', 'Captive heading terms' => 'Termes & conditions', 'Captive heading voucher' => 'Coupon ou code d\accès', @@ -61,10 +61,10 @@ 'Captive title' => 'Titre de la page de connexion', 'Captive upload logo' => 'Télécharger le logo', 'Captive upload logo recommendations' => '(PNG ou JPEG, 1280 x 720 pixels recommandé)', -'Captive valid for' => 'Valide pour', +'Captive valid for' => 'Validité', 'Captive voactive' => 'Active coupons', 'Captive voucher' => 'Coupon', -'Captive vouchervalid' => 'Temps alloué pour ce coupon', +'Captive vouchervalid' => 'Délai d'expiration de ce coupon', 'Captive vout' => 'Reçus émis', 'Captive wrong ext' => 'Le fichier téléchargé a un mauvais type de fichier', 'Choose Rule' => 'Choisissez <u>une</u> des règles suivantes.', @@ -133,12 +133,13 @@ 'a ca certificate with this name already exists' => 'Un certificat de CA avec ce nom existe déjà.', 'a connection with this common name already exists' => 'Une connexion avec ce nom commun existe déjà.', 'a connection with this name already exists' => 'Une connexion avec ce nom existe déjà.', -'abort' => 'annuler', +'abort' => 'Annuler', 'access allowed' => 'Accès autorisé de :', 'access refused with this oinkcode' => 'Accès refusé avec ce code Oink', 'accounting' => 'Comptage', 'accounting user nonpdc' => 'Comptage - pas en mode contrôleur principal de domaine', 'accounting user pdc' => 'Comptage - mode contrôleur principal de domaine', +'acpitemp' => 'ACPI - Températures', 'action' => 'Action', 'activate' => 'Activer', 'activate user' => 'Activer utilisateur', @@ -357,9 +358,9 @@ 'advproxy no internal proxy on blue' => 'Désactiver l'accès du proxy interne BLEU vers d'autres sous-réseaux ', 'advproxy no internal proxy on green' => 'Désactiver l'accès du proxy interne VERT vers d'autres sous-réseaux ', 'advproxy number of L1 dirs' => 'Nombre de sous-dossiers niveau-1 ', -'advproxy off' => 'Proxy éteint', +'advproxy off' => 'Proxy inactif', 'advproxy offline mode' => 'Autoriser le mode hors connexion ', -'advproxy on' => 'Proxy allumé', +'advproxy on' => 'Proxy actif', 'advproxy privacy' => 'Privé', 'advproxy proxy port' => 'Port proxy ', 'advproxy proxy port transparent' => 'Port transparent ', @@ -548,7 +549,7 @@ 'calamaris number of requesting hosts' => 'Nombre d'hôtes demandés ', 'calamaris performance options' => 'Options de performance', 'calamaris proxy reports' => 'Réglages rapports de proxy', -'calamaris refresh list' => 'Rafraichir la liste', +'calamaris refresh list' => 'Actualiser la liste', 'calamaris report interval (in minutes)' => 'Intervalle entre les rapports (en minutes) ', 'calamaris report options' => 'Options de rapport', 'calamaris report period' => 'Période de rapport', @@ -575,7 +576,7 @@ 'capsinactive' => 'INACTIF', 'capsopen' => 'CONNECTE', 'capswarning' => 'ATTENTION', -'caption' => 'Sous-titre', +'caption' => 'Légende', 'ccd add' => 'Ajouter un réseau', 'ccd choose net' => 'Choisissez un réseau', 'ccd client options' => 'Options avancées du client', @@ -658,15 +659,15 @@ 'connection closed' => 'Non connecté...', 'connection debugging' => 'Déboggage de la connexion ', 'connection status and controlc' => 'Etat et contrôle de connexion :', -'connection tracking' => 'Suivi de connexion', +'connection tracking' => 'Suivi de connexions', 'connection type' => 'Type de connexion', 'connection type is invalid' => 'Le type de connexion est non valide.', 'connections' => 'Connexions', 'connections are associated with this ca. deleting the ca will delete these connections as well.' => 'Les connexions sont associées avec cette CA. La suppression de cette CA entraînera la suppression des connexions associées.', 'connscheduler' => 'Planificateur de connexion', -'core notice 1' => '<strong>Remarque :</strong> Il y a une mise à jour disponible de', +'core notice 1' => '<strong>Remarque :</strong> Une mise à jour est disponible depuis la version', 'core notice 2' => 'vers', -'core notice 3' => '.', +'core notice 3' => '', 'could not be opened' => 'ne peut pas être ouvert', 'could not connect to' => 'Impossible de se connecter à', 'could not connect to www ipcop org' => 'Impossible de se connecter à www.ipcop.org', @@ -905,7 +906,7 @@ 'domain not set' => 'Domaine non établi.', 'donation' => 'Faire un don', 'donation-link' => 'https://www.paypal.com/fr_fr/fr/i/btn/btn_donateCC_LG.gif', -'donation-text' => '<strong>IPFire</strong> est développé et maintenu par des volontaires durant leur temps libre.<br>Afin d'assurer les coûts du projet et nous encourager, vous pouvez effectuer un don.', +'donation-text' => '<strong>IPFire</strong> est développé et maintenu par des bénévoles durant leur temps libre.<br>Afin de participer aux coûts du projet et nous encourager, vous pouvez faire un don.', 'done' => 'Fait', 'dos charset' => 'Jeu de car. DOS', 'down and up speed' => 'Entrez votre débit descendant et montant <br /> et cliquez sur <i>Sauvegarder</i>.', @@ -1070,15 +1071,15 @@ 'fireinfo is submitted' => 'Votre profil est soumis au service Fireinfo.', 'fireinfo is submitted button' => 'Ne plus envoyer mes infos de profil à Fireinfo', 'fireinfo kernel version' => 'Version du noyau ', -'fireinfo not submitted' => 'Votre profil ne sera pas soumis au service Fireinfo.', +'fireinfo not submitted' => 'Votre profil n'est pas soumis au service Fireinfo.', 'fireinfo not submitted button' => 'Oui, je souhaite envoyer mes infos de profil à Fireinfo', 'fireinfo pakfire version' => 'Version Pakfire ', -'fireinfo please enable' => 'Veuillez activer le service fireinfo.', -'fireinfo settings' => 'Configuration Fireinfo', +'fireinfo please enable' => 'Veuillez activer le service Fireinfo.', +'fireinfo settings' => 'Paramètre Fireinfo', 'fireinfo system version' => 'Versions du système', 'fireinfo why descr1' => 'Il est très important pour le développement d'IPFire que vous activiez ce', 'fireinfo why descr2' => 'service. ', -'fireinfo why enable' => 'Pourquoi devrais-je activer fireinfo ?', +'fireinfo why enable' => 'Pourquoi devrais-je activer Fireinfo ?', 'fireinfo why read more' => 'En savoir davantage sur les raisons.', 'fireinfo your profile id' => 'Votre ID de profil ', 'firewall' => 'Pare-feu', @@ -1579,6 +1580,7 @@ 'lateprompting' => 'Dernière action', 'lease expires' => 'Bail expiré', 'least preferred' => 'le moins souhaité', +'legacy architecture warning' => 'Vous exécutez IPFire sur une architecture héritée et il est recommandé de mettre à niveau', 'legend' => 'Légende ', 'length' => 'Longueur', 'lifetime' => 'Durée de vie :', @@ -1691,7 +1693,7 @@ 'mbmon fan' => 'Vitesse ventilateurs', 'mbmon fan in' => 'Vitesse ventilateurs en', 'mbmon graphs' => 'Graphs mbmon', -'mbmon label' => ' Intitulé', +'mbmon label' => ' Label', 'mbmon settings' => 'Réglages sondes des graphiques', 'mbmon temp' => 'Température', 'mbmon temp in' => 'Température en', @@ -1864,6 +1866,7 @@ 'only digits allowed in max retries field' => 'Seuls les chiffres sont autorisés dans le champ nombre d'essais maximum.', 'only digits allowed in the idle timeout' => 'Seuls les chiffres sont autorisés pour le délai d'inactivité.', 'only red' => 'Seulement ROUGE', +'open connections' => 'Connexions ouvertes', 'open to all' => 'Autoriser l'accès externe à TOUS', 'openssl produced an error' => 'Une erreur a été produite par Openssl', 'openvpn client' => 'Client OpenVPN', @@ -1925,7 +1928,7 @@ 'outgoing firewall view group' => 'Voir le groupe', 'outgoing firewall warning' => 'Ne pas choisir IP source ou Mac ignore les', 'outgoing overhead in bytes per second' => 'Surcharge en sortie (octets/s)', -'outgoing traffic in bytes per second' => 'Trafic sortant (octets/s)', +'outgoing traffic in bytes per second' => 'Trafic sortant', 'override mtu' => 'Remplacer le MTU par défaut', 'ovpn' => 'OpenVPN', 'ovpn add conf' => 'Configuration additionnelle', @@ -1989,8 +1992,8 @@ 'p2p block' => 'Réseaux P2P', 'p2p block save notice' => 'Veuillez recharger le jeu de règles du pare-feu afin d'appliquer vos modifications.', 'package failed to install' => 'L'installation du paquet a échoué.', -'pagerefresh' => 'La page est en cours de rafraichissement, veuillez patienter.', -'pakfire accept all' => 'Voulez-vous installer tous les paquets ?', +'pagerefresh' => 'La page est en cours d'actualisation, veuillez patienter.', +'pakfire accept all' => 'Voulez-vous installer ce(s) paquet(s) ?', 'pakfire ago' => '', 'pakfire available addons' => 'Modules disponibles :', 'pakfire configuration' => 'Configuration Pakfire', @@ -1998,23 +2001,23 @@ 'pakfire core update level' => 'Version de mise à jour du noyau ', 'pakfire health check' => 'Vérifier si le miroir est accessible (ping) :', 'pakfire install description' => 'Veuillez choisir un ou plusieurs modules dans la liste ci-dessous<br>et cliquer sur le signe PLUS pour le(s) installer.', -'pakfire install package' => 'Vous souhaitez installer les paquets suivants : ', +'pakfire install package' => 'Vous souhaitez installer le(s) module(s) suivant(s) : ', 'pakfire installed addons' => 'Modules installés :', -'pakfire invalid tree' => 'Référentiel choisi invalide', +'pakfire invalid tree' => 'Dépôt choisi invalide', 'pakfire last core list update' => 'Dernière mise à jour de la liste du noyau : ', 'pakfire last package update' => 'Dernière mise à jour de la liste des paquets : ', 'pakfire last serverlist update' => 'Dernière mise à jour de la liste des serveurs : ', 'pakfire last update' => 'Dernière mise à jour : ', -'pakfire possible dependency' => 'Il y a peut-être des dépendances, voici la liste des paquets qu'il faut installer.', +'pakfire possible dependency' => '<br><br>Il y a peut-être des dépendances, voici la liste des paquets qu'il faut (dés)installer.<br>', 'pakfire register' => 'S'inscrire au serveur pakfire :', 'pakfire system state' => 'Statut système PakFire ', -'pakfire tree' => 'Référentiel', +'pakfire tree' => 'Dépôt officiel', 'pakfire tree stable' => 'Stable', 'pakfire tree testing' => 'En test', 'pakfire tree unstable' => 'Instable', -'pakfire uninstall all' => 'Souhaitez-vous désinstaller les packages suivants?', +'pakfire uninstall all' => 'Voulez-vous désinstaller ce(s) paquet(s) ?', 'pakfire uninstall description' => 'Veuillez choisir un ou plusieurs modules dans la liste ci-dessous<br>et cliquer sur le signe MOINS pour le(s) désinstaller.', -'pakfire uninstall package' => 'Vous voulez désinstaller les paquets suivants : ', +'pakfire uninstall package' => 'Vous souhaitez désinstaller le(s) module(s) suivant(s) : ', 'pakfire update daily' => 'Rechercher des mises à jour quotidiennes :', 'pakfire updates' => 'Mise à jour disponible :', 'pakfire working' => 'Pakfire est en cours de traitement... Veuillez attendre que tout soit terminé.', @@ -2126,9 +2129,9 @@ 'red' => 'Internet', 'red1' => 'ROUGE', 'references' => 'Références', -'refresh' => 'Rafraîchir', -'refresh index page while connected' => 'Rafraîchir la page index.cgi tout en restant connecté', -'refresh update list' => 'Rafraîchir la liste des mises à jour', +'refresh' => 'Actualiser', +'refresh index page while connected' => 'Actualiser la page index.cgi pendant la connexion', +'refresh update list' => 'Actualiser la liste des mises à jour', 'registered user rules' => 'Règles Sourcefire VRT pour les utilisateurs enregistrés', 'released' => 'Disponible', 'reload' => 'Recharger', @@ -2226,7 +2229,7 @@ 'set' => 'défini', 'set time now' => 'Synchronisation heure', 'set time now help' => 'A tout moment, pour placer un événement de synchronisation dans la file d'attente (même si vous utilisez un calendrier répété), cliquez sur le bouton <i>Synchronisation heure</i>. Il se peut que vous ayez à attendre cinq minutes ou plus, avant qu'une synchronisation se produise.', -'settings' => 'Réglages ', +'settings' => 'Paramètres ', 'shaping add options' => 'Ajouter un service', 'shaping list options' => 'Services de mise en forme du trafic', 'shared' => 'partagé', @@ -2354,7 +2357,7 @@ 'subnet is invalid' => 'Le masque réseau est non valide', 'subnet mask' => 'Masque de sous-réseau', 'subscripted user rules' => 'Règles Sourcefire VRT avec abonnement', -'successfully refreshed updates list' => 'La liste des mises à jour a été rafraîchie avec succès.', +'successfully refreshed updates list' => 'La liste des mises à jour a été actualisée avec succès.', 'summaries kept' => 'Résumés à conserver :', 'sunday' => 'Dimanche', 'support donation' => 'Soutenez le projet IPFire avec votre don', @@ -2656,7 +2659,7 @@ 'urlfilter block all' => 'Bloquer toutes les url non autorisées explicitement ', 'urlfilter block archives' => 'Bloquer fichiers d'archives compressés ', 'urlfilter block audio-video' => 'Bloquer fichiers audio / vidéo ', -'urlfilter block categories' => 'Bloquage de catégories', +'urlfilter block categories' => 'Blocage de catégories', 'urlfilter block executables' => 'Bloquer fichiers exécutables ', 'urlfilter block ip' => 'Bloquer les sites atteints par leur IP ', 'urlfilter block settings' => ' Réglages de filtre URL', diff --git a/lfs/bacula b/lfs/bacula index 3201688f4..1921db11a 100644 --- a/lfs/bacula +++ b/lfs/bacula @@ -24,7 +24,7 @@
include Config
-VER = 9.6.5 +VER = 9.6.6
THISAPP = bacula-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = bacula -PAK_VER = 6 +PAK_VER = 7
DEPS =
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = e58eb531483de98d0410b33e3ec3d96a +$(DL_FILE)_MD5 = 1ba9e2a2d979cbe9b5d76187f98418ac
install : $(TARGET)
diff --git a/lfs/git b/lfs/git index 86ba8d98d..2928d59e6 100644 --- a/lfs/git +++ b/lfs/git @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2020 IPFire Team info@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 = 2.12.2 +VER = 2.28.0
THISAPP = git-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = git -PAK_VER = 16 +PAK_VER = 17
DEPS = perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ad5ae08664c40caf074392abc301cccd +$(DL_FILE)_MD5 = 5fde0206768ed70092d1fcc8f447251a
install : $(TARGET)
diff --git a/lfs/iptraf-ng b/lfs/iptraf-ng index 3d1c4b61a..3a5ace552 100644 --- a/lfs/iptraf-ng +++ b/lfs/iptraf-ng @@ -1,6 +1,21 @@ ############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2020 IPFire Team info@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 3 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/. # +# # ###############################################################################
############################################################################### @@ -9,7 +24,7 @@
include Config
-VER = 1.1.4 +VER = 1.2.1
THISAPP = iptraf-ng-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -17,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = iptraf-ng -PAK_VER = 3 +PAK_VER = 4
DEPS =
@@ -29,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = de27cfeeede96e2acfb0edc8439b034a +$(DL_FILE)_MD5 = 3e6b425e21c7dc5df35b40799cbfe7dd
install : $(TARGET)
@@ -63,26 +78,19 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch - cd $(DIR_APP) && ./configure \ - --prefix=/usr + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/iptraf-ng_set_path.patch
- cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - - # Binary install - cd $(DIR_APP) && install -v -m750 -D iptraf-ng /usr/sbin/iptraf-ng - cd $(DIR_APP) && install -v -m750 -D rvnamed-ng /usr/sbin/rvnamed-ng + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install
# Directory install -mkdir -vp /var/log/iptraf-ng chmod 750 /var/log/iptraf-ng chown root.root /var/log/iptraf-ng - -mkdir -vp /var/lib/iptraf-ng - chmod 750 /var/lib/iptraf-ng - chown root.root /var/lib/iptraf-ng - -mkdir -vp /var/lock/iptraf-ng - chmod 755 /var/lock/iptraf-ng - chown root.root /var/lock/iptraf-ng + + # Install logrotate + install -v -m 644 $(DIR_SRC)/config/iptraf-ng/iptraf-ng.logrotate \ + /etc/logrotate.d/iptraf-ng
@rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/nginx b/lfs/nginx index 4a52e9471..183fae1de 100644 --- a/lfs/nginx +++ b/lfs/nginx @@ -24,7 +24,7 @@
include Config
-VER = 1.17.8 +VER = 1.19.2
THISAPP = nginx-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nginx -PAK_VER = 10 +PAK_VER = 11
############################################################################### # Top-level Rules @@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 29cd861a13aae69a058cbabaae86177b +$(DL_FILE)_MD5 = 3dc55f6451ed6f819f1c796f4e5e9617
install : $(TARGET)
diff --git a/lfs/openssh b/lfs/openssh index 75210060e..5143f4154 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -24,7 +24,7 @@
include Config
-VER = 8.3p1 +VER = 8.4p1
THISAPP = openssh-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 68d7527bf2672153ca47402f6489a1af +$(DL_FILE)_MD5 = 8f897870404c088e4aa7d1c1c58b526b
install : $(TARGET)
diff --git a/src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch b/src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch deleted file mode 100644 index 24a6ce43c..000000000 --- a/src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur iptraf-ng-1.1.4-orig/src/tcptable.c iptraf-ng-1.1.4/src/tcptable.c ---- iptraf-ng-1.1.4-orig/src/tcptable.c 2013-07-23 15:06:11.000000000 +0200 -+++ iptraf-ng-1.1.4/src/tcptable.c 2013-08-28 19:10:33.000000000 +0200 -@@ -444,6 +444,8 @@ - size_t bufsize) - { - time_t interval = time(NULL) - entry->conn_starttime; -+ if (interval < 1) -+ interval = 1; - - char rbuf[64]; - rate_print(entry->bcount / interval, rbuf, sizeof(rbuf)); diff --git a/src/patches/iptraf-ng_set_path.patch b/src/patches/iptraf-ng_set_path.patch new file mode 100644 index 000000000..27f20e2cd --- /dev/null +++ b/src/patches/iptraf-ng_set_path.patch @@ -0,0 +1,12 @@ +diff -Nur iptraf-ng-1.2.1.orig/Makefile iptraf-ng-1.2.1/Makefile +--- iptraf-ng-1.2.1.orig/Makefile 2020-09-15 14:44:55.118508574 +0000 ++++ iptraf-ng-1.2.1/Makefile 2020-09-15 14:45:22.828358457 +0000 +@@ -25,7 +25,7 @@ + ALL_LDFLAGS = $(LDFLAGS) + STRIP ?= strip + +-prefix = $(HOME) ++prefix = /usr + sbindir_relative = sbin + sbindir = $(prefix)/$(sbindir_relative) + mandir = $(prefix)/share/man
hooks/post-receive -- IPFire 2.x development tree