[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1f60759eab2594d9b30d9f0e3307b3f1cae9cf2d - IPFire-SCM

2 Sep 2021

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  1f60759eab2594d9b30d9f0e3307b3f1cae9cf2d (commit)
       via  a673226e424144b833e77d465be1205c310980d3 (commit)
       via  89f7a4a096d7f50607efc848c4dfd5cfc65619fa (commit)
       via  ca1f4a07abec374b319c29e2f08fce621483bdd0 (commit)
       via  5c9faddc97fbac3099f77325643fab0ef062c796 (commit)
       via  7249b3446b3e3cd40dda60cd40919104ebff047f (commit)
       via  c0ce328e68d3c193b3029a8bf9c0af194bf576ef (commit)
       via  af766db1989ea1743bafa9792b515a642b33bf3c (commit)
       via  b8239208efb63c3f8041556ebfe14fdd73e3dc1f (commit)
       via  48e1d3ff46e84efea4711401feec20d1895f72bd (commit)
       via  f27fb33d471c2600ea1ac461e736fc17806a6bbf (commit)
       via  e64a5b4f74b4cbea8fa2d6a091225d2e80714fb7 (commit)
       via  f8c746044658001f8248c3e5eb113c9a027aae86 (commit)
       via  84f741e7bd30f8124b95b63573d6dc482dc41dbb (commit)
       via  0887a6b29c504934e70d019fb7b48be771d17977 (commit)
       via  785903dbeecb57060bf33621204a63b916b64c46 (commit)
       via  34694d34bfa1bbc0e0a96cc9af419549c5ce85c5 (commit)
       via  3cc3edeca4254b8bdff0f45c707f65d4f8f757a2 (commit)
       via  d10a558196dc6a8c3559659686f74d1722c8741b (commit)
       via  ec0ed11d711513ca944b2a8f34a0638cf0985246 (commit)
       via  04b6a4baa80a26a6e097c2194ef2b57a056083c2 (commit)
       via  0e9b16472230a7f1022cebc445615905574e3e23 (commit)
       via  ee2cd894cde65bf963dc64ebb6f30ddc581c9136 (commit)
       via  1c5aa4affcd12fa5ba78e23ead2a425fdc6beaa1 (commit)
      from  bdac4c81d8cbcce3f363dab622dc62f440e36718 (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 1f60759eab2594d9b30d9f0e3307b3f1cae9cf2d
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Jul 15 14:46:19 2021 +0200
sysstat: Update to version 12.5.4
- Update from 6.0.2 (2005) to 12.5.4 (2021)
    - sysstat-6.0.2-sysconf.patch no longer required. Built into source as standard now.
    - Update rootfile
       rootfile made the same as previous version. New options are available, such as
       pidstat and tapestat but they have been commented out in the rootfile. If required
       in the future they can be uncommented.
    - iso that was built with this sysstat was installed into vm testbed and confirmed
       that all graphs working, especially those related to disk stats.
    - Changelog is too large to show here. Full details for all previous versions can be
       found in the CHANGES file in the source tarball.
    - At least 25 bugs fixed between the two versions.
Tested-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit a673226e424144b833e77d465be1205c310980d3
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Jul 15 14:45:58 2021 +0200
minidlna: Update to version 1.3.0
- Update from 1.2.1 to 1.3.0
    - Update of rootfile not required
    - Changelog
       1.3.0 - Released 24-Nov-2020
         - Fixed some build warnings when building with musl.
         - Use $USER instead of $LOGNAME for the default friendly name.
         - Fixed build with GCC 10
         - Fixed some warnings from newer compilers
         - Disallow negative HTTP chunk lengths. [CVE-2020-28926]
         - Validate SUBSCRIBE callback URL. [CVE-2020-12695]
         - Fixed spurious warnings with ogg coverart
         - Fixed an issue with VLC where browse results would be truncated.
         - Fixed bookmarks on Samsung Q series
         - Added DSD file support.
         - Fixed potential stack smash vulnerability in getsyshwaddr on macOS.
         - Will now reload the log file on SIGHUP.
         - Worked around bad SearchCriteria from the Control4 Android app.
         - Increased max supported network addresses to 8.
         - Added forced alphasort capability.
         - Added episode season and number metadata support.
         - Enabled subtitles by default for unknown DLNA clients, and add enable_subtitles config option.
         - Fixed discovery when connected to certain WiFi routers.
         - Added FreeBSD kqueue support.
         - Added the ability to set the group to run as.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 89f7a4a096d7f50607efc848c4dfd5cfc65619fa
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Thu Sep 2 09:23:07 2021 +0000
core160: add logs.cgi/firewalllog.dat
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit ca1f4a07abec374b319c29e2f08fce621483bdd0
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Thu Jul 15 10:16:18 2021 +0200
firewalllog.dat: Proper display protocol names.
In some cases iptables logs the protocol number instead of the name.
    When accessing the logs via the WUI, this number has been displayed as used
    protocol, which is very hard to read and understand.
This commit adds a new function to the general-functions.pl, which
    generates a hash to translate the protocol number into the protocol
    name.
Fixes #11282.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Reviewed-by: Michael Tremer michael.tremer@ipfire.org
    Reviewed-by: Bernhard Bitsch bbitsch@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 5c9faddc97fbac3099f77325643fab0ef062c796
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Wed Jul 14 22:40:59 2021 +0200
texinfo: Update to version 6.8
- Update from 6.7 to 6.8
    - Update rootfile
    - Changelog is too large to include here. Full details can be found in the
       ChangeLog file in the source tarball
       Following is the content of the NEWS file from the source tarball which highlights
        noteworthy changes, very tersely.
       6.8 (3 July 2021)
        * Language
          . new command @displaymath for formatting of mathematical notation
          . @example takes an argument to specify the language
          . mark these commands as deprecated, not to be used:
            @centerchap, @definfoenclose, @refill, @inforef.
          . new paper size @bsixpaper
        * texi2any
          . should be faster as Perl XS parser is enabled by default
          . SHOW_MENU customization variable replaced by FORMAT_MENU.
            FORMAT_MENU set to 'menu' is the same as SHOW_MENU set to 1, and
            FORMAT_MENU set to 'nomenu' is the same as SHOW_MENU set to 0.
          . only check menu structure if CHECK_NORMAL_MENU_STRUCTURE variable is set
          . changes to HTML output:
              . MathJax support for display of math.  new variables HTML_MATH,
                MATHJAX_SCRIPT and MATHJAX_SOURCE.
              . new variables JS_WEBLABELS and JS_WEBLABELS_FILE to support
                JavaScript License Web Labels
              . by default, use sectional tables of contents instead of menus
              . use section names in links by default (configure with
                xrefautomaticsectiontitle customization variable)
              . CONTENTS_OUTPUT_LOCATION sets location of table of contents
              . document sections wrapped in <div> elements
              . new variable USE_NODE_DIRECTIONS to use node or section structure
                for node directions
              . copiable anchor links for definitions with COPIABLE_ANCHORS variable
              . experimental JavaScript browsing interface enabled with INFO_JS_DIR
              . don't add an extra period before file extension given as an argument
                to @image if image file is not found
        * info
          . support compressed dir files
        * texi2dvi
          . stop on first error in input file
        * texinfo.tex
          . put logical page numbers into PDF's ('page labels')
          . put chapter numbers in the PDF outline
          . new Finnish translation
        * Distribution
          . autoconf 2.71, automake 1.16.3, gettext 0.21
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 7249b3446b3e3cd40dda60cd40919104ebff047f
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Wed Jul 14 22:40:39 2021 +0200
taglib: Update to version 1.12
- Update from 1.11.1 to 1.12
    - Update rootfile
    - Changelog
       TagLib 1.12 (Feb 16, 2021)
        * Added support for WinRT.
        * Added support for Linux on POWER.
        * Added support for classical music tags of iTunes 12.5.
        * Added support for file descriptor to FileStream.
        * Added support for 'cmID', 'purl', 'egid' MP4 atoms.
        * Added support for 'GRP1' ID3v2 frame.
        * Added support for extensible WAV subformat.
        * Enabled FileRef to detect file types based on the stream content.
        * Dropped support for Windows 9x and NT 4.0 or older.
        * Check for mandatory header objects in ASF files.
        * More tolerant handling of RIFF padding, WAV files, broken MPEG streams.
        * Improved calculation of Ogg, Opus, Speex, WAV, MP4 bitrates.
        * Improved Windows compatibility by storing FLAC picture after comments.
        * Fixed numerical genres in ID3v2.3.0 'TCON' frames.
        * Fixed consistency of API removing MP4 items when empty values are set.
        * Fixed consistency of API preferring COMM frames with no description.
        * Fixed OOB read on invalid Ogg FLAC files (CVE-2018-11439).
        * Fixed handling of empty MPEG files.
        * Fixed parsing MP4 mdhd timescale.
        * Fixed reading MP4 atoms with zero length.
        * Fixed reading FLAC files with zero-sized seektables.
        * Fixed handling of lowercase field names in Vorbis Comments.
        * Fixed handling of 'rate' atoms in MP4 files.
        * Fixed handling of invalid UTF-8 sequences.
        * Fixed possible file corruptions when saving Ogg files.
        * Fixed handling of non-audio blocks, sampling rates, DSD audio in WavPack files.
        * TableOfContentsFrame::toString() improved.
        * UserTextIdentificationFrame::toString() improved.
        * Marked FileRef::create() deprecated.
        * Marked MPEG::File::save() with boolean parameters deprecated,
          provide overloads with enum parameters.
        * Several smaller bug fixes and performance improvements.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit c0ce328e68d3c193b3029a8bf9c0af194bf576ef
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Thu Sep 2 09:17:06 2021 +0000
core160: add less
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit af766db1989ea1743bafa9792b515a642b33bf3c
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Wed Jul 14 13:36:57 2021 +0200
less: Update to version 590
- Update from 581.2 to 590
    - Update of rootfile not required
    - Changelog
       Major changes between "less" versions 581 and 590
        * Make less able to read lesskey source files (deprecating lesskey).
        * If XDG_CONFIG_HOME is set, find lesskey source file
          in $XDG_CONFIG_HOME/lesskey rather than $HOME/.lesskey.
        * If XDG_DATA_HOME is set, find and store history file
          in $XDG_DATA_HOME/lesshst rather than $HOME/.lesshst.
        * Add the --lesskey-src option.
        * Add the --file-size option.
        * With -F, if screen is resized to make file fit on one screen, don't exit.
        * Fix bug which could leave terminal in mouse-reporting mode
          after exiting less.
        * Fix bug which caused failure to respond to window resize.
        * Fix backslash bug searching in tag file.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit b8239208efb63c3f8041556ebfe14fdd73e3dc1f
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Wed Jul 14 13:36:40 2021 +0200
hplip: Update to version 3.21.6
- Update from 3.21.2 to 3.21.6
    - Update of rootfile
    - Changelog
       3.21.6
        Added support for following new Distro's:
         Fedora 34
         Ubuntu 21.04
         OpenSuse 15.3
         Debian 10.9
       3.21.4
        Added support for following new Distro's:
         LinuxMint 20.1
         Debian 10.8
        Added support for the following new Printers:
         HP Envy 6400 series
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 48e1d3ff46e84efea4711401feec20d1895f72bd
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Thu Sep 2 09:15:00 2021 +0000
core160: add shutdown.cgi
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit f27fb33d471c2600ea1ac461e736fc17806a6bbf
Author: Leo-Andres Hofmann hofmann@leo-andres.de
Date:   Tue Jul 13 21:06:29 2021 +0200
Run "./make.sh lang"
Signed-off-by: Leo-Andres Hofmann hofmann@leo-andres.de
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit e64a5b4f74b4cbea8fa2d6a091225d2e80714fb7
Author: Leo-Andres Hofmann hofmann@leo-andres.de
Date:   Tue Jul 13 21:06:28 2021 +0200
shutdown.cgi: Add "reboot with filesystem check" button
ipfirereboot.c is able to force a file system check during reboot.
    This patch makes this function available in the shutdown GUI.
Signed-off-by: Leo-Andres Hofmann hofmann@leo-andres.de
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit f8c746044658001f8248c3e5eb113c9a027aae86
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Thu Sep 2 09:08:28 2021 +0000
core160: add libloc
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 84f741e7bd30f8124b95b63573d6dc482dc41dbb
Author: Peter Müller peter.mueller@ipfire.org
Date:   Tue Jul 13 18:40:09 2021 +0200
libloc: update to 0.9.7
Signed-off-by: Peter Müller peter.mueller@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 0887a6b29c504934e70d019fb7b48be771d17977
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Thu Sep 2 09:05:43 2021 +0000
core160: add ddns
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 785903dbeecb57060bf33621204a63b916b64c46
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Mon Jul 12 18:47:47 2021 +0200
ddns: Update to 014.
This is a major update to the latest available version of ddns.
Remove patches which are part of the upstream release.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 34694d34bfa1bbc0e0a96cc9af419549c5ce85c5
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Thu Sep 2 09:02:52 2021 +0000
core160: add style.css
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 3cc3edeca4254b8bdff0f45c707f65d4f8f757a2
Author: Leo-Andres Hofmann hofmann@leo-andres.de
Date:   Sun Jul 11 20:22:12 2021 +0200
RRD graphs: Remove padding around graph images
The images inherited padding from the general design and
    have been resized to fit the layout, resulting in blurred graphs.
    This removes the padding and shows the graphs in full size.
Fixes: #12657
Signed-off-by: Leo-Andres Hofmann hofmann@leo-andres.de
    Reviewed-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit d10a558196dc6a8c3559659686f74d1722c8741b
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Thu Sep 2 08:58:21 2021 +0000
core160: add firewall.cgi
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit ec0ed11d711513ca944b2a8f34a0638cf0985246
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Jul 11 19:54:18 2021 +0200
firewall.cgi: Make checked and selected hashes private for each single function.
Some functions uses those two hashes and are altering them - making them
    private will erase and fill it with new data.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 04b6a4baa80a26a6e097c2194ef2b57a056083c2
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Jul 11 19:54:17 2021 +0200
firewall.cgi: Fix multiple usage of configured net or interface.
When configuring a standard network as source or target the same
    interface would be pre-selected as firewall interface when editing an
    existing rule.
In case an existing input rule with an configured firewall interface
    should be changed, the same network device has been pre-selected in the
    standard networks dropdown box.
This easily confuses users and may lead to false configurations when
    saving an edited rule.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 0e9b16472230a7f1022cebc445615905574e3e23
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Jul 11 19:54:16 2021 +0200
firewall.cgi: Remove faulty assignments for selected hash.
The removed assignments are wrong because both are trying to assign
    something different to the same key and will overwrite each other.
Secondary the assignment to the hash is not needed at this place, so it
    safely can be removed.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit ee2cd894cde65bf963dc64ebb6f30ddc581c9136
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Thu Sep 2 08:52:41 2021 +0000
core160: add poppler
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 1c5aa4affcd12fa5ba78e23ead2a425fdc6beaa1
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Jul 8 13:43:43 2021 +0200
poppler: Update to version 21.07.0
- Update from 21.05.0 to 21.07.0
    - Update of rootfile
    - Changelog is too large to include here. Full details can be found in the ChangeLog file
       in the source tarball. This is a collection of all the commits made.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 config/cfgroot/general-functions.pl                |  36 +++
 config/rootfiles/common/libloc                     |   2 +
 config/rootfiles/common/poppler                    |   4 +-
 config/rootfiles/common/sysstat                    |  75 ++++--
 config/rootfiles/common/texinfo                    |   6 +
 .../{oldcore/104 => core/160}/filelists/ddns       |   0
 config/rootfiles/core/160/filelists/files          |   4 +
 .../{oldcore/103 => core/160}/filelists/less       |   0
 .../{oldcore/148 => core/160}/filelists/libloc     |   0
 .../{oldcore/110 => core/160}/filelists/poppler    |   0
 config/rootfiles/packages/hplip                    |  75 +++---
 config/rootfiles/packages/taglib                   |   3 +-
 doc/language_issues.en                             |   2 +
 doc/language_issues.es                             |   2 +
 doc/language_issues.fr                             |   2 +
 doc/language_issues.it                             |   2 +
 doc/language_issues.nl                             |   2 +
 doc/language_issues.pl                             |   2 +
 doc/language_issues.ru                             |   2 +
 doc/language_issues.tr                             |   2 +
 doc/language_missings                              |  14 +
 html/cgi-bin/firewall.cgi                          |  26 +-
 html/cgi-bin/logs.cgi/firewalllog.dat              |   8 +
 html/cgi-bin/shutdown.cgi                          |  79 ++++--
 html/html/themes/ipfire/include/css/style.css      |   2 +-
 langs/de/cgi-bin/de.pl                             |   2 +
 langs/en/cgi-bin/en.pl                             |   2 +
 lfs/ddns                                           |  11 +-
 lfs/hplip                                          |   6 +-
 lfs/less                                           |   4 +-
 lfs/libloc                                         |   8 +-
 lfs/minidlna                                       |   8 +-
 lfs/poppler                                        |   4 +-
 lfs/sysstat                                        |  10 +-
 lfs/taglib                                         |   8 +-
 lfs/texinfo                                        |   8 +-
 ...dns-013-add-option-to-list-token-provider.patch | 292 ---------------------
 src/patches/ddns-013-duckdns-new-api.patch         |  83 ------
 src/patches/ddns-013-dyfi-use-https.patch          |  22 --
 ...dns-013-fix-argparse-list-token-providers.patch |  23 --
 src/patches/ddns-013-proper-encode-string.patch    |  24 --
 src/patches/sysstat-6.0.2-sysconf.patch            |  26 --
 42 files changed, 300 insertions(+), 591 deletions(-)
 copy config/rootfiles/{oldcore/104 => core/160}/filelists/ddns (100%)
 copy config/rootfiles/{oldcore/103 => core/160}/filelists/less (100%)
 copy config/rootfiles/{oldcore/148 => core/160}/filelists/libloc (100%)
 copy config/rootfiles/{oldcore/110 => core/160}/filelists/poppler (100%)
 delete mode 100644 src/patches/ddns-013-add-option-to-list-token-provider.patch
 delete mode 100644 src/patches/ddns-013-duckdns-new-api.patch
 delete mode 100644 src/patches/ddns-013-dyfi-use-https.patch
 delete mode 100644 src/patches/ddns-013-fix-argparse-list-token-providers.patch
 delete mode 100644 src/patches/ddns-013-proper-encode-string.patch
 delete mode 100644 src/patches/sysstat-6.0.2-sysconf.patch
Difference in files:

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index c7df46489..de608e38b 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -1363,6 +1363,42 @@ sub formatBytes {
    return sprintf("%.2f %s", $bytes, $unit);
 }
+# Function to collect and generate a hash for translating protocol numbers into
+# their names.
+sub generateProtoTransHash () {
+	# File which contains the protocol definitions.
+	my $protocols_file = "/etc/protocols";
+
+	my %protocols = ();
+
+	# Open protocols file.
+	open(FILE, "$protocols_file") or die "Could not open $protocols_file. $!\n";
+
+	# Loop through the file.
+	while (my $line = <FILE>) {
+		# Skip comments.
+		next if ($line =~ /^#/);
+
+		# Skip blank  lines.
+		next if ($line =~ /^\s*$/);
+
+		# Remove any newlines.
+		chomp($line);
+
+		# Split line content.
+		my ($protocol_lc, $number, $protocol_uc, $comment) = split(' ', $line);
+
+		# Add proto details to the hash of protocols.
+		$protocols{$number} = $protocol_uc;
+	}
+
+	# Close file handle.
+	close(FILE);
+
+	# Return the hash.
+	return %protocols;
+}
+
 # Cloud Stuff
sub running_in_cloud() {
diff --git a/config/rootfiles/common/libloc b/config/rootfiles/common/libloc
index a605c0db7..6b788658d 100644
--- a/config/rootfiles/common/libloc
+++ b/config/rootfiles/common/libloc
@@ -91,6 +91,7 @@ usr/share/xt_geoip/CM.iv4
 usr/share/xt_geoip/CN.iv4
 usr/share/xt_geoip/CO.iv4
 usr/share/xt_geoip/CR.iv4
+usr/share/xt_geoip/CS.iv4
 usr/share/xt_geoip/CU.iv4
 usr/share/xt_geoip/CV.iv4
 usr/share/xt_geoip/CW.iv4
@@ -287,6 +288,7 @@ usr/share/xt_geoip/VN.iv4
 usr/share/xt_geoip/VU.iv4
 usr/share/xt_geoip/WF.iv4
 usr/share/xt_geoip/WS.iv4
+usr/share/xt_geoip/XD.iv4
 usr/share/xt_geoip/YE.iv4
 usr/share/xt_geoip/YT.iv4
 usr/share/xt_geoip/ZA.iv4
diff --git a/config/rootfiles/common/poppler b/config/rootfiles/common/poppler
index d80001c39..9746d9412 100644
--- a/config/rootfiles/common/poppler
+++ b/config/rootfiles/common/poppler
@@ -172,8 +172,8 @@ usr/lib/libpoppler-cpp.so.0.9.0
 usr/lib/libpoppler-glib.so.8
 usr/lib/libpoppler-glib.so.8.21.0
 #usr/lib/libpoppler.so
-usr/lib/libpoppler.so.110
-usr/lib/libpoppler.so.110.0.0
+usr/lib/libpoppler.so.111
+usr/lib/libpoppler.so.111.0.0
 #usr/lib/pkgconfig/poppler-cpp.pc
 #usr/lib/pkgconfig/poppler-glib.pc
 #usr/lib/pkgconfig/poppler.pc
diff --git a/config/rootfiles/common/sysstat b/config/rootfiles/common/sysstat
index b17e527a7..480cbecd3 100644
--- a/config/rootfiles/common/sysstat
+++ b/config/rootfiles/common/sysstat
@@ -1,25 +1,70 @@
+#etc/sysconfig/sysstat
 #etc/sysconfig/sysstat.ioconf
+#usr/bin/cifsiostat
 usr/bin/iostat
 usr/bin/mpstat
+#usr/bin/pidstat
 usr/bin/sadf
 usr/bin/sar
-#usr/doc
-#usr/doc/sysstat-6.0.2
-#usr/doc/sysstat-6.0.2/CHANGES
-#usr/doc/sysstat-6.0.2/COPYING
-#usr/doc/sysstat-6.0.2/CREDITS
-#usr/doc/sysstat-6.0.2/FAQ
-#usr/doc/sysstat-6.0.2/README
-#usr/doc/sysstat-6.0.2/sysstat-6.0.2.lsm
+#usr/bin/tapestat
 #usr/lib/sa
 usr/lib/sa/sa1
 usr/lib/sa/sa2
 usr/lib/sa/sadc
-#usr/man/man1/iostat.1
-#usr/man/man1/mpstat.1
-#usr/man/man1/sadf.1
-#usr/man/man1/sar.1
-#usr/man/man8/sa1.8
-#usr/man/man8/sa2.8
-#usr/man/man8/sadc.8
+#usr/share/doc/sysstat-12.5.4
+#usr/share/doc/sysstat-12.5.4/CHANGES
+#usr/share/doc/sysstat-12.5.4/COPYING
+#usr/share/doc/sysstat-12.5.4/CREDITS
+#usr/share/doc/sysstat-12.5.4/FAQ.md
+#usr/share/doc/sysstat-12.5.4/README.md
+#usr/share/doc/sysstat-12.5.4/sysstat-12.5.4.lsm
+#usr/share/locale/af/LC_MESSAGES/sysstat.mo
+#usr/share/locale/cs/LC_MESSAGES/sysstat.mo
+#usr/share/locale/da/LC_MESSAGES/sysstat.mo
+#usr/share/locale/de/LC_MESSAGES/sysstat.mo
+#usr/share/locale/eo/LC_MESSAGES/sysstat.mo
+#usr/share/locale/es/LC_MESSAGES/sysstat.mo
+#usr/share/locale/eu/LC_MESSAGES/sysstat.mo
+#usr/share/locale/fi/LC_MESSAGES/sysstat.mo
+#usr/share/locale/fr/LC_MESSAGES/sysstat.mo
+#usr/share/locale/fur/LC_MESSAGES/sysstat.mo
+#usr/share/locale/gl/LC_MESSAGES/sysstat.mo
+#usr/share/locale/hr/LC_MESSAGES/sysstat.mo
+#usr/share/locale/hu/LC_MESSAGES/sysstat.mo
+#usr/share/locale/id/LC_MESSAGES/sysstat.mo
+#usr/share/locale/it/LC_MESSAGES/sysstat.mo
+#usr/share/locale/ja/LC_MESSAGES/sysstat.mo
+#usr/share/locale/ko/LC_MESSAGES/sysstat.mo
+#usr/share/locale/ky/LC_MESSAGES/sysstat.mo
+#usr/share/locale/lv/LC_MESSAGES/sysstat.mo
+#usr/share/locale/mt
+#usr/share/locale/mt/LC_MESSAGES
+#usr/share/locale/mt/LC_MESSAGES/sysstat.mo
+#usr/share/locale/nb/LC_MESSAGES/sysstat.mo
+#usr/share/locale/nl/LC_MESSAGES/sysstat.mo
+#usr/share/locale/nn/LC_MESSAGES/sysstat.mo
+#usr/share/locale/pl/LC_MESSAGES/sysstat.mo
+#usr/share/locale/pt/LC_MESSAGES/sysstat.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/sysstat.mo
+#usr/share/locale/ro/LC_MESSAGES/sysstat.mo
+#usr/share/locale/ru/LC_MESSAGES/sysstat.mo
+#usr/share/locale/sk/LC_MESSAGES/sysstat.mo
+#usr/share/locale/sr/LC_MESSAGES/sysstat.mo
+#usr/share/locale/sv/LC_MESSAGES/sysstat.mo
+#usr/share/locale/tr/LC_MESSAGES/sysstat.mo
+#usr/share/locale/uk/LC_MESSAGES/sysstat.mo
+#usr/share/locale/vi/LC_MESSAGES/sysstat.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/sysstat.mo
+#usr/share/locale/zh_TW/LC_MESSAGES/sysstat.mo
+#usr/share/man/man1/cifsiostat.1.xz
+#usr/share/man/man1/iostat.1.xz
+#usr/share/man/man1/mpstat.1.xz
+#usr/share/man/man1/pidstat.1.xz
+#usr/share/man/man1/sadf.1.xz
+#usr/share/man/man1/sar.1.xz
+#usr/share/man/man1/tapestat.1.xz
+#usr/share/man/man5/sysstat.5.xz
+#usr/share/man/man8/sa1.8.xz
+#usr/share/man/man8/sa2.8.xz
+#usr/share/man/man8/sadc.8.xz
 var/log/sa
diff --git a/config/rootfiles/common/texinfo b/config/rootfiles/common/texinfo
index 96cc3f0e9..13df03542 100644
--- a/config/rootfiles/common/texinfo
+++ b/config/rootfiles/common/texinfo
@@ -76,9 +76,14 @@
 #usr/share/texinfo/init
 #usr/share/texinfo/init/book.pm
 #usr/share/texinfo/init/chm.pm
+#usr/share/texinfo/init/highlight_syntax.pm
 #usr/share/texinfo/init/html32.pm
 #usr/share/texinfo/init/latex2html.pm
 #usr/share/texinfo/init/tex4ht.pm
+#usr/share/texinfo/js
+#usr/share/texinfo/js/info.css
+#usr/share/texinfo/js/info.js
+#usr/share/texinfo/js/modernizr.js
 #usr/share/texinfo/lib
 #usr/share/texinfo/lib/Text-Unidecode
 #usr/share/texinfo/lib/Text-Unidecode/lib
@@ -419,6 +424,7 @@
 #usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/_Encode.pm
 #usr/share/texinfo/lib/libintl-perl/lib/Locale/TextDomain.pm
 #usr/share/texinfo/lib/libintl-perl/lib/Locale/Util.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/gettext_dumb.pm
 #usr/share/texinfo/lib/libintl-perl/lib/Locale/gettext_pp.pm
 #usr/share/texinfo/texindex.awk
 #usr/share/texinfo/texinfo.dtd
diff --git a/config/rootfiles/core/160/filelists/ddns b/config/rootfiles/core/160/filelists/ddns
new file mode 120000
index 000000000..739516420
--- /dev/null
+++ b/config/rootfiles/core/160/filelists/ddns
@@ -0,0 +1 @@
+../../../common/ddns
\ No newline at end of file
diff --git a/config/rootfiles/core/160/filelists/files b/config/rootfiles/core/160/filelists/files
index 36600adf0..d1f904ef5 100644
--- a/config/rootfiles/core/160/filelists/files
+++ b/config/rootfiles/core/160/filelists/files
@@ -1,3 +1,7 @@
 usr/lib/firewall/rules.pl
+srv/web/ipfire/cgi-bin/firewall.cgi
 srv/web/ipfire/cgi-bin/fwhosts.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
+srv/web/ipfire/cgi-bin/shutdown.cgi
+srv/web/ipfire/html/themes/ipfire/include/css/style.css
 var/ipfire/general-functions.pl
diff --git a/config/rootfiles/core/160/filelists/less b/config/rootfiles/core/160/filelists/less
new file mode 120000
index 000000000..65c0e0771
--- /dev/null
+++ b/config/rootfiles/core/160/filelists/less
@@ -0,0 +1 @@
+../../../common/less
\ No newline at end of file
diff --git a/config/rootfiles/core/160/filelists/libloc b/config/rootfiles/core/160/filelists/libloc
new file mode 120000
index 000000000..ff4a92429
--- /dev/null
+++ b/config/rootfiles/core/160/filelists/libloc
@@ -0,0 +1 @@
+../../../common/libloc
\ No newline at end of file
diff --git a/config/rootfiles/core/160/filelists/poppler b/config/rootfiles/core/160/filelists/poppler
new file mode 120000
index 000000000..39aa6c263
--- /dev/null
+++ b/config/rootfiles/core/160/filelists/poppler
@@ -0,0 +1 @@
+../../../common/poppler
\ No newline at end of file
diff --git a/config/rootfiles/packages/hplip b/config/rootfiles/packages/hplip
index 5adddae1e..2fde7ac65 100644
--- a/config/rootfiles/packages/hplip
+++ b/config/rootfiles/packages/hplip
@@ -1,40 +1,40 @@
-#usr/share/doc/hplip-3.21.2
-#usr/share/doc/hplip-3.21.2/COPYING
-#usr/share/doc/hplip-3.21.2/README_LIBJPG
-#usr/share/doc/hplip-3.21.2/commandline.html
-#usr/share/doc/hplip-3.21.2/copying.html
-#usr/share/doc/hplip-3.21.2/copyright
-#usr/share/doc/hplip-3.21.2/devicemanager.html
-#usr/share/doc/hplip-3.21.2/faxtrouble.html
-#usr/share/doc/hplip-3.21.2/gettinghelp.html
-#usr/share/doc/hplip-3.21.2/hpscan.html
-#usr/share/doc/hplip-3.21.2/images
-#usr/share/doc/hplip-3.21.2/images/favicon.ico
-#usr/share/doc/hplip-3.21.2/images/print.png
-#usr/share/doc/hplip-3.21.2/images/toolbox_actions.png
-#usr/share/doc/hplip-3.21.2/images/toolbox_fax.png
-#usr/share/doc/hplip-3.21.2/images/toolbox_print_control.png
-#usr/share/doc/hplip-3.21.2/images/toolbox_print_settings.png
-#usr/share/doc/hplip-3.21.2/images/toolbox_status.png
-#usr/share/doc/hplip-3.21.2/images/toolbox_supplies.png
-#usr/share/doc/hplip-3.21.2/images/xsane.png
-#usr/share/doc/hplip-3.21.2/index.html
-#usr/share/doc/hplip-3.21.2/mainttask.html
-#usr/share/doc/hplip-3.21.2/plugins.html
-#usr/share/doc/hplip-3.21.2/print.html
-#usr/share/doc/hplip-3.21.2/printing.html
-#usr/share/doc/hplip-3.21.2/printoptions.html
-#usr/share/doc/hplip-3.21.2/printtroubleshooting.html
-#usr/share/doc/hplip-3.21.2/scanning.html
-#usr/share/doc/hplip-3.21.2/scantrouble.html
-#usr/share/doc/hplip-3.21.2/sendfax.html
-#usr/share/doc/hplip-3.21.2/setup.html
-#usr/share/doc/hplip-3.21.2/styles
-#usr/share/doc/hplip-3.21.2/styles/css.css
-#usr/share/doc/hplip-3.21.2/systray.html
-#usr/share/doc/hplip-3.21.2/troubleshooting.html
-#usr/share/doc/hplip-3.21.2/uninstalling.html
-#usr/share/doc/hplip-3.21.2/upgrading.html
+#usr/share/doc/hplip-3.21.6
+#usr/share/doc/hplip-3.21.6/COPYING
+#usr/share/doc/hplip-3.21.6/README_LIBJPG
+#usr/share/doc/hplip-3.21.6/commandline.html
+#usr/share/doc/hplip-3.21.6/copying.html
+#usr/share/doc/hplip-3.21.6/copyright
+#usr/share/doc/hplip-3.21.6/devicemanager.html
+#usr/share/doc/hplip-3.21.6/faxtrouble.html
+#usr/share/doc/hplip-3.21.6/gettinghelp.html
+#usr/share/doc/hplip-3.21.6/hpscan.html
+#usr/share/doc/hplip-3.21.6/images
+#usr/share/doc/hplip-3.21.6/images/favicon.ico
+#usr/share/doc/hplip-3.21.6/images/print.png
+#usr/share/doc/hplip-3.21.6/images/toolbox_actions.png
+#usr/share/doc/hplip-3.21.6/images/toolbox_fax.png
+#usr/share/doc/hplip-3.21.6/images/toolbox_print_control.png
+#usr/share/doc/hplip-3.21.6/images/toolbox_print_settings.png
+#usr/share/doc/hplip-3.21.6/images/toolbox_status.png
+#usr/share/doc/hplip-3.21.6/images/toolbox_supplies.png
+#usr/share/doc/hplip-3.21.6/images/xsane.png
+#usr/share/doc/hplip-3.21.6/index.html
+#usr/share/doc/hplip-3.21.6/mainttask.html
+#usr/share/doc/hplip-3.21.6/plugins.html
+#usr/share/doc/hplip-3.21.6/print.html
+#usr/share/doc/hplip-3.21.6/printing.html
+#usr/share/doc/hplip-3.21.6/printoptions.html
+#usr/share/doc/hplip-3.21.6/printtroubleshooting.html
+#usr/share/doc/hplip-3.21.6/scanning.html
+#usr/share/doc/hplip-3.21.6/scantrouble.html
+#usr/share/doc/hplip-3.21.6/sendfax.html
+#usr/share/doc/hplip-3.21.6/setup.html
+#usr/share/doc/hplip-3.21.6/styles
+#usr/share/doc/hplip-3.21.6/styles/css.css
+#usr/share/doc/hplip-3.21.6/systray.html
+#usr/share/doc/hplip-3.21.6/troubleshooting.html
+#usr/share/doc/hplip-3.21.6/uninstalling.html
+#usr/share/doc/hplip-3.21.6/upgrading.html
 #usr/share/hplip
 usr/share/hplip/dat2drv
 usr/share/hplip/locatedriver
@@ -521,6 +521,7 @@ usr/share/ppd/HP
 #usr/share/ppd/HP/hp-envy_5640_series.ppd.gz
 #usr/share/ppd/HP/hp-envy_5660_series.ppd.gz
 #usr/share/ppd/HP/hp-envy_6000_series.ppd.gz
+#usr/share/ppd/HP/hp-envy_6400_series.ppd.gz
 #usr/share/ppd/HP/hp-envy_7640_series.ppd.gz
 #usr/share/ppd/HP/hp-envy_8000_series.ppd.gz
 #usr/share/ppd/HP/hp-envy_photo_6200_series.ppd.gz
diff --git a/config/rootfiles/packages/taglib b/config/rootfiles/packages/taglib
index 4aa79ec7f..fa341c1e5 100644
--- a/config/rootfiles/packages/taglib
+++ b/config/rootfiles/packages/taglib
@@ -25,6 +25,7 @@ usr/bin/taglib-config
 #usr/include/taglib/generalencapsulatedobjectframe.h
 #usr/include/taglib/id3v1genres.h
 #usr/include/taglib/id3v1tag.h
+#usr/include/taglib/id3v2.h
 #usr/include/taglib/id3v2extendedheader.h
 #usr/include/taglib/id3v2footer.h
 #usr/include/taglib/id3v2frame.h
@@ -107,7 +108,7 @@ usr/bin/taglib-config
 #usr/include/taglib/xmproperties.h
 usr/lib/libtag.so
 usr/lib/libtag.so.1
-usr/lib/libtag.so.1.17.0
+usr/lib/libtag.so.1.18.0
 usr/lib/libtag_c.so
 usr/lib/libtag_c.so.0
 usr/lib/libtag_c.so.0.0.0
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 0c9b88777..ee8321a32 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1501,8 +1501,10 @@ WARNING: untranslated string: rdns = rDNS
 WARNING: untranslated string: read bytes = Bytes Read
 WARNING: untranslated string: real address = Real Address
 WARNING: untranslated string: reboot = Reboot
+WARNING: untranslated string: reboot fsck = Reboot & check filesystem
 WARNING: untranslated string: rebooting = Rebooting
 WARNING: untranslated string: rebooting ipfire = Rebooting IPFire
+WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check
 WARNING: untranslated string: received = Received
 WARNING: untranslated string: reconnect = Reconnect
 WARNING: untranslated string: reconnection = Reconnection
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 626eec21a..2e58b5b02 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1344,6 +1344,8 @@ WARNING: untranslated string: ptr = PTR
 WARNING: untranslated string: qos enter bandwidths = You will need to enter your downstream and upstream bandwidth!
 WARNING: untranslated string: random number generator daemon = Random Number Generator Daemon
 WARNING: untranslated string: rdns = rDNS
+WARNING: untranslated string: reboot fsck = Reboot & check filesystem
+WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check
 WARNING: untranslated string: received = Received
 WARNING: untranslated string: red1 = RED
 WARNING: untranslated string: required = Required
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 42f8160b7..72826274b 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -924,6 +924,8 @@ 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: pakfire ago = ago.
+WARNING: untranslated string: reboot fsck = Reboot & check filesystem
+WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check
 WARNING: untranslated string: route config changed = unknown string
 WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string
diff --git a/doc/language_issues.it b/doc/language_issues.it
index 9c0b62c15..4538461c6 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -1128,6 +1128,8 @@ WARNING: untranslated string: pptp route = PPTP Route
 WARNING: untranslated string: processor vulnerability mitigations = Processor Vulnerability Mitigations
 WARNING: untranslated string: ptr = PTR
 WARNING: untranslated string: rdns = rDNS
+WARNING: untranslated string: reboot fsck = Reboot & check filesystem
+WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check
 WARNING: untranslated string: received = Received
 WARNING: untranslated string: required = Required
 WARNING: untranslated string: required field = Required field
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 5db088b66..eb41b59ed 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1161,6 +1161,8 @@ WARNING: untranslated string: processor vulnerability mitigations = Processor Vu
 WARNING: untranslated string: ptr = PTR
 WARNING: untranslated string: random number generator daemon = Random Number Generator Daemon
 WARNING: untranslated string: rdns = rDNS
+WARNING: untranslated string: reboot fsck = Reboot & check filesystem
+WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check
 WARNING: untranslated string: received = Received
 WARNING: untranslated string: required = Required
 WARNING: untranslated string: required field = Required field
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 95e68faaf..a023bdbee 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1353,6 +1353,8 @@ WARNING: untranslated string: ptr = PTR
 WARNING: untranslated string: qos enter bandwidths = You will need to enter your downstream and upstream bandwidth!
 WARNING: untranslated string: random number generator daemon = Random Number Generator Daemon
 WARNING: untranslated string: rdns = rDNS
+WARNING: untranslated string: reboot fsck = Reboot & check filesystem
+WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check
 WARNING: untranslated string: received = Received
 WARNING: untranslated string: red1 = RED
 WARNING: untranslated string: required = Required
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index cfaeed5b5..d1abbc4a8 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1348,6 +1348,8 @@ WARNING: untranslated string: ptr = PTR
 WARNING: untranslated string: qos enter bandwidths = You will need to enter your downstream and upstream bandwidth!
 WARNING: untranslated string: random number generator daemon = Random Number Generator Daemon
 WARNING: untranslated string: rdns = rDNS
+WARNING: untranslated string: reboot fsck = Reboot & check filesystem
+WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check
 WARNING: untranslated string: received = Received
 WARNING: untranslated string: red1 = RED
 WARNING: untranslated string: required = Required
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index e89ce0601..a882db069 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -1036,6 +1036,8 @@ WARNING: untranslated string: pakfire tree unstable = Unstable
 WARNING: untranslated string: please reboot to apply your changes = Please reboot to apply your changes
 WARNING: untranslated string: processor vulnerability mitigations = Processor Vulnerability Mitigations
 WARNING: untranslated string: ptr = PTR
+WARNING: untranslated string: reboot fsck = Reboot & check filesystem
+WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check
 WARNING: untranslated string: received = Received
 WARNING: untranslated string: required = Required
 WARNING: untranslated string: route config changed = unknown string
diff --git a/doc/language_missings b/doc/language_missings
index fc74274bd..344406ebc 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -691,6 +691,8 @@
 < qos enter bandwidths
 < random number generator daemon
 < rdns
+< reboot fsck
+< rebooting ipfire fsck
 < received
 < red1
 < required
@@ -930,6 +932,8 @@
 < bewan adsl usb
 < g.dtm
 < g.lite
+< reboot fsck
+< rebooting ipfire fsck
 < upload fcdsl.o
 ############################################################################
 # Checking cgi-bin translations for language: it                           #
@@ -1209,6 +1213,8 @@
 < processor vulnerability mitigations
 < ptr
 < rdns
+< reboot fsck
+< rebooting ipfire fsck
 < received
 < required
 < required field
@@ -1650,6 +1656,8 @@
 < ptr
 < random number generator daemon
 < rdns
+< reboot fsck
+< rebooting ipfire fsck
 < received
 < required
 < required field
@@ -2437,6 +2445,8 @@
 < qos enter bandwidths
 < random number generator daemon
 < rdns
+< reboot fsck
+< rebooting ipfire fsck
 < received
 < red1
 < required
@@ -3333,6 +3343,8 @@
 < qos enter bandwidths
 < random number generator daemon
 < rdns
+< reboot fsck
+< rebooting ipfire fsck
 < received
 < red1
 < required
@@ -3692,6 +3704,8 @@
 < please reboot to apply your changes
 < processor vulnerability mitigations
 < ptr
+< reboot fsck
+< rebooting ipfire fsck
 < received
 < required
 < runmode
diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 70dee8d3c..0eace5f11 100644
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -1005,6 +1005,10 @@ sub gen_dd_block
    my $grp=shift;
    my $helper='';
    my $show='';
+
+	my %checked = ();
+	my %selected = ();
+
    $checked{'grp1'}{$fwdfwsettings{'grp1'}} 				= 'CHECKED';
    $checked{'grp2'}{$fwdfwsettings{'grp2'}} 				= 'CHECKED';
    $checked{'grp3'}{$fwdfwsettings{'grp3'}} 				= 'CHECKED';
@@ -1022,8 +1026,6 @@ sub gen_dd_block
    $checked{'TIME_SUN'}{$fwdfwsettings{'TIME_SUN'}} 		= 'CHECKED';
    $selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}}		= 'selected';
    $selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}}			= 'selected';
