[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 01141196f6789e14c9d57e673cfeac63b9e348f5

22 Oct 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  01141196f6789e14c9d57e673cfeac63b9e348f5 (commit)
       via  80a1f805912314e77cc4ed95d2a37069f4795785 (commit)
       via  110d4c81060c6663cdb562ee10afc7626c2d489b (commit)
       via  6befc952cc9f71d314f696dc2621120d705e8220 (commit)
       via  ada4f4cc99efe7229e465bb86c51bd60c4abf64d (commit)
       via  5f965f36f0bf8f4ae6f6341d9b59ce306ed0883b (commit)
       via  6cdc5164ff8365896fcd1ddb1fff6f5716b92a9a (commit)
       via  0aca0b419f827b33904306e2cce9f7ec2313daf6 (commit)
       via  5f71d0a6bf369719e2456c2ffe34e4ac2b103e94 (commit)
       via  726891607b32908e8f757d941b5202387c90ca89 (commit)
       via  d2c2025b3d0271d3afdccc43b550a07b59480c94 (commit)
       via  bca0fb81476b3ca5b7352435e38a06a7dd1332b0 (commit)
       via  52764dbe7f6439045040ab35719953cf178063b9 (commit)
       via  aa45d923ebc396fdbe4a95db3d54457bd55fd20e (commit)
       via  d6f10036654c1f0a6457fd5a67e144f64e7280e5 (commit)
       via  64aa254af13f6164e8c441f1ed43b838580064cd (commit)
       via  e01dd97b5c08f90249894e9b0ef7e29543a057b7 (commit)
       via  448649ae645c285d04294773fc60ea1510cfe029 (commit)
       via  725d6a49169d779efe2493478f9c4a7c2e9b8f45 (commit)
       via  1c71ff6b2ccde8383529ed26937e1cd21f4cce08 (commit)
       via  4ee445ce44e801c5746e05f06ffa7d05932fdee7 (commit)
       via  0df914ef30b67a45f59ff8d02cddd76245d64953 (commit)
       via  9a93f07dae62990610d0b7168e83767e907803e4 (commit)
       via  dbd455ef936277aae9cf4d7d7294f0ceca495b84 (commit)
       via  65710b528a73425a86b286c982130457f3a7d7f4 (commit)
       via  f85e3493ac71b05d9c5499d8b08b4aaa87c548f5 (commit)
       via  82c53ef9df7eb0ab75d8d5be42206f14e2b703f1 (commit)
       via  76f36a621d1ec83b3a998c600b7bb92f40a88cf0 (commit)
       via  91aa257ed732cfa881740310d659db7554bece3d (commit)
       via  fb4e1d53a0f079a82717203d0ff7eeea7d0c6162 (commit)
       via  0b6a2e761bc14d90725beda5b31f1637a599d163 (commit)
       via  0e0c1a8aec13c626b905e97531a2f3f1b5d31e9b (commit)
       via  4bd07ee400b1c39e4efec803567efc024147674a (commit)
       via  8c943731b14e100e2c55f600e110e28e4040b528 (commit)
       via  574690dc0015447b5db788ab08190790e0c22d7b (commit)
       via  eb8dcf245fc8fa1c40f5248863dd4a003f68e35e (commit)
       via  923cf5358ca02c25bb57efb39fa5d00740c86364 (commit)
      from  2e82a4002daac145ad2d46978667994728e2dcf0 (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 01141196f6789e14c9d57e673cfeac63b9e348f5
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Fri Oct 22 16:18:46 2021 +0000
core161: ship azure-setup
with core158 was a bug fixed that local hyperV installations wait to long
    for the metadata service for azure but it was not shipped to existing
    installations.
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 80a1f805912314e77cc4ed95d2a37069f4795785
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Fri Oct 22 16:16:32 2021 +0000
core161: add speed.cgi
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 110d4c81060c6663cdb562ee10afc7626c2d489b
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Fri Oct 22 10:05:32 2021 +0200
speed.cgi: reduce system load by copying two general-functions.
include general-functions.pl load and initialize many subfunctions that are not
    needed by speed.cgi which was executed very often.
    So this reduce the system load significant if webif was open in browser
    and ajax-speed display enabled.
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
    Reviewed-by: Bernhard Bitsch bbitsch@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 6befc952cc9f71d314f696dc2621120d705e8220
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Fri Oct 22 15:37:27 2021 +0200
minidlna: Add backup capability - bug#12710
- Backup definition missing - created ro backup config file
    - Update of rootfile
    - Addition of backup definition install into lfs file
    - Addition of restore and backup statements into install.sh and uninstall.sh pak scripts
Fixes: 12710
    Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit ada4f4cc99efe7229e465bb86c51bd60c4abf64d
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Fri Oct 22 16:11:35 2021 +0000
core161: add gd changes
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 5f965f36f0bf8f4ae6f6341d9b59ce306ed0883b
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Sep 23 14:24:51 2021 +0200
GD-Graph: Update to version 1.54
- Update from 1.4308 (2006) to 1.54 (2016 - latest version)
    - Update of rootfile not required
    - Changelog
       1.54 21 Nov 2016
         - Disable two Y axes alignment when any y[12]_{min,max}_value is defined
           RT#62665
       1.53 08 Jul 2016
         - Fix 'Illegal division by zero' when x_min_value and x_max_value
           are defined and x_tick_number set to 'auto' RT#73185
           Thanks to Bob Rogers, https://github.com/ruz/GDGraph/pull/12
       1.52 28 Jan 2016
         - y1_min_range and y2_min_range instead of min_range_1 and min_range_2,
           niether were documented before.
         - Update documentation in regards to all *_min_range options available.
       1.51 27 Dec 2015
         - fix shadows rendering on cumulative bar charts
           thanks to https://github.com/Tordek
           see https://github.com/ruz/GDGraph/pull/4
       1.50 27 Dec 2015
         - run samples as part of test suite to make sure no sample crashes
           thanks to https://github.com/tynovsky
         - properly define test requirements using newer MakeMaker
       1.49 11 Mar 2015
         - fix to Z-axis color filling in 3D pie charts (Debian Bug #489184)
         - bump ExtUtils::MakeMaker dependency
         - tiny improvement in the code of the samples
       1.48 02 Aug 2013
         - no code changes, just release enginering cleanup
         - adjust MANIFEST.SKIP file so MANIFEST can be generated
           once again
         - ship sample58.pl file, so `make samples` stop failing
         - mention the current and past maintainers in META files
           as authors
         - use newer CPAN::Meta and ExtUtils::MakeMaker, older
           versions generated META files without runtime prerequisites
       1.47 28 Jun 2013
         - experimental hide_overlapping_values option for bar graphs
       1.46 26 Jun 2013
         - This release is based on old work by Martien that was sitting
           in his repo
         - x_last_label_skip option
         - new samples and tweaks to old
       1.45 21 Jun 2013
         - read DISTRIBUTION STATUS in perldoc GD::Graph
         - no code changes since 1.44
       1.44 25 Apr 2007
         - Patched bugs 21610, 20792, 20802, 23755 and 22932
         - Updated POD to clarify current maintenance status, and encourage
           bug reporting via RT (and to point out some external help resources)
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 6cdc5164ff8365896fcd1ddb1fff6f5716b92a9a
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Sep 23 14:24:50 2021 +0200
ExtUtils-PkgConfig: Build of this required for latest version of perl-GD
- ExtUtils-PkgConfig is required when building perl-GD
    - lfs and rootfile created
    - All rootfile entries commented out as only required for building of perl-GD
    - added to make.sh file just before perl-GD
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 0aca0b419f827b33904306e2cce9f7ec2313daf6
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Sep 23 14:24:49 2021 +0200
perl-GD: Update to version 2.73
- Update from 2.35 (2006) to 2.73 (2020)
    - Update of rootfile
    - Updated version of perl-GD required ExtUtils-PkgConfig for build. Seperate patch
       to build that is part of this series
    - Changelog
       2.73    * allow --options override the libgd options. Not recommended.
                 See GH #33 and RT #130045
       2.72    * fix CVE 2019-6977 colorMatch for older unpatched libgd versions.
                 This is a severe security problem, an exploitable heap-overflow.
                 See https://nvd.nist.gov/vuln/detail/CVE-2019-6977
       2.71    * skip Test::Fork on freebsd (GH #25)
       2.70    * fixes for hardened CCFLAGS with -Werror (RT #128167)
       2.69    * little spelling error, GH #29 Xavier Guimard
       2.68    * fix GD::Polygon->clear, RT #124463 Michael Cain
       2.67    * fix thread-safety for GD::Simple %COLORS (#26 melak)
               * fix arc start-angle docs, RT #123277 Andrew G Gray
               * improve setBrush docs, RT #123194 Andrew G Gray
               * improve StringFT docs, RT #123193
               * replace MacOSX by darwin, and not by Mac OS X/macOS as suggested
                 in PR #24
               * add GD::Image->_file method as suggested in RT #60488 by Kevin Ryde,
                 also the helper GD::supportsFileType
       2.66    * throw proper error on newFrom* with not-existing file
               * add t/transp.t from RT #40525
               * Improve RT #54366 multiple gd.h warning
               * better doc for GD::Simple->arc
               * fix ANIMGIF with libgd 2.3.0-dev
       2.65    * fix --gdlib_config_path to accept an argument (fperrad)
       2.64    * Update doc for LIBGD_VERSION()
               * Fix 5.6.2, which does not have float in its typemap
       2.63    * renamed VERSION() to LIBGD_VERSION(), RT #121307.
                 It was treated magically by "use GD 2.18"
       2.62    * fixed wrong <5.14 code generated with ExtUtils::Constants
                 RT #121297. Don't generate const-xs.inc, only when missing.
               * add -liconv on hpux also (our pkgconfig parser cannot handle it)
       2.61    * add CONFIGURE_REQUIRES META
               * add --gdlib_config_path
               * add Image Filters: scatter, pixelate, negate, grayscale, brightness,
                 contrast, color, selectiveBlur, edgeDetectQuick, gaussianBlur, emboss,
                 meanRemoval, smooth, copyGaussianBlurred
               * add palette methods: createPaletteFromTrueColor,
                 neuQuant (but discouraged), colorMatch.
               * add interpolation methods: copyScale, copyRotateInterpolated,
                 interpolationMethod.
               * add double GD::VERSION
               * add all gd.h constants
       2.60    * add missing methods newFromWBMP, newFromXbm,
                 (RT #68784) and some missing docs
               * Add --lib_fontconfig_path, --fcgi options
               * rewrote most of the XS code
               * cleanup Makefile.PL #20
       2.59    * error on failing libgd calls
               * fix colorClosestAlpha, colorAllocateAlpha
               * add missing documentation
       2.58    * fix VERSION_STRING for 2.0.x
               * honor --lib_gd_path specific gdlib-config
               * Loosen the comparison tests with GDIMAGETYPE ne gd2
               * Improve gdlib-config parsing (PR #17), esp. with 2.0.34
       2.57    * fix Jpeg magic number detection RT #26146
               * fix RGB - HSV roundtrips: RT #120572 by J2N-FORGET
               * fix -print-search-dirs errors RT #106265
               * co-maint to rurban
               * add hv_fetchs, CI smokers
               * add GD::VERSION_STRING api
       2.56_03 * add alpha method
               * improve option handling
               * fix meta data
       2.56_02 * fix feature extraction >= 2.2 [RT #119459]
       2.56_01 * rm Build.PL, fix permissions, fix for missing gdlib-config
       2.56    * Fix Makefile.PL so that it works again.
       2.55    * Great simplification of regression framework ought to fix make test problems.
               * Replace ExtUtils::MakeMaker script with Module::Build system
    	     (just in time for Module::Build to be deprecated).
    	   * Remove archaic qd.pl (for creating QuickDraw picts) from distribution.
       2.54	   Patch from yurly@unet.net to fix image corruption in rotate180 when image height is odd.
       2.53	   Points to Gabor Szabo's GD::Simple tutorial, and fix link to repository.
       2.52    Fix regression tests to run on Ubuntu 12.04 64bit.
       2.51	   Fix misleading warning message about location of gd.h file.
       2.50	   Fix gdUseFontConfig so that it can be called as a class method.
       2.49    Add GitHub information to README.
       2.48    Fix compile crash on windows and strawberry (https://rt.cpan.org/Public/Bug/Display.html?id=67990).
       2.47	   Fix compilation on older perl's without the Newxz macros.
       2.46    Added a basic "use" test for GD::Simple
       2.45	   Clarified the GD license. There is now a formal LICENSE file in the package.
       2.44    GD::Group now installed properly.
    	   Quenched compiler warning caused by Newxs() calls.
       2.43    Added "transparent" color to GD::Simple.
    	   Fixed Makefile so that GD/Image.pm depends both on GD/Image.pm.PLS and .config.cache
       2.42	   Fixed magic number detection to autodetect certain missed jpeg files (thanks to Mike Walker)
       2.41    Added backend support for grouping features in GD::SVG module.
       2.40    ** Do not use - contains a bug **
       2.39	   Makefile.PL will refuse to run if the proper version of libgd is unavailable.
       2.38	   Fixed bizarre warning about /usr/include/gd.h != /usr/include/gd.h.
       2.37	   GD/Image.pm did not bring in croak() properly, meaning that incorrect error messages are printed out when any of the newFromXXX() calls are made.
       2.36	   Instructions on using gdAntiAliased with palette images.
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 5f71d0a6bf369719e2456c2ffe34e4ac2b103e94
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Sep 23 14:24:48 2021 +0200
gd: Update to version 2.3.3
- Update from 2.0.33 (2006) to 2.3.3 (Sep 2021)
    - Updating gd requires GD-Graph and perl-GD to be updated otherwise the png graphs
       didn't work so all required changes are part of this patch series
    - Update rootfile
    - Dependencies checked from library so bump. Nothing found.
    - Changelog is too large to include here.
       For full details see https://github.com/libgd/libgd/releases
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 726891607b32908e8f757d941b5202387c90ca89
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Fri Oct 22 16:00:49 2021 +0000
core161: add backup exclude
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit d2c2025b3d0271d3afdccc43b550a07b59480c94
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Wed May 26 12:43:01 2021 +0200
backup/exclude: unbound is missing hosts.conf include after restoring a backup of an older version
- Added unbound.conf to backup/exclude list to fix bug #12441
Fixes: #12441
    Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit bca0fb81476b3ca5b7352435e38a06a7dd1332b0
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Fri Oct 22 15:56:53 2021 +0000
core161: add ppp changes
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 52764dbe7f6439045040ab35719953cf178063b9
Author: Peter Müller peter.mueller@ipfire.org
Date:   Wed Jul 7 21:49:35 2021 +0200
Tell pppd not to ask for IPv6 addresses during dial-up
pppd 2.4.9 supports IPv6 and asks for an IPv6 configuration by default.
    Setting the received prefix in the kernel will never work, however, as
    the rest of IPFire 2.x does not support IPv6.
pppd notices the ISP about this, and at least Otenet (GR) and British
    Telecom (several countries) decide to close a dial-up connection then.
    German DTAG seems to ignore such errors silently.
This patch adds an option to the pppd call to prevent asking for an
    IPv6 configuration, hence avoiding this errors.
To apply this patch, it is necessary to ship ppp 2.4.9 again. Since I
    have no access to a testing machine behind an ISP supporting IPv6, this
    patch unfortunately is untested.
Fixes: #12651
Signed-off-by: Peter Müller peter.mueller@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit aa45d923ebc396fdbe4a95db3d54457bd55fd20e
Author: Peter Müller peter.mueller@ipfire.org
Date:   Wed Jul 7 21:49:11 2021 +0200
Revert "Revert "ppp: update to 2.4.9""
This reverts commit 2d6e633d7f20bd94cbc36880049d2599e93bdaf3.
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit d6f10036654c1f0a6457fd5a67e144f64e7280e5
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sun Sep 5 22:45:05 2021 +0200
cups-filters: Update to version 1.28.10
- Update from 1.28.9 to 1.28 10
    - Update rootfile
    - Changelog
        CHANGES IN V1.28.10
    	- Sample PPDs: Add borderless page size definitions to Generic
    	  PDF Printer, HP Color LaserJet CM3530 MFP PDF, and Ricoh PDF
    	  Printer PPD files.
    	- Sample PPDs: From the PDF PPD files removed the unneeded
    	  "*cupsFilters2: ..." line. For CUPS it does not make any
    	  difference.
    	- libcupsfilters: Fixed pdftopdf filter to correctly support
    	  page ranges without upper limit, like "10-" (Pull request
    	  #399).
    	- libcupsfilters: Use wildcard tag (IPP_TAG_ZERO) search for
    	  "media-type" and "media-type-supported" in the PPD
    	  generator (Pull request #398).
    	- implicitclass, parallel: Added missing newlines at error
    	  messages.
    	- libfontembed: Removed unneeded fontembed/main.c and ttfread
    	  executable. Eliminates the dependency on DejaVuSans.ttf
    	  (Issue #386).
    	- gstoraster: Refactor the filter a little to clarify handling
    	  of page counts and set job-impressions for TotalPageCount in
    	  PWG-Raster header (Pull request #394).
    	- cups-browsed: Make NotifLeaseDuration configurable and renew
    	  after half the lease duration not 60 sec before end. The
    	  early renewal improves reliability on busy systems a
    	  lot. For easier development and debugging short durations
    	  from 300 sec on can get selected (Pull request #378).
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 64aa254af13f6164e8c441f1ed43b838580064cd
Author: Matthias Fischer matthias.fischer@ipfire.org
Date:   Mon Sep 20 17:08:18 2021 +0200
monit 5.29.0: Bump forgotten PAK_VER
Thanks Adolf! ;-)
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit e01dd97b5c08f90249894e9b0ef7e29543a057b7
Author: Matthias Fischer matthias.fischer@ipfire.org
Date:   Sat Sep 18 16:11:10 2021 +0200
monit: Update to 5.29.0
For details see:
    https://mmonit.com/monit/changes/
New: Issue #715: The PostgreSQL protocol test has been improved and
        now supports authentication with username, password and database
        when testing connection. Example:
if failed port 5432
            protocol pgsql username "username" password "12345" database "test"
        then alert
Previous Monit versions used hardcoded credentials when testing
        connection to postgresql (user=root and database=root). This could
        trigger thousands of messages like this in the postgresql log:
root@root FATAL:  password authentication failed for user "root"
        root@root DETAIL:  Role "root" does not exist.
Note: Monit will continue to use the hardcoded credentials (for
        backward compatibility) unless username and password are set.
        New: Issue #973: You can now test program output using a regular
        expression. Syntax:
IF CONTENT [!]= <regex> THEN action
Example:
check program disk0_smart with path "/usr/sbin/nvme smart-log /dev/nvme0"
            if content != "critical_warning[ ]+: 0" then alert
New: Issue #974: Monit CLI: Added support for the -g (group) option
        to the report command. Example:
monit -g database report
Fixed: Issue #991 (Monit 5.28.1 regression): MacOS: Monit didn't
        compile on MacOS 10.13 or older. Thanks to Lutz Mader.
Fixed: Issue #994 (Monit 5.28.1 regression): The check program
        statement with every did not work properly.
Fixed: Issue #995: Monit start delay was vulnerable to time jumps
        when Monit is waiting for the delay to pass. Thanks to Daniel Crowe.
Fixed: Issue #975: Monit CLI: Monit did not report a warning if -s,
        -p, -l, -g or -c command-line options were specified multiple times
        and silently used the last value only. Monit will generate a warning
        now.
Fixed: Issue #972: Monit GUI: The log view had no size limit when
        reading the Monit log file and could block the browser if the log
        file was large.
Fixed: Issue #955: If more than one every statement is used in
        a check-service context only the last value is (silently) used.
        We now report a warning in this case.
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 448649ae645c285d04294773fc60ea1510cfe029
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Tue Sep 28 23:21:16 2021 +0200
shairport-sync: Update to version 3.3.8
- Update from 3.3.7 to 3.3.8
    - Update of rootfile not required
    - Changelog
       Version 3.3.8
         **Enhancements**
           * Documentation for the MQTT interface. Many thanks to [minix1234](https://github.com/minix1234)!
         **Bug Fixes**
           * Fix a bug in the `alsa` back end. In the interval between checking that the alsa
             device handle was non-`NULL` and actually using it, the handle could be set to
             `NULL`. The interval between check and usage is now protected.
           * Fix a bug in the `alsa` precision timing code. Thanks to
             [durwin99](https://github.com/durwin99),
             [Nicolas Da Mutten](https://github.com/cleverer),
             [mistakenideas](https://github.com/mistakenideas),
             [Ben Willmore](https://github.com/ben-willmore) and
             [giggywithit](https://github.com/giggywithit) for the
             [report](https://github.com/mikebrady/shairport-sync/issues/1158).
           * Fix a bug that caused Shairport Sync to hang, but not actually crash, if an
             `on-...` script failed.
           * Fix a crash that occurred if metadata support is enabled during compilation but
             turned off in the configuration file. Thanks to
             [Tim Curtis](https://github.com/moodeaudio) for the report.
           * Fix a crash that occurred playing from AirPower on Android. Thanks to
             [Ircama](https://github.com/Ircama) for the report.
           * Fix the configure.ac file so that `--without-<feature>` configuration options
             are not interpreted as `--with-<feature>` options instead! Thanks to
             [David Racine](https://github.com/bassdr) for the report.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 725d6a49169d779efe2493478f9c4a7c2e9b8f45
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Fri Oct 22 10:45:26 2021 +0000
core161: add logwatch
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 1c71ff6b2ccde8383529ed26937e1cd21f4cce08
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Wed Oct 6 15:48:35 2021 +0200
logwatch: mdadm status missing - Fix for Bug 12080
- Addition of mdadm module to logwatch
    - Addition of logwatch to sudoers list to run mdadm commands
    - patch to change logwatch mdadm.conf to allow scan for raid drives, change mdadm script
       to run mdadm scan commands with sudo, allow clean but degraded drives to be listed
       in the output.
Fixes: 12080
    Tested-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 4ee445ce44e801c5746e05f06ffa7d05932fdee7
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Wed Oct 20 22:28:43 2021 +0200
ghostscript: Update to version 9.55.0
- Update from 9.54 to 9.55.0
    - Update rootfile
    - Changelog
       Version 9.55.0 (2021-09-27)
         Highlights in this release include:
           This release includes the fix for the %pipe% security issue (CVE-2021-3781).
           New PDF Interpreter: This is an entirely new implementation written in C (rather
            than PostScript, as before). For a full discussion of this change and reasons for
            it see: Changes Coming to the PDF Interpreter.
           In this (9.55.0) release, the new PDF interpreter is disabled by default in
            Ghostscript, but can be used by specifying -dNEWPDF. We hope to make it the
            default in 9.56.0, and fully deprecate the PostScript implementation shortly
            after that (depending on the feedback we get).
           This also allows us to offer a new executable (gpdf, or gpdfwin??.exe on Windows)
            which is purely for PDF input. For this release, those new binaries are not
            included in the "install" make targets, nor in the Windows installers (they will
            be from 9.56.0 onwards).
           We would ask that as many users as possible take the opportunity to test with the
            new PDF implementation (i.e. using -dNEWPDF on your gs command line), and discuss
            any problems with us, before the new implementation becomes the default.
           The pdfwrite device now supports "passthrough" for JPX/JPG2000 data images (as
            well as the already supported JPEG/DCT Encoded). That means that if no rescaling
            or color conversion of the image data is required, the encoded/compressed image
            data from the input file will be written unchanged to the output, preventing
            potential image degradation caused by decompressing and recompressing.
           The Ghostscript/GhostPDL demo apps for C, C#, Java and Python have all had
            improvements and the C#/Java/Python language bindings have now been documented,
            see Ghostscript Language Bindings
           The Zugferd compliant PDF generating definitions (lib/zugferd.ps) have been
            updated and expanded to support the current version (2.1.1) of the Zugferd spec,
            and optionally different versions of the specification.
           The PCL/m output devices now support Duplex/Tumble.
           The internal support for "n-up" style simple imposition (introduced in 9.54.0) has
            been extended and improved for better support across all input formats.
           Ghostscript now supports object specific halftone - for example, different
            halftones can be specified for text and images, reflecting the differing needs of
            rendering those two types of object.
           Our efforts in code hygiene and maintainability continue.
           The usual round of bug fixes, compatibility changes, and incremental improvements.
           (9.53.0) We have added the capability to build with the Tesseract OCR engine. In
            such a build, new devices are available (pdfocr8/pdfocr24/pdfocr32) which render
            the output file to an image, OCR that image, and output the image "wrapped" up as
            a PDF file, with the OCR generated text information included as "invisible" text
            (in PDF terms, text rendering mode 3).
           Mainly due to time constraints, we only support including Tesseract from source
            included in our release packages, and not linking to Tesseract/Leptonica shared
            libraries. Whether we add this capability will be largely dependent on community
            demand for the feature.
           See Enabling OCR for more details.
         For a list of open issues, or to report problems, please visit bugs.ghostscript.com.
         Incompatible changes
           (9.55.0) Changes to the device API. This will affect developers and maintainers of
            Ghostscript devices. Firstly, and most importantly, the way device-specific
            "procs" are specified has been rewritten to make it (we think!) clearer and less
            confusing. See The Interface between Ghostscript and Device Drivers and The Great
            Device Rework Of 2021 for more details.
           (9.55.0) The command line options -sGraphicsICCProfile=___, -dGraphicsIntent=#,
            -dGraphicsBlackPt=#, -dGraphicsKPreserve=# have been changed to
            -sVectorICCProfile=___, -dVectorIntent=#, -dVectorBlackPt=#,
            -dVectorKPreserve=#.
         From 9.55.0 onwards, in recognition of how unwieldy very large HTML files can become
          (History9.html had reached 8.1Mb!), we intend to only include the summary
          highlights (above).
         For anyone wanting the full details of the changes in a release, we ask them to look
          at the history in our public git repository: ghostpdl-9.55.0 log.
         If this change does not draw negative feedback, History?.htm file(s) will be removed
          from the release archives.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 0df914ef30b67a45f59ff8d02cddd76245d64953
Author: Stéphane Pautrel steph78630@gmail.com
Date:   Wed Oct 20 09:21:36 2021 +0000
lang: Update French translation
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 9a93f07dae62990610d0b7168e83767e907803e4
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Oct 20 09:21:35 2021 +0000
Run "./make.sh lang"
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit dbd455ef936277aae9cf4d7d7294f0ceca495b84
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Oct 20 17:46:37 2021 +0000
make.sh: Rewrite uploadsrc with rsync
Instead of having a very dodgy diff of filelists, this rsync call does
    everything automatically and only requires authentication once.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 65710b528a73425a86b286c982130457f3a7d7f4
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Fri Oct 8 15:43:49 2021 +0200
pcengines-apu-firmware: Update to version 4.14.0.4
- Update from 4.14.0.2 to 4.14.0.4
    - Update of rootfile
    - Changelog
       v4.14.0.4 Release date: 2021-09-17
        Changed:
            Rebased with official coreboot repository commit d9f5d90
            Enabled EHCI controller by default on apu3-apu6 platforms
            Updated sortbootorder to v4.6.22
        Added:
            Safeguard against setting watchdog timeout too low
        Known issues:
            apuled driver doesn't work in FreeBSD. Check the GPIOs document for workaround.
            Some PCIe cards are not detected on certain OSes and/or in certain mPCIe slots.
             Check the mPCIe modules document for solution/workaround.
            Booting with 2 USB 3.x sticks plugged in apu4 sometimes results in detecting
             only 1 stick
            Certain USB 3.x sticks happen to not appear in boot menu
            Booting Xen is unstable
       v4.14.0.3 Release date: 2021-08-06
        Changed:
            Rebased with official coreboot repository commit c049c80
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit f85e3493ac71b05d9c5499d8b08b4aaa87c548f5
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Fri Oct 22 10:23:41 2021 +0000
core161: add ca-certificates
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 82c53ef9df7eb0ab75d8d5be42206f14e2b703f1
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sat Sep 25 11:41:29 2021 +0200
update ca-certificates CA bundle
Update the CA certificates list to what Mozilla NSS ships currently.
The original file can be retrieved from:
    https://hg.mozilla.org/mozilla-central/raw-file/tip/security/nss/lib/ckfw/bu...
Signed-off-by: Peter Müller peter.mueller@ipfire.org
    Reviewed-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 76f36a621d1ec83b3a998c600b7bb92f40a88cf0
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sat Sep 25 09:09:00 2021 +0200
Tor: Bump package version
Signed-off-by: Peter Müller peter.mueller@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 91aa257ed732cfa881740310d659db7554bece3d
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sat Sep 25 09:08:42 2021 +0200
Tor: Do not try to support IPv6 for Directory and OR ports
We currently don't have IPv6 in vanilla IPFire 2.x installations, hence
    there is no sense in letting Tor finding out IPv6 connectivity.
Signed-off-by: Peter Müller peter.mueller@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit fb4e1d53a0f079a82717203d0ff7eeea7d0c6162
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sat Sep 25 09:08:22 2021 +0200
Tor: Use crypto hardware acceleration if available
Signed-off-by: Peter Müller peter.mueller@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 0b6a2e761bc14d90725beda5b31f1637a599d163
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sat Sep 25 09:07:58 2021 +0200
Tor: Enable syscall sandbox
This makes post-exploitation activities harder, in case the local Tor
    instance has been compromised. It is worth noticing that Tor won't
    respond to a "GETINFO address" command on the control port if sandboxed,
    but our CGI does not make use of it, and neither is any legitimate
    service on IPFire doing so.
Tested on a small middle relay running on an IPFire machine.
Signed-off-by: Peter Müller peter.mueller@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 0e0c1a8aec13c626b905e97531a2f3f1b5d31e9b
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sat Sep 11 12:57:09 2021 +0200
krb5: Update to version 1.19.2
- Update from 1.19.1 to 1.19.2
    - Update of rootfile not required
    - Changelog
       Major changes in 1.19.2 (2021-07-22)
        This is a bug fix release.
          * Fix a denial of service attack against the KDC encrypted challenge
            code [CVE-2021-36222].
          * Fix a memory leak when gss_inquire_cred() is called without a
            credential handle.
        krb5-1.19.2 changes by ticket ID
          8989    Fix typo in enctypes.rst
          8992    Avoid rand() in aes-gen test program
          9005    Fix argument type errors on Windows
          9006    doc build fails with Sphinx 4.0.2
          9007    Fix KDC null deref on bad encrypted challenge
          9014    Using locking in MEMORY krb5_cc_get_principal()
          9015    Fix use-after-free during krad remote_shutdown()
          9016    Memory leak in krb5_gss_inquire_cred
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 4bd07ee400b1c39e4efec803567efc024147674a
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sat Sep 11 12:56:48 2021 +0200
7zip: Update to version 17.04
- Update from 17.03 to 17.04
    - Update rootfile
    - Changelog
       Version 17.04
         - add lzip decompress
         - update zstd 1.4.9
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 8c943731b14e100e2c55f600e110e28e4040b528
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Fri Oct 22 10:16:23 2021 +0000
core161: add exfatprogs
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 574690dc0015447b5db788ab08190790e0c22d7b
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Sep 9 13:53:30 2021 +0200
exfatprogs: Provide package to work with exfat formats
- Create lfs and rootfile
    - Add exfatprogs to make.sh
    - exfat is supported as a native kernel module since kernel 5.7
    - This package requires CONFIG_EXFAT_FS=m to be set for the kernel module for each
       architecture that will be supported. Currently that is only i586
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit eb8dcf245fc8fa1c40f5248863dd4a003f68e35e
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Fri Oct 22 10:14:04 2021 +0000
core161: add dosfstools
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 923cf5358ca02c25bb57efb39fa5d00740c86364
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Wed Sep 8 23:21:14 2021 +0200
dosfstools: Update to version 4.2
- Update from 3.0.9 (2013) to 4.2 (2021)
    - Update rootfile
    - Program names changed in version 2.0.18
        dosfslabel became fatlabel
        dosfsck became fsck.fat
        and mkdosfs became mkfs.fat
    - Added --enable-compat-symlinks to ./configure command to maintain original names as
       symlinks
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 config/backup/exclude                              |   1 +
 config/backup/includes/minidlna                    |   1 +
 config/ca-certificates/certdata.txt                | 771 +++++++++++++++++++++
 config/cfgroot/general-functions.pl                |   2 +
 config/logwatch/sudoers/logwatch-mdadm             |   2 +
 config/rootfiles/common/ExtUtils-PkgConfig         |   6 +
 config/rootfiles/common/dosfstools                 |  47 +-
 config/rootfiles/common/exfatprogs                 |  10 +
 config/rootfiles/common/gd                         |  13 +-
 config/rootfiles/common/logwatch                   |   6 +-
 config/rootfiles/common/perl-GD                    |   4 +-
 config/rootfiles/common/ppp                        |  29 +-
 .../core/161/filelists/ExtUtils-PkgConfig          |   1 +
 .../{oldcore/136 => core/161}/filelists/GD-Graph   |   0
 .../121 => core/161}/filelists/ca-certificates     |   0
 .../{oldcore/38 => core/161}/filelists/dosfstools  |   0
 config/rootfiles/core/161/filelists/exfatprogs     |   1 +
 config/rootfiles/core/161/filelists/files          |   4 +
 config/rootfiles/core/161/filelists/gd             |   1 +
 .../{oldcore/111 => core/161}/filelists/logwatch   |   0
 .../{oldcore/136 => core/161}/filelists/perl-GD    |   0
 .../{oldcore/125 => core/161}/filelists/ppp        |   0
 config/rootfiles/packages/7zip                     | 198 +++---
 config/rootfiles/packages/cups-filters             |   1 -
 config/rootfiles/packages/ghostscript              | 404 +++++------
 config/rootfiles/packages/minidlna                 |   3 +-
 config/rootfiles/packages/pcengines-apu-firmware   |  12 +-
 doc/language_issues.de                             |   4 +
 doc/language_issues.en                             |  23 +-
 doc/language_issues.es                             |  11 +-
 doc/language_issues.fr                             |  14 +-
 doc/language_issues.it                             |  13 +-
 doc/language_issues.nl                             |  11 +-
 doc/language_issues.pl                             |  11 +-
 doc/language_issues.ru                             |  11 +-
 doc/language_issues.tr                             |  11 +
 doc/language_missings                              |  50 +-
 html/cgi-bin/speed.cgi                             |  46 +-
 html/cgi-bin/tor.cgi                               |   8 +-
 langs/de/cgi-bin/de.pl                             |   2 +-
 langs/en/cgi-bin/en.pl                             |   2 +-
 langs/fr/cgi-bin/fr.pl                             |  17 +-
 lfs/7zip                                           |   8 +-
 lfs/{perl-Data-UUID => ExtUtils-PkgConfig}         |   6 +-
 lfs/GD-Graph                                       |   4 +-
 lfs/ca-certificates                                |   2 +-
 lfs/cups-filters                                   |   6 +-
 lfs/dosfstools                                     |   9 +-
 lfs/{nasm => exfatprogs}                           |   9 +-
 lfs/gd                                             |  15 +-
 lfs/ghostscript                                    |   6 +-
 lfs/krb5                                           |   6 +-
 lfs/logwatch                                       |   8 +-
 lfs/minidlna                                       |   6 +-
 lfs/monit                                          |   6 +-
 lfs/pcengines-apu-firmware                         |  16 +-
 lfs/perl-GD                                        |   4 +-
 lfs/ppp                                            |  15 +-
 lfs/shairport-sync                                 |   6 +-
 lfs/tor                                            |   2 +-
 make.sh                                            |  24 +-
 src/initscripts/networking/red                     |   2 +-
 src/paks/minidlna/install.sh                       |   1 +
 src/paks/minidlna/uninstall.sh                     |   1 +
 .../logwatch-7.5.5-enable-mdadm-sudo.patch         |  46 ++
 ...tilize-compiler-flags-handed-to-us-by-rpm.patch | 121 ----
 .../ppp/0013-everywhere-O_CLOEXEC-harder.patch     |  10 +-
 ...ere-use-SOCK_CLOEXEC-when-creating-socket.patch |  33 +-
 .../ppp/ppp-2.4.6-increase-max-padi-attempts.patch |   6 +-
 src/patches/ppp/ppp-2.4.7-headers_4.9.patch        |   6 +-
 ...p-2.4.8-pppd-fix-bounds-check-in-eap-code.patch |  35 -
 ...patch-configure-to-handle-cflags-properly.patch |  15 +
 72 files changed, 1540 insertions(+), 645 deletions(-)
 create mode 100644 config/backup/includes/minidlna
 create mode 100644 config/logwatch/sudoers/logwatch-mdadm
 create mode 100644 config/rootfiles/common/ExtUtils-PkgConfig
 create mode 100644 config/rootfiles/common/exfatprogs
 create mode 120000 config/rootfiles/core/161/filelists/ExtUtils-PkgConfig
 copy config/rootfiles/{oldcore/136 => core/161}/filelists/GD-Graph (100%)
 copy config/rootfiles/{oldcore/121 => core/161}/filelists/ca-certificates (100%)
 copy config/rootfiles/{oldcore/38 => core/161}/filelists/dosfstools (100%)
 create mode 120000 config/rootfiles/core/161/filelists/exfatprogs
 create mode 120000 config/rootfiles/core/161/filelists/gd
 copy config/rootfiles/{oldcore/111 => core/161}/filelists/logwatch (100%)
 copy config/rootfiles/{oldcore/136 => core/161}/filelists/perl-GD (100%)
 copy config/rootfiles/{oldcore/125 => core/161}/filelists/ppp (100%)
 copy lfs/{perl-Data-UUID => ExtUtils-PkgConfig} (96%)
 copy lfs/{nasm => exfatprogs} (96%)
 create mode 100644 src/patches/logwatch/logwatch-7.5.5-enable-mdadm-sudo.patch
 delete mode 100644 src/patches/ppp/0003-build-sys-utilize-compiler-flags-handed-to-us-by-rpm.patch
 delete mode 100644 src/patches/ppp/ppp-2.4.8-pppd-fix-bounds-check-in-eap-code.patch
 create mode 100644 src/patches/ppp/ppp-2.4.9-patch-configure-to-handle-cflags-properly.patch
Difference in files:

diff --git a/config/backup/exclude b/config/backup/exclude
index 0d3de04d2..68c37de48 100644
--- a/config/backup/exclude
+++ b/config/backup/exclude
@@ -1,4 +1,5 @@
 /etc/sysconfig/lm_sensors
+/etc/unbound/unbound.conf
 *.tmp
 /var/ipfire/ethernet/settings
 /var/ipfire/firewall/bin/*
diff --git a/config/backup/includes/minidlna b/config/backup/includes/minidlna
new file mode 100644
index 000000000..e4e69325c
--- /dev/null
+++ b/config/backup/includes/minidlna
@@ -0,0 +1 @@
+/etc/minidlna.conf
diff --git a/config/ca-certificates/certdata.txt b/config/ca-certificates/certdata.txt
index 56ab1c19f..dfaeceb89 100644
--- a/config/ca-certificates/certdata.txt
+++ b/config/ca-certificates/certdata.txt
@@ -22304,3 +22304,774 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "TunTrust Root CA"
+#
+# Issuer: CN=TunTrust Root CA,O=Agence Nationale de Certification Electronique,C=TN
+# Serial Number:13:02:d5:e2:40:4c:92:46:86:16:67:5d:b4:bb:bb:b2:6b:3e:fc:13
+# Subject: CN=TunTrust Root CA,O=Agence Nationale de Certification Electronique,C=TN
+# Not Valid Before: Fri Apr 26 08:57:56 2019
+# Not Valid After : Tue Apr 26 08:57:56 2044
+# Fingerprint (SHA-256): 2E:44:10:2A:B5:8C:B8:54:19:45:1C:8E:19:D9:AC:F3:66:2C:AF:BC:61:4B:6A:53:96:0A:30:F7:D0:E2:EB:41
+# Fingerprint (SHA1): CF:E9:70:84:0F:E0:73:0F:9D:F6:0C:7F:2C:4B:EE:20:46:34:9C:BB
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "TunTrust Root CA"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\141\061\013\060\011\006\003\125\004\006\023\002\124\116\061
+\067\060\065\006\003\125\004\012\014\056\101\147\145\156\143\145
+\040\116\141\164\151\157\156\141\154\145\040\144\145\040\103\145
+\162\164\151\146\151\143\141\164\151\157\156\040\105\154\145\143
+\164\162\157\156\151\161\165\145\061\031\060\027\006\003\125\004
+\003\014\020\124\165\156\124\162\165\163\164\040\122\157\157\164
+\040\103\101
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\141\061\013\060\011\006\003\125\004\006\023\002\124\116\061
+\067\060\065\006\003\125\004\012\014\056\101\147\145\156\143\145
+\040\116\141\164\151\157\156\141\154\145\040\144\145\040\103\145
+\162\164\151\146\151\143\141\164\151\157\156\040\105\154\145\143
+\164\162\157\156\151\161\165\145\061\031\060\027\006\003\125\004
+\003\014\020\124\165\156\124\162\165\163\164\040\122\157\157\164
+\040\103\101
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\024\023\002\325\342\100\114\222\106\206\026\147\135\264\273
+\273\262\153\076\374\023
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\263\060\202\003\233\240\003\002\001\002\002\024\023
+\002\325\342\100\114\222\106\206\026\147\135\264\273\273\262\153
+\076\374\023\060\015\006\011\052\206\110\206\367\015\001\001\013
+\005\000\060\141\061\013\060\011\006\003\125\004\006\023\002\124
+\116\061\067\060\065\006\003\125\004\012\014\056\101\147\145\156
+\143\145\040\116\141\164\151\157\156\141\154\145\040\144\145\040
+\103\145\162\164\151\146\151\143\141\164\151\157\156\040\105\154
+\145\143\164\162\157\156\151\161\165\145\061\031\060\027\006\003
+\125\004\003\014\020\124\165\156\124\162\165\163\164\040\122\157
+\157\164\040\103\101\060\036\027\015\061\071\060\064\062\066\060
+\070\065\067\065\066\132\027\015\064\064\060\064\062\066\060\070
+\065\067\065\066\132\060\141\061\013\060\011\006\003\125\004\006
+\023\002\124\116\061\067\060\065\006\003\125\004\012\014\056\101
+\147\145\156\143\145\040\116\141\164\151\157\156\141\154\145\040
+\144\145\040\103\145\162\164\151\146\151\143\141\164\151\157\156
+\040\105\154\145\143\164\162\157\156\151\161\165\145\061\031\060
+\027\006\003\125\004\003\014\020\124\165\156\124\162\165\163\164
+\040\122\157\157\164\040\103\101\060\202\002\042\060\015\006\011
+\052\206\110\206\367\015\001\001\001\005\000\003\202\002\017\000
+\060\202\002\012\002\202\002\001\000\303\315\323\374\275\004\123
+\335\014\040\072\325\210\056\005\113\101\365\203\202\176\367\131
+\237\236\236\143\350\163\332\366\006\251\117\037\264\371\013\037
+\071\214\232\040\320\176\006\324\354\064\331\206\274\165\133\207
+\210\360\322\331\324\243\012\262\154\033\353\111\054\076\254\135
+\330\224\003\240\354\064\345\060\304\065\175\373\046\115\033\156
+\060\124\330\365\200\105\234\071\255\234\311\045\004\115\232\220
+\076\116\100\156\212\153\315\051\147\306\314\055\340\164\350\005
+\127\012\110\120\372\172\103\332\176\354\133\232\016\142\166\376
+\352\235\035\205\162\354\021\273\065\350\037\047\277\301\241\307
+\273\110\026\335\126\327\314\116\240\341\271\254\333\325\203\031
+\032\205\321\224\227\327\312\243\145\013\363\070\371\002\256\335
+\366\147\317\311\077\365\212\054\107\032\231\157\005\015\375\320
+\035\202\061\374\051\314\000\130\227\221\114\200\000\034\063\205
+\226\057\313\101\302\213\020\204\303\011\044\211\037\265\017\331
+\331\167\107\030\222\224\140\134\307\231\003\074\376\367\225\247
+\175\120\241\200\302\251\203\255\130\226\125\041\333\206\131\324
+\257\306\274\335\201\156\007\333\140\142\376\354\020\156\332\150
+\001\364\203\033\251\076\242\133\043\327\144\306\337\334\242\175
+\330\113\272\202\322\121\370\146\277\006\106\344\171\052\046\066
+\171\217\037\116\231\035\262\217\014\016\034\377\311\135\300\375
+\220\020\246\261\067\363\315\072\044\156\264\205\220\277\200\271
+\014\214\325\233\326\310\361\126\077\032\200\211\172\251\342\033
+\062\121\054\076\362\337\173\366\135\172\051\031\216\345\310\275
+\066\161\213\135\114\302\035\077\255\130\242\317\075\160\115\246
+\120\230\045\334\043\371\270\130\101\010\161\277\117\270\204\240
+\217\000\124\025\374\221\155\130\247\226\073\353\113\226\047\315
+\153\242\241\206\254\015\174\124\346\146\114\146\137\220\276\041
+\232\002\106\055\344\203\302\200\271\317\113\076\350\177\074\001
+\354\217\136\315\177\322\050\102\001\225\212\342\227\075\020\041
+\175\366\235\034\305\064\241\354\054\016\012\122\054\022\125\160
+\044\075\313\302\024\065\103\135\047\116\276\300\275\252\174\226
+\347\374\236\141\255\104\323\000\227\002\003\001\000\001\243\143
+\060\141\060\035\006\003\125\035\016\004\026\004\024\006\232\233
+\037\123\175\361\365\244\310\323\206\076\241\163\131\264\367\104
+\041\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001
+\001\377\060\037\006\003\125\035\043\004\030\060\026\200\024\006
+\232\233\037\123\175\361\365\244\310\323\206\076\241\163\131\264
+\367\104\041\060\016\006\003\125\035\017\001\001\377\004\004\003
+\002\001\006\060\015\006\011\052\206\110\206\367\015\001\001\013
+\005\000\003\202\002\001\000\252\005\156\266\335\025\311\277\263
+\306\040\366\006\107\260\206\223\045\323\215\271\310\000\077\227
+\365\122\047\210\161\311\164\375\353\312\144\333\133\357\036\135
+\272\277\321\353\356\134\151\272\026\310\363\271\217\323\066\056
+\100\111\007\015\131\336\213\020\260\111\005\342\377\221\077\113
+\267\335\002\216\370\201\050\134\314\334\155\257\137\024\234\175
+\130\170\015\366\200\011\271\351\016\227\051\031\270\267\353\370
+\026\313\125\022\344\306\175\273\304\354\370\265\034\116\076\147
+\277\305\137\033\155\155\107\050\252\004\130\141\326\166\277\042
+\177\320\007\152\247\144\123\360\227\215\235\200\077\273\301\007
+\333\145\257\346\233\062\232\303\124\223\304\034\010\303\104\373
+\173\143\021\103\321\152\032\141\152\171\155\220\117\051\216\107
+\005\301\022\151\151\326\306\066\061\341\374\372\200\272\134\117
+\304\353\267\062\254\370\165\141\027\327\020\031\271\361\322\011
+\357\172\102\235\133\132\013\324\306\225\116\052\316\377\007\327
+\117\176\030\006\210\361\031\265\331\230\273\256\161\304\034\347
+\164\131\130\357\014\211\317\213\037\165\223\032\004\024\222\110
+\120\251\353\127\051\000\026\343\066\034\310\370\277\360\063\325
+\101\017\304\314\074\335\351\063\103\001\221\020\053\036\321\271
+\135\315\062\031\213\217\214\040\167\327\042\304\102\334\204\026
+\233\045\155\350\264\125\161\177\260\174\263\323\161\111\271\317
+\122\244\004\077\334\075\240\273\257\063\236\012\060\140\216\333
+\235\135\224\250\275\140\347\142\200\166\201\203\014\214\314\060
+\106\111\342\014\322\250\257\353\141\161\357\347\042\142\251\367
+\134\144\154\237\026\214\147\066\047\105\365\011\173\277\366\020
+\012\361\260\215\124\103\214\004\272\243\077\357\342\065\307\371
+\164\340\157\064\101\320\277\163\145\127\040\371\233\147\172\146
+\150\044\116\200\145\275\020\231\006\131\362\145\257\270\306\107
+\273\375\220\170\213\101\163\056\257\125\037\334\073\222\162\156
+\204\323\320\141\114\015\314\166\127\342\055\205\042\025\066\015
+\353\001\235\353\330\353\304\204\231\373\300\014\314\062\350\343
+\167\332\203\104\213\236\125\050\300\213\130\323\220\076\116\033
+\000\361\025\255\203\053\232
+END
+CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
+CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
+CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
+
+# Trust for "TunTrust Root CA"
+# Issuer: CN=TunTrust Root CA,O=Agence Nationale de Certification Electronique,C=TN
+# Serial Number:13:02:d5:e2:40:4c:92:46:86:16:67:5d:b4:bb:bb:b2:6b:3e:fc:13
+# Subject: CN=TunTrust Root CA,O=Agence Nationale de Certification Electronique,C=TN
+# Not Valid Before: Fri Apr 26 08:57:56 2019
+# Not Valid After : Tue Apr 26 08:57:56 2044
+# Fingerprint (SHA-256): 2E:44:10:2A:B5:8C:B8:54:19:45:1C:8E:19:D9:AC:F3:66:2C:AF:BC:61:4B:6A:53:96:0A:30:F7:D0:E2:EB:41
+# Fingerprint (SHA1): CF:E9:70:84:0F:E0:73:0F:9D:F6:0C:7F:2C:4B:EE:20:46:34:9C:BB
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "TunTrust Root CA"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\317\351\160\204\017\340\163\017\235\366\014\177\054\113\356\040
+\106\064\234\273
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\205\023\271\220\133\066\134\266\136\270\132\370\340\061\127\264
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\141\061\013\060\011\006\003\125\004\006\023\002\124\116\061
+\067\060\065\006\003\125\004\012\014\056\101\147\145\156\143\145
+\040\116\141\164\151\157\156\141\154\145\040\144\145\040\103\145
+\162\164\151\146\151\143\141\164\151\157\156\040\105\154\145\143
+\164\162\157\156\151\161\165\145\061\031\060\027\006\003\125\004
+\003\014\020\124\165\156\124\162\165\163\164\040\122\157\157\164
+\040\103\101
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\024\023\002\325\342\100\114\222\106\206\026\147\135\264\273
+\273\262\153\076\374\023
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "HARICA TLS RSA Root CA 2021"
+#
+# Issuer: CN=HARICA TLS RSA Root CA 2021,O=Hellenic Academic and Research Institutions CA,C=GR
+# Serial Number:39:ca:93:1c:ef:43:f3:c6:8e:93:c7:f4:64:89:38:7e
+# Subject: CN=HARICA TLS RSA Root CA 2021,O=Hellenic Academic and Research Institutions CA,C=GR
+# Not Valid Before: Fri Feb 19 10:55:38 2021
+# Not Valid After : Mon Feb 13 10:55:37 2045
+# Fingerprint (SHA-256): D9:5D:0E:8E:DA:79:52:5B:F9:BE:B1:1B:14:D2:10:0D:32:94:98:5F:0C:62:D9:FA:BD:9C:D9:99:EC:CB:7B:1D
+# Fingerprint (SHA1): 02:2D:05:82:FA:88:CE:14:0C:06:79:DE:7F:14:10:E9:45:D7:A5:6D
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "HARICA TLS RSA Root CA 2021"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\154\061\013\060\011\006\003\125\004\006\023\002\107\122\061
+\067\060\065\006\003\125\004\012\014\056\110\145\154\154\145\156
+\151\143\040\101\143\141\144\145\155\151\143\040\141\156\144\040
+\122\145\163\145\141\162\143\150\040\111\156\163\164\151\164\165
+\164\151\157\156\163\040\103\101\061\044\060\042\006\003\125\004
+\003\014\033\110\101\122\111\103\101\040\124\114\123\040\122\123
+\101\040\122\157\157\164\040\103\101\040\062\060\062\061
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\154\061\013\060\011\006\003\125\004\006\023\002\107\122\061
+\067\060\065\006\003\125\004\012\014\056\110\145\154\154\145\156
+\151\143\040\101\143\141\144\145\155\151\143\040\141\156\144\040
+\122\145\163\145\141\162\143\150\040\111\156\163\164\151\164\165
+\164\151\157\156\163\040\103\101\061\044\060\042\006\003\125\004
+\003\014\033\110\101\122\111\103\101\040\124\114\123\040\122\123
+\101\040\122\157\157\164\040\103\101\040\062\060\062\061
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\071\312\223\034\357\103\363\306\216\223\307\364\144\211
+\070\176
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\244\060\202\003\214\240\003\002\001\002\002\020\071
+\312\223\034\357\103\363\306\216\223\307\364\144\211\070\176\060
+\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060\154
+\061\013\060\011\006\003\125\004\006\023\002\107\122\061\067\060
+\065\006\003\125\004\012\014\056\110\145\154\154\145\156\151\143
+\040\101\143\141\144\145\155\151\143\040\141\156\144\040\122\145
+\163\145\141\162\143\150\040\111\156\163\164\151\164\165\164\151
+\157\156\163\040\103\101\061\044\060\042\006\003\125\004\003\014
+\033\110\101\122\111\103\101\040\124\114\123\040\122\123\101\040
+\122\157\157\164\040\103\101\040\062\060\062\061\060\036\027\015
+\062\061\060\062\061\071\061\060\065\065\063\070\132\027\015\064
+\065\060\062\061\063\061\060\065\065\063\067\132\060\154\061\013
+\060\011\006\003\125\004\006\023\002\107\122\061\067\060\065\006
+\003\125\004\012\014\056\110\145\154\154\145\156\151\143\040\101
+\143\141\144\145\155\151\143\040\141\156\144\040\122\145\163\145
+\141\162\143\150\040\111\156\163\164\151\164\165\164\151\157\156
+\163\040\103\101\061\044\060\042\006\003\125\004\003\014\033\110
+\101\122\111\103\101\040\124\114\123\040\122\123\101\040\122\157
+\157\164\040\103\101\040\062\060\062\061\060\202\002\042\060\015
+\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\002
+\017\000\060\202\002\012\002\202\002\001\000\213\302\347\257\145
+\233\005\147\226\311\015\044\271\320\016\144\374\316\342\044\030
+\054\204\177\167\121\313\004\021\066\270\136\355\151\161\247\236
+\344\045\011\227\147\301\107\302\317\221\026\066\142\075\070\004
+\341\121\202\377\254\322\264\151\335\056\354\021\243\105\356\153
+\153\073\114\277\214\215\244\036\235\021\271\351\070\371\172\016
+\014\230\342\043\035\321\116\143\324\347\270\101\104\373\153\257
+\153\332\037\323\305\221\210\133\244\211\222\321\201\346\214\071
+\130\240\326\151\103\251\255\230\122\130\156\333\012\373\153\317
+\150\372\343\244\136\072\105\163\230\007\352\137\002\162\336\014
+\245\263\237\256\251\035\267\035\263\374\212\131\347\156\162\145
+\255\365\060\224\043\007\363\202\026\113\065\230\234\123\273\057
+\312\344\132\331\307\215\035\374\230\231\373\054\244\202\153\360
+\052\037\216\013\137\161\134\134\256\102\173\051\211\201\313\003
+\243\231\312\210\236\013\100\011\101\063\333\346\130\172\375\256
+\231\160\300\132\017\326\023\206\161\057\166\151\374\220\335\333
+\055\156\321\362\233\365\032\153\236\157\025\214\172\360\113\050
+\240\042\070\200\044\154\066\244\073\362\060\221\363\170\023\317
+\301\077\065\253\361\035\021\043\265\103\042\236\001\222\267\030
+\002\345\021\321\202\333\025\000\314\141\067\301\052\174\232\341
+\320\272\263\120\106\356\202\254\235\061\370\373\043\342\003\000
+\110\160\243\011\046\171\025\123\140\363\070\134\255\070\352\201
+\000\143\024\271\063\136\335\013\333\240\105\007\032\063\011\370
+\115\264\247\002\246\151\364\302\131\005\210\145\205\126\256\113
+\313\340\336\074\175\055\032\310\351\373\037\243\141\112\326\052
+\023\255\167\114\032\030\233\221\017\130\330\006\124\305\227\370
+\252\077\040\212\246\205\246\167\366\246\374\034\342\356\156\224
+\063\052\203\120\204\012\345\117\206\370\120\105\170\000\201\353
+\133\150\343\046\215\314\173\134\121\364\024\054\100\276\032\140
+\035\172\162\141\035\037\143\055\210\252\316\242\105\220\010\374
+\153\276\263\120\052\132\375\250\110\030\106\326\220\100\222\220
+\012\204\136\150\061\370\353\355\015\323\035\306\175\231\030\125
+\126\047\145\056\215\105\305\044\354\316\343\002\003\001\000\001
+\243\102\060\100\060\017\006\003\125\035\023\001\001\377\004\005
+\060\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024
+\012\110\043\246\140\244\222\012\063\352\223\133\305\127\352\045
+\115\275\022\356\060\016\006\003\125\035\017\001\001\377\004\004
+\003\002\001\206\060\015\006\011\052\206\110\206\367\015\001\001
+\013\005\000\003\202\002\001\000\076\220\110\252\156\142\025\045
+\146\173\014\325\214\213\211\235\327\355\116\007\357\234\320\024
+\137\136\120\275\150\226\220\244\024\021\252\150\155\011\065\071
+\100\011\332\364\011\054\064\245\173\131\204\111\051\227\164\310
+\007\036\107\155\362\316\034\120\046\343\236\075\100\123\077\367
+\177\226\166\020\305\106\245\320\040\113\120\364\065\073\030\364
+\125\152\101\033\107\006\150\074\273\011\010\142\331\137\125\102
+\252\254\123\205\254\225\126\066\126\253\344\005\214\305\250\332
+\037\243\151\275\123\017\304\377\334\312\343\176\362\114\210\206
+\107\106\032\363\000\365\200\221\242\334\103\102\224\233\040\360
+\321\315\262\353\054\123\302\123\170\112\117\004\224\101\232\217
+\047\062\301\345\111\031\277\361\362\302\213\250\012\071\061\050
+\264\175\142\066\054\115\354\037\063\266\176\167\155\176\120\360
+\237\016\327\021\217\317\030\305\343\047\376\046\357\005\235\317
+\317\067\305\320\173\332\073\260\026\204\014\072\223\326\276\027
+\333\017\076\016\031\170\011\307\251\002\162\042\113\367\067\166
+\272\165\304\205\003\132\143\325\261\165\005\302\271\275\224\255
+\214\025\231\247\223\175\366\305\363\252\164\317\004\205\224\230
+\000\364\342\371\312\044\145\277\340\142\257\310\305\372\262\311
+\236\126\110\332\171\375\226\166\025\276\243\216\126\304\263\064
+\374\276\107\364\301\264\250\374\325\060\210\150\356\313\256\311
+\143\304\166\276\254\070\030\341\136\134\317\256\072\042\121\353
+\321\213\263\363\053\063\007\124\207\372\264\262\023\173\272\123
+\004\142\001\235\361\300\117\356\341\072\324\213\040\020\372\002
+\127\346\357\301\013\267\220\106\234\031\051\214\334\157\240\112
+\151\151\224\267\044\145\240\377\254\077\316\001\373\041\056\375
+\150\370\233\362\245\317\061\070\134\025\252\346\227\000\301\337
+\132\245\247\071\252\351\204\177\074\121\250\072\331\224\133\214
+\277\117\010\161\345\333\250\134\324\322\246\376\000\243\306\026
+\307\017\350\200\316\034\050\144\164\031\010\323\102\343\316\000
+\135\177\261\334\023\260\341\005\313\321\040\252\206\164\236\071
+\347\221\375\377\133\326\367\255\246\057\003\013\155\343\127\124
+\353\166\123\030\215\021\230\272
+END
+CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
+CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
+CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
+
+# Trust for "HARICA TLS RSA Root CA 2021"
+# Issuer: CN=HARICA TLS RSA Root CA 2021,O=Hellenic Academic and Research Institutions CA,C=GR
+# Serial Number:39:ca:93:1c:ef:43:f3:c6:8e:93:c7:f4:64:89:38:7e
+# Subject: CN=HARICA TLS RSA Root CA 2021,O=Hellenic Academic and Research Institutions CA,C=GR
+# Not Valid Before: Fri Feb 19 10:55:38 2021
+# Not Valid After : Mon Feb 13 10:55:37 2045
+# Fingerprint (SHA-256): D9:5D:0E:8E:DA:79:52:5B:F9:BE:B1:1B:14:D2:10:0D:32:94:98:5F:0C:62:D9:FA:BD:9C:D9:99:EC:CB:7B:1D
+# Fingerprint (SHA1): 02:2D:05:82:FA:88:CE:14:0C:06:79:DE:7F:14:10:E9:45:D7:A5:6D
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "HARICA TLS RSA Root CA 2021"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\002\055\005\202\372\210\316\024\014\006\171\336\177\024\020\351
+\105\327\245\155
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\145\107\233\130\206\335\054\360\374\242\204\037\036\226\304\221
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\154\061\013\060\011\006\003\125\004\006\023\002\107\122\061
+\067\060\065\006\003\125\004\012\014\056\110\145\154\154\145\156
+\151\143\040\101\143\141\144\145\155\151\143\040\141\156\144\040
+\122\145\163\145\141\162\143\150\040\111\156\163\164\151\164\165
+\164\151\157\156\163\040\103\101\061\044\060\042\006\003\125\004
+\003\014\033\110\101\122\111\103\101\040\124\114\123\040\122\123
+\101\040\122\157\157\164\040\103\101\040\062\060\062\061
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\071\312\223\034\357\103\363\306\216\223\307\364\144\211
+\070\176
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "HARICA TLS ECC Root CA 2021"
+#
+# Issuer: CN=HARICA TLS ECC Root CA 2021,O=Hellenic Academic and Research Institutions CA,C=GR
+# Serial Number:67:74:9d:8d:77:d8:3b:6a:db:22:f4:ff:59:e2:bf:ce
+# Subject: CN=HARICA TLS ECC Root CA 2021,O=Hellenic Academic and Research Institutions CA,C=GR
+# Not Valid Before: Fri Feb 19 11:01:10 2021
+# Not Valid After : Mon Feb 13 11:01:09 2045
+# Fingerprint (SHA-256): 3F:99:CC:47:4A:CF:CE:4D:FE:D5:87:94:66:5E:47:8D:15:47:73:9F:2E:78:0F:1B:B4:CA:9B:13:30:97:D4:01
+# Fingerprint (SHA1): BC:B0:C1:9D:E9:98:92:70:19:38:57:E9:8D:A7:B4:5D:6E:EE:01:48
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "HARICA TLS ECC Root CA 2021"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\154\061\013\060\011\006\003\125\004\006\023\002\107\122\061
+\067\060\065\006\003\125\004\012\014\056\110\145\154\154\145\156
+\151\143\040\101\143\141\144\145\155\151\143\040\141\156\144\040
+\122\145\163\145\141\162\143\150\040\111\156\163\164\151\164\165
+\164\151\157\156\163\040\103\101\061\044\060\042\006\003\125\004
+\003\014\033\110\101\122\111\103\101\040\124\114\123\040\105\103
+\103\040\122\157\157\164\040\103\101\040\062\060\062\061
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\154\061\013\060\011\006\003\125\004\006\023\002\107\122\061
+\067\060\065\006\003\125\004\012\014\056\110\145\154\154\145\156
+\151\143\040\101\143\141\144\145\155\151\143\040\141\156\144\040
+\122\145\163\145\141\162\143\150\040\111\156\163\164\151\164\165
+\164\151\157\156\163\040\103\101\061\044\060\042\006\003\125\004
+\003\014\033\110\101\122\111\103\101\040\124\114\123\040\105\103
+\103\040\122\157\157\164\040\103\101\040\062\060\062\061
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\147\164\235\215\167\330\073\152\333\042\364\377\131\342
+\277\316
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\002\124\060\202\001\333\240\003\002\001\002\002\020\147
+\164\235\215\167\330\073\152\333\042\364\377\131\342\277\316\060
+\012\006\010\052\206\110\316\075\004\003\003\060\154\061\013\060
+\011\006\003\125\004\006\023\002\107\122\061\067\060\065\006\003
+\125\004\012\014\056\110\145\154\154\145\156\151\143\040\101\143
+\141\144\145\155\151\143\040\141\156\144\040\122\145\163\145\141
+\162\143\150\040\111\156\163\164\151\164\165\164\151\157\156\163
+\040\103\101\061\044\060\042\006\003\125\004\003\014\033\110\101
+\122\111\103\101\040\124\114\123\040\105\103\103\040\122\157\157
+\164\040\103\101\040\062\060\062\061\060\036\027\015\062\061\060
+\062\061\071\061\061\060\061\061\060\132\027\015\064\065\060\062
+\061\063\061\061\060\061\060\071\132\060\154\061\013\060\011\006
+\003\125\004\006\023\002\107\122\061\067\060\065\006\003\125\004
+\012\014\056\110\145\154\154\145\156\151\143\040\101\143\141\144
+\145\155\151\143\040\141\156\144\040\122\145\163\145\141\162\143
+\150\040\111\156\163\164\151\164\165\164\151\157\156\163\040\103
+\101\061\044\060\042\006\003\125\004\003\014\033\110\101\122\111
+\103\101\040\124\114\123\040\105\103\103\040\122\157\157\164\040
+\103\101\040\062\060\062\061\060\166\060\020\006\007\052\206\110
+\316\075\002\001\006\005\053\201\004\000\042\003\142\000\004\070
+\010\376\261\240\226\322\172\254\257\111\072\320\300\340\303\073
+\050\252\361\162\155\145\000\107\210\204\374\232\046\153\252\113
+\272\154\004\012\210\136\027\362\125\207\374\060\260\064\342\064
+\130\127\032\204\123\351\060\331\251\362\226\164\303\121\037\130
+\111\061\314\230\116\140\021\207\165\323\162\224\220\117\233\020
+\045\052\250\170\055\276\220\101\130\220\025\162\247\241\267\243
+\102\060\100\060\017\006\003\125\035\023\001\001\377\004\005\060
+\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024\311
+\033\123\201\022\376\004\325\026\321\252\274\232\157\267\240\225
+\031\156\312\060\016\006\003\125\035\017\001\001\377\004\004\003
+\002\001\206\060\012\006\010\052\206\110\316\075\004\003\003\003
+\147\000\060\144\002\060\021\336\256\370\334\116\210\260\251\360
+\042\255\302\121\100\357\140\161\055\356\217\002\304\135\003\160
+\111\244\222\352\305\024\210\160\246\323\015\260\252\312\054\100
+\234\373\351\202\156\232\002\060\053\107\232\007\306\321\302\201
+\174\312\013\226\030\101\033\243\364\060\011\236\265\043\050\015
+\237\024\266\074\123\242\114\006\151\175\372\154\221\306\052\111
+\105\346\354\267\023\341\072\154
+END
+CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
+CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
+CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
+
+# Trust for "HARICA TLS ECC Root CA 2021"
+# Issuer: CN=HARICA TLS ECC Root CA 2021,O=Hellenic Academic and Research Institutions CA,C=GR
+# Serial Number:67:74:9d:8d:77:d8:3b:6a:db:22:f4:ff:59:e2:bf:ce
+# Subject: CN=HARICA TLS ECC Root CA 2021,O=Hellenic Academic and Research Institutions CA,C=GR
+# Not Valid Before: Fri Feb 19 11:01:10 2021
+# Not Valid After : Mon Feb 13 11:01:09 2045
+# Fingerprint (SHA-256): 3F:99:CC:47:4A:CF:CE:4D:FE:D5:87:94:66:5E:47:8D:15:47:73:9F:2E:78:0F:1B:B4:CA:9B:13:30:97:D4:01
+# Fingerprint (SHA1): BC:B0:C1:9D:E9:98:92:70:19:38:57:E9:8D:A7:B4:5D:6E:EE:01:48
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "HARICA TLS ECC Root CA 2021"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\274\260\301\235\351\230\222\160\031\070\127\351\215\247\264\135
+\156\356\001\110
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\256\367\114\345\146\065\321\267\233\214\042\223\164\323\113\260
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\154\061\013\060\011\006\003\125\004\006\023\002\107\122\061
+\067\060\065\006\003\125\004\012\014\056\110\145\154\154\145\156
+\151\143\040\101\143\141\144\145\155\151\143\040\141\156\144\040
+\122\145\163\145\141\162\143\150\040\111\156\163\164\151\164\165
+\164\151\157\156\163\040\103\101\061\044\060\042\006\003\125\004
+\003\014\033\110\101\122\111\103\101\040\124\114\123\040\105\103
+\103\040\122\157\157\164\040\103\101\040\062\060\062\061
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\147\164\235\215\167\330\073\152\333\042\364\377\131\342
+\277\316
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "HARICA Client RSA Root CA 2021"
+#
+# Issuer: CN=HARICA Client RSA Root CA 2021,O=Hellenic Academic and Research Institutions CA,C=GR
+# Serial Number:55:52:f8:1e:db:1b:24:2c:9e:bb:96:18:cd:02:28:3e
+# Subject: CN=HARICA Client RSA Root CA 2021,O=Hellenic Academic and Research Institutions CA,C=GR
+# Not Valid Before: Fri Feb 19 10:58:46 2021
+# Not Valid After : Mon Feb 13 10:58:45 2045
+# Fingerprint (SHA-256): 1B:E7:AB:E3:06:86:B1:63:48:AF:D1:C6:1B:68:66:A0:EA:7F:48:21:E6:7D:5E:8A:F9:37:CF:80:11:BC:75:0D
+# Fingerprint (SHA1): 46:C6:90:0A:77:3A:B6:BC:F4:65:AD:AC:FC:E3:F7:07:00:6E:DE:6E
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "HARICA Client RSA Root CA 2021"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\157\061\013\060\011\006\003\125\004\006\023\002\107\122\061
+\067\060\065\006\003\125\004\012\014\056\110\145\154\154\145\156
+\151\143\040\101\143\141\144\145\155\151\143\040\141\156\144\040
+\122\145\163\145\141\162\143\150\040\111\156\163\164\151\164\165
+\164\151\157\156\163\040\103\101\061\047\060\045\006\003\125\004
+\003\014\036\110\101\122\111\103\101\040\103\154\151\145\156\164
+\040\122\123\101\040\122\157\157\164\040\103\101\040\062\060\062
+\061
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\157\061\013\060\011\006\003\125\004\006\023\002\107\122\061
+\067\060\065\006\003\125\004\012\014\056\110\145\154\154\145\156
+\151\143\040\101\143\141\144\145\155\151\143\040\141\156\144\040
+\122\145\163\145\141\162\143\150\040\111\156\163\164\151\164\165
+\164\151\157\156\163\040\103\101\061\047\060\045\006\003\125\004
+\003\014\036\110\101\122\111\103\101\040\103\154\151\145\156\164
+\040\122\123\101\040\122\157\157\164\040\103\101\040\062\060\062
+\061
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\125\122\370\036\333\033\044\054\236\273\226\030\315\002
+\050\076
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\252\060\202\003\222\240\003\002\001\002\002\020\125
+\122\370\036\333\033\044\054\236\273\226\030\315\002\050\076\060
+\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060\157
+\061\013\060\011\006\003\125\004\006\023\002\107\122\061\067\060
+\065\006\003\125\004\012\014\056\110\145\154\154\145\156\151\143
+\040\101\143\141\144\145\155\151\143\040\141\156\144\040\122\145
+\163\145\141\162\143\150\040\111\156\163\164\151\164\165\164\151
+\157\156\163\040\103\101\061\047\060\045\006\003\125\004\003\014
+\036\110\101\122\111\103\101\040\103\154\151\145\156\164\040\122
+\123\101\040\122\157\157\164\040\103\101\040\062\060\062\061\060
+\036\027\015\062\061\060\062\061\071\061\060\065\070\064\066\132
+\027\015\064\065\060\062\061\063\061\060\065\070\064\065\132\060
+\157\061\013\060\011\006\003\125\004\006\023\002\107\122\061\067
+\060\065\006\003\125\004\012\014\056\110\145\154\154\145\156\151
+\143\040\101\143\141\144\145\155\151\143\040\141\156\144\040\122
+\145\163\145\141\162\143\150\040\111\156\163\164\151\164\165\164
+\151\157\156\163\040\103\101\061\047\060\045\006\003\125\004\003
+\014\036\110\101\122\111\103\101\040\103\154\151\145\156\164\040
+\122\123\101\040\122\157\157\164\040\103\101\040\062\060\062\061
+\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001
+\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001
+\000\201\333\127\102\220\054\164\065\364\370\270\164\031\115\253
+\011\132\167\105\201\163\142\260\065\237\370\320\267\063\000\207
+\023\266\226\253\016\124\022\060\007\274\233\267\110\327\321\031
+\203\256\216\330\251\361\251\000\204\260\214\136\236\350\014\217
+\124\151\277\366\324\010\117\046\160\376\030\101\143\032\263\062
+\213\100\370\007\253\127\061\360\306\026\166\147\232\264\335\057
+\362\321\153\305\320\222\204\221\161\156\017\056\143\351\037\123
+\244\335\122\023\314\011\203\051\201\014\305\123\165\104\261\016
+\147\123\030\320\303\037\210\113\237\224\044\264\051\274\273\350
+\116\375\157\322\025\035\111\334\215\160\362\021\032\040\121\125
+\021\272\210\157\304\367\120\171\326\252\061\342\204\075\136\062
+\310\167\052\120\161\345\013\057\351\266\352\357\253\012\063\071
+\016\375\217\245\147\103\202\216\230\151\011\011\033\100\315\070
+\147\107\352\311\354\227\161\022\336\044\365\162\074\321\367\103
+\114\046\367\220\262\211\351\105\113\125\075\061\005\172\101\342
+\225\272\103\300\027\305\266\205\075\031\215\144\160\363\133\254
+\315\237\323\051\165\207\113\225\147\152\246\370\321\335\274\220
+\206\211\103\051\251\067\133\365\135\260\046\132\123\102\166\220
+\053\317\236\126\154\053\124\317\134\232\145\337\133\213\110\140
+\070\174\373\305\013\317\166\004\143\002\063\052\175\365\203\147
+\347\372\306\103\375\053\017\324\046\057\167\244\062\301\044\352
+\144\235\277\263\070\161\061\104\362\107\270\242\146\101\241\373
+\233\173\274\307\106\152\165\277\132\242\214\350\152\104\301\270
+\226\265\300\062\010\055\173\164\065\163\262\312\306\376\257\021
+\162\030\366\347\310\302\317\245\052\352\173\326\131\350\174\240
+\262\152\100\011\151\016\245\226\333\321\000\271\361\210\156\066
+\360\210\262\235\361\122\362\303\174\277\060\211\074\012\151\371
+\042\244\145\341\233\340\164\306\261\205\227\226\054\256\224\217
+\120\246\071\022\037\276\107\362\201\170\323\165\066\236\175\132
+\040\227\342\122\256\231\237\306\174\233\146\363\376\330\317\356
+\275\227\006\035\055\205\334\076\066\123\226\173\040\272\350\310
+\341\255\226\142\076\021\174\263\000\204\236\247\114\161\253\112
+\067\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035
+\023\001\001\377\004\005\060\003\001\001\377\060\035\006\003\125
+\035\016\004\026\004\024\240\326\007\075\136\044\367\173\240\104
+\056\044\122\015\031\252\053\004\221\247\060\016\006\003\125\035
+\017\001\001\377\004\004\003\002\001\206\060\015\006\011\052\206
+\110\206\367\015\001\001\013\005\000\003\202\002\001\000\015\107
+\371\011\146\061\122\354\171\356\302\250\362\150\076\355\226\105
+\313\072\246\230\143\077\352\053\115\116\003\320\034\202\341\313
+\323\345\326\253\133\147\050\274\235\376\014\231\012\200\125\247
+\316\033\043\141\015\260\127\360\376\340\312\276\346\220\333\203
+\054\276\203\216\364\171\266\376\320\015\102\247\130\037\151\352
+\201\365\005\245\376\106\150\353\154\170\311\340\352\347\346\336
+\061\305\322\325\054\202\143\050\235\135\250\032\176\210\346\347
+\053\361\054\325\320\005\236\334\055\275\067\146\324\004\242\247
+\255\277\072\302\250\073\255\377\215\235\063\340\271\232\204\241
+\207\037\166\364\202\164\327\016\371\060\110\076\133\210\076\252
+\134\153\326\057\014\350\216\163\302\030\221\203\071\266\146\132
+\320\037\140\047\135\115\343\366\072\015\146\120\234\170\173\253
+\363\023\020\256\017\057\253\350\144\263\030\040\235\106\065\144
+\045\163\352\233\020\134\130\065\211\261\106\110\247\364\254\324
+\035\236\133\314\251\245\032\023\117\044\120\252\331\033\155\261
+\100\373\235\335\130\164\304\302\157\024\162\354\333\065\237\270
+\124\165\105\303\246\310\032\050\065\072\256\145\362\251\230\316
+\257\133\311\070\214\061\073\177\314\334\226\375\342\133\326\320
+\131\364\166\272\013\313\117\203\020\307\100\320\035\140\351\052
+\345\110\130\167\014\105\151\276\031\161\004\044\342\343\044\037
+\112\310\301\076\231\365\226\230\070\110\045\241\025\260\033\327
+\342\204\030\133\366\161\065\232\150\173\100\314\030\134\014\044
+\235\324\225\365\231\252\106\352\256\254\277\364\024\031\044\350
+\214\354\343\365\274\006\150\212\052\014\005\137\012\227\165\247
+\334\176\300\375\327\172\030\337\060\321\070\113\037\260\230\160
+\277\314\174\163\360\156\304\061\245\244\227\035\254\277\316\154
+\041\112\276\047\043\147\363\006\126\201\012\221\216\266\341\003
+\005\063\054\332\064\010\115\116\120\043\255\037\245\305\324\172
+\376\352\011\354\247\050\140\213\106\174\265\352\233\335\117\371
+\347\153\025\306\210\317\103\333\345\047\334\004\126\156\157\106
+\025\361\126\055\350\134\014\163\303\043\201\070\040\313\311\014
+\151\317\054\253\073\204\140\063\031\122\375\151\024\063
+END
+CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
+CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
+CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
+
+# Trust for "HARICA Client RSA Root CA 2021"
+# Issuer: CN=HARICA Client RSA Root CA 2021,O=Hellenic Academic and Research Institutions CA,C=GR
+# Serial Number:55:52:f8:1e:db:1b:24:2c:9e:bb:96:18:cd:02:28:3e
+# Subject: CN=HARICA Client RSA Root CA 2021,O=Hellenic Academic and Research Institutions CA,C=GR
+# Not Valid Before: Fri Feb 19 10:58:46 2021
+# Not Valid After : Mon Feb 13 10:58:45 2045
+# Fingerprint (SHA-256): 1B:E7:AB:E3:06:86:B1:63:48:AF:D1:C6:1B:68:66:A0:EA:7F:48:21:E6:7D:5E:8A:F9:37:CF:80:11:BC:75:0D
+# Fingerprint (SHA1): 46:C6:90:0A:77:3A:B6:BC:F4:65:AD:AC:FC:E3:F7:07:00:6E:DE:6E
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "HARICA Client RSA Root CA 2021"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\106\306\220\012\167\072\266\274\364\145\255\254\374\343\367\007
+\000\156\336\156
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\157\355\134\327\210\314\070\251\334\351\335\331\135\333\330\355
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\157\061\013\060\011\006\003\125\004\006\023\002\107\122\061
+\067\060\065\006\003\125\004\012\014\056\110\145\154\154\145\156
+\151\143\040\101\143\141\144\145\155\151\143\040\141\156\144\040
+\122\145\163\145\141\162\143\150\040\111\156\163\164\151\164\165
+\164\151\157\156\163\040\103\101\061\047\060\045\006\003\125\004
+\003\014\036\110\101\122\111\103\101\040\103\154\151\145\156\164
+\040\122\123\101\040\122\157\157\164\040\103\101\040\062\060\062
+\061
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\125\122\370\036\333\033\044\054\236\273\226\030\315\002
+\050\076
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "HARICA Client ECC Root CA 2021"
+#
+# Issuer: CN=HARICA Client ECC Root CA 2021,O=Hellenic Academic and Research Institutions CA,C=GR
+# Serial Number:31:68:d9:d8:e1:62:57:1e:d2:19:44:88:e6:10:7d:f0
+# Subject: CN=HARICA Client ECC Root CA 2021,O=Hellenic Academic and Research Institutions CA,C=GR
+# Not Valid Before: Fri Feb 19 11:03:34 2021
+# Not Valid After : Mon Feb 13 11:03:33 2045
+# Fingerprint (SHA-256): 8D:D4:B5:37:3C:B0:DE:36:76:9C:12:33:92:80:D8:27:46:B3:AA:6C:D4:26:E7:97:A3:1B:AB:E4:27:9C:F0:0B
+# Fingerprint (SHA1): BE:64:D3:DA:14:4B:D2:6B:CD:AF:8F:DB:A6:A6:72:F8:DE:26:F9:00
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "HARICA Client ECC Root CA 2021"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\157\061\013\060\011\006\003\125\004\006\023\002\107\122\061
+\067\060\065\006\003\125\004\012\014\056\110\145\154\154\145\156
+\151\143\040\101\143\141\144\145\155\151\143\040\141\156\144\040
+\122\145\163\145\141\162\143\150\040\111\156\163\164\151\164\165
+\164\151\157\156\163\040\103\101\061\047\060\045\006\003\125\004
+\003\014\036\110\101\122\111\103\101\040\103\154\151\145\156\164
+\040\105\103\103\040\122\157\157\164\040\103\101\040\062\060\062
+\061
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\157\061\013\060\011\006\003\125\004\006\023\002\107\122\061
+\067\060\065\006\003\125\004\012\014\056\110\145\154\154\145\156
+\151\143\040\101\143\141\144\145\155\151\143\040\141\156\144\040
+\122\145\163\145\141\162\143\150\040\111\156\163\164\151\164\165
+\164\151\157\156\163\040\103\101\061\047\060\045\006\003\125\004
+\003\014\036\110\101\122\111\103\101\040\103\154\151\145\156\164
+\040\105\103\103\040\122\157\157\164\040\103\101\040\062\060\062
+\061
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\061\150\331\330\341\142\127\036\322\031\104\210\346\020
+\175\360
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\002\132\060\202\001\341\240\003\002\001\002\002\020\061
+\150\331\330\341\142\127\036\322\031\104\210\346\020\175\360\060
+\012\006\010\052\206\110\316\075\004\003\003\060\157\061\013\060
+\011\006\003\125\004\006\023\002\107\122\061\067\060\065\006\003
+\125\004\012\014\056\110\145\154\154\145\156\151\143\040\101\143
+\141\144\145\155\151\143\040\141\156\144\040\122\145\163\145\141
+\162\143\150\040\111\156\163\164\151\164\165\164\151\157\156\163
+\040\103\101\061\047\060\045\006\003\125\004\003\014\036\110\101
+\122\111\103\101\040\103\154\151\145\156\164\040\105\103\103\040
+\122\157\157\164\040\103\101\040\062\060\062\061\060\036\027\015
+\062\061\060\062\061\071\061\061\060\063\063\064\132\027\015\064
+\065\060\062\061\063\061\061\060\063\063\063\132\060\157\061\013
+\060\011\006\003\125\004\006\023\002\107\122\061\067\060\065\006
+\003\125\004\012\014\056\110\145\154\154\145\156\151\143\040\101
+\143\141\144\145\155\151\143\040\141\156\144\040\122\145\163\145
+\141\162\143\150\040\111\156\163\164\151\164\165\164\151\157\156
+\163\040\103\101\061\047\060\045\006\003\125\004\003\014\036\110
+\101\122\111\103\101\040\103\154\151\145\156\164\040\105\103\103
+\040\122\157\157\164\040\103\101\040\062\060\062\061\060\166\060
+\020\006\007\052\206\110\316\075\002\001\006\005\053\201\004\000
+\042\003\142\000\004\007\030\255\225\226\224\320\134\017\202\367
+\052\100\372\002\311\311\075\066\246\243\004\152\301\155\225\001
+\210\140\022\124\154\134\242\053\156\023\072\210\225\014\034\046
+\206\066\112\211\031\267\030\336\073\350\250\120\037\312\337\133
+\277\111\200\025\333\343\060\341\035\132\307\052\212\001\007\376
+\155\054\064\357\050\050\227\274\301\371\127\206\225\213\065\317
+\236\132\321\150\225\243\102\060\100\060\017\006\003\125\035\023
+\001\001\377\004\005\060\003\001\001\377\060\035\006\003\125\035
+\016\004\026\004\024\122\010\322\276\062\201\045\375\365\032\227
+\354\116\137\032\273\123\315\220\255\060\016\006\003\125\035\017
+\001\001\377\004\004\003\002\001\206\060\012\006\010\052\206\110
+\316\075\004\003\003\003\147\000\060\144\002\060\114\061\105\106
+\117\250\346\276\303\167\262\032\030\113\055\210\173\130\346\253
+\224\153\104\003\260\027\377\337\202\163\104\121\054\375\223\035
+\006\173\024\322\211\354\100\014\357\041\001\056\002\060\057\311
+\056\132\154\054\035\331\225\340\236\260\271\134\122\174\366\370
+\070\312\056\361\324\035\362\242\111\242\225\370\301\130\136\117
+\376\163\012\357\061\260\253\043\130\023\214\213\336\073
+END
+CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
+CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
+CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
+
+# Trust for "HARICA Client ECC Root CA 2021"
+# Issuer: CN=HARICA Client ECC Root CA 2021,O=Hellenic Academic and Research Institutions CA,C=GR
+# Serial Number:31:68:d9:d8:e1:62:57:1e:d2:19:44:88:e6:10:7d:f0
+# Subject: CN=HARICA Client ECC Root CA 2021,O=Hellenic Academic and Research Institutions CA,C=GR
+# Not Valid Before: Fri Feb 19 11:03:34 2021
+# Not Valid After : Mon Feb 13 11:03:33 2045
+# Fingerprint (SHA-256): 8D:D4:B5:37:3C:B0:DE:36:76:9C:12:33:92:80:D8:27:46:B3:AA:6C:D4:26:E7:97:A3:1B:AB:E4:27:9C:F0:0B
+# Fingerprint (SHA1): BE:64:D3:DA:14:4B:D2:6B:CD:AF:8F:DB:A6:A6:72:F8:DE:26:F9:00
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "HARICA Client ECC Root CA 2021"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\276\144\323\332\024\113\322\153\315\257\217\333\246\246\162\370
+\336\046\371\000
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\255\270\120\246\251\202\172\154\075\032\252\244\322\143\244\104
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\157\061\013\060\011\006\003\125\004\006\023\002\107\122\061
+\067\060\065\006\003\125\004\012\014\056\110\145\154\154\145\156
+\151\143\040\101\143\141\144\145\155\151\143\040\141\156\144\040
+\122\145\163\145\141\162\143\150\040\111\156\163\164\151\164\165
+\164\151\157\156\163\040\103\101\061\047\060\045\006\003\125\004
+\003\014\036\110\101\122\111\103\101\040\103\154\151\145\156\164
+\040\105\103\103\040\122\157\157\164\040\103\101\040\062\060\062
+\061
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\061\150\331\330\341\142\127\036\322\031\104\210\346\020
+\175\360
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index f72d6588c..c10a04faa 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -53,6 +53,7 @@ sub system_background($) {
 }
# Returns the output of a shell command
+# if you change this also check speed.cgi that include a local copy for systemload reasons
 sub system_output($) {
    my @command = @_;
    my $pid;
@@ -1227,6 +1228,7 @@ sub firewall_reload() {
 }
# Function which will return the used interface for the red network zone (red0, ppp0, etc).
+# if you change this also check speed.cgi that include a local copy for systemload reasons
 sub get_red_interface() {
open(IFACE, "${General::swroot}/red/iface") or die "Could not open /var/ipfire/red/iface";
diff --git a/config/logwatch/sudoers/logwatch-mdadm b/config/logwatch/sudoers/logwatch-mdadm
new file mode 100644
index 000000000..cdc524def
--- /dev/null
+++ b/config/logwatch/sudoers/logwatch-mdadm
@@ -0,0 +1,2 @@
+# The following commands need to be executed by logwatch in case there's an MD Raid
+logwatch ALL=(root) NOPASSWD: /sbin/mdadm --misc --detail /dev/md*, /sbin/mdadm --detail --scan
diff --git a/config/rootfiles/common/ExtUtils-PkgConfig b/config/rootfiles/common/ExtUtils-PkgConfig
new file mode 100644
index 000000000..6cd28fbac
--- /dev/null
+++ b/config/rootfiles/common/ExtUtils-PkgConfig
@@ -0,0 +1,6 @@
+#usr/lib/perl5/site_perl/5.32.1/ExtUtils
+#usr/lib/perl5/site_perl/5.32.1/ExtUtils/PkgConfig.pm
+#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/ExtUtils
+#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/ExtUtils/PkgConfig
+#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/ExtUtils/PkgConfig/.packlist
+#usr/share/man/man3/ExtUtils::PkgConfig.3
diff --git a/config/rootfiles/common/dosfstools b/config/rootfiles/common/dosfstools
index 4b38c2926..200066aac 100644
--- a/config/rootfiles/common/dosfstools
+++ b/config/rootfiles/common/dosfstools
@@ -1,28 +1,33 @@
 sbin/dosfsck
 sbin/dosfslabel
+sbin/fatlabel
+sbin/fsck.fat
 sbin/fsck.msdos
 sbin/fsck.vfat
 sbin/mkdosfs
+sbin/mkfs.fat
 sbin/mkfs.msdos
 sbin/mkfs.vfat
-#share
-#share/doc
-#share/doc/dosfstools
-#share/doc/dosfstools/ANNOUNCE.mkdosfs
-#share/doc/dosfstools/ChangeLog
-#share/doc/dosfstools/ChangeLog.dosfsck
-#share/doc/dosfstools/ChangeLog.dosfstools-2.x
-#share/doc/dosfstools/ChangeLog.mkdosfs
-#share/doc/dosfstools/README.dosfsck
-#share/doc/dosfstools/README.dosfstools-2.x
-#share/doc/dosfstools/README.mkdosfs
-#share/doc/dosfstools/TODO.dosfstools-2.x
-#share/man
-#share/man/man8
-#share/man/man8/dosfsck.8
-#share/man/man8/dosfslabel.8
-#share/man/man8/fsck.msdos.8
-#share/man/man8/fsck.vfat.8
-#share/man/man8/mkdosfs.8
-#share/man/man8/mkfs.msdos.8
-#share/man/man8/mkfs.vfat.8
+#usr/share/doc/dosfstools
+#usr/share/doc/dosfstools/ANNOUNCE.mkdosfs
+#usr/share/doc/dosfstools/COPYING
+#usr/share/doc/dosfstools/ChangeLog
+#usr/share/doc/dosfstools/ChangeLog.dosfsck
+#usr/share/doc/dosfstools/ChangeLog.dosfstools-2.x
+#usr/share/doc/dosfstools/ChangeLog.mkdosfs
+#usr/share/doc/dosfstools/NEWS
+#usr/share/doc/dosfstools/README
+#usr/share/doc/dosfstools/README.dosfsck
+#usr/share/doc/dosfstools/README.dosfstools-2.x
+#usr/share/doc/dosfstools/README.mkdosfs
+#usr/share/doc/dosfstools/TODO.dosfstools-2.x
+#usr/share/man/man8/dosfsck.8
+#usr/share/man/man8/dosfslabel.8
+#usr/share/man/man8/fatlabel.8
+#usr/share/man/man8/fsck.fat.8
+#usr/share/man/man8/fsck.msdos.8
+#usr/share/man/man8/fsck.vfat.8
+#usr/share/man/man8/mkdosfs.8
+#usr/share/man/man8/mkfs.fat.8
+#usr/share/man/man8/mkfs.msdos.8
+#usr/share/man/man8/mkfs.vfat.8
diff --git a/config/rootfiles/common/exfatprogs b/config/rootfiles/common/exfatprogs
new file mode 100644
index 000000000..19652c8c1
--- /dev/null
+++ b/config/rootfiles/common/exfatprogs
@@ -0,0 +1,10 @@
+usr/sbin/dump.exfat
+usr/sbin/exfatlabel
+usr/sbin/fsck.exfat
+usr/sbin/mkfs.exfat
+usr/sbin/tune.exfat
+#usr/share/man/man8/dump.exfat.8
+#usr/share/man/man8/exfatlabel.8
+#usr/share/man/man8/fsck.exfat.8
+#usr/share/man/man8/mkfs.exfat.8
+#usr/share/man/man8/tune.exfat.8
diff --git a/config/rootfiles/common/gd b/config/rootfiles/common/gd
index 09366b717..434102084 100644
--- a/config/rootfiles/common/gd
+++ b/config/rootfiles/common/gd
@@ -4,15 +4,15 @@
 #usr/bin/gd2togif
 #usr/bin/gd2topng
 #usr/bin/gdcmpgif
-#usr/bin/gdlib-config
 #usr/bin/gdparttopng
 #usr/bin/gdtopng
 #usr/bin/giftogd2
 #usr/bin/pngtogd
 #usr/bin/pngtogd2
 #usr/bin/webpng
-#usr/include/entities.h
 #usr/include/gd.h
+#usr/include/gd_color_map.h
+#usr/include/gd_errors.h
 #usr/include/gd_io.h
 #usr/include/gdcache.h
 #usr/include/gdfontg.h
@@ -21,8 +21,9 @@
 #usr/include/gdfonts.h
 #usr/include/gdfontt.h
 #usr/include/gdfx.h
-#usr/lib/libgd.a
+#usr/include/gdpp.h
 #usr/lib/libgd.la
-usr/lib/libgd.so
-usr/lib/libgd.so.2
-usr/lib/libgd.so.2.0.0
+#usr/lib/libgd.so
+usr/lib/libgd.so.3
+usr/lib/libgd.so.3.0.11
+#usr/lib/pkgconfig/gdlib.pc
diff --git a/config/rootfiles/common/logwatch b/config/rootfiles/common/logwatch
index c47fb4199..1e4a0a81b 100644
--- a/config/rootfiles/common/logwatch
+++ b/config/rootfiles/common/logwatch
@@ -3,6 +3,8 @@ etc/logwatch/conf
 #etc/logwatch/logwatch.cron
 etc/logwatch/scripts
 etc/logwatch/scripts/services
+#etc/sudoers.d
+etc/sudoers.d/logwatch-mdadm
 usr/sbin/logwatch
 #usr/share/logwatch
 #usr/share/logwatch/HOWTO-Customize-LogWatch
@@ -117,7 +119,7 @@ usr/share/logwatch/default.conf/services/kernel.conf
 #usr/share/logwatch/default.conf/services/knockd.conf
 #usr/share/logwatch/default.conf/services/lvm.conf
 #usr/share/logwatch/default.conf/services/mailscanner.conf
-#usr/share/logwatch/default.conf/services/mdadm.conf
+usr/share/logwatch/default.conf/services/mdadm.conf
 #usr/share/logwatch/default.conf/services/mod_security2.conf
 usr/share/logwatch/default.conf/services/modprobe.conf
 #usr/share/logwatch/default.conf/services/mountd.conf
@@ -262,7 +264,7 @@ usr/share/logwatch/scripts/services/kernel
 #usr/share/logwatch/scripts/services/knockd
 #usr/share/logwatch/scripts/services/lvm
 #usr/share/logwatch/scripts/services/mailscanner
-#usr/share/logwatch/scripts/services/mdadm
+usr/share/logwatch/scripts/services/mdadm
 #usr/share/logwatch/scripts/services/mod_security2
 usr/share/logwatch/scripts/services/modprobe
 #usr/share/logwatch/scripts/services/mountd
diff --git a/config/rootfiles/common/perl-GD b/config/rootfiles/common/perl-GD
index 465d84ce5..eedb8ac4c 100644
--- a/config/rootfiles/common/perl-GD
+++ b/config/rootfiles/common/perl-GD
@@ -1,18 +1,18 @@
 #usr/bin/bdf2gdfont.pl
 #usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/GD
 usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/GD.pm
+usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/GD/Group.pm
 usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/GD/Image.pm
 usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/GD/Polygon.pm
 usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/GD/Polyline.pm
 usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/GD/Simple.pm
 #usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/GD
 #usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/GD/.packlist
-#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/GD/GD.bs
 usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/GD/GD.so
 usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/GD/autosplit.ix
-usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/qd.pl
 #usr/share/man/man1/bdf2gdfont.pl.1
 #usr/share/man/man3/GD.3
+#usr/share/man/man3/GD::Group.3
 #usr/share/man/man3/GD::Image.3
 #usr/share/man/man3/GD::Polygon.3
 #usr/share/man/man3/GD::Polyline.3
diff --git a/config/rootfiles/common/ppp b/config/rootfiles/common/ppp
index f1f4f88f2..d61fdf811 100644
--- a/config/rootfiles/common/ppp
+++ b/config/rootfiles/common/ppp
@@ -2,6 +2,8 @@
 etc/ppp/chap-secrets
 etc/ppp/demonloginscript
 etc/ppp/dialer
+#etc/ppp/eaptls-client
+#etc/ppp/eaptls-server
 etc/ppp/ioptions
 etc/ppp/ip-down
 etc/ppp/ip-up
@@ -12,6 +14,7 @@ etc/ppp/standardloginscript
 #usr/include/pppd/ccp.h
 #usr/include/pppd/chap-new.h
 #usr/include/pppd/chap_ms.h
+#usr/include/pppd/eap-tls.h
 #usr/include/pppd/eap.h
 #usr/include/pppd/ecp.h
 #usr/include/pppd/eui64.h
@@ -23,6 +26,7 @@ etc/ppp/standardloginscript
 #usr/include/pppd/magic.h
 #usr/include/pppd/md4.h
 #usr/include/pppd/md5.h
+#usr/include/pppd/mppe.h
 #usr/include/pppd/patchlevel.h
 #usr/include/pppd/pathnames.h
 #usr/include/pppd/pppcrypt.h
@@ -33,18 +37,19 @@ etc/ppp/standardloginscript
 #usr/include/pppd/tdb.h
 #usr/include/pppd/upap.h
 usr/lib/pppd
-usr/lib/pppd/2.4.8
-#usr/lib/pppd/2.4.8/minconn.so
-#usr/lib/pppd/2.4.8/openl2tp.so
-#usr/lib/pppd/2.4.8/passprompt.so
-#usr/lib/pppd/2.4.8/passwordfd.so
-#usr/lib/pppd/2.4.8/pppoatm.so
-#usr/lib/pppd/2.4.8/pppol2tp.so
-#usr/lib/pppd/2.4.8/radattr.so
-#usr/lib/pppd/2.4.8/radius.so
-#usr/lib/pppd/2.4.8/radrealms.so
-#usr/lib/pppd/2.4.8/rp-pppoe.so
-#usr/lib/pppd/2.4.8/winbind.so
+usr/lib/pppd/2.4.9
+usr/lib/pppd/2.4.9/minconn.so
+usr/lib/pppd/2.4.9/openl2tp.so
+usr/lib/pppd/2.4.9/passprompt.so
+usr/lib/pppd/2.4.9/passwordfd.so
+usr/lib/pppd/2.4.9/pppoatm.so
+usr/lib/pppd/2.4.9/pppoe.so
+usr/lib/pppd/2.4.9/pppol2tp.so
+usr/lib/pppd/2.4.9/radattr.so
+usr/lib/pppd/2.4.9/radius.so
+usr/lib/pppd/2.4.9/radrealms.so
+usr/lib/pppd/2.4.9/rp-pppoe.so
+usr/lib/pppd/2.4.9/winbind.so
 usr/sbin/chat
 usr/sbin/pppd
 usr/sbin/pppdump
diff --git a/config/rootfiles/core/161/filelists/ExtUtils-PkgConfig b/config/rootfiles/core/161/filelists/ExtUtils-PkgConfig
new file mode 120000
index 000000000..dba38aff5
--- /dev/null
+++ b/config/rootfiles/core/161/filelists/ExtUtils-PkgConfig
@@ -0,0 +1 @@
+../../../common/ExtUtils-PkgConfig
\ No newline at end of file
diff --git a/config/rootfiles/core/161/filelists/GD-Graph b/config/rootfiles/core/161/filelists/GD-Graph
new file mode 120000
index 000000000..1718c5f65
--- /dev/null
+++ b/config/rootfiles/core/161/filelists/GD-Graph
@@ -0,0 +1 @@
+../../../common/GD-Graph
\ No newline at end of file
diff --git a/config/rootfiles/core/161/filelists/ca-certificates b/config/rootfiles/core/161/filelists/ca-certificates
new file mode 120000
index 000000000..320fea8f4
--- /dev/null
+++ b/config/rootfiles/core/161/filelists/ca-certificates
@@ -0,0 +1 @@
+../../../common/ca-certificates
\ No newline at end of file
diff --git a/config/rootfiles/core/161/filelists/dosfstools b/config/rootfiles/core/161/filelists/dosfstools
new file mode 120000
index 000000000..087ccb0de
--- /dev/null
+++ b/config/rootfiles/core/161/filelists/dosfstools
@@ -0,0 +1 @@
+../../../common/dosfstools
\ No newline at end of file
diff --git a/config/rootfiles/core/161/filelists/exfatprogs b/config/rootfiles/core/161/filelists/exfatprogs
new file mode 120000
index 000000000..3b6a60895
--- /dev/null
+++ b/config/rootfiles/core/161/filelists/exfatprogs
@@ -0,0 +1 @@
+../../../common/exfatprogs
\ No newline at end of file
diff --git a/config/rootfiles/core/161/filelists/files b/config/rootfiles/core/161/filelists/files
index dd727ee2d..544b08d17 100644
--- a/config/rootfiles/core/161/filelists/files
+++ b/config/rootfiles/core/161/filelists/files
@@ -1,6 +1,8 @@
 etc/rc.d/init.d/firewall
+etc/rc.d/init.d/networking/red
 etc/rc.d/init.d/partresize
 etc/rc.d/init.d/suricata
+etc/rc.d/helper/azure-setup
 etc/suricata/suricata.yaml
 opt/pakfire/etc/pakfire.conf
 opt/pakfire/lib/functions.pl
@@ -8,11 +10,13 @@ srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/pakfire.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/qos.cgi
+srv/web/ipfire/cgi-bin/speed.cgi
 usr/bin/2to3
 usr/bin/hexdump
 usr/lib/firewall/rules.pl
 usr/libexec/ipsec/_updown
 usr/local/bin/hddshutdown
 usr/local/bin/makegraphs
+var/ipfire/backup/exclude
 var/ipfire/general-functions.pl
 var/ipfire/qos/bin/makeqosscripts.pl
diff --git a/config/rootfiles/core/161/filelists/gd b/config/rootfiles/core/161/filelists/gd
new file mode 120000
index 000000000..8c126de62
--- /dev/null
+++ b/config/rootfiles/core/161/filelists/gd
@@ -0,0 +1 @@
+../../../common/gd
\ No newline at end of file
diff --git a/config/rootfiles/core/161/filelists/logwatch b/config/rootfiles/core/161/filelists/logwatch
new file mode 120000
index 000000000..f14eabda9
--- /dev/null
+++ b/config/rootfiles/core/161/filelists/logwatch
@@ -0,0 +1 @@
+../../../common/logwatch
\ No newline at end of file
diff --git a/config/rootfiles/core/161/filelists/perl-GD b/config/rootfiles/core/161/filelists/perl-GD
new file mode 120000
index 000000000..962d937da
--- /dev/null
+++ b/config/rootfiles/core/161/filelists/perl-GD
@@ -0,0 +1 @@
+../../../common/perl-GD
\ No newline at end of file
diff --git a/config/rootfiles/core/161/filelists/ppp b/config/rootfiles/core/161/filelists/ppp
new file mode 120000
index 000000000..4844a9b58
--- /dev/null
+++ b/config/rootfiles/core/161/filelists/ppp
@@ -0,0 +1 @@
+../../../common/ppp
\ No newline at end of file
diff --git a/config/rootfiles/packages/7zip b/config/rootfiles/packages/7zip
index a0e8a80d1..d050e02bb 100644
--- a/config/rootfiles/packages/7zip
+++ b/config/rootfiles/packages/7zip
@@ -9,105 +9,105 @@ usr/lib/p7zip/7za
 usr/lib/p7zip/7zr
 usr/lib/p7zip/Codecs
 usr/lib/p7zip/Codecs/Rar.so
-#usr/share/doc/p7zip-17.03
-#usr/share/doc/p7zip-17.03/ChangeLog
-#usr/share/doc/p7zip-17.03/DOC
-#usr/share/doc/p7zip-17.03/DOC/7zC.txt
-#usr/share/doc/p7zip-17.03/DOC/7zFormat.txt
-#usr/share/doc/p7zip-17.03/DOC/License.txt
-#usr/share/doc/p7zip-17.03/DOC/MANUAL
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/7-zip.chm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/add.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/bench.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/delete.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/extract.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/extract_full.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/hash.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/index.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/list.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/rename.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/style.css
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/test.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/update.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/exit_codes.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/index.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/style.css
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/ar_exclude.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/ar_include.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/ar_no.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/bb.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/bs.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/charset.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/exclude.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/include.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/index.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/large_pages.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/list_tech.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/method.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/output_dir.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/overwrite.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/password.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/recurse.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/sa.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/scc.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/scrc.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/sdel.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/sfx.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/shared.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/sni.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/sns.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/spf.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/ssc.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/stdin.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/stdout.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/stl.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/stop_switch.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/stx.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/style.css
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/type.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/update.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/volume.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/working_dir.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/yes.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/syntax.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/about.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/benchmark.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/index.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/menu.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/options.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/plugins
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/plugins/7-zip
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/plugins/7-zip/add.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/plugins/7-zip/extract.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/plugins/7-zip/index.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/plugins/7-zip/style.css
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/plugins/index.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/plugins/style.css
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/style.css
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/general
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/general/7z.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/general/faq.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/general/formats.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/general/index.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/general/license.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/general/performance.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/general/style.css
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/general/thanks.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/start.htm
-#usr/share/doc/p7zip-17.03/DOC/MANUAL/style.css
-#usr/share/doc/p7zip-17.03/DOC/Methods.txt
-#usr/share/doc/p7zip-17.03/DOC/Struct.EAP
-#usr/share/doc/p7zip-17.03/DOC/Struct.ldb
-#usr/share/doc/p7zip-17.03/DOC/copying.txt
-#usr/share/doc/p7zip-17.03/DOC/lzma.txt
-#usr/share/doc/p7zip-17.03/DOC/readme.txt
-#usr/share/doc/p7zip-17.03/DOC/src-history.txt
-#usr/share/doc/p7zip-17.03/DOC/unRarLicense.txt
-#usr/share/doc/p7zip-17.03/README
+#usr/share/doc/p7zip-17.04
+#usr/share/doc/p7zip-17.04/ChangeLog
+#usr/share/doc/p7zip-17.04/DOC
+#usr/share/doc/p7zip-17.04/DOC/7zC.txt
+#usr/share/doc/p7zip-17.04/DOC/7zFormat.txt
+#usr/share/doc/p7zip-17.04/DOC/License.txt
+#usr/share/doc/p7zip-17.04/DOC/MANUAL
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/7-zip.chm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/commands
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/commands/add.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/commands/bench.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/commands/delete.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/commands/extract.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/commands/extract_full.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/commands/hash.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/commands/index.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/commands/list.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/commands/rename.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/commands/style.css
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/commands/test.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/commands/update.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/exit_codes.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/index.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/style.css
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/ar_exclude.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/ar_include.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/ar_no.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/bb.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/bs.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/charset.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/exclude.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/include.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/index.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/large_pages.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/list_tech.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/method.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/output_dir.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/overwrite.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/password.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/recurse.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/sa.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/scc.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/scrc.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/sdel.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/sfx.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/shared.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/sni.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/sns.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/spf.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/ssc.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/stdin.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/stdout.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/stl.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/stop_switch.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/stx.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/style.css
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/type.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/update.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/volume.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/working_dir.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/yes.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/syntax.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/about.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/benchmark.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/index.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/menu.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/options.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/plugins
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/plugins/7-zip
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/plugins/7-zip/add.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/plugins/7-zip/extract.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/plugins/7-zip/index.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/plugins/7-zip/style.css
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/plugins/index.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/plugins/style.css
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/style.css
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/general
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/general/7z.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/general/faq.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/general/formats.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/general/index.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/general/license.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/general/performance.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/general/style.css
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/general/thanks.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/start.htm
+#usr/share/doc/p7zip-17.04/DOC/MANUAL/style.css
+#usr/share/doc/p7zip-17.04/DOC/Methods.txt
+#usr/share/doc/p7zip-17.04/DOC/Struct.EAP
+#usr/share/doc/p7zip-17.04/DOC/Struct.ldb
+#usr/share/doc/p7zip-17.04/DOC/copying.txt
+#usr/share/doc/p7zip-17.04/DOC/lzma.txt
+#usr/share/doc/p7zip-17.04/DOC/readme.txt
+#usr/share/doc/p7zip-17.04/DOC/src-history.txt
+#usr/share/doc/p7zip-17.04/DOC/unRarLicense.txt
+#usr/share/doc/p7zip-17.04/README
 #usr/share/man/man1/7z.1.gz
 #usr/share/man/man1/7za.1.gz
 #usr/share/man/man1/7zr.1.gz
diff --git a/config/rootfiles/packages/cups-filters b/config/rootfiles/packages/cups-filters
index 285eb9d3a..0378162f5 100644
--- a/config/rootfiles/packages/cups-filters
+++ b/config/rootfiles/packages/cups-filters
@@ -9,7 +9,6 @@ etc/rc.d/init.d/cups-browsed
 usr/bin/driverless
 usr/bin/driverless-fax
 usr/bin/foomatic-rip
-usr/bin/ttfread
 #usr/include/cupsfilters
 #usr/include/cupsfilters/colord.h
 #usr/include/cupsfilters/colormanager.h
diff --git a/config/rootfiles/packages/ghostscript b/config/rootfiles/packages/ghostscript
index 45337fc36..0fc837dfa 100644
--- a/config/rootfiles/packages/ghostscript
+++ b/config/rootfiles/packages/ghostscript
@@ -25,209 +25,209 @@ usr/bin/ps2ps
 usr/bin/ps2ps2
 usr/bin/unix-lpr.sh
 #usr/share/doc/ghostscript
-#usr/share/doc/ghostscript/9.54.0
-#usr/share/doc/ghostscript/9.54.0/API.htm
-#usr/share/doc/ghostscript/9.54.0/C-style.htm
-#usr/share/doc/ghostscript/9.54.0/COPYING
-#usr/share/doc/ghostscript/9.54.0/Commprod.htm
-#usr/share/doc/ghostscript/9.54.0/DLL.htm
-#usr/share/doc/ghostscript/9.54.0/Deprecated.htm
-#usr/share/doc/ghostscript/9.54.0/Develop.htm
-#usr/share/doc/ghostscript/9.54.0/Devices.htm
-#usr/share/doc/ghostscript/9.54.0/Drivers.htm
-#usr/share/doc/ghostscript/9.54.0/Fonts.htm
-#usr/share/doc/ghostscript/9.54.0/GS9_Color_Management.pdf
-#usr/share/doc/ghostscript/9.54.0/History9.htm
-#usr/share/doc/ghostscript/9.54.0/Install.htm
-#usr/share/doc/ghostscript/9.54.0/Language.htm
-#usr/share/doc/ghostscript/9.54.0/Lib.htm
-#usr/share/doc/ghostscript/9.54.0/Make.htm
-#usr/share/doc/ghostscript/9.54.0/News.htm
-#usr/share/doc/ghostscript/9.54.0/Ps-style.htm
-#usr/share/doc/ghostscript/9.54.0/Ps2epsi.htm
-#usr/share/doc/ghostscript/9.54.0/Psfiles.htm
-#usr/share/doc/ghostscript/9.54.0/Readme.htm
-#usr/share/doc/ghostscript/9.54.0/Release.htm
-#usr/share/doc/ghostscript/9.54.0/SavedPages.htm
-#usr/share/doc/ghostscript/9.54.0/Source.htm
-#usr/share/doc/ghostscript/9.54.0/Unix-lpr.htm
-#usr/share/doc/ghostscript/9.54.0/Use.htm
-#usr/share/doc/ghostscript/9.54.0/VectorDevices.htm
-#usr/share/doc/ghostscript/9.54.0/WhatIsGS.htm
-#usr/share/doc/ghostscript/9.54.0/gdevds32.c
-#usr/share/doc/ghostscript/9.54.0/gs-style.css
-#usr/share/doc/ghostscript/9.54.0/images
-#usr/share/doc/ghostscript/9.54.0/images/Artifex_logo.png
-#usr/share/doc/ghostscript/9.54.0/images/favicon.png
-#usr/share/doc/ghostscript/9.54.0/images/ghostscript_logo.png
-#usr/share/doc/ghostscript/9.54.0/images/hamburger-light.png
-#usr/share/doc/ghostscript/9.54.0/images/x-light.png
-#usr/share/doc/ghostscript/9.54.0/index.html
-#usr/share/doc/ghostscript/9.54.0/index.js
-#usr/share/doc/ghostscript/9.54.0/pscet_status.txt
-#usr/share/doc/ghostscript/9.54.0/sample_downscale_device.htm
-#usr/share/doc/ghostscript/9.54.0/style.css
-#usr/share/doc/ghostscript/9.54.0/subclass.htm
-#usr/share/doc/ghostscript/9.54.0/thirdparty.htm
+#usr/share/doc/ghostscript/9.55.0
+#usr/share/doc/ghostscript/9.55.0/API.htm
+#usr/share/doc/ghostscript/9.55.0/C-style.htm
+#usr/share/doc/ghostscript/9.55.0/COPYING
+#usr/share/doc/ghostscript/9.55.0/Commprod.htm
+#usr/share/doc/ghostscript/9.55.0/DLL.htm
+#usr/share/doc/ghostscript/9.55.0/Deprecated.htm
+#usr/share/doc/ghostscript/9.55.0/Develop.htm
+#usr/share/doc/ghostscript/9.55.0/Devices.htm
+#usr/share/doc/ghostscript/9.55.0/Drivers.htm
+#usr/share/doc/ghostscript/9.55.0/Fonts.htm
+#usr/share/doc/ghostscript/9.55.0/GS9_Color_Management.pdf
+#usr/share/doc/ghostscript/9.55.0/History9.htm
+#usr/share/doc/ghostscript/9.55.0/Install.htm
+#usr/share/doc/ghostscript/9.55.0/Language.htm
+#usr/share/doc/ghostscript/9.55.0/Lib.htm
+#usr/share/doc/ghostscript/9.55.0/Make.htm
+#usr/share/doc/ghostscript/9.55.0/News.htm
+#usr/share/doc/ghostscript/9.55.0/Ps-style.htm
+#usr/share/doc/ghostscript/9.55.0/Ps2epsi.htm
+#usr/share/doc/ghostscript/9.55.0/Psfiles.htm
+#usr/share/doc/ghostscript/9.55.0/Readme.htm
+#usr/share/doc/ghostscript/9.55.0/Release.htm
+#usr/share/doc/ghostscript/9.55.0/SavedPages.htm
+#usr/share/doc/ghostscript/9.55.0/Source.htm
+#usr/share/doc/ghostscript/9.55.0/Unix-lpr.htm
+#usr/share/doc/ghostscript/9.55.0/Use.htm
+#usr/share/doc/ghostscript/9.55.0/VectorDevices.htm
+#usr/share/doc/ghostscript/9.55.0/WhatIsGS.htm
+#usr/share/doc/ghostscript/9.55.0/gdevds32.c
+#usr/share/doc/ghostscript/9.55.0/gs-style.css
+#usr/share/doc/ghostscript/9.55.0/images
+#usr/share/doc/ghostscript/9.55.0/images/Artifex_logo.png
+#usr/share/doc/ghostscript/9.55.0/images/favicon.png
+#usr/share/doc/ghostscript/9.55.0/images/ghostscript_logo.png
+#usr/share/doc/ghostscript/9.55.0/images/hamburger-light.png
+#usr/share/doc/ghostscript/9.55.0/images/x-light.png
+#usr/share/doc/ghostscript/9.55.0/index.html
+#usr/share/doc/ghostscript/9.55.0/index.js
+#usr/share/doc/ghostscript/9.55.0/pscet_status.txt
+#usr/share/doc/ghostscript/9.55.0/sample_downscale_device.htm
+#usr/share/doc/ghostscript/9.55.0/style.css
+#usr/share/doc/ghostscript/9.55.0/subclass.htm
+#usr/share/doc/ghostscript/9.55.0/thirdparty.htm
 #usr/share/ghostscript
-#usr/share/ghostscript/9.54.0
-#usr/share/ghostscript/9.54.0/lib
-usr/share/ghostscript/9.54.0/lib/PDFA_def.ps
-usr/share/ghostscript/9.54.0/lib/PDFX_def.ps
-usr/share/ghostscript/9.54.0/lib/PM760p.upp
-usr/share/ghostscript/9.54.0/lib/PM760pl.upp
-usr/share/ghostscript/9.54.0/lib/PM820p.upp
-usr/share/ghostscript/9.54.0/lib/PM820pl.upp
-usr/share/ghostscript/9.54.0/lib/Stc670p.upp
-usr/share/ghostscript/9.54.0/lib/Stc670pl.upp
-usr/share/ghostscript/9.54.0/lib/Stc680p.upp
-usr/share/ghostscript/9.54.0/lib/Stc680pl.upp
-usr/share/ghostscript/9.54.0/lib/Stc740p.upp
-usr/share/ghostscript/9.54.0/lib/Stc740pl.upp
-usr/share/ghostscript/9.54.0/lib/Stc760p.upp
-usr/share/ghostscript/9.54.0/lib/Stc760pl.upp
-usr/share/ghostscript/9.54.0/lib/Stc777p.upp
-usr/share/ghostscript/9.54.0/lib/Stc777pl.upp
-usr/share/ghostscript/9.54.0/lib/Stp720p.upp
-usr/share/ghostscript/9.54.0/lib/Stp720pl.upp
-usr/share/ghostscript/9.54.0/lib/Stp870p.upp
-usr/share/ghostscript/9.54.0/lib/Stp870pl.upp
-usr/share/ghostscript/9.54.0/lib/acctest.ps
-usr/share/ghostscript/9.54.0/lib/align.ps
-usr/share/ghostscript/9.54.0/lib/bj8.rpd
-usr/share/ghostscript/9.54.0/lib/bj8gc12f.upp
-usr/share/ghostscript/9.54.0/lib/bj8hg12f.upp
-usr/share/ghostscript/9.54.0/lib/bj8oh06n.upp
-usr/share/ghostscript/9.54.0/lib/bj8pa06n.upp
-usr/share/ghostscript/9.54.0/lib/bj8pp12f.upp
-usr/share/ghostscript/9.54.0/lib/bj8ts06n.upp
-usr/share/ghostscript/9.54.0/lib/bjc6000a1.upp
-usr/share/ghostscript/9.54.0/lib/bjc6000b1.upp
-usr/share/ghostscript/9.54.0/lib/bjc610a0.upp
-usr/share/ghostscript/9.54.0/lib/bjc610a1.upp
-usr/share/ghostscript/9.54.0/lib/bjc610a2.upp
-usr/share/ghostscript/9.54.0/lib/bjc610a3.upp
-usr/share/ghostscript/9.54.0/lib/bjc610a4.upp
-usr/share/ghostscript/9.54.0/lib/bjc610a5.upp
-usr/share/ghostscript/9.54.0/lib/bjc610a6.upp
-usr/share/ghostscript/9.54.0/lib/bjc610a7.upp
-usr/share/ghostscript/9.54.0/lib/bjc610a8.upp
-usr/share/ghostscript/9.54.0/lib/bjc610b1.upp
-usr/share/ghostscript/9.54.0/lib/bjc610b2.upp
-usr/share/ghostscript/9.54.0/lib/bjc610b3.upp
-usr/share/ghostscript/9.54.0/lib/bjc610b4.upp
-usr/share/ghostscript/9.54.0/lib/bjc610b6.upp
-usr/share/ghostscript/9.54.0/lib/bjc610b7.upp
-usr/share/ghostscript/9.54.0/lib/bjc610b8.upp
-usr/share/ghostscript/9.54.0/lib/caption.ps
-usr/share/ghostscript/9.54.0/lib/cbjc600.ppd
-usr/share/ghostscript/9.54.0/lib/cbjc800.ppd
-usr/share/ghostscript/9.54.0/lib/cdj550.upp
-usr/share/ghostscript/9.54.0/lib/cdj690.upp
-usr/share/ghostscript/9.54.0/lib/cdj690ec.upp
-usr/share/ghostscript/9.54.0/lib/cid2code.ps
-usr/share/ghostscript/9.54.0/lib/dnj750c.upp
-usr/share/ghostscript/9.54.0/lib/dnj750m.upp
-usr/share/ghostscript/9.54.0/lib/docie.ps
-usr/share/ghostscript/9.54.0/lib/font2pcl.ps
-usr/share/ghostscript/9.54.0/lib/ghostpdf.ppd
-usr/share/ghostscript/9.54.0/lib/gs_ce_e.ps
-usr/share/ghostscript/9.54.0/lib/gs_css_e.ps
-usr/share/ghostscript/9.54.0/lib/gs_il2_e.ps
-usr/share/ghostscript/9.54.0/lib/gs_kanji.ps
-usr/share/ghostscript/9.54.0/lib/gs_ksb_e.ps
-usr/share/ghostscript/9.54.0/lib/gs_l.xbm
-usr/share/ghostscript/9.54.0/lib/gs_l.xpm
-usr/share/ghostscript/9.54.0/lib/gs_l_m.xbm
-usr/share/ghostscript/9.54.0/lib/gs_lgo_e.ps
-usr/share/ghostscript/9.54.0/lib/gs_lgx_e.ps
-usr/share/ghostscript/9.54.0/lib/gs_m.xbm
-usr/share/ghostscript/9.54.0/lib/gs_m.xpm
-usr/share/ghostscript/9.54.0/lib/gs_m_m.xbm
-usr/share/ghostscript/9.54.0/lib/gs_s.xbm
-usr/share/ghostscript/9.54.0/lib/gs_s.xpm
-usr/share/ghostscript/9.54.0/lib/gs_s_m.xbm
-usr/share/ghostscript/9.54.0/lib/gs_t.xbm
-usr/share/ghostscript/9.54.0/lib/gs_t.xpm
-usr/share/ghostscript/9.54.0/lib/gs_t_m.xbm
-usr/share/ghostscript/9.54.0/lib/gs_wl1_e.ps
-usr/share/ghostscript/9.54.0/lib/gs_wl2_e.ps
-usr/share/ghostscript/9.54.0/lib/gs_wl5_e.ps
-usr/share/ghostscript/9.54.0/lib/gslp.ps
-usr/share/ghostscript/9.54.0/lib/gsnup.ps
-usr/share/ghostscript/9.54.0/lib/ht_ccsto.ps
-usr/share/ghostscript/9.54.0/lib/image-qa.ps
-usr/share/ghostscript/9.54.0/lib/jispaper.ps
-usr/share/ghostscript/9.54.0/lib/landscap.ps
-usr/share/ghostscript/9.54.0/lib/lines.ps
-usr/share/ghostscript/9.54.0/lib/mkcidfm.ps
-usr/share/ghostscript/9.54.0/lib/necp2x.upp
-usr/share/ghostscript/9.54.0/lib/necp2x6.upp
-usr/share/ghostscript/9.54.0/lib/pdf2dsc.ps
-usr/share/ghostscript/9.54.0/lib/pdf_info.ps
-usr/share/ghostscript/9.54.0/lib/pf2afm.ps
-usr/share/ghostscript/9.54.0/lib/pfbtopfa.ps
-usr/share/ghostscript/9.54.0/lib/ppath.ps
-usr/share/ghostscript/9.54.0/lib/pphs.ps
-usr/share/ghostscript/9.54.0/lib/prfont.ps
-usr/share/ghostscript/9.54.0/lib/printafm.ps
-usr/share/ghostscript/9.54.0/lib/ps2ai.ps
-usr/share/ghostscript/9.54.0/lib/ps2epsi.ps
-usr/share/ghostscript/9.54.0/lib/ras1.upp
-usr/share/ghostscript/9.54.0/lib/ras24.upp
-usr/share/ghostscript/9.54.0/lib/ras3.upp
-usr/share/ghostscript/9.54.0/lib/ras32.upp
-usr/share/ghostscript/9.54.0/lib/ras4.upp
-usr/share/ghostscript/9.54.0/lib/ras8m.upp
-usr/share/ghostscript/9.54.0/lib/rollconv.ps
-usr/share/ghostscript/9.54.0/lib/s400a1.upp
-usr/share/ghostscript/9.54.0/lib/s400b1.upp
-usr/share/ghostscript/9.54.0/lib/sharp.upp
-usr/share/ghostscript/9.54.0/lib/sipixa6.upp
-usr/share/ghostscript/9.54.0/lib/st640ih.upp
-usr/share/ghostscript/9.54.0/lib/st640ihg.upp
-usr/share/ghostscript/9.54.0/lib/st640p.upp
-usr/share/ghostscript/9.54.0/lib/st640pg.upp
-usr/share/ghostscript/9.54.0/lib/st640pl.upp
-usr/share/ghostscript/9.54.0/lib/st640plg.upp
-usr/share/ghostscript/9.54.0/lib/stc.upp
-usr/share/ghostscript/9.54.0/lib/stc1520h.upp
-usr/share/ghostscript/9.54.0/lib/stc2.upp
-usr/share/ghostscript/9.54.0/lib/stc200_h.upp
-usr/share/ghostscript/9.54.0/lib/stc2_h.upp
-usr/share/ghostscript/9.54.0/lib/stc2s_h.upp
-usr/share/ghostscript/9.54.0/lib/stc300.upp
-usr/share/ghostscript/9.54.0/lib/stc300bl.upp
-usr/share/ghostscript/9.54.0/lib/stc300bm.upp
-usr/share/ghostscript/9.54.0/lib/stc500p.upp
-usr/share/ghostscript/9.54.0/lib/stc500ph.upp
-usr/share/ghostscript/9.54.0/lib/stc600ih.upp
-usr/share/ghostscript/9.54.0/lib/stc600p.upp
-usr/share/ghostscript/9.54.0/lib/stc600pl.upp
-usr/share/ghostscript/9.54.0/lib/stc640p.upp
-usr/share/ghostscript/9.54.0/lib/stc740ih.upp
-usr/share/ghostscript/9.54.0/lib/stc800ih.upp
-usr/share/ghostscript/9.54.0/lib/stc800p.upp
-usr/share/ghostscript/9.54.0/lib/stc800pl.upp
-usr/share/ghostscript/9.54.0/lib/stc_h.upp
-usr/share/ghostscript/9.54.0/lib/stc_l.upp
-usr/share/ghostscript/9.54.0/lib/stcany.upp
-usr/share/ghostscript/9.54.0/lib/stcany_h.upp
-usr/share/ghostscript/9.54.0/lib/stcinfo.ps
-usr/share/ghostscript/9.54.0/lib/stcolor.ps
-usr/share/ghostscript/9.54.0/lib/stocht.ps
-usr/share/ghostscript/9.54.0/lib/traceimg.ps
-usr/share/ghostscript/9.54.0/lib/traceop.ps
-usr/share/ghostscript/9.54.0/lib/uninfo.ps
-usr/share/ghostscript/9.54.0/lib/viewcmyk.ps
-usr/share/ghostscript/9.54.0/lib/viewgif.ps
-usr/share/ghostscript/9.54.0/lib/viewjpeg.ps
-usr/share/ghostscript/9.54.0/lib/viewmiff.ps
-usr/share/ghostscript/9.54.0/lib/viewpbm.ps
-usr/share/ghostscript/9.54.0/lib/viewpcx.ps
-usr/share/ghostscript/9.54.0/lib/viewps2a.ps
-usr/share/ghostscript/9.54.0/lib/winmaps.ps
-usr/share/ghostscript/9.54.0/lib/zeroline.ps
+#usr/share/ghostscript/9.55.0
+#usr/share/ghostscript/9.55.0/lib
+#usr/share/ghostscript/9.55.0/lib/PDFA_def.ps
+#usr/share/ghostscript/9.55.0/lib/PDFX_def.ps
+#usr/share/ghostscript/9.55.0/lib/PM760p.upp
+#usr/share/ghostscript/9.55.0/lib/PM760pl.upp
+#usr/share/ghostscript/9.55.0/lib/PM820p.upp
+#usr/share/ghostscript/9.55.0/lib/PM820pl.upp
+#usr/share/ghostscript/9.55.0/lib/Stc670p.upp
+#usr/share/ghostscript/9.55.0/lib/Stc670pl.upp
+#usr/share/ghostscript/9.55.0/lib/Stc680p.upp
+#usr/share/ghostscript/9.55.0/lib/Stc680pl.upp
+#usr/share/ghostscript/9.55.0/lib/Stc740p.upp
+#usr/share/ghostscript/9.55.0/lib/Stc740pl.upp
+#usr/share/ghostscript/9.55.0/lib/Stc760p.upp
+#usr/share/ghostscript/9.55.0/lib/Stc760pl.upp
+#usr/share/ghostscript/9.55.0/lib/Stc777p.upp
+#usr/share/ghostscript/9.55.0/lib/Stc777pl.upp
+#usr/share/ghostscript/9.55.0/lib/Stp720p.upp
+#usr/share/ghostscript/9.55.0/lib/Stp720pl.upp
+#usr/share/ghostscript/9.55.0/lib/Stp870p.upp
+#usr/share/ghostscript/9.55.0/lib/Stp870pl.upp
+#usr/share/ghostscript/9.55.0/lib/acctest.ps
+#usr/share/ghostscript/9.55.0/lib/align.ps
+#usr/share/ghostscript/9.55.0/lib/bj8.rpd
+#usr/share/ghostscript/9.55.0/lib/bj8gc12f.upp
+#usr/share/ghostscript/9.55.0/lib/bj8hg12f.upp
+#usr/share/ghostscript/9.55.0/lib/bj8oh06n.upp
+#usr/share/ghostscript/9.55.0/lib/bj8pa06n.upp
+#usr/share/ghostscript/9.55.0/lib/bj8pp12f.upp
+#usr/share/ghostscript/9.55.0/lib/bj8ts06n.upp
+#usr/share/ghostscript/9.55.0/lib/bjc6000a1.upp
+#usr/share/ghostscript/9.55.0/lib/bjc6000b1.upp
+#usr/share/ghostscript/9.55.0/lib/bjc610a0.upp
+#usr/share/ghostscript/9.55.0/lib/bjc610a1.upp
+#usr/share/ghostscript/9.55.0/lib/bjc610a2.upp
+#usr/share/ghostscript/9.55.0/lib/bjc610a3.upp
+#usr/share/ghostscript/9.55.0/lib/bjc610a4.upp
+#usr/share/ghostscript/9.55.0/lib/bjc610a5.upp
+#usr/share/ghostscript/9.55.0/lib/bjc610a6.upp
+#usr/share/ghostscript/9.55.0/lib/bjc610a7.upp
+#usr/share/ghostscript/9.55.0/lib/bjc610a8.upp
+#usr/share/ghostscript/9.55.0/lib/bjc610b1.upp
+#usr/share/ghostscript/9.55.0/lib/bjc610b2.upp
+#usr/share/ghostscript/9.55.0/lib/bjc610b3.upp
+#usr/share/ghostscript/9.55.0/lib/bjc610b4.upp
+#usr/share/ghostscript/9.55.0/lib/bjc610b6.upp
+#usr/share/ghostscript/9.55.0/lib/bjc610b7.upp
+#usr/share/ghostscript/9.55.0/lib/bjc610b8.upp
+#usr/share/ghostscript/9.55.0/lib/caption.ps
+#usr/share/ghostscript/9.55.0/lib/cbjc600.ppd
+#usr/share/ghostscript/9.55.0/lib/cbjc800.ppd
+#usr/share/ghostscript/9.55.0/lib/cdj550.upp
+#usr/share/ghostscript/9.55.0/lib/cdj690.upp
+#usr/share/ghostscript/9.55.0/lib/cdj690ec.upp
+#usr/share/ghostscript/9.55.0/lib/cid2code.ps
+#usr/share/ghostscript/9.55.0/lib/dnj750c.upp
+#usr/share/ghostscript/9.55.0/lib/dnj750m.upp
+#usr/share/ghostscript/9.55.0/lib/docie.ps
+#usr/share/ghostscript/9.55.0/lib/font2pcl.ps
+#usr/share/ghostscript/9.55.0/lib/ghostpdf.ppd
+#usr/share/ghostscript/9.55.0/lib/gs_ce_e.ps
+#usr/share/ghostscript/9.55.0/lib/gs_css_e.ps
+#usr/share/ghostscript/9.55.0/lib/gs_il2_e.ps
+#usr/share/ghostscript/9.55.0/lib/gs_kanji.ps
+#usr/share/ghostscript/9.55.0/lib/gs_ksb_e.ps
+#usr/share/ghostscript/9.55.0/lib/gs_l.xbm
+#usr/share/ghostscript/9.55.0/lib/gs_l.xpm
+#usr/share/ghostscript/9.55.0/lib/gs_l_m.xbm
+#usr/share/ghostscript/9.55.0/lib/gs_lgo_e.ps
+#usr/share/ghostscript/9.55.0/lib/gs_lgx_e.ps
+#usr/share/ghostscript/9.55.0/lib/gs_m.xbm
+#usr/share/ghostscript/9.55.0/lib/gs_m.xpm
+#usr/share/ghostscript/9.55.0/lib/gs_m_m.xbm
+#usr/share/ghostscript/9.55.0/lib/gs_s.xbm
+#usr/share/ghostscript/9.55.0/lib/gs_s.xpm
+#usr/share/ghostscript/9.55.0/lib/gs_s_m.xbm
+#usr/share/ghostscript/9.55.0/lib/gs_t.xbm
+#usr/share/ghostscript/9.55.0/lib/gs_t.xpm
+#usr/share/ghostscript/9.55.0/lib/gs_t_m.xbm
+#usr/share/ghostscript/9.55.0/lib/gs_wl1_e.ps
+#usr/share/ghostscript/9.55.0/lib/gs_wl2_e.ps
+#usr/share/ghostscript/9.55.0/lib/gs_wl5_e.ps
+#usr/share/ghostscript/9.55.0/lib/gslp.ps
+#usr/share/ghostscript/9.55.0/lib/gsnup.ps
+#usr/share/ghostscript/9.55.0/lib/ht_ccsto.ps
+#usr/share/ghostscript/9.55.0/lib/image-qa.ps
+#usr/share/ghostscript/9.55.0/lib/jispaper.ps
+#usr/share/ghostscript/9.55.0/lib/landscap.ps
+#usr/share/ghostscript/9.55.0/lib/lines.ps
+#usr/share/ghostscript/9.55.0/lib/mkcidfm.ps
+#usr/share/ghostscript/9.55.0/lib/necp2x.upp
+#usr/share/ghostscript/9.55.0/lib/necp2x6.upp
+#usr/share/ghostscript/9.55.0/lib/pdf2dsc.ps
+#usr/share/ghostscript/9.55.0/lib/pdf_info.ps
+#usr/share/ghostscript/9.55.0/lib/pf2afm.ps
+#usr/share/ghostscript/9.55.0/lib/pfbtopfa.ps
+#usr/share/ghostscript/9.55.0/lib/ppath.ps
+#usr/share/ghostscript/9.55.0/lib/pphs.ps
+#usr/share/ghostscript/9.55.0/lib/prfont.ps
+#usr/share/ghostscript/9.55.0/lib/printafm.ps
+#usr/share/ghostscript/9.55.0/lib/ps2ai.ps
+#usr/share/ghostscript/9.55.0/lib/ps2epsi.ps
+#usr/share/ghostscript/9.55.0/lib/ras1.upp
+#usr/share/ghostscript/9.55.0/lib/ras24.upp
+#usr/share/ghostscript/9.55.0/lib/ras3.upp
+#usr/share/ghostscript/9.55.0/lib/ras32.upp
+#usr/share/ghostscript/9.55.0/lib/ras4.upp
+#usr/share/ghostscript/9.55.0/lib/ras8m.upp
+#usr/share/ghostscript/9.55.0/lib/rollconv.ps
+#usr/share/ghostscript/9.55.0/lib/s400a1.upp
+#usr/share/ghostscript/9.55.0/lib/s400b1.upp
+#usr/share/ghostscript/9.55.0/lib/sharp.upp
+#usr/share/ghostscript/9.55.0/lib/sipixa6.upp
+#usr/share/ghostscript/9.55.0/lib/st640ih.upp
+#usr/share/ghostscript/9.55.0/lib/st640ihg.upp
+#usr/share/ghostscript/9.55.0/lib/st640p.upp
+#usr/share/ghostscript/9.55.0/lib/st640pg.upp
+#usr/share/ghostscript/9.55.0/lib/st640pl.upp
+#usr/share/ghostscript/9.55.0/lib/st640plg.upp
+#usr/share/ghostscript/9.55.0/lib/stc.upp
+#usr/share/ghostscript/9.55.0/lib/stc1520h.upp
+#usr/share/ghostscript/9.55.0/lib/stc2.upp
+#usr/share/ghostscript/9.55.0/lib/stc200_h.upp
+#usr/share/ghostscript/9.55.0/lib/stc2_h.upp
+#usr/share/ghostscript/9.55.0/lib/stc2s_h.upp
+#usr/share/ghostscript/9.55.0/lib/stc300.upp
+#usr/share/ghostscript/9.55.0/lib/stc300bl.upp
+#usr/share/ghostscript/9.55.0/lib/stc300bm.upp
+#usr/share/ghostscript/9.55.0/lib/stc500p.upp
+#usr/share/ghostscript/9.55.0/lib/stc500ph.upp
+#usr/share/ghostscript/9.55.0/lib/stc600ih.upp
+#usr/share/ghostscript/9.55.0/lib/stc600p.upp
+#usr/share/ghostscript/9.55.0/lib/stc600pl.upp
+#usr/share/ghostscript/9.55.0/lib/stc640p.upp
+#usr/share/ghostscript/9.55.0/lib/stc740ih.upp
+#usr/share/ghostscript/9.55.0/lib/stc800ih.upp
+#usr/share/ghostscript/9.55.0/lib/stc800p.upp
+#usr/share/ghostscript/9.55.0/lib/stc800pl.upp
+#usr/share/ghostscript/9.55.0/lib/stc_h.upp
+#usr/share/ghostscript/9.55.0/lib/stc_l.upp
+#usr/share/ghostscript/9.55.0/lib/stcany.upp
+#usr/share/ghostscript/9.55.0/lib/stcany_h.upp
+#usr/share/ghostscript/9.55.0/lib/stcinfo.ps
+#usr/share/ghostscript/9.55.0/lib/stcolor.ps
+#usr/share/ghostscript/9.55.0/lib/stocht.ps
+#usr/share/ghostscript/9.55.0/lib/traceimg.ps
+#usr/share/ghostscript/9.55.0/lib/traceop.ps
+#usr/share/ghostscript/9.55.0/lib/uninfo.ps
+#usr/share/ghostscript/9.55.0/lib/viewcmyk.ps
+#usr/share/ghostscript/9.55.0/lib/viewgif.ps
+#usr/share/ghostscript/9.55.0/lib/viewjpeg.ps
+#usr/share/ghostscript/9.55.0/lib/viewmiff.ps
+#usr/share/ghostscript/9.55.0/lib/viewpbm.ps
+#usr/share/ghostscript/9.55.0/lib/viewpcx.ps
+#usr/share/ghostscript/9.55.0/lib/viewps2a.ps
+#usr/share/ghostscript/9.55.0/lib/winmaps.ps
+#usr/share/ghostscript/9.55.0/lib/zeroline.ps
 #usr/share/ghostscript/fonts
 #usr/share/ghostscript/fonts/COPYING
 #usr/share/ghostscript/fonts/ChangeLog
diff --git a/config/rootfiles/packages/minidlna b/config/rootfiles/packages/minidlna
index 42a83f8da..12d81de5e 100644
--- a/config/rootfiles/packages/minidlna
+++ b/config/rootfiles/packages/minidlna
@@ -1,5 +1,5 @@
-etc/rc.d/init.d/minidlna
 etc/minidlna.conf
+etc/rc.d/init.d/minidlna
 usr/sbin/minidlnad
 #usr/share/locale/da/LC_MESSAGES/minidlna.mo
 #usr/share/locale/de/LC_MESSAGES/minidlna.mo
@@ -14,3 +14,4 @@ usr/sbin/minidlnad
 #usr/share/locale/ru/LC_MESSAGES/minidlna.mo
 #usr/share/locale/sl/LC_MESSAGES/minidlna.mo
 #usr/share/locale/sv/LC_MESSAGES/minidlna.mo
+var/ipfire/backup/addons/includes/minidlna
diff --git a/config/rootfiles/packages/pcengines-apu-firmware b/config/rootfiles/packages/pcengines-apu-firmware
index 1eb3cf08c..3ae4e74e9 100644
--- a/config/rootfiles/packages/pcengines-apu-firmware
+++ b/config/rootfiles/packages/pcengines-apu-firmware
@@ -1,8 +1,8 @@
 #lib/firmware/pcengines
 #lib/firmware/pcengines/apu
-lib/firmware/pcengines/apu/apu1_v4.14.0.2.rom
-lib/firmware/pcengines/apu/apu2_v4.14.0.2.rom
-lib/firmware/pcengines/apu/apu3_v4.14.0.2.rom
-lib/firmware/pcengines/apu/apu4_v4.14.0.2.rom
-lib/firmware/pcengines/apu/apu5_v4.14.0.2.rom
-lib/firmware/pcengines/apu/apu6_v4.14.0.2.rom
+lib/firmware/pcengines/apu/apu1_v4.14.0.4.rom
+lib/firmware/pcengines/apu/apu2_v4.14.0.4.rom
+lib/firmware/pcengines/apu/apu3_v4.14.0.4.rom
+lib/firmware/pcengines/apu/apu4_v4.14.0.4.rom
+lib/firmware/pcengines/apu/apu5_v4.14.0.4.rom
+lib/firmware/pcengines/apu/apu6_v4.14.0.4.rom
diff --git a/doc/language_issues.de b/doc/language_issues.de
index a091f2303..d1aacc1e6 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -92,7 +92,9 @@ WARNING: translation string unused: advproxy errmsg password incorrect
 WARNING: translation string unused: advproxy invalid num of children
 WARNING: translation string unused: advproxy no clients defined
 WARNING: translation string unused: advproxy redirector children
+WARNING: translation string unused: advproxy squid version
 WARNING: translation string unused: advproxy ssadvanced proxy
+WARNING: translation string unused: advproxy suppress version
 WARNING: translation string unused: advproxy throttle binary
 WARNING: translation string unused: advproxy throttle dskimg
 WARNING: translation string unused: advproxy throttle mmedia
@@ -234,6 +236,7 @@ WARNING: translation string unused: dns new 0
 WARNING: translation string unused: dns new 1
 WARNING: translation string unused: dns saved
 WARNING: translation string unused: dns saved txt
+WARNING: translation string unused: dnssec disabled warning
 WARNING: translation string unused: dnssec information
 WARNING: translation string unused: do not log this port list
 WARNING: translation string unused: domain master
@@ -264,6 +267,7 @@ WARNING: translation string unused: enable javascript
 WARNING: translation string unused: enable wildcards
 WARNING: translation string unused: enabledtitle
 WARNING: translation string unused: encrypted
+WARNING: translation string unused: enter ack class
 WARNING: translation string unused: err bk 1
 WARNING: translation string unused: err bk 10 password
 WARNING: translation string unused: err bk 2 key
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 3d10bebc6..34a95b358 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -180,6 +180,7 @@ WARNING: untranslated string: advproxy admin mail = Cache administrator e-mail
 WARNING: untranslated string: advproxy advanced web proxy = Advanced Web Proxy
 WARNING: untranslated string: advproxy advanced web proxy configuration = Advanced web proxy configuration
 WARNING: untranslated string: advproxy allowed subnets = Allowed subnets (one per line)
+WARNING: untranslated string: advproxy asbased anomaly detection = Anomaly detections based on Autonomous Systems information
 WARNING: untranslated string: advproxy back to main page = Back to main page
 WARNING: untranslated string: advproxy banned ip clients = Banned IP addresses (one per line)
 WARNING: untranslated string: advproxy banned mac clients = Banned MAC addresses (one per line)
@@ -232,6 +233,11 @@ WARNING: untranslated string: advproxy errmsg time restriction = Invalid time re
 WARNING: untranslated string: advproxy errmsg wpad invalid ip or mask = WPAD: Invalid IP or subnet for excluded IP subnet
 WARNING: untranslated string: advproxy error design = Error messages design
 WARNING: untranslated string: advproxy error language = Error messages language
+WARNING: untranslated string: advproxy fastflux detection = Deny access to destinations hosted on fast flux setups
+WARNING: untranslated string: advproxy fastflux detection threshold = Threshold
+WARNING: untranslated string: advproxy fastflux no threshold given = No threshold was given for fast flux detection
+WARNING: untranslated string: advproxy fastflux threshold invalid = Supplied fast flux detection threshold is invalid
+WARNING: untranslated string: advproxy fastflux threshold out of bounds = Supplied fast flux detection threshold is out of bounds
 WARNING: untranslated string: advproxy friday = Fri
 WARNING: untranslated string: advproxy from = From
 WARNING: untranslated string: advproxy group access control = Group based access control
@@ -265,14 +271,13 @@ WARNING: untranslated string: advproxy ram cache size = Memory cache size (MB)
 WARNING: untranslated string: advproxy reset = Reset
 WARNING: untranslated string: advproxy saturday = Sat
 WARNING: untranslated string: advproxy save and restart = Save and Restart
-WARNING: untranslated string: advproxy squid version = Squid cache version
+WARNING: untranslated string: advproxy selectively announcements detection = Deny access to destinations hosted on selectively announced networks
 WARNING: untranslated string: advproxy squidclamav = SquidClamav
 WARNING: untranslated string: advproxy ssl ports = Allowed SSL ports (one per line)
 WARNING: untranslated string: advproxy standard = Standard
 WARNING: untranslated string: advproxy standard ports = Allowed standard ports (one per line)
 WARNING: untranslated string: advproxy sunday = Sun
 WARNING: untranslated string: advproxy supervisor password = Supervisor password
-WARNING: untranslated string: advproxy suppress version = Suppress version information
 WARNING: untranslated string: advproxy throttling per host on = Limit per host on
 WARNING: untranslated string: advproxy throttling total on = Overall limit on
 WARNING: untranslated string: advproxy throttling unlimited = unlimited
@@ -345,8 +350,8 @@ WARNING: untranslated string: bad destination range = The Destination port range
 WARNING: untranslated string: bad ignore filter = Bad ignore filter:
 WARNING: untranslated string: bad return code = Helper program returned error code
 WARNING: untranslated string: bad source range = The Source port range has a first value that is greater than or equal to the second value.
-WARNING: untranslated string: bandwitherror = You cannot change the bandwithsettings, with Qos being enabled. First disable Qos.<p>
-WARNING: untranslated string: bandwithsettings = Bandwithsettings
+WARNING: untranslated string: bandwidtherror = You cannot change the bandwidthsettings, with Qos being enabled. First disable Qos.<p>
+WARNING: untranslated string: bandwidthsettings = bandwidthsettings
 WARNING: untranslated string: basic options = Basic Options
 WARNING: untranslated string: beep when ppp connects or disconnects = Beep when IPFire connects or disconnects
 WARNING: untranslated string: bit = bit
@@ -626,7 +631,6 @@ WARNING: untranslated string: dnsforward entries = Current entries
 WARNING: untranslated string: dnsforward forward_servers = Nameservers
 WARNING: untranslated string: dnsforward zone = Zone
 WARNING: untranslated string: dnssec aware = DNSSEC Aware
-WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled
 WARNING: untranslated string: dnssec not supported = DNSSEC Not supported
 WARNING: untranslated string: dnssec validating = DNSSEC Validating
 WARNING: untranslated string: dod = Dial on Demand
@@ -713,7 +717,6 @@ WARNING: untranslated string: enabled on = Enabled on
 WARNING: untranslated string: encapsulation = Encapsulation
 WARNING: untranslated string: encryption = Encryption:
 WARNING: untranslated string: end address = End address:
-WARNING: untranslated string: enter ack class = Enter the ACK- Class <br /> and then press <i>Save</i>.
 WARNING: untranslated string: enter data = Enter your settings <br /> and then press <i>Save</i>.
 WARNING: untranslated string: entropy = Entropy
 WARNING: untranslated string: entropy graphs = Entropy Graphs
@@ -736,8 +739,8 @@ WARNING: untranslated string: extrahd to root = to root
 WARNING: untranslated string: extrahd you cant mount = You can't mount
 WARNING: untranslated string: fallout zombieload ridl = Fallout/ZombieLoad/RIDL
 WARNING: untranslated string: false classnumber = The Class-Number does not match the interface.
-WARNING: untranslated string: false max bandwith = Maximum bandwith is false.
-WARNING: untranslated string: false min bandwith = Minimum bandwith is false.
+WARNING: untranslated string: false max bandwidth = Maximum bandwidth is false.
+WARNING: untranslated string: false min bandwidth = Minimum bandwidth is false.
 WARNING: untranslated string: february = February
 WARNING: untranslated string: fetch ip from = Guess the real public IP with help of an external server
 WARNING: untranslated string: fifteen minutes = 15 Minutes
@@ -964,7 +967,7 @@ WARNING: untranslated string: graph = Graph
 WARNING: untranslated string: graph per = per
 WARNING: untranslated string: green = GREEN
 WARNING: untranslated string: grouptype = Grouptype:
-WARNING: untranslated string: guaranteed bandwith = Guaranteed bandwith
+WARNING: untranslated string: guaranteed bandwidth = Guaranteed bandwidth
 WARNING: untranslated string: guardian = Guardian
 WARNING: untranslated string: guardian block a host = unknown string
 WARNING: untranslated string: guardian block httpd brute-force = unknown string
@@ -1223,7 +1226,7 @@ WARNING: untranslated string: masquerade orange = Masquerade ORANGE
 WARNING: untranslated string: masquerading = Masquerading
 WARNING: untranslated string: masquerading disabled = Masquerading disabled
 WARNING: untranslated string: masquerading enabled = Masquerading enabled
-WARNING: untranslated string: max bandwith = Maximum bandwith
+WARNING: untranslated string: max bandwidth = Maximum bandwidth
 WARNING: untranslated string: max lease time = Max lease time (mins):
 WARNING: untranslated string: max reliability = Maximum reliability
 WARNING: untranslated string: max renewal time = Maximum Renewal Time
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 2e58b5b02..55d46c597 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -90,7 +90,9 @@ WARNING: translation string unused: advproxy errmsg password incorrect
 WARNING: translation string unused: advproxy invalid num of children
 WARNING: translation string unused: advproxy no clients defined
 WARNING: translation string unused: advproxy redirector children
+WARNING: translation string unused: advproxy squid version
 WARNING: translation string unused: advproxy ssadvanced proxy
+WARNING: translation string unused: advproxy suppress version
 WARNING: translation string unused: advproxy throttle binary
 WARNING: translation string unused: advproxy throttle dskimg
 WARNING: translation string unused: advproxy throttle mmedia
@@ -273,6 +275,7 @@ WARNING: translation string unused: enable javascript
 WARNING: translation string unused: enable wildcards
 WARNING: translation string unused: enabledtitle
 WARNING: translation string unused: encrypted
+WARNING: translation string unused: enter ack class
 WARNING: translation string unused: err bk 1
 WARNING: translation string unused: err bk 10 password
 WARNING: translation string unused: err bk 2 key
@@ -801,15 +804,22 @@ WARNING: untranslated string: addons = Addons
 WARNING: untranslated string: administrator password = Administrator password
 WARNING: untranslated string: administrator username = Administrator username
 WARNING: untranslated string: advproxy AUTH method ntlm auth = Windows Active Directory
+WARNING: untranslated string: advproxy asbased anomaly detection = Anomaly detections based on Autonomous Systems information
 WARNING: untranslated string: advproxy basic authentication = Allow HTTP Basic authentication
 WARNING: untranslated string: advproxy cache-digest = Enable Cache-Digest Generation
 WARNING: untranslated string: advproxy errmsg cache = The RAM cache size is greater than the harddisk cache size:
 WARNING: untranslated string: advproxy errmsg invalid upstream proxy = Invalid upstream proxy IP/hostname
 WARNING: untranslated string: advproxy errmsg proxy ports equal = The proxy port and the transparent port cannot be equal.
 WARNING: untranslated string: advproxy errmsg wpad invalid ip or mask = WPAD: Invalid IP or subnet for excluded IP subnet
+WARNING: untranslated string: advproxy fastflux detection = Deny access to destinations hosted on fast flux setups
+WARNING: untranslated string: advproxy fastflux detection threshold = Threshold
+WARNING: untranslated string: advproxy fastflux no threshold given = No threshold was given for fast flux detection
+WARNING: untranslated string: advproxy fastflux threshold invalid = Supplied fast flux detection threshold is invalid
+WARNING: untranslated string: advproxy fastflux threshold out of bounds = Supplied fast flux detection threshold is out of bounds
 WARNING: untranslated string: advproxy group access control = Group based access control
 WARNING: untranslated string: advproxy group required = Required group
 WARNING: untranslated string: advproxy proxy port transparent = Transparent port
+WARNING: untranslated string: advproxy selectively announcements detection = Deny access to destinations hosted on selectively announced networks
 WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.168.2.0/255.255.255.0
 WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org*
 WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line)
@@ -920,7 +930,6 @@ WARNING: untranslated string: dnsforward entries = Current entries
 WARNING: untranslated string: dnsforward forward_servers = Nameservers
 WARNING: untranslated string: dnsforward zone = Zone
 WARNING: untranslated string: dnssec aware = DNSSEC Aware
-WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled
 WARNING: untranslated string: dnssec not supported = DNSSEC Not supported
 WARNING: untranslated string: dnssec validating = DNSSEC Validating
 WARNING: untranslated string: downlink = Downlink
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 72826274b..632eaa891 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -96,7 +96,9 @@ WARNING: translation string unused: advproxy errmsg password incorrect
 WARNING: translation string unused: advproxy invalid num of children
 WARNING: translation string unused: advproxy no clients defined
 WARNING: translation string unused: advproxy redirector children
+WARNING: translation string unused: advproxy squid version
 WARNING: translation string unused: advproxy ssadvanced proxy
+WARNING: translation string unused: advproxy suppress version
 WARNING: translation string unused: advproxy throttle binary
 WARNING: translation string unused: advproxy throttle dskimg
 WARNING: translation string unused: advproxy throttle mmedia
@@ -261,6 +263,7 @@ WARNING: translation string unused: dns new 0
 WARNING: translation string unused: dns new 1
 WARNING: translation string unused: dns saved
 WARNING: translation string unused: dns saved txt
+WARNING: translation string unused: dnssec disabled warning
 WARNING: translation string unused: dnssec information
 WARNING: translation string unused: do not log this port list
 WARNING: translation string unused: domain master
@@ -292,6 +295,7 @@ WARNING: translation string unused: enable javascript
 WARNING: translation string unused: enable wildcards
 WARNING: translation string unused: enabledtitle
 WARNING: translation string unused: encrypted
+WARNING: translation string unused: enter ack class
 WARNING: translation string unused: err bk 1
 WARNING: translation string unused: err bk 10 password
 WARNING: translation string unused: err bk 2 key
@@ -320,6 +324,8 @@ WARNING: translation string unused: external access rule removed
 WARNING: translation string unused: extrahd
 WARNING: translation string unused: extrahd unable to read
 WARNING: translation string unused: extrahd unable to write
+WARNING: translation string unused: false max bandwith
+WARNING: translation string unused: false min bandwith
 WARNING: translation string unused: filename
 WARNING: translation string unused: firmware
 WARNING: translation string unused: firmware upload
@@ -388,6 +394,7 @@ WARNING: translation string unused: generatepolicy
 WARNING: translation string unused: generatereport
 WARNING: translation string unused: genkey
 WARNING: translation string unused: green interface
+WARNING: translation string unused: guaranteed bandwith
 WARNING: translation string unused: guest ok
 WARNING: translation string unused: gz with key
 WARNING: translation string unused: harddisk temperature graphs
@@ -486,6 +493,7 @@ WARNING: translation string unused: manage printers
 WARNING: translation string unused: manual
 WARNING: translation string unused: manual control and status
 WARNING: translation string unused: marked
+WARNING: translation string unused: max bandwith
 WARNING: translation string unused: max incoming size
 WARNING: translation string unused: max outgoing size
 WARNING: translation string unused: max size
@@ -892,8 +900,11 @@ 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 vlan tag range error
 WARNING: translation string unused: zoneconf val zoneslave amount error
+WARNING: untranslated string: false max bandwidth = Maximum bandwidth is false.
+WARNING: untranslated string: false min bandwidth = Minimum bandwidth is false.
 WARNING: untranslated string: fwhost cust locationgrp = unknown string
 WARNING: untranslated string: fwhost err hostip = unknown string
+WARNING: untranslated string: guaranteed bandwidth = Guaranteed bandwidth
 WARNING: untranslated string: guardian block a host = unknown string
 WARNING: untranslated string: guardian block httpd brute-force = unknown string
 WARNING: untranslated string: guardian block ssh brute-force = unknown string
@@ -923,9 +934,8 @@ 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: max bandwidth = Maximum bandwidth
 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 4538461c6..a97016dcc 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -70,7 +70,9 @@ WARNING: translation string unused: advproxy errmsg password incorrect
 WARNING: translation string unused: advproxy invalid num of children
 WARNING: translation string unused: advproxy no clients defined
 WARNING: translation string unused: advproxy redirector children
+WARNING: translation string unused: advproxy squid version
 WARNING: translation string unused: advproxy ssadvanced proxy
+WARNING: translation string unused: advproxy suppress version
 WARNING: translation string unused: advproxy throttle binary
 WARNING: translation string unused: advproxy throttle dskimg
 WARNING: translation string unused: advproxy throttle mmedia
@@ -263,6 +265,7 @@ WARNING: translation string unused: enable javascript
 WARNING: translation string unused: enable wildcards
 WARNING: translation string unused: enabledtitle
 WARNING: translation string unused: encrypted
+WARNING: translation string unused: enter ack class
 WARNING: translation string unused: err bk 1
 WARNING: translation string unused: err bk 10 password
 WARNING: translation string unused: err bk 2 key
@@ -895,10 +898,17 @@ WARNING: untranslated string: acpitemp = ACPI - Temperatures
 WARNING: untranslated string: administrator password = Administrator password
 WARNING: untranslated string: administrator username = Administrator username
 WARNING: untranslated string: advproxy AUTH method ntlm auth = Windows Active Directory
+WARNING: untranslated string: advproxy asbased anomaly detection = Anomaly detections based on Autonomous Systems information
 WARNING: untranslated string: advproxy basic authentication = Allow HTTP Basic authentication
 WARNING: untranslated string: advproxy errmsg wpad invalid ip or mask = WPAD: Invalid IP or subnet for excluded IP subnet
+WARNING: untranslated string: advproxy fastflux detection = Deny access to destinations hosted on fast flux setups
+WARNING: untranslated string: advproxy fastflux detection threshold = Threshold
+WARNING: untranslated string: advproxy fastflux no threshold given = No threshold was given for fast flux detection
+WARNING: untranslated string: advproxy fastflux threshold invalid = Supplied fast flux detection threshold is invalid
+WARNING: untranslated string: advproxy fastflux threshold out of bounds = Supplied fast flux detection threshold is out of bounds
 WARNING: untranslated string: advproxy group access control = Group based access control
 WARNING: untranslated string: advproxy group required = Required group
+WARNING: untranslated string: advproxy selectively announcements detection = Deny access to destinations hosted on selectively announced networks
 WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.168.2.0/255.255.255.0
 WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org*
 WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line)
@@ -946,7 +956,6 @@ WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigne
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries
 WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled
 WARNING: untranslated string: dnsforward forward_servers = Nameservers
-WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled
 WARNING: untranslated string: download apple profile = Download Apple Configuration Profile
 WARNING: untranslated string: duration = Duration
 WARNING: untranslated string: eight hours = 8 Hours
@@ -999,7 +1008,7 @@ WARNING: untranslated string: fwhost cust locationgrp = unknown string
 WARNING: untranslated string: fwhost err hostip = unknown string
 WARNING: untranslated string: fwhost newlocationgrp = Location Groups
 WARNING: untranslated string: generate ptr = Generate PTR
-WARNING: untranslated string: guaranteed bandwith = Guaranteed bandwith
+WARNING: untranslated string: guaranteed bandwidth = Guaranteed bandwidth
 WARNING: untranslated string: guardian = Guardian
 WARNING: untranslated string: guardian block a host = unknown string
 WARNING: untranslated string: guardian block httpd brute-force = unknown string
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 85fdcbe44..6c2715bc4 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -69,7 +69,9 @@ WARNING: translation string unused: advproxy errmsg password incorrect
 WARNING: translation string unused: advproxy invalid num of children
 WARNING: translation string unused: advproxy no clients defined
 WARNING: translation string unused: advproxy redirector children
+WARNING: translation string unused: advproxy squid version
 WARNING: translation string unused: advproxy ssadvanced proxy
+WARNING: translation string unused: advproxy suppress version
 WARNING: translation string unused: advproxy throttle binary
 WARNING: translation string unused: advproxy throttle dskimg
 WARNING: translation string unused: advproxy throttle mmedia
@@ -261,6 +263,7 @@ WARNING: translation string unused: enable javascript
 WARNING: translation string unused: enable wildcards
 WARNING: translation string unused: enabledtitle
 WARNING: translation string unused: encrypted
+WARNING: translation string unused: enter ack class
 WARNING: translation string unused: err bk 1
 WARNING: translation string unused: err bk 10 password
 WARNING: translation string unused: err bk 2 key
@@ -890,10 +893,17 @@ WARNING: untranslated string: acpitemp = ACPI - Temperatures
 WARNING: untranslated string: administrator password = Administrator password
 WARNING: untranslated string: administrator username = Administrator username
 WARNING: untranslated string: advproxy AUTH method ntlm auth = Windows Active Directory
+WARNING: untranslated string: advproxy asbased anomaly detection = Anomaly detections based on Autonomous Systems information
 WARNING: untranslated string: advproxy basic authentication = Allow HTTP Basic authentication
 WARNING: untranslated string: advproxy errmsg wpad invalid ip or mask = WPAD: Invalid IP or subnet for excluded IP subnet
+WARNING: untranslated string: advproxy fastflux detection = Deny access to destinations hosted on fast flux setups
+WARNING: untranslated string: advproxy fastflux detection threshold = Threshold
+WARNING: untranslated string: advproxy fastflux no threshold given = No threshold was given for fast flux detection
+WARNING: untranslated string: advproxy fastflux threshold invalid = Supplied fast flux detection threshold is invalid
+WARNING: untranslated string: advproxy fastflux threshold out of bounds = Supplied fast flux detection threshold is out of bounds
 WARNING: untranslated string: advproxy group access control = Group based access control
 WARNING: untranslated string: advproxy group required = Required group
+WARNING: untranslated string: advproxy selectively announcements detection = Deny access to destinations hosted on selectively announced networks
 WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.168.2.0/255.255.255.0
 WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org*
 WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line)
@@ -949,7 +959,6 @@ WARNING: untranslated string: dns use protocol for dns queries = Protocol for DN
 WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled
 WARNING: untranslated string: dnsforward forward_servers = Nameservers
 WARNING: untranslated string: dnssec aware = DNSSEC Aware
-WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled
 WARNING: untranslated string: dnssec not supported = DNSSEC Not supported
 WARNING: untranslated string: dnssec validating = DNSSEC Validating
 WARNING: untranslated string: download apple profile = Download Apple Configuration Profile
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index a023bdbee..79d2045d3 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -69,7 +69,9 @@ WARNING: translation string unused: advproxy errmsg password incorrect
 WARNING: translation string unused: advproxy invalid num of children
 WARNING: translation string unused: advproxy no clients defined
 WARNING: translation string unused: advproxy redirector children
+WARNING: translation string unused: advproxy squid version
 WARNING: translation string unused: advproxy ssadvanced proxy
+WARNING: translation string unused: advproxy suppress version
 WARNING: translation string unused: advproxy throttle binary
 WARNING: translation string unused: advproxy throttle dskimg
 WARNING: translation string unused: advproxy throttle mmedia
@@ -251,6 +253,7 @@ WARNING: translation string unused: enable javascript
 WARNING: translation string unused: enable wildcards
 WARNING: translation string unused: enabledtitle
 WARNING: translation string unused: encrypted
+WARNING: translation string unused: enter ack class
 WARNING: translation string unused: err bk 1
 WARNING: translation string unused: err bk 10 password
 WARNING: translation string unused: err bk 2 key
@@ -816,15 +819,22 @@ WARNING: untranslated string: addons = Addons
 WARNING: untranslated string: administrator password = Administrator password
 WARNING: untranslated string: administrator username = Administrator username
 WARNING: untranslated string: advproxy AUTH method ntlm auth = Windows Active Directory
+WARNING: untranslated string: advproxy asbased anomaly detection = Anomaly detections based on Autonomous Systems information
 WARNING: untranslated string: advproxy basic authentication = Allow HTTP Basic authentication
 WARNING: untranslated string: advproxy cache-digest = Enable Cache-Digest Generation
 WARNING: untranslated string: advproxy errmsg cache = The RAM cache size is greater than the harddisk cache size:
 WARNING: untranslated string: advproxy errmsg invalid upstream proxy = Invalid upstream proxy IP/hostname
 WARNING: untranslated string: advproxy errmsg proxy ports equal = The proxy port and the transparent port cannot be equal.
 WARNING: untranslated string: advproxy errmsg wpad invalid ip or mask = WPAD: Invalid IP or subnet for excluded IP subnet
+WARNING: untranslated string: advproxy fastflux detection = Deny access to destinations hosted on fast flux setups
+WARNING: untranslated string: advproxy fastflux detection threshold = Threshold
+WARNING: untranslated string: advproxy fastflux no threshold given = No threshold was given for fast flux detection
+WARNING: untranslated string: advproxy fastflux threshold invalid = Supplied fast flux detection threshold is invalid
+WARNING: untranslated string: advproxy fastflux threshold out of bounds = Supplied fast flux detection threshold is out of bounds
 WARNING: untranslated string: advproxy group access control = Group based access control
 WARNING: untranslated string: advproxy group required = Required group
 WARNING: untranslated string: advproxy proxy port transparent = Transparent port
+WARNING: untranslated string: advproxy selectively announcements detection = Deny access to destinations hosted on selectively announced networks
 WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.168.2.0/255.255.255.0
 WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org*
 WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line)
@@ -935,7 +945,6 @@ WARNING: untranslated string: dnsforward entries = Current entries
 WARNING: untranslated string: dnsforward forward_servers = Nameservers
 WARNING: untranslated string: dnsforward zone = Zone
 WARNING: untranslated string: dnssec aware = DNSSEC Aware
-WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled
 WARNING: untranslated string: dnssec not supported = DNSSEC Not supported
 WARNING: untranslated string: dnssec validating = DNSSEC Validating
 WARNING: untranslated string: downlink = Downlink
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index d1abbc4a8..52b116c60 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -69,7 +69,9 @@ WARNING: translation string unused: advproxy errmsg password incorrect
 WARNING: translation string unused: advproxy invalid num of children
 WARNING: translation string unused: advproxy no clients defined
 WARNING: translation string unused: advproxy redirector children
+WARNING: translation string unused: advproxy squid version
 WARNING: translation string unused: advproxy ssadvanced proxy
+WARNING: translation string unused: advproxy suppress version
 WARNING: translation string unused: advproxy throttle binary
 WARNING: translation string unused: advproxy throttle dskimg
 WARNING: translation string unused: advproxy throttle mmedia
@@ -250,6 +252,7 @@ WARNING: translation string unused: enable javascript
 WARNING: translation string unused: enable wildcards
 WARNING: translation string unused: enabledtitle
 WARNING: translation string unused: encrypted
+WARNING: translation string unused: enter ack class
 WARNING: translation string unused: err bk 1
 WARNING: translation string unused: err bk 10 password
 WARNING: translation string unused: err bk 2 key
@@ -812,15 +815,22 @@ WARNING: untranslated string: addons = Addons
 WARNING: untranslated string: administrator password = Administrator password
 WARNING: untranslated string: administrator username = Administrator username
 WARNING: untranslated string: advproxy AUTH method ntlm auth = Windows Active Directory
+WARNING: untranslated string: advproxy asbased anomaly detection = Anomaly detections based on Autonomous Systems information
 WARNING: untranslated string: advproxy basic authentication = Allow HTTP Basic authentication
 WARNING: untranslated string: advproxy cache-digest = Enable Cache-Digest Generation
 WARNING: untranslated string: advproxy errmsg cache = The RAM cache size is greater than the harddisk cache size:
 WARNING: untranslated string: advproxy errmsg invalid upstream proxy = Invalid upstream proxy IP/hostname
 WARNING: untranslated string: advproxy errmsg proxy ports equal = The proxy port and the transparent port cannot be equal.
 WARNING: untranslated string: advproxy errmsg wpad invalid ip or mask = WPAD: Invalid IP or subnet for excluded IP subnet
+WARNING: untranslated string: advproxy fastflux detection = Deny access to destinations hosted on fast flux setups
+WARNING: untranslated string: advproxy fastflux detection threshold = Threshold
+WARNING: untranslated string: advproxy fastflux no threshold given = No threshold was given for fast flux detection
+WARNING: untranslated string: advproxy fastflux threshold invalid = Supplied fast flux detection threshold is invalid
+WARNING: untranslated string: advproxy fastflux threshold out of bounds = Supplied fast flux detection threshold is out of bounds
 WARNING: untranslated string: advproxy group access control = Group based access control
 WARNING: untranslated string: advproxy group required = Required group
 WARNING: untranslated string: advproxy proxy port transparent = Transparent port
+WARNING: untranslated string: advproxy selectively announcements detection = Deny access to destinations hosted on selectively announced networks
 WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.168.2.0/255.255.255.0
 WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org*
 WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line)
@@ -932,7 +942,6 @@ WARNING: untranslated string: dnsforward entries = Current entries
 WARNING: untranslated string: dnsforward forward_servers = Nameservers
 WARNING: untranslated string: dnsforward zone = Zone
 WARNING: untranslated string: dnssec aware = DNSSEC Aware
-WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled
 WARNING: untranslated string: dnssec not supported = DNSSEC Not supported
 WARNING: untranslated string: dnssec validating = DNSSEC Validating
 WARNING: untranslated string: downlink = Downlink
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index a882db069..019dd7be0 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -92,7 +92,9 @@ WARNING: translation string unused: advproxy errmsg password incorrect
 WARNING: translation string unused: advproxy invalid num of children
 WARNING: translation string unused: advproxy no clients defined
 WARNING: translation string unused: advproxy redirector children
+WARNING: translation string unused: advproxy squid version
 WARNING: translation string unused: advproxy ssadvanced proxy
+WARNING: translation string unused: advproxy suppress version
 WARNING: translation string unused: advproxy throttle binary
 WARNING: translation string unused: advproxy throttle dskimg
 WARNING: translation string unused: advproxy throttle mmedia
@@ -258,6 +260,7 @@ WARNING: translation string unused: dns new 1
 WARNING: translation string unused: dns saved
 WARNING: translation string unused: dns saved txt
 WARNING: translation string unused: dnsforward forward_server
+WARNING: translation string unused: dnssec disabled warning
 WARNING: translation string unused: dnssec information
 WARNING: translation string unused: do not log this port list
 WARNING: translation string unused: domain master
@@ -289,6 +292,7 @@ WARNING: translation string unused: enable javascript
 WARNING: translation string unused: enable wildcards
 WARNING: translation string unused: enabledtitle
 WARNING: translation string unused: encrypted
+WARNING: translation string unused: enter ack class
 WARNING: translation string unused: err bk 1
 WARNING: translation string unused: err bk 10 password
 WARNING: translation string unused: err bk 2 key
@@ -885,7 +889,14 @@ WARNING: untranslated string: Disabled = Disabled
 WARNING: untranslated string: Scan for Songs = unknown string
 WARNING: untranslated string: Weekly = Weekly
 WARNING: untranslated string: acpitemp = ACPI - Temperatures
+WARNING: untranslated string: advproxy asbased anomaly detection = Anomaly detections based on Autonomous Systems information
 WARNING: untranslated string: advproxy errmsg wpad invalid ip or mask = WPAD: Invalid IP or subnet for excluded IP subnet
+WARNING: untranslated string: advproxy fastflux detection = Deny access to destinations hosted on fast flux setups
+WARNING: untranslated string: advproxy fastflux detection threshold = Threshold
+WARNING: untranslated string: advproxy fastflux no threshold given = No threshold was given for fast flux detection
+WARNING: untranslated string: advproxy fastflux threshold invalid = Supplied fast flux detection threshold is invalid
+WARNING: untranslated string: advproxy fastflux threshold out of bounds = Supplied fast flux detection threshold is out of bounds
+WARNING: untranslated string: advproxy selectively announcements detection = Deny access to destinations hosted on selectively announced networks
 WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.168.2.0/255.255.255.0
 WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org*
 WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line)
diff --git a/doc/language_missings b/doc/language_missings
index 7aa2094a4..e0755b024 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -79,6 +79,7 @@
 < administrator password
 < administrator username
 < adsl settings
+< advproxy asbased anomaly detection
 < advproxy AUTH method ntlm
 < advproxy AUTH method ntlm auth
 < advproxy basic authentication
@@ -87,9 +88,15 @@
 < advproxy errmsg invalid upstream proxy
 < advproxy errmsg proxy ports equal
 < advproxy errmsg wpad invalid ip or mask
+< advproxy fastflux detection
+< advproxy fastflux detection threshold
+< advproxy fastflux no threshold given
+< advproxy fastflux threshold invalid
+< advproxy fastflux threshold out of bounds
 < advproxy group access control
 < advproxy group required
 < advproxy proxy port transparent
+< advproxy selectively announcements detection
 < advproxy wpad example dst_noproxy_ip
 < advproxy wpad example dst_noproxy_url
 < advproxy wpad label dst_noproxy_ip
@@ -930,10 +937,12 @@
 < ansi t1.483
 < bewan adsl pci st
 < bewan adsl usb
+< false max bandwidth
+< false min bandwidth
 < g.dtm
 < g.lite
-< reboot fsck
-< rebooting ipfire fsck
+< guaranteed bandwidth
+< max bandwidth
 < upload fcdsl.o
 ############################################################################
 # Checking cgi-bin translations for language: it                           #
@@ -943,11 +952,18 @@
 < administrator password
 < administrator username
 < adsl settings
+< advproxy asbased anomaly detection
 < advproxy AUTH method ntlm auth
 < advproxy basic authentication
 < advproxy errmsg wpad invalid ip or mask
+< advproxy fastflux detection
+< advproxy fastflux detection threshold
+< advproxy fastflux no threshold given
+< advproxy fastflux threshold invalid
+< advproxy fastflux threshold out of bounds
 < advproxy group access control
 < advproxy group required
+< advproxy selectively announcements detection
 < advproxy wpad example dst_noproxy_ip
 < advproxy wpad example dst_noproxy_url
 < advproxy wpad label dst_noproxy_ip
@@ -1108,7 +1124,7 @@
 < fwhost cust locationlocation
 < fwhost newlocationgrp
 < generate ptr
-< guaranteed bandwith
+< guaranteed bandwidth
 < guardian
 < hardware vulnerabilities
 < ids apply
@@ -1340,12 +1356,19 @@
 < administrator password
 < administrator username
 < adsl settings
+< advproxy asbased anomaly detection
 < advproxy AUTH method ntlm
 < advproxy AUTH method ntlm auth
 < advproxy basic authentication
 < advproxy errmsg wpad invalid ip or mask
+< advproxy fastflux detection
+< advproxy fastflux detection threshold
+< advproxy fastflux no threshold given
+< advproxy fastflux threshold invalid
+< advproxy fastflux threshold out of bounds
 < advproxy group access control
 < advproxy group required
+< advproxy selectively announcements detection
 < advproxy wpad example dst_noproxy_ip
 < advproxy wpad example dst_noproxy_url
 < advproxy wpad label dst_noproxy_ip
@@ -1793,6 +1816,7 @@
 < administrator password
 < administrator username
 < adsl settings
+< advproxy asbased anomaly detection
 < advproxy AUTH method ntlm
 < advproxy AUTH method ntlm auth
 < advproxy basic authentication
@@ -1801,9 +1825,15 @@
 < advproxy errmsg invalid upstream proxy
 < advproxy errmsg proxy ports equal
 < advproxy errmsg wpad invalid ip or mask
+< advproxy fastflux detection
+< advproxy fastflux detection threshold
+< advproxy fastflux no threshold given
+< advproxy fastflux threshold invalid
+< advproxy fastflux threshold out of bounds
 < advproxy group access control
 < advproxy group required
 < advproxy proxy port transparent
+< advproxy selectively announcements detection
 < advproxy wpad example dst_noproxy_ip
 < advproxy wpad example dst_noproxy_url
 < advproxy wpad label dst_noproxy_ip
@@ -2687,6 +2717,7 @@
 < administrator password
 < administrator username
 < adsl settings
+< advproxy asbased anomaly detection
 < advproxy AUTH method ntlm
 < advproxy AUTH method ntlm auth
 < advproxy basic authentication
@@ -2695,9 +2726,15 @@
 < advproxy errmsg invalid upstream proxy
 < advproxy errmsg proxy ports equal
 < advproxy errmsg wpad invalid ip or mask
+< advproxy fastflux detection
+< advproxy fastflux detection threshold
+< advproxy fastflux no threshold given
+< advproxy fastflux threshold invalid
+< advproxy fastflux threshold out of bounds
 < advproxy group access control
 < advproxy group required
 < advproxy proxy port transparent
+< advproxy selectively announcements detection
 < advproxy wpad example dst_noproxy_ip
 < advproxy wpad example dst_noproxy_url
 < advproxy wpad label dst_noproxy_ip
@@ -3581,7 +3618,14 @@
 # Checking cgi-bin translations for language: tr                           #
 ############################################################################
 < acpitemp
+< advproxy asbased anomaly detection
 < advproxy errmsg wpad invalid ip or mask
+< advproxy fastflux detection
+< advproxy fastflux detection threshold
+< advproxy fastflux no threshold given
+< advproxy fastflux threshold invalid
+< advproxy fastflux threshold out of bounds
+< advproxy selectively announcements detection
 < advproxy wpad example dst_noproxy_ip
 < advproxy wpad example dst_noproxy_url
 < advproxy wpad label dst_noproxy_ip
diff --git a/html/cgi-bin/speed.cgi b/html/cgi-bin/speed.cgi
index b550fda52..651c3c0b3 100644
--- a/html/cgi-bin/speed.cgi
+++ b/html/cgi-bin/speed.cgi
@@ -19,7 +19,47 @@
 #                                                                             #
 ###############################################################################
-require '/var/ipfire/general-functions.pl';
+###############################################################################
+# functions copied from general-functions.pl for speed improvement because    #
+# loading and initializing the whole general-functions.pl every second create #
+# high system load                                                            #
+###########################################OA##################################
+#
+# Returns the output of a shell command
+sub General__system_output($) {
+    my @command = @_;
+    my $pid;
+    my @output = ();
+
+    unless ($pid = open(OUTPUT, "-|")) {
+            open(STDERR, ">&STDOUT");
+            exec { ${command[0]} } @command;
+            die "Could not execute @command: $!";
+    }
+
+    waitpid($pid, 0);
+
+    while (<OUTPUT>) {
+            push(@output, $_);
+    }
+
+    close(OUTPUT);
+    return @output;
+}
+#
+# Function which will return the used interface for the red network zone (red0, ppp0, etc).
+sub General__get_red_interface() {
+
+     open(IFACE, "/var/ipfire/red/iface") or die "Could not open /var/ipfire/red/iface";
+
+     my $interface = <IFACE>;
+     close(IFACE);
+     chomp $interface;
+
+     return $interface;
+}
+#
+###############################################################################
my $data_last = $ENV{'QUERY_STRING'};
 my $rxb_last = 0;
@@ -38,8 +78,8 @@ foreach $field (@fields) {
    }
 }
-my $interface = &General::get_red_interface();
-my @data_now = &General::system_output("ip", "-s", "link", "show", "$interface");
+my $interface = &General__get_red_interface();
+my @data_now = &General__system_output("ip", "-s", "link", "show", "$interface");
my $lastline;
 my $rxb_now = 0;
diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi
index 3349336ae..539a74343 100644
--- a/html/cgi-bin/tor.cgi
+++ b/html/cgi-bin/tor.cgi
@@ -2,7 +2,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        #
@@ -730,6 +730,8 @@ sub BuildConfiguration() {
    open(FILE, ">$torrc");
# Global settings.
+	print FILE "Sandbox 1\n";
+	print FILE "HardwareAccel 1\n";
    print FILE "ControlPort $TOR_CONTROL_PORT\n";
if ($settings{'TOR_ENABLED'} eq 'on') {
@@ -800,10 +802,10 @@ sub BuildConfiguration() {
    	# Reject access to private networks.
    	print FILE "ExitPolicyRejectPrivate 1\n";
-		print FILE "ORPort $settings{'TOR_RELAY_PORT'}\n";
+		print FILE "ORPort $settings{'TOR_RELAY_PORT'} IPv4Only\n";
if ($settings{'TOR_RELAY_DIRPORT'} ne '0') {
-			print FILE "DirPort $settings{'TOR_RELAY_DIRPORT'}\n";
+			print FILE "DirPort $settings{'TOR_RELAY_DIRPORT'} IPv4Only\n";
    	}
if ($settings{'TOR_RELAY_ADDRESS'} ne '') {
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 0844e3991..80aaff9a9 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -328,8 +328,8 @@
 'advproxy error design' => 'Design der Fehlermeldungen',
 'advproxy error language' => 'Sprache der Fehlermeldungen',
 'advproxy fastflux detection' => 'Verbindungen zu auf Fast Flux-Setups gehosteten Zielen verweigern',
-'advproxy fastflux no threshold given' => 'Kein Schwellwert für Fast Flux-Erkennung angegeben',
 'advproxy fastflux detection threshold' => 'Schwellwert',
+'advproxy fastflux no threshold given' => 'Kein Schwellwert für Fast Flux-Erkennung angegeben',
 'advproxy fastflux threshold invalid' => 'Eingegebener Schwellwert für Fast Flux-Erkennung ist ungültig',
 'advproxy fastflux threshold out of bounds' => 'Eingegebener Schwellwert für Fast Flux-Erkennung befindet sich außerhalb zulässiger Grenzwerte',
 'advproxy friday' => 'Fr',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 1d833b6ef..4c05dcf76 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -325,8 +325,8 @@
 'advproxy error design' => 'Error messages design',
 'advproxy error language' => 'Error messages language',
 'advproxy fastflux detection' => 'Deny access to destinations hosted on fast flux setups',
-'advproxy fastflux no threshold given' => 'No threshold was given for fast flux detection',
 'advproxy fastflux detection threshold' => 'Threshold',
+'advproxy fastflux no threshold given' => 'No threshold was given for fast flux detection',
 'advproxy fastflux threshold invalid' => 'Supplied fast flux detection threshold is invalid',
 'advproxy fastflux threshold out of bounds' => 'Supplied fast flux detection threshold is out of bounds',
 'advproxy friday' => 'Fri',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 56e4a9faa..a20fa22f4 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -259,6 +259,7 @@
 'advproxy advanced web proxy configuration' => 'Configuration avancée du proxy web',
 'advproxy allowed subnets' => 'Sous-réseaux autorisés (un par ligne) ',
 'advproxy allowed web browsers' => 'Clients autorisés pour l'accès web',
+'advproxy asbased anomaly detection' => 'Détections d'anomalies basées sur les informations des systèmes autonomes',
 'advproxy back to main page' => 'Retour à la page principale',
 'advproxy banned ip clients' => 'Adresses IP interdites (une par ligne) ',
 'advproxy banned mac clients' => 'Adresses MAC interdites (une par ligne) ',
@@ -330,6 +331,11 @@
 'advproxy errmsg wpad invalid ip or mask' => 'WPAD : IP ou sous-réseau invalide pour le sous-réseau IP exclu',
 'advproxy error design' => 'Construction messages erronés ',
 'advproxy error language' => 'Langage des messages erronés ',
+'advproxy fastflux detection' => 'Refuser l'accès aux destinations hébergées sur les configurations de flux rapide',
+'advproxy fastflux detection threshold' => 'Seuil',
+'advproxy fastflux no threshold given' => 'Aucun seuil n'a été fourni pour la détection de flux rapide',
+'advproxy fastflux threshold invalid' => 'Le seuil de détection de flux rapide fourni n'est pas valide',
+'advproxy fastflux threshold out of bounds' => 'Le seuil de détection de flux rapide fourni est hors limites',
 'advproxy friday' => 'Ven',
 'advproxy from' => 'De',
 'advproxy group access control' => 'Contrôle d'accès basé sur le groupe',
@@ -366,6 +372,7 @@
 'advproxy reset' => 'Relancer',
 'advproxy saturday' => 'Sam',
 'advproxy save and restart' => 'Sauvegarder et redémarrer',
+'advproxy selectively announcements detection' => 'Refuser l'accès aux destinations hébergées sur des réseaux annoncés de manière sélective',
 'advproxy squid version' => 'Version Squid Cache ',
 'advproxy squidclamav' => 'SquidClamav',
 'advproxy ssadvanced proxy' => 'Proxy avancé',
@@ -1061,8 +1068,8 @@
 'extrahd you cant mount' => 'Vous ne pouvez pas monter',
 'fallout zombieload ridl' => 'Fallout / ZombieLoad / RIDL',
 'false classnumber' => 'Le numéro de classe ne correspond pas à l'interface.',
-'false max bandwidth' => 'La bande passante maximum est fausse.',
-'false min bandwidth' => 'La bande passante minimum est fausse.',
+'false max bandwith' => 'La bande passante maximum est fausse.',
+'false min bandwith' => 'La bande passante minimum est fausse.',
 'february' => 'Février',
 'fetch ip from' => 'Deviner la véritable IP publique à l'aide d'un serveur externe',
 'fifteen minutes' => '15 minutes',
@@ -1355,7 +1362,7 @@
 'green' => 'VERT',
 'green interface' => 'Interface VERTE',
 'grouptype' => 'Type de groupe :',
-'guaranteed bandwidth' => 'Bande passante garantie',
+'guaranteed bandwith' => 'Bande passante garantie',
 'guardian' => 'Gardien',
 'guest ok' => 'autoriser l'accès aux invités',
 'gui settings' => 'Interface graphique',
@@ -1683,7 +1690,7 @@
 'masquerading' => 'Masquage (une seule IP pour plusieurs machines en sortie du réseau interne)',
 'masquerading disabled' => 'Masquage désactivé',
 'masquerading enabled' => 'Masquage activé',
-'max bandwidth' => 'Bande passante maximum',
+'max bandwith' => 'Bande passante maximum',
 'max incoming size' => 'Taille maximum des téléchargement (Ko) :',
 'max lease time' => 'Durée maximum du bail (minutes) :',
 'max outgoing size' => 'Taille maximum des envois (Ko) :',
@@ -2128,11 +2135,13 @@
 'real address' => 'Adresse réelle',
 'reboot' => 'Redémarrer',
 'reboot ask' => 'Redémarrage ?',
+'reboot fsck' => 'Redémarrer et vérifier le système de fichier',
 'reboot question' => 'Requête supplémentaire pour le redémarrage et l'arrêt',
 'reboot schedule' => 'Redémarrages planifiées d'IPFire',
 'reboot sure' => 'Etes-vous sûr de vouloir redémarrer ?',
 'rebooting' => 'Redémarrage en cours...',
 'rebooting ipfire' => 'Redemarrage d'IPFire',
+'rebooting ipfire fsck' => 'Redémarrage d'IPFire, vérification du système de fichier en mode forcé',
 'received' => 'Reçu',
 'reconnect' => 'Reconnecter',
 'reconnection' => 'Reconnexion ',
diff --git a/lfs/7zip b/lfs/7zip
index b70ce491c..3e204ca1a 100644
--- a/lfs/7zip
+++ b/lfs/7zip
@@ -24,15 +24,15 @@
include Config
-VER        = 17.03
+VER        = 17.04
THISAPP    = p7zip-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = https://github.com/jinfeihan57/p7zip/archive/v$(VER)/
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = 7zip
-PAK_VER    = 8
+PAK_VER    = 9
DEPS       =
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = fd7e6b082db89edfc047c1ce2d810850
+$(DL_FILE)_MD5 = 00acfd6be87848231722d2d53f89e4a5
install : $(TARGET)
diff --git a/lfs/ExtUtils-PkgConfig b/lfs/ExtUtils-PkgConfig
new file mode 100644
index 000000000..f35868a83
--- /dev/null
+++ b/lfs/ExtUtils-PkgConfig
@@ -0,0 +1,77 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2018  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/.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.16
+
+THISAPP    = ExtUtils-PkgConfig-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = b86318f2b6ac6af3ee985299e1e38fe5
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && perl Makefile.PL
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/lfs/GD-Graph b/lfs/GD-Graph
index 044344df1..2ad306af7 100644
--- a/lfs/GD-Graph
+++ b/lfs/GD-Graph
@@ -24,7 +24,7 @@
include Config
-VER        = 1.4308
+VER        = 1.54
THISAPP    = GDGraph-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = fcdd34d5e09ae917b5d264887734b3b1
+$(DL_FILE)_MD5 = 38c6a188519e6272e9b2b722b315c3d8
install : $(TARGET)
diff --git a/lfs/ca-certificates b/lfs/ca-certificates
index 9e37687da..aa366ff5e 100644
--- a/lfs/ca-certificates
+++ b/lfs/ca-certificates
@@ -24,7 +24,7 @@
include Config
-VER        = 20210819
+VER        = 20210925
THISAPP    = ca-certificates
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
diff --git a/lfs/cups-filters b/lfs/cups-filters
index d00b5ccb2..10de534c4 100644
--- a/lfs/cups-filters
+++ b/lfs/cups-filters
@@ -24,7 +24,7 @@
include Config
-VER        = 1.28.9
+VER        = 1.28.10
THISAPP    = cups-filters-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups-filters
-PAK_VER    = 6
+PAK_VER    = 7
DEPS       = cups ghostscript
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 1ea8d0311463d4026f0f631a4843dec2
+$(DL_FILE)_MD5 = 828b8c81534ecb996d6c6b7e1332412f
install : $(TARGET)
diff --git a/lfs/dosfstools b/lfs/dosfstools
index 8a74661e9..49dddab6b 100644
--- a/lfs/dosfstools
+++ b/lfs/dosfstools
@@ -24,7 +24,7 @@
include Config
-VER        = 3.0.9
+VER        = 4.2
THISAPP    = dosfstools-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = bd273cf8aa6341c0b52cbac72050bcf4
+$(DL_FILE)_MD5 = 49c8e457327dc61efab5b115a27b087a
install : $(TARGET)
@@ -70,7 +70,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && sed -i -e "s|PREFIX = /usr/local||g" Makefile
+	cd $(DIR_APP) && ./configure \
+					--prefix=/usr \
+					--sbindir=/sbin \
+					--enable-compat-symlinks
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
    @rm -rf $(DIR_APP)
diff --git a/lfs/exfatprogs b/lfs/exfatprogs
new file mode 100644
index 000000000..7b257f168
--- /dev/null
+++ b/lfs/exfatprogs
@@ -0,0 +1,78 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2018  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/.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.1.2
+
+THISAPP    = exfatprogs-$(VER)
+DL_FILE    = $(THISAPP).tar.xz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 20c6caa98a0ad7d073c045628807a884
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure \
+					--prefix=/usr
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/lfs/gd b/lfs/gd
index 134d2fccd..d4a593fbf 100644
--- a/lfs/gd
+++ b/lfs/gd
@@ -24,10 +24,10 @@
include Config
-VER        = 2.0.33
+VER        = 2.3.3
-THISAPP    = gd-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+THISAPP    = libgd-$(VER)
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = be0a6d326cd8567e736fbc75df0a5c45
+$(DL_FILE)_MD5 = 7a58b54d375eda236414201252a0ee3c
install : $(TARGET)
@@ -69,9 +69,12 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
    $(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+	cd $(DIR_APP) && ./configure \
+			--prefix=/usr \
+			--disable-static \
+			--without-tiff
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
    @rm -rf $(DIR_APP)
diff --git a/lfs/ghostscript b/lfs/ghostscript
index 1ee14a16e..695ff6bcb 100644
--- a/lfs/ghostscript
+++ b/lfs/ghostscript
@@ -24,7 +24,7 @@
include Config
-VER        = 9.54.0
+VER        = 9.55.0
THISAPP    = ghostscript-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ghostscript
-PAK_VER    = 8
+PAK_VER    = 9
DEPS       = cups dbus libtiff
@@ -48,7 +48,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 ghostscript-fonts-std-8.11.tar.gz = $(URL_IPFIRE)/ghostscript-fonts-std-8.11.tar.gz
 gnu-gs-fonts-other-6.0.tar.gz = $(URL_IPFIRE)/gnu-gs-fonts-other-6.0.tar.gz
-$(DL_FILE)_MD5 = 72535d31018129a1a8ff636a47ba1f92
+$(DL_FILE)_MD5 = 92aa46e75c4f32eb11d9c975053d876c
 ghostscript-fonts-std-8.11.tar.gz_MD5 = 6865682b095f8c4500c54b285ff05ef6
 gnu-gs-fonts-other-6.0.tar.gz_MD5 = 33457d3f37de7ef03d2eea05a9e6aa4f
diff --git a/lfs/krb5 b/lfs/krb5
index a972920e7..f72c12fd0 100644
--- a/lfs/krb5
+++ b/lfs/krb5
@@ -24,7 +24,7 @@
include Config
-VER        = 1.19.1
+VER        = 1.19.2
THISAPP    = krb5-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)/src
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = krb5
-PAK_VER    = 6
+PAK_VER    = 7
DEPS       =
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 81257292f8243f735654d4fd5d1fef6a
+$(DL_FILE)_MD5 = eb51b7724111e1a458a8c9a261d45a31
install : $(TARGET)
diff --git a/lfs/logwatch b/lfs/logwatch
index 8baaef2ce..628dafe6f 100644
--- a/lfs/logwatch
+++ b/lfs/logwatch
@@ -74,6 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP)/lib && patch < $(DIR_SRC)/src/patches/logwatch/logwatch-7.3.6-date_manip6.patch
    cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.5-enable-mdadm-sudo.patch
@cd $(DIR_APP) && chmod 755 install_logwatch.sh
    cd $(DIR_APP) && yes "" | ./install_logwatch.sh
@@ -103,6 +104,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    chmod -v 755 /var/log/logwatch
    -rm -rf /etc/logwatch/conf
    ln -vsf /usr/share/logwatch/default.conf /etc/logwatch/conf
-	
+
+	-mkdir -p /etc/sudoers.d
+	chmod -v 755 /etc/sudoers.d
+	install -v -m 644 $(DIR_SRC)/config/logwatch/sudoers/logwatch-mdadm \
+                /etc/sudoers.d/logwatch-mdadm
+
    @rm -rf $(DIR_APP)
    @$(POSTBUILD)
diff --git a/lfs/minidlna b/lfs/minidlna
index 822251fcf..a0e09a0a3 100644
--- a/lfs/minidlna
+++ b/lfs/minidlna
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = minidlna
-PAK_VER    = 7
+PAK_VER    = 8
DEPS       = ffmpeg flac libexif libid3tag libogg
@@ -89,6 +89,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
#install initscripts
    $(call INSTALL_INITSCRIPT,minidlna)
+	
+	#install backup definition
+	install -v -m 644 ${DIR_SRC}/config/backup/includes/minidlna \
+			/var/ipfire/backup/addons/includes/minidlna
@rm -rf $(DIR_APP)
    @$(POSTBUILD)
diff --git a/lfs/monit b/lfs/monit
index 06306eb8f..044fe560f 100644
--- a/lfs/monit
+++ b/lfs/monit
@@ -24,7 +24,7 @@
include Config
-VER        = 5.28.1
+VER        = 5.29.0
THISAPP    = monit-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = monit
-PAK_VER    = 15
+PAK_VER    = 16
DEPS       =
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 832783145cbd523bd6bc2c36e0e5c052
+$(DL_FILE)_MD5 = 8a0546d0d52216b22ebd57acc0bb1e03
install : $(TARGET)
diff --git a/lfs/pcengines-apu-firmware b/lfs/pcengines-apu-firmware
index cf723ff83..0224b028f 100644
--- a/lfs/pcengines-apu-firmware
+++ b/lfs/pcengines-apu-firmware
@@ -24,14 +24,14 @@
include Config
-VER        = 4.14.0.2
+VER        = 4.14.0.4
THISAPP    = pcengines-apu-firmware-$(VER)
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = pcengines-apu-firmware
-PAK_VER    = 8
+PAK_VER    = 9
 SUP_ARCH   = i586 x86_64
DEPS       = firmware-update
@@ -55,12 +55,12 @@ apu4_v$(VER).rom = $(DL_FROM)/apu4_v$(VER).rom
 apu5_v$(VER).rom = $(DL_FROM)/apu5_v$(VER).rom
 apu6_v$(VER).rom = $(DL_FROM)/apu6_v$(VER).rom
-apu1_v$(VER).rom_MD5 = e4d9ae35c2be9bf00c18426be5939eea
-apu2_v$(VER).rom_MD5 = 03441c9c73b19e7f7dac609900ce5ea1
-apu3_v$(VER).rom_MD5 = ad98d3f992ca7bfc8ceb5e3f64f8d7ac
-apu4_v$(VER).rom_MD5 = 1257cc73fe96e131da9d21207f6793ce
-apu5_v$(VER).rom_MD5 = 442c34e47402fbe9c2f9c597f9e88bea
-apu6_v$(VER).rom_MD5 = 958de4c34fecedd38fc95e602f28c627
+apu1_v$(VER).rom_MD5 = e60ce8d903cb1e301aae1160aa8413cd
+apu2_v$(VER).rom_MD5 = 00da67aecd00e7479f0194ccc4ee5739
+apu3_v$(VER).rom_MD5 = 4f935c61fc4274c0b427d16d6aa0049a
+apu4_v$(VER).rom_MD5 = 3aed8f5e1e543a3912c808fe68067dde
+apu5_v$(VER).rom_MD5 = c39dbf45aa630c273fcace35fbc6324e
+apu6_v$(VER).rom_MD5 = b81f9da0f39b355344b602868b2ddcff
install : $(TARGET)
diff --git a/lfs/perl-GD b/lfs/perl-GD
index 0a97c18fa..3df5b18c3 100644
--- a/lfs/perl-GD
+++ b/lfs/perl-GD
@@ -24,7 +24,7 @@
include Config
-VER        = 2.35
+VER        = 2.73
THISAPP    = GD-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = dfc3e16e85a17aab7ee1029fbe307fca
+$(DL_FILE)_MD5 = c2bf1ca56d15e33d2432e4d8ba5aeadf
install : $(TARGET)
diff --git a/lfs/ppp b/lfs/ppp
index cbac95067..73356b8c4 100644
--- a/lfs/ppp
+++ b/lfs/ppp
@@ -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,12 +24,12 @@
include Config
-VER        = 2.4.8
+VER        = 2.4.9
THISAPP    = ppp-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/ppp-$(THISAPP)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
CFLAGS    += -fno-strict-aliasing
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = fa325e90e43975a1bd7e1012c8676123
+$(DL_FILE)_MD5 = f605d021b586fc26e35c6a54fd84b65f
install : $(TARGET)
@@ -73,16 +73,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
    cd $(DIR_APP) && rm -f include/pcap-int.h include/linux/if_pppol2tp.h
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/0003-build-sys-utilize-compiler-flags-handed-to-us-by-rpm.patch
    cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/0012-pppd-we-don-t-want-to-accidentally-leak-fds.patch
    cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/0013-everywhere-O_CLOEXEC-harder.patch
    cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch
    cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/ppp-2.4.6-increase-max-padi-attempts.patch
    cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/ppp-2.4.7-headers_4.9.patch
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/ppp-2.4.8-pppd-fix-bounds-check-in-eap-code.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/ppp-2.4.9-patch-configure-to-handle-cflags-properly.patch
    cd $(DIR_APP) && sed -i -e "s+/etc/ppp/connect-errors+/var/log/connect-errors+" pppd/pathnames.h
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
-	cd $(DIR_APP) && make $(MAKETUNING) CC="gcc" RPM_OPT_FLAGS="$(CFLAGS)"
+	cd $(DIR_APP) && ./configure --prefix=/usr --cc="gcc" --cflags="$(CFLAGS)" --disable-nls
+	cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
    cd $(DIR_APP) && make install-etcppp
    touch /var/log/connect-errors
diff --git a/lfs/shairport-sync b/lfs/shairport-sync
index 6ec986bbe..2f0995480 100644
--- a/lfs/shairport-sync
+++ b/lfs/shairport-sync
@@ -24,7 +24,7 @@
include Config
-VER        = 3.3.7
+VER        = 3.3.8
THISAPP    = shairport-sync-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = shairport-sync
-PAK_VER    = 5
+PAK_VER    = 6
DEPS       = alac alsa avahi libdaemon soxr
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 5f4206ac28e323fda3c150575eb64e15
+$(DL_FILE)_MD5 = b84a05dd6d81ef52b39b02f378e4462b
install : $(TARGET)
diff --git a/lfs/tor b/lfs/tor
index 56280b936..7aaad07d3 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tor
-PAK_VER    = 63
+PAK_VER    = 64
DEPS       = libseccomp
diff --git a/make.sh b/make.sh
index d9e560cf0..86e92ecd7 100755
--- a/make.sh
+++ b/make.sh
@@ -1277,6 +1277,7 @@ buildipfire() {
   lfsmake2 libinih
   lfsmake2 cdrkit
   lfsmake2 dosfstools
+  lfsmake2 exfatprogs
   lfsmake2 reiserfsprogs
   lfsmake2 xfsprogs
   lfsmake2 sysfsutils
@@ -1284,6 +1285,7 @@ buildipfire() {
   lfsmake2 ntfs-3g
   lfsmake2 ethtool
   lfsmake2 fcron
+  lfsmake2 ExtUtils-PkgConfig
   lfsmake2 perl-GD
   lfsmake2 GD-Graph
   lfsmake2 GD-TextUtil
@@ -1903,24 +1905,24 @@ gettoolchain)
    fi
    ;;
 uploadsrc)
-	PWD=`pwd`
    if [ -z $IPFIRE_USER ]; then
    	echo -n "You have to setup IPFIRE_USER first. See .config for details."
    	print_status FAIL
    	exit 1
    fi
-	URL_SOURCE=$(grep URL_SOURCE lfs/Config | awk '{ print $3 }')
-	REMOTE_FILES=$(echo "ls -1" | sftp -C ${IPFIRE_USER}@${URL_SOURCE})
+	URL_SOURCE="$(awk '/^URL_SOURCE/ { print $3 }' lfs/Config)"
+
+	rsync \
+		--recursive \
+		--update \
+		--ignore-existing \
+		--progress \
+		--human-readable \
+		--exclude="toolchains/" \
+		"${BASEDIR}/cache/" \
+		"${IPFIRE_USER}@${URL_SOURCE}"
-	for file in ${BASEDIR}/cache/*; do
-		[ -d "${file}" ] && continue
-		grep -q "$(basename ${file})" <<<$REMOTE_FILES && continue
-		NEW_FILES="$NEW_FILES $file"
-	done
-	[ -n "$NEW_FILES" ] && scp -2 $NEW_FILES ${IPFIRE_USER}@${URL_SOURCE}
-	cd $BASEDIR
-	cd $PWD
    exit 0
    ;;
 lang)
diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red
index ca0a8ae58..56f8ebb66 100644
--- a/src/initscripts/networking/red
+++ b/src/initscripts/networking/red
@@ -410,7 +410,7 @@ case "${1}" in
    		### Standard PPP options we always use
    		#
    		PPP_STD_OPTIONS="$PLUGOPTS usepeerdns defaultroute noipdefault noauth"
-			PPP_STD_OPTIONS+=" default-asyncmap hide-password nodetach"
+			PPP_STD_OPTIONS+=" default-asyncmap hide-password nodetach noipv6"
    		PPP_STD_OPTIONS+=" noaccomp nodeflate nopcomp novj novjccomp"
    		PPP_STD_OPTIONS+=" nobsdcomp user ${USERNAME} lcp-echo-interval 20"
    		PPP_STD_OPTIONS+=" lcp-echo-failure 5 ${AUTH}"
diff --git a/src/paks/minidlna/install.sh b/src/paks/minidlna/install.sh
index 5080157cd..397d3b193 100644
--- a/src/paks/minidlna/install.sh
+++ b/src/paks/minidlna/install.sh
@@ -25,6 +25,7 @@
 extract_files
 [ -d /var/mp3 ] ||  ( mkdir /var/mp3 && chown nobody.nobody /var/mp3 )
+restore_backup ${NAME}
 start_service ${NAME}
ln -svf ../init.d/minidlna /etc/rc.d/rc0.d/K00minidlna
diff --git a/src/paks/minidlna/uninstall.sh b/src/paks/minidlna/uninstall.sh
index bc5983843..8c8f28e47 100644
--- a/src/paks/minidlna/uninstall.sh
+++ b/src/paks/minidlna/uninstall.sh
@@ -23,5 +23,6 @@
 #
 . /opt/pakfire/lib/functions.sh
 stop_service ${NAME}
+make_backup ${NAME}
 remove_files
 rm -rf /etc/rc.d/rc*.d/*minidlna
diff --git a/src/patches/logwatch/logwatch-7.5.5-enable-mdadm-sudo.patch b/src/patches/logwatch/logwatch-7.5.5-enable-mdadm-sudo.patch
new file mode 100644
index 000000000..b7034077b
--- /dev/null
+++ b/src/patches/logwatch/logwatch-7.5.5-enable-mdadm-sudo.patch
@@ -0,0 +1,46 @@
+diff -Naur logwatch-7.5.5-orig/conf/services/mdadm.conf logwatch-7.5.5/conf/services/mdadm.conf
+--- logwatch-7.5.5-orig/conf/services/mdadm.conf	2021-01-22 21:59:40.000000000 +0100
++++ logwatch-7.5.5/conf/services/mdadm.conf	2021-10-04 13:52:30.850057355 +0200
+@@ -13,7 +13,7 @@
+ # Logwatch will try to find md devices in /etc/mdadm.conf or 
+ # /etc/mdadm/mdadm.conf. If none of these files exist it can scan actively
+ # for md devices. Set to 'Yes' to enable active scanning:
+-$mdadm_enable_scan = No
++$mdadm_enable_scan = Yes
+ 
+ # Logwatch will emit an error for md devices listed in /etc/mdadm.conf
+ # that are not present.  If you do not want this (e.g. raid devices may come
+diff -Naur logwatch-7.5.5-orig/scripts/services/mdadm logwatch-7.5.5/scripts/services/mdadm
+--- logwatch-7.5.5-orig/scripts/services/mdadm	2021-01-22 21:59:40.000000000 +0100
++++ logwatch-7.5.5/scripts/services/mdadm	2021-10-06 11:41:14.800307603 +0200
+@@ -35,7 +35,7 @@
+ } elsif ( -f "/etc/mdadm/mdadm.conf" ) {
+   open(MDADM,"< /etc/mdadm/mdadm.conf");
+ } elsif ($enable_scan) {
+-  open(MDADM,"mdadm --detail --scan 2>/dev/null|");
++  open(MDADM,"sudo mdadm --detail --scan 2>/dev/null|");
+ }
+ while (<MDADM>) {
+   if (/^ARRAY/) {
+@@ -51,7 +51,7 @@
+     next;
+   }
+ 
+-  open(MDADM,"mdadm --misc --detail $dev 2>&1 |");
++  open(MDADM,"sudo mdadm --misc --detail $dev 2>&1 |");
+   while (<MDADM>) {
+     if ($_ =~ /cannot open .*: No such file or directory/) {
+       print $_ unless $ignore_missing;
+@@ -74,7 +74,11 @@
+ 
+   if ($Detail <= 4) {
+     if (lc($mdhash{'state'}) =~ /clean|active/) {
+-      print "$dev : $mdhash{'state'}\n" if $Detail;
++      if (lc($mdhash{'state'}) =~ /degraded/) {
++        print "$dev : $mdhash{'state'}\n";
++      } else {
++        print "$dev : $mdhash{'state'}\n" if $Detail;
++      }
+     } else {
+       print "$dev : $mdhash{'state'}\n";
+       if (defined($mdhash{'middle devices'})) {
diff --git a/src/patches/ppp/0003-build-sys-utilize-compiler-flags-handed-to-us-by-rpm.patch b/src/patches/ppp/0003-build-sys-utilize-compiler-flags-handed-to-us-by-rpm.patch
deleted file mode 100644
index 4a43d444a..000000000
--- a/src/patches/ppp/0003-build-sys-utilize-compiler-flags-handed-to-us-by-rpm.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From d729b06f0ac7a5ebd3648ef60bef0499b59bf82d Mon Sep 17 00:00:00 2001
-From: Michal Sekletar msekleta@redhat.com
-Date: Fri, 4 Apr 2014 11:29:39 +0200
-Subject: [PATCH 03/25] build-sys: utilize compiler flags handed to us by
- rpmbuild
-
----
- chat/Makefile.linux                  | 2 +-
- pppd/Makefile.linux                  | 3 +--
- pppd/plugins/Makefile.linux          | 2 +-
- pppd/plugins/pppoatm/Makefile.linux  | 2 +-
- pppd/plugins/radius/Makefile.linux   | 2 +-
- pppd/plugins/rp-pppoe/Makefile.linux | 2 +-
- pppdump/Makefile.linux               | 2 +-
- pppstats/Makefile.linux              | 2 +-
- 8 files changed, 8 insertions(+), 9 deletions(-)
-
-diff --git a/chat/Makefile.linux b/chat/Makefile.linux
-index 1065ac5..848cd8d 100644
---- a/chat/Makefile.linux
-+++ b/chat/Makefile.linux
-@@ -10,7 +10,7 @@ CDEF3=	-UNO_SLEEP			# Use the usleep function
- CDEF4=	-DFNDELAY=O_NDELAY		# Old name value
- CDEFS=	$(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
- 
--COPTS=	-O2 -g -pipe
-+COPTS=	$(RPM_OPT_FLAGS)
- CFLAGS=	$(COPTS) $(CDEFS)
- 
- INSTALL= install
-diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
-index 5a44d30..63872eb 100644
---- a/pppd/Makefile.linux
-+++ b/pppd/Makefile.linux
-@@ -32,8 +32,7 @@ endif
- 
- CC = gcc
- #
--COPTS = -O2 -pipe -Wall -g
--LIBS =
-+COPTS = -Wall $(RPM_OPT_FLAGS)
- 
- # Uncomment the next 2 lines to include support for Microsoft's
- # MS-CHAP authentication protocol.  Also, edit plugins/radius/Makefile.linux.
-diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
-index 0a7ec7b..e09a369 100644
---- a/pppd/plugins/Makefile.linux
-+++ b/pppd/plugins/Makefile.linux
-@@ -1,5 +1,5 @@
- #CC	= gcc
--COPTS	= -O2 -g
-+COPTS	= $(RPM_OPT_FLAGS)
- CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
- LDFLAGS	= -shared
- INSTALL	= install
-diff --git a/pppd/plugins/pppoatm/Makefile.linux b/pppd/plugins/pppoatm/Makefile.linux
-index 20f62e6..5a81447 100644
---- a/pppd/plugins/pppoatm/Makefile.linux
-+++ b/pppd/plugins/pppoatm/Makefile.linux
-@@ -1,5 +1,5 @@
- #CC	= gcc
--COPTS	= -O2 -g
-+COPTS	= $(RPM_OPT_FLAGS)
- CFLAGS	= $(COPTS) -I../.. -I../../../include -fPIC
- LDFLAGS	= -shared
- INSTALL	= install
-diff --git a/pppd/plugins/radius/Makefile.linux b/pppd/plugins/radius/Makefile.linux
-index 24ed3e5..45b3b8d 100644
---- a/pppd/plugins/radius/Makefile.linux
-+++ b/pppd/plugins/radius/Makefile.linux
-@@ -12,7 +12,7 @@ VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
- INSTALL	= install
- 
- PLUGIN=radius.so radattr.so radrealms.so
--CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
-+CFLAGS=-I. -I../.. -I../../../include $(RPM_OPT_FLAGS) -DRC_LOG_FACILITY=LOG_DAEMON
- 
- # Uncomment the next line to include support for Microsoft's
- # MS-CHAP authentication protocol.
-diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
-index 5d7a271..352991a 100644
---- a/pppd/plugins/rp-pppoe/Makefile.linux
-+++ b/pppd/plugins/rp-pppoe/Makefile.linux
-@@ -25,7 +25,7 @@ INSTALL	= install
- # Version is set ONLY IN THE MAKEFILE!  Don't delete this!
- RP_VERSION=3.8p
- 
--COPTS=-O2 -g
-+COPTS=$(RPM_OPT_FLAGS)
- CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
- all: rp-pppoe.so pppoe-discovery
- 
-diff --git a/pppdump/Makefile.linux b/pppdump/Makefile.linux
-index ac028f6..d0a5032 100644
---- a/pppdump/Makefile.linux
-+++ b/pppdump/Makefile.linux
-@@ -2,7 +2,7 @@ DESTDIR = $(INSTROOT)@DESTDIR@
- BINDIR = $(DESTDIR)/sbin
- MANDIR = $(DESTDIR)/share/man/man8
- 
--CFLAGS= -O -I../include/net
-+CFLAGS= $(RPM_OPT_FLAGS) -I../include/net
- OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
- 
- INSTALL= install
-diff --git a/pppstats/Makefile.linux b/pppstats/Makefile.linux
-index cca6f0f..42aba73 100644
---- a/pppstats/Makefile.linux
-+++ b/pppstats/Makefile.linux
-@@ -10,7 +10,7 @@ PPPSTATSRCS = pppstats.c
- PPPSTATOBJS = pppstats.o
- 
- #CC = gcc
--COPTS = -O
-+COPTS = $(RPM_OPT_FLAGS)
- COMPILE_FLAGS = -I../include
- LIBS =
- 
--- 
-1.8.3.1
-
diff --git a/src/patches/ppp/0013-everywhere-O_CLOEXEC-harder.patch b/src/patches/ppp/0013-everywhere-O_CLOEXEC-harder.patch
index 2513021b2..0fb028779 100644
--- a/src/patches/ppp/0013-everywhere-O_CLOEXEC-harder.patch
+++ b/src/patches/ppp/0013-everywhere-O_CLOEXEC-harder.patch
@@ -27,10 +27,10 @@ index 6ea6c1f..faced53 100644
    free(path);
    errno = err;
 diff --git a/pppd/main.c b/pppd/main.c
-index 6d50d1b..4880377 100644
+index 87a5d29..152e4a2 100644
 --- a/pppd/main.c
 +++ b/pppd/main.c
-@@ -420,7 +420,7 @@ main(argc, argv)
+@@ -400,7 +400,7 @@ main(int argc, char *argv[])
    die(0);
/* Make sure fds 0, 1, 2 are open to somewhere. */
@@ -39,12 +39,12 @@ index 6d50d1b..4880377 100644
      if (fd_devnull < 0)
    fatal("Couldn't open %s: %m", _PATH_DEVNULL);
      while (fd_devnull <= 2) {
-@@ -1679,7 +1679,7 @@ device_script(program, in, out, dont_wait)
+@@ -1642,7 +1642,7 @@ device_script(char *program, int in, int out, int dont_wait)
      if (log_to_fd >= 0)
    errfd = log_to_fd;
      else
--	errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT, 0600);
-+	errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC, 0600);
+-	errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT, 0644);
++	errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC, 0644);
++conn_running;
      pid = safe_fork(in, out, errfd);
diff --git a/src/patches/ppp/0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch b/src/patches/ppp/0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch
index 3475f09a8..fffda981d 100644
--- a/src/patches/ppp/0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch
+++ b/src/patches/ppp/0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch
@@ -7,9 +7,9 @@ Subject: [PATCH 14/25] everywhere: use SOCK_CLOEXEC when creating socket
  pppd/plugins/pppoatm/pppoatm.c          |  2 +-
  pppd/plugins/pppol2tp/openl2tp.c        |  2 +-
  pppd/plugins/pppol2tp/pppol2tp.c        |  2 +-
- pppd/plugins/rp-pppoe/if.c              |  2 +-
- pppd/plugins/rp-pppoe/plugin.c          |  6 +++---
- pppd/plugins/rp-pppoe/pppoe-discovery.c |  2 +-
+ pppd/plugins/pppoe/if.c                 |  2 +-
+ pppd/plugins/pppoe/plugin.c             |  6 +++---
+ pppd/plugins/pppoe/pppoe-discovery.c    |  2 +-
  pppd/sys-linux.c                        | 10 +++++-----
  pppd/tty.c                              |  2 +-
  8 files changed, 14 insertions(+), 14 deletions(-)
@@ -53,10 +53,10 @@ index a7e3400..e64a778 100644
    	if (fd >= 0) {
    		memset (&ifr, '\0', sizeof (ifr));
    		strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
-diff --git a/pppd/plugins/rp-pppoe/if.c b/pppd/plugins/rp-pppoe/if.c
+diff --git a/pppd/plugins/pppoe/if.c b/pppd/plugins/pppoe/if.c
 index 91e9a57..72aba41 100644
---- a/pppd/plugins/rp-pppoe/if.c
-+++ b/pppd/plugins/rp-pppoe/if.c
+--- a/pppd/plugins/pppoe/if.c
++++ b/pppd/plugins/pppoe/if.c
 @@ -116,7 +116,7 @@ openInterface(char const *ifname, UINT16_t type, unsigned char *hwaddr)
      stype = SOCK_PACKET;
  #endif
@@ -66,10 +66,10 @@ index 91e9a57..72aba41 100644
    /* Give a more helpful message for the common error case */
    if (errno == EPERM) {
        fatal("Cannot create raw socket -- pppoe must be run as root.");
-diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c
+diff --git a/pppd/plugins/pppoe/plugin.c b/pppd/plugins/pppoe/plugin.c
 index a8c2bb4..24bdf8f 100644
---- a/pppd/plugins/rp-pppoe/plugin.c
-+++ b/pppd/plugins/rp-pppoe/plugin.c
+--- a/pppd/plugins/pppoe/plugin.c
++++ b/pppd/plugins/pppoe/plugin.c
 @@ -137,7 +137,7 @@ PPPOEConnectDevice(void)
      /* server equipment).                                                  */
      /* Opening this socket just before waitForPADS in the discovery()      */
@@ -97,10 +97,10 @@ index a8c2bb4..24bdf8f 100644
    r = 0;
      }
-diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.c b/pppd/plugins/rp-pppoe/pppoe-discovery.c
+diff --git a/pppd/plugins/pppoe/pppoe-discovery.c b/pppd/plugins/pppoe/pppoe-discovery.c
 index 3d3bf4e..c0d927d 100644
---- a/pppd/plugins/rp-pppoe/pppoe-discovery.c
-+++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c
+--- a/pppd/plugins/pppoe/pppoe-discovery.c
++++ b/pppd/plugins/pppoe/pppoe-discovery.c
 @@ -121,7 +121,7 @@ openInterface(char const *ifname, UINT16_t type, unsigned char *hwaddr)
      stype = SOCK_PACKET;
  #endif
@@ -147,15 +147,6 @@ index 00a2cf5..0690019 100644
      if (s < 0)
    return 0;
-@@ -2860,7 +2860,7 @@ ether_to_eui64(eui64_t *p_eui64)
-     int skfd;
-     const unsigned char *ptr;
- 
--    skfd = socket(PF_INET6, SOCK_DGRAM, 0);
-+    skfd = socket(PF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0);
-     if(skfd == -1)
-     {
-         warn("could not open IPv6 socket");
 diff --git a/pppd/tty.c b/pppd/tty.c
 index bc96695..8e76a5d 100644
 --- a/pppd/tty.c
diff --git a/src/patches/ppp/ppp-2.4.6-increase-max-padi-attempts.patch b/src/patches/ppp/ppp-2.4.6-increase-max-padi-attempts.patch
index 5127c1f10..1b36e8369 100644
--- a/src/patches/ppp/ppp-2.4.6-increase-max-padi-attempts.patch
+++ b/src/patches/ppp/ppp-2.4.6-increase-max-padi-attempts.patch
@@ -1,7 +1,7 @@
-diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h
+diff --git a/pppd/plugins/pppoe/pppoe.h b/pppd/plugins/pppoe/pppoe.h
 index 9ab2eee..86762bd 100644
---- a/pppd/plugins/rp-pppoe/pppoe.h
-+++ b/pppd/plugins/rp-pppoe/pppoe.h
+--- a/pppd/plugins/pppoe/pppoe.h
++++ b/pppd/plugins/pppoe/pppoe.h
 @@ -148,7 +148,7 @@ extern UINT16_t Eth_PPPOE_Session;
  #define STATE_TERMINATED    4
diff --git a/src/patches/ppp/ppp-2.4.7-headers_4.9.patch b/src/patches/ppp/ppp-2.4.7-headers_4.9.patch
index 633eb045a..686db9204 100644
--- a/src/patches/ppp/ppp-2.4.7-headers_4.9.patch
+++ b/src/patches/ppp/ppp-2.4.7-headers_4.9.patch
@@ -1,6 +1,6 @@
-diff -Naur ppp-2.4.7.org/pppd/plugins/rp-pppoe/plugin.c ppp-2.4.7/pppd/plugins/rp-pppoe/plugin.c
---- ppp-2.4.7.org/pppd/plugins/rp-pppoe/plugin.c	2014-08-09 14:31:39.000000000 +0200
-+++ ppp-2.4.7/pppd/plugins/rp-pppoe/plugin.c	2017-02-09 08:45:12.567493723 +0100
+diff -Naur ppp-2.4.7.org/pppd/plugins/pppoe/plugin.c ppp-2.4.7/pppd/plugins/pppoe/plugin.c
+--- ppp-2.4.7.org/pppd/plugins/pppoe/plugin.c	2014-08-09 14:31:39.000000000 +0200
++++ ppp-2.4.7/pppd/plugins/pppoe/plugin.c	2017-02-09 08:45:12.567493723 +0100
 @@ -49,6 +49,8 @@
  #include <net/ethernet.h>
  #include <net/if_arp.h>
diff --git a/src/patches/ppp/ppp-2.4.8-pppd-fix-bounds-check-in-eap-code.patch b/src/patches/ppp/ppp-2.4.8-pppd-fix-bounds-check-in-eap-code.patch
deleted file mode 100644
index 858769f48..000000000
--- a/src/patches/ppp/ppp-2.4.8-pppd-fix-bounds-check-in-eap-code.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 8d7970b8f3db727fe798b65f3377fe6787575426
-Author: Paul Mackerras paulus@ozlabs.org
-Date:   Mon Feb 3 15:53:28 2020 +1100
-
-    pppd: Fix bounds check in EAP code
-    
-    Given that we have just checked vallen < len, it can never be the case
-    that vallen >= len + sizeof(rhostname).  This fixes the check so we
-    actually avoid overflowing the rhostname array.
-    
-    Reported-by: Ilja Van Sprundel ivansprundel@ioactive.com
-    Signed-off-by: Paul Mackerras paulus@ozlabs.org
-
-diff --git a/pppd/eap.c b/pppd/eap.c
-index 94407f5..1b93db0 100644
---- a/pppd/eap.c
-+++ b/pppd/eap.c
-@@ -1420,7 +1420,7 @@ int len;
- 		}
- 
- 		/* Not so likely to happen. */
--		if (vallen >= len + sizeof (rhostname)) {
-+		if (len - vallen >= sizeof (rhostname)) {
- 			dbglog("EAP: trimming really long peer name down");
- 			BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1);
- 			rhostname[sizeof (rhostname) - 1] = '\0';
-@@ -1846,7 +1846,7 @@ int len;
- 		}
- 
- 		/* Not so likely to happen. */
--		if (vallen >= len + sizeof (rhostname)) {
-+		if (len - vallen >= sizeof (rhostname)) {
- 			dbglog("EAP: trimming really long peer name down");
- 			BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1);
- 			rhostname[sizeof (rhostname) - 1] = '\0';
diff --git a/src/patches/ppp/ppp-2.4.9-patch-configure-to-handle-cflags-properly.patch b/src/patches/ppp/ppp-2.4.9-patch-configure-to-handle-cflags-properly.patch
new file mode 100644
index 000000000..b36ace192
--- /dev/null
+++ b/src/patches/ppp/ppp-2.4.9-patch-configure-to-handle-cflags-properly.patch
@@ -0,0 +1,15 @@
+--- ppp-2.4.9.orig/configure	2021-03-30 21:38:27.415735914 +0200
++++ ppp-2.4.9/configure	2021-04-01 19:10:48.632314447 +0200
+@@ -121,9 +121,9 @@
+     rm -f $2
+     if [ -f $1 ]; then
+ 	echo "  $2 <= $1"
+-	sed -e "s,@DESTDIR@,$DESTDIR,g" -e "s,@SYSCONF@,$SYSCONF,g" \
+-	    -e "s,@CROSS_COMPILE@,$CROSS_COMPILE,g" -e "s,@CC@,$CC,g" \
+-	    -e "s,@CFLAGS@,$CFLAGS,g" $1 >$2
++	sed -e "s#@DESTDIR@#$DESTDIR#g" -e "s#@SYSCONF@#$SYSCONF#g" \
++	    -e "s#@CROSS_COMPILE@#$CROSS_COMPILE#g" -e "s#@CC@#$CC#g" \
++	    -e "s#@CFLAGS@#$CFLAGS#g" $1 >$2
+     fi
+ }
+
hooks/post-receive
--
IPFire 2.x development tree

    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 01141196f6789e14c9d57e673cfeac63b9e348f5