Merge branch 'next' into master

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2026-04-18 23:12:59 +02:00 · 2020-12-03 12:55:36 +00:00
parent 31cbb589d9 e1253a4d34
commit 4e5a35c123
197 changed files with 14066 additions and 2297 deletions
--- a/config/amavisd/amavisd.conf
+++ b/config/amavisd/amavisd.conf
@@ -1,438 +0,0 @@
-use strict;
-
-# a minimalistic configuration file for amavisd-new with all necessary settings
-#
-#   see amavisd.conf-default for a list of all variables with their defaults;
-#   see amavisd.conf-sample for a traditional-style commented file;
-#   for more details see documentation in INSTALL, README_FILES/*
-#   and at http://www.ijs.si/software/amavisd/amavisd-new-docs.html
-
-
-# COMMONLY ADJUSTED SETTINGS:
-
-# @bypass_virus_checks_maps = (1);  # controls running of anti-virus code
-# @bypass_spam_checks_maps  = (1);  # controls running of anti-spam code
-# $bypass_decode_parts = 1;         # controls running of decoders&dearchivers
-
-$max_servers = 2;            # num of pre-forked children (2..15 is common), -m
-$daemon_user  = 'amavis';    # (no default;  customary: vscan or amavis), -u
-$daemon_group = 'amavis';    # (no default;  customary: vscan or amavis), -g
-
-$mydomain = 'ipfire.org';   # a convenient default for other settings
-
-# $MYHOME = '/var/amavis';   # a convenient default for other settings, -H
-$TEMPBASE = "$MYHOME/tmp";   # working directory, needs to exist, -T
-$ENV{TMPDIR} = $TEMPBASE;    # environment variable TMPDIR, used by SA, etc.
-$QUARANTINEDIR = '/var/virusmails';  # -Q
-# $quarantine_subdir_levels = 1;  # add level of subdirs to disperse quarantine
-
-# $daemon_chroot_dir = $MYHOME;   # chroot directory or undef, -R
-
-# $db_home   = "$MYHOME/db";      # dir for bdb nanny/cache/snmp databases, -D
-# $helpers_home = "$MYHOME/var";  # working directory for SpamAssassin, -S
-# $lock_file = "$MYHOME/var/amavisd.lock";  # -L
-# $pid_file  = "$MYHOME/var/amavisd.pid";   # -P
-#NOTE: create directories $MYHOME/tmp, $MYHOME/var, $MYHOME/db manually
-
-$log_level = 2;              # verbosity 0..5, -d
-$log_recip_templ = undef;    # disable by-recipient level-0 log entries
-$DO_SYSLOG = 1;              # log via syslogd (preferred)
-$syslog_facility = 'mail';   # Syslog facility as a string
-           # e.g.: mail, daemon, user, local0, ... local7
-$syslog_priority = 'debug';  # Syslog base (minimal) priority as a string,
-           # choose from: emerg, alert, crit, err, warning, notice, info, debug
-
-$enable_db = 1;              # enable use of BerkeleyDB/libdb (SNMP and nanny)
-$enable_global_cache = 1;    # enable use of libdb-based cache if $enable_db=1
-$nanny_details_level = 2;    # nanny verbosity: 1: traditional, 2: detailed
-
-@local_domains_maps = ( [".$mydomain"] );  # list of all local domains
-
-@mynetworks = qw( 127.0.0.0/8 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 );
-
-$unix_socketname = "$MYHOME/amavisd.sock";  # amavisd-release or amavis-milter
-               # option(s) -p overrides $inet_socket_port and $unix_socketname
-
-$inet_socket_port = 10024;   # listen on this local TCP port(s)
-# $inet_socket_port = [10024,10026];  # listen on multiple TCP ports
-
-$policy_bank{'MYNETS'} = {   # mail originating from @mynetworks
-  originating => 1,  # is true in MYNETS by default, but let's make it explicit
-  os_fingerprint_method => undef,  # don't query p0f for internal clients
-};
-
-# it is up to MTA to re-route mail from authenticated roaming users or
-# from internal hosts to a dedicated TCP port (such as 10026) for filtering
-$interface_policy{'10026'} = 'ORIGINATING';
-
-$policy_bank{'ORIGINATING'} = {  # mail supposedly originating from our users
-  originating => 1,  # declare that mail was submitted by our smtp client
-  allow_disclaimers => 1,  # enables disclaimer insertion if available
-  # notify administrator of locally originating malware
-  virus_admin_maps => ["virusalert\@$mydomain"],
-  spam_admin_maps  => ["spamalert\@$mydomain"],
-  warnbadhsender   => 1,
-  # forward to a smtpd service providing DKIM signing service
-  forward_method => 'smtp:[127.0.0.1]:10027',
-  # force MTA conversion to 7-bit (e.g. before DKIM signing)
-  smtpd_discard_ehlo_keywords => ['8BITMIME'],
-  bypass_banned_checks_maps => [1],  # allow sending any file names and types
-  terminate_dsn_on_notify_success => 0,  # don't remove NOTIFY=SUCCESS option 
-};
-
-$interface_policy{'SOCK'} = 'AM.PDP-SOCK'; # only applies with $unix_socketname
-
-# Use with amavis-release over a socket or with Petr Rehor's amavis-milter.c
-# (with amavis-milter.c from this package or old amavis.c client use 'AM.CL'):
-$policy_bank{'AM.PDP-SOCK'} = {
-  protocol => 'AM.PDP',
-  auth_required_release => 0,  # do not require secret_id for amavisd-release
-};
-
-$sa_tag_level_deflt  = 2.0;  # add spam info headers if at, or above that level
-$sa_tag2_level_deflt = 6.2;  # add 'spam detected' headers at that level
-$sa_kill_level_deflt = 6.9;  # triggers spam evasive actions (e.g. blocks mail)
-$sa_dsn_cutoff_level = 10;   # spam level beyond which a DSN is not sent
-# $sa_quarantine_cutoff_level = 25; # spam level beyond which quarantine is off
-$penpals_bonus_score = 8;    # (no effect without a @storage_sql_dsn database)
-$penpals_threshold_high = $sa_kill_level_deflt;  # don't waste time on hi spam
-
-$sa_mail_body_size_limit = 400*1024; # don't waste time on SA if mail is larger
-$sa_local_tests_only = 0;    # only tests which do not require internet access?
-
-$virus_admin               = "virusalert\@$mydomain";  # notifications recip.
-
-$mailfrom_notify_admin     = "virusalert\@$mydomain";  # notifications sender
-$mailfrom_notify_recip     = "virusalert\@$mydomain";  # notifications sender
-$mailfrom_notify_spamadmin = "spam.police\@$mydomain"; # notifications sender
-$mailfrom_to_quarantine = ''; # null return path; uses original sender if undef
-
-@addr_extension_virus_maps      = ('virus');
-@addr_extension_banned_maps     = ('banned');
-@addr_extension_spam_maps       = ('spam');
-@addr_extension_bad_header_maps = ('badh');
-# $recipient_delimiter = '+';  # undef disables address extensions altogether
-# when enabling addr extensions do also Postfix/main.cf: recipient_delimiter=+
-
-$path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin';
-# $dspam = 'dspam';
-
-$MAXLEVELS = 14;
-$MAXFILES = 1500;
-$MIN_EXPANSION_QUOTA =      100*1024;  # bytes  (default undef, not enforced)
-$MAX_EXPANSION_QUOTA = 300*1024*1024;  # bytes  (default undef, not enforced)
-
-$sa_spam_subject_tag = '***SPAM*** ';
-$defang_virus  = 1;  # MIME-wrap passed infected mail
-$defang_banned = 1;  # MIME-wrap passed mail containing banned name
-# for defanging bad headers only turn on certain minor contents categories:
-$defang_by_ccat{+CC_BADH.",3"} = 1;  # NUL or CR character in header
-$defang_by_ccat{+CC_BADH.",5"} = 1;  # header line longer than 998 characters
-$defang_by_ccat{+CC_BADH.",6"} = 1;  # header field syntax error
-
-
-# OTHER MORE COMMON SETTINGS (defaults may suffice):
-
-$myhostname = 'ipfire.localdomain';  # must be a fully-qualified domain name!
-
-# $notify_method  = 'smtp:[127.0.0.1]:10025';
-# $forward_method = 'smtp:[127.0.0.1]:10025';  # set to undef with milter!
-
-$final_virus_destiny      = D_DISCARD;
-$final_banned_destiny     = D_BOUNCE;
-$final_spam_destiny       = D_DISCARD;
-$final_bad_header_destiny = D_PASS;
-
-
-# Notify virus sender?  Bloß nicht!
-$warnvirussender = 0; 
-# Notify spam sender?   Bloß nicht!
-$warnspamsender = 0;  
-# Notify sender of banned files?  Kann man machen.
-$warnbannedsender = 1;
-# Notify sender of syntactically invalid header containing non-ASCII characters? Bloß nicht!
-#$warnbadsender = 0;
-# Notify virus (or banned files) RECIPIENT? Wie man möchte, ich finde es sinnvoll.
-$warnvirusrecip = 1;
-$warnbannedrecip = 1;
-$warnbadhrecip = 1;
-
-# SOME OTHER VARIABLES WORTH CONSIDERING (see amavisd.conf-default for all)
-
-# $warnbadhsender,
-# $warnvirusrecip, $warnbannedrecip, $warnbadhrecip, (or @warn*recip_maps)
-#
-# @bypass_virus_checks_maps, @bypass_spam_checks_maps,
-# @bypass_banned_checks_maps, @bypass_header_checks_maps,
-#
-# @virus_lovers_maps, @spam_lovers_maps,
-# @banned_files_lovers_maps, @bad_header_lovers_maps,
-#
-# @blacklist_sender_maps, @score_sender_maps,
-#
-# $clean_quarantine_method, $virus_quarantine_to, $banned_quarantine_to,
-# $bad_header_quarantine_to, $spam_quarantine_to,
-#
-# $defang_bad_header, $defang_undecipherable, $defang_spam
-
-
-# REMAINING IMPORTANT VARIABLES ARE LISTED HERE BECAUSE OF LONGER ASSIGNMENTS
-
-@keep_decoded_original_maps = (new_RE(
-# qr'^MAIL$',   # retain full original message for virus checking (can be slow)
-  qr'^MAIL-UNDECIPHERABLE$', # recheck full mail if it contains undecipherables
-  qr'^(ASCII(?! cpio)|text|uuencoded|xxencoded|binhex)'i,
-# qr'^Zip archive data',     # don't trust Archive::Zip
-));
-
-
-# for $banned_namepath_re (a new-style of banned table) see amavisd.conf-sample
-
-$banned_filename_re = new_RE(
-
-### BLOCKED ANYWHERE
-# qr'^UNDECIPHERABLE$',  # is or contains any undecipherable components
-  qr'^\.(exe-ms|dll)$',                   # banned file(1) types, rudimentary
-# qr'^\.(exe|lha|tnef|cab|dll)$',         # banned file(1) types
-
-### BLOCK THE FOLLOWING, EXCEPT WITHIN UNIX ARCHIVES:
-# [ qr'^\.(gz|bz2)$'             => 0 ],  # allow any in gzip or bzip2
-  [ qr'^\.(rpm|cpio|tar)$'       => 0 ],  # allow any in Unix-type archives
-
-  qr'.\.(pif|scr)$'i,                     # banned extensions - rudimentary
-# qr'^\.zip$',                            # block zip type
-
-### BLOCK THE FOLLOWING, EXCEPT WITHIN ARCHIVES:
-# [ qr'^\.(zip|rar|arc|arj|zoo)$'=> 0 ],  # allow any within these archives
-
-  qr'^application/x-msdownload$'i,        # block these MIME types
-  qr'^application/x-msdos-program$'i,
-  qr'^application/hta$'i,
-
-# qr'^message/partial$'i,         # rfc2046 MIME type
-# qr'^message/external-body$'i,   # rfc2046 MIME type
-
-# qr'^(application/x-msmetafile|image/x-wmf)$'i,  # Windows Metafile MIME type
-# qr'^\.wmf$',                            # Windows Metafile file(1) type
-
-  # block certain double extensions in filenames
-  qr'\.[^./]*[A-Za-z][^./]*\.\s*(exe|vbs|pif|scr|bat|cmd|com|cpl|dll)[.\s]*$'i,
-
-# qr'\{[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}\}?'i, # Class ID CLSID, strict
-# qr'\{[0-9a-z]{4,}(-[0-9a-z]{4,}){0,7}\}?'i, # Class ID extension CLSID, loose
-
-  qr'.\.(exe|vbs|pif|scr|cpl)$'i,             # banned extension - basic
-# qr'.\.(exe|vbs|pif|scr|cpl|bat|cmd|com)$'i, # banned extension - basic+cmd
-# qr'.\.(ade|adp|app|bas|bat|chm|cmd|com|cpl|crt|emf|exe|fxp|grp|hlp|hta|
-#        inf|ins|isp|js|jse|lnk|mda|mdb|mde|mdw|mdt|mdz|msc|msi|msp|mst|
-#        ops|pcd|pif|prg|reg|scr|sct|shb|shs|vb|vbe|vbs|
-#        wmf|wsc|wsf|wsh)$'ix,  # banned ext - long
-# qr'.\.(ani|cur|ico)$'i,                 # banned cursors and icons filename
-# qr'^\.ani$',                            # banned animated cursor file(1) type
-
-# qr'.\.(mim|b64|bhx|hqx|xxe|uu|uue)$'i,  # banned extension - WinZip vulnerab.
-);
-# See http://support.microsoft.com/default.aspx?scid=kb;EN-US;q262631
-# and http://www.cknow.com/vtutor/vtextensions.htm
-
-
-# ENVELOPE SENDER SOFT-WHITELISTING / SOFT-BLACKLISTING
-
-@score_sender_maps = ({ # a by-recipient hash lookup table,
-                        # results from all matching recipient tables are summed
-
-# ## per-recipient personal tables  (NOTE: positive: black, negative: white)
-# 'user1@example.com'  => [{'bla-mobile.press@example.com' => 10.0}],
-# 'user3@example.com'  => [{'.ebay.com'                 => -3.0}],
-# 'user4@example.com'  => [{'cleargreen@cleargreen.com' => -7.0,
-#                           '.cleargreen.com'           => -5.0}],
-
-  ## site-wide opinions about senders (the '.' matches any recipient)
-  '.' => [  # the _first_ matching sender determines the score boost
-
-   new_RE(  # regexp-type lookup table, just happens to be all soft-blacklist
-    [qr'^(bulkmail|offers|cheapbenefits|earnmoney|foryou)@'i         => 5.0],
-    [qr'^(greatcasino|investments|lose_weight_today|market\.alert)@'i=> 5.0],
-    [qr'^(money2you|MyGreenCard|new\.tld\.registry|opt-out|opt-in)@'i=> 5.0],
-    [qr'^(optin|saveonlsmoking2002k|specialoffer|specialoffers)@'i   => 5.0],
-    [qr'^(stockalert|stopsnoring|wantsome|workathome|yesitsfree)@'i  => 5.0],
-    [qr'^(your_friend|greatoffers)@'i                                => 5.0],
-    [qr'^(inkjetplanet|marketopt|MakeMoney)\d*@'i                    => 5.0],
-   ),
-
-#  read_hash("/var/amavis/sender_scores_sitewide"),
-
-   { # a hash-type lookup table (associative array)
-     'nobody@cert.org'                        => -3.0,
-     'cert-advisory@us-cert.gov'              => -3.0,
-     'owner-alert@iss.net'                    => -3.0,
-     'slashdot@slashdot.org'                  => -3.0,
-     'securityfocus.com'                      => -3.0,
-     'ntbugtraq@listserv.ntbugtraq.com'       => -3.0,
-     'security-alerts@linuxsecurity.com'      => -3.0,
-     'mailman-announce-admin@python.org'      => -3.0,
-     'amavis-user-admin@lists.sourceforge.net'=> -3.0,
-     'amavis-user-bounces@lists.sourceforge.net' => -3.0,
-     'spamassassin.apache.org'                => -3.0,
-     'notification-return@lists.sophos.com'   => -3.0,
-     'owner-postfix-users@postfix.org'        => -3.0,
-     'owner-postfix-announce@postfix.org'     => -3.0,
-     'owner-sendmail-announce@lists.sendmail.org'   => -3.0,
-     'sendmail-announce-request@lists.sendmail.org' => -3.0,
-     'donotreply@sendmail.org'                => -3.0,
-     'ca+envelope@sendmail.org'               => -3.0,
-     'noreply@freshmeat.net'                  => -3.0,
-     'owner-technews@postel.acm.org'          => -3.0,
-     'ietf-123-owner@loki.ietf.org'           => -3.0,
-     'cvs-commits-list-admin@gnome.org'       => -3.0,
-     'rt-users-admin@lists.fsck.com'          => -3.0,
-     'clp-request@comp.nus.edu.sg'            => -3.0,
-     'surveys-errors@lists.nua.ie'            => -3.0,
-     'emailnews@genomeweb.com'                => -5.0,
-     'yahoo-dev-null@yahoo-inc.com'           => -3.0,
-     'returns.groups.yahoo.com'               => -3.0,
-     'clusternews@linuxnetworx.com'           => -3.0,
-     lc('lvs-users-admin@LinuxVirtualServer.org')    => -3.0,
-     lc('owner-textbreakingnews@CNNIMAIL12.CNN.COM') => -5.0,
-
-     # soft-blacklisting (positive score)
-     'sender@example.net'                     =>  3.0,
-     '.example.net'                           =>  1.0,
-
-   },
-  ],  # end of site-wide tables
-});
-
-
-@decoders = (
-  ['mail', \&do_mime_decode],
-  ['asc',  \&do_ascii],
-  ['uue',  \&do_ascii],
-  ['hqx',  \&do_ascii],
-  ['ync',  \&do_ascii],
-  ['F',    \&do_uncompress, ['unfreeze','freeze -d','melt','fcat'] ],
-  ['Z',    \&do_uncompress, ['uncompress','gzip -d','zcat'] ],
-  ['gz',   \&do_uncompress,  'gzip -d'],
-  ['gz',   \&do_gunzip],
-  ['bz2',  \&do_uncompress,  'bzip2 -d'],
-  ['lzo',  \&do_uncompress,  'lzop -d'],
-  ['rpm',  \&do_uncompress, ['rpm2cpio.pl','rpm2cpio'] ],
-  ['cpio', \&do_pax_cpio,   ['pax','gcpio','cpio'] ],
-  ['tar',  \&do_pax_cpio,   ['pax','gcpio','cpio'] ],
-  ['deb',  \&do_ar,          'ar'],
-# ['a',    \&do_ar,          'ar'],  # unpacking .a seems an overkill
-  ['zip',  \&do_unzip],
-  ['7z',   \&do_7zip,       ['7zr','7za','7z'] ],
-  ['rar',  \&do_unrar,      ['rar','unrar'] ],
-  ['arj',  \&do_unarj,      ['arj','unarj'] ],
-  ['arc',  \&do_arc,        ['nomarch','arc'] ],
-  ['zoo',  \&do_zoo,        ['zoo','unzoo'] ],
-  ['lha',  \&do_lha,         'lha'],
-# ['doc',  \&do_ole,         'ripole'],
-  ['cab',  \&do_cabextract,  'cabextract'],
-  ['tnef', \&do_tnef_ext,    'tnef'],
-  ['tnef', \&do_tnef],
-# ['sit',  \&do_unstuff,     'unstuff'],  # broken/unsafe decoder
-  ['exe',  \&do_executable, ['rar','unrar'], 'lha', ['arj','unarj'] ],
-);
-
-
-@av_scanners = (
-
-#	### http://www.clamav.net/
-	['ClamAV-clamd',
-  \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamd"],
-	qr/\bOK$/, qr/\bFOUND$/,
-	 qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
-#	# NOTE: run clamd under the same user as amavisd, or run it under its own
-#	#   uid such as clamav, add user clamav to the amavis group, and then add
-#	#   AllowSupplementaryGroups to clamd.conf;
-#	# NOTE: match socket name (LocalSocket) in clamav.conf to the socket name in
-#	#   this entry; when running chrooted one may prefer socket "$MYHOME/clamd".
-
-# ### http://www.f-prot.com/
-# ['FRISK F-Prot Daemon',
-#   \&ask_daemon,
-#   ["GET {}/*?-dumb%20-archive%20-packed HTTP/1.0\r\n\r\n",
-#     ['127.0.0.1:10200','127.0.0.1:10201','127.0.0.1:10202',
-#      '127.0.0.1:10203','127.0.0.1:10204'] ],
-#   qr/(?i)<summary[^>]*>clean<\/summary>/,
-#   qr/(?i)<summary[^>]*>infected<\/summary>/,
-#   qr/(?i)<name>(.+)<\/name>/ ],
-
-  ### http://www.kaspersky.com/  (kav4mailservers)
-  ['KasperskyLab AVP - aveclient',
-    ['/usr/local/kav/bin/aveclient','/usr/local/share/kav/bin/aveclient',
-     '/opt/kav/5.5/kav4mailservers/bin/aveclient','aveclient'],
-    '-p /var/run/aveserver -s {}/*',
-    [0,3,6,8], qr/\b(INFECTED|SUSPICION|SUSPICIOUS)\b/,
-    qr/(?:INFECTED|WARNING|SUSPICION|SUSPICIOUS) (.+)/,
-  ],
-  # NOTE: one may prefer [0],[2,3,4,5], depending on how suspicious,
-  # currupted or protected archives are to be handled
-
-  ### http://www.avira.com/
-  ### Avira AntiVir (formerly H+BEDV) or (old) CentralCommand Vexira Antivirus
-  ['Avira AntiVir', ['antivir','vexira'],
-    '--allfiles -noboot -nombr -rs -s -z {}', [0], qr/ALERT:|VIRUS:/,
-    qr/(?x)^\s* (?: ALERT: \s* (?: \[ | [^']* ' ) |
-         (?i) VIRUS:\ .*?\ virus\ '?) ( [^\]\s']+ )/ ],
-    # NOTE: if you only have a demo version, remove -z and add 214, as in:
-    #  '--allfiles -noboot -nombr -rs -s {}', [0,214], qr/ALERT:|VIRUS:/,
-
-# ### http://www.avast.com/
-# ['avast! Antivirus daemon',
-#   \&ask_daemon,	# greets with 220, terminate with QUIT
-#   ["SCAN {}\015\012QUIT\015\012", '/var/run/avast4/mailscanner.sock'],
-#   qr/\t\[\+\]/, qr/\t\[L\]\t/, qr/\t\[L\]\t([^[ \t\015\012]+)/ ],
-
-# ### http://www.avast.com/
-# ['avast! Antivirus - Client/Server Version', 'avastlite',
-#   '-a /var/run/avast4/mailscanner.sock -n {}', [0], [1],
-#   qr/\t\[L\]\t([^[ \t\015\012]+)/ ],
-
-  ### http://www.avast.com/
-  ['avast! Antivirus', ['/usr/bin/avastcmd','avastcmd'],
-    '-a -i -n -t=A {}', [0], [1], qr/\binfected by:\s+([^ \t\n\[\]]+)/ ],
-
-  ### http://www.bitdefender.com/
-  ['BitDefender', 'bdc',
-    '--arc --mail {}', qr/^Infected files *:0+(?!\d)/,
-    qr/^(?:Infected files|Identified viruses|Suspect files) *:0*[1-9]/,
-    qr/(?:suspected|infected): (.*)(?:\033|$)/ ],
-  # consider also: --all --nowarn --alev=15 --flev=15.  The --all argument may
-  # not apply to your version of bdc, check documentation and see 'bdc --help'
-
-);
-
-
-@av_scanners_backup = (
-
-  ### http://www.clamav.net/   - backs up clamd or Mail::ClamAV
-  ['ClamAV-clamscan', 'clamscan',
-    "--stdout --no-summary -r --tempdir=$TEMPBASE {}",
-    [0], qr/:.*\sFOUND$/, qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
-
-  ### http://www.f-prot.com/   - backs up F-Prot Daemon
-  ['FRISK F-Prot Antivirus', ['f-prot','f-prot.sh'],
-    '-dumb -archive -packed {}', [0,8], [3,6],   # or: [0], [3,6,8],
-    qr/(?:Infection:|security risk named) (.+)|\s+contains\s+(.+)$/ ],
-
-   ### http://www.kaspersky.com/
-   ['Kaspersky Antivirus v5.5',
-     ['/opt/kaspersky/kav4fs/bin/kav4fs-kavscanner',
-      '/opt/kav/5.5/kav4unix/bin/kavscanner',
-      '/opt/kav/5.5/kav4mailservers/bin/kavscanner', 'kavscanner'],
-     '-i0 -xn -xp -mn -R -ePASBME {}/*', [0,10,15], [5,20,21,25],
-     qr/(?:INFECTED|WARNING|SUSPICION|SUSPICIOUS) (.*)/ ,
-#    sub {chdir('/opt/kav/bin') or die "Can't chdir to kav: $!"},
-#    sub {chdir($TEMPBASE) or die "Can't chdir back to $TEMPBASE $!"},
-   ],
-
-# always succeeds (uncomment to consider mail clean if all other scanners fail)
-# ['always-clean', sub {0}],
-
-);
-
-
-1;  # insure a defined return
--- a/config/backup/includes/apcupsd
+++ b/config/backup/includes/apcupsd
@@ -0,0 +1 @@
+/etc/apcupsd/
--- a/config/cfgroot/location-functions.pl
+++ b/config/cfgroot/location-functions.pl
@@ -1,25 +1,23 @@
 #!/usr/bin/perl -w
-############################################################################
-#                                                                          #
-# This file is part of the IPFire Firewall.                                #
-#                                                                          #
-# IPFire 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 2 of the License, or        #
-# (at your option) any later version.                                      #
-#                                                                          #
-# IPFire 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 IPFire; if not, write to the Free Software                    #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
-#                                                                          #
-# Copyright (C) 2015 - 2020 IPFire Team <info@ipfire.org>.                 #
-#                                                                          #
-############################################################################
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 2 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/>.       #
+#                                                                             #
+###############################################################################

 package Location::Functions;

@@ -55,6 +53,9 @@ our $keyfile = "$location_dir/signing-key.pem";
 # Directory which contains the exported databases.
 our $xt_geoip_db_directory = "/usr/share/xt_geoip/";

+# Create libloc database handle.
+my $db_handle = &init();
+
 #
 ## Tiny function to init the location database.
 #
@@ -83,10 +84,10 @@ sub verify ($) {
 }

 #
-## Function to the the country code of a given address.
+## Function to get the country code of a given address.
 #
 sub lookup_country_code($$) {
-	my ($db_handle, $address) = @_;
+	my ($address) = @_;

 	# Lookup the given address.
 	my $country_code = &Location::lookup_country_code($db_handle, $address);
@@ -162,9 +163,6 @@ sub get_full_country_name($) {
 		# Grab location name from hash.
 		$name = $not_iso_3166_location{$code};
 	} else {
-		# Init libloc database connection.
-		my $db_handle = &init();
-
 		# Get the country name by using the location module.
 		$name = &Location::get_country_name($db_handle, $code);
 	}
@@ -174,22 +172,37 @@ sub get_full_country_name($) {

 # Function to get all available locations.
 sub get_locations() {
-	# Create libloc database handle.
-	my $db_handle = &init();
+	my ($mode) = @_;
+
+	# Set default mode to add_special_locations.
+	$mode = $mode ? $mode : "add_special_locations";

 	# Get locations which are stored in the location database.
-	my @database_locations = &Location::database_countries($db_handle);
+	my @locations = &Location::database_countries($db_handle);

-	# Merge special locations array and the database locations array.
-	my @locations = (@special_locations, @database_locations);
+	# Check if the special locations should be added.
+	if ($mode ne "no_special_locations") {
+		# Merge special locations array and the database locations array.
+		@locations = (@special_locations, @locations);
+	}

 	# Sort locations array in alphabetical order.
 	my @sorted_locations = sort(@locations);

-	# Return the array..
+	# Return the array.
 	return @sorted_locations;
 }

+# Function to get the continent code of a given country code.
+sub get_continent_code($) {
+	my ($country_code) = @_;
+
+	# Use location module to grab the continent code.
+	my $continent_code = &Location::get_continent_code($db_handle, $country_code);
+
+	return $continent_code;
+}
+
 # Function to check if a given address has one ore more special flags.
 sub address_has_flags($) {
 	my ($address) = @_;
@@ -197,9 +210,6 @@ sub address_has_flags($) {
 	# Array to store the flags of the address.
 	my @flags;

-	# Init libloc database handle.
-	my $db_handle = &init();
-
 	# Loop through the hash of possible network flags.
 	foreach my $flag (keys(%network_flags)) {
 		# Check if the address has the current flag.
@@ -221,4 +231,40 @@ sub address_has_flags($) {
 	return @flags;
 }

+#
+## Function to get the Autonomous System Number of a given address.
+#
+sub lookup_asn($) {
+	my ($address) = @_;
+
+	# Lookup the given address.
+	my $asn = &Location::lookup_asn($db_handle, $address);
+
+	# Return the number of the Autonomous System
+	return $asn;
+}
+
+#
+## Function to get the name of an Autonomous System.
+#
+sub get_as_name($) {
+	my ($asn) = @_;
+
+	# Fetch the name of this AS...
+	my $as_name = &Location::get_as_name($db_handle, $asn);
+
+	# Return the name of the Autonomous System
+	return $as_name;
+}
+
+# Custom END declaration which will be executed when perl
+# ends, to release the database handle to libloc.
+END {
+	# Check if a database handle exists.
+	if ($db_handle) {
+		# Destroy libloc database handle.
+		&Location::DESTROY($db_handle);
+	}
+}
+
 1;
--- a/config/etc/sysctl.conf
+++ b/config/etc/sysctl.conf
@@ -103,3 +103,6 @@ net.ipv4.tcp_fastopen = 3
 # This protects against various TCP attacks, such as DoS against or injection
 # of arbitrary segments into prematurely closed connections.
 net.ipv4.tcp_rfc1337 = 1
+
+# Include PID in file names of generated core dumps
+kernel.core_uses_pid = 1
--- a/config/firewall/rules.pl
+++ b/config/firewall/rules.pl
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -628,8 +628,11 @@ sub locationblock {
 		return;
 	}

-	# Only check the RED interface
-	if ($defaultNetworks{'RED_DEV'} ne "") {
+	# Only check the RED interface, which is ppp0 in case of RED_TYPE being
+	# set to "PPPOE", and red0 in case of RED_TYPE not being empty otherwise.
+	if ($defaultNetworks{'RED_TYPE'} eq "PPPOE") {
+		run("$IPTABLES -A LOCATIONBLOCK ! -i ppp0 -j RETURN");
+	} elsif ($defaultNetworks{'RED_DEV'} ne "") {
 		run("$IPTABLES -A LOCATIONBLOCK ! -i $defaultNetworks{'RED_DEV'} -j RETURN");
 	}

--- a/config/hostapd/config
+++ b/config/hostapd/config
@@ -15,22 +15,31 @@ CONFIG_DRIVER_HOSTAP=y
 # Driver interface for wired authenticator
 #CONFIG_DRIVER_WIRED=y

-# Driver interface for Prism54 driver
-CONFIG_DRIVER_PRISM54=y
-
 # Driver interface for drivers using the nl80211 kernel interface
 CONFIG_DRIVER_NL80211=y
-# driver_nl80211.c requires a rather new libnl (version 1.1) which may not be
-# shipped with your distribution yet. If that is the case, you need to build
-# newer libnl version and point the hostapd build to use it.
-#LIBNL=/usr/src/libnl
-#CFLAGS += -I$(LIBNL)/include
-#LIBS += -L$(LIBNL)/lib
+
+# QCA vendor extensions to nl80211
+#CONFIG_DRIVER_NL80211_QCA=y
+
+# driver_nl80211.c requires libnl. If you are compiling it yourself
+# you may need to point hostapd to your version of libnl.
+#
+#CFLAGS += -I$<path to libnl include files>
+#LIBS += -L$<path to libnl library files>
+
+# Use libnl v2.0 (or 3.0) libraries.
+#CONFIG_LIBNL20=y
+
+# Use libnl 3.2 libraries (if this is selected, CONFIG_LIBNL20 is ignored)
+CONFIG_LIBNL32=y
+

 # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
 #CONFIG_DRIVER_BSD=y
 #CFLAGS += -I/usr/local/include
 #LIBS += -L/usr/local/lib
+#LIBS_p += -L/usr/local/lib
+#LIBS_c += -L/usr/local/lib

 # Driver interface for no driver (e.g., RADIUS server only)
 #CONFIG_DRIVER_NONE=y
@@ -41,12 +50,12 @@ CONFIG_IAPP=y
 # WPA2/IEEE 802.11i RSN pre-authentication
 CONFIG_RSN_PREAUTH=y

-# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
-CONFIG_PEERKEY=y
-
 # IEEE 802.11w (management frame protection)
 CONFIG_IEEE80211W=y

+# Support Operating Channel Validation
+#CONFIG_OCV=y
+
 # Integrated EAP server
 CONFIG_EAP=y

@@ -99,24 +108,30 @@ CONFIG_EAP_TTLS=y
 #CONFIG_EAP_GPSK_SHA256=y

 # EAP-FAST for the integrated EAP server
-# Note: Default OpenSSL package does not include support for all the
-# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL,
-# the OpenSSL library must be patched (openssl-0.9.9-session-ticket.patch)
-# to add the needed functions.
 #CONFIG_EAP_FAST=y

+# EAP-TEAP for the integrated EAP server
+# Note: The current EAP-TEAP implementation is experimental and should not be
+# enabled for production use. The IETF RFC 7170 that defines EAP-TEAP has number
+# of conflicting statements and missing details and the implementation has
+# vendor specific workarounds for those and as such, may not interoperate with
+# any other implementation. This should not be used for anything else than
+# experimentation and interoperability testing until those issues has been
+# resolved.
+#CONFIG_EAP_TEAP=y
+
 # Wi-Fi Protected Setup (WPS)
-CONFIG_WPS=y
+#CONFIG_WPS=y
 # Enable UPnP support for external WPS Registrars
-CONFIG_WPS_UPNP=y
+#CONFIG_WPS_UPNP=y
 # Enable WPS support with NFC config method
 #CONFIG_WPS_NFC=y

 # EAP-IKEv2
-CONFIG_EAP_IKEV2=y
+#CONFIG_EAP_IKEV2=y

 # Trusted Network Connect (EAP-TNC)
-CONFIG_EAP_TNC=y
+#CONFIG_EAP_TNC=y

 # EAP-EKE for the integrated EAP server
 #CONFIG_EAP_EKE=y
@@ -133,10 +148,10 @@ CONFIG_PKCS12=y
 #CONFIG_IPV6=y

 # IEEE Std 802.11r-2008 (Fast BSS Transition)
-CONFIG_IEEE80211R=y
+#CONFIG_IEEE80211R=y

 # Use the hostapd's IEEE 802.11 authentication (ACL), but without
-# the IEEE 802.11 Management capability (e.g., madwifi or FreeBSD/net80211)
+# the IEEE 802.11 Management capability (e.g., FreeBSD/net80211)
 #CONFIG_DRIVER_RADIUS_ACL=y

 # IEEE 802.11n (High Throughput) support
@@ -149,6 +164,12 @@ CONFIG_IEEE80211N=y
 # IEEE 802.11ac (Very High Throughput) support
 CONFIG_IEEE80211AC=y

+# IEEE 802.11ax HE support
+# Note: This is experimental and work in progress. The definitions are still
+# subject to change and this should not be expected to interoperate with the
+# final IEEE 802.11ax version.
+#CONFIG_IEEE80211AX=y
+
 # Remove debugging code that is printing out debug messages to stdout.
 # This can be used to reduce the size of the hostapd considerably if debugging
 # code is not needed.
@@ -158,6 +179,9 @@ CONFIG_IEEE80211AC=y
 # Disabled by default.
 #CONFIG_DEBUG_FILE=y

+# Send debug messages to syslog instead of stdout
+#CONFIG_DEBUG_SYSLOG=y
+
 # Add support for sending all debug messages (regardless of debug verbosity)
 # to the Linux kernel tracing facility. This helps debug the entire stack by
 # making it easy to record everything happening from the driver up into the
@@ -235,10 +259,25 @@ CONFIG_IEEE80211AC=y
 # requirements described above.
 #CONFIG_NO_RANDOM_POOL=y

+# Should we attempt to use the getrandom(2) call that provides more reliable
+# yet secure randomness source than /dev/random on Linux 3.17 and newer.
+# Requires glibc 2.25 to build, falls back to /dev/random if unavailable.
+CONFIG_GETRANDOM=y
+
+# Should we use poll instead of select? Select is used by default.
+#CONFIG_ELOOP_POLL=y
+
+# Should we use epoll instead of select? Select is used by default.
+CONFIG_ELOOP_EPOLL=y
+
+# Should we use kqueue instead of select? Select is used by default.
+#CONFIG_ELOOP_KQUEUE=y
+
 # Select TLS implementation
 # openssl = OpenSSL (default)
 # gnutls = GnuTLS
 # internal = Internal TLSv1 implementation (experimental)
+# linux = Linux kernel AF_ALG and internal TLSv1 implementation (experimental)
 # none = Empty template
 #CONFIG_TLS=openssl

@@ -251,6 +290,10 @@ CONFIG_IEEE80211AC=y
 # can be enabled to enable use of stronger crypto algorithms.
 #CONFIG_TLSV12=y

+# Select which ciphers to use by default with OpenSSL if the user does not
+# specify them.
+#CONFIG_TLS_DEFAULT_CIPHERS="DEFAULT:!EXP:!LOW"
+
 # If CONFIG_TLS=internal is used, additional library and include paths are
 # needed for LibTomMath. Alternatively, an integrated, minimal version of
 # LibTomMath can be used. See beginning of libtommath.c for details on benefits
@@ -278,6 +321,12 @@ CONFIG_IEEE80211AC=y
 # Enable SQLite database support in hlr_auc_gw, EAP-SIM DB, and eap_user_file
 #CONFIG_SQLITE=y

+# Enable Fast Session Transfer (FST)
+#CONFIG_FST=y
+
+# Enable CLI commands for FST testing
+#CONFIG_FST_TEST=y
+
 # Testing options
 # This can be used to enable some testing options (see also the example
 # configuration file) that are really useful only for testing clients that
@@ -309,3 +358,37 @@ CONFIG_IEEE80211AC=y
 # http://wireless.kernel.org/en/users/Documentation/acs
 #
 CONFIG_ACS=y
+
+# Multiband Operation support
+# These extentions facilitate efficient use of multiple frequency bands
+# available to the AP and the devices that may associate with it.
+#CONFIG_MBO=y
+
+# Client Taxonomy
+# Has the AP retain the Probe Request and (Re)Association Request frames from
+# a client, from which a signature can be produced which can identify the model
+# of client device like "Nexus 6P" or "iPhone 5s".
+CONFIG_TAXONOMY=y
+
+# Fast Initial Link Setup (FILS) (IEEE 802.11ai)
+#CONFIG_FILS=y
+# FILS shared key authentication with PFS
+#CONFIG_FILS_SK_PFS=y
+
+# Include internal line edit mode in hostapd_cli. This can be used to provide
+# limited command line editing and history support.
+#CONFIG_WPA_CLI_EDIT=y
+
+# Opportunistic Wireless Encryption (OWE)
+# Experimental implementation of draft-harkins-owe-07.txt
+#CONFIG_OWE=y
+
+# Airtime policy support
+CONFIG_AIRTIME_POLICY=y
+
+# Override default value for the wpa_disable_eapol_key_retries configuration
+# parameter. See that parameter in hostapd.conf for more details.
+#CFLAGS += -DDEFAULT_WPA_DISABLE_EAPOL_KEY_RETRIES=1
+
+# Custom configuration
+CONFIG_SAE=y
--- a/config/kernel/kernel.config.aarch64-ipfire
+++ b/config/kernel/kernel.config.aarch64-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.14.198-ipfire Kernel Configuration
+# Linux/arm64 4.14.206-ipfire Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -1819,7 +1819,7 @@ CONFIG_SATA_PMP=y
 #
 # Controllers with non-SFF native interface
 #
-# CONFIG_SATA_AHCI is not set
+CONFIG_SATA_AHCI=y
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_AHCI_CEVA=m
 CONFIG_AHCI_MVEBU=m
@@ -5577,6 +5577,8 @@ CONFIG_TIMER_OF=y
 CONFIG_TIMER_ACPI=y
 CONFIG_TIMER_PROBE=y
 CONFIG_CLKSRC_MMIO=y
+CONFIG_DW_APB_TIMER=y
+CONFIG_DW_APB_TIMER_OF=y
 CONFIG_ROCKCHIP_TIMER=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
--- a/config/kernel/kernel.config.armv5tel-ipfire-multi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-multi
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.195-ipfire-multi Kernel Configuration
+# Linux/arm 4.14.206-ipfire-multi Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.195-ipfire Kernel Configuration
+# Linux/x86 4.14.206-ipfire Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -4648,7 +4648,6 @@ CONFIG_HDMI=y
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
 CONFIG_MDA_CONSOLE=m
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
--- a/config/kernel/kernel.config.x86_64-ipfire
+++ b/config/kernel/kernel.config.x86_64-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.195-ipfire Kernel Configuration
+# Linux/x86 4.14.206-ipfire Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -4530,7 +4530,6 @@ CONFIG_HDMI=y
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
--- a/config/ntp/ntp.conf
+++ b/config/ntp/ntp.conf
@@ -0,0 +1,6 @@
+disable monitor
+restrict default nomodify noquery
+restrict 127.0.0.1
+server  127.127.1.0 prefer
+fudge   127.127.1.0 stratum 10
+driftfile /etc/ntp/drift
--- a/config/rootfiles/common/aarch64/linux
+++ b/config/rootfiles/common/aarch64/linux
@@ -7072,6 +7072,9 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/dw
 #lib/modules/KVER-ipfire/build/include/config/dw/apb
 #lib/modules/KVER-ipfire/build/include/config/dw/apb/ictl.h
+#lib/modules/KVER-ipfire/build/include/config/dw/apb/timer
+#lib/modules/KVER-ipfire/build/include/config/dw/apb/timer.h
+#lib/modules/KVER-ipfire/build/include/config/dw/apb/timer/of.h
 #lib/modules/KVER-ipfire/build/include/config/dw/dmac
 #lib/modules/KVER-ipfire/build/include/config/dw/dmac/core.h
 #lib/modules/KVER-ipfire/build/include/config/dw/dmac/pci.h
@@ -9617,6 +9620,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/s2io.h
 #lib/modules/KVER-ipfire/build/include/config/sata
 #lib/modules/KVER-ipfire/build/include/config/sata/ahci
+#lib/modules/KVER-ipfire/build/include/config/sata/ahci.h
 #lib/modules/KVER-ipfire/build/include/config/sata/ahci/platform.h
 #lib/modules/KVER-ipfire/build/include/config/sata/dwc.h
 #lib/modules/KVER-ipfire/build/include/config/sata/mv.h
@@ -17306,7 +17310,6 @@ lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/drivers/ata/ahci_platform.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/ata/ahci_qoriq.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/ata/ahci_sunxi.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/ata/libahci.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/ata/libahci_platform.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/ata/sata_dwc_460ex.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/ata/sata_mv.ko.xz
--- a/config/rootfiles/common/curl
+++ b/config/rootfiles/common/curl
@@ -6,6 +6,7 @@ usr/bin/curl
 #usr/include/curl/easy.h
 #usr/include/curl/mprintf.h
 #usr/include/curl/multi.h
+#usr/include/curl/options.h
 #usr/include/curl/stdcheaders.h
 #usr/include/curl/system.h
 #usr/include/curl/typecheck-gcc.h
@@ -13,7 +14,7 @@ usr/bin/curl
 #usr/lib/libcurl.la
 #usr/lib/libcurl.so
 usr/lib/libcurl.so.4
-usr/lib/libcurl.so.4.6.0
+usr/lib/libcurl.so.4.7.0
 #usr/lib/pkgconfig/libcurl.pc
 #usr/share/aclocal/libcurl.m4
 #usr/share/man/man1/curl-config.1
@@ -31,6 +32,7 @@ usr/lib/libcurl.so.4.6.0
 #usr/share/man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD_T.3
 #usr/share/man/man3/CURLINFO_CONTENT_TYPE.3
 #usr/share/man/man3/CURLINFO_COOKIELIST.3
+#usr/share/man/man3/CURLINFO_EFFECTIVE_METHOD.3
 #usr/share/man/man3/CURLINFO_EFFECTIVE_URL.3
 #usr/share/man/man3/CURLINFO_FILETIME.3
 #usr/share/man/man3/CURLINFO_FILETIME_T.3
@@ -53,6 +55,7 @@ usr/lib/libcurl.so.4.6.0
 #usr/share/man/man3/CURLINFO_PRIVATE.3
 #usr/share/man/man3/CURLINFO_PROTOCOL.3
 #usr/share/man/man3/CURLINFO_PROXYAUTH_AVAIL.3
+#usr/share/man/man3/CURLINFO_PROXY_ERROR.3
 #usr/share/man/man3/CURLINFO_PROXY_SSL_VERIFYRESULT.3
 #usr/share/man/man3/CURLINFO_REDIRECT_COUNT.3
 #usr/share/man/man3/CURLINFO_REDIRECT_TIME.3
@@ -325,6 +328,7 @@ usr/lib/libcurl.so.4.6.0
 #usr/share/man/man3/CURLOPT_SSL_CIPHER_LIST.3
 #usr/share/man/man3/CURLOPT_SSL_CTX_DATA.3
 #usr/share/man/man3/CURLOPT_SSL_CTX_FUNCTION.3
+#usr/share/man/man3/CURLOPT_SSL_EC_CURVES.3
 #usr/share/man/man3/CURLOPT_SSL_ENABLE_ALPN.3
 #usr/share/man/man3/CURLOPT_SSL_ENABLE_NPN.3
 #usr/share/man/man3/CURLOPT_SSL_FALSESTART.3
@@ -381,6 +385,9 @@ usr/lib/libcurl.so.4.6.0
 #usr/share/man/man3/curl_easy_escape.3
 #usr/share/man/man3/curl_easy_getinfo.3
 #usr/share/man/man3/curl_easy_init.3
+#usr/share/man/man3/curl_easy_option_by_id.3
+#usr/share/man/man3/curl_easy_option_by_name.3
+#usr/share/man/man3/curl_easy_option_next.3
 #usr/share/man/man3/curl_easy_pause.3
 #usr/share/man/man3/curl_easy_perform.3
 #usr/share/man/man3/curl_easy_recv.3
--- a/config/rootfiles/common/file
+++ b/config/rootfiles/common/file
@@ -1,10 +1,10 @@
 usr/bin/file
 #usr/include/magic.h
-#usr/lib/libmagic.a
 #usr/lib/libmagic.la
 #usr/lib/libmagic.so
 usr/lib/libmagic.so.1
 usr/lib/libmagic.so.1.0.0
+#usr/lib/pkgconfig/libmagic.pc
 #usr/share/man/man1/file.1
 #usr/share/man/man3/libmagic.3
 #usr/share/man/man4/magic.4
--- a/config/rootfiles/common/gdb
+++ b/config/rootfiles/common/gdb
@@ -0,0 +1,63 @@
+#usr/bin/gcore
+#usr/bin/gdb
+#usr/bin/gdb-add-index
+#usr/bin/gdbserver
+#usr/include/gdb
+#usr/include/gdb/jit-reader.h
+#usr/lib/libinproctrace.so
+#usr/share/gdb/python
+#usr/share/gdb/python/gdb
+#usr/share/gdb/python/gdb/FrameDecorator.py
+#usr/share/gdb/python/gdb/FrameIterator.py
+#usr/share/gdb/python/gdb/__init__.py
+#usr/share/gdb/python/gdb/command
+#usr/share/gdb/python/gdb/command/__init__.py
+#usr/share/gdb/python/gdb/command/explore.py
+#usr/share/gdb/python/gdb/command/frame_filters.py
+#usr/share/gdb/python/gdb/command/pretty_printers.py
+#usr/share/gdb/python/gdb/command/prompt.py
+#usr/share/gdb/python/gdb/command/type_printers.py
+#usr/share/gdb/python/gdb/command/unwinders.py
+#usr/share/gdb/python/gdb/command/xmethods.py
+#usr/share/gdb/python/gdb/frames.py
+#usr/share/gdb/python/gdb/function
+#usr/share/gdb/python/gdb/function/__init__.py
+#usr/share/gdb/python/gdb/function/as_string.py
+#usr/share/gdb/python/gdb/function/caller_is.py
+#usr/share/gdb/python/gdb/function/strfns.py
+#usr/share/gdb/python/gdb/printer
+#usr/share/gdb/python/gdb/printer/__init__.py
+#usr/share/gdb/python/gdb/printer/bound_registers.py
+#usr/share/gdb/python/gdb/printing.py
+#usr/share/gdb/python/gdb/prompt.py
+#usr/share/gdb/python/gdb/types.py
+#usr/share/gdb/python/gdb/unwinder.py
+#usr/share/gdb/python/gdb/xmethod.py
+#usr/share/gdb/syscalls
+#usr/share/gdb/syscalls/aarch64-linux.xml
+#usr/share/gdb/syscalls/amd64-linux.xml
+#usr/share/gdb/syscalls/arm-linux.xml
+#usr/share/gdb/syscalls/freebsd.xml
+#usr/share/gdb/syscalls/gdb-syscalls.dtd
+#usr/share/gdb/syscalls/i386-linux.xml
+#usr/share/gdb/syscalls/mips-n32-linux.xml
+#usr/share/gdb/syscalls/mips-n64-linux.xml
+#usr/share/gdb/syscalls/mips-o32-linux.xml
+#usr/share/gdb/syscalls/netbsd.xml
+#usr/share/gdb/syscalls/ppc-linux.xml
+#usr/share/gdb/syscalls/ppc64-linux.xml
+#usr/share/gdb/syscalls/s390-linux.xml
+#usr/share/gdb/syscalls/s390x-linux.xml
+#usr/share/gdb/syscalls/sparc-linux.xml
+#usr/share/gdb/syscalls/sparc64-linux.xml
+#usr/share/gdb/system-gdbinit
+#usr/share/gdb/system-gdbinit/elinos.py
+#usr/share/gdb/system-gdbinit/wrs-linux.py
+#usr/share/info/annotate.info
+#usr/share/info/gdb.info
+#usr/share/info/stabs.info
+#usr/share/man/man1/gcore.1
+#usr/share/man/man1/gdb-add-index.1
+#usr/share/man/man1/gdb.1
+#usr/share/man/man1/gdbserver.1
+#usr/share/man/man5/gdbinit.5
--- a/config/rootfiles/common/i586/intel-microcode
+++ b/config/rootfiles/common/i586/intel-microcode
@@ -69,6 +69,7 @@ lib/firmware/intel-ucode/06-55-03
 lib/firmware/intel-ucode/06-55-04
 lib/firmware/intel-ucode/06-55-06
 lib/firmware/intel-ucode/06-55-07
+lib/firmware/intel-ucode/06-55-0b
 lib/firmware/intel-ucode/06-56-02
 lib/firmware/intel-ucode/06-56-03
 lib/firmware/intel-ucode/06-56-04
@@ -82,6 +83,7 @@ lib/firmware/intel-ucode/06-66-03
 lib/firmware/intel-ucode/06-7a-01
 lib/firmware/intel-ucode/06-7a-08
 lib/firmware/intel-ucode/06-7e-05
+lib/firmware/intel-ucode/06-8a-01
 lib/firmware/intel-ucode/06-8e-09
 lib/firmware/intel-ucode/06-8e-0a
 lib/firmware/intel-ucode/06-8e-0b
@@ -91,7 +93,11 @@ lib/firmware/intel-ucode/06-9e-0a
 lib/firmware/intel-ucode/06-9e-0b
 lib/firmware/intel-ucode/06-9e-0c
 lib/firmware/intel-ucode/06-9e-0d
+lib/firmware/intel-ucode/06-a5-02
+lib/firmware/intel-ucode/06-a5-03
+lib/firmware/intel-ucode/06-a5-05
 lib/firmware/intel-ucode/06-a6-00
+lib/firmware/intel-ucode/06-a6-01
 lib/firmware/intel-ucode/0f-00-07
 lib/firmware/intel-ucode/0f-00-0a
 lib/firmware/intel-ucode/0f-01-02
--- a/config/rootfiles/common/libarchive
+++ b/config/rootfiles/common/libarchive
@@ -5,8 +5,8 @@
 #usr/include/archive_entry.h
 #usr/lib/libarchive.la
 #usr/lib/libarchive.so
-#usr/lib/libarchive.so.13
-#usr/lib/libarchive.so.13.4.0
+usr/lib/libarchive.so.13
+usr/lib/libarchive.so.13.4.0
 #usr/lib/pkgconfig/libarchive.pc
 #usr/share/man/man1/bsdcat.1
 #usr/share/man/man1/bsdcpio.1
--- a/config/rootfiles/common/libloc
+++ b/config/rootfiles/common/libloc
@@ -1,12 +1,15 @@
 usr/bin/location
 #usr/bin/location-importer
 #usr/include/libloc
+#usr/include/libloc/as-list.h
 #usr/include/libloc/as.h
 #usr/include/libloc/compat.h
+#usr/include/libloc/country-list.h
 #usr/include/libloc/country.h
 #usr/include/libloc/database.h
 #usr/include/libloc/format.h
 #usr/include/libloc/libloc.h
+#usr/include/libloc/network-list.h
 #usr/include/libloc/network.h
 #usr/include/libloc/private.h
 #usr/include/libloc/resolv.h
--- a/config/rootfiles/common/openvpn
+++ b/config/rootfiles/common/openvpn
@@ -19,7 +19,6 @@ usr/sbin/openvpn
 #usr/share/doc/openvpn/README.down-root
 #usr/share/doc/openvpn/README.mbedtls
 #usr/share/doc/openvpn/management-notes.txt
-#usr/share/man/man8/openvpn.8
 var/ipfire/ovpn/ca
 var/ipfire/ovpn/caconfig
 var/ipfire/ovpn/ccd
--- a/config/rootfiles/common/suricata
+++ b/config/rootfiles/common/suricata
@@ -3,6 +3,7 @@ etc/suricata/suricata.yaml
 #root/.cargo
 #root/.cargo/.package-cache
 usr/bin/suricata
+#usr/include/suricata-plugin.h
 #usr/share/doc/suricata
 #usr/share/doc/suricata/AUTHORS
 #usr/share/doc/suricata/Basic_Setup.txt
--- a/config/rootfiles/common/tzdata
+++ b/config/rootfiles/common/tzdata
@@ -181,6 +181,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/America/North_Dakota/Beulah
 #usr/share/zoneinfo/America/North_Dakota/Center
 #usr/share/zoneinfo/America/North_Dakota/New_Salem
+#usr/share/zoneinfo/America/Nuuk
 #usr/share/zoneinfo/America/Ojinaga
 #usr/share/zoneinfo/America/Panama
 #usr/share/zoneinfo/America/Pangnirtung
@@ -503,6 +504,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/Europe/Zagreb
 #usr/share/zoneinfo/Europe/Zaporozhye
 #usr/share/zoneinfo/Europe/Zurich
+#usr/share/zoneinfo/Factory
 #usr/share/zoneinfo/GB
 #usr/share/zoneinfo/GB-Eire
 #usr/share/zoneinfo/GMT
@@ -606,7 +608,6 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/US/Michigan
 #usr/share/zoneinfo/US/Mountain
 #usr/share/zoneinfo/US/Pacific
-#usr/share/zoneinfo/US/Pacific-New
 #usr/share/zoneinfo/US/Samoa
 #usr/share/zoneinfo/UTC
 #usr/share/zoneinfo/Universal
@@ -796,6 +797,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/posix/America/North_Dakota/Beulah
 #usr/share/zoneinfo/posix/America/North_Dakota/Center
 #usr/share/zoneinfo/posix/America/North_Dakota/New_Salem
+#usr/share/zoneinfo/posix/America/Nuuk
 #usr/share/zoneinfo/posix/America/Ojinaga
 #usr/share/zoneinfo/posix/America/Panama
 #usr/share/zoneinfo/posix/America/Pangnirtung
@@ -1118,6 +1120,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/posix/Europe/Zagreb
 #usr/share/zoneinfo/posix/Europe/Zaporozhye
 #usr/share/zoneinfo/posix/Europe/Zurich
+#usr/share/zoneinfo/posix/Factory
 #usr/share/zoneinfo/posix/GB
 #usr/share/zoneinfo/posix/GB-Eire
 #usr/share/zoneinfo/posix/GMT
@@ -1221,7 +1224,6 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/posix/US/Michigan
 #usr/share/zoneinfo/posix/US/Mountain
 #usr/share/zoneinfo/posix/US/Pacific
-#usr/share/zoneinfo/posix/US/Pacific-New
 #usr/share/zoneinfo/posix/US/Samoa
 #usr/share/zoneinfo/posix/UTC
 #usr/share/zoneinfo/posix/Universal
@@ -1411,6 +1413,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/right/America/North_Dakota/Beulah
 #usr/share/zoneinfo/right/America/North_Dakota/Center
 #usr/share/zoneinfo/right/America/North_Dakota/New_Salem
+#usr/share/zoneinfo/right/America/Nuuk
 #usr/share/zoneinfo/right/America/Ojinaga
 #usr/share/zoneinfo/right/America/Panama
 #usr/share/zoneinfo/right/America/Pangnirtung
@@ -1733,6 +1736,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/right/Europe/Zagreb
 #usr/share/zoneinfo/right/Europe/Zaporozhye
 #usr/share/zoneinfo/right/Europe/Zurich
+#usr/share/zoneinfo/right/Factory
 #usr/share/zoneinfo/right/GB
 #usr/share/zoneinfo/right/GB-Eire
 #usr/share/zoneinfo/right/GMT
@@ -1836,7 +1840,6 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/right/US/Michigan
 #usr/share/zoneinfo/right/US/Mountain
 #usr/share/zoneinfo/right/US/Pacific
-#usr/share/zoneinfo/right/US/Pacific-New
 #usr/share/zoneinfo/right/US/Samoa
 #usr/share/zoneinfo/right/UTC
 #usr/share/zoneinfo/right/Universal
--- a/config/rootfiles/common/usb_modeswitch_data
+++ b/config/rootfiles/common/usb_modeswitch_data
@@ -3,6 +3,7 @@ lib/udev/rules.d/40-usb_modeswitch.rules
 #usr/share/usb_modeswitch
 usr/share/usb_modeswitch/03f0:002a
 usr/share/usb_modeswitch/03f0:032a
+usr/share/usb_modeswitch/03f0:0857
 usr/share/usb_modeswitch/03f0:371d
 usr/share/usb_modeswitch/03f0:4b1d
 usr/share/usb_modeswitch/03f0:4e1d
@@ -59,6 +60,7 @@ usr/share/usb_modeswitch/05c6:1000:uMa=CELOT
 usr/share/usb_modeswitch/05c6:1000:uMa=Co.,Ltd
 usr/share/usb_modeswitch/05c6:1000:uMa=DGT
 usr/share/usb_modeswitch/05c6:1000:uMa=Option
+usr/share/usb_modeswitch/05c6:1000:uMa=Qualcomm
 usr/share/usb_modeswitch/05c6:1000:uMa=SAMSUNG
 usr/share/usb_modeswitch/05c6:1000:uMa=SSE
 usr/share/usb_modeswitch/05c6:1000:uMa=StrongRising
@@ -145,6 +147,7 @@ usr/share/usb_modeswitch/0b3c:c700
 usr/share/usb_modeswitch/0b3c:f000
 usr/share/usb_modeswitch/0b3c:f00c
 usr/share/usb_modeswitch/0b3c:f017
+usr/share/usb_modeswitch/0bda:1a2b
 usr/share/usb_modeswitch/0bdb:190d
 usr/share/usb_modeswitch/0bdb:1910
 usr/share/usb_modeswitch/0cf3:20ff
@@ -153,6 +156,7 @@ usr/share/usb_modeswitch/0d46:45a5
 usr/share/usb_modeswitch/0df7:0800
 usr/share/usb_modeswitch/0e8d:0002:uPr=MT
 usr/share/usb_modeswitch/0e8d:0002:uPr=Product
+usr/share/usb_modeswitch/0e8d:2870
 usr/share/usb_modeswitch/0e8d:7109
 usr/share/usb_modeswitch/0fca:8020
 usr/share/usb_modeswitch/0fce:d0cf
@@ -248,6 +252,7 @@ usr/share/usb_modeswitch/12d1:15d0
 usr/share/usb_modeswitch/12d1:15d2
 usr/share/usb_modeswitch/12d1:15e7
 usr/share/usb_modeswitch/12d1:15ec
+usr/share/usb_modeswitch/12d1:15ee
 usr/share/usb_modeswitch/12d1:15f0
 usr/share/usb_modeswitch/12d1:1805
 usr/share/usb_modeswitch/12d1:1c0b
@@ -264,6 +269,7 @@ usr/share/usb_modeswitch/12d1:1f05
 usr/share/usb_modeswitch/12d1:1f06
 usr/share/usb_modeswitch/12d1:1f07
 usr/share/usb_modeswitch/12d1:1f09
+usr/share/usb_modeswitch/12d1:1f0a
 usr/share/usb_modeswitch/12d1:1f11
 usr/share/usb_modeswitch/12d1:1f15
 usr/share/usb_modeswitch/12d1:1f16
@@ -286,12 +292,16 @@ usr/share/usb_modeswitch/1410:5055
 usr/share/usb_modeswitch/1410:5059
 usr/share/usb_modeswitch/1410:7001
 usr/share/usb_modeswitch/1410:9020
+usr/share/usb_modeswitch/1410:9030
+usr/share/usb_modeswitch/1410:b00c
 usr/share/usb_modeswitch/148e:a000
 usr/share/usb_modeswitch/148f:2578
 usr/share/usb_modeswitch/148f:2878
 usr/share/usb_modeswitch/15eb:7153
+usr/share/usb_modeswitch/15eb:a403
 usr/share/usb_modeswitch/1614:0800
 usr/share/usb_modeswitch/1614:0802
+usr/share/usb_modeswitch/161c:f010
 usr/share/usb_modeswitch/16d5:f000
 usr/share/usb_modeswitch/16d8:6281
 usr/share/usb_modeswitch/16d8:6803
@@ -360,6 +370,7 @@ usr/share/usb_modeswitch/19d2:1233
 usr/share/usb_modeswitch/19d2:1237
 usr/share/usb_modeswitch/19d2:1238
 usr/share/usb_modeswitch/19d2:1420
+usr/share/usb_modeswitch/19d2:1421
 usr/share/usb_modeswitch/19d2:1511
 usr/share/usb_modeswitch/19d2:1514
 usr/share/usb_modeswitch/19d2:1517
@@ -391,6 +402,7 @@ usr/share/usb_modeswitch/1bbb:f000
 usr/share/usb_modeswitch/1bbb:f017
 usr/share/usb_modeswitch/1bbb:f052
 usr/share/usb_modeswitch/1c9e:1001
+usr/share/usb_modeswitch/1c9e:3003
 usr/share/usb_modeswitch/1c9e:6000
 usr/share/usb_modeswitch/1c9e:6061:uPr=Storage
 usr/share/usb_modeswitch/1c9e:9101
@@ -405,6 +417,7 @@ usr/share/usb_modeswitch/1c9e:9e08
 usr/share/usb_modeswitch/1c9e:f000
 usr/share/usb_modeswitch/1c9e:f000:uMa=USB_Modem
 usr/share/usb_modeswitch/1c9e:f010
+usr/share/usb_modeswitch/1c9e:f030
 usr/share/usb_modeswitch/1d09:1000
 usr/share/usb_modeswitch/1d09:1021
 usr/share/usb_modeswitch/1d09:1025
@@ -452,10 +465,12 @@ usr/share/usb_modeswitch/2001:a805
 usr/share/usb_modeswitch/2001:a809
 usr/share/usb_modeswitch/2001:a80b
 usr/share/usb_modeswitch/2001:ab00
+usr/share/usb_modeswitch/2001:ac01
 usr/share/usb_modeswitch/2015:0001
 usr/share/usb_modeswitch/201e:1023
 usr/share/usb_modeswitch/201e:2009
 usr/share/usb_modeswitch/2020:0002
+usr/share/usb_modeswitch/2020:2030
 usr/share/usb_modeswitch/2020:f00e
 usr/share/usb_modeswitch/2020:f00f
 usr/share/usb_modeswitch/2077:1000
@@ -479,12 +494,23 @@ usr/share/usb_modeswitch/230d:000d
 usr/share/usb_modeswitch/230d:0101
 usr/share/usb_modeswitch/230d:0103
 usr/share/usb_modeswitch/2357:0200
+usr/share/usb_modeswitch/2357:0600
 usr/share/usb_modeswitch/2357:f000
 usr/share/usb_modeswitch/23a2:1010
 usr/share/usb_modeswitch/257a:a000
 usr/share/usb_modeswitch/257a:b000
 usr/share/usb_modeswitch/257a:c000
 usr/share/usb_modeswitch/257a:d000
+usr/share/usb_modeswitch/2fd4:9aff
+usr/share/usb_modeswitch/413c:81a2
+usr/share/usb_modeswitch/413c:81a3
+usr/share/usb_modeswitch/413c:81a4
+usr/share/usb_modeswitch/413c:81a8
+usr/share/usb_modeswitch/413c:81b1
+usr/share/usb_modeswitch/413c:81b3
+usr/share/usb_modeswitch/413c:81d7
+usr/share/usb_modeswitch/413c:81e0
 usr/share/usb_modeswitch/6000:1000
 usr/share/usb_modeswitch/8888:6500
 usr/share/usb_modeswitch/ed09:1021
+usr/share/usb_modeswitch/new.lst
--- a/config/rootfiles/common/web-user-interface
+++ b/config/rootfiles/common/web-user-interface
@@ -308,6 +308,7 @@ srv/web/ipfire/html/images/wakeup.gif
 srv/web/ipfire/html/images/window-new.png
 srv/web/ipfire/html/include
 srv/web/ipfire/html/include/snortupdateutility.js
+srv/web/ipfire/html/include/zoneconf.js
 srv/web/ipfire/html/index.cgi
 srv/web/ipfire/html/redirect-templates
 srv/web/ipfire/html/redirect-templates/legacy
--- a/config/rootfiles/common/x86_64/go
+++ b/config/rootfiles/common/x86_64/go
--- a/config/rootfiles/common/x86_64/intel-microcode
+++ b/config/rootfiles/common/x86_64/intel-microcode
@@ -69,6 +69,7 @@ lib/firmware/intel-ucode/06-55-03
 lib/firmware/intel-ucode/06-55-04
 lib/firmware/intel-ucode/06-55-06
 lib/firmware/intel-ucode/06-55-07
+lib/firmware/intel-ucode/06-55-0b
 lib/firmware/intel-ucode/06-56-02
 lib/firmware/intel-ucode/06-56-03
 lib/firmware/intel-ucode/06-56-04
@@ -82,6 +83,7 @@ lib/firmware/intel-ucode/06-66-03
 lib/firmware/intel-ucode/06-7a-01
 lib/firmware/intel-ucode/06-7a-08
 lib/firmware/intel-ucode/06-7e-05
+lib/firmware/intel-ucode/06-8a-01
 lib/firmware/intel-ucode/06-8e-09
 lib/firmware/intel-ucode/06-8e-0a
 lib/firmware/intel-ucode/06-8e-0b
@@ -91,7 +93,11 @@ lib/firmware/intel-ucode/06-9e-0a
 lib/firmware/intel-ucode/06-9e-0b
 lib/firmware/intel-ucode/06-9e-0c
 lib/firmware/intel-ucode/06-9e-0d
+lib/firmware/intel-ucode/06-a5-02
+lib/firmware/intel-ucode/06-a5-03
+lib/firmware/intel-ucode/06-a5-05
 lib/firmware/intel-ucode/06-a6-00
+lib/firmware/intel-ucode/06-a6-01
 lib/firmware/intel-ucode/0f-00-07
 lib/firmware/intel-ucode/0f-00-0a
 lib/firmware/intel-ucode/0f-01-02
--- a/config/rootfiles/core/153/exclude
+++ b/config/rootfiles/core/153/exclude
--- a/config/rootfiles/core/153/filelists/aarch64/linux
+++ b/config/rootfiles/core/153/filelists/aarch64/linux
@@ -0,0 +1 @@
+../../../../common/aarch64/linux
--- a/config/rootfiles/core/153/filelists/aarch64/linux-initrd
+++ b/config/rootfiles/core/153/filelists/aarch64/linux-initrd
@@ -0,0 +1 @@
+../../../../common/aarch64/linux-initrd
--- a/config/rootfiles/core/153/filelists/armv5tel/linux-initrd-multi
+++ b/config/rootfiles/core/153/filelists/armv5tel/linux-initrd-multi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-initrd-multi
--- a/config/rootfiles/core/153/filelists/armv5tel/linux-multi
+++ b/config/rootfiles/core/153/filelists/armv5tel/linux-multi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-multi
--- a/config/rootfiles/core/153/filelists/bash
+++ b/config/rootfiles/core/153/filelists/bash
@@ -0,0 +1 @@
+../../../common/bash
--- a/config/rootfiles/core/153/filelists/curl
+++ b/config/rootfiles/core/153/filelists/curl
@@ -0,0 +1 @@
+../../../common/curl
--- a/config/rootfiles/core/153/filelists/ddns
+++ b/config/rootfiles/core/153/filelists/ddns
@@ -0,0 +1 @@
+../../../common/ddns
--- a/config/rootfiles/core/153/filelists/file
+++ b/config/rootfiles/core/153/filelists/file
@@ -0,0 +1 @@
+../../../common/file
--- a/config/rootfiles/core/153/filelists/files
+++ b/config/rootfiles/core/153/filelists/files
@@ -0,0 +1,27 @@
+etc/issue
+etc/ntp.conf
+etc/os-release
+etc/rc.d/init.d/network
+etc/rc.d/init.d/unbound
+etc/system-release
+etc/sysctl.conf
+lib/udev/network-hotplug-bridges
+srv/web/ipfire/cgi-bin/connections.cgi
+srv/web/ipfire/cgi-bin/country.cgi
+srv/web/ipfire/cgi-bin/credits.cgi
+srv/web/ipfire/cgi-bin/dns.cgi
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/ipinfo.cgi
+srv/web/ipfire/cgi-bin/location-block.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat
+srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/remote.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
+srv/web/ipfire/cgi-bin/zoneconf.cgi
+srv/web/ipfire/html/include/zoneconf.js
+usr/lib/firewall/rules.pl
+var/ipfire/location-functions.pl
+var/ipfire/langs
--- a/config/rootfiles/core/153/filelists/hwdata
+++ b/config/rootfiles/core/153/filelists/hwdata
@@ -0,0 +1 @@
+../../../common/hwdata
--- a/config/rootfiles/core/153/filelists/i586/intel-microcode
+++ b/config/rootfiles/core/153/filelists/i586/intel-microcode
@@ -0,0 +1 @@
+../../../../common/i586/intel-microcode
--- a/config/rootfiles/core/153/filelists/i586/linux
+++ b/config/rootfiles/core/153/filelists/i586/linux
@@ -0,0 +1 @@
+../../../../common/i586/linux
--- a/config/rootfiles/core/153/filelists/i586/linux-initrd
+++ b/config/rootfiles/core/153/filelists/i586/linux-initrd
@@ -0,0 +1 @@
+../../../../common/i586/linux-initrd
--- a/config/rootfiles/core/153/filelists/ids-ruleset-sources
+++ b/config/rootfiles/core/153/filelists/ids-ruleset-sources
@@ -0,0 +1 @@
+../../../common/ids-ruleset-sources
--- a/config/rootfiles/core/153/filelists/knot
+++ b/config/rootfiles/core/153/filelists/knot
--- a/config/rootfiles/core/153/filelists/libarchive
+++ b/config/rootfiles/core/153/filelists/libarchive
@@ -0,0 +1 @@
+../../../common/libarchive
--- a/config/rootfiles/core/153/filelists/libhtp
+++ b/config/rootfiles/core/153/filelists/libhtp
--- a/config/rootfiles/core/153/filelists/libloc
+++ b/config/rootfiles/core/153/filelists/libloc
--- a/config/rootfiles/core/153/filelists/logwatch
+++ b/config/rootfiles/core/153/filelists/logwatch
@@ -0,0 +1 @@
+../../../common/logwatch
--- a/config/rootfiles/core/153/filelists/openvpn
+++ b/config/rootfiles/core/153/filelists/openvpn
@@ -0,0 +1 @@
+../../../common/openvpn
--- a/config/rootfiles/core/153/filelists/strongswan
+++ b/config/rootfiles/core/153/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
--- a/config/rootfiles/core/153/filelists/suricata
+++ b/config/rootfiles/core/153/filelists/suricata
--- a/config/rootfiles/core/153/filelists/tzdata
+++ b/config/rootfiles/core/153/filelists/tzdata
@@ -0,0 +1 @@
+../../../common/tzdata
--- a/config/rootfiles/core/153/filelists/usb_modeswitch
+++ b/config/rootfiles/core/153/filelists/usb_modeswitch
@@ -0,0 +1 @@
+../../../common/usb_modeswitch
--- a/config/rootfiles/core/153/filelists/usb_modeswitch_data
+++ b/config/rootfiles/core/153/filelists/usb_modeswitch_data
@@ -0,0 +1 @@
+../../../common/usb_modeswitch_data
--- a/config/rootfiles/core/153/filelists/x86_64/intel-microcode
+++ b/config/rootfiles/core/153/filelists/x86_64/intel-microcode
@@ -0,0 +1 @@
+../../../../common/x86_64/intel-microcode
--- a/config/rootfiles/core/153/filelists/x86_64/linux
+++ b/config/rootfiles/core/153/filelists/x86_64/linux
@@ -0,0 +1 @@
+../../../../common/x86_64/linux
--- a/config/rootfiles/core/153/filelists/x86_64/linux-initrd
+++ b/config/rootfiles/core/153/filelists/x86_64/linux-initrd
@@ -0,0 +1 @@
+../../../../common/x86_64/linux-initrd
--- a/config/rootfiles/core/153/update.sh
+++ b/config/rootfiles/core/153/update.sh
@@ -0,0 +1,159 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire 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.                                      #
+#                                                                          #
+# IPFire 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 IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2020 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=153
+
+exit_with_error() {
+	# Set last succesfull installed core.
+	echo $(($core-1)) > /opt/pakfire/db/core/mine
+	# force fsck at next boot, this may fix free space on xfs
+	touch /forcefsck
+	# don't start pakfire again at error
+	killall -KILL pak_update
+	/usr/bin/logger -p syslog.emerg -t ipfire \
+		"core-update-${core}: $1"
+	exit $2
+}
+
+# Remove old core updates from pakfire cache to save space...
+for (( i=1; i<=$core; i++ )); do
+	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+KVER="xxxKVERxxx"
+
+# Backup uEnv.txt if exist
+if [ -e /boot/uEnv.txt ]; then
+	cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
+fi
+
+# Do some sanity checks.
+case $(uname -r) in
+	*-ipfire-kirkwood)
+		exit_with_error "ERROR cannot update. kirkwood kernel was not supported." 1
+		;;
+	*-ipfire*)
+		# Ok.
+		;;
+	*)
+		exit_with_error "ERROR cannot update. No IPFire Kernel." 1
+		;;
+esac
+if [ -e /boot/grub/grub.conf ]; then
+	exit_with_error "ERROR unsupported GRUB1/pygrub found!" 1
+fi
+
+# Check diskspace on root
+ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+
+if [ $ROOTSPACE -lt 100000 ]; then
+	exit_with_error "ERROR cannot update because not enough free space on root." 2
+	exit 2
+fi
+
+# Remove the old kernel
+rm -rf /boot/System.map-*
+rm -rf /boot/config-*
+rm -rf /boot/ipfirerd-*
+rm -rf /boot/initramfs-*
+rm -rf /boot/vmlinuz-*
+rm -rf /boot/uImage-*-ipfire-*
+rm -rf /boot/zImage-*-ipfire-*
+rm -rf /boot/uInit-*-ipfire-*
+rm -rf /boot/dtb-*-ipfire-*
+rm -rf /lib/modules
+
+# Remove files
+
+# Stop services
+/etc/init.d/ipsec stop
+/usr/local/bin/openvpnctrl -k
+/usr/local/bin/openvpnctrl -kn2n
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# Update permissions
+chown -vR root:root /etc/ntp
+
+# Update owernship of "/var/ipfire/red"
+chown nobody:nobody /var/ipfire/red
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Filesytem cleanup
+/usr/local/bin/filesystem-cleanup
+
+# Fix invalid cronjob syntax
+sed -e "s/^%hourly,random \* \* \*/%hourly,random */g" \
+	-i /var/spool/cron/root.orig
+fcrontab -z
+
+# Start services
+if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
+    /etc/init.d/ipsec start
+fi
+/etc/init.d/suricata restart
+/usr/local/bin/openvpnctrl -s
+/usr/local/bin/openvpnctrl -sn2n
+
+# Reload sysctl.conf
+sysctl -p
+
+# remove lm_sensor config after collectd was started
+# to reserch sensors at next boot with updated kernel
+rm -f  /etc/sysconfig/lm_sensors
+
+# Upadate Kernel version uEnv.txt
+if [ -e /boot/uEnv.txt ]; then
+	sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt
+fi
+
+# call user update script (needed for some arm boards)
+if [ -e /boot/pakfire-kernel-update ]; then
+	/boot/pakfire-kernel-update ${KVER}
+fi
+
+# This update needs a reboot...
+touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+	grub-mkconfig -o /boot/grub/grub.cfg
+fi
+
+sync
+
+# Don't report the exitcode last command
+exit 0
--- a/config/rootfiles/oldcore/152/exclude
+++ b/config/rootfiles/oldcore/152/exclude
@@ -0,0 +1,32 @@
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+etc/alternatives
+etc/collectd.custom
+etc/default/grub
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/dma
+var/ipfire/time
+var/ipfire/firewall/locationblock
+var/ipfire/fwhosts/customlocationgrp
+var/ipfire/ovpn
+var/ipfire/urlfilter/blacklist
+var/ipfire/urlfilter/settings
+var/lib/alternatives
+var/log/cache
+var/log/dhcpcd.log
+var/log/messages
+var/state/dhcp/dhcpd.leases
+var/updatecache
--- a/config/rootfiles/oldcore/152/filelists/aarch64/python
+++ b/config/rootfiles/oldcore/152/filelists/aarch64/python
--- a/config/rootfiles/oldcore/152/filelists/aarch64/python3
+++ b/config/rootfiles/oldcore/152/filelists/aarch64/python3
--- a/config/rootfiles/oldcore/152/filelists/armv5tel/python
+++ b/config/rootfiles/oldcore/152/filelists/armv5tel/python
--- a/config/rootfiles/oldcore/152/filelists/armv5tel/python3
+++ b/config/rootfiles/oldcore/152/filelists/armv5tel/python3
--- a/config/rootfiles/oldcore/152/filelists/ca-certificates
+++ b/config/rootfiles/oldcore/152/filelists/ca-certificates
--- a/config/rootfiles/oldcore/152/filelists/files
+++ b/config/rootfiles/oldcore/152/filelists/files
--- a/config/rootfiles/oldcore/152/filelists/i586/python
+++ b/config/rootfiles/oldcore/152/filelists/i586/python
--- a/config/rootfiles/oldcore/152/filelists/i586/python3
+++ b/config/rootfiles/oldcore/152/filelists/i586/python3
--- a/config/rootfiles/oldcore/152/filelists/knot
+++ b/config/rootfiles/oldcore/152/filelists/knot
@@ -0,0 +1 @@
+../../../common/knot
--- a/config/rootfiles/oldcore/152/filelists/libhtp
+++ b/config/rootfiles/oldcore/152/filelists/libhtp
@@ -0,0 +1 @@
+../../../common/libhtp
--- a/config/rootfiles/oldcore/152/filelists/setup
+++ b/config/rootfiles/oldcore/152/filelists/setup
--- a/config/rootfiles/oldcore/152/filelists/suricata
+++ b/config/rootfiles/oldcore/152/filelists/suricata
@@ -0,0 +1 @@
+../../../common/suricata
--- a/config/rootfiles/oldcore/152/filelists/unbound
+++ b/config/rootfiles/oldcore/152/filelists/unbound
--- a/config/rootfiles/oldcore/152/filelists/x86_64/python
+++ b/config/rootfiles/oldcore/152/filelists/x86_64/python
--- a/config/rootfiles/oldcore/152/filelists/x86_64/python3
+++ b/config/rootfiles/oldcore/152/filelists/x86_64/python3
--- a/config/rootfiles/oldcore/152/filelists/yaml
+++ b/config/rootfiles/oldcore/152/filelists/yaml
--- a/config/rootfiles/oldcore/152/update.sh
+++ b/config/rootfiles/oldcore/152/update.sh
--- a/config/rootfiles/packages/aarch64/vdr_dvbapi
+++ b/config/rootfiles/packages/aarch64/vdr_dvbapi
@@ -1,3 +1,3 @@
 etc/sysconfig/vdr-plugins.d/dvbapi.conf
 etc/vdr/plugins/dvbapi
-usr/lib/vdr/libvdr-dvbapi.so.2.4.1
+usr/lib/vdr/libvdr-dvbapi.so.2.4.4
--- a/config/rootfiles/packages/amavisd
+++ b/config/rootfiles/packages/amavisd
@@ -1,7 +0,0 @@
-etc/amavisd.conf
-etc/rc.d/init.d/amavisd
-usr/bin/amavisd
-var/amavis
-var/amavis/db
-var/amavis/tmp
-var/virusmails
--- a/config/rootfiles/packages/apcupsd
+++ b/config/rootfiles/packages/apcupsd
@@ -33,3 +33,4 @@ srv/web/ipfire/cgi-bin/upsstats.cgi
 #usr/share/man/man8/apcupsd.8
 etc/rc.d/init.d/apcupsd
 var/ipfire/menu.d/EX-apcupsd.menu
+var/ipfire/backup/addons/includes/apcupsd
--- a/config/rootfiles/packages/armv5tel/vdr_dvbapi
+++ b/config/rootfiles/packages/armv5tel/vdr_dvbapi
@@ -1,3 +1,3 @@
 etc/sysconfig/vdr-plugins.d/dvbapi.conf
 etc/vdr/plugins/dvbapi
-usr/lib/vdr/libvdr-dvbapi.so.2.4.1
+usr/lib/vdr/libvdr-dvbapi.so.2.4.4
--- a/config/rootfiles/packages/aws-cli
+++ b/config/rootfiles/packages/aws-cli
--- a/config/rootfiles/packages/ghostscript
+++ b/config/rootfiles/packages/ghostscript
@@ -25,209 +25,208 @@ usr/bin/ps2ps
 usr/bin/ps2ps2
 usr/bin/unix-lpr.sh
 #usr/share/doc/ghostscript
-#usr/share/doc/ghostscript/9.26
-#usr/share/doc/ghostscript/9.26/API.htm
-#usr/share/doc/ghostscript/9.26/C-style.htm
-#usr/share/doc/ghostscript/9.26/Commprod.htm
-#usr/share/doc/ghostscript/9.26/DLL.htm
-#usr/share/doc/ghostscript/9.26/Deprecated.htm
-#usr/share/doc/ghostscript/9.26/Develop.htm
-#usr/share/doc/ghostscript/9.26/Devices.htm
-#usr/share/doc/ghostscript/9.26/Drivers.htm
-#usr/share/doc/ghostscript/9.26/Fonts.htm
-#usr/share/doc/ghostscript/9.26/GS9_Color_Management.pdf
-#usr/share/doc/ghostscript/9.26/History9.htm
-#usr/share/doc/ghostscript/9.26/Install.htm
-#usr/share/doc/ghostscript/9.26/Language.htm
-#usr/share/doc/ghostscript/9.26/Lib.htm
-#usr/share/doc/ghostscript/9.26/Make.htm
-#usr/share/doc/ghostscript/9.26/News.htm
-#usr/share/doc/ghostscript/9.26/Ps-style.htm
-#usr/share/doc/ghostscript/9.26/Ps2epsi.htm
-#usr/share/doc/ghostscript/9.26/Psfiles.htm
-#usr/share/doc/ghostscript/9.26/Readme.htm
-#usr/share/doc/ghostscript/9.26/Release.htm
-#usr/share/doc/ghostscript/9.26/SavedPages.htm
-#usr/share/doc/ghostscript/9.26/Source.htm
-#usr/share/doc/ghostscript/9.26/Unix-lpr.htm
-#usr/share/doc/ghostscript/9.26/Use.htm
-#usr/share/doc/ghostscript/9.26/VectorDevices.htm
-#usr/share/doc/ghostscript/9.26/WhatIsGS.htm
-#usr/share/doc/ghostscript/9.26/gdevds32.c
-#usr/share/doc/ghostscript/9.26/gs-style.css
-#usr/share/doc/ghostscript/9.26/images
-#usr/share/doc/ghostscript/9.26/images/Artifex_logo.png
-#usr/share/doc/ghostscript/9.26/images/favicon.png
-#usr/share/doc/ghostscript/9.26/images/ghostscript_logo.png
-#usr/share/doc/ghostscript/9.26/images/hamburger-light.png
-#usr/share/doc/ghostscript/9.26/images/x-light.png
-#usr/share/doc/ghostscript/9.26/index.html
-#usr/share/doc/ghostscript/9.26/index.js
-#usr/share/doc/ghostscript/9.26/pscet_status.txt
-#usr/share/doc/ghostscript/9.26/sample_downscale_device.htm
-#usr/share/doc/ghostscript/9.26/style.css
-#usr/share/doc/ghostscript/9.26/subclass.htm
-#usr/share/doc/ghostscript/9.26/thirdparty.htm
+#usr/share/doc/ghostscript/9.53.3
+#usr/share/doc/ghostscript/9.53.3/API.htm
+#usr/share/doc/ghostscript/9.53.3/C-style.htm
+#usr/share/doc/ghostscript/9.53.3/COPYING
+#usr/share/doc/ghostscript/9.53.3/Commprod.htm
+#usr/share/doc/ghostscript/9.53.3/DLL.htm
+#usr/share/doc/ghostscript/9.53.3/Deprecated.htm
+#usr/share/doc/ghostscript/9.53.3/Develop.htm
+#usr/share/doc/ghostscript/9.53.3/Devices.htm
+#usr/share/doc/ghostscript/9.53.3/Drivers.htm
+#usr/share/doc/ghostscript/9.53.3/Fonts.htm
+#usr/share/doc/ghostscript/9.53.3/GS9_Color_Management.pdf
+#usr/share/doc/ghostscript/9.53.3/History9.htm
+#usr/share/doc/ghostscript/9.53.3/Install.htm
+#usr/share/doc/ghostscript/9.53.3/Language.htm
+#usr/share/doc/ghostscript/9.53.3/Lib.htm
+#usr/share/doc/ghostscript/9.53.3/Make.htm
+#usr/share/doc/ghostscript/9.53.3/News.htm
+#usr/share/doc/ghostscript/9.53.3/Ps-style.htm
+#usr/share/doc/ghostscript/9.53.3/Ps2epsi.htm
+#usr/share/doc/ghostscript/9.53.3/Psfiles.htm
+#usr/share/doc/ghostscript/9.53.3/Readme.htm
+#usr/share/doc/ghostscript/9.53.3/Release.htm
+#usr/share/doc/ghostscript/9.53.3/SavedPages.htm
+#usr/share/doc/ghostscript/9.53.3/Source.htm
+#usr/share/doc/ghostscript/9.53.3/Unix-lpr.htm
+#usr/share/doc/ghostscript/9.53.3/Use.htm
+#usr/share/doc/ghostscript/9.53.3/VectorDevices.htm
+#usr/share/doc/ghostscript/9.53.3/WhatIsGS.htm
+#usr/share/doc/ghostscript/9.53.3/gdevds32.c
+#usr/share/doc/ghostscript/9.53.3/gs-style.css
+#usr/share/doc/ghostscript/9.53.3/images
+#usr/share/doc/ghostscript/9.53.3/images/Artifex_logo.png
+#usr/share/doc/ghostscript/9.53.3/images/favicon.png
+#usr/share/doc/ghostscript/9.53.3/images/ghostscript_logo.png
+#usr/share/doc/ghostscript/9.53.3/images/hamburger-light.png
+#usr/share/doc/ghostscript/9.53.3/images/x-light.png
+#usr/share/doc/ghostscript/9.53.3/index.html
+#usr/share/doc/ghostscript/9.53.3/index.js
+#usr/share/doc/ghostscript/9.53.3/pscet_status.txt
+#usr/share/doc/ghostscript/9.53.3/sample_downscale_device.htm
+#usr/share/doc/ghostscript/9.53.3/style.css
+#usr/share/doc/ghostscript/9.53.3/subclass.htm
+#usr/share/doc/ghostscript/9.53.3/thirdparty.htm
 #usr/share/ghostscript
-#usr/share/ghostscript/9.26
-#usr/share/ghostscript/9.26/lib
-#usr/share/ghostscript/9.26/lib/PDFA_def.ps
-#usr/share/ghostscript/9.26/lib/PDFX_def.ps
-#usr/share/ghostscript/9.26/lib/PM760p.upp
-#usr/share/ghostscript/9.26/lib/PM760pl.upp
-#usr/share/ghostscript/9.26/lib/PM820p.upp
-#usr/share/ghostscript/9.26/lib/PM820pl.upp
-#usr/share/ghostscript/9.26/lib/Stc670p.upp
-#usr/share/ghostscript/9.26/lib/Stc670pl.upp
-#usr/share/ghostscript/9.26/lib/Stc680p.upp
-#usr/share/ghostscript/9.26/lib/Stc680pl.upp
-#usr/share/ghostscript/9.26/lib/Stc740p.upp
-#usr/share/ghostscript/9.26/lib/Stc740pl.upp
-#usr/share/ghostscript/9.26/lib/Stc760p.upp
-#usr/share/ghostscript/9.26/lib/Stc760pl.upp
-#usr/share/ghostscript/9.26/lib/Stc777p.upp
-#usr/share/ghostscript/9.26/lib/Stc777pl.upp
-#usr/share/ghostscript/9.26/lib/Stp720p.upp
-#usr/share/ghostscript/9.26/lib/Stp720pl.upp
-#usr/share/ghostscript/9.26/lib/Stp870p.upp
-#usr/share/ghostscript/9.26/lib/Stp870pl.upp
-#usr/share/ghostscript/9.26/lib/acctest.ps
-#usr/share/ghostscript/9.26/lib/align.ps
-#usr/share/ghostscript/9.26/lib/bj8.rpd
-#usr/share/ghostscript/9.26/lib/bj8gc12f.upp
-#usr/share/ghostscript/9.26/lib/bj8hg12f.upp
-#usr/share/ghostscript/9.26/lib/bj8oh06n.upp
-#usr/share/ghostscript/9.26/lib/bj8pa06n.upp
-#usr/share/ghostscript/9.26/lib/bj8pp12f.upp
-#usr/share/ghostscript/9.26/lib/bj8ts06n.upp
-#usr/share/ghostscript/9.26/lib/bjc6000a1.upp
-#usr/share/ghostscript/9.26/lib/bjc6000b1.upp
-#usr/share/ghostscript/9.26/lib/bjc610a0.upp
-#usr/share/ghostscript/9.26/lib/bjc610a1.upp
-#usr/share/ghostscript/9.26/lib/bjc610a2.upp
-#usr/share/ghostscript/9.26/lib/bjc610a3.upp
-#usr/share/ghostscript/9.26/lib/bjc610a4.upp
-#usr/share/ghostscript/9.26/lib/bjc610a5.upp
-#usr/share/ghostscript/9.26/lib/bjc610a6.upp
-#usr/share/ghostscript/9.26/lib/bjc610a7.upp
-#usr/share/ghostscript/9.26/lib/bjc610a8.upp
-#usr/share/ghostscript/9.26/lib/bjc610b1.upp
-#usr/share/ghostscript/9.26/lib/bjc610b2.upp
-#usr/share/ghostscript/9.26/lib/bjc610b3.upp
-#usr/share/ghostscript/9.26/lib/bjc610b4.upp
-#usr/share/ghostscript/9.26/lib/bjc610b6.upp
-#usr/share/ghostscript/9.26/lib/bjc610b7.upp
-#usr/share/ghostscript/9.26/lib/bjc610b8.upp
-#usr/share/ghostscript/9.26/lib/caption.ps
-#usr/share/ghostscript/9.26/lib/cbjc600.ppd
-#usr/share/ghostscript/9.26/lib/cbjc800.ppd
-#usr/share/ghostscript/9.26/lib/cdj550.upp
-#usr/share/ghostscript/9.26/lib/cdj690.upp
-#usr/share/ghostscript/9.26/lib/cdj690ec.upp
-#usr/share/ghostscript/9.26/lib/cid2code.ps
-#usr/share/ghostscript/9.26/lib/dmp_init.ps
-#usr/share/ghostscript/9.26/lib/dmp_site.ps
-#usr/share/ghostscript/9.26/lib/dnj750c.upp
-#usr/share/ghostscript/9.26/lib/dnj750m.upp
-#usr/share/ghostscript/9.26/lib/docie.ps
-#usr/share/ghostscript/9.26/lib/escp_24.src
-#usr/share/ghostscript/9.26/lib/font2pcl.ps
-#usr/share/ghostscript/9.26/lib/ghostpdf.ppd
-#usr/share/ghostscript/9.26/lib/gs_ce_e.ps
-#usr/share/ghostscript/9.26/lib/gs_il2_e.ps
-#usr/share/ghostscript/9.26/lib/gs_kanji.ps
-#usr/share/ghostscript/9.26/lib/gs_ksb_e.ps
-#usr/share/ghostscript/9.26/lib/gs_l.xbm
-#usr/share/ghostscript/9.26/lib/gs_l.xpm
-#usr/share/ghostscript/9.26/lib/gs_l_m.xbm
-#usr/share/ghostscript/9.26/lib/gs_lgo_e.ps
-#usr/share/ghostscript/9.26/lib/gs_lgx_e.ps
-#usr/share/ghostscript/9.26/lib/gs_m.xbm
-#usr/share/ghostscript/9.26/lib/gs_m.xpm
-#usr/share/ghostscript/9.26/lib/gs_m_m.xbm
-#usr/share/ghostscript/9.26/lib/gs_s.xbm
-#usr/share/ghostscript/9.26/lib/gs_s.xpm
-#usr/share/ghostscript/9.26/lib/gs_s_m.xbm
-#usr/share/ghostscript/9.26/lib/gs_t.xbm
-#usr/share/ghostscript/9.26/lib/gs_t.xpm
-#usr/share/ghostscript/9.26/lib/gs_t_m.xbm
-#usr/share/ghostscript/9.26/lib/gs_wl1_e.ps
-#usr/share/ghostscript/9.26/lib/gs_wl2_e.ps
-#usr/share/ghostscript/9.26/lib/gs_wl5_e.ps
-#usr/share/ghostscript/9.26/lib/gslp.ps
-#usr/share/ghostscript/9.26/lib/gsnup.ps
-#usr/share/ghostscript/9.26/lib/ht_ccsto.ps
-#usr/share/ghostscript/9.26/lib/image-qa.ps
-#usr/share/ghostscript/9.26/lib/jispaper.ps
-#usr/share/ghostscript/9.26/lib/landscap.ps
-#usr/share/ghostscript/9.26/lib/lines.ps
-#usr/share/ghostscript/9.26/lib/mkcidfm.ps
-#usr/share/ghostscript/9.26/lib/necp2x.upp
-#usr/share/ghostscript/9.26/lib/necp2x6.upp
-#usr/share/ghostscript/9.26/lib/pdf2dsc.ps
-#usr/share/ghostscript/9.26/lib/pf2afm.ps
-#usr/share/ghostscript/9.26/lib/pfbtopfa.ps
-#usr/share/ghostscript/9.26/lib/ppath.ps
-#usr/share/ghostscript/9.26/lib/pphs.ps
-#usr/share/ghostscript/9.26/lib/prfont.ps
-#usr/share/ghostscript/9.26/lib/printafm.ps
-#usr/share/ghostscript/9.26/lib/ps2ai.ps
-#usr/share/ghostscript/9.26/lib/ps2epsi.ps
-#usr/share/ghostscript/9.26/lib/ras1.upp
-#usr/share/ghostscript/9.26/lib/ras24.upp
-#usr/share/ghostscript/9.26/lib/ras3.upp
-#usr/share/ghostscript/9.26/lib/ras32.upp
-#usr/share/ghostscript/9.26/lib/ras4.upp
-#usr/share/ghostscript/9.26/lib/ras8m.upp
-#usr/share/ghostscript/9.26/lib/rollconv.ps
-#usr/share/ghostscript/9.26/lib/s400a1.upp
-#usr/share/ghostscript/9.26/lib/s400b1.upp
-#usr/share/ghostscript/9.26/lib/sharp.upp
-#usr/share/ghostscript/9.26/lib/sipixa6.upp
-#usr/share/ghostscript/9.26/lib/st640ih.upp
-#usr/share/ghostscript/9.26/lib/st640ihg.upp
-#usr/share/ghostscript/9.26/lib/st640p.upp
-#usr/share/ghostscript/9.26/lib/st640pg.upp
-#usr/share/ghostscript/9.26/lib/st640pl.upp
-#usr/share/ghostscript/9.26/lib/st640plg.upp
-#usr/share/ghostscript/9.26/lib/stc.upp
-#usr/share/ghostscript/9.26/lib/stc1520h.upp
-#usr/share/ghostscript/9.26/lib/stc2.upp
-#usr/share/ghostscript/9.26/lib/stc200_h.upp
-#usr/share/ghostscript/9.26/lib/stc2_h.upp
-#usr/share/ghostscript/9.26/lib/stc2s_h.upp
-#usr/share/ghostscript/9.26/lib/stc300.upp
-#usr/share/ghostscript/9.26/lib/stc300bl.upp
-#usr/share/ghostscript/9.26/lib/stc300bm.upp
-#usr/share/ghostscript/9.26/lib/stc500p.upp
-#usr/share/ghostscript/9.26/lib/stc500ph.upp
-#usr/share/ghostscript/9.26/lib/stc600ih.upp
-#usr/share/ghostscript/9.26/lib/stc600p.upp
-#usr/share/ghostscript/9.26/lib/stc600pl.upp
-#usr/share/ghostscript/9.26/lib/stc640p.upp
-#usr/share/ghostscript/9.26/lib/stc740ih.upp
-#usr/share/ghostscript/9.26/lib/stc800ih.upp
-#usr/share/ghostscript/9.26/lib/stc800p.upp
-#usr/share/ghostscript/9.26/lib/stc800pl.upp
-#usr/share/ghostscript/9.26/lib/stc_h.upp
-#usr/share/ghostscript/9.26/lib/stc_l.upp
-#usr/share/ghostscript/9.26/lib/stcany.upp
-#usr/share/ghostscript/9.26/lib/stcany_h.upp
-#usr/share/ghostscript/9.26/lib/stcinfo.ps
-#usr/share/ghostscript/9.26/lib/stcolor.ps
-#usr/share/ghostscript/9.26/lib/stocht.ps
-#usr/share/ghostscript/9.26/lib/traceimg.ps
-#usr/share/ghostscript/9.26/lib/traceop.ps
-#usr/share/ghostscript/9.26/lib/uninfo.ps
-#usr/share/ghostscript/9.26/lib/viewcmyk.ps
-#usr/share/ghostscript/9.26/lib/viewgif.ps
-#usr/share/ghostscript/9.26/lib/viewjpeg.ps
-#usr/share/ghostscript/9.26/lib/viewmiff.ps
-#usr/share/ghostscript/9.26/lib/viewpbm.ps
-#usr/share/ghostscript/9.26/lib/viewpcx.ps
-#usr/share/ghostscript/9.26/lib/viewps2a.ps
-#usr/share/ghostscript/9.26/lib/winmaps.ps
-#usr/share/ghostscript/9.26/lib/zeroline.ps
+#usr/share/ghostscript/9.53.3
+#usr/share/ghostscript/9.53.3/lib
+#usr/share/ghostscript/9.53.3/lib/PDFA_def.ps
+#usr/share/ghostscript/9.53.3/lib/PDFX_def.ps
+#usr/share/ghostscript/9.53.3/lib/PM760p.upp
+#usr/share/ghostscript/9.53.3/lib/PM760pl.upp
+#usr/share/ghostscript/9.53.3/lib/PM820p.upp
+#usr/share/ghostscript/9.53.3/lib/PM820pl.upp
+#usr/share/ghostscript/9.53.3/lib/Stc670p.upp
+#usr/share/ghostscript/9.53.3/lib/Stc670pl.upp
+#usr/share/ghostscript/9.53.3/lib/Stc680p.upp
+#usr/share/ghostscript/9.53.3/lib/Stc680pl.upp
+#usr/share/ghostscript/9.53.3/lib/Stc740p.upp
+#usr/share/ghostscript/9.53.3/lib/Stc740pl.upp
+#usr/share/ghostscript/9.53.3/lib/Stc760p.upp
+#usr/share/ghostscript/9.53.3/lib/Stc760pl.upp
+#usr/share/ghostscript/9.53.3/lib/Stc777p.upp
+#usr/share/ghostscript/9.53.3/lib/Stc777pl.upp
+#usr/share/ghostscript/9.53.3/lib/Stp720p.upp
+#usr/share/ghostscript/9.53.3/lib/Stp720pl.upp
+#usr/share/ghostscript/9.53.3/lib/Stp870p.upp
+#usr/share/ghostscript/9.53.3/lib/Stp870pl.upp
+#usr/share/ghostscript/9.53.3/lib/acctest.ps
+#usr/share/ghostscript/9.53.3/lib/align.ps
+#usr/share/ghostscript/9.53.3/lib/bj8.rpd
+#usr/share/ghostscript/9.53.3/lib/bj8gc12f.upp
+#usr/share/ghostscript/9.53.3/lib/bj8hg12f.upp
+#usr/share/ghostscript/9.53.3/lib/bj8oh06n.upp
+#usr/share/ghostscript/9.53.3/lib/bj8pa06n.upp
+#usr/share/ghostscript/9.53.3/lib/bj8pp12f.upp
+#usr/share/ghostscript/9.53.3/lib/bj8ts06n.upp
+#usr/share/ghostscript/9.53.3/lib/bjc6000a1.upp
+#usr/share/ghostscript/9.53.3/lib/bjc6000b1.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610a0.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610a1.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610a2.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610a3.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610a4.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610a5.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610a6.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610a7.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610a8.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610b1.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610b2.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610b3.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610b4.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610b6.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610b7.upp
+#usr/share/ghostscript/9.53.3/lib/bjc610b8.upp
+#usr/share/ghostscript/9.53.3/lib/caption.ps
+#usr/share/ghostscript/9.53.3/lib/cbjc600.ppd
+#usr/share/ghostscript/9.53.3/lib/cbjc800.ppd
+#usr/share/ghostscript/9.53.3/lib/cdj550.upp
+#usr/share/ghostscript/9.53.3/lib/cdj690.upp
+#usr/share/ghostscript/9.53.3/lib/cdj690ec.upp
+#usr/share/ghostscript/9.53.3/lib/cid2code.ps
+#usr/share/ghostscript/9.53.3/lib/dnj750c.upp
+#usr/share/ghostscript/9.53.3/lib/dnj750m.upp
+#usr/share/ghostscript/9.53.3/lib/docie.ps
+#usr/share/ghostscript/9.53.3/lib/font2pcl.ps
+#usr/share/ghostscript/9.53.3/lib/ghostpdf.ppd
+#usr/share/ghostscript/9.53.3/lib/gs_ce_e.ps
+#usr/share/ghostscript/9.53.3/lib/gs_il2_e.ps
+#usr/share/ghostscript/9.53.3/lib/gs_kanji.ps
+#usr/share/ghostscript/9.53.3/lib/gs_ksb_e.ps
+#usr/share/ghostscript/9.53.3/lib/gs_l.xbm
+#usr/share/ghostscript/9.53.3/lib/gs_l.xpm
+#usr/share/ghostscript/9.53.3/lib/gs_l_m.xbm
+#usr/share/ghostscript/9.53.3/lib/gs_lgo_e.ps
+#usr/share/ghostscript/9.53.3/lib/gs_lgx_e.ps
+#usr/share/ghostscript/9.53.3/lib/gs_m.xbm
+#usr/share/ghostscript/9.53.3/lib/gs_m.xpm
+#usr/share/ghostscript/9.53.3/lib/gs_m_m.xbm
+#usr/share/ghostscript/9.53.3/lib/gs_s.xbm
+#usr/share/ghostscript/9.53.3/lib/gs_s.xpm
+#usr/share/ghostscript/9.53.3/lib/gs_s_m.xbm
+#usr/share/ghostscript/9.53.3/lib/gs_t.xbm
+#usr/share/ghostscript/9.53.3/lib/gs_t.xpm
+#usr/share/ghostscript/9.53.3/lib/gs_t_m.xbm
+#usr/share/ghostscript/9.53.3/lib/gs_wl1_e.ps
+#usr/share/ghostscript/9.53.3/lib/gs_wl2_e.ps
+#usr/share/ghostscript/9.53.3/lib/gs_wl5_e.ps
+#usr/share/ghostscript/9.53.3/lib/gslp.ps
+#usr/share/ghostscript/9.53.3/lib/gsnup.ps
+#usr/share/ghostscript/9.53.3/lib/ht_ccsto.ps
+#usr/share/ghostscript/9.53.3/lib/image-qa.ps
+#usr/share/ghostscript/9.53.3/lib/jispaper.ps
+#usr/share/ghostscript/9.53.3/lib/landscap.ps
+#usr/share/ghostscript/9.53.3/lib/lines.ps
+#usr/share/ghostscript/9.53.3/lib/mkcidfm.ps
+#usr/share/ghostscript/9.53.3/lib/necp2x.upp
+#usr/share/ghostscript/9.53.3/lib/necp2x6.upp
+#usr/share/ghostscript/9.53.3/lib/pdf2dsc.ps
+#usr/share/ghostscript/9.53.3/lib/pdf_info.ps
+#usr/share/ghostscript/9.53.3/lib/pf2afm.ps
+#usr/share/ghostscript/9.53.3/lib/pfbtopfa.ps
+#usr/share/ghostscript/9.53.3/lib/ppath.ps
+#usr/share/ghostscript/9.53.3/lib/pphs.ps
+#usr/share/ghostscript/9.53.3/lib/prfont.ps
+#usr/share/ghostscript/9.53.3/lib/printafm.ps
+#usr/share/ghostscript/9.53.3/lib/ps2ai.ps
+#usr/share/ghostscript/9.53.3/lib/ps2epsi.ps
+#usr/share/ghostscript/9.53.3/lib/ras1.upp
+#usr/share/ghostscript/9.53.3/lib/ras24.upp
+#usr/share/ghostscript/9.53.3/lib/ras3.upp
+#usr/share/ghostscript/9.53.3/lib/ras32.upp
+#usr/share/ghostscript/9.53.3/lib/ras4.upp
+#usr/share/ghostscript/9.53.3/lib/ras8m.upp
+#usr/share/ghostscript/9.53.3/lib/rollconv.ps
+#usr/share/ghostscript/9.53.3/lib/s400a1.upp
+#usr/share/ghostscript/9.53.3/lib/s400b1.upp
+#usr/share/ghostscript/9.53.3/lib/sharp.upp
+#usr/share/ghostscript/9.53.3/lib/sipixa6.upp
+#usr/share/ghostscript/9.53.3/lib/st640ih.upp
+#usr/share/ghostscript/9.53.3/lib/st640ihg.upp
+#usr/share/ghostscript/9.53.3/lib/st640p.upp
+#usr/share/ghostscript/9.53.3/lib/st640pg.upp
+#usr/share/ghostscript/9.53.3/lib/st640pl.upp
+#usr/share/ghostscript/9.53.3/lib/st640plg.upp
+#usr/share/ghostscript/9.53.3/lib/stc.upp
+#usr/share/ghostscript/9.53.3/lib/stc1520h.upp
+#usr/share/ghostscript/9.53.3/lib/stc2.upp
+#usr/share/ghostscript/9.53.3/lib/stc200_h.upp
+#usr/share/ghostscript/9.53.3/lib/stc2_h.upp
+#usr/share/ghostscript/9.53.3/lib/stc2s_h.upp
+#usr/share/ghostscript/9.53.3/lib/stc300.upp
+#usr/share/ghostscript/9.53.3/lib/stc300bl.upp
+#usr/share/ghostscript/9.53.3/lib/stc300bm.upp
+#usr/share/ghostscript/9.53.3/lib/stc500p.upp
+#usr/share/ghostscript/9.53.3/lib/stc500ph.upp
+#usr/share/ghostscript/9.53.3/lib/stc600ih.upp
+#usr/share/ghostscript/9.53.3/lib/stc600p.upp
+#usr/share/ghostscript/9.53.3/lib/stc600pl.upp
+#usr/share/ghostscript/9.53.3/lib/stc640p.upp
+#usr/share/ghostscript/9.53.3/lib/stc740ih.upp
+#usr/share/ghostscript/9.53.3/lib/stc800ih.upp
+#usr/share/ghostscript/9.53.3/lib/stc800p.upp
+#usr/share/ghostscript/9.53.3/lib/stc800pl.upp
+#usr/share/ghostscript/9.53.3/lib/stc_h.upp
+#usr/share/ghostscript/9.53.3/lib/stc_l.upp
+#usr/share/ghostscript/9.53.3/lib/stcany.upp
+#usr/share/ghostscript/9.53.3/lib/stcany_h.upp
+#usr/share/ghostscript/9.53.3/lib/stcinfo.ps
+#usr/share/ghostscript/9.53.3/lib/stcolor.ps
+#usr/share/ghostscript/9.53.3/lib/stocht.ps
+#usr/share/ghostscript/9.53.3/lib/traceimg.ps
+#usr/share/ghostscript/9.53.3/lib/traceop.ps
+#usr/share/ghostscript/9.53.3/lib/uninfo.ps
+#usr/share/ghostscript/9.53.3/lib/viewcmyk.ps
+#usr/share/ghostscript/9.53.3/lib/viewgif.ps
+#usr/share/ghostscript/9.53.3/lib/viewjpeg.ps
+#usr/share/ghostscript/9.53.3/lib/viewmiff.ps
+#usr/share/ghostscript/9.53.3/lib/viewpbm.ps
+#usr/share/ghostscript/9.53.3/lib/viewpcx.ps
+#usr/share/ghostscript/9.53.3/lib/viewps2a.ps
+#usr/share/ghostscript/9.53.3/lib/winmaps.ps
+#usr/share/ghostscript/9.53.3/lib/zeroline.ps
 #usr/share/ghostscript/fonts
 #usr/share/ghostscript/fonts/COPYING
 #usr/share/ghostscript/fonts/ChangeLog
--- a/config/rootfiles/packages/git
+++ b/config/rootfiles/packages/git
@@ -333,9 +333,9 @@ usr/share/perl5/FromCPAN/Error.pm
 usr/share/perl5/Git.pm
 usr/share/perl5/Git/I18N.pm
 usr/share/perl5/Git/IndexInfo.pm
-#usr/share/perl5/Git/LoadCPAN
-#usr/share/perl5/Git/LoadCPAN.pm
-#usr/share/perl5/Git/LoadCPAN/Error.pm
+usr/share/perl5/Git/LoadCPAN
+usr/share/perl5/Git/LoadCPAN.pm
+usr/share/perl5/Git/LoadCPAN/Error.pm
 #usr/share/perl5/Git/LoadCPAN/Mail
 #usr/share/perl5/Git/LoadCPAN/Mail/Address.pm
 #usr/share/perl5/Git/Packet.pm
--- a/config/rootfiles/packages/i586/vdr_dvbapi
+++ b/config/rootfiles/packages/i586/vdr_dvbapi
@@ -1,4 +1,4 @@
 etc/sysconfig/vdr-plugins.d/dvbapi.conf
 etc/vdr/plugins/dvbapi
-usr/lib/vdr/libvdr-dvbapi.so.2.4.1
-usr/lib/vdr/libvdr-dvbapi.so.2.4.1-sse
+usr/lib/vdr/libvdr-dvbapi.so.2.4.4
+usr/lib/vdr/libvdr-dvbapi.so.2.4.4-sse
--- a/config/rootfiles/packages/libseccomp
+++ b/config/rootfiles/packages/libseccomp
@@ -4,7 +4,7 @@ usr/bin/scmp_sys_resolver
 #usr/lib/libseccomp.la
 #usr/lib/libseccomp.so
 usr/lib/libseccomp.so.2
-usr/lib/libseccomp.so.2.4.3
+usr/lib/libseccomp.so.2.4.4
 #usr/lib/pkgconfig/libseccomp.pc
 #usr/share/man/man1/scmp_sys_resolver.1
 #usr/share/man/man3/seccomp_api_get.3
--- a/config/rootfiles/packages/lynis
+++ b/config/rootfiles/packages/lynis
@@ -15,6 +15,7 @@ var/ipfire/lynis/db/languages/br
 var/ipfire/lynis/db/languages/cn
 var/ipfire/lynis/db/languages/da
 var/ipfire/lynis/db/languages/de
+var/ipfire/lynis/db/languages/de-AT
 var/ipfire/lynis/db/languages/en
 var/ipfire/lynis/db/languages/en-GB
 var/ipfire/lynis/db/languages/en-US
--- a/config/rootfiles/packages/pcengines-apu-firmware
+++ b/config/rootfiles/packages/pcengines-apu-firmware
@@ -1,7 +1,8 @@
 #lib/firmware/pcengines
 #lib/firmware/pcengines/apu
-lib/firmware/pcengines/apu/apu1_v4.11.0.6.rom
-lib/firmware/pcengines/apu/apu2_v4.11.0.6.rom
-lib/firmware/pcengines/apu/apu3_v4.11.0.6.rom
-lib/firmware/pcengines/apu/apu4_v4.11.0.6.rom
-lib/firmware/pcengines/apu/apu5_v4.11.0.6.rom
+lib/firmware/pcengines/apu/apu1_v4.12.0.6.rom
+lib/firmware/pcengines/apu/apu2_v4.12.0.6.rom
+lib/firmware/pcengines/apu/apu3_v4.12.0.6.rom
+lib/firmware/pcengines/apu/apu4_v4.12.0.6.rom
+lib/firmware/pcengines/apu/apu5_v4.12.0.6.rom
+lib/firmware/pcengines/apu/apu6_v4.12.0.6.rom
--- a/config/rootfiles/packages/python3-botocore
+++ b/config/rootfiles/packages/python3-botocore
@@ -1,10 +1,10 @@
 #usr/lib/python3.8/site-packages/botocore
-#usr/lib/python3.8/site-packages/botocore-1.16.1-py3.8.egg-info
-#usr/lib/python3.8/site-packages/botocore-1.16.1-py3.8.egg-info/PKG-INFO
-#usr/lib/python3.8/site-packages/botocore-1.16.1-py3.8.egg-info/SOURCES.txt
-#usr/lib/python3.8/site-packages/botocore-1.16.1-py3.8.egg-info/dependency_links.txt
-#usr/lib/python3.8/site-packages/botocore-1.16.1-py3.8.egg-info/requires.txt
-#usr/lib/python3.8/site-packages/botocore-1.16.1-py3.8.egg-info/top_level.txt
+#usr/lib/python3.8/site-packages/botocore-1.19.28-py3.8.egg-info
+#usr/lib/python3.8/site-packages/botocore-1.19.28-py3.8.egg-info/PKG-INFO
+#usr/lib/python3.8/site-packages/botocore-1.19.28-py3.8.egg-info/SOURCES.txt
+#usr/lib/python3.8/site-packages/botocore-1.19.28-py3.8.egg-info/dependency_links.txt
+#usr/lib/python3.8/site-packages/botocore-1.19.28-py3.8.egg-info/requires.txt
+#usr/lib/python3.8/site-packages/botocore-1.19.28-py3.8.egg-info/top_level.txt
 usr/lib/python3.8/site-packages/botocore/__init__.py
 usr/lib/python3.8/site-packages/botocore/args.py
 usr/lib/python3.8/site-packages/botocore/auth.py
@@ -43,6 +43,10 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/amplify/2017-07-25
 #usr/lib/python3.8/site-packages/botocore/data/amplify/2017-07-25/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/amplify/2017-07-25/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/amplifybackend
+#usr/lib/python3.8/site-packages/botocore/data/amplifybackend/2020-08-11
+#usr/lib/python3.8/site-packages/botocore/data/amplifybackend/2020-08-11/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/amplifybackend/2020-08-11/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/apigateway
 #usr/lib/python3.8/site-packages/botocore/data/apigateway/2015-07-09
 #usr/lib/python3.8/site-packages/botocore/data/apigateway/2015-07-09/examples-1.json
@@ -60,6 +64,14 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/appconfig/2019-10-09
 #usr/lib/python3.8/site-packages/botocore/data/appconfig/2019-10-09/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/appconfig/2019-10-09/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/appflow
+#usr/lib/python3.8/site-packages/botocore/data/appflow/2020-08-23
+#usr/lib/python3.8/site-packages/botocore/data/appflow/2020-08-23/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/appflow/2020-08-23/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/appintegrations
+#usr/lib/python3.8/site-packages/botocore/data/appintegrations/2020-07-29
+#usr/lib/python3.8/site-packages/botocore/data/appintegrations/2020-07-29/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/appintegrations/2020-07-29/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/application-autoscaling
 #usr/lib/python3.8/site-packages/botocore/data/application-autoscaling/2016-02-06
 #usr/lib/python3.8/site-packages/botocore/data/application-autoscaling/2016-02-06/examples-1.json
@@ -111,6 +123,10 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/batch/2016-08-10/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/batch/2016-08-10/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/batch/2016-08-10/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/braket
+#usr/lib/python3.8/site-packages/botocore/data/braket/2019-09-01
+#usr/lib/python3.8/site-packages/botocore/data/braket/2019-09-01/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/braket/2019-09-01/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/budgets
 #usr/lib/python3.8/site-packages/botocore/data/budgets/2016-10-20
 #usr/lib/python3.8/site-packages/botocore/data/budgets/2016-10-20/examples-1.json
@@ -223,6 +239,11 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/cloudfront/2019-03-26/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/cloudfront/2019-03-26/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/cloudfront/2019-03-26/waiters-2.json
+#usr/lib/python3.8/site-packages/botocore/data/cloudfront/2020-05-31
+#usr/lib/python3.8/site-packages/botocore/data/cloudfront/2020-05-31/examples-1.json
+#usr/lib/python3.8/site-packages/botocore/data/cloudfront/2020-05-31/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/cloudfront/2020-05-31/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/cloudfront/2020-05-31/waiters-2.json
 #usr/lib/python3.8/site-packages/botocore/data/cloudhsm
 #usr/lib/python3.8/site-packages/botocore/data/cloudhsm/2014-05-30
 #usr/lib/python3.8/site-packages/botocore/data/cloudhsm/2014-05-30/examples-1.json
@@ -254,6 +275,11 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/cloudwatch/2010-08-01/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/cloudwatch/2010-08-01/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/cloudwatch/2010-08-01/waiters-2.json
+#usr/lib/python3.8/site-packages/botocore/data/codeartifact
+#usr/lib/python3.8/site-packages/botocore/data/codeartifact/2018-09-22
+#usr/lib/python3.8/site-packages/botocore/data/codeartifact/2018-09-22/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/codeartifact/2018-09-22/paginators-1.sdk-extras.json
+#usr/lib/python3.8/site-packages/botocore/data/codeartifact/2018-09-22/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/codebuild
 #usr/lib/python3.8/site-packages/botocore/data/codebuild/2016-10-06
 #usr/lib/python3.8/site-packages/botocore/data/codebuild/2016-10-06/examples-1.json
@@ -328,6 +354,10 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/config/2014-11-12/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/config/2014-11-12/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/connect
+#usr/lib/python3.8/site-packages/botocore/data/connect-contact-lens
+#usr/lib/python3.8/site-packages/botocore/data/connect-contact-lens/2020-08-21
+#usr/lib/python3.8/site-packages/botocore/data/connect-contact-lens/2020-08-21/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/connect-contact-lens/2020-08-21/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/connect/2017-08-08
 #usr/lib/python3.8/site-packages/botocore/data/connect/2017-08-08/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/connect/2017-08-08/paginators-1.json
@@ -341,6 +371,14 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/cur/2017-01-06/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/cur/2017-01-06/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/cur/2017-01-06/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/customer-profiles
+#usr/lib/python3.8/site-packages/botocore/data/customer-profiles/2020-08-15
+#usr/lib/python3.8/site-packages/botocore/data/customer-profiles/2020-08-15/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/customer-profiles/2020-08-15/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/databrew
+#usr/lib/python3.8/site-packages/botocore/data/databrew/2017-07-25
+#usr/lib/python3.8/site-packages/botocore/data/databrew/2017-07-25/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/databrew/2017-07-25/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/dataexchange
 #usr/lib/python3.8/site-packages/botocore/data/dataexchange/2017-07-25
 #usr/lib/python3.8/site-packages/botocore/data/dataexchange/2017-07-25/paginators-1.json
@@ -367,6 +405,10 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/devicefarm/2015-06-23/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/devicefarm/2015-06-23/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/devicefarm/2015-06-23/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/devops-guru
+#usr/lib/python3.8/site-packages/botocore/data/devops-guru/2020-12-01
+#usr/lib/python3.8/site-packages/botocore/data/devops-guru/2020-12-01/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/devops-guru/2020-12-01/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/directconnect
 #usr/lib/python3.8/site-packages/botocore/data/directconnect/2012-10-25
 #usr/lib/python3.8/site-packages/botocore/data/directconnect/2012-10-25/examples-1.json
@@ -392,6 +434,7 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/docdb/2014-10-31
 #usr/lib/python3.8/site-packages/botocore/data/docdb/2014-10-31/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/docdb/2014-10-31/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/docdb/2014-10-31/service-2.sdk-extras.json
 #usr/lib/python3.8/site-packages/botocore/data/docdb/2014-10-31/waiters-2.json
 #usr/lib/python3.8/site-packages/botocore/data/ds
 #usr/lib/python3.8/site-packages/botocore/data/ds/2015-04-16
@@ -453,6 +496,10 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/ec2/2016-11-15/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/ec2/2016-11-15/waiters-2.json
 #usr/lib/python3.8/site-packages/botocore/data/ecr
+#usr/lib/python3.8/site-packages/botocore/data/ecr-public
+#usr/lib/python3.8/site-packages/botocore/data/ecr-public/2020-10-30
+#usr/lib/python3.8/site-packages/botocore/data/ecr-public/2020-10-30/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/ecr-public/2020-10-30/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/ecr/2015-09-21
 #usr/lib/python3.8/site-packages/botocore/data/ecr/2015-09-21/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/ecr/2015-09-21/paginators-1.json
@@ -495,6 +542,7 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/elasticbeanstalk/2010-12-01/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/elasticbeanstalk/2010-12-01/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/elasticbeanstalk/2010-12-01/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/elasticbeanstalk/2010-12-01/waiters-2.json
 #usr/lib/python3.8/site-packages/botocore/data/elastictranscoder
 #usr/lib/python3.8/site-packages/botocore/data/elastictranscoder/2012-09-25
 #usr/lib/python3.8/site-packages/botocore/data/elastictranscoder/2012-09-25/examples-1.json
@@ -595,12 +643,21 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/health/2016-08-04/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/health/2016-08-04/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/health/2016-08-04/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/honeycode
+#usr/lib/python3.8/site-packages/botocore/data/honeycode/2020-03-01
+#usr/lib/python3.8/site-packages/botocore/data/honeycode/2020-03-01/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/honeycode/2020-03-01/paginators-1.sdk-extras.json
+#usr/lib/python3.8/site-packages/botocore/data/honeycode/2020-03-01/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/iam
 #usr/lib/python3.8/site-packages/botocore/data/iam/2010-05-08
 #usr/lib/python3.8/site-packages/botocore/data/iam/2010-05-08/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/iam/2010-05-08/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/iam/2010-05-08/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/iam/2010-05-08/waiters-2.json
+#usr/lib/python3.8/site-packages/botocore/data/identitystore
+#usr/lib/python3.8/site-packages/botocore/data/identitystore/2020-06-15
+#usr/lib/python3.8/site-packages/botocore/data/identitystore/2020-06-15/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/identitystore/2020-06-15/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/imagebuilder
 #usr/lib/python3.8/site-packages/botocore/data/imagebuilder/2019-12-02
 #usr/lib/python3.8/site-packages/botocore/data/imagebuilder/2019-12-02/paginators-1.json
@@ -619,6 +676,7 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/iot
 #usr/lib/python3.8/site-packages/botocore/data/iot-data
 #usr/lib/python3.8/site-packages/botocore/data/iot-data/2015-05-28
+#usr/lib/python3.8/site-packages/botocore/data/iot-data/2015-05-28/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/iot-data/2015-05-28/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/iot-jobs-data
 #usr/lib/python3.8/site-packages/botocore/data/iot-jobs-data/2017-09-29
@@ -664,6 +722,10 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/iotthingsgraph/2018-09-06
 #usr/lib/python3.8/site-packages/botocore/data/iotthingsgraph/2018-09-06/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/iotthingsgraph/2018-09-06/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/ivs
+#usr/lib/python3.8/site-packages/botocore/data/ivs/2020-07-14
+#usr/lib/python3.8/site-packages/botocore/data/ivs/2020-07-14/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/ivs/2020-07-14/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/kafka
 #usr/lib/python3.8/site-packages/botocore/data/kafka/2018-11-14
 #usr/lib/python3.8/site-packages/botocore/data/kafka/2018-11-14/paginators-1.json
@@ -747,6 +809,10 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/logs/2014-03-28/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/logs/2014-03-28/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/logs/2014-03-28/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/lookoutvision
+#usr/lib/python3.8/site-packages/botocore/data/lookoutvision/2020-11-20
+#usr/lib/python3.8/site-packages/botocore/data/lookoutvision/2020-11-20/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/lookoutvision/2020-11-20/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/machinelearning
 #usr/lib/python3.8/site-packages/botocore/data/machinelearning/2014-12-12
 #usr/lib/python3.8/site-packages/botocore/data/machinelearning/2014-12-12/examples-1.json
@@ -758,6 +824,10 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/macie/2017-12-19/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/macie/2017-12-19/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/macie/2017-12-19/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/macie2
+#usr/lib/python3.8/site-packages/botocore/data/macie2/2020-01-01
+#usr/lib/python3.8/site-packages/botocore/data/macie2/2020-01-01/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/macie2/2020-01-01/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/managedblockchain
 #usr/lib/python3.8/site-packages/botocore/data/managedblockchain/2018-09-24
 #usr/lib/python3.8/site-packages/botocore/data/managedblockchain/2018-09-24/paginators-1.json
@@ -839,6 +909,10 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/mturk/2017-01-17/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/mturk/2017-01-17/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/mturk/2017-01-17/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/mwaa
+#usr/lib/python3.8/site-packages/botocore/data/mwaa/2020-07-01
+#usr/lib/python3.8/site-packages/botocore/data/mwaa/2020-07-01/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/mwaa/2020-07-01/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/neptune
 #usr/lib/python3.8/site-packages/botocore/data/neptune/2014-10-31
 #usr/lib/python3.8/site-packages/botocore/data/neptune/2014-10-31/examples-1.json
@@ -846,6 +920,10 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/neptune/2014-10-31/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/neptune/2014-10-31/service-2.sdk-extras.json
 #usr/lib/python3.8/site-packages/botocore/data/neptune/2014-10-31/waiters-2.json
+#usr/lib/python3.8/site-packages/botocore/data/network-firewall
+#usr/lib/python3.8/site-packages/botocore/data/network-firewall/2020-11-12
+#usr/lib/python3.8/site-packages/botocore/data/network-firewall/2020-11-12/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/network-firewall/2020-11-12/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/networkmanager
 #usr/lib/python3.8/site-packages/botocore/data/networkmanager/2019-07-05
 #usr/lib/python3.8/site-packages/botocore/data/networkmanager/2019-07-05/paginators-1.json
@@ -941,6 +1019,11 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/rds/2014-10-31/service-2.sdk-extras.json
 #usr/lib/python3.8/site-packages/botocore/data/rds/2014-10-31/waiters-2.json
 #usr/lib/python3.8/site-packages/botocore/data/redshift
+#usr/lib/python3.8/site-packages/botocore/data/redshift-data
+#usr/lib/python3.8/site-packages/botocore/data/redshift-data/2019-12-20
+#usr/lib/python3.8/site-packages/botocore/data/redshift-data/2019-12-20/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/redshift-data/2019-12-20/paginators-1.sdk-extras.json
+#usr/lib/python3.8/site-packages/botocore/data/redshift-data/2019-12-20/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/redshift/2012-12-01
 #usr/lib/python3.8/site-packages/botocore/data/redshift/2012-12-01/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/redshift/2012-12-01/paginators-1.json
@@ -980,6 +1063,7 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/route53resolver
 #usr/lib/python3.8/site-packages/botocore/data/route53resolver/2018-04-01
 #usr/lib/python3.8/site-packages/botocore/data/route53resolver/2018-04-01/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/route53resolver/2018-04-01/paginators-1.sdk-extras.json
 #usr/lib/python3.8/site-packages/botocore/data/route53resolver/2018-04-01/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/s3
 #usr/lib/python3.8/site-packages/botocore/data/s3/2006-03-01
@@ -991,11 +1075,19 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/s3control/2018-08-20
 #usr/lib/python3.8/site-packages/botocore/data/s3control/2018-08-20/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/s3control/2018-08-20/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/s3outposts
+#usr/lib/python3.8/site-packages/botocore/data/s3outposts/2017-07-25
+#usr/lib/python3.8/site-packages/botocore/data/s3outposts/2017-07-25/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/s3outposts/2017-07-25/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/sagemaker
 #usr/lib/python3.8/site-packages/botocore/data/sagemaker-a2i-runtime
 #usr/lib/python3.8/site-packages/botocore/data/sagemaker-a2i-runtime/2019-11-07
 #usr/lib/python3.8/site-packages/botocore/data/sagemaker-a2i-runtime/2019-11-07/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/sagemaker-a2i-runtime/2019-11-07/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/sagemaker-featurestore-runtime
+#usr/lib/python3.8/site-packages/botocore/data/sagemaker-featurestore-runtime/2020-07-01
+#usr/lib/python3.8/site-packages/botocore/data/sagemaker-featurestore-runtime/2020-07-01/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/sagemaker-featurestore-runtime/2020-07-01/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/sagemaker-runtime
 #usr/lib/python3.8/site-packages/botocore/data/sagemaker-runtime/2017-05-13
 #usr/lib/python3.8/site-packages/botocore/data/sagemaker-runtime/2017-05-13/examples-1.json
@@ -1038,6 +1130,10 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/service-quotas/2019-06-24/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/service-quotas/2019-06-24/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/servicecatalog
+#usr/lib/python3.8/site-packages/botocore/data/servicecatalog-appregistry
+#usr/lib/python3.8/site-packages/botocore/data/servicecatalog-appregistry/2020-06-24
+#usr/lib/python3.8/site-packages/botocore/data/servicecatalog-appregistry/2020-06-24/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/servicecatalog-appregistry/2020-06-24/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/servicecatalog/2015-12-10
 #usr/lib/python3.8/site-packages/botocore/data/servicecatalog/2015-12-10/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/servicecatalog/2015-12-10/paginators-1.json
@@ -1096,7 +1192,12 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/ssm/2014-11-06/examples-1.json
 #usr/lib/python3.8/site-packages/botocore/data/ssm/2014-11-06/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/ssm/2014-11-06/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/ssm/2014-11-06/waiters-2.json
 #usr/lib/python3.8/site-packages/botocore/data/sso
+#usr/lib/python3.8/site-packages/botocore/data/sso-admin
+#usr/lib/python3.8/site-packages/botocore/data/sso-admin/2020-07-20
+#usr/lib/python3.8/site-packages/botocore/data/sso-admin/2020-07-20/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/sso-admin/2020-07-20/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/sso-oidc
 #usr/lib/python3.8/site-packages/botocore/data/sso-oidc/2019-06-10
 #usr/lib/python3.8/site-packages/botocore/data/sso-oidc/2019-06-10/paginators-1.json
@@ -1137,6 +1238,14 @@ usr/lib/python3.8/site-packages/botocore/data
 #usr/lib/python3.8/site-packages/botocore/data/textract/2018-06-27
 #usr/lib/python3.8/site-packages/botocore/data/textract/2018-06-27/paginators-1.json
 #usr/lib/python3.8/site-packages/botocore/data/textract/2018-06-27/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/timestream-query
+#usr/lib/python3.8/site-packages/botocore/data/timestream-query/2018-11-01
+#usr/lib/python3.8/site-packages/botocore/data/timestream-query/2018-11-01/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/timestream-query/2018-11-01/service-2.json
+#usr/lib/python3.8/site-packages/botocore/data/timestream-write
+#usr/lib/python3.8/site-packages/botocore/data/timestream-write/2018-11-01
+#usr/lib/python3.8/site-packages/botocore/data/timestream-write/2018-11-01/paginators-1.json
+#usr/lib/python3.8/site-packages/botocore/data/timestream-write/2018-11-01/service-2.json
 #usr/lib/python3.8/site-packages/botocore/data/transcribe
 #usr/lib/python3.8/site-packages/botocore/data/transcribe/2017-10-26
 #usr/lib/python3.8/site-packages/botocore/data/transcribe/2017-10-26/examples-1.json
@@ -1198,11 +1307,9 @@ usr/lib/python3.8/site-packages/botocore/discovery.py
 usr/lib/python3.8/site-packages/botocore/docs/__init__.py
 #usr/lib/python3.8/site-packages/botocore/docs/bcdoc
 usr/lib/python3.8/site-packages/botocore/docs/bcdoc/__init__.py
-usr/lib/python3.8/site-packages/botocore/docs/bcdoc/docevents.py
 usr/lib/python3.8/site-packages/botocore/docs/bcdoc/docstringparser.py
 usr/lib/python3.8/site-packages/botocore/docs/bcdoc/restdoc.py
 usr/lib/python3.8/site-packages/botocore/docs/bcdoc/style.py
-usr/lib/python3.8/site-packages/botocore/docs/bcdoc/textwriter.py
 usr/lib/python3.8/site-packages/botocore/docs/client.py
 usr/lib/python3.8/site-packages/botocore/docs/docstring.py
 usr/lib/python3.8/site-packages/botocore/docs/example.py
--- a/config/rootfiles/packages/python3-urllib3
+++ b/config/rootfiles/packages/python3-urllib3
@@ -0,0 +1,52 @@
+usr/lib/python3.8/site-packages/urllib3
+#usr/lib/python3.8/site-packages/urllib3-1.26.2-py3.8.egg-info
+#usr/lib/python3.8/site-packages/urllib3-1.26.2-py3.8.egg-info/PKG-INFO
+#usr/lib/python3.8/site-packages/urllib3-1.26.2-py3.8.egg-info/SOURCES.txt
+#usr/lib/python3.8/site-packages/urllib3-1.26.2-py3.8.egg-info/dependency_links.txt
+#usr/lib/python3.8/site-packages/urllib3-1.26.2-py3.8.egg-info/requires.txt
+#usr/lib/python3.8/site-packages/urllib3-1.26.2-py3.8.egg-info/top_level.txt
+#usr/lib/python3.8/site-packages/urllib3/__init__.py
+#usr/lib/python3.8/site-packages/urllib3/_collections.py
+#usr/lib/python3.8/site-packages/urllib3/_version.py
+#usr/lib/python3.8/site-packages/urllib3/connection.py
+#usr/lib/python3.8/site-packages/urllib3/connectionpool.py
+#usr/lib/python3.8/site-packages/urllib3/contrib
+#usr/lib/python3.8/site-packages/urllib3/contrib/__init__.py
+#usr/lib/python3.8/site-packages/urllib3/contrib/_appengine_environ.py
+#usr/lib/python3.8/site-packages/urllib3/contrib/_securetransport
+#usr/lib/python3.8/site-packages/urllib3/contrib/_securetransport/__init__.py
+#usr/lib/python3.8/site-packages/urllib3/contrib/_securetransport/bindings.py
+#usr/lib/python3.8/site-packages/urllib3/contrib/_securetransport/low_level.py
+#usr/lib/python3.8/site-packages/urllib3/contrib/appengine.py
+#usr/lib/python3.8/site-packages/urllib3/contrib/ntlmpool.py
+#usr/lib/python3.8/site-packages/urllib3/contrib/pyopenssl.py
+#usr/lib/python3.8/site-packages/urllib3/contrib/securetransport.py
+#usr/lib/python3.8/site-packages/urllib3/contrib/socks.py
+#usr/lib/python3.8/site-packages/urllib3/exceptions.py
+#usr/lib/python3.8/site-packages/urllib3/fields.py
+#usr/lib/python3.8/site-packages/urllib3/filepost.py
+#usr/lib/python3.8/site-packages/urllib3/packages
+#usr/lib/python3.8/site-packages/urllib3/packages/__init__.py
+#usr/lib/python3.8/site-packages/urllib3/packages/backports
+#usr/lib/python3.8/site-packages/urllib3/packages/backports/__init__.py
+#usr/lib/python3.8/site-packages/urllib3/packages/backports/makefile.py
+#usr/lib/python3.8/site-packages/urllib3/packages/six.py
+#usr/lib/python3.8/site-packages/urllib3/packages/ssl_match_hostname
+#usr/lib/python3.8/site-packages/urllib3/packages/ssl_match_hostname/__init__.py
+#usr/lib/python3.8/site-packages/urllib3/packages/ssl_match_hostname/_implementation.py
+#usr/lib/python3.8/site-packages/urllib3/poolmanager.py
+#usr/lib/python3.8/site-packages/urllib3/request.py
+#usr/lib/python3.8/site-packages/urllib3/response.py
+#usr/lib/python3.8/site-packages/urllib3/util
+#usr/lib/python3.8/site-packages/urllib3/util/__init__.py
+#usr/lib/python3.8/site-packages/urllib3/util/connection.py
+#usr/lib/python3.8/site-packages/urllib3/util/proxy.py
+#usr/lib/python3.8/site-packages/urllib3/util/queue.py
+#usr/lib/python3.8/site-packages/urllib3/util/request.py
+#usr/lib/python3.8/site-packages/urllib3/util/response.py
+#usr/lib/python3.8/site-packages/urllib3/util/retry.py
+#usr/lib/python3.8/site-packages/urllib3/util/ssl_.py
+#usr/lib/python3.8/site-packages/urllib3/util/ssltransport.py
+#usr/lib/python3.8/site-packages/urllib3/util/timeout.py
+#usr/lib/python3.8/site-packages/urllib3/util/url.py
+#usr/lib/python3.8/site-packages/urllib3/util/wait.py
--- a/config/rootfiles/packages/spamassassin
+++ b/config/rootfiles/packages/spamassassin
@@ -1,228 +0,0 @@
-etc/mail
-#etc/mail/spamassassin
-#etc/mail/spamassassin/init.pre
-#etc/mail/spamassassin/local.cf
-#etc/mail/spamassassin/v310.pre
-#etc/mail/spamassassin/v312.pre
-#etc/mail/spamassassin/v320.pre
-#etc/mail/spamassassin/v330.pre
-#etc/mail/spamassassin/v340.pre
-#etc/mail/spamassassin/v341.pre
-#etc/mail/spamassassin/v342.pre
-etc/rc.d/init.d/spamassassin
-usr/bin/sa-awl
-usr/bin/sa-check_spamd
-usr/bin/sa-compile
-usr/bin/sa-learn
-usr/bin/sa-update
-usr/bin/spamassassin
-usr/bin/spamc
-usr/bin/spamd
-usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/AICache.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/ArchiveIterator.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/AsyncLoop.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/AutoWhitelist.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Bayes
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Bayes.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Bayes/CombineChi.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Bayes/CombineNaiveBayes.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/BayesStore
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/BayesStore.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/BayesStore/BDB.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/BayesStore/DBM.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/BayesStore/MySQL.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/BayesStore/PgSQL.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/BayesStore/Redis.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/BayesStore/SDBM.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/BayesStore/SQL.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Client.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Conf
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Conf.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Conf/LDAP.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Conf/Parser.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Conf/SQL.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Constants.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/DBBasedAddrList.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Dns.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/DnsResolver.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/HTML.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Locales.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Locker
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Locker.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Locker/Flock.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Locker/UnixNFSSafe.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Locker/Win32.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Logger
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Logger.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Logger/File.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Logger/Stderr.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Logger/Syslog.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/MailingList.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Message
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Message.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Message/Metadata
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Message/Metadata.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Message/Metadata/Received.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Message/Node.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/NetSet.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/PerMsgLearner.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/PerMsgStatus.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/PersistentAddrList.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/ASN.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/AWL.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/AccessDB.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/AntiVirus.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/AskDNS.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/Bayes.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/BodyEval.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/Check.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/DCC.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/DKIM.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/DNSEval.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/FreeMail.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/FromNameSpoof.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/HTMLEval.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/HTTPSMismatch.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/HashBL.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/Hashcash.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/HeaderEval.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/ImageInfo.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/MIMEEval.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/MIMEHeader.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/PDFInfo.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/PhishTag.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/Phishing.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/Pyzor.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/Razor2.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/RelayCountry.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/RelayEval.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/ReplaceTags.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/ResourceLimits.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/Reuse.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/Rule2XSBody.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/SPF.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/Shortcircuit.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/SpamCop.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/Test.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/TextCat.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/TxRep.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/URIDNSBL.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/URIDetail.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/URIEval.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/URILocalBL.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/VBounce.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/WLBLEval.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Plugin/WhiteListSubject.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/PluginHandler.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/RegistryBoundaries.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Reporter.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/SQLBasedAddrList.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/SpamdForkScaling.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/SubProcBackChannel.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Timeout.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Util
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Util.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Util/DependencyInfo.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Util/Progress.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Util/ScopedTimer.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Util/TieOneStringHash.pm
-#usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Util/TinyRedis.pm
-#usr/lib/perl5/site_perl/5.30.0/spamassassin-run.pod
-#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Mail/SpamAssassin
-#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Mail/SpamAssassin/.packlist
-#usr/share/man/man1/sa-awl.1
-#usr/share/man/man1/sa-compile.1
-#usr/share/man/man1/sa-learn.1
-#usr/share/man/man1/sa-update.1
-#usr/share/man/man1/spamassassin-run.1
-#usr/share/man/man1/spamassassin.1
-#usr/share/man/man1/spamc.1
-#usr/share/man/man1/spamd.1
-#usr/share/man/man3/Mail::SpamAssassin.3
-#usr/share/man/man3/Mail::SpamAssassin::AICache.3
-#usr/share/man/man3/Mail::SpamAssassin::ArchiveIterator.3
-#usr/share/man/man3/Mail::SpamAssassin::AsyncLoop.3
-#usr/share/man/man3/Mail::SpamAssassin::AutoWhitelist.3
-#usr/share/man/man3/Mail::SpamAssassin::Bayes.3
-#usr/share/man/man3/Mail::SpamAssassin::BayesStore.3
-#usr/share/man/man3/Mail::SpamAssassin::BayesStore::BDB.3
-#usr/share/man/man3/Mail::SpamAssassin::BayesStore::MySQL.3
-#usr/share/man/man3/Mail::SpamAssassin::BayesStore::PgSQL.3
-#usr/share/man/man3/Mail::SpamAssassin::BayesStore::Redis.3
-#usr/share/man/man3/Mail::SpamAssassin::BayesStore::SQL.3
-#usr/share/man/man3/Mail::SpamAssassin::Client.3
-#usr/share/man/man3/Mail::SpamAssassin::Conf.3
-#usr/share/man/man3/Mail::SpamAssassin::Conf::LDAP.3
-#usr/share/man/man3/Mail::SpamAssassin::Conf::Parser.3
-#usr/share/man/man3/Mail::SpamAssassin::Conf::SQL.3
-#usr/share/man/man3/Mail::SpamAssassin::DnsResolver.3
-#usr/share/man/man3/Mail::SpamAssassin::Logger.3
-#usr/share/man/man3/Mail::SpamAssassin::Logger::File.3
-#usr/share/man/man3/Mail::SpamAssassin::Logger::Stderr.3
-#usr/share/man/man3/Mail::SpamAssassin::Logger::Syslog.3
-#usr/share/man/man3/Mail::SpamAssassin::Message.3
-#usr/share/man/man3/Mail::SpamAssassin::Message::Metadata.3
-#usr/share/man/man3/Mail::SpamAssassin::Message::Node.3
-#usr/share/man/man3/Mail::SpamAssassin::PerMsgLearner.3
-#usr/share/man/man3/Mail::SpamAssassin::PerMsgStatus.3
-#usr/share/man/man3/Mail::SpamAssassin::PersistentAddrList.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::ASN.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::AWL.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::AccessDB.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::AntiVirus.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::AskDNS.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::AutoLearnThreshold.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::Bayes.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::BodyRuleBaseExtractor.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::Check.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::DCC.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::DKIM.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::DNSEval.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::FromNameSpoof.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::HashBL.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::Hashcash.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::MIMEEval.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::MIMEHeader.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::OneLineBodyRuleType.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::PDFInfo.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::PhishTag.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::Phishing.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::Pyzor.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::Razor2.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::RelayCountry.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::ReplaceTags.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::ResourceLimits.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::Reuse.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::Rule2XSBody.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::SPF.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::Shortcircuit.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::SpamCop.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::Test.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::TextCat.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::TxRep.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::URIDNSBL.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::URIDetail.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::URILocalBL.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::VBounce.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::WhiteListSubject.3
-#usr/share/man/man3/Mail::SpamAssassin::PluginHandler.3
-#usr/share/man/man3/Mail::SpamAssassin::RegistryBoundaries.3
-#usr/share/man/man3/Mail::SpamAssassin::SQLBasedAddrList.3
-#usr/share/man/man3/Mail::SpamAssassin::SubProcBackChannel.3
-#usr/share/man/man3/Mail::SpamAssassin::Timeout.3
-#usr/share/man/man3/Mail::SpamAssassin::Util.3
-#usr/share/man/man3/Mail::SpamAssassin::Util::DependencyInfo.3
-#usr/share/man/man3/Mail::SpamAssassin::Util::Progress.3
-#usr/share/man/man3/spamassassin-run.3
-usr/share/spamassassin
-#usr/share/spamassassin/languages
-#usr/share/spamassassin/sa-update-pubkey.txt
-#usr/share/spamassassin/user_prefs.template
--- a/config/rootfiles/packages/transmission
+++ b/config/rootfiles/packages/transmission
@@ -31,7 +31,9 @@ usr/share/transmission
 #usr/share/transmission/web/javascript/jquery/jquery.transmenu.min.js
 #usr/share/transmission/web/javascript/jquery/jquery.ui-contextmenu.min.js
 #usr/share/transmission/web/javascript/jquery/json2.min.js
+#usr/share/transmission/web/javascript/main.js
 #usr/share/transmission/web/javascript/notifications.js
+#usr/share/transmission/web/javascript/polyfill.js
 #usr/share/transmission/web/javascript/prefs-dialog.js
 #usr/share/transmission/web/javascript/remote.js
 #usr/share/transmission/web/javascript/torrent-row.js
--- a/config/rootfiles/packages/vdr_eepg
+++ b/config/rootfiles/packages/vdr_eepg
@@ -1,2 +1,2 @@
 etc/vdr/plugins/eepg
-usr/lib/vdr/libvdr-eepg.so.2.4.1
+usr/lib/vdr/libvdr-eepg.so.2.4.4
--- a/config/rootfiles/packages/vdr_epgsearch
+++ b/config/rootfiles/packages/vdr_epgsearch
@@ -5,10 +5,10 @@ etc/sysconfig/vdr-plugins.d/quickepgsearch.conf
 etc/vdr/plugins/epgsearch
 etc/vdr/plugins/epgsearch/conf.d
 usr/bin/createcats
-usr/lib/vdr/libvdr-conflictcheckonly.so.2.4.1
-usr/lib/vdr/libvdr-epgsearch.so.2.4.1
-usr/lib/vdr/libvdr-epgsearchonly.so.2.4.1
-usr/lib/vdr/libvdr-quickepgsearch.so.2.4.1
+usr/lib/vdr/libvdr-conflictcheckonly.so.2.4.4
+usr/lib/vdr/libvdr-epgsearch.so.2.4.4
+usr/lib/vdr/libvdr-epgsearchonly.so.2.4.4
+usr/lib/vdr/libvdr-quickepgsearch.so.2.4.4
 #var/lib/vdr
 #var/lib/vdr/data
 var/lib/vdr/data/epgsearch
--- a/config/rootfiles/packages/vdr_streamdev
+++ b/config/rootfiles/packages/vdr_streamdev
@@ -4,4 +4,4 @@ etc/vdr/plugins/streamdev-server
 etc/vdr/plugins/streamdev-server/streamdevhosts.conf
 #usr/lib/vdr/bin
 usr/lib/vdr/bin/externremux.sh
-usr/lib/vdr/libvdr-streamdev-server.so.2.4.1
+usr/lib/vdr/libvdr-streamdev-server.so.2.4.4
--- a/config/rootfiles/packages/x86_64/amazon-ssm-agent
+++ b/config/rootfiles/packages/x86_64/amazon-ssm-agent
@@ -4,6 +4,7 @@ etc/amazon/ssm/amazon-ssm-agent.json
 etc/amazon/ssm/seelog.xml
 etc/rc.d/init.d/amazon-ssm-agent
 usr/bin/amazon-ssm-agent
+usr/bin/ssm-agent-worker
 usr/bin/ssm-cli
 usr/bin/ssm-document-worker
 usr/bin/ssm-session-logger
--- a/config/rootfiles/packages/x86_64/vdr_dvbapi
+++ b/config/rootfiles/packages/x86_64/vdr_dvbapi
@@ -1,3 +1,3 @@
 etc/sysconfig/vdr-plugins.d/dvbapi.conf
 etc/vdr/plugins/dvbapi
-usr/lib/vdr/libvdr-dvbapi.so.2.4.1
+usr/lib/vdr/libvdr-dvbapi.so.2.4.4
--- a/config/suricata/ruleset-sources
+++ b/config/suricata/ruleset-sources
@@ -1,8 +1,8 @@
 # Ruleset for registered sourcefire users.
-registered = https://www.snort.org/rules/snortrules-snapshot-29151.tar.gz?oinkcode=<oinkcode>
+registered = https://www.snort.org/rules/snortrules-snapshot-29161.tar.gz?oinkcode=<oinkcode>

 # Ruleset for registered sourcefire users with valid subscription.
-subscripted = https://www.snort.org/rules/snortrules-snapshot-29151.tar.gz?oinkcode=<oinkcode>
+subscripted = https://www.snort.org/rules/snortrules-snapshot-29161.tar.gz?oinkcode=<oinkcode>

 # Community rules from sourcefire.
 community = https://www.snort.org/rules/community
--- a/config/suricata/suricata.yaml
+++ b/config/suricata/suricata.yaml
@@ -271,14 +271,16 @@ outputs:

        #- dnp3
        - ftp
-        #- rdp
+        - rdp
        - nfs
        - smb
        - tftp
        - ikev2
+        - dcerpc
        - krb5
        - snmp
-        #- sip
+        - rfb
+        - sip
        - dhcp:
            enabled: yes
            # When extended mode is on, all DHCP messages are logged
@@ -287,6 +289,12 @@ outputs:
            # to an IP address is logged.
            extended: no
        - ssh
+        - mqtt:
+            # passwords: yes           # enable output of passwords
+        # HTTP2 logging. HTTP2 support is currently experimental and
+        # disabled by default. To enable, uncomment the following line
+        # and be sure to enable http2 in the app-layer section.
+        #- http2
        - stats:
            totals: yes       # stats for all threads merged together
            threads: no       # per thread stats
@@ -358,6 +366,14 @@ nfq:
 # "detection-only" enables protocol detection only (parser disabled).
 app-layer:
  protocols:
+    rfb:
+      enabled: yes
+      detection-ports:
+        dp: 5900, 5901, 5902, 5903, 5904, 5905, 5906, 5907, 5908, 5909
+    # MQTT, disabled by default.
+    mqtt:
+      # enabled: no
+      # max-msg-length: 1mb
    krb5:
      enabled: yes
    snmp:
@@ -371,9 +387,7 @@ app-layer:

      # Generate JA3 fingerprint from client hello. If not specified it
      # will be disabled by default, but enabled if rules require it.
-      #ja3-fingerprints: auto
-      # Generate JA3 fingerprint from client hello
-      ja3-fingerprints: no
+      ja3-fingerprints: auto

      # Completely stop processing TLS/SSL session after the handshake
      # completed. If bypass is enabled this will also trigger flow
@@ -388,6 +402,10 @@ app-layer:
      enabled: yes
    ssh:
      enabled: yes
+      #hassh: yes
+    # HTTP2: Experimental HTTP 2 support. Disabled by default.
+    http2:
+      enabled: no
    smtp:
      enabled: yes
      # Configure SMTP-MIME Decoder
--- a/config/udev/network-hotplug-bridges
+++ b/config/udev/network-hotplug-bridges
@@ -81,15 +81,23 @@ MODE="$(get_value "${ZONE}_MODE")"

 # The name of the virtual bridge
 BRIDGE="$(get_value "${ZONE}_DEV")"
+STP="$(get_value "${ZONE}_STP")"
+STP_PRIORITY="$(get_value "${ZONE}_STP_PRIORITY")"

 case "${MODE}" in
 	bridge)
+		# We need to check if $STP_PRIORITY has a valid value if not set it
+		if [ -n "${STP_PRIORITY}" ]; then
+			STP_PRIORITY=16384;
+		fi
+
 		ADDRESS="$(get_value "${ZONE}_MACADDR")"
 		[ -n "${ADDRESS}" ] || ADDRESS="$(random_mac_address)"

 		# We need to create the bridge if it doesn't exist, yet
 		if [ ! -d "/sys/class/net/${BRIDGE}" ]; then
-			ip link add "${BRIDGE}" address "${ADDRESS}" type bridge
+			ip link add "${BRIDGE}" address "${ADDRESS}" type bridge \
+				$([ "${STP}" = "on" ] && echo "stp_state 1  priority ${STP_PRIORITY}" )
 			#ip link set "${BRIDGE}" up
 		fi

--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -235,8 +235,6 @@ 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: dns server
-WARNING: translation string unused: dns servers
 WARNING: translation string unused: dnssec information
 WARNING: translation string unused: do not log this port list
 WARNING: translation string unused: domain master
@@ -735,6 +733,7 @@ WARNING: translation string unused: tor accounting period daily
 WARNING: translation string unused: tor accounting period monthly
 WARNING: translation string unused: tor accounting period weekly
 WARNING: translation string unused: tor exit country
+WARNING: translation string unused: tor guard country
 WARNING: translation string unused: traffic back
 WARNING: translation string unused: traffic calc time
 WARNING: translation string unused: traffic calc time bad
@@ -888,3 +887,6 @@ WARNING: untranslated string: show tls-auth key = Show tls-auth key
 WARNING: untranslated string: smb daemon = SMB Daemon
 WARNING: untranslated string: user management = User Management
 WARNING: untranslated string: winbind daemon = Winbind Daemon
+WARNING: untranslated string: wlanap 802.11w disabled = Disabled
+WARNING: untranslated string: wlanap 802.11w enforced = Enforced
+WARNING: untranslated string: wlanap 802.11w optional = Optional
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -324,12 +324,14 @@ WARNING: untranslated string: april = April
 WARNING: untranslated string: are you sure = Are you sure?
 WARNING: untranslated string: arp table entries = ARP Table Entries
 WARNING: untranslated string: artist = Artist
+WARNING: untranslated string: asn lookup failed = AS lookup failed
 WARNING: untranslated string: atm device = Device:
 WARNING: untranslated string: atm settings = ATM settings
 WARNING: untranslated string: attention = ATTENTION
 WARNING: untranslated string: august = August
 WARNING: untranslated string: authentication = Authentication:
 WARNING: untranslated string: automatic = Automatic
+WARNING: untranslated string: autonomous system = Autonomous System
 WARNING: untranslated string: average = Average
 WARNING: untranslated string: back = Back
 WARNING: untranslated string: backup = Backup
@@ -596,11 +598,11 @@ WARNING: untranslated string: dl client arch = Download Client Package (zip)
 WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
 WARNING: untranslated string: dmz = DMZ
 WARNING: untranslated string: dnat address = Firewall Interface
-WARNING: untranslated string: dns = unknown string
 WARNING: untranslated string: dns check failed = DNS check failed
 WARNING: untranslated string: dns check servers = Check DNS Servers
 WARNING: untranslated string: dns configuration = DNS Configuration
 WARNING: untranslated string: dns enable safe-search = Enable Safe Search
+WARNING: untranslated string: dns enable safe-search youtube = Include YouTube in Safe Search
 WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
 WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
 WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS server
@@ -610,6 +612,7 @@ WARNING: untranslated string: dns no address given = No IP Address given.
 WARNING: untranslated string: dns no tls hostname given = No TLS hostname given.
 WARNING: untranslated string: dns proxy server = DNS Proxy Server
 WARNING: untranslated string: dns recursor mode = Recursor Mode
+WARNING: untranslated string: dns servers = DNS Servers
 WARNING: untranslated string: dns title = Domain Name System
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
@@ -1126,7 +1129,9 @@ WARNING: untranslated string: ip address outside subnets = IP Address outside su
 WARNING: untranslated string: ip alias added = External IP alias added
 WARNING: untranslated string: ip alias changed = External IP alias changed
 WARNING: untranslated string: ip alias removed = External IP alias removed
-WARNING: untranslated string: ip info = IP Information
+WARNING: untranslated string: ip basic info = Basic IP information
+WARNING: untranslated string: ip info = IP information
+WARNING: untranslated string: ip info for = IP information for
 WARNING: untranslated string: ipfire has now rebooted = IPFire is rebooting now.
 WARNING: untranslated string: ipfire has now shutdown = IPFire is shutting down now.
 WARNING: untranslated string: ipfire side is invalid = IPFire side is invalid.
@@ -1186,7 +1191,6 @@ WARNING: untranslated string: loged in at = Logged in at
 WARNING: untranslated string: logging server = Logging Server
 WARNING: untranslated string: loginlogout = Login/Logout
 WARNING: untranslated string: logs = logs
-WARNING: untranslated string: lookup failed = Reverse lookup failed
 WARNING: untranslated string: low = Low
 WARNING: untranslated string: mac address = MAC Address
 WARNING: untranslated string: mac address deleted = Successfully deleted!
@@ -1484,6 +1488,7 @@ WARNING: untranslated string: proxy reports monthly = Monthly reports
 WARNING: untranslated string: proxy reports today = Today
 WARNING: untranslated string: proxy reports weekly = Weekly reports
 WARNING: untranslated string: ptr = PTR
+WARNING: untranslated string: ptr lookup failed = Reverse lookup failed
 WARNING: untranslated string: pulse = Pulse
 WARNING: untranslated string: pulse dial = Pulse dial:
 WARNING: untranslated string: qos enter bandwidths = You will need to enter your downstream and upstream bandwidth!
@@ -1711,6 +1716,8 @@ WARNING: untranslated string: tor errmsg invalid relay port = Invalid relay port
 WARNING: untranslated string: tor errmsg invalid socks port = Invalid SOCKS port
 WARNING: untranslated string: tor exit country any = Any country
 WARNING: untranslated string: tor exit nodes = Exit Nodes
+WARNING: untranslated string: tor guard country any = Any country
+WARNING: untranslated string: tor guard nodes = Guard Nodes
 WARNING: untranslated string: tor relay address = Relay address
 WARNING: untranslated string: tor relay configuration = Tor Relay Configuration
 WARNING: untranslated string: tor relay enabled = Enable Tor Relay
@@ -1729,7 +1736,8 @@ WARNING: untranslated string: tor stats = Statistics
 WARNING: untranslated string: tor traffic limit hard = Traffic limit has been reached.
 WARNING: untranslated string: tor traffic limit soft = Traffic limit almost reached. Not accepting any new connections.
 WARNING: untranslated string: tor traffic read written = Total traffic (read/written)
-WARNING: untranslated string: tor use exit nodes = Use only these exit nodes (one per line)
+WARNING: untranslated string: tor use exit nodes = Use only these exit nodes (one fingerprint per line)
+WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line)
 WARNING: untranslated string: total connection time = Total Connection Time
 WARNING: untranslated string: total hits for log section = Total hits for log section
 WARNING: untranslated string: traffic on = Traffic on
@@ -2086,6 +2094,7 @@ WARNING: untranslated string: website = Website
 WARNING: untranslated string: wednesday = Wednesday
 WARNING: untranslated string: week = Week
 WARNING: untranslated string: weeks = Weeks
+WARNING: untranslated string: whois results from = WHOIS results from
 WARNING: untranslated string: winbind daemon = Winbind Daemon
 WARNING: untranslated string: wireless = Wireless
 WARNING: untranslated string: wireless config added = Wireless config added
@@ -2138,6 +2147,9 @@ WARNING: untranslated string: wlan client wpa mode ccmp tkip = CCMP-TKIP
 WARNING: untranslated string: wlan client wpa mode tkip tkip = TKIP-TKIP
 WARNING: untranslated string: wlan clients = Wireless clients
 WARNING: untranslated string: wlanap = Access Point
+WARNING: untranslated string: wlanap 802.11w disabled = Disabled
+WARNING: untranslated string: wlanap 802.11w enforced = Enforced
+WARNING: untranslated string: wlanap 802.11w optional = Optional
 WARNING: untranslated string: wlanap auto = Automatic Channel Selection
 WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID
 WARNING: untranslated string: wlanap channel = Channel
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -821,8 +821,10 @@ WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Pro
 WARNING: untranslated string: advproxy wpad view pac = Open PAC File
 WARNING: untranslated string: age second = second
 WARNING: untranslated string: application layer gateways = Application Layer Gateways
+WARNING: untranslated string: asn lookup failed = AS lookup failed
 WARNING: untranslated string: atm device = Device:
 WARNING: untranslated string: attention = ATTENTION
+WARNING: untranslated string: autonomous system = Autonomous System
 WARNING: untranslated string: bit = bit
 WARNING: untranslated string: block = Block
 WARNING: untranslated string: broken = Broken
@@ -893,10 +895,10 @@ WARNING: untranslated string: disable = Disable
 WARNING: untranslated string: disconnected = Disconnected
 WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
 WARNING: untranslated string: dnat address = Firewall Interface
-WARNING: untranslated string: dns = unknown string
 WARNING: untranslated string: dns check servers = Check DNS Servers
 WARNING: untranslated string: dns configuration = DNS Configuration
 WARNING: untranslated string: dns enable safe-search = Enable Safe Search
+WARNING: untranslated string: dns enable safe-search youtube = Include YouTube in Safe Search
 WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
 WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
 WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS server
@@ -905,6 +907,7 @@ WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisati
 WARNING: untranslated string: dns no address given = No IP Address given.
 WARNING: untranslated string: dns no tls hostname given = No TLS hostname given.
 WARNING: untranslated string: dns recursor mode = Recursor Mode
+WARNING: untranslated string: dns servers = DNS Servers
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries
@@ -1217,6 +1220,8 @@ WARNING: untranslated string: invalid input for mode = Invalid input for mode
 WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
 WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
 WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
+WARNING: untranslated string: ip basic info = Basic IP information
+WARNING: untranslated string: ip info for = IP information for
 WARNING: untranslated string: ipsec = IPsec
 WARNING: untranslated string: ipsec connection = IPsec Connection
 WARNING: untranslated string: ipsec interface mode gre = GRE
@@ -1411,6 +1416,8 @@ WARNING: untranslated string: tor errmsg invalid relay port = Invalid relay port
 WARNING: untranslated string: tor errmsg invalid socks port = Invalid SOCKS port
 WARNING: untranslated string: tor exit country any = Any country
 WARNING: untranslated string: tor exit nodes = Exit Nodes
+WARNING: untranslated string: tor guard country any = Any country
+WARNING: untranslated string: tor guard nodes = Guard Nodes
 WARNING: untranslated string: tor relay address = Relay address
 WARNING: untranslated string: tor relay configuration = Tor Relay Configuration
 WARNING: untranslated string: tor relay enabled = Enable Tor Relay
@@ -1429,7 +1436,8 @@ WARNING: untranslated string: tor stats = Statistics
 WARNING: untranslated string: tor traffic limit hard = Traffic limit has been reached.
 WARNING: untranslated string: tor traffic limit soft = Traffic limit almost reached. Not accepting any new connections.
 WARNING: untranslated string: tor traffic read written = Total traffic (read/written)
-WARNING: untranslated string: tor use exit nodes = Use only these exit nodes (one per line)
+WARNING: untranslated string: tor use exit nodes = Use only these exit nodes (one fingerprint per line)
+WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line)
 WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode
 WARNING: untranslated string: twelve hours = 12 Hours
 WARNING: untranslated string: two weeks = Two Weeks
@@ -1465,6 +1473,7 @@ WARNING: untranslated string: vpn wait = WAITING
 WARNING: untranslated string: vpn weak = Weak
 WARNING: untranslated string: vulnerability = Vulnerability
 WARNING: untranslated string: vulnerable = Vulnerable
+WARNING: untranslated string: whois results from = WHOIS results from
 WARNING: untranslated string: winbind daemon = Winbind Daemon
 WARNING: untranslated string: wireless network = WiFi Network
 WARNING: untranslated string: wlan client = Wireless client
@@ -1513,6 +1522,9 @@ WARNING: untranslated string: wlan client wpa mode ccmp tkip = CCMP-TKIP
 WARNING: untranslated string: wlan client wpa mode tkip tkip = TKIP-TKIP
 WARNING: untranslated string: wlan clients = Wireless clients
 WARNING: untranslated string: wlanap = Access Point
+WARNING: untranslated string: wlanap 802.11w disabled = Disabled
+WARNING: untranslated string: wlanap 802.11w enforced = Enforced
+WARNING: untranslated string: wlanap 802.11w optional = Optional
 WARNING: untranslated string: wlanap auto = Automatic Channel Selection
 WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID
 WARNING: untranslated string: wlanap client isolation = Client Isolation
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -262,8 +262,6 @@ 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: dns server
-WARNING: translation string unused: dns servers
 WARNING: translation string unused: dnssec information
 WARNING: translation string unused: do not log this port list
 WARNING: translation string unused: domain master
@@ -879,9 +877,9 @@ WARNING: translation string unused: zoneconf val ppp assignment error
 WARNING: translation string unused: zoneconf val vlan amount assignment error
 WARNING: translation string unused: zoneconf val vlan tag assignment error
 WARNING: translation string unused: zoneconf val zoneslave amount error
-WARNING: untranslated string: desired = Desired
-WARNING: untranslated string: disable = Disable
-WARNING: untranslated string: enable = Enable
+WARNING: untranslated string: asn lookup failed = AS lookup failed
+WARNING: untranslated string: autonomous system = Autonomous System
+WARNING: untranslated string: dns enable safe-search youtube = Include YouTube in Safe Search
 WARNING: untranslated string: fwhost cust locationgrp = unknown string
 WARNING: untranslated string: fwhost err hostip = unknown string
 WARNING: untranslated string: guardian block a host = unknown string
@@ -913,15 +911,13 @@ 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: netbios nameserver daemon = NetBIOS Nameserver Daemon
-WARNING: untranslated string: optional = Optional
+WARNING: untranslated string: ip basic info = Basic IP information
+WARNING: untranslated string: ip info for = IP information for
 WARNING: untranslated string: pakfire ago = ago.
-WARNING: untranslated string: required = Required
 WARNING: untranslated string: route config changed = unknown string
 WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string
-WARNING: untranslated string: samba server role member = Domain Member
-WARNING: untranslated string: samba server role standalone = Standalone
-WARNING: untranslated string: smb daemon = SMB Daemon
-WARNING: untranslated string: user management = User Management
-WARNING: untranslated string: winbind daemon = Winbind Daemon
+WARNING: untranslated string: tor guard country any = Any country
+WARNING: untranslated string: tor guard nodes = Guard Nodes
+WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line)
+WARNING: untranslated string: whois results from = WHOIS results from
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`../../../../common/armv5tel/linux-initrd-multi`