-	$selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected';
-	$selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected';
 print<<END;
    	<table width='100%' border='0'>
    	<tr><td width='50%' valign='top'>
@@ -1034,7 +1036,12 @@ END
    	{
    		next if($defaultNetworks{$network}{'NAME'} eq "IPFire");
    		print "<option value='$defaultNetworks{$network}{'NAME'}'";
-			print " selected='selected'" if ($fwdfwsettings{$fwdfwsettings{$grp}} eq $defaultNetworks{$network}{'NAME'});
+
+			# Check if the the key handles a standard network.
+			if ( grep(/std_net_/, $fwdfwsettings{$grp}) ) {
+				print " selected='selected'" if ($fwdfwsettings{$fwdfwsettings{$grp}} eq $defaultNetworks{$network}{'NAME'});
+			}
+
    		my $defnet="$defaultNetworks{$network}{'NAME'}_NETADDRESS";
    		my $defsub="$defaultNetworks{$network}{'NAME'}_NETMASK";
    		my $defsub1=&General::subtocidr($ifaces{$defsub});
@@ -1479,7 +1486,10 @@ sub newrule
    &General::readhasharray("$configlocationgrp", %customlocationgrp);
    &General::readhasharray("$configipsec", %ipsecconf);
    &General::get_aliases(%aliases);
-	my %checked=();
+
+	my %checked = ();
+	my %selected = ();
+
    my $helper;
    my $sum=0;
    if($fwdfwsettings{'config'} eq ''){$fwdfwsettings{'config'}=$configfwdfw;}
@@ -1512,8 +1522,8 @@ sub newrule
    $checked{'USE_NAT'}{$fwdfwsettings{'USE_NAT'}} 			= 'CHECKED';
    $selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}}		= 'selected';
    $selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}}			= 'selected';
-	$selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected';
-	$selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected';
+	$selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} = 'selected' if ($fwdfwsettings{'grp2'} eq "ipfire");
+	$selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} = 'selected' if ($fwdfwsettings{'grp1'} eq "ipfire_src");
    #check if update and get values
    if($fwdfwsettings{'updatefwrule'} eq 'on' || $fwdfwsettings{'copyfwrule'} eq 'on' && !$errormessage){
    	&General::readhasharray("$config", %hash);
@@ -1584,8 +1594,8 @@ sub newrule
    			$checked{'RATE_LIMIT'}{$fwdfwsettings{'RATE_LIMIT'}}	= 'CHECKED';
    			$selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}}		= 'selected';
    			$selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}}			= 'selected';
-				$selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected';
-				$selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected';
+				$selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} = 'selected' if ($fwdfwsettings{'grp2'} eq "ipfire");
+				$selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} = 'selected' if ($fwdfwsettings{'grp1'} eq "ipfire_src");
    			$selected{'dnat'}{$fwdfwsettings{'dnat'}}				='selected';
    			$selected{'snat'}{$fwdfwsettings{'snat'}}				='selected';
    			$selected{'RATETIME'}{$fwdfwsettings{'RATETIME'}}		='selected';
diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat
index e326d65c0..73596d8cd 100644
--- a/html/cgi-bin/logs.cgi/firewalllog.dat
+++ b/html/cgi-bin/logs.cgi/firewalllog.dat
@@ -325,6 +325,8 @@ print <<END
 END
 ;
+# Generate hash to translate protocol numbers into protocol names.
+my %protocols = &General::generateProtoTransHash();
$lines = 0;
 foreach $_ (@log)
@@ -354,6 +356,12 @@ foreach $_ (@log)
    # Get the country code.
    my $ccode = &Location::Functions::lookup_country_code($srcaddr);
+	# Lookup if the grabbed protocol is part of the protocols hash.
+	if (exists ($protocols{$proto})) {
+		# Translate protocol number into protocol name.
+		$proto = $protocols{$proto};
+	}
+
    my $servi = uc(getservbyport($srcport, lc($proto)));
    if ($servi ne '' && $srcport < 1024) {
    	$srcport = "$srcport($servi)"; 
diff --git a/html/cgi-bin/shutdown.cgi b/html/cgi-bin/shutdown.cgi
index e0a2c9da0..1321e158b 100644
--- a/html/cgi-bin/shutdown.cgi
+++ b/html/cgi-bin/shutdown.cgi
@@ -1,11 +1,23 @@
 #!/usr/bin/perl
-#
-# SmoothWall CGIs
-#
-# This code is distributed under the terms of the GPL
-#
-# (c) The SmoothWall Team
-#
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2021  IPFire Development Team                                 #
+#                                                                             #
+# 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/.       #
+#                                                                             #
+###############################################################################
use strict;
@@ -17,6 +29,27 @@ require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
+###--- HTML HEAD ---###
+my $extraHead = <<END
+<style>
+	table#controls {
+		width: 100%;
+		border: none;
+		table-layout: fixed;
+	}
+	#controls td {
+		text-align: center;
+	}
+	#controls button {
+		font-weight: bold;
+		padding: 0.7em;
+		min-width: 65%;
+	}
+</style>
+END
+;
+###--- END HTML HEAD ---###
+
 my %cgiparams=();
 my $death = 0;
 my $rebirth = 0;
@@ -26,33 +59,39 @@ my $rebirth = 0;
 $cgiparams{'ACTION'} = '';
 &Header::getcgihash(%cgiparams);
-if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'}) {
+if ($cgiparams{'ACTION'} eq "SHUTDOWN") {
    $death = 1;
    &General::log($Lang::tr{'shutting down ipfire'});
    &General::system('/usr/local/bin/ipfirereboot', 'down');
-} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'reboot'}) {
+} elsif ($cgiparams{'ACTION'} eq "REBOOT") {
    $rebirth = 1;
    &General::log($Lang::tr{'rebooting ipfire'});
    &General::system('/usr/local/bin/ipfirereboot', 'boot');
+} elsif ($cgiparams{'ACTION'} eq "REBOOT_FSCK") {
+	$rebirth = 1;
+	&General::log($Lang::tr{'rebooting ipfire fsck'});
+	&General::system('/usr/local/bin/ipfirereboot', 'bootfs');
 }
+
 if ($death == 0 && $rebirth == 0) {
-	&Header::openpage($Lang::tr{'shutdown control'}, 1, '');
+	&Header::openpage($Lang::tr{'shutdown control'}, 1, $extraHead);
&Header::openbigbox('100%', 'left');
+	&Header::openbox('100%', 'left');
-	print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n";
-
-	&Header::openbox('100%', 'left', );
    print <<END
-<table width='100%'>
-<tr>
-	<td width='50%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'reboot'}' /></td>
-	<td width='50%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'shutdown'}' /></td>
-</tr>
-</table>
+<form method="post" action="$ENV{'SCRIPT_NAME'}">
+	<table id="controls">
+	<tr>
+		<td><button type="submit" name="ACTION" value="SHUTDOWN">$Lang::tr{'shutdown'}</button></td>
+		<td><button type="submit" name="ACTION" value="REBOOT">$Lang::tr{'reboot'}</button></td>
+		<td><button type="submit" name="ACTION" value="REBOOT_FSCK">$Lang::tr{'reboot fsck'}</button></td>
+	</tr>
+	</table>
+</form>
 END
-	;
+;
    &Header::closebox();
} else {
diff --git a/html/html/themes/ipfire/include/css/style.css b/html/html/themes/ipfire/include/css/style.css
index 2c727a770..b92f476c4 100644
--- a/html/html/themes/ipfire/include/css/style.css
+++ b/html/html/themes/ipfire/include/css/style.css
@@ -359,7 +359,7 @@ div.rrdimage > ul {
 }
div.rrdimage > img {
-	box-sizing: border-box;
+	padding: 0;
    max-width: 100%;
    min-height: 290px;
 }
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 0d2228ede..76bf0469d 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -2085,11 +2085,13 @@
 'real address' => 'Reale Addresse',
 'reboot' => 'Neustart',
 'reboot ask' => 'Neustart?',
+'reboot fsck' => 'Neustart & Dateisystem-Test',
 'reboot question' => 'Extra Abfrage bei neustart und herunterfahren einschalten',
 'reboot schedule' => 'Zeitsteuerung für IPFire Neustarts',
 'reboot sure' => 'Sind Sie sicher, dass Sie neustarten wollen?',
 'rebooting' => 'Starte neu ...',
 'rebooting ipfire' => 'Starte IPFire neu',
+'rebooting ipfire fsck' => 'Starte IPFire neu, Dateisystem-Test erzwingen',
 'received' => 'Empfangen',
 'reconnect' => 'Neu Verbinden',
 'reconnection' => 'Wiederverbindung',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 2ba6961f3..181dc80b0 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2120,11 +2120,13 @@
 'real address' => 'Real Address',
 'reboot' => 'Reboot',
 'reboot ask' => 'Reboot?',
+'reboot fsck' => 'Reboot & check filesystem',
 'reboot question' => 'Extra query for restart and shutdown',
 'reboot schedule' => 'Schedule IPFire reboots',
 'reboot sure' => 'Are you sure that you want to reboot?',
 'rebooting' => 'Rebooting',
 'rebooting ipfire' => 'Rebooting IPFire',
+'rebooting ipfire fsck' => 'Rebooting IPFire, forcing filesystem check',
 'received' => 'Received',
 'reconnect' => 'Reconnect',
 'reconnection' => 'Reconnection',
diff --git a/lfs/ddns b/lfs/ddns
index 538cf7256..b1d0f2dbb 100644
--- a/lfs/ddns
+++ b/lfs/ddns
@@ -24,7 +24,7 @@
include Config
-VER        = 013
+VER        = 014
THISAPP    = ddns-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = a988a808a08c810c41964ac6b0febbeb
+$(DL_FILE)_MD5 = f10f7dfb29bd159db10e7a52c0a91d72
install : $(TARGET)
@@ -72,12 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
# Apply upstream patches.
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-dyfi-use-https.patch
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patch
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-duckdns-new-api.patch
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-add-option-to-list-token-provider.patch
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-proper-encode-string.patch
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-fix-argparse-list-token-providers.patch
+	# No upstream patches at the moment.
cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh
    cd $(DIR_APP) && ./configure \
diff --git a/lfs/hplip b/lfs/hplip
index e87b8fb8e..c783a0e34 100644
--- a/lfs/hplip
+++ b/lfs/hplip
@@ -24,7 +24,7 @@
include Config
-VER        = 3.21.2
+VER        = 3.21.6
THISAPP    = hplip-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hplip
-PAK_VER    = 5
+PAK_VER    = 6
DEPS       =
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 362cb4c10321ec98fa4b4f18891e1a45
+$(DL_FILE)_MD5 = 090f47d47c0d487ccfd2abdd5102ce1e
install : $(TARGET)
diff --git a/lfs/less b/lfs/less
index 5e33bf311..77fc2ae9f 100644
--- a/lfs/less
+++ b/lfs/less
@@ -24,7 +24,7 @@
include Config
-VER        = 581.2
+VER        = 590
THISAPP    = less-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 18f5d83c0cada3f288a5a20bf88faea2
+$(DL_FILE)_MD5 = f029087448357812fba450091a1172ab
install : $(TARGET)
diff --git a/lfs/libloc b/lfs/libloc
index 8f6b35c32..bdf977c7b 100644
--- a/lfs/libloc
+++ b/lfs/libloc
@@ -24,8 +24,8 @@
include Config
-VER        = 0.9.6
-DB_DATE    = 2021-03-30
+VER        = 0.9.7
+DB_DATE    = 2021-07-11
THISAPP    = libloc-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -43,8 +43,8 @@ objects = $(DL_FILE) \
 $(DL_FILE)                    = https://source.ipfire.org/releases/libloc/$(DL_FILE)
 location-$(DB_DATE).db.xz     = https://location.ipfire.org/databases/1/archive/location-$(DB_DATE).db.xz
-$(DL_FILE)_MD5                = a05c44568bce04ab777caadb3e1d3c51
-location-$(DB_DATE).db.xz_MD5 = e5a05e01e999ba5c70d7e2960336d2a4
+$(DL_FILE)_MD5                = eef5d7de51550b8b051ffe29967b17f0
+location-$(DB_DATE).db.xz_MD5 = 16d273593b2634edc8654cc1a3e81ef1
install : $(TARGET)
diff --git a/lfs/minidlna b/lfs/minidlna
index 1a9020158..822251fcf 100644
--- a/lfs/minidlna
+++ b/lfs/minidlna
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2021  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        = 1.2.1
+VER        = 1.3.0
THISAPP    = minidlna-$(VER)
 DL_FILE    = minidlna-$(VER).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = minidlna
-PAK_VER    = 6
+PAK_VER    = 7
DEPS       = ffmpeg flac libexif libid3tag libogg
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = a968d3d84971322471cabda3669cc0f8
+$(DL_FILE)_MD5 = 89e92d1938ee3066631d4ca9fbf31507
install : $(TARGET)
diff --git a/lfs/poppler b/lfs/poppler
index a63001c46..3589e86b4 100644
--- a/lfs/poppler
+++ b/lfs/poppler
@@ -24,7 +24,7 @@
include Config
-VER        = 21.05.0
+VER        = 21.07.0
THISAPP    = poppler-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 109c337462c2a4ac916226588a2c23f7
+$(DL_FILE)_MD5 = 3c4b500a0af4cf1dc4a1c66fa48b7551
install : $(TARGET)
diff --git a/lfs/sysstat b/lfs/sysstat
index bdd78ff86..4ea724c74 100644
--- a/lfs/sysstat
+++ b/lfs/sysstat
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2021  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        = 6.0.2
+VER        = 12.5.4
THISAPP    = sysstat-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 99ed143d7e753f0b2220baa115859b44
+$(DL_FILE)_MD5 = e2616e42f1b613ca8113ee8de7b7eafd
install : $(TARGET)
@@ -70,9 +70,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/sysstat-6.0.2-sysconf.patch
-	cd $(DIR_APP) && sed "/asm/page.h/d" -i common.c
-	cd $(DIR_APP) && cp -vf $(DIR_SRC)/config/sysstat/CONFIG build/
+	cd $(DIR_APP) && ./configure --prefix=/usr
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
    @rm -rf $(DIR_APP)
diff --git a/lfs/taglib b/lfs/taglib
index 101d64662..ec9038700 100644
--- a/lfs/taglib
+++ b/lfs/taglib
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2021  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        = 1.11.1
+VER        = 1.12
THISAPP    = taglib-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = taglib
-PAK_VER    = 2
+PAK_VER    = 3
DEPS       =
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = cee7be0ccfc892fa433d6c837df9522a
+$(DL_FILE)_MD5 = 4313ed2671234e029b7af8f97c84e9af
 install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
diff --git a/lfs/texinfo b/lfs/texinfo
index 236713b47..4563243f0 100644
--- a/lfs/texinfo
+++ b/lfs/texinfo
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2021  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,12 +24,12 @@
include Config
-VER        = 6.7
+VER        = 6.8
THISAPP    = texinfo-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/texinfo-6.7
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
# Normal build or $(TOOLS_DIR) build.
 #
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d4c5d8cc84438c5993ec5163a59522a6
+$(DL_FILE)_MD5 = a91b404e30561a5df803e6eb3a53be71
install : $(TARGET)
diff --git a/src/patches/ddns-013-add-option-to-list-token-provider.patch b/src/patches/ddns-013-add-option-to-list-token-provider.patch
deleted file mode 100644
index 7603422a2..000000000
--- a/src/patches/ddns-013-add-option-to-list-token-provider.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-commit 287b2bfe7bf5e0639da9227a8c7893ce40d298ae
-Author: Stefan Schantl stefan.schantl@ipfire.org
-Date:   Wed Dec 2 20:31:19 2020 +0100
-
-    Add option to list provider with token support.
-    
-    This option can be used to get a list of all known provider which support
-    a token based authentication method.
-    
-    In order to provide this feature the provider details has been extended
-    to contain the information if a provider supports this authentication
-    method or not.
-    
-    Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
-
-diff --git a/ddns.in b/ddns.in
-old mode 100644
-new mode 100755
-index 0e377e7..538e4b0
---- a/ddns.in
-+++ b/ddns.in
-@@ -49,6 +49,10 @@ def main():
- 	p_list_providers = subparsers.add_parser("list-providers",
- 		help=_("List all available providers"))
- 
-+	# list-token-provider
-+	p_list_token_provider = subparsers.add_parser("list-token-provider",
-+		help=_("List all providers which supports authentication via token"))
-+
- 	# update
- 	p_update = subparsers.add_parser("update", help=_("Update DNS record"))
- 	p_update.add_argument("hostname")
-@@ -85,6 +89,10 @@ def main():
- 		provider_names = d.get_provider_names()
- 		print("\n".join(provider_names))
- 
-+	elif args.subparsers_name == "list-token-providers":
-+		token_provider = d.get_provider_with_token_support()
-+		print("\n".join(token_provider))
-+
- 	elif args.subparsers_name == "update":
- 		d.updateone(hostname=args.hostname, force=args.force)
- 
-diff --git a/src/ddns/__init__.py b/src/ddns/__init__.py
-index 3e43fa7..ca232bf 100644
---- a/src/ddns/__init__.py
-+++ b/src/ddns/__init__.py
-@@ -86,6 +86,20 @@ class DDNSCore(object):
- 		"""
- 		return sorted(self.providers.keys())
- 
-+	def get_provider_with_token_support(self):
-+		"""
-+			Returns a list with names of all registered providers
-+			which support token based authtentication.
-+		"""
-+
-+		token_provider = []
-+
-+		for handle, provider in sorted(self.providers.items()):
-+			if provider.supports_token_auth is True:
-+				token_provider.append(handle)
-+
-+		return sorted(token_provider)
-+
- 	def load_configuration(self, filename):
- 		logger.debug(_("Loading configuration file %s") % filename)
- 
-diff --git a/src/ddns/providers.py b/src/ddns/providers.py
-index a1ca3f3..b0066d5 100644
---- a/src/ddns/providers.py
-+++ b/src/ddns/providers.py
-@@ -73,6 +73,10 @@ class DDNSProvider(object):
- 	# Required to remove AAAA records if IPv6 is absent again.
- 	can_remove_records = True
- 
-+	# True if the provider supports authentication via a random
-+	# generated token instead of username and password.
-+	supports_token_auth = True
-+
- 	@staticmethod
- 	def supported():
- 		"""
-@@ -352,6 +356,10 @@ class DDNSProtocolDynDNS2(object):
- 	# The DynDNS protocol version 2 does not allow to remove records
- 	can_remove_records = False
- 
-+	# The DynDNS protocol version 2 only supports authentication via
-+	# username and password.
-+	supports_token_auth = False
-+
- 	def prepare_request_data(self, proto):
- 		data = {
- 			"hostname" : self.hostname,
-@@ -440,6 +448,7 @@ class DDNSProviderAllInkl(DDNSProvider):
- 
- 	url = "http://dyndns.kasserver.com"
- 	can_remove_records = False
-+	supports_token_auth = False
- 
- 	def update(self):
- 		# There is no additional data required so we directly can
-@@ -464,6 +473,8 @@ class DDNSProviderBindNsupdate(DDNSProvider):
- 
- 	DEFAULT_TTL = 60
- 
-+	supports_token_auth = False
-+
- 	@staticmethod
- 	def supported():
- 		# Search if the nsupdate utility is available
-@@ -550,6 +561,7 @@ class DDNSProviderChangeIP(DDNSProvider):
- 
- 	url = "https://nic.changeip.com/nic/update"
- 	can_remove_records = False
-+	supports_token_auth = False
- 
- 	def update_protocol(self, proto):
- 		data = {
-@@ -616,6 +628,7 @@ class DDNSProviderDDNSS(DDNSProvider):
- 
- 	url = "http://www.ddnss.de/upd.php"
- 	can_remove_records = False
-+	supports_token_auth = False
- 
- 	def update_protocol(self, proto):
- 		data = {
-@@ -678,6 +691,7 @@ class DDNSProviderDHS(DDNSProvider):
- 
- 	url = "http://members.dhs.org/nic/hosts"
- 	can_remove_records = False
-+	supports_token_auth = False
- 
- 	def update_protocol(self, proto):
- 		data = {
-@@ -710,6 +724,7 @@ class DDNSProviderDNSpark(DDNSProvider):
- 
- 	url = "https://control.dnspark.com/api/dynamic/update.php"
- 	can_remove_records = False
-+	supports_token_auth = False
- 
- 	def update_protocol(self, proto):
- 		data = {
-@@ -758,6 +773,7 @@ class DDNSProviderDtDNS(DDNSProvider):
- 
- 	url = "https://www.dtdns.com/api/autodns.cfm"
- 	can_remove_records = False
-+	supports_token_auth = False
- 
- 	def update_protocol(self, proto):
- 		data = {
-@@ -813,6 +829,7 @@ class DDNSProviderDuckDNS(DDNSProvider):
- 
- 	url = "https://www.duckdns.org/update"
- 	can_remove_records = False
-+	supports_token_auth = True
- 
- 	def update(self):
- 		# Raise an error if no auth details are given.
-@@ -914,6 +931,7 @@ class DDNSProviderDynUp(DDNSProvider):
- 
- 	url = "https://dynup.de/dyn.php"
- 	can_remove_records = False
-+	supports_token_auth = False
- 
- 	def update_protocol(self, proto):
- 		data = {
-@@ -979,6 +997,8 @@ class DDNSProviderEasyDNS(DDNSProvider):
- 
- 	url = "http://api.cp.easydns.com/dyn/tomato.php"
- 
-+	supports_token_auth = False
-+
- 	def update_protocol(self, proto):
- 		data = {
- 			"myip"     : self.get_address(proto, "-"),
-@@ -1032,6 +1052,7 @@ class DDNSProviderDynsNet(DDNSProvider):
- 	website   = "http://www.dyns.net/"
- 	protocols = ("ipv4",)
- 	can_remove_records = False
-+	supports_token_auth = False
- 
- 	# There is very detailed informatio about how to send the update request and
- 	# the possible response codes. (Currently we are using the v1.1 proto)
-@@ -1083,6 +1104,7 @@ class DDNSProviderEnomCom(DDNSResponseParserXML, DDNSProvider):
- 
- 	url = "https://dynamic.name-services.com/interface.asp"
- 	can_remove_records = False
-+	supports_token_auth = False
- 
- 	def update_protocol(self, proto):
- 		data = {
-@@ -1125,6 +1147,7 @@ class DDNSProviderEntryDNS(DDNSProvider):
- 	# here: https://entrydns.net/help
- 	url = "https://entrydns.net/records/modify"
- 	can_remove_records = False
-+	supports_token_auth = True
- 
- 	def update_protocol(self, proto):
- 		data = {
-@@ -1165,6 +1188,7 @@ class DDNSProviderFreeDNSAfraidOrg(DDNSProvider):
- 	# page. All used values have been collected by testing.
- 	url = "https://freedns.afraid.org/dynamic/update.php"
- 	can_remove_records = False
-+	supports_token_auth = True
- 
- 	def update_protocol(self, proto):
- 		data = {
-@@ -1246,6 +1270,7 @@ class DDNSProviderKEYSYSTEMS(DDNSProvider):
- 
- 	url = "https://dynamicdns.key-systems.net/update.php"
- 	can_remove_records = False
-+	supports_token_auth = False
- 
- 	def update_protocol(self, proto):
- 		address = self.get_address(proto)
-@@ -1297,6 +1322,8 @@ class DDNSProviderLightningWireLabs(DDNSProvider):
- 	# Information about the format of the HTTPS request is to be found
- 	# https://dns.lightningwirelabs.com/knowledge-base/api/ddns
- 
-+	supports_token_auth = True
-+
- 	url = "https://dns.lightningwirelabs.com/update"
- 
- 	def update(self):
-@@ -1365,6 +1392,7 @@ class DDNSProviderNamecheap(DDNSResponseParserXML, DDNSProvider):
- 
- 	url = "https://dynamicdns.park-your-domain.com/update"
- 	can_remove_records = False
-+	supports_token_auth = False
- 
- 	def update_protocol(self, proto):
- 		# Namecheap requires the hostname splitted into a host and domain part.
-@@ -1458,6 +1486,8 @@ class DDNSProviderNsupdateINFO(DDNSProtocolDynDNS2, DDNSProvider):
- 	# has not been implemented here, yet.
- 	can_remove_records = False
- 
-+	supports_token_auth = True
-+
- 	# After a failed update, there will be no retries
- 	# https://bugzilla.ipfire.org/show_bug.cgi?id=10603
- 	holdoff_failure_days = None
-@@ -1534,6 +1564,7 @@ class DDNSProviderRegfish(DDNSProvider):
- 
- 	url = "https://dyndns.regfish.de/"
- 	can_remove_records = False
-+	supports_token_auth = True
- 
- 	def update(self):
- 		data = {
-@@ -1630,6 +1661,7 @@ class DDNSProviderServercow(DDNSProvider):
- 
- 	url = "https://www.servercow.de/dnsupdate/update.php"
- 	can_remove_records = False
-+	supports_token_auth = False
- 
- 	def update_protocol(self, proto):
- 		data = {
-@@ -1671,6 +1703,8 @@ class DDNSProviderSPDNS(DDNSProtocolDynDNS2, DDNSProvider):
- 
- 	url = "https://update.spdyn.de/nic/update"
- 
-+	supports_token_auth = True
-+
- 	@property
- 	def username(self):
- 		return self.get("username") or self.hostname
-@@ -1774,6 +1808,8 @@ class DDNSProviderZoneedit(DDNSProvider):
- 	website   = "http://www.zoneedit.com"
- 	protocols = ("ipv4",)
- 
-+	supports_token_auth = False
-+
- 	# Detailed information about the request and the response codes can be
- 	# obtained here:
- 	# http://www.zoneedit.com/doc/api/other.html
-@@ -1821,6 +1857,7 @@ class DDNSProviderDNSmadeEasy(DDNSProvider):
- 
- 	url = "https://cp.dnsmadeeasy.com/servlet/updateip?"
- 	can_remove_records = False
-+	supports_token_auth = False
- 
- 	def update_protocol(self, proto):
- 		data = {
-@@ -1871,6 +1908,7 @@ class DDNSProviderZZZZ(DDNSProvider):
- 
- 	url = "https://zzzz.io/api/v1/update"
- 	can_remove_records = False
-+	supports_token_auth = True
- 
- 	def update_protocol(self, proto):
- 		data = {
diff --git a/src/patches/ddns-013-duckdns-new-api.patch b/src/patches/ddns-013-duckdns-new-api.patch
deleted file mode 100644
index a671bf917..000000000
--- a/src/patches/ddns-013-duckdns-new-api.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-commit ebdb37245e2033b065cce5a19597be4ef1c8875c
-Author: Carl Mascott cmascott@yahoo.com
-Date:   Wed Dec 2 11:39:20 2020 +0100
-
-    DuckDNS: Update to use new API.
-    
-    The new API supports IPv6 and a token based auth.
-    
-    Reference #12415.
-    
-    Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
-
-diff --git a/src/ddns/providers.py b/src/ddns/providers.py
-index 46d8a67..a1ca3f3 100644
---- a/src/ddns/providers.py
-+++ b/src/ddns/providers.py
-@@ -802,16 +802,62 @@ class DDNSProviderDtDNS(DDNSProvider):
- 		raise DDNSUpdateError
- 
- 
--class DDNSProviderDuckDNS(DDNSProtocolDynDNS2, DDNSProvider):
-+class DDNSProviderDuckDNS(DDNSProvider):
- 	handle    = "duckdns.org"
- 	name      = "Duck DNS"
- 	website   = "http://www.duckdns.org/"
--	protocols = ("ipv4",)
-+	protocols = ("ipv6", "ipv4",)
- 
- 	# Information about the format of the request is to be found
--	# https://www.duckdns.org/install.jsp
-+	# https://www.duckdns.org/spec.jsp
-+
-+	url = "https://www.duckdns.org/update"
-+	can_remove_records = False
-+
-+	def update(self):
-+		# Raise an error if no auth details are given.
-+		if not self.token:
-+			raise DDNSConfigurationError
-+
-+		data =  {
-+			"domains" : self.hostname,
-+			"token"    : self.token,
-+		}
-+
-+		# Check if we update an IPv4 address.
-+		address4 = self.get_address("ipv4")
-+		if address4:
-+			data["ip"] = address4
- 
--	url = "https://www.duckdns.org/nic/update"
-+		# Check if we update an IPv6 address.
-+		address6 = self.get_address("ipv6")
-+		if address6:
-+			data["ipv6"] = address6
-+
-+		# Raise an error if no address is given.
-+		if "ip" not in data and "ipv6" not in data:
-+			raise DDNSConfigurationError
-+
-+		# Send update to the server.
-+		response = self.send_request(self.url, data=data)
-+
-+		# Get the full response message.
-+		output = response.read().decode()
-+
-+		# Remove all leading and trailing whitespace.
-+		output = output.strip()
-+
-+		# Handle success messages.
-+		if output == "OK":
-+			return
-+
-+		# The provider does not give detailed information
-+		# if the update fails. Only a "KO" will be sent back.
-+		if output == "KO":
-+			raise DDNSUpdateError
-+
-+		# If we got here, some other update error happened.
-+		raise DDNSUpdateError
- 
- 
- class DDNSProviderDyFi(DDNSProtocolDynDNS2, DDNSProvider):
diff --git a/src/patches/ddns-013-dyfi-use-https.patch b/src/patches/ddns-013-dyfi-use-https.patch
deleted file mode 100644
index f131c5b24..000000000
--- a/src/patches/ddns-013-dyfi-use-https.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit ce6e977f0ace7fe468411270ad07f1824a3aeaec
-Author: Mauno Pirnes mauno.pirnes@hotmail.com
-Date:   Fri Feb 7 12:25:00 2020 +0100
-
-    dy.fi: Use HTTPS to perform updates.
-    
-    Signed-off-by: Mauno Pirnes mauno.pirnes@hotmail.com
-    Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
-
-diff --git a/src/ddns/providers.py b/src/ddns/providers.py
-index dcdc5da..f1fed22 100644
---- a/src/ddns/providers.py
-+++ b/src/ddns/providers.py
-@@ -826,7 +826,7 @@ class DDNSProviderDyFi(DDNSProtocolDynDNS2, DDNSProvider):
- 	# https://www.dy.fi/page/clients?lang=en
- 	# https://www.dy.fi/page/specification?lang=en
- 
--	url = "http://www.dy.fi/nic/update"
-+	url = "https://www.dy.fi/nic/update"
- 
- 	# Please only send automatic updates when your IP address changes,
- 	# or once per 5 to 6 days to refresh the address mapping (they will
diff --git a/src/patches/ddns-013-fix-argparse-list-token-providers.patch b/src/patches/ddns-013-fix-argparse-list-token-providers.patch
deleted file mode 100644
index 065dbb666..000000000
--- a/src/patches/ddns-013-fix-argparse-list-token-providers.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 5e075681008174839a47cae698ae459c0ea3a30a
-Author: Stefan Schantl stefan.schantl@ipfire.org
-Date:   Wed May 12 19:59:01 2021 +0200
-
-    Fix argsparse string for listing token providers.
-    
-    Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
-
-diff --git a/ddns.in b/ddns.in
-index 538e4b0..20edd28 100755
---- a/ddns.in
-+++ b/ddns.in
-@@ -49,8 +49,8 @@ def main():
- 	p_list_providers = subparsers.add_parser("list-providers",
- 		help=_("List all available providers"))
- 
--	# list-token-provider
--	p_list_token_provider = subparsers.add_parser("list-token-provider",
-+	# list-token-providers
-+	p_list_token_provider = subparsers.add_parser("list-token-providers",
- 		help=_("List all providers which supports authentication via token"))
- 
- 	# update
diff --git a/src/patches/ddns-013-proper-encode-string.patch b/src/patches/ddns-013-proper-encode-string.patch
deleted file mode 100644
index b101913e8..000000000
--- a/src/patches/ddns-013-proper-encode-string.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 27aea61ba3c8e561c4a5921aeb0ea0986d4d234c
-Author: Johannes Schwietzke johannes.schwietzke@web.de
-Date:   Tue Dec 29 12:07:19 2020 +0100
-
-    providers.py: Proper encode string.
-    
-    Python 3 memoryview requires an encoded string.
-    
-    Signed-off-by: Johannes Schwietzke johannes.schwietzke@web.de
-    Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
-
-diff --git a/src/ddns/providers.py b/src/ddns/providers.py
-index b0066d5..56e6620 100644
---- a/src/ddns/providers.py
-+++ b/src/ddns/providers.py
-@@ -547,7 +547,7 @@ class DDNSProviderBindNsupdate(DDNSProvider):
- 
- 			logger.debug("  %s" % line)
- 
--		return "\n".join(scriptlet)
-+		return "\n".join(scriptlet).encode()
- 
- 
- class DDNSProviderChangeIP(DDNSProvider):
diff --git a/src/patches/sysstat-6.0.2-sysconf.patch b/src/patches/sysstat-6.0.2-sysconf.patch
deleted file mode 100644
index 829cc8fca..000000000
--- a/src/patches/sysstat-6.0.2-sysconf.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- sysstat-6.0.2/common.c.sysc	2005-11-28 11:14:29.000000000 +0100
-+++ sysstat-6.0.2/common.c	2006-05-11 10:40:18.000000000 +0200
-@@ -31,8 +31,9 @@
- #include <sys/param.h>	/* for HZ */
- 
- /*
-+ * PAGE_SIZE should be get by sysconf function - 
-  * For PAGE_SIZE (which may be itself a call to getpagesize()).
-- * PAGE_SHIFT no longer necessarily exists in <asm/page.h>. So
-+ * PAGE_SHIFT no longer necessarily exists. So
-  * we use PAGE_SIZE to compute PAGE_SHIFT...
-  */
- #include <asm/page.h>
-@@ -408,8 +409,10 @@
- {
-    int shift = 0;
-    int size;
-+   int p_size;
- 
--   size = PAGE_SIZE >> 10; /* Assume that a page has a minimum size of 1 kB */
-+   p_size = sysconf(_SC_PAGE_SIZE);
-+   size = p_size >> 10; /* Assume that a page has a minimum size of 1 kB */
-    while (size > 1) {
-       shift++;
-       size >>= 1;
-
hooks/post-receive
--
IPFire 2.x development tree

    