public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 87dcb206d025556d9c939fd7f003ad75ff93b61f
@ 2022-04-24 10:28 Peter Müller
  0 siblings, 0 replies; only message in thread
From: Peter Müller @ 2022-04-24 10:28 UTC (permalink / raw)
  To: ipfire-scm

[-- Attachment #1: Type: text/plain, Size: 445365 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  87dcb206d025556d9c939fd7f003ad75ff93b61f (commit)
       via  bad8659d80520b2cdbd043efa0b5b15d8580c2c5 (commit)
       via  c04309ef012b19e3bdc98384cad28af407cc62ac (commit)
       via  2420f4775b77f4692cfc1625c2d7318fb5e1876f (commit)
       via  c13060fd4cda278ea79dd8d547291dbbc31840c1 (commit)
       via  a04b39daa75022e5e6e12da32398bee71b73b150 (commit)
       via  28894b78260b8194ff1df4ef0700c5d21031a8d4 (commit)
       via  2f4148ccd3cab052c39a6eb77314bd789f0abd9c (commit)
       via  7a981d94cb2c3e48ecaf07c506c8353a2c839d79 (commit)
       via  018f80c6cd609184b72c08c1967b143a0637cc7f (commit)
       via  7554e857eebdd6593f986b2a0b840e73db65aa19 (commit)
       via  420e8a85d0141198a04af0cb8000739c2bc4a108 (commit)
       via  a808de4c17fea4453817d6dde9de7a0581f3e60d (commit)
       via  ffa5629d06f3ee08ba49ecf6ef6c298cc98d91c4 (commit)
       via  701e63c222f7e09cd27c8198c02ce0279627c7d8 (commit)
       via  30f306a3e28d63d63e126b709d8866cfc9b80803 (commit)
       via  c2ead0c78ddce8e82969ceaab172d3f6bc5e84d4 (commit)
       via  af8c9da4e525c3d0c896398d33e8e891180fc163 (commit)
       via  e56de75e336c84784d46c16f715950b088080adb (commit)
       via  166efe4cb5c5ccd8888ce521857b36b3169b1f5a (commit)
       via  1f326847a36c80b4c65952d06687bf6819a2d6e8 (commit)
       via  0676b7b777e7d93d80103ca463567b89c8344841 (commit)
       via  9196f2a4483ca9a12485c9d511d9946ccc00a0d7 (commit)
       via  8b27f672f80f2364fd28b13466d3a555b5c076f1 (commit)
       via  0312f9294255755d4a94dcf3fd4b455e25e0324c (commit)
       via  aee369fea30e210bf1088e88116610f8ce970a4b (commit)
       via  12fbbc61e568b208f007df3b02c28b0bb6fe14e7 (commit)
       via  2e68dcd6eb10cccda976d2dfe1f8204cb066eecb (commit)
       via  bdd2566f7bbda478769006871c6f515fc6230940 (commit)
       via  76227aaf7181296f58969a00b91ad2c80d800cfa (commit)
       via  f9563f97c63e0c5c4249cea00ddeb82f5e2450f4 (commit)
       via  75363dc20ffbb2aa17518b757eec2a4e09f9be65 (commit)
       via  7eeeb60373dd381db51505002b3de89d7c33f948 (commit)
       via  a790b010770eb5839055c117f71e44bc9b8d3538 (commit)
       via  dba994e86f185585e656c0fa5dc5c2c5f6b15116 (commit)
       via  98c7df65620a424c1980730bb6118098a685f1ea (commit)
       via  40556f0946c26163d852d973b71f2818ad555198 (commit)
       via  b9758326128d343afe0a80db8aef7b308a9f4ba9 (commit)
       via  e9fecdc0397044c268c8c7ef34bcd924a2daa4a7 (commit)
       via  441e92695515b32beafb009e513b11661eaa210d (commit)
       via  4d2a20f407110fa91b2ceb9f38c6c0bae1add405 (commit)
       via  b3ae0e6695fb3e9dbffa6f15a66c6fdc4a62af23 (commit)
       via  159f9214a6852328f4edb327b33d2268ac4bac3f (commit)
       via  75072c7702208179b392570485d5b301673525a0 (commit)
       via  0f447b470a929bb8f565e4cc5eb2697f074ddd7a (commit)
       via  5e792900bc14070f877e7d2c1e406bebd60fac19 (commit)
       via  f56b5ce8af9a71296bd20c7b47208781b1574caa (commit)
       via  b101f8e842f221113377f69b6a0471ffd24d15e7 (commit)
       via  c516ba3b01b93cd4d549cf92b70f4eb58fd95d20 (commit)
       via  31e85ef336ccfc2abb724d08e497c40c55b52762 (commit)
       via  c74f7aa6d94337fec1d83e10e6d63c90b3d7aa72 (commit)
       via  a95bb24fe13e4e7837bfbf2e75e255f61985df7d (commit)
       via  6fd8dd43b63d32acd119c06682bb19a2ee10966d (commit)
       via  77be7ab63b0fb4be4eeaa3059d7860ab3a701729 (commit)
       via  54fe871c8305649b00dbd7e67bb68ccfc4c43f7d (commit)
       via  9c4e7e3b4956eb886acaaf039d31b4a26dbece8c (commit)
       via  2a8de00c6fbc7625d385ebd04ad466ee8a024a12 (commit)
       via  bf1defce5579ed2db91d8fae4eb5549bc8471311 (commit)
       via  d6aead033a752d7965a3bed6c98dcf5d289707b2 (commit)
       via  88e01ab8553e9fc7d7d64d2de2b3e7f03c515177 (commit)
       via  00c31b29184dac2f5dadc21f9457b427a6ee3cb6 (commit)
       via  8841ef19685bcb148fdbcdd5c75b8eb96b2bb244 (commit)
       via  411cd0ca9c52b8a57fc288b2e992d13b3ffb1215 (commit)
       via  22ac250b37bbce6f56ea7920e55d5ca9a70f71d3 (commit)
       via  c002bd1f44f4ae0c33691be3896456dc8fbd221f (commit)
       via  6ac573bd8f4a1070e56769e1d74e8268ce8bf19f (commit)
       via  f09b8111142c5d27466d40668d1bd92f60003596 (commit)
       via  da8ca3b1216906d2f009ee6ee09131fa9c7e65de (commit)
       via  5806ff0cc5af4b361b3e32cb9e32d97d1f07d400 (commit)
       via  18ed846002a02d51a9122133dc2314cbb6d5b04e (commit)
       via  b86bd4f90adc4111db864cb8c1365a0d115a6675 (commit)
       via  e2e51070a18073d6087429daa6036f8eb510886e (commit)
       via  943ce57701d39352f51a6b09906cd945a421829c (commit)
       via  5dcca14b51b845a56ea3d99e1772f569a259e949 (commit)
       via  d258332f5bb062394f524dc485153d1841e55436 (commit)
       via  a6d966e1b79de3b052f92569f8f67b2b0753df49 (commit)
       via  9624937d9112b92cd735391bc15b3d7aef5bedd5 (commit)
       via  85967534723f8da3f6077814dc1f04f8ffb87874 (commit)
       via  adee5528664883cf48fd83873c978b51b11a7342 (commit)
       via  03216bd01c57262e1fa753ee4ed86cf050fc2212 (commit)
       via  758162bdc4f5d58cd10afd3f5efbdf7a3034b5b8 (commit)
       via  77c3824f285e7df66ce4a26be11dc336bc17633d (commit)
      from  a6d1108e77791d15eb3de78d050bbd2bc39dc77e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 87dcb206d025556d9c939fd7f003ad75ff93b61f
Merge: a6d1108e7 bad8659d8
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sun Apr 24 10:27:59 2022 +0000

    Merge branch 'temp-c168-development' into next

commit bad8659d80520b2cdbd043efa0b5b15d8580c2c5
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sat Apr 23 19:36:57 2022 +0000

    Do not mark CGI files as executable, second round
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit c04309ef012b19e3bdc98384cad28af407cc62ac
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sat Apr 23 19:35:37 2022 +0000

    Do not mark CGI files as executable
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 2420f4775b77f4692cfc1625c2d7318fb5e1876f
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sat Apr 23 14:35:19 2022 +0000

    Core Update 168: Ship WebIF-related changes
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit c13060fd4cda278ea79dd8d547291dbbc31840c1
Author: Leo-Andres Hofmann <hofmann(a)leo-andres.de>
Date:   Wed Apr 20 15:32:34 2022 +0200

    menu: Fix warnings, clean code
    
    This patch adds default values and removes a missing translation
    to fix "uninitialized value" and "odd number of elements" warnings.
    
    Removes function calls from functions.pl that have already been
    handled by the header before it is loaded by eval().
    
    Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de>
    Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>

commit a04b39daa75022e5e6e12da32398bee71b73b150
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sat Apr 23 14:32:00 2022 +0000

    Core Update 168: Ship efibootmgr on x86_64 and aarch64
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 28894b78260b8194ff1df4ef0700c5d21031a8d4
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Mon Apr 18 19:49:32 2022 +0000

    efibootmgr: Update to 17
    
    Full changelog as per https://github.com/rhboot/efibootmgr/releases/tag/17:
    
        various CI updates
        Make.defaults: fix pkg-config invocation for LDFLAGS
        make_linux_load_option(): add some more efi_error() calls
        Change the default partition choice.
        Don't set LIBEFIBOOT_REPORT_GPT_ERRORS=1
        Make it easier to build with a devel branch of efivar
        efibootmgr -e: improve parsing for efivar-36 compat
        Fix an invalid free()
        Propogate verbosity to libefivar 36's internal logging facility
        Add a bit more logging
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
    Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>

commit 2f4148ccd3cab052c39a6eb77314bd789f0abd9c
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sat Apr 23 14:29:08 2022 +0000

    Core Update 168: Ship and restart OpenSSH
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 7a981d94cb2c3e48ecaf07c506c8353a2c839d79
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Mon Apr 18 20:40:41 2022 +0000

    SSH: do not send spoofable TCP keep alive messages
    
    By default, both SSH server and client rely on TCP-based keep alive
    messages to detect broken sessions, which can be spoofed rather easily
    in order to keep a broken session opened (and vice versa).
    
    Since we rely on SSH-based keep alive messages, which are not vulnerable
    to this kind of tampering, there is no need to double-check connections
    via TCP keep alive as well.
    
    This patch thereof disables using TCP keep alive for both SSH client and
    server scenario. For usability reasons, a timeout of 5 minutes (10
    seconds * 30 keep alive messages = 300 seconds) will be used for both
    client and server configuration, as 60 seconds were found to be too
    short for unstable connectivity scenarios.
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 018f80c6cd609184b72c08c1967b143a0637cc7f
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Mon Apr 18 20:40:20 2022 +0000

    SSH: Add sntrup761x25519-sha512(a)openssh.com key exchange to configurations
    
    This algorithm was introduced in OpenSSH 9.0p1; also, align the
    curve25519-sha256* key exchanges to keep things tidy.
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 7554e857eebdd6593f986b2a0b840e73db65aa19
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Mon Apr 18 20:40:00 2022 +0000

    OpenSSH: Update to 9.0p1
    
    Relevant changelog part, as retrieved from https://www.openssh.com/txt/release-9.0:
    
    Changes since OpenSSH 8.9
    =========================
    
    This release is focused on bug fixing.
    
    Potentially-incompatible changes
    --------------------------------
    
    This release switches scp(1) from using the legacy scp/rcp protocol
    to using the SFTP protocol by default.
    
    Legacy scp/rcp performs wildcard expansion of remote filenames (e.g.
    "scp host:* .") through the remote shell. This has the side effect of
    requiring double quoting of shell meta-characters in file names
    included on scp(1) command-lines, otherwise they could be interpreted
    as shell commands on the remote side.
    
    This creates one area of potential incompatibility: scp(1) when using
    the SFTP protocol no longer requires this finicky and brittle quoting,
    and attempts to use it may cause transfers to fail. We consider the
    removal of the need for double-quoting shell characters in file names
    to be a benefit and do not intend to introduce bug-compatibility for
    legacy scp/rcp in scp(1) when using the SFTP protocol.
    
    Another area of potential incompatibility relates to the use of remote
    paths relative to other user's home directories, for example -
    "scp host:~user/file /tmp". The SFTP protocol has no native way to
    expand a ~user path. However, sftp-server(8) in OpenSSH 8.7 and later
    support a protocol extension "expand-path(a)openssh.com" to support
    this.
    
    In case of incompatibility, the scp(1) client may be instructed to use
    the legacy scp/rcp using the -O flag.
    
    New features
    ------------
    
     * ssh(1), sshd(8): use the hybrid Streamlined NTRU Prime + x25519 key
       exchange method by default ("sntrup761x25519-sha512(a)openssh.com").
       The NTRU algorithm is believed to resist attacks enabled by future
       quantum computers and is paired with the X25519 ECDH key exchange
       (the previous default) as a backstop against any weaknesses in
       NTRU Prime that may be discovered in the future. The combination
       ensures that the hybrid exchange offers at least as good security
       as the status quo.
    
       We are making this change now (i.e. ahead of cryptographically-
       relevant quantum computers) to prevent "capture now, decrypt
       later" attacks where an adversary who can record and store SSH
       session ciphertext would be able to decrypt it once a sufficiently
       advanced quantum computer is available.
    
     * sftp-server(8): support the "copy-data" extension to allow server-
       side copying of files/data, following the design in
       draft-ietf-secsh-filexfer-extensions-00. bz2948
    
     * sftp(1): add a "cp" command to allow the sftp client to perform
       server-side file copies.
    
    Bugfixes
    --------
    
     * ssh(1), sshd(8): upstream: fix poll(2) spin when a channel's output
       fd closes without data in the channel buffer. bz3405 and bz3411
    
     * sshd(8): pack pollfd array in server listen/accept loop. Could
       cause the server to hang/spin when MaxStartups > RLIMIT_NOFILE
    
     * ssh-keygen(1): avoid NULL deref via the find-principals and
       check-novalidate operations. bz3409 and GHPR#307 respectively.
    
     * scp(1): fix a memory leak in argument processing. bz3404
    
     * sshd(8): don't try to resolve ListenAddress directives in the sshd
       re-exec path. They are unused after re-exec and parsing errors
       (possible for example if the host's network configuration changed)
       could prevent connections from being accepted.
    
     * sshd(8): when refusing a public key authentication request from a
       client for using an unapproved or unsupported signature algorithm
       include the algorithm name in the log message to make debugging
       easier.
    
    Portability
    -----------
    
     * sshd(8): refactor platform-specific locked account check, fixing
       an incorrect free() on platforms with both libiaf and shadow
       passwords (probably only Unixware) GHPR#284,
    
     * ssh(1), sshd(8): Fix possible integer underflow in scan_scaled(3)
       parsing of K/M/G/etc quantities. bz#3401.
    
     * sshd(8): provide killpg implementation (mostly for Tandem NonStop)
       GHPR#301.
    
     * Check for missing ftruncate prototype. GHPR#301
    
     * sshd(8): default to not using sandbox when cross compiling. On most
       systems poll(2) does not work when the number of FDs is reduced
       with setrlimit, so assume it doesn't when cross compiling and we
       can't run the test.  bz#3398.
    
     * sshd(8): allow ppoll_time64 in seccomp sandbox. Should fix sandbox
       violations on some (at least i386 and armhf) 32bit Linux platforms.
       bz#3396.
    
     * Improve detection of -fzero-call-used-regs=all support in
       configure script.
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 420e8a85d0141198a04af0cb8000739c2bc4a108
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Mon Apr 18 20:53:35 2022 +0000

    lynis: Update to 3.0.7
    
    Full changelog as retrieved from https://cisofy.com/changelog/lynis/#307:
    
    - MALW-3290 - Show status of malware components
    - OS detection for RHEL 6 and Funtoo Linux
    - Added service manager openrc
    
    - DBS-1804 - Added alias for MariaDB
    - FINT-4316 - Support for newer Ubuntu versions
    - MALW-3280 - Added Trend Micro malware agent
    - NETW-3200 - Allow unknown number of spaces in modprobe blacklists
    - PKGS-7320 - Support for Garuda Linux and arch-audit
    - Several improvements for busybox shell
    - Russian translation of Lynis extended
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
    Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>

commit a808de4c17fea4453817d6dde9de7a0581f3e60d
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sat Apr 23 14:27:01 2022 +0000

    Core Update 168: Ship bind
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit ffa5629d06f3ee08ba49ecf6ef6c298cc98d91c4
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Fri Apr 22 09:55:36 2022 +0200

    bind: Update to 9.16.28
    
    For details see:
    https://downloads.isc.org/isc/bind9/9.16.28/doc/arm/html/notes.html#notes-for-bind-9-16-28
    
    "Notes for BIND 9.16.28
    New Features
    
        Add a new configuration option reuseport to disable load balancing
        on sockets in situations where processing of Response Policy Zones
        (RPZ), Catalog Zones, or large zone transfers can cause service
        disruptions. See the BIND 9 ARM for more detail. [GL #3249]
    
    Bug Fixes
    
        Invalid dnssec-policy definitions, where the defined keys did not
        cover both KSK and ZSK roles for a given algorithm, were being
        accepted. These are now checked, and the dnssec-policy is rejected
        if both roles are not present for all algorithms in use. [GL #3142]
    
        Handling of TCP write timeouts has been improved to track the
        timeout for each TCP write separately, leading to a faster
        connection teardown in case the other party is not reading the data.
        [GL #3200]"
    
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>

commit 701e63c222f7e09cd27c8198c02ce0279627c7d8
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sat Apr 23 14:26:05 2022 +0000

    Core Update 168: Ship libhtp and Suricata, restart the latter
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 30f306a3e28d63d63e126b709d8866cfc9b80803
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Fri Apr 22 10:21:48 2022 +0200

    suricata: Update to 5.0.9
    
    Changelog:
    
    "5.0.9 -- 2022-04-21
    
    Security #4889: ftp: SEGV at flow cleanup due to protocol confusion
    Security #5025: ftp: GetLine function buffers data indefinitely if 0x0a was not found int the frag'd input
    Security #5028: smtp: GetLine function buffers data indefinitely if 0x0a was not found in the frag'd input
    Security #5253: Infinite loop in JsonFTPLogger
    Feature #4644: pthreads: set minimum stack size
    Bug #4466: dataset file not written when run as user
    Bug #4678: Configuration test mode succeeds when reference.config file contains invalid content
    Bug #4745: Absent app-layer protocol is always enabled by default
    Bug #4819: tcp: insert_data_normal_fail can hit without triggering memcap
    Bug #4823: conf: quadratic complexity
    Bug #4825: pppoe decoder fails when protocol identity field is only 1 byte
    Bug #4827: packetpool: packets in pool may have capture method ReleasePacket callbacks set
    Bug #4838: af-packet: cluster_id is not used when trying to set fanout support
    Bug #4878: datasets: memory leak in 5.0.x
    Bug #4887: dnp3: buffer over read in logging base64 empty objects
    Bug #4891: protodetect: SMB vs TLS protocol detection in midstream
    Bug #4893: TFTP: memory leak due to missing detect state
    Bug #4895: Memory leak with signature using file_data and NFS
    Bug #4897: profiling: Invalid performance counter when using sampling
    Bug #4901: eve: memory leak related to dns
    Bug #4932: smtp: smtp transaction not logged if no email is present
    Bug #4955: stream: too aggressive pruning in lossy streams
    Bug #4957: SMTP assertion triggered
    Bug #4959: suricatasc loop if recv returns no data
    Bug #4961: dns: transaction not created when z-bit set
    Bug #4963: Run stream reassembly on both directions upon receiving a FIN packet
    Bug #5058: dns: probing/parser can return error when it should return incomplete
    Bug #5063: Not keyword matches in Kerberos requests
    Bug #5096: output: timestamp missing usecs on Arm 32bit + Musl
    Bug #5099: htp: server personality radix handling issue
    Bug #5101: defrag: policy config can setup radix incorrectly
    Bug #5103: Application log cannot to be re-opened when running as non-root user
    Bug #5105: iprep: cidr support can set up radix incorrectly
    Bug #5107: detect/iponly: rule parsing does not always apply netmask correctly
    Bug #5109: swf: coverity warning
    Bug #5115: detect/ip_proto: inconsistent behavior when specifying protocol by string
    Bug #5117: detect/iponly: mixing netblocks can lead to FN/FP
    Bug #5119: smb: excessive CPU utilization and higher packet processing latency due to excessive calls to Vec::extend_from_slice()
    Bug #5137: smb: excessive memory use during file transfer
    Bug #5150: nfs: Integer underflow in NFS
    Bug #5157: xbits: noalert is allowed in rule language with other commands
    Bug #5164: iprep: use_cnt can get desynchronized (SIGABRT)
    Bug #5171: detect/iponly: non-cidr netmask settings can lead incorrect radix tree
    Bug #5193: SSL : over allocation for certificates
    Bug #5213: content:"22 2 22"; is parsed without error
    Bug #5227: 5.0.x: SMB: Wrong buffer being checked for possible overflow.
    Bug #5251: smb: integer underflows and overflows
    Task #5006: libhtp 0.5.40"
    
    Additionally, I moved the 'suricata' patch files into a separate directory.
    Apart from some line numbers, nothing else was changed.
    
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>

commit c2ead0c78ddce8e82969ceaab172d3f6bc5e84d4
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Fri Apr 22 10:21:47 2022 +0200

    libhtp: Update to 0.5.40 - needed for 'suricata'
    
    For details see:
    https://github.com/OISF/libhtp/releases/tag/0.5.40
    
        "uri: optionally allows spaces in uri
        ints: integer handling improvements
        headers: continue on nul byte
        headers: consistent trailing space handling
        list: fix integer overflow
        util: remove unused htp_utf8_decode
        fix 100-continue with CL 0
        lzma: don't do unnecessary realloc"
    
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>

commit af8c9da4e525c3d0c896398d33e8e891180fc163
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sat Apr 23 14:24:25 2022 +0000

    Core Update 168: Ship knot
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit e56de75e336c84784d46c16f715950b088080adb
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Fri Apr 22 10:03:54 2022 +0200

    knot: Update to 3.1.7
    
    For changes since v3.1.1 see:
    https://gitlab.nic.cz/knot/knot-dns/raw/v3.1.7/NEWS
    
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>

commit 166efe4cb5c5ccd8888ce521857b36b3169b1f5a
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Fri Apr 22 13:32:28 2022 +0200

    mc: Update to 4.8.28
    
    For details see:
    http://midnight-commander.org/wiki/NEWS-4.8.28
    
    Summary:
    
    "Major changes since 4.8.27
    Core
    VFS
        Remove SMB support (#1)
    
    Editor
        Add syntax highlighting:
            Ngspice/SPICE (http://ngspice.sourceforge.net/) (#4316, #4319)
            DOT/Graphviz (https://graphviz.org/doc/info/lang.html) (#4322)
    
    Viewer
        Support file/dir macros from mc.ect for standalone viewer (#4150)
    
    Misc
        Minimal version of "check" utility is 0.9.10.
        Code cleanup (#4270, #4330)
        Support Shift+Fn keys for KiTTY (#4325)
        Filehighlight:
            graphical formats: avif, jp2, jxl, heic, heif, psb, psd (#4328)
            Markdown (#4351)
    
    Fixes
        FTBFS with ncurses build with --disable-widec (#4200)
        There is no exit on Ubuntu PPC64 big endian (#3887)
        Segfault on change panel mode (#4323)
        Accelerator conflict in Left/Right? menu (#4284)
        move a lot of files across filesystems is slow (#4287)
        mc.ext: wrong order of rules: general matches are made before more specific ones (#4273)
        mc.ext: compressed man pages are shown unformatted (#4272)
        ext.d/misc.sh: invoking /bin/cat on systems that have no /bin/cat (like NixOS) (#4298)
        mcedit: errors in syntax definitions (#4286)
        VFS: FISH: when uploading a symbolic link, it creates both the link and its target (#4281)
        VFS: SFTP: timestamps are not preserved for uploaded symlink (#4285)
        VFS: EXTFS: incorrect test of isoinfo (#4326)
        Typo in skin files (#3146)"
    
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>

commit 1f326847a36c80b4c65952d06687bf6819a2d6e8
Merge: 0676b7b77 7e6efc89e
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sat Apr 23 14:23:04 2022 +0000

    Merge branch 'next' into temp-c168-development

commit 0676b7b777e7d93d80103ca463567b89c8344841
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Mon Apr 18 21:16:03 2022 +0000

    borgbackup: Add missing 'python3-pkgconfig' dependency
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 9196f2a4483ca9a12485c9d511d9946ccc00a0d7
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Wed Apr 13 19:07:57 2022 +0200

    python3-pkgconfig: Install this new python module for borgbackup
    
    - Instal the python pkgconfig module - required for borgbackup
    - Install of rootfile
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>

commit 8b27f672f80f2364fd28b13466d3a555b5c076f1
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Wed Apr 13 19:07:56 2022 +0200

    borgbackup: Update to version 1.2.0
    
    - Update from 1.1.17 to 1.2.0
    - Update of rootfile
    - v2 version has x86_64 replaced by xxxMACHINExxx in the rootfile
    - borgbackup now requires the python module pkgconfig, installed as a set with this patch
    - Changelog
    	Compatibility notes:
    	    dropped support / testing for older Pythons, minimum requirement is 3.8. In
                 case your OS does not provide Python >= 3.8, consider using our binary,
                 which does not need an external Python interpreter. Or continue using
                 borg 1.1.x, which is still supported.
    	    freeing repository space only happens when “borg compact” is invoked.
    	    mount: the default for --numeric-ids is False now (same as borg extract)
    	    borg create --noatime is deprecated. Not storing atime is the default
                 behaviour now (use --atime if you want to store the atime).
    	    list: corrected mix-up of “isomtime” and “mtime” formats. Previously,
                 “isomtime” was the default but produced a verbose human format, while
                 “mtime” produced a ISO-8601-like format. The behaviours have been swapped
                 (so “mtime” is human, “isomtime” is ISO-like), and the default is now
                 “mtime”. “isomtime” is now a real ISO-8601 format (“T” between date and
                 time, not a space).
    	    create/recreate --list: file status for all files used to get announced
                 AFTER the file (with borg < 1.2). Now, file status is announced BEFORE the
                 file contents are processed. If the file status changes later (e.g. due to
                 an error or a content change), the updated/final file status will be
                 printed again.
    	    removed deprecated-since-long stuff (deprecated since):
    	        command “borg change-passphrase” (2017-02), use “borg key …”
    	        option “--keep-tag-files” (2017-01), use “--keep-exclude-tags”
    	        option “--list-format” (2017-10), use “--format”
    	        option “--ignore-inode” (2017-09), use “--files-cache” w/o “inode”
    	        option “--no-files-cache” (2017-09), use “--files-cache=disabled”
    	    removed BORG_HOSTNAME_IS_UNIQUE env var. to use borg you must implement one
                 of these 2 scenarios:
    	            the combination of FQDN and result of uuid.getnode() must be unique
                         and stable (this should be the case for almost everybody, except
                         when having duplicate FQDN and MAC address or all-zero MAC address)
    	            if you are aware that 1) is not the case for you, you must set
                         BORG_HOST_ID env var to something unique.
    	    exit with 128 + signal number, #5161. if you have scripts expecting rc == 2
                 for a signal exit, you need to update them to check for >= 128.
    	Fixes:
    	    diff: reduce memory consumption, fix is_hardlink_master, #6295
    	    compact: fix / improve freeable / freed space log output
    	        derive really freed space from quota use before/after, #5679
    	        do not say “freeable”, but “maybe freeable” (based on hint, unsure)
    	    fix race conditions in internal SaveFile function, #6306 #6028
    	    implement internal safe_unlink (was: truncate_and_unlink) function more
                 safely: usually it does not truncate any more, only under “disk full”
                 circumstances and only if there is only one hardlink. see:
                 https://github.com/borgbackup/borg/discussions/6286
    	Other changes:
    	    info: use a pre12-meta cache to accelerate stats for borg < 1.2 archives.
                 the first time borg info is invoked on a borg 1.1 repo, it can take a
                 rather long time computing and caching some stats values for 1.1 archives,
                 which borg 1.2 archives have in their archive metadata structure. be
                 patient, esp. if you have lots of old archives. following invocations are
                 much faster due to the cache. related change: add archive name to
                 calc_stats progress display.
    	    docs:
    	        add borg 1.2 upgrade notes, #6217
    	        link to borg placeholders and borg patterns help
    	        init: explain the encryption modes better
    	        clarify usage of patternfile roots
    	        put import-tar docs into same file as export-tar docs
    	        explain the difference between a path that ends with or without a slash,
                     #6297
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>

commit 0312f9294255755d4a94dcf3fd4b455e25e0324c
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Mon Apr 18 21:13:09 2022 +0000

    wio: Bump package version
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit aee369fea30e210bf1088e88116610f8ce970a4b
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Wed Apr 13 10:00:20 2022 +0200

    wio.cgi: Remove code lines that are commented out
    
    - These lines were introduced with another patch related to removing IPFire start/stop
       capability from wio
    - The lines were introduced in commented out form and so are doing nothing.
    - It looks like they were added as part of a debugging or investigation work on wio
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>

commit 12fbbc61e568b208f007df3b02c28b0bb6fe14e7
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Wed Apr 13 10:00:19 2022 +0200

    wio.pl: Fix bug 12799 - Remove code scanning for all potential IP's on RED interface
    
    - The lines to scan the red interface were introduced at the time of a patch to remove
       the IPFire start/stop function from wio. These lines are not related to that change
       but were included in the patch with no commit message. The same lines were also added
       into wio.cgi in the same patch set but in that case the lines were all commented out.
    - These lines look like they were most likely added to the code for investigation or
       debugging purposes. Looking at the lines in wio.pl the results obtained are not
       used elsewhere in wio for obtaining info on the status of the red interface. Deleting
       the lines did not affect anything related to the scanning, setup or monitoring of
       systems by wio.
    - The lines were wasting space but generally not creating a huge impact on pertformance.
       On my production system it scans my red and comes up with a list of 1022 IP's because
       of the subnet my ISP uses - xxx.yy.216.0/20
    - Scanning those 1022 IP's and sorting them takes my system about 3 seconds. Without
       sorting it is around the same level.
    - In Bug#12799 the originator has an ISP that is using a private network that has a
       defined subnet of 10.0.0.0/8 This is 16,777,214 IP's to be scanned. Even without sorting
       my system would end up taking around 13 hours to do that. The bug originator found that
       on certain machines that he had IPFire on wio just never stopped scanning.
    - As these lines just seem to collect a large amount of IP's on red that are not related
       to the actual running red IP, as there was no commit message related to their
       introduction and as removing the lines on vm's running dhcp and static red interfaces
       and also on my running production system for 4 weeks has shown no impact on the
       monitoring capability this patch is being submitted to remove these lines from wio
    
    Fixes: Bug#12799
    Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>

commit 2e68dcd6eb10cccda976d2dfe1f8204cb066eecb
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Tue Apr 12 12:35:40 2022 +0200

    tshark: Update to version 3.6.3
    
    - Update from 3.4.7 to 3.6.3
    - Update of rootfile
    - find-dependencies run due to sobump - nothing reported
    - Changelog - a range of changes including many bug fixes and several vulnerabilities
    	Wireshark 3.6.3 Release Notes
    	  Bug Fixes
    	     • Fuzz job crash output: fuzz-2022-01-19-7399.pcap Issue 17894[1].
    	     • TLS dissector incorrectly reports JA3 values Issue 17942[2].
    	     • "Wiki Protocol page" in packet details menu is broken - wiki
    	       pages not migrated to GitLab? Issue 17944[3].
    	     • Dissector bug, protocol PFCP display Flow Description IE value
    	       error in Additional Flow Description of PFD Management Request
    	       Message Issue 17951[4].
    	     • Bluetooth: Fails to open Log file for SCO connection Issue
    	       17964[5].
    	     • Fuzz job crash output: fuzz-2022-03-07-10896.pcap Issue 17984[6].
    	     • libwiretap: Save as ERF causes segmentation fault Issue 17989[7].
    	     • HTTP server returning multiple early hints shows too many
    	       responses in "Follow HTTP Stream" Issue 18006[8].
    	  New and Updated Features
    	     Updated Protocol Support
    	      CSN.1, HTTP, IEEE 802.11, NTLM SSP, PFCP, PKTLOG, SSDP, TLS, and USB
    	      HID
    	     New and Updated Capture File Support
    	      pcap and pcapng
    	Wireshark 3.6.2 Release Notes
    	  Bug Fixes
    	   The following vulnerabilities have been fixed:
    	     • wnpa-sec-2022-01[1] RTMPT dissector infinite loop. Issue
    	       17813[2].
    	     • wnpa-sec-2022-02[3] Large loops in multiple dissectors. Issue
    	       17829[4], Issue 17842[5], Issue 17847[6], Issue 17855[7], Issue
    	       17891[8], Issue 17925[9], Issue 17926[10], Issue 17931[11], Issue
    	       17932[12], Issue 17933[13].
    	     • wnpa-sec-2022-03[14] PVFS dissector crash. Issue 17840[15].
    	     • wnpa-sec-2022-04[16] CSN.1 dissector crash. Issue 17882[17].
    	     • wnpa-sec-2022-05[18] CMS dissector crash. Issue 17935[19].
    	   The following bugs have been fixed:
    	     • Support for GSM SMS TPDU in HTTP2 body Issue 17784[20].
    	     • Wireshark 3.6.1 broke the ABI by removing ws_log_default_writer
    	       from libwsutil Issue 17822[21].
    	     • Fedora RPM package build failing with RPATH of /usr/local/lib64
    	       Issue 17830[22].
    	     • macos-setup.sh: ftp.pcre.org no longer exists Issue 17834[23].
    	     • nmap.org/npcap → npcap.com: domain/URL change Issue 17838[24].
    	     • MPLS ECHO FEC stack change TLV not dissected correctly Issue
    	       17868[25].
    	     • Attempting to open a systemd journal export file segfaults Issue
    	       17875[26].
    	     • Dissector bug on 802.11ac packets Issue 17878[27].
    	     • The Info column shows only one NGAP/S1AP packet of several
    	       packets inside an SCTP packet Issue 17886[28].
    	     • Uninstalling Wireshark 3.6.1 on Windows 10 fails to remove the
    	       installation directory because it doesn’t remove the User’s Guide
    	       subdirectory and all its contents. Issue 17898[29].
    	     • 3.6 doesn’t build without zlib Issue 17899[30].
    	     • SIP Statistics no longer properly reporting method type
    	       accounting Issue 17904[31].
    	     • Fuzz job crash output: fuzz-2022-01-26-6940.pcap Issue 17909[32].
    	     • SCTP retransmission detection broken for the first data chunk of
    	       each association with relative TSN Issue 17917[33].
    	     • “Show In Folder” doesn’t work correctly for filenames with spaces
    	       Issue 17927[34].
    	  New and Updated Features
    	     Updated Protocol Support
    	      AMP, ASN.1 PER, ATN-ULCS, BGP, BP, CFLOW, CMS, CSN.1, GDSDB, GSM RP,
    	      GTP, HTTP3, IEEE 802.11 Radiotap, IPDC, ISAKMP, Kafka, MP2T, MPEG
    	      PES, MPEG SECT, MPLS ECHO, NGAP, NTLMSSP, OpenFlow 1.4, OpenFlow 1.5,
    	      P_MUL, PN-RT, PROXY, PTP, PVFS, RSL, RTMPT, rtnetlink, S1AP, SCTP,
    	      Signal PDU, SIP, TDS, USB, WAP, and ZigBee ZCL
    	  New and Updated Capture File Support
    	      BLF and libpcap
    	Wireshark 3.6.1 Release Notes
    	  Bug Fixes
    	   The following vulnerabilities have been fixed:
    	     • wnpa-sec-2021-17[1] RTMPT dissector infinite loop. Issue
    	       17745[2]. CVE-2021-4185[3].
    	     • wnpa-sec-2021-18[4] BitTorrent DHT dissector infinite loop. Issue
    	       17754[5]. CVE-2021-4184[6].
    	     • wnpa-sec-2021-19[7] pcapng file parser crash. Issue 17755[8].
    	       CVE-2021-4183[9].
    	     • wnpa-sec-2021-20[10] RFC 7468 file parser infinite loop. Issue
    	       17801[11]. CVE-2021-4182[12].
    	     • wnpa-sec-2021-21[13] Sysdig Event dissector crash.
    	       CVE-2021-4181[14].
    	     • wnpa-sec-2021-22[15] Kafka dissector infinite loop. Issue
    	       17811[16].
    	   The following bugs have been fixed:
    	     • Allow sub-second timestamps in hexdumps Issue 15562[17].
    	     • GRPC: An unnecessary empty Protobuf tree item is displayed if the
    	       GRPC message body length is 0 Issue 17675[18].
    	     • Can’t install "ChmodBPF.pkg" or "Add Wireshark to the system
    	       path.pkg" on M1 MacBook Air Monterey without Rosetta 2 Issue
    	       17757[19].
    	     • TECMP: LIN Payload is cut off by 1 byte Issue 17760[20].
    	     • Wireshark crashes if a 64 bit field of type BASE_CUSTOM is
    	       applied as a column Issue 17762[21].
    	     • Command line option "-o console.log.level" causes wireshark and
    	       tshark to exit on start Issue 17763[22].
    	     • Setting WIRESHARK_LOG_LEVEL=debug breaks interface capture Issue
    	       17764[23].
    	     • Unable to build without tshark Issue 17766[24].
    	     • IEEE 802.11 action frames are not getting parsed and always seen
    	       as malformed Issue 17767[25].
    	     • IEC 60870-5-101 link address field is 1 byte, but should have
    	       configurable length of 0,1 or 2 bytes Issue 17775[26].
    	     • dfilter: 'tcp.port not in {1}' crashes Wireshark Issue 17785[27].
    	  New and Updated Features
    	     • The 'console.log.level' preference was removed in Wireshark
    	       3.6.0. This release adds an '-o console.log.level:'
    	       backward-compatibilty option on the CLI that maps to the new
    	       logging sub-system. Note that this does not have bitmask
    	       semantics and does not correspond to any actual preference. It is
    	       just a transition mechanism for users that were relying on this
    	       CLI option and will be removed in the future. To see the new
    	       diagnostic output options consult the manpages or the output of
    	       '--help'.
    	  Updated Protocol Support
    	      ANSI A I/F, AT, BitTorrent DHT, FF, GRPC, IEC 101/104, IEEE 802.11,
    	      IEEE 802.11 Radiotap, IPsec, Kafka, QUIC, RTMPT, RTSP, SRVLOC, Sysdig
    	      Event, and TECMP
    	  New and Updated Capture File Support
    	      BLF and RFC 7468
    	Wireshark 3.6.0 Release Notes
    	  Many improvements have been made. See the “New and Updated Features”
    	  section below for more details. You might want to pay particular
    	  attention to the display filter syntax updates.
    	  New and Updated Features
    	   The following features are new (or have been significantly updated)
    	   since version 3.6.0rc3:
    	     • The macOS Intel packages now ship with Qt 5.15.3 and require
    	       macOS 10.13 or later.
    	   The following features are new (or have been significantly updated)
    	   since version 3.6.0rc2:
    	     • Display filter set elements must now be comma-separated. See
    	       below for more details.
    	   The following features are new (or have been significantly updated)
    	   since version 3.6.0rc1:
    	     • The display filter expression “a != b” now has the same meaning
    	       as “!(a == b)”.
    	   The following features are new (or have been significantly updated)
    	   since version 3.5.0:
    	     • Nothing of note.
    	   The following features are new (or have been significantly updated)
    	   since version 3.4.0:
    	     • Several changes have been made to the display filter syntax:
    	        • The expression “a != b” now always has the same meaning as
    	       “!(a == b)”. In particular this means filter expressions with
    	       multi-value fields like “ip.addr != 1.1.1.1” will work as
    	       expected (the result is the same as typing “ip.src != 1.1.1.1 and
    	       ip.dst != 1.1.1.1”). This avoids the contradiction (a == b and a
    	       != b) being true.
    	        • It is possible to use the syntax “a ~= b” or “a any_ne b” to
    	       recover the previous (inconsistent with "==") logic for not
    	       equal.
    	        • Literal strings can now be specified using raw string syntax,
    	       identical to raw strings in the Python programming language. This
    	       can be used to avoid the complexity of using two levels of
    	       character escapes with regular expressions.
    	        • Set elements must now be separated using a comma. A filter
    	       such as http.request.method in {"GET" "HEAD"} must be written as
    	       …​ in {"GET", "HEAD"}. Whitespace is not significant. The
    	       previous use of whitespace as separator is deprecated and will be
    	       removed in a future version.
    	        • Support for the syntax "a not in b" with the same meaning as
    	       "not a in b" has been added.
    	     • Packaging updates:
    	        • A macOS Arm 64 (Apple Silicon) package is now available.
    	        • The macOS Intel packages now ship with Qt 5.15.3 and require
    	       macOS 10.13 or later.
    	        • The Windows installers now ship with Npcap 1.55.
    	        • A 64-bit Windows PortableApps package is now available.
    	     • TCP conversations now support a completeness criteria, which
    	       facilitates the identification of TCP streams having any of
    	       opening or closing handshakes, a payload, in any combination. It
    	       can be accessed with the new tcp.completeness filter.
    	     • Protobuf fields that are not serialized on the wire or otherwise
    	       missing in capture files can now be displayed with default values
    	       by setting the new “add_default_value” preference. The default
    	       values might be explicitly declared in “proto2” files, or false
    	       for bools, first value for enums, zero for numeric types.
    	     • Wireshark now supports reading Event Tracing for Windows (ETW). A
    	       new extcap named ETW reader is created that now can open an etl
    	       file, convert all events in the file to DLT_ETW packets and write
    	       to a specified FIFO destination. Also, a new packet_etw dissector
    	       is created to dissect DLT_ETW packets so Wireshark can display
    	       the DLT_ETW packet header, its message and packet_etw dissector
    	       calls packet_mbim sub_dissector if its provider matches the MBIM
    	       provider GUID.
    	     • “Follow DCCP stream” feature to filter for and extract the
    	       contents of DCCP streams.
    	     • Wireshark now supports dissecting RTP packets with OPUS payloads.
    	     • Importing captures from text files based on regular expressions
    	       is now possible. By specifying a regex capturing a single packet
    	       including capturing groups for relevant fields a textfile can be
    	       converted to a libpcap capture file. Supported data encodings are
    	       plain-hexadecimal, -octal, -binary and base64. Also the timestamp
    	       format now allows the second-fractions to be placed anywhere in
    	       the timestamp and it will be stored with nanosecond instead of
    	       microsecond precision.
    	     • The RTP Player has been significatnly redesigned and improved.
    	       See Playing VoIP Calls[1] and RTP Player Window[2] in the User’s
    	       Guide for more details.
    	        • The RTP Player can play many streams in row.
    	        • The UI is more responsive.
    	        • The RTP Player maintains playlist and other tools can add and
    	       remove streams to and from it.
    	        • Every stream can be muted or routed to the left or right
    	       channel for replay.
    	        • The option to save audio has been moved from the RTP Analysis
    	       dialog to the RTP Player. The RTP Player also saves what was
    	       played, and it can save in multichannel .au or .wav.
    	        • The RTP Player is now accessible from the Telephony › RTP ›
    	       RTP Player menu.
    	     • The VoIP dialogs (VoIP Calls, RTP Streams, RTP Analysis, RTP
    	       Player, SIP Flows) are non-modal and can stay opened on
    	       background.
    	        • The same tools are provided across all dialogs (Prepare
    	       Filter, Analyse, RTP Player …​)
    	     • The “Follow Stream” dialog is now able to follow SIP calls based
    	       on their Call-ID value.
    	     • The “Follow Stream” dialog’s YAML output format has been updated
    	       to add timestamps and peers information For more details see
    	       Following Protocol Streams[3] in the User’s Guide.
    	     • IP fragments between public IPv4 addresses are now reassembled
    	       even if they have different VLAN IDs. Reassembly of IP fragments
    	       where one endpoint is a private (RFC 1918 section 3) or
    	       link-local (RFC 3927) IPv4 address continues to take the VLAN ID
    	       into account, as those addresses can be reused. To revert to the
    	       previous behavior and not reassemble fragments with different
    	       VLAN IDs, turn on the “Enable stricter conversation tracking
    	       heuristics” top level protocol preference.
    	     • USB Link Layer reassembly has been added, which allows hardware
    	       captures to be analyzed at the same level as software captures.
    	     • TShark can now export TLS session keys with the
    	       --export-tls-session-keys option.
    	     • Wireshark participated in the Google Season of Docs 2020 and the
    	       User’s Guide has been extensively updated.
    	     • The “RTP Stream Analysis” dialog CSV export format was slightly
    	       changed. The first line of the export contains column titles as
    	       in other CSV exports.
    	     • Wireshark now supports the Turkish language.
    	     • The settings in the “Import from Hex Dump” dialog is now stored
    	       in a profile import_hexdump.json file.
    	     • Analyze › Reload Lua Plugins has been improved to properly
    	       support FileHandler.
    	     • The “RTP Stream Analysis” and “IAX2 Stream Analysis” dialogs now
    	       show correct calculation mean jitter calculations.
    	     • RTP streams are now created based on Skinny protocol messages in
    	       addition to other types of messages.
    	     • The “VoIP Calls Flow Sequence” window shows more information
    	       about various Skinny messages.
    	     • Initial support for building Wireshark on Windows using GCC and
    	       MinGW-w64 has been added. See README.msys2 in the sources for
    	       more information.
    	  New File Format Decoding Support
    	      Vector Informatik Binary Log File (BLF)
    	  New Protocol Support
    	      5G Lawful Interception (5GLI), Bluetooth Link Manager Protocol (BT
    	      LMP), Bundle Protocol version 7 (BPv7), Bundle Protocol version 7
    	      Security (BPSec), CBOR Object Signing and Encryption (COSE), E2
    	      Application Protocol (E2AP), Event Tracing for Windows (ETW), EXtreme
    	      extra Eth Header (EXEH), High-Performance Connectivity Tracer
    	      (HiPerConTracer), ISO 10681, Kerberos SPAKE, Linux psample protocol,
    	      Local Interconnect Network (LIN), Microsoft Task Scheduler Service,
    	      O-RAN E2AP, O-RAN fronthaul UC-plane (O-RAN), Opus Interactive Audio
    	      Codec (OPUS), PDU Transport Protocol, R09.x (R09), RDP Dynamic
    	      Channel Protocol (DRDYNVC), RDP Graphic pipeline channel Protocol
    	      (EGFX), RDP Multi-transport (RDPMT), Real-Time Publish-Subscribe
    	      Virtual Transport (RTPS-VT), Real-Time Publish-Subscribe Wire
    	      Protocol (processed) (RTPS-PROC), Shared Memory Communications (SMC),
    	      Signal PDU, SparkplugB, State Synchronization Protocol (SSyncP),
    	      Tagged Image File Format (TIFF), TP-Link Smart Home Protocol, UAVCAN
    	      DSDL, UAVCAN/CAN, UDP Remote Desktop Protocol (RDPUDP), Van Jacobson
    	      PPP compression (VJC), World of Warcraft World (WOWW), and X2 xIRI
    	      payload (xIRI)
    	  Updated Protocol Support
    	      Too many protocols have been updated to list here.
    	  New and Updated Capture File Support
    	      Vector Informatik Binary Log File (BLF)
    	Wireshark 3.4.9 Release Notes
    	  Bug Fixes
    	     • TShark PDML output embeds "proto" elements within other "proto"
    	       elements Issue 10588[1].
    	     • Filter expressions comparing against single-octet hex strings
    	       where the hex digit string equals a protocol name don’t work
    	       Issue 12810[2].
    	     • AMQP 0.9: dissector fails to handle Content-Body frame split
    	       across TCP packets Issue 14217[3].
    	     • IEEE 802.15.4: Missing check on "PAN ID Present" bit of the
    	       Multipurpose Frame Control field Issue 17496[4].
    	     • Wireshark ignored some character in filename when exporting SMB
    	       objects. Issue 17530[5].
    	     • tshark -z credentials: assertion failed: (allocator→in_scope)
    	       Issue 17576[6].
    	     • IS-IS Extended IP Reachability Prefix-SID not decoded properly
    	       Issue 17610[7].
    	     • Error when reloading lua plugins with a capture file loaded via a
    	       custom lua file handler Issue 17615[8].
    	     • Absolute time UTC field filters are constructed incorrectly,
    	       don’t match the packet Issue 17617[9].
    	     • GUI freezes when clicking on large (non-capture) file in File
    	       chooser Issue 17620[10].
    	     • Crash after selecting a different profile while capturing Issue
    	       17622[11].
    	     • BT-DHT reports malformed packets that are actually uTP on same
    	       connection Issue 17626[12].
    	  Updated Protocol Support
    	      AMQP, Aruba IAP, BGP, BT-DHT, CoAP, DCERPC SPOOLSS, Diameter, EPL,
    	      GSM A-bis OML, GSM A-I/F COMMON, GSM SIM, IEEE 1905.1a, IEEE
    	      802.15.4, IMAP, InfiniBand, ISIS LSP, ISObus VT, JPEG, MP2T,
    	      NORDIC_BLE, QUIC, RTCP, SDP, SMB, TWAMP-Control, USB HID, and VSS
    	      Monitoring
    	  New and Updated Capture File Support
    	      CAM Inspector, Ixia IxVeriWave, pcapng, and USBDump
    	Wireshark 3.4.8 Release Notes
    	  Bug Fixes
    	     • Dissector bug reported for Bluetooth Cycling Power Measurement
    	       characteristic for extreme angles value Issue 17505[1].
    	     • vcruntime140_1.dll deleted on Wireshark update/install Issue
    	       17506[2].
    	     • Raknet Addresses are incorrectly identified. Issue 17509[3].
    	     • Editcap saving files as ethernet when specifying '-T
    	       ieee-802-11-*' Issue 17520[4].
    	     • CoAP dissector confuses Content-Format with Accept Issue
    	       17536[5].
    	  Updated Protocol Support
    	      BT ATT, BT LE LL, CoAP, DLM3, GSM SIM, iLBC, and RakNet
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>

commit bdd2566f7bbda478769006871c6f515fc6230940
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Sun Apr 10 13:18:20 2022 +0200

    python3-urllib3: Update to version 1.26.9
    
    - Update from 1.26.7 to 1.26.9
    - Update of rootfile
    - Changelog
        1.26.9 (2022-03-16)
    	* Changed ``urllib3[brotli]`` extra to favor installing Brotli libraries that are still
    	  receiving updates like ``brotli`` and ``brotlicffi`` instead of ``brotlipy``.
    	  This change does not impact behavior of urllib3, only which dependencies are installed.
    	* Fixed a socket leaking when ``HTTPSConnection.connect()`` raises an exception.
    	* Fixed ``server_hostname`` being forwarded from ``PoolManager`` to ``HTTPConnectionPool``
    	  when requesting an HTTP URL. Should only be forwarded when requesting an HTTPS URL.
        1.26.8 (2022-01-07)
    	* Added extra message to ``urllib3.exceptions.ProxyError`` when urllib3 detects that
    	  a proxy is configured to use HTTPS but the proxy itself appears to only use HTTP.
    	* Added a mention of the size of the connection pool when discarding a connection due to the pool being full.
    	* Added explicit support for Python 3.11.
    	* Deprecated the ``Retry.MAX_BACKOFF`` class property in favor of ``Retry.DEFAULT_MAX_BACKOFF``
    	  to better match the rest of the default parameter names. ``Retry.MAX_BACKOFF`` is removed in v2.0.
    	* Changed location of the vendored ``ssl.match_hostname`` function from ``urllib3.packages.ssl_match_hostname``
    	  to ``urllib3.util.ssl_match_hostname`` to ensure Python 3.10+ compatibility after being repackaged
    	  by downstream distributors.
    	* Fixed absolute imports, all imports are now relative.
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>

commit 76227aaf7181296f58969a00b91ad2c80d800cfa
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Sun Apr 10 13:18:19 2022 +0200

    python3-typing-extensions: Update to version 4.1.1
    
    - Update from 4.0.1 to 4.1.1
    - Update of rootfile
    - Changelog
       # Release 4.1.1 (February 13, 2022)
    	- Fix importing `typing_extensions` on Python 3.7.0 and 3.7.1. Original
    	  patch by Nikita Sobolev (@sobolevn).
       # Release 4.1.0 (February 12, 2022)
    	- Runtime support for PEP 646, adding `typing_extensions.TypeVarTuple`
    	  and `typing_extensions.Unpack`.
    	- Add interaction of `Required` and `NotRequired` with `__required_keys__`,
    	  `__optional_keys__` and `get_type_hints()`. Patch by David Cabot (@d-k-bo).
    	- Runtime support for PEP 675 and `typing_extensions.LiteralString`.
    	- Add `Never` and `assert_never`. Backport from bpo-46475.
    	- `ParamSpec` args and kwargs are now equal to themselves. Backport from
    	  bpo-46676. Patch by Gregory Beauregard (@GBeauregard).
    	- Add `reveal_type`. Backport from bpo-46414.
    	- Runtime support for PEP 681 and `typing_extensions.dataclass_transform`.
    	- `Annotated` can now wrap `ClassVar` and `Final`. Backport from
    	  bpo-46491. Patch by Gregory Beauregard (@GBeauregard).
    	- Add missed `Required` and `NotRequired` to `__all__`. Patch by
    	  Yuri Karabas (@uriyyo).
    	- The `@final` decorator now sets the `__final__` attribute on the
    	  decorated object to allow runtime introspection. Backport from
    	  bpo-46342.
    	- Add `is_typeddict`. Patch by Chris Moradi (@chrismoradi) and James
    	  Hilton-Balfe (@Gobot1234).
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>

commit f9563f97c63e0c5c4249cea00ddeb82f5e2450f4
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Sun Apr 10 13:18:18 2022 +0200

    python3-tomli: Update to version 2.0.1
    
    - Update from 2.0.0 to 2.0.1
    - Update of rootfile
    - Changelog
         2.0.1
    	    Improve
    	        Make bundling easier by using relative imports internally and adding
                     license and copyright notice to source files.
    	        Make error messages more uniform
    	        Raise a friendly TypeError for wrong file mode
    	        Allow parse_float to return objects having the append attr
    	        Eagerly raise an error if parse_float returns an illegal type
    	    Packaging
    	        Move from pytest testing framework to unittest and remove python-dateutil
                     test dependency. Tests now only require Python interpreter.
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>

commit 75363dc20ffbb2aa17518b757eec2a4e09f9be65
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Sun Apr 10 13:18:17 2022 +0200

    python3-setuptools: Update to version 62.0.0
    
    - Update from 59.5.0 to 62.0.0
    - Update of rootfile
    - Changelog
    	v62.0.0
    	Breaking Changes
    	* #3151: Made ``setup.py develop --user`` install to the user site packages directory even if it is disabled in the current interpreter.
    	Changes
    	* #3153: When resolving requirements use both canonical and normalized names -- by :user:`ldaniluk`
    	* #3167: Honor unix file mode in ZipFile when installing wheel via ``install_as_egg`` -- by :user:`delijati`
    	Misc
    	* #3088: Fixed duplicated tag with the ``dist-info`` command.
    	* #3247: Fixed problem preventing ``readme`` specified as dynamic in ``pyproject.toml``
    	  from being dynamically specified in ``setup.py``.
    	v61.3.1
    	Misc
    	* #3233: Included missing test file ``setupcfg_examples.txt`` in ``sdist``.
    	* #3233: Added script that allows developers to download ``setupcfg_examples.txt`` prior to
    	  running tests. By caching these files it should be possible to run the test suite
    	  offline.
    	v61.3.0
    	Changes
    	* #3229: Disabled automatic download of ``trove-classifiers`` to facilitate reproducibility.
    	Misc
    	* #3229: Updated ``pyproject.toml`` validation via ``validate-pyproject`` v0.7.1.
    	* #3229: New internal tool made available for updating the code responsible for
    	  the validation of ``pyproject.toml``.
    	  This tool can be executed via ``tox -e generate-validation-code``.
    	v61.2.0
    	Changes
    	* #3215: Ignored a subgroup of invalid ``pyproject.toml`` files that use the ``[project]``
    	  table to specify only ``requires-python`` (**transitional**).
    	  .. warning::
    	     Please note that future releases of setuptools will halt the build process
    	     if a ``pyproject.toml`` file that does not match doc:`the PyPA Specification
    	     <PyPUG:specifications/declaring-project-metadata>` is given.
    	* #3215: Updated ``pyproject.toml`` validation, as generated by ``validate-pyproject==0.6.1``.
    	* #3218: Prevented builds from erroring if the project specifies metadata via
    	  ``pyproject.toml``, but uses other files (e.g. ``setup.py``) to complement it,
    	  without setting ``dynamic`` properly.
    	  .. important::
    	     This is a **transitional** behaviour.
    	     Future releases of ``setuptools`` may simply ignore externally set metadata
    	     not backed by ``dynamic`` or even halt the build with an error.
    	* #3224: Merge changes from pypa/distutils(a)e1d5c9b1f6
    	Documentation changes
    	* #3217: Fixed typo in ``pyproject.toml`` example in Quickstart -- by :user:`pablo-cardenas`.
    	Misc
    	* #3223: Fixed missing requirements with environment markers when
    	  ``optional-dependencies`` is set in ``pyproject.toml``.
    	v61.1.1
    	Misc
    	* #3212: Fixed missing dependencies when running ``setup.py install``.
    	  Note that calling ``setup.py install`` directly is still deprecated and
    	  will be removed in future versions of ``setuptools``.
    	  Please check the release notes for :ref:`setup_install_deprecation_note`.
    	v61.1.0
    	Deprecations
    	* #3206: Changed ``setuptools.convert_path`` to an internal function that is not exposed
    	  as part of setuptools API.
    	  Future releases of ``setuptools`` are likely to remove this function.
    	Changes
    	* #3202: Changed behaviour of auto-discovery to not explicitly expand ``package_dir``
    	  for flat-layouts and to not use relative paths starting with ``./``.
    	* #3203: Prevented ``pyproject.toml`` parsing from overwriting
    	  ``dist.include_package_data`` explicitly set in ``setup.py`` with default
    	  value.
    	* #3208: Added a warning for non existing files listed with the ``file`` directive in
    	  ``setup.cfg`` and ``pyproject.toml``.
    	* #3208: Added a default value for dynamic ``classifiers`` in ``pyproject.toml`` when
    	  files are missing and errors being ignored.
    	* #3211: Disabled auto-discovery when distribution class has a ``configuration``
    	  attribute (e.g. when the ``setup.py`` script contains ``setup(...,
    	  configuration=...)``).  This is done to ensure extension-only packages created
    	  with ``numpy.distutils.misc_util.Configuration`` are not broken by the safe
    	  guard
    	  behaviour to avoid accidental multiple top-level packages in a flat-layout.
    	  .. note::
    	     Users that don't set ``packages``, ``py_modules``, or ``configuration`` are
    	     still likely to observe the auto-discovery behavior, which may halt the
    	     build if the project contains multiple directories and/or multiple Python
    	     files directly under the project root.
    	     To disable auto-discovery please explicitly set either ``packages`` or
    	     ``py_modules``. Alternatively you can also configure :ref:`custom-discovery`.
    	v61.0.0
    	Deprecations
    	* #3068: Deprecated ``setuptools.config.read_configuration``,
    	  ``setuptools.config.parse_configuration`` and other functions or classes
    	  from ``setuptools.config``.
    	  Users that still need to parse and process configuration from ``setup.cfg`` can
    	  import a direct replacement from ``setuptools.config.setupcfg``, however this
    	  module is transitional and might be removed in the future
    	  (the ``setup.cfg`` configuration format itself is likely to be deprecated in the future).
    	Breaking Changes
    	* #2894: If you purposefully want to create an *"empty distribution"*, please be aware
    	  that some Python files (or general folders) might be automatically detected and
    	  included.
    	  Projects that currently don't specify both ``packages`` and ``py_modules`` in their
    	  configuration and contain extra folders or Python files (not meant for distribution),
    	  might see these files being included in the wheel archive or even experience
    	  the build to fail.
    	  You can check details about the automatic discovery (and how to configure a
    	  different behaviour) in :doc:`/userguide/package_discovery`.
    	* #3067: If the file ``pyproject.toml`` exists and it includes project
    	  metadata/config (via ``[project]`` table or ``[tool.setuptools]``),
    	  a series of new behaviors that are not backward compatible may take place:
    	  - The default value of ``include_package_data`` will be considered to be ``True``.
    	  - Setuptools will attempt to validate the ``pyproject.toml`` file according
    	    to PEP 621 specification.
    	  - The values specified in ``pyproject.toml`` will take precedence over those
    	    specified in ``setup.cfg`` or ``setup.py``.
    	Changes
    	* #2887: **[EXPERIMENTAL]** Added automatic discovery for ``py_modules`` and ``packages``
    	  -- by :user:`abravalheri`.
    	  Setuptools will try to find these values assuming that the package uses either
    	  the *src-layout* (a ``src`` directory containing all the packages or modules),
    	  the *flat-layout* (package directories directly under the project root),
    	  or the *single-module* approach (an isolated Python file, directly under
    	  the project root).
    	  The automatic discovery will also respect layouts that are explicitly
    	  configured using the ``package_dir`` option.
    	  For backward-compatibility, this behavior will be observed **only if both**
    	  ``py_modules`` **and** ``packages`` **are not set**.
    	  (**Note**: specifying ``ext_modules`` might also prevent auto-discover from
    	  taking place)
    	  If setuptools detects modules or packages that are not supposed to be in the
    	  distribution, please manually set ``py_modules`` and ``packages`` in your
    	  ``setup.cfg`` or ``setup.py`` file.
    	  If you are using a *flat-layout*, you can also consider switching to
    	  *src-layout*.
    	* #2887: **[EXPERIMENTAL]** Added automatic configuration for the ``name`` metadata
    	  -- by :user:`abravalheri`.
    	  Setuptools will adopt the name of the top-level package (or module in the case
    	  of single-module distributions), **only when** ``name`` **is not explicitly
    	  provided**.
    	  Please note that it is not possible to automatically derive a single name when
    	  the distribution consists of multiple top-level packages or modules.
    	* #3066: Added vendored dependencies for :pypi:`tomli`, :pypi:`validate-pyproject`.
    	  These dependencies are used to read ``pyproject.toml`` files and validate them.
    	* #3067: **[EXPERIMENTAL]** When using ``pyproject.toml`` metadata,
    	  the default value of ``include_package_data`` is changed to ``True``.
    	* #3068: **[EXPERIMENTAL]** Add support for ``pyproject.toml`` configuration
    	  (as introduced by :pep:`621`). Configuration parameters not covered by
    	  standards are handled in the ``[tool.setuptools]`` sub-table.
    	  In the future, existing ``setup.cfg`` configuration
    	  may be automatically converted into the ``pyproject.toml`` equivalent before taking effect
    	  (as proposed in #1688). Meanwhile users can use automated tools like
    	  :pypi:`ini2toml` to help in the transition.
    	  Please note that the legacy backend is not guaranteed to work with
    	  ``pyproject.toml`` configuration.
    	  -- by :user:`abravalheri`
    	* #3125: Implicit namespaces (as introduced in :pep:`420`) are now considered by default
    	  during :doc:`package discovery </userguide/package_discovery>`, when
    	  ``setuptools`` configuration and project metadata are added to the
    	  ``pyproject.toml`` file.
    	  To disable this behaviour, use ``namespaces = False`` when explicitly setting
    	  the ``[tool.setuptools.packages.find]`` section in ``pyproject.toml``.
    	  This change is backwards compatible and does not affect the behaviour of
    	  configuration done in ``setup.cfg`` or ``setup.py``.
    	* #3152: **[EXPERIMENTAL]** Added support for ``attr:`` and ``cmdclass`` configurations
    	  in ``setup.cfg`` and ``pyproject.toml`` when ``package_dir`` is implicitly
    	  found via auto-discovery.
    	* #3178: Postponed importing ``ctypes`` when hiding files on Windows.
    	  This helps to prevent errors in systems that might not have ``libffi`` installed.
    	* #3179: Merge with pypa/distutils(a)267dbd25ac
    	Documentation changes
    	* #3172: Added initial documentation about configuring ``setuptools`` via ``pyproject.toml``
    	  (using standard project metadata).
    	Misc
    	* #3065: Refactored ``setuptools.config`` by separating configuration parsing (specific
    	  to the configuration file format, e.g. ``setup.cfg``) and post-processing
    	  (which includes directives such as ``file:`` that can be used across different
    	  configuration formats).
    	v60.10.0
    	Changes
    	* #2971: Deprecated upload_docs command, to be removed in the future.
    	* #3137: Use samefile from stdlib, supported on Windows since Python 3.2.
    	* #3170: Adopt nspektr (vendored) to implement Distribution._install_dependencies.
    	Documentation changes
    	* #3144: Added documentation on using console_scripts from setup.py, which was previously only shown in setup.cfg  -- by :user:`xhlulu`
    	* #3148: Added clarifications about ``MANIFEST.in``, that include links to PyPUG docs
    	  and more prominent mentions to using a revision control system plugin as an
    	  alternative.
    	* #3148: Removed mention to ``pkg_resources`` as the recommended way of accessing data
    	  files, in favour of importlib.resources.
    	  Additionally more emphasis was put on the fact that *package data files* reside
    	  **inside** the *package directory* (and therefore should be *read-only*).
    	Misc
    	* #3120: Added workaround for intermittent failures of backend tests on PyPy.
    	  These tests now are marked with `XFAIL
    	  <https://docs.pytest.org/en/stable/how-to/skipping.html>`_, instead of erroring
    	  out directly.
    	* #3124: Improved configuration for :pypi:`rst-linker` (extension used to build the
    	  changelog).
    	* #3133: Enhanced isolation of tests using virtual environments - PYTHONPATH is not leaking to spawned subprocesses  -- by :user:`befeleme`
    	* #3147: Added options to provide a pre-built ``setuptools`` wheel or sdist for being
    	  used during tests with virtual environments.
    	  Paths for these pre-built distribution files can now be set via the environment
    	  variables: ``PRE_BUILT_SETUPTOOLS_SDIST`` and ``PRE_BUILT_SETUPTOOLS_WHEEL``.
    	v60.9.3
    	Misc
    	* #3093: Repaired automated release process.
    	v60.9.2
    	Misc
    	* #3035: When loading distutils from the vendored copy, rewrite ``__name__`` to ensure consistent importing from inside and out.
    	v60.9.1
    	Misc
    	* #3102: Prevent vendored importlib_metadata from loading distributions from older importlib_metadata.
    	* #3103: Fixed issue where string-based entry points would be omitted.
    	* #3107: Bump importlib_metadata to 4.11.1 addressing issue with parsing requirements in egg-info as found in PyPy.
    	v60.9.0
    	Changes
    	* #2876: In the build backend, allow single config settings to be supplied.
    	* #2993: Removed workaround in distutils hack for get-pip now that pypa/get-pip#137 is closed.
    	* #3085: Setuptools no longer relies on ``pkg_resources`` for entry point handling.
    	* #3098: Bump vendored packaging to 21.3.
    	* Removed bootstrap script.
    	v60.8.2
    	Misc
    	* #3091: Make ``concurrent.futures`` import lazy in vendored ``more_itertools``
    	  package to a  avoid importing threading as a side effect (which caused
    	  `gevent/gevent#1865 <https://github.com/gevent/gevent/issues/1865>`__).
    	  -- by :user:`maciejp-ro`
    	v60.8.1
    	Misc
    	* #3084: When vendoring jaraco packages, ensure the namespace package is converted to a simple package to support zip importer.
    	v60.8.0
    	Changes
    	* #3085: Setuptools now vendors importlib_resources and importlib_metadata and jaraco.text. Setuptools no longer relies on pkg_resources for ensure_directory nor parse_requirements.
    	v60.7.1
    	Misc
    	* #3072: Remove lorem_ipsum from jaraco.text when vendored.
    	v60.7.0
    	Changes
    	* #3061: Vendored jaraco.text and use line processing from that library in pkg_resources.
    	Misc
    	* #3070: Avoid AttributeError in easy_install.create_home_path when sysconfig.get_config_vars values are not strings.
    	v60.6.0
    	Changes
    	* #3043: Merge with pypa/distutils(a)bb018f1ac3 including consolidated behavior in sysconfig.get_platform (pypa/distutils#104).
    	* #3057: Don't include optional ``Home-page`` in metadata if no ``url`` is specified. -- by :user:`cdce8p`
    	* #3062: Merge with pypa/distutils(a)b53a824ec3 including improved support for lib directories on non-x64 Windows builds.
    	Documentation changes
    	* #2897: Added documentation about wrapping ``setuptools.build_meta`` in a in-tree
    	  custom backend. This is a :pep:`517`-compliant way of dynamically specifying
    	  build dependencies (e.g. when platform, OS and other markers are not enough).
    	  -- by :user:`abravalheri`
    	* #3034: Replaced occurrences of the defunct distutils-sig mailing list with pointers
    	  to GitHub Discussions.
    	  -- by :user:`ashemedai`
    	* #3056: The documentation has stopped suggesting to add ``wheel`` to
    	  :pep:`517` requirements -- by :user:`webknjaz`
    	Misc
    	* #3054: Used Py3 syntax ``super().__init__()`` -- by :user:`imba-tjd`
    	v60.5.4
    	Misc
    	* #3009: Remove filtering of distutils warnings.
    	* #3031: Suppress distutils replacement when building or testing CPython.
    	v60.5.3
    	Misc
    	* #3026: Honor sysconfig variables in easy_install.
    	v60.5.2
    	Misc
    	* #2993: In _distutils_hack, for get-pip, simulate existence of setuptools.
    	v60.5.1
    	Misc
    	* #2918: Correct support for Python 3 native loaders.
    	v60.5.0
    	Changes
    	* #2990: Set the ``.origin`` attribute of the ``distutils`` module to the module's ``__file__``.
    	v60.4.0
    	Changes
    	* #2839: Removed ``requires`` sorting when installing wheels as an egg dir.
    	* #2953: Fixed a bug that easy install incorrectly parsed Python 3.10 version string.
    	* #3006: Fixed startup performance issue of Python interpreter due to imports of
    	  costly modules in ``_distutils_hack`` -- by :user:`tiran`
    	Documentation changes
    	* #2674: Added link to additional resources on packaging in Quickstart guide
    	* #3008: "In-tree" Sphinx extension for "favicons" replaced with ``sphinx-favicon``.
    	* #3008: SVG images (logo, banners, ...) optimised with the help of the ``scour``
    	  package.
    	Misc
    	* #2862: Added integration tests that focus on building and installing some packages in
    	  the Python ecosystem via ``pip`` -- by :user:`abravalheri`
    	* #2952: Modified "vendoring" logic to keep license files.
    	* #2968: Improved isolation for some tests that where inadvertently using the project
    	  root for builds, and therefore creating directories (e.g. ``build``, ``dist``,
    	  ``*.egg-info``) that could interfere with the outcome of other tests
    	  -- by :user:`abravalheri`.
    	* #2968: Introduced new test fixtures ``venv``, ``venv_without_setuptools``,
    	  ``bare_venv`` that rely on the ``jaraco.envs`` package.
    	  These new test fixtures were also used to remove the (currently problematic)
    	  dependency on the ``pytest_virtualenv`` plugin.
    	* #2968: Removed ``tmp_src`` test fixture. Previously this fixture was copying all the
    	  files and folders under the project root, including the ``.git`` directory,
    	  which is error prone and increases testing time.
    	  Since ``tmp_src`` was used to populate virtual environments (installing the
    	  version of ``setuptools`` under test via the source tree), it was replaced by
    	  the new ``setuptools_sdist`` and ``setuptools_wheel`` fixtures (that are build
    	  only once per session testing and can be shared between all the workers for
    	  read-only usage).
    	v60.3.1
    	Misc
    	* #3002: Suppress AttributeError when detecting get-pip.
    	v60.3.0
    	Changes
    	* #2993: In _distutils_hack, bypass the distutils exception for pip when get-pip is being invoked, because it imports setuptools.
    	Misc
    	* #2989: Merge with pypa/distutils(a)788cc159. Includes fix for config vars missing from sysconfig.
    	v60.2.0
    	Changes
    	* #2974: Setuptools now relies on the Python logging infrastructure to log messages. Instead of using ``distutils.log.*``, use ``logging.getLogger(name).*``.
    	* #2987: Sync with pypa/distutils(a)2def21c5d74fdd2fe7996ee4030ac145a9d751bd, including fix for missing get_versions attribute (#2969), more reliance on sysconfig from stdlib.
    	Misc
    	* #2962: Avoid attempting to use local distutils when the presiding version of Setuptools on the path doesn't have one.
    	* #2983: Restore 'add_shim' as the way to invoke the hook. Avoids compatibility issues between different versions of Setuptools with the distutils local implementation.
    	v60.1.1
    	Misc
    	* #2980: Bypass distutils loader when setuptools module is no longer available on sys.path.
    	v60.1.0
    	Changes
    	* #2958: In distutils_hack, only add the metadata finder once. In ensure_local_distutils, rely on a context manager for reliable manipulation.
    	* #2963: Merge with pypa/distutils(a)a5af364910. Includes revisited fix for pypa/distutils#15 and improved MinGW/Cygwin support from pypa/distutils#77.
    	v60.0.5
    	Misc
    	* #2960: Install schemes fall back to default scheme for headers.
    	v60.0.4
    	Misc
    	* #2954: Merge with pypa/distutils(a)eba2bcd310. Adds platsubdir to config vars available for substitution.
    	v60.0.3
    	Misc
    	* #2940: Avoid KeyError in distutils hack when pip is imported during ensurepip.
    	v60.0.2
    	Misc
    	* #2938: Select 'posix_user' for the scheme unless falling back to stdlib, then use 'unix_user'.
    	v60.0.1
    	Misc
    	* #2944: Add support for extended install schemes in easy_install.
    	v60.0.0
    	Breaking Changes
    	* #2896: Setuptools once again makes its local copy of distutils the default. To override, set SETUPTOOLS_USE_DISTUTILS=stdlib.
    	v59.8.0
    	Changes
    	* #2935: Merge pypa/distutils(a)460b59f0e68dba17e2465e8dd421bbc14b994d1f.
    	v59.7.0
    	Changes
    	* #2930: Require Python 3.7
    	v59.6.0
    	Changes
    	* #2925: Merge with pypa/distutils(a)92082ee42c including introduction of deprecation warning on Version classes.
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>

commit 7eeeb60373dd381db51505002b3de89d7c33f948
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Sun Apr 10 13:18:16 2022 +0200

    python3-setuptools-scm: Update to version 6.4.2
    
    - Update from version 6.3.2 to 6.4.2
    - Update rootfile
    - Changelog
    	v6.4.2
    	   * fix #671 : NoReturn is not avaliable in painfully dead python 3.6
    	v6.4.1
    	   * fix regression #669: restore get_version signature
    	   * fix #668: harden the selftest for distribution extras
    	v6.4.0
    	   * compatibility adjustments for setuptools >58
    	   * only put minimal setuptools version into toml extra to warn people with old
                 strict pins
    	   * coorectly handle hg-git self-use
    	   * better mercurial detection
    	   * modernize packaging setup
    	   * python 3.10 support
    	   * better handling of setuptools install command deprecation
    	   * consider ``pyproject.tomls`` when running as command
    	   * use list in git describe command to avoid shell expansions while supporting
                 both windows and posix
    	   * add ``--strip-dev`` flag to ``python -m setuptools_scm`` to print the next
                 guessed version cleanly
    	   * ensure no-guess-dev will fail on bad tags instead of generating invalid
                 versions
    	   * ensure we use utc everywhere to avoid confusion
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>

commit a790b010770eb5839055c117f71e44bc9b8d3538
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Sun Apr 10 13:18:15 2022 +0200

    python3-setuptools-rust: Update to version 1.2.0
    
    - Update from 1.1.2 to 1.2.0
    - Update of rootfile
    - Changelog
       ## 1.2.0 (2022-03-22)
    	### Packaging
    	   - Drop support for Python 3.6. [#209]
    	### Added
    	   - Add support for `kebab-case` executable names. [#205]
    	   - Add support for custom cargo profiles. [#216]
    	### Fixed
    	   - Fix building macOS arm64 wheel with cibuildwheel. [#217]
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>

commit dba994e86f185585e656c0fa5dc5c2c5f6b15116
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Sun Apr 10 13:18:14 2022 +0200

    python3-semantic-version: Update to version 2.9.0
    
    - Update from 2.8.5 to 2.9.0
    - Update of rootfile
    - Changelog
        2.9.0 (2022-02-06)
    	*New:*
    	    * Add support for Django 3.1, 3.2, 4.0
    	    * Add support for Python 3.7 / 3.8 / 3.9 / 3.10
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>

commit 98c7df65620a424c1980730bb6118098a685f1ea
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Sun Apr 10 13:18:13 2022 +0200

    python3-s3transfer: Update to version 0.5.2
    
    - Update from 0.5.0 to 0.5.2
    - Update of rootfile
    - Changelog
       There is no changelog in the source tarball or in PyPi or in the github repository.
        To see the changes you have to read through the individual commits in the github
        repository.
       https://github.com/boto/s3transfer/commits/develop
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>

commit 40556f0946c26163d852d973b71f2818ad555198
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Sun Apr 10 13:18:12 2022 +0200

    python3-pytz: Update to version 2022.1
    
    - Update from 2021.3 to 2022.1
    - Update of rootfile
    - Changelog
       pytz 2022.1 with the 2022a timezone database has been released. There are no code
        changes.
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>

commit b9758326128d343afe0a80db8aef7b308a9f4ba9
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Sun Apr 10 13:18:11 2022 +0200

    python3-jmespath: Update to version 1.0.0
    
    - Update from 0.10.0 to 1.0.0
    - Update of rootfile
    - Changelog
       This python module does not have a changelog in its source file or on its PyPi page
        or on its github page.
       To see what changes have occurred you have to look at the individual commits in github
        https://github.com/jmespath/jmespath.py/commits/develop
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>

commit e9fecdc0397044c268c8c7ef34bcd924a2daa4a7
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Sun Apr 10 13:18:10 2022 +0200

    python3-flit: Update to version 3.7.1
    
    - Update from 3.6.0 to 3.7.1
    - Update of rootfile
    - Changelog
    	Version 3.7.1
    	    Fix building packages which need execution to get the version number, and
                 have a relative import in __init__.py (PR #531).
    	Version 3.7
    	    Support for external data files such as man pages or Jupyter extension
                 support files (PR #510).
    	    Project names are now lowercase in wheel filenames and .dist-info folder
                 names, in line with the specifications (PR #498).
    	    Improved support for bootstrapping a Python environment, e.g. for downstream
                 packagers (PR #511). flit_core.wheel is usable with python -m to create
                 wheels before the build tool is available, and flit_core sdists also
                 include a script to install itself from a wheel before installer is available.
    	    Use newer importlib APIs, fixing some deprecation warnings (PR #499).
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>

commit 441e92695515b32beafb009e513b11661eaa210d
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Sun Apr 10 13:18:09 2022 +0200

    python3-click: Update to version 8.1.2
    
    - Update from 8.0.3 to 8.1.2
    - Update of rootfile
    - Changelog
       Version 8.1.2
    	-   Fix error message for readable path check that was mixed up with the
    	    executable check. :pr:`2236`
    	-   Restore parameter order for ``Path``, placing the ``executable``
    	    parameter at the end. It is recommended to use keyword arguments
    	    instead of positional arguments. :issue:`2235`
       Version 8.1.1
    	-   Fix an issue with decorator typing that caused type checking to
    	    report that a command was not callable. :issue:`2227`
       Version 8.1.0
    	-   Drop support for Python 3.6. :pr:`2129`
    	-   Remove previously deprecated code. :pr:`2130`
    
    	    -   ``Group.resultcallback`` is renamed to ``result_callback``.
    	    -   ``autocompletion`` parameter to ``Command`` is renamed to
    	        ``shell_complete``.
    	    -   ``get_terminal_size`` is removed, use
    	        ``shutil.get_terminal_size`` instead.
    	    -   ``get_os_args`` is removed, use ``sys.argv[1:]`` instead.
    
    	-   Rely on :pep:`538` and :pep:`540` to handle selecting UTF-8 encoding
    	    instead of ASCII. Click's locale encoding detection is removed.
    	    :issue:`2198`
    	-   Single options boolean flags with ``show_default=True`` only show
    	    the default if it is ``True``. :issue:`1971`
    	-   The ``command`` and ``group`` decorators can be applied with or
    	    without parentheses. :issue:`1359`
    	-   The ``Path`` type can check whether the target is executable.
    	    :issue:`1961`
    	-   ``Command.show_default`` overrides ``Context.show_default``, instead
    	    of the other way around. :issue:`1963`
    	-   Parameter decorators and ``@group`` handles ``cls=None`` the same as
    	    not passing ``cls``. ``@option`` handles ``help=None`` the same as
    	    not passing ``help``. :issue:`#1959`
    	-   A flag option with ``required=True`` requires that the flag is
    	    passed instead of choosing the implicit default value. :issue:`1978`
    	-   Indentation in help text passed to ``Option`` and ``Command`` is
    	    cleaned the same as using the ``@option`` and ``@command``
    	    decorators does. A command's ``epilog`` and ``short_help`` are also
    	    processed. :issue:`1985`
    	-   Store unprocessed ``Command.help``, ``epilog`` and ``short_help``
    	    strings. Processing is only done when formatting help text for
    	    output. :issue:`2149`
    	-   Allow empty str input for ``prompt()`` when
    	    ``confirmation_prompt=True`` and ``default=""``. :issue:`2157`
    	-   Windows glob pattern expansion doesn't fail if a value is an invalid
    	    pattern. :issue:`2195`
    	-   It's possible to pass a list of ``params`` to ``@command``. Any
    	    params defined with decorators are appended to the passed params.
    	    :issue:`2131`.
    	-   ``@command`` decorator is annotated as returning the correct type if
    	    a ``cls`` argument is used. :issue:`2211`
    	-   A ``Group`` with ``invoke_without_command=True`` and ``chain=False``
    	    will invoke its result callback with the group function's return
    	    value. :issue:`2124`
    	-   ``to_info_dict`` will not fail if a ``ParamType`` doesn't define a
    	    ``name``. :issue:`2168`
    	-   Shell completion prioritizes option values with option prefixes over
    	    new options. :issue:`2040`
    	-   Options that get an environment variable value using
    	    ``autoenvvar_prefix`` treat an empty value as ``None``, consistent
    	    with a direct ``envvar``. :issue:`2146`
       Version 8.0.4
    	-   ``open_file`` recognizes ``Path("-")`` as a standard stream, the
    	    same as the string ``"-"``. :issue:`2106`
    	-   The ``option`` and ``argument`` decorators preserve the type
    	    annotation of the decorated function. :pr:`2155`
    	-   A callable default value can customize its help text by overriding
    	    ``__str__`` instead of always showing ``(dynamic)``. :issue:`2099`
    	-   Fix a typo in the Bash completion script that affected file and
    	    directory completion. If this script was generated by a previous
    	    version, it should be regenerated. :issue:`2163`
    	-   Fix typing for ``echo`` and ``secho`` file argument.
    	    :issue:`2174, 2185`
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>

commit 4d2a20f407110fa91b2ceb9f38c6c0bae1add405
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Sun Apr 10 13:18:08 2022 +0200

    python3-charset-vomalizer: Update to version 2.0.12
    
    - Update from 2.0.10 to 2.0.12
    - Update of rootfile
    - Changelog
       ## [2.0.12]
    	### Fixed
    	- ASCII miss-detection on rare cases (PR #170)
       ## [2.0.11]
    	### Added
    	- Explicit support for Python 3.11 (PR #164)
    	### Changed
    	- The logging behavior have been completely reviewed, now using only TRACE and
              DEBUG levels (PR #163 #165)
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>

commit b3ae0e6695fb3e9dbffa6f15a66c6fdc4a62af23
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Sun Apr 10 13:18:07 2022 +0200

    python3-botocore: Update to version 1.24.37
    
    - Update from 1.23.21 to 1.24.37
    - Update of rootfile
    - Changelog
    	1.24.37
    	    api-change:mediaconvert: AWS Elemental MediaConvert SDK has added support for the pass-through of WebVTT styling to WebVTT outputs, pass-through of KLV metadata to supported formats, and improved filter support for processing 444/RGB content.
    	    api-change:wafv2: Add a new CurrentDefaultVersion field to ListAvailableManagedRuleGroupVersions API response; add a new VersioningSupported boolean to each ManagedRuleGroup returned from ListAvailableManagedRuleGroups API response.
    	    api-change:mediapackage-vod: This release adds ScteMarkersSource as an available field for Dash Packaging Configurations. When set to MANIFEST, MediaPackage will source the SCTE-35 markers from the manifest. When set to SEGMENTS, MediaPackage will source the SCTE-35 markers from the segments.
    	1.24.36
    	    api-change:apigateway: ApiGateway CLI command get-usage now includes usagePlanId, startDate, and endDate fields in the output to match documentation.
    	    api-change:personalize: This release provides tagging support in AWS Personalize.
    	    api-change:pi: Adds support for DocumentDB to the Performance Insights API.
    	    api-change:events: Update events client to latest version
    	    api-change:docdb: Added support to enable/disable performance insights when creating or modifying db instances
    	    api-change:sagemaker: Amazon Sagemaker Notebook Instances now supports G5 instance types
    	1.24.35
    	    bugfix:Proxy: Fix failure case for IP proxy addresses using TLS-in-TLS. boto/botocore#2652
    	    api-change:config: Add resourceType enums for AWS::EMR::SecurityConfiguration and AWS::SageMaker::CodeRepository
    	    api-change:panorama: Added Brand field to device listings.
    	    api-change:lambda: This release adds new APIs for creating and managing Lambda Function URLs and adds a new FunctionUrlAuthType parameter to the AddPermission API. Customers can use Function URLs to create built-in HTTPS endpoints on their functions.
    	    api-change:kendra: Amazon Kendra now provides a data source connector for Box. For more information, see https://docs.aws.amazon.com/kendra/latest/dg/data-source-box.html
    	1.24.34
    	    api-change:securityhub: Added additional ASFF details for RdsSecurityGroup AutoScalingGroup, ElbLoadBalancer, CodeBuildProject and RedshiftCluster.
    	    api-change:fsx: Provide customers more visibility into file system status by adding new "Misconfigured Unavailable" status for Amazon FSx for Windows File Server.
    	    api-change:s3control: Documentation-only update for doc bug fixes for the S3 Control API docs.
    	    api-change:datasync: AWS DataSync now supports Amazon FSx for OpenZFS locations.
    	1.24.33
    	    api-change:iot: AWS IoT - AWS IoT Device Defender adds support to list metric datapoints collected for IoT devices through the ListMetricValues API
    	    api-change:servicecatalog: This release adds ProvisioningArtifictOutputKeys to DescribeProvisioningParameters to reference the outputs of a Provisioned Product and deprecates ProvisioningArtifactOutputs.
    	    api-change:sms: Revised product update notice for SMS console deprecation.
    	    api-change:proton: SDK release to support tagging for AWS Proton Repository resource
    	    enhancement:AWSCRT: Upgrade awscrt version to 0.13.8
    	1.24.32
    	    api-change:connect: This release updates these APIs: UpdateInstanceAttribute, DescribeInstanceAttribute and ListInstanceAttributes. You can use it to programmatically enable/disable multi-party conferencing using attribute type MULTI_PARTY_CONFERENCING on the specified Amazon Connect instance.
    	1.24.31
    	    api-change:cloudcontrol: SDK release for Cloud Control API in Amazon Web Services China (Beijing) Region, operated by Sinnet, and Amazon Web Services China (Ningxia) Region, operated by NWCD
    	    api-change:pinpoint-sms-voice-v2: Amazon Pinpoint now offers a version 2.0 suite of SMS and voice APIs, providing increased control over sending and configuration. This release is a new SDK for sending SMS and voice messages called PinpointSMSVoiceV2.
    	    api-change:workspaces: Added APIs that allow you to customize the logo, login message, and help links in the WorkSpaces client login page. To learn more, visit https://docs.aws.amazon.com/workspaces/latest/adminguide/customize-branding.html
    	    api-change:route53-recovery-cluster: This release adds a new API "ListRoutingControls" to list routing control states using the highly reliable Route 53 ARC data plane endpoints.
    	    api-change:databrew: This AWS Glue Databrew release adds feature to support ORC as an input format.
    	    api-change:auditmanager: This release adds documentation updates for Audit Manager. The updates provide data deletion guidance when a customer deregisters Audit Manager or deregisters a delegated administrator.
    	    api-change:grafana: This release adds tagging support to the Managed Grafana service. New APIs: TagResource, UntagResource and ListTagsForResource. Updates: add optional field tags to support tagging while calling CreateWorkspace.
    	1.24.30
    	    api-change:iot-data: Update the default AWS IoT Core Data Plane endpoint from VeriSign signed to ATS signed. If you have firewalls with strict egress rules, configure the rules to grant you access to data-ats.iot.[region].amazonaws.com or data-ats.iot.[region].amazonaws.com.cn.
    	    api-change:ec2: This release simplifies the auto-recovery configuration process enabling customers to set the recovery behavior to disabled or default
    	    api-change:fms: AWS Firewall Manager now supports the configuration of third-party policies that can use either the centralized or distributed deployment models.
    	    api-change:fsx: This release adds support for modifying throughput capacity for FSx for ONTAP file systems.
    	    api-change:iot: Doc only update for IoT that fixes customer-reported issues.
    	1.24.29
    	    api-change:organizations: This release provides the new CloseAccount API that enables principals in the management account to close any member account within an organization.
    	1.24.28
    	    api-change:medialive: This release adds support for selecting a maintenance window.
    	    api-change:acm-pca: Updating service name entities
    	1.24.27
    	    api-change:ec2: This is release adds support for Amazon VPC Reachability Analyzer to analyze path through a Transit Gateway.
    	    api-change:ssm: This Patch Manager release supports creating, updating, and deleting Patch Baselines for Rocky Linux OS.
    	    api-change:batch: Bug Fix: Fixed a bug where shapes were marked as unboxed and were not serialized and sent over the wire, causing an API error from the service.
    	1.24.26
    	    api-change:lambda: Adds support for increased ephemeral storage (/tmp) up to 10GB for Lambda functions. Customers can now provision up to 10 GB of ephemeral storage per function instance, a 20x increase over the previous limit of 512 MB.
    	    api-change:config: Added new APIs GetCustomRulePolicy and GetOrganizationCustomRulePolicy, and updated existing APIs PutConfigRule, DescribeConfigRule, DescribeConfigRuleEvaluationStatus, PutOrganizationConfigRule, DescribeConfigRule to support a new feature for building AWS Config rules with AWS CloudFormation Guard
    	    api-change:transcribe: This release adds an additional parameter for subtitling with Amazon Transcribe batch jobs: outputStartIndex.
    	1.24.25
    	    api-change:redshift: This release adds a new [--encrypted | --no-encrypted] field in restore-from-cluster-snapshot API. Customers can now restore an unencrypted snapshot to a cluster encrypted with AWS Managed Key or their own KMS key.
    	    api-change:ebs: Increased the maximum supported value for the Timeout parameter of the StartSnapshot API from 60 minutes to 4320 minutes. Changed the HTTP error code for ConflictException from 503 to 409.
    	    api-change:gamesparks: Released the preview of Amazon GameSparks, a fully managed AWS service that provides a multi-service backend for game developers.
    	    api-change:elasticache: Doc only update for ElastiCache
    	    api-change:transfer: Documentation updates for AWS Transfer Family to describe how to remove an associated workflow from a server.
    	    api-change:auditmanager: This release updates 1 API parameter, the SnsArn attribute. The character length and regex pattern for the SnsArn attribute have been updated, which enables you to deselect an SNS topic when using the UpdateSettings operation.
    	    api-change:ssm: Update AddTagsToResource, ListTagsForResource, and RemoveTagsFromResource APIs to reflect the support for tagging Automation resources. Includes other minor documentation updates.
    	1.24.24
    	    api-change:location: Amazon Location Service now includes a MaxResults parameter for GetDevicePositionHistory requests.
    	    api-change:polly: Amazon Polly adds new Catalan voice - Arlet. Arlet is available as Neural voice only.
    	    api-change:lakeformation: The release fixes the incorrect permissions called out in the documentation - DESCRIBE_TAG, ASSOCIATE_TAG, DELETE_TAG, ALTER_TAG. This trebuchet release fixes the corresponding SDK and documentation.
    	    api-change:ecs: Documentation only update to address tickets
    	    api-change:ce: Added three new APIs to support tagging and resource-level authorization on Cost Explorer resources: TagResource, UntagResource, ListTagsForResource. Added optional parameters to CreateCostCategoryDefinition, CreateAnomalySubscription and CreateAnomalyMonitor APIs to support Tag On Create.
    	1.24.23
    	    api-change:ram: Document improvements to the RAM API operations and parameter descriptions.
    	    api-change:ecr: This release includes a fix in the DescribeImageScanFindings paginated output.
    	    api-change:quicksight: AWS QuickSight Service Features - Expand public API support for group management.
    	    api-change:chime-sdk-meetings: Add support for media replication to link multiple WebRTC media sessions together to reach larger and global audiences. Participants connected to a replica session can be granted access to join the primary session and can switch sessions with their existing WebRTC connection
    	    api-change:mediaconnect: This release adds support for selecting a maintenance window.
    	1.24.22
    	    enhancement:jmespath: Add env markers to get working version of jmespath for python 3.6
    	    api-change:glue: Added 9 new APIs for AWS Glue Interactive Sessions: ListSessions, StopSession, CreateSession, GetSession, DeleteSession, RunStatement, GetStatement, ListStatements, CancelStatement
    	1.24.21
    	    enhancement:Dependency: Added support for jmespath 1.0
    	    api-change:amplifybackend: Adding the ability to customize Cognito verification messages for email and SMS in CreateBackendAuth and UpdateBackendAuth. Adding deprecation documentation for ForgotPassword in CreateBackendAuth and UpdateBackendAuth
    	    api-change:acm-pca: AWS Certificate Manager (ACM) Private Certificate Authority (CA) now supports customizable certificate subject names and extensions.
    	    api-change:ssm-incidents: Removed incorrect validation pattern for IncidentRecordSource.invokedBy
    	    api-change:billingconductor: This is the initial SDK release for AWS Billing Conductor. The AWS Billing Conductor is a customizable billing service, allowing you to customize your billing data to match your desired business structure.
    	    api-change:s3outposts: S3 on Outposts is releasing a new API, ListSharedEndpoints, that lists all endpoints associated with S3 on Outpost, that has been shared by Resource Access Manager (RAM).
    	1.24.20
    	    api-change:robomaker: This release deprecates ROS, Ubuntu and Gazbeo from RoboMaker Simulation Service Software Suites in favor of user-supplied containers and Relaxed Software Suites.
    	    api-change:dataexchange: This feature enables data providers to use the RevokeRevision operation to revoke subscriber access to a given revision. Subscribers are unable to interact with assets within a revoked revision.
    	    api-change:ec2: Adds the Cascade parameter to the DeleteIpam API. Customers can use this parameter to automatically delete their IPAM, including non-default scopes, pools, cidrs, and allocations. There mustn't be any pools provisioned in the default public scope to use this parameter.
    	    api-change:cognito-idp: Updated EmailConfigurationType and SmsConfigurationType to reflect that you can now choose Amazon SES and Amazon SNS resources in the same Region.
    	    enhancement:AWSCRT: Upgrade awscrt extra to 0.13.5
    	    api-change:location: New HERE style "VectorHereExplore" and "VectorHereExploreTruck".
    	    api-change:ecs: Documentation only update to address tickets
    	    api-change:keyspaces: Fixing formatting issues in CLI and SDK documentation
    	    api-change:rds: Various documentation improvements
    	1.24.19
    	    api-change:kendra: Amazon Kendra now provides a data source connector for Slack. For more information, see https://docs.aws.amazon.com/kendra/latest/dg/data-source-slack.html
    	    api-change:timestream-query: Amazon Timestream Scheduled Queries now support Timestamp datatype in a multi-measure record.
    	    enhancement:Stubber: Added support for modeled exception fields when adding errors to a client stub. Implements boto/boto3`#3178 <https://github.com/boto/botocore/issues/3178>`__.
    	    api-change:elasticache: Doc only update for ElastiCache
    	    api-change:config: Add resourceType enums for AWS::ECR::PublicRepository and AWS::EC2::LaunchTemplate
    	1.24.18
    	    api-change:outposts: This release adds address filters for listSites
    	    api-change:lambda: Adds PrincipalOrgID support to AddPermission API. Customers can use it to manage permissions to lambda functions at AWS Organizations level.
    	    api-change:secretsmanager: Documentation updates for Secrets Manager.
    	    api-change:connect: This release adds support for enabling Rich Messaging when starting a new chat session via the StartChatContact API. Rich Messaging enables the following formatting options: bold, italics, hyperlinks, bulleted lists, and numbered lists.
    	    api-change:chime: Chime VoiceConnector Logging APIs will now support MediaMetricLogs. Also CreateMeetingDialOut now returns AccessDeniedException.
    	1.24.17
    	    api-change:transcribe: Documentation fix for API StartMedicalTranscriptionJobRequest, now showing min sample rate as 16khz
    	    api-change:transfer: Adding more descriptive error types for managed workflows
    	    api-change:lexv2-models: Update lexv2-models client to latest version
    	1.24.16
    	    api-change:comprehend: Amazon Comprehend now supports extracting the sentiment associated with entities such as brands, products and services from text documents.
    	1.24.15
    	    api-change:eks: Introducing a new enum for NodeGroup error code: Ec2SubnetMissingIpv6Assignment
    	    api-change:keyspaces: Adding link to CloudTrail section in Amazon Keyspaces Developer Guide
    	    api-change:mediaconvert: AWS Elemental MediaConvert SDK has added support for reading timecode from AVCHD sources and now provides the ability to segment WebVTT at the same interval as the video and audio in HLS packages.
    	1.24.14
    	    api-change:chime-sdk-meetings: Adds support for Transcribe language identification feature to the StartMeetingTranscription API.
    	    api-change:ecs: Amazon ECS UpdateService API now supports additional parameters: loadBalancers, propagateTags, enableECSManagedTags, and serviceRegistries
    	    api-change:migration-hub-refactor-spaces: AWS Migration Hub Refactor Spaces documentation update.
    	1.24.13
    	    api-change:synthetics: Allow custom handler function.
    	    api-change:transfer: Add waiters for server online and offline.
    	    api-change:devops-guru: Amazon DevOps Guru now integrates with Amazon CodeGuru Profiler. You can view CodeGuru Profiler recommendations for your AWS Lambda function in DevOps Guru. This feature is enabled by default for new customers as of 3/4/2022. Existing customers can enable this feature with UpdateEventSourcesConfig.
    	    api-change:macie: Amazon Macie Classic (macie) has been discontinued and is no longer available. A new Amazon Macie (macie2) is now available with significant design improvements and additional features.
    	    api-change:ec2: Documentation updates for Amazon EC2.
    	    api-change:sts: Documentation updates for AWS Security Token Service.
    	    api-change:connect: This release updates the *InstanceStorageConfig APIs so they support a new ResourceType: REAL_TIME_CONTACT_ANALYSIS_SEGMENTS. Use this resource type to enable streaming for real-time contact analysis and to associate the Kinesis stream where real-time contact analysis segments will be published.
    	1.24.12
    	    api-change:greengrassv2: Doc only update that clarifies Create Deployment section.
    	    api-change:fsx: This release adds support for data repository associations to use root ("/") as the file system path
    	    api-change:kendra: Amazon Kendra now suggests spell corrections for a query. For more information, see https://docs.aws.amazon.com/kendra/latest/dg/query-spell-check.html
    	    api-change:appflow: Launching Amazon AppFlow Marketo as a destination connector SDK.
    	    api-change:timestream-query: Documentation only update for SDK and CLI
    	1.24.11
    	    api-change:gamelift: Minor updates to address errors.
    	    api-change:cloudtrail: Add bytesScanned field into responses of DescribeQuery and GetQueryResults.
    	    api-change:athena: This release adds support for S3 Object Ownership by allowing the S3 bucket owner full control canned ACL to be set when Athena writes query results to S3 buckets.
    	    api-change:keyspaces: This release adds support for data definition language (DDL) operations
    	    api-change:ecr: This release adds support for tracking images lastRecordedPullTime.
    	1.24.10
    	    api-change:mediapackage: This release adds Hybridcast as an available profile option for Dash Origin Endpoints.
    	    api-change:rds: Documentation updates for Multi-AZ DB clusters.
    	    api-change:mgn: Add support for GP3 and IO2 volume types. Add bootMode to LaunchConfiguration object (and as a parameter to UpdateLaunchConfigurationRequest).
    	    api-change:kafkaconnect: Adds operation for custom plugin deletion (DeleteCustomPlugin) and adds new StateDescription field to DescribeCustomPlugin and DescribeConnector responses to return errors from asynchronous resource creation.
    	1.24.9
    	    api-change:finspace-data: Add new APIs for managing Users and Permission Groups.
    	    api-change:amplify: Add repositoryCloneMethod field for hosting an Amplify app. This field shows what authorization method is used to clone the repo: SSH, TOKEN, or SIGV4.
    	    api-change:fsx: This release adds support for the following FSx for OpenZFS features: snapshot lifecycle transition messages, force flag for deleting file systems with child resources, LZ4 data compression, custom record sizes, and unsetting volume quotas and reservations.
    	    api-change:fis: This release adds logging support for AWS Fault Injection Simulator experiments. Experiment templates can now be configured to send experiment activity logs to Amazon CloudWatch Logs or to an S3 bucket.
    	    api-change:route53-recovery-cluster: This release adds a new API option to enable overriding safety rules to allow routing control state updates.
    	    api-change:amplifyuibuilder: We are adding the ability to configure workflows and actions for components.
    	    api-change:athena: This release adds support for updating an existing named query.
    	    api-change:ec2: This release adds support for new AMI property 'lastLaunchedTime'
    	    api-change:servicecatalog-appregistry: AppRegistry is deprecating Application and Attribute-Group Name update feature. In this release, we are marking the name attributes for Update APIs as deprecated to give a heads up to our customers.
    	1.24.8
    	    api-change:elasticache: Doc only update for ElastiCache
    	    api-change:panorama: Added NTP server configuration parameter to ProvisionDevice operation. Added alternate software fields to DescribeDevice response
    	1.24.7
    	    api-change:route53: SDK doc update for Route 53 to update some parameters with new information.
    	    api-change:databrew: This AWS Glue Databrew release adds feature to merge job outputs into a max number of files for S3 File output type.
    	    api-change:transfer: Support automatic pagination when listing AWS Transfer Family resources.
    	    api-change:s3control: Amazon S3 Batch Operations adds support for new integrity checking capabilities in Amazon S3.
    	    api-change:s3: This release adds support for new integrity checking capabilities in Amazon S3. You can choose from four supported checksum algorithms for data integrity checking on your upload and download requests. In addition, AWS SDK can automatically calculate a checksum as it streams data into S3
    	    api-change:fms: AWS Firewall Manager now supports the configuration of AWS Network Firewall policies with either centralized or distributed deployment models. This release also adds support for custom endpoint configuration, where you can choose which Availability Zones to create firewall endpoints in.
    	    api-change:lightsail: This release adds support to delete and create Lightsail default key pairs that you can use with Lightsail instances.
    	    api-change:autoscaling: You can now hibernate instances in a warm pool to stop instances without deleting their RAM contents. You can now also return instances to the warm pool on scale in, instead of always terminating capacity that you will need later.
    	1.24.6
    	    api-change:transfer: The file input selection feature provides the ability to use either the originally uploaded file or the output file from the previous workflow step, enabling customers to make multiple copies of the original file while keeping the source file intact for file archival.
    	    api-change:lambda: Lambda releases .NET 6 managed runtime to be available in all commercial regions.
    	    api-change:textract: Added support for merged cells and column header for table response.
    	1.24.5
    	    api-change:translate: This release enables customers to use translation settings for formality customization in their synchronous translation output.
    	    api-change:wafv2: Updated descriptions for logging configuration.
    	    api-change:apprunner: AWS App Runner adds a Java platform (Corretto 8, Corretto 11 runtimes) and a Node.js 14 runtime.
    	1.24.4
    	    api-change:imagebuilder: This release adds support to enable faster launching for Windows AMIs created by EC2 Image Builder.
    	    api-change:customer-profiles: This release introduces apis CreateIntegrationWorkflow, DeleteWorkflow, ListWorkflows, GetWorkflow and GetWorkflowSteps. These apis are used to manage and view integration workflows.
    	    api-change:dynamodb: DynamoDB ExecuteStatement API now supports Limit as a request parameter to specify the maximum number of items to evaluate. If specified, the service will process up to the Limit and the results will include a LastEvaluatedKey value to continue the read in a subsequent operation.
    	1.24.3
    	    api-change:transfer: Properties for Transfer Family used with SFTP, FTP, and FTPS protocols. Display Banners are bodies of text that can be displayed before and/or after a user authenticates onto a server using one of the previously mentioned protocols.
    	    api-change:gamelift: Increase string list limit from 10 to 100.
    	    api-change:budgets: This change introduces DescribeBudgetNotificationsForAccount API which returns budget notifications for the specified account
    	1.24.2
    	    api-change:iam: Documentation updates for AWS Identity and Access Management (IAM).
    	    api-change:redshift: SDK release for Cross region datasharing and cost-control for cross region datasharing
    	    api-change:evidently: Add support for filtering list of experiments and launches by status
    	    api-change:backup: AWS Backup add new S3_BACKUP_OBJECT_FAILED and S3_RESTORE_OBJECT_FAILED event types in BackupVaultNotifications events list.
    	1.24.1
    	    api-change:ec2: Documentation updates for EC2.
    	    api-change:budgets: Adds support for auto-adjusting budgets, a new budget method alongside fixed and planned. Auto-adjusting budgets introduces new metadata to configure a budget limit baseline using a historical lookback average or current period forecast.
    	    api-change:ce: AWS Cost Anomaly Detection now supports SNS FIFO topic subscribers.
    	    api-change:glue: Support for optimistic locking in UpdateTable
    	    api-change:ssm: Assorted ticket fixes and updates for AWS Systems Manager.
    	1.24.0
    	    api-change:appflow: Launching Amazon AppFlow SAP as a destination connector SDK.
    	    feature:Parser: Adding support for parsing int/long types in rest-json response headers.
    	    api-change:rds: Adds support for determining which Aurora PostgreSQL versions support Babelfish.
    	    api-change:athena: This release adds a subfield, ErrorType, to the AthenaError response object in the GetQueryExecution API when a query fails.
    	1.23.54
    	    api-change:ssm: Documentation updates for AWS Systems Manager.
    	1.23.53
    	    api-change:cloudformation: This SDK release adds AWS CloudFormation Hooks HandlerErrorCodes
    	    api-change:lookoutvision: This release makes CompilerOptions in Lookout for Vision's StartModelPackagingJob's Configuration object optional.
    	    api-change:pinpoint: This SDK release adds a new paramater creation date for GetApp and GetApps Api call
    	    api-change:sns: Customer requested typo fix in API documentation.
    	    api-change:wafv2: Adds support for AWS WAF Fraud Control account takeover prevention (ATP), with configuration options for the new managed rule group AWSManagedRulesATPRuleSet and support for application integration SDKs for Android and iOS mobile apps.
    	1.23.52
    	    api-change:cloudformation: This SDK release is for the feature launch of AWS CloudFormation Hooks.
    	1.23.51
    	    api-change:kendra: Amazon Kendra now provides a data source connector for Amazon FSx. For more information, see https://docs.aws.amazon.com/kendra/latest/dg/data-source-fsx.html
    	    api-change:apprunner: This release adds support for App Runner to route outbound network traffic of a service through an Amazon VPC. New API: CreateVpcConnector, DescribeVpcConnector, ListVpcConnectors, and DeleteVpcConnector. Updated API: CreateService, DescribeService, and UpdateService.
    	    api-change:s3control: This release adds support for S3 Batch Replication. Batch Replication lets you replicate existing objects, already replicated objects to new destinations, and objects that previously failed to replicate. Customers will receive object-level visibility of progress and a detailed completion report.
    	    api-change:sagemaker: Autopilot now generates an additional report with information on the performance of the best model, such as a Confusion matrix and Area under the receiver operating characteristic (AUC-ROC). The path to the report can be found in CandidateArtifactLocations.
    	1.23.50
    	    api-change:auditmanager: This release updates 3 API parameters. UpdateAssessmentFrameworkControlSet now requires the controls attribute, and CreateAssessmentFrameworkControl requires the id attribute. Additionally, UpdateAssessmentFramework now has a minimum length constraint for the controlSets attribute.
    	    api-change:synthetics: Adding names parameters to the Describe APIs.
    	    api-change:ssm-incidents: Update RelatedItem enum to support SSM Automation
    	    api-change:events: Update events client to latest version
    	    enhancement:Lambda Request Header: Adding request header for Lambda recursion detection.
    	1.23.49
    	    api-change:athena: You can now optionally specify the account ID that you expect to be the owner of your query results output location bucket in Athena. If the account ID of the query results bucket owner does not match the specified account ID, attempts to output to the bucket will fail with an S3 permissions error.
    	    api-change:rds: updates for RDS Custom for Oracle 12.1 support
    	    api-change:lakeformation: Add support for calling Update Table Objects without a TransactionId.
    	1.23.48
    	    api-change:ec2: adds support for AMIs in Recycle Bin
    	    api-change:robomaker: The release deprecates the use various APIs of RoboMaker Deployment Service in favor of AWS IoT GreenGrass v2.0.
    	    api-change:meteringmarketplace: Add CustomerAWSAccountId to ResolveCustomer API response and increase UsageAllocation limit to 2500.
    	    api-change:rbin: Add EC2 Image recycle bin support.
    	1.23.47
    	    api-change:emr: Update emr client to latest version
    	    api-change:personalize: Adding minRecommendationRequestsPerSecond attribute to recommender APIs.
    	    enhancement:Request headers: Adding request headers with retry information.
    	    api-change:appflow: Launching Amazon AppFlow Custom Connector SDK.
    	    api-change:dynamodb: Documentation update for DynamoDB Java SDK.
    	    api-change:iot: This release adds support for configuring AWS IoT logging level per client ID, source IP, or principal ID.
    	    api-change:comprehend: Amazon Comprehend now supports sharing and importing custom trained models from one AWS account to another within the same region.
    	    api-change:ce: Doc-only update for Cost Explorer API that adds INVOICING_ENTITY dimensions
    	    api-change:fis: Added GetTargetResourceType and ListTargetResourceTypesAPI actions. These actions return additional details about resource types and parameters that can be targeted by FIS actions. Added a parameters field for the targets that can be specified in experiment templates.
    	    api-change:es: Allows customers to get progress updates for blue/green deployments
    	    api-change:glue: Launch Protobuf support for AWS Glue Schema Registry
    	    api-change:elasticache: Documentation update for AWS ElastiCache
    	1.23.46
    	    api-change:appconfigdata: Documentation updates for AWS AppConfig Data.
    	    api-change:athena: This release adds a field, AthenaError, to the GetQueryExecution response object when a query fails.
    	    api-change:appconfig: Documentation updates for AWS AppConfig
    	    api-change:cognito-idp: Doc updates for Cognito user pools API Reference.
    	    api-change:secretsmanager: Feature are ready to release on Jan 28th
    	    api-change:sagemaker: This release added a new NNA accelerator compilation support for Sagemaker Neo.
    	1.23.45
    	    api-change:ec2: X2ezn instances are powered by Intel Cascade Lake CPUs that deliver turbo all core frequency of up to 4.5 GHz and up to 100 Gbps of networking bandwidth
    	    api-change:kafka: Amazon MSK has updated the CreateCluster and UpdateBrokerStorage API that allows you to specify volume throughput during cluster creation and broker volume updates.
    	    api-change:connect: This release adds support for configuring a custom chat duration when starting a new chat session via the StartChatContact API. The default value for chat duration is 25 hours, minimum configurable value is 1 hour (60 minutes) and maximum configurable value is 7 days (10,080 minutes).
    	    api-change:amplify: Doc only update to the description of basicauthcredentials to describe the required encoding and format.
    	    api-change:opensearch: Allows customers to get progress updates for blue/green deployments
    	1.23.44
    	    api-change:frauddetector: Added new APIs for viewing past predictions and obtaining prediction metadata including prediction explanations: ListEventPredictions and GetEventPredictionMetadata
    	    api-change:ebs: Documentation updates for Amazon EBS Direct APIs.
    	    api-change:codeguru-reviewer: Added failure state and adjusted timeout in waiter
    	    api-change:securityhub: Adding top level Sample boolean field
    	    api-change:sagemaker: API changes relating to Fail steps in model building pipeline and add PipelineExecutionFailureReason in PipelineExecutionSummary.
    	1.23.43
    	    api-change:fsx: This release adds support for growing SSD storage capacity and growing/shrinking SSD IOPS for FSx for ONTAP file systems.
    	    api-change:efs: Update efs client to latest version
    	    api-change:connect: This release adds support for custom vocabularies to be used with Contact Lens. Custom vocabularies improve transcription accuracy for one or more specific words.
    	    api-change:guardduty: Amazon GuardDuty expands threat detection coverage to protect Amazon Elastic Kubernetes Service (EKS) workloads.
    	1.23.42
    	    api-change:route53-recovery-readiness: Updated documentation for Route53 Recovery Readiness APIs.
    	1.23.41
    	    enhancement:Exceptions: ProxyConnectionError previously provided the full proxy URL. User info will now be appropriately masked if needed.
    	    api-change:mediaconvert: AWS Elemental MediaConvert SDK has added support for 4K AV1 output resolutions & 10-bit AV1 color, the ability to ingest sidecar Dolby Vision XML metadata files, and the ability to flag WebVTT and IMSC tracks for accessibility in HLS.
    	    api-change:transcribe: Add support for granular PIIEntityTypes when using Batch ContentRedaction.
    	1.23.40
    	    api-change:guardduty: Amazon GuardDuty findings now include remoteAccountDetails under AwsApiCallAction section if instance credential is exfiltrated.
    	    api-change:connect: This release adds tagging support for UserHierarchyGroups resource.
    	    api-change:mediatailor: This release adds support for multiple Segment Delivery Configurations. Users can provide a list of names and URLs when creating or editing a source location. When retrieving content, users can send a header to choose which URL should be used to serve content.
    	    api-change:fis: Added action startTime and action endTime timestamp fields to the ExperimentAction object
    	    api-change:ec2: C6i, M6i and R6i instances are powered by a third-generation Intel Xeon Scalable processor (Ice Lake) delivering all-core turbo frequency of 3.5 GHz
    	1.23.39
    	    api-change:macie2: This release of the Amazon Macie API introduces stricter validation of requests to create custom data identifiers.
    	    api-change:ec2-instance-connect: Adds support for ED25519 keys. PushSSHPublicKey Availability Zone parameter is now optional. Adds EC2InstanceStateInvalidException for instances that are not running. This was previously a service exception, so this may require updating your code to handle this new exception.
    	1.23.38
    	    api-change:ivs: This release adds support for the new Thumbnail Configuration property for Recording Configurations. For more information see https://docs.aws.amazon.com/ivs/latest/userguide/record-to-s3.html
    	    api-change:storagegateway: Documentation update for adding bandwidth throttling support for S3 File Gateways.
    	    api-change:location: This release adds the CalculateRouteMatrix API which calculates routes for the provided departure and destination positions. The release also deprecates the use of pricing plan across all verticals.
    	    api-change:cloudtrail: This release fixes a documentation bug in the description for the readOnly field selector in advanced event selectors. The description now clarifies that users omit the readOnly field selector to select both Read and Write management events.
    	    api-change:ec2: Add support for AWS Client VPN client login banner and session timeout.
    	1.23.37
    	    enhancement:Configuration: Adding support for defaults_mode configuration. The defaults_mode will be used to determine how certain default configuration options are resolved in the SDK.
    	1.23.36
    	    api-change:config: Update ResourceType enum with values for CodeDeploy, EC2 and Kinesis resources
    	    api-change:application-insights: Application Insights support for Active Directory and SharePoint
    	    api-change:honeycode: Added read and write api support for multi-select picklist. And added errorcode field to DescribeTableDataImportJob API output, when import job fails.
    	    api-change:ram: This release adds the ListPermissionVersions API which lists the versions for a given permission.
    	    api-change:lookoutmetrics: This release adds a new DeactivateAnomalyDetector API operation.
    	1.23.35
    	    api-change:pinpoint: Adds JourneyChannelSettings to WriteJourneyRequest
    	    api-change:lexv2-runtime: Update lexv2-runtime client to latest version
    	    api-change:nimble: Amazon Nimble Studio now supports validation for Launch Profiles. Launch Profiles now report static validation results after create/update to detect errors in network or active directory configuration.
    	    api-change:glue: This SDK release adds support to pass run properties when starting a workflow run
    	    api-change:ssm: AWS Systems Manager adds category support for DescribeDocument API
    	    api-change:elasticache: AWS ElastiCache for Redis has added a new Engine Log LogType in LogDelivery feature. You can now publish the Engine Log from your Amazon ElastiCache for Redis clusters to Amazon CloudWatch Logs and Amazon Kinesis Data Firehose.
    	1.23.34
    	    api-change:lexv2-models: Update lexv2-models client to latest version
    	    api-change:elasticache: Doc only update for ElastiCache
    	    api-change:honeycode: Honeycode is releasing new APIs to allow user to create, delete and list tags on resources.
    	    api-change:ec2: Hpc6a instances are powered by a third-generation AMD EPYC processors (Milan) delivering all-core turbo frequency of 3.4 GHz
    	    api-change:fms: Shield Advanced policies for Amazon CloudFront resources now support automatic application layer DDoS mitigation. The max length for SecurityServicePolicyData ManagedServiceData is now 8192 characters, instead of 4096.
    	    api-change:pi: This release adds three Performance Insights APIs. Use ListAvailableResourceMetrics to get available metrics, GetResourceMetadata to get feature metadata, and ListAvailableResourceDimensions to list available dimensions. The AdditionalMetrics field in DescribeDimensionKeys retrieves per-SQL metrics.
    	1.23.33
    	    api-change:finspace-data: Documentation updates for FinSpace.
    	    api-change:rds: This release adds the db-proxy event type to support subscribing to RDS Proxy events.
    	    api-change:ce: Doc only update for Cost Explorer API that fixes missing clarifications for MatchOptions definitions
    	    api-change:kendra: Amazon Kendra now supports advanced query language and query-less search.
    	    api-change:workspaces: Introducing new APIs for Workspaces audio optimization with Amazon Connect: CreateConnectClientAddIn, DescribeConnectClientAddIns, UpdateConnectClientAddIn and DeleteConnectClientAddIn.
    	    api-change:iotevents-data: This release provides documentation updates for Timer.timestamp in the IoT Events API Reference Guide.
    	    api-change:ec2: EC2 Capacity Reservations now supports RHEL instance platforms (RHEL with SQL Server Standard, RHEL with SQL Server Enterprise, RHEL with SQL Server Web, RHEL with HA, RHEL with HA and SQL Server Standard, RHEL with HA and SQL Server Enterprise)
    	1.23.32
    	    api-change:ec2: New feature: Updated EC2 API to support faster launching for Windows images. Optimized images are pre-provisioned, using snapshots to launch instances up to 65% faster.
    	    api-change:compute-optimizer: Adds support for new Compute Optimizer capability that makes it easier for customers to optimize their EC2 instances by leveraging multiple CPU architectures.
    	    api-change:lookoutmetrics: This release adds FailureType in the response of DescribeAnomalyDetector.
    	    api-change:databrew: This SDK release adds support for specifying a Bucket Owner for an S3 location.
    	    api-change:transcribe: Documentation updates for Amazon Transcribe.
    	1.23.31
    	    api-change:medialive: This release adds support for selecting the Program Date Time (PDT) Clock source algorithm for HLS outputs.
    	1.23.30
    	    api-change:ec2: This release introduces On-Demand Capacity Reservation support for Cluster Placement Groups, adds Tags on instance Metadata, and includes documentation updates for Amazon EC2.
    	    api-change:mediatailor: This release adds support for filler slate when updating MediaTailor channels that use the linear playback mode.
    	    api-change:opensearch: Amazon OpenSearch Service adds support for Fine Grained Access Control for existing domains running Elasticsearch version 6.7 and above
    	    api-change:iotwireless: Downlink Queue Management feature provides APIs for customers to manage the queued messages destined to device inside AWS IoT Core for LoRaWAN. Customer can view, delete or purge the queued message(s). It allows customer to preempt the queued messages and let more urgent messages go through.
    	    api-change:es: Amazon OpenSearch Service adds support for Fine Grained Access Control for existing domains running Elasticsearch version 6.7 and above
    	    api-change:mwaa: This release adds a "Source" field that provides the initiator of an update, such as due to an automated patch from AWS or due to modification via Console or API.
    	    api-change:appsync: AppSync: AWS AppSync now supports configurable batching sizes for AWS Lambda resolvers, Direct AWS Lambda resolvers and pipeline functions
    	1.23.29
    	    api-change:cloudtrail: This release adds support for CloudTrail Lake, a new feature that lets you run SQL-based queries on events that you have aggregated into event data stores. New APIs have been added for creating and managing event data stores, and creating, running, and managing queries in CloudTrail Lake.
    	    api-change:iot: This release adds an automatic retry mechanism for AWS IoT Jobs. You can now define a maximum number of retries for each Job rollout, along with the criteria to trigger the retry for FAILED/TIMED_OUT/ALL(both FAILED an TIMED_OUT) job.
    	    api-change:ec2: This release adds a new API called ModifyVpcEndpointServicePayerResponsibility which allows VPC endpoint service owners to take payer responsibility of their VPC Endpoint connections.
    	    api-change:snowball: Updating validation rules for interfaces used in the Snowball API to tighten security of service.
    	    api-change:lakeformation: Add new APIs for 3rd Party Support for Lake Formation
    	    api-change:appstream: Includes APIs for App Entitlement management regarding entitlement and entitled application association.
    	    api-change:eks: Amazon EKS now supports running applications using IPv6 address space
    	    api-change:quicksight: Multiple Doc-only updates for Amazon QuickSight.
    	    api-change:ecs: Documentation update for ticket fixes.
    	    api-change:sagemaker: Amazon SageMaker now supports running training jobs on ml.g5 instance types.
    	    api-change:glue: Add Delta Lake target support for Glue Crawler and 3rd Party Support for Lake Formation
    	1.23.28
    	    api-change:rekognition: This release introduces a new field IndexFacesModelVersion, which is the version of the face detect and storage model that was used when indexing the face vector.
    	    api-change:s3: Minor doc-based updates based on feedback bugs received.
    	    enhancement:JSONFileCache: Add support for __delitem__ in JSONFileCache
    	    api-change:s3control: Documentation updates for the renaming of Glacier to Glacier Flexible Retrieval.
    	1.23.27
    	    api-change:sagemaker: The release allows users to pass pipeline definitions as Amazon S3 locations and control the pipeline execution concurrency using ParallelismConfiguration. It also adds support of EMR jobs as pipeline steps.
    	    api-change:rds: Multiple doc-only updates for Relational Database Service (RDS)
    	    api-change:mediaconvert: AWS Elemental MediaConvert SDK has added strength levels to the Sharpness Filter and now permits OGG files to be specified as sidecar audio inputs.
    	    api-change:greengrassv2: This release adds the API operations to manage the Greengrass role associated with your account and to manage the core device connectivity information. Greengrass V2 customers can now depend solely on Greengrass V2 SDK for all the API operations needed to manage their fleets.
    	    api-change:detective: Added and updated API operations to support the Detective integration with AWS Organizations. New actions are used to manage the delegated administrator account and the integration configuration.
    	1.23.26
    	    api-change:nimble: Amazon Nimble Studio adds support for users to upload files during a streaming session using NICE DCV native client or browser.
    	    api-change:chime-sdk-messaging: The Amazon Chime SDK now supports updating message attributes via channel flows
    	    api-change:imagebuilder: Added a note to infrastructure configuration actions and data types concerning delivery of Image Builder event messages to encrypted SNS topics. The key that's used to encrypt the SNS topic must reside in the account that Image Builder runs under.
    	    api-change:workmail: This release allows customers to change their email monitoring configuration in Amazon WorkMail.
    	    api-change:transfer: Property for Transfer Family used with the FTPS protocol. TLS Session Resumption provides a mechanism to resume or share a negotiated secret key between the control and data connection for an FTPS session.
    	    api-change:lookoutmetrics: This release adds support for Causal Relationships. Added new ListAnomalyGroupRelatedMetrics API operation and InterMetricImpactDetails API data type
    	    api-change:mediaconnect: You can now use the Fujitsu-QoS protocol for your MediaConnect sources and outputs to transport content to and from Fujitsu devices.
    	    api-change:qldb: Amazon QLDB now supports journal exports in JSON and Ion Binary formats. This release adds an optional OutputFormat parameter to the ExportJournalToS3 API.
    	1.23.25
    	    api-change:customer-profiles: This release adds an optional parameter, ObjectTypeNames to the PutIntegration API to support multiple object types per integration option. Besides, this release introduces Standard Order Objects which contain data from third party systems and each order object belongs to a specific profile.
    	    api-change:sagemaker: This release adds a new ContentType field in AutoMLChannel for SageMaker CreateAutoMLJob InputDataConfig.
    	    api-change:forecast: Adds ForecastDimensions field to the DescribeAutoPredictorResponse
    	    api-change:securityhub: Added new resource details objects to ASFF, including resources for Firewall, and RuleGroup, FirewallPolicy Added additional details for AutoScalingGroup, LaunchConfiguration, and S3 buckets.
    	    api-change:location: Making PricingPlan optional as part of create resource API.
    	    api-change:redshift: This release adds API support for managed Redshift datashares. Customers can now interact with a Redshift datashare that is managed by a different service, such as AWS Data Exchange.
    	    api-change:apigateway: Documentation updates for Amazon API Gateway
    	    api-change:devops-guru: Adds Tags support to DescribeOrganizationResourceCollectionHealth
    	    api-change:imagebuilder: This release adds support for importing and exporting VM Images as part of the Image Creation workflow via EC2 VM Import/Export.
    	    api-change:datasync: AWS DataSync now supports FSx Lustre Locations.
    	    api-change:finspace-data: Make dataset description optional and allow s3 export for dataviews
    	1.23.24
    	    api-change:secretsmanager: Documentation updates for Secrets Manager
    	1.23.23
    	    api-change:lexv2-models: Update lexv2-models client to latest version
    	    api-change:network-firewall: This release adds support for managed rule groups.
    	    api-change:route53-recovery-control-config: This release adds tagging supports to Route53 Recovery Control Configuration. New APIs: TagResource, UntagResource and ListTagsForResource. Updates: add optional field tags to support tagging while calling CreateCluster, CreateControlPanel and CreateSafetyRule.
    	    api-change:ec2: Adds waiters support for internet gateways.
    	    api-change:sms: This release adds SMS discontinuation information to the API and CLI references.
    	    api-change:route53domains: Amazon Route 53 domain registration APIs now support filtering and sorting in the ListDomains API, deleting a domain by using the DeleteDomain API and getting domain pricing information by using the ListPrices API.
    	    api-change:savingsplans: Adds the ability to specify Savings Plans hourly commitments using five digits after the decimal point.
    	1.23.22
    	    api-change:lookoutvision: This release adds new APIs for packaging an Amazon Lookout for Vision model as an AWS IoT Greengrass component.
    	    api-change:sagemaker: This release added a new Ambarella device(amba_cv2) compilation support for Sagemaker Neo.
    	    api-change:comprehendmedical: This release adds a new set of APIs (synchronous and batch) to support the SNOMED-CT ontology.
    	    api-change:health: Documentation updates for AWS Health
    	    api-change:logs: This release adds AWS Organizations support as condition key in destination policy for cross account Subscriptions in CloudWatch Logs.
    	    api-change:outposts: This release adds the UpdateOutpost API.
    	    api-change:support: Documentation updates for AWS Support.
    	    api-change:iot: This release allows customer to enable caching of custom authorizer on HTTP protocol for clients that use persistent or Keep-Alive connection in order to reduce the number of Lambda invocations.
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>

commit 159f9214a6852328f4edb327b33d2268ac4bac3f
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Mon Apr 18 21:08:28 2022 +0000

    Core Update 168: Ship and restart OpenVPN
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 75072c7702208179b392570485d5b301673525a0
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Thu Apr 14 10:21:12 2022 +0200

    openvpn: Update to version 2.5.6
    
    - Update from version 2.5.4 to 2.5.6
    - Update of rootfile not required
    - No changes related to ciphers or options
    - Source tarball changed from .xz to .gz as for version 2.5.6 the xz options was not
       available. Raised on Openvpn forum but response was that they also didn't know why xz
       option was not available but they thought it was not a big deal as the gz version is
       only slightly larger.
    - Changelog
       Overview of changes in 2.5.6
    	User-visible Changes
    	    update copyright year to 2022
    	New features
    	    new plugin (sample-plugin/defer/multi-auth.c) to help testing with multiple
                 parallel plugins that succeed/fail in direct/deferred mode
    	    various build improvements (github actions etc)
    	    upgrade pkcs11-helper to release 1.28.4
    	Bugfixes
    	    CVE-2022-0547 see
                 https://community.openvpn.net/openvpn/wiki/SecurityAnnouncements
    	      If openvpn is configured with multiple authentication plugins and more than
                   one plugin tries to do deferred authentication, the result is not
                   well-defined - creating a possible authentication bypass.
    	      In this situation the server process will now abort itself with a clear log
                   message. Only one plugin is allowed to do deferred authentication.
    	    Fix "--mtu-disc maybe|yes" on Linux
    	    Due to configure/syshead.h/#ifdef confusion, the code in question was not
                 compiled-in since a long time. Fixed. Trac: #1452
    	    Fix $common_name variable passed to scripts when username-as-common-name is
                 in effect.
    	      This was not consistently set - sometimes, OpenVPN exported the username,
                   sometimes the common name from the client cert. Fixed. Trac: #1434
    	    Fix potential memory leaks in add_route() and add_route_ipv6().
    	    Apply connect-retry backoff only to one side of the connection in p2p mode.
                 Without that fix/enhancement, two sides could end up only sending packets
                  when the other end is not ready. Trac: #1010, #1384
    	    remove unused sitnl.h file
    	    clean up msvc build files, remove unused MSVC build .bat files
    	    repair "--inactive" handling with a 'bytes' parameter larger than 2 Gbytes
    	     due to integer overflow, this ended up being "0" on Linux, but on Windows
                  with MSVC it ends up being "always 2 Gbyte", both not doing what is
                  requested. Trac: #1448
    	    repair handling of EC certificates on Windows with pkcs11-helper
    	    (wrong compile-time defines for OpenSSL 1.1.1)
    	Documentation
    	    documentation improvements related to DynDNS. Trac: #1417
    	    clean up documentation for --proto and related options
    	    rebuild rst docs if input files change (proper dependency handling)
       Overview of changes in 2.5.5
    	User-visible Changes
    	    SWEET32/64bit cipher deprecation change was postponed to 2.7
    	    Windows: use network address for emulated DHCP server as default this
                 enables use of a /30 subnet, which is needed when connecting to OpenVPN Cloud.
    	    require EC support in windows builds (this means it's no longer possible to
                 build a Windows OpenVPN binary with an OpenSSL lib without EC support)
    	New features
    	    Windows build: use CFG and Spectre mitigations on MSVC builds
    	    bring back OpenSSL config loading to Windows builds. OpenSSL config is
                 loaded from %installdir%\ssl\openssl.cnf (typically:
                 c:\program files\openvpn\ssl\openssl.cnf) if it exists.
    	      This is important for some hardware tokens which need special OpenSSL
                   config for correct operation. Trac #1296
    	Bugfixes
    	    Windows build: enable EKM
    	    Windows build: improve various vcpkg related build issues
    	    Windows build: fix regression related to non-writeable status files
                 (Trac #1430)
    	    Windows build: fix regression that broke OpenSSL EC support
    	    Windows build: fix "product version" display (2.5..4 -> 2.5.4)
    	    Windows build: fix regression preventing use of PKCS12 files
    	    improve "make check" to notice if "openvpn --show-cipher" crashes
    	    improve argv unit tests
    	    ensure unit tests work with mbedTLS builds without BF-CBC ciphers
    	    include "--push-remove" in the output of "openvpn --help"
    	    fix error in iptables syntax in example firewall.sh script
    	    fix "resolvconf -p" invocation in example "up" script
    	    fix "common_name" environment for script calls when
                 "--username-as-common-name" is in effect (Trac #1434)
    	Documentation
    	    move "push-peer-info" documentation from "server options" to "client"
                 (where it belongs)
    	    correct "foreign_option_{n}" typo in manpage
    	    update IRC information in CONTRIBUTING.rst (libera.chat)
    	    README.down-root: fix plugin module name
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 0f447b470a929bb8f565e4cc5eb2697f074ddd7a
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Thu Apr 14 10:20:57 2022 +0200

    bird: Update to version 2.0.9
    
    - Update from version 2.0.8 to 2.0.9
    - Update of rootfile not required
    - Changelog
    	Version 2.0.9 (2022-02-09)
    	  o BGP: Flowspec validation procedure
    	  o Babel: MAC authentication support
    	  o Routing table configuration blocks
    	  o Optional prefix trie in routing table for faster LPM/interval queries
    	  o CLI: New 'show route in <prefix>' command
    	  o Filter: Faster (16-way) prefix sets
    	  o Filter: MPLS label route attribute
    	  o Filter: Operators to pick community components
    	  o Filter: Operators to find minimum and maximum element of lists
    	  o BGP: New 'free bind' option
    	  o BGP: Log route updates that were changed to withdraws
    	  o BGP: Improved 'invalid next hop' error reporting
    	  o OSPF: Allow ifaces with host address as unnumbered PtP or PtMP ifaces
    	  o OSPF: All packets on PtP networks should be sent to AllSPFRouters address
    	  o Scripts for apkg-powered upstream packaging for deb and rpm
    	  o Support for Blake2s and Blake2b hash functions
    	  o Security keys / passwords can be entered in hexadecimal digits
    	  o Memory statistics split into Effective and Overhead
    	  o Linux: New option 'netlink rx buffer' to specify netlink socket buffer size
    	  o BSD: Assume onlink flag on ifaces with only host addresses
    	  o Many bugfixes
    	  Notes:
    	  - For OSPF on PtP network, BIRD now sends all packets to multicast AllSPFRouters
    	    address (as required in RFC 2328 8.1). This likely breaks setups with multiple
    	    neighbors on a network configured as PtP, which worked in previous versions.
    	    Such links should be configured as PtMP.
    	  - Since Linux 5.3, netlink socket can be flooded by route cache entries during
    	    route table scan. This version mitigates that issue by using strict netlink
    	    filtering.
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 5e792900bc14070f877e7d2c1e406bebd60fac19
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Mon Apr 18 21:05:49 2022 +0000

    Core Update 168: Ship and restart Squid
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit f56b5ce8af9a71296bd20c7b47208781b1574caa
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Fri Apr 15 13:07:14 2022 +0200

    squid: Update to 5.5
    
    For details see:
    http://lists.squid-cache.org/pipermail/squid-users/2022-April/024725.html
    
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>

commit b101f8e842f221113377f69b6a0471ffd24d15e7
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Mon Apr 18 21:04:38 2022 +0000

    Core Update 168: Ship and restart vnstat
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit c516ba3b01b93cd4d549cf92b70f4eb58fd95d20
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Sat Apr 16 16:53:47 2022 +0200

    vnstat: Update to 2.9
    
    Triggered by Bug #12846 - in this context I noticed that vnstat had been updated to version 2.9.
    
    For details see:
    https://humdi.net/vnstat/CHANGES
    
    "2.9 / 23-Jan-2022
    
     - Fixed
       - RescanDatabaseOnSave configuration option wasn't being read from the
         configuration file resulting in the feature always being enabled
       - Hourly graph image output using large fonts didn't correctly fade out
         the x-axis line for hours not having data available
     - New
       - Add --alert for producing output and/or specific exit status when
         configured condition and transfer limit is exceeded, can also be used
         for "quota remaining" type of queries depending on used parameters
       - Add configuration option InterfaceMatchMethod which allows configuring
         the possibility of specifying an interface for database queries by using
         its alias instead of system provided interface name, enabled by default
         to support case insensitive matching of the beginning of interface
         aliases (vnstat and vnstati)
       - Image output file extension allows selecting the used image file format
         as long as the used LibGD supports it, PNG is no longer the only option
       - Add configuration option HourlyGraphMode for changing the output mode
         of the graph, 0 = 24 hour sliding window (default, as in previous
         releases), 1 = graph begins from midnight
       - Add mode parameter for -hg / --hoursgraph options for overriding the
         HourlyGraphMode configuration option setting from the command line
       - Add vertical line to image output hourly graph to visualize midnight
       - Add -t / --timestamp options to daemon for enabling timestamps to prints
         when the daemon is running in the foreground attached to a terminal
       - Accept ; as comment character in configuration file in addition to #
       - Comment out keywords which are using default values with ; character in
         provided configuration file and --showconfig output
    
    2.8 / 4-Sep-2021
    
     - Fixed
       - Using a combination of --live and --json wasn't flushing stdout after
         each line resulting in buffered output if the output was being piped
       - Image output would fail to show the last line bar graph in list outputs
         if EstimateStyle was 0, BarColumnShowsRate was 1 and the last line had a
         higher traffic rate than other lines
       - Image output didn't correctly horizontally align the "no data available"
         message in 5 minute graph depending on the width of the image
       - Image output related configuration warnings could get shown when image
         output wasn't being used
       - Warnings of mismatches between image output and data retention
         configuration didn't provide relevant details for solving the issues
       - BandwidthDetection was being used for tun interfaces even when the
         Linux kernel had the information hardcoded to 10 Mbit regardless of the
         used real interface, interface specific MaxBW will now be used instead
         or MaxBandwidth as fallback
       - Configured interface specific MaxBW values were getting overridden by
         BandwidthDetection when something could be detected
       - Image output horizontal rx/tx bars often had one pixel too much width in
         the tx section resulting in slightly wrong ratio getting shown
       - Top days list wasn't always sorting entries with exactly the same traffic
         sum using ascending date
       - 64bitInterfaceCounters with value -2 always assumed 32-bit on Linux
         systems until a 64-bit value was seen if kernel headers weren't available
         when binaries were built
     - New
       - Add the possibility of specifying an interface without using the
         -i / --iface options (vnstat and vnstati)
       - The daemon can discover added interfaces from the database without
         requiring a restart, configurable with option RescanDatabaseOnSave
       - Add configuration option UseUTC for using UTC as timezone for database
         entries instead of following the system timezone configuration
       - --iflist uses user configured interface specific MaxBW values in the
         output when available instead of showing only the kernel provided
         information when detected
       - Add configuration option AlwaysAddNewInterfaces to expose the daemon
         --alwaysadd command line option which gains an optional mode parameter
       - Image output uses LibGD filled arc bug workaround only for LibGD
         versions that are known to be broken
       - Image output example cgi (examples/vnstat.cgi) improvements
         - Automatically lists all monitored interfaces instead of requiring the
           list to be filled manually, server name in page title comes from
           hostname command by default
         - Provides links for most available images to more detailed or longer
           versions of each image
         - Allows direct interface specific page access with /interfacename suffix
           for the cgi if the used httpd supports PATH_INFO
         - Page auto refresh can be enabled with configurable interval"
    
    Please note:
    As mentioned above, the default values in 2.9 are commented out. I have reversed this
    by adding a simple 'sed' command to the lfs file.
    
    Another possibility would have been to extend the existing sed commands. If this
    is desired differently, please report.
    
    As - nearly - always: running here with no seen problems...
    
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 31e85ef336ccfc2abb724d08e497c40c55b52762
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Mon Apr 18 11:12:43 2022 +0200

    rsync: Update to 3.2.4
    
    For details see:
    https://download.samba.org/pub/rsync/NEWS#3.2.4
    
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>

commit c74f7aa6d94337fec1d83e10e6d63c90b3d7aa72
Merge: a95bb24fe 31592610c
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Mon Apr 18 16:38:47 2022 +0000

    Merge branch 'next' into temp-c168-development

commit a95bb24fe13e4e7837bfbf2e75e255f61985df7d
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Tue Apr 5 09:02:40 2022 +0000

    nginx: Update to 1.20.2
    
    The 1.20.x series is the current stable one, please refer to
    https://nginx.org/en/CHANGES-1.20 for its changelog.
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 6fd8dd43b63d32acd119c06682bb19a2ee10966d
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Tue Apr 5 15:47:01 2022 +0200

    dbus: Update to version 1.14.0
    
    - Update from 1.12.20 to 1.14.0
    - Update of rootfile
    - Changelog
       1.14.x is a new stable branch, superseding 1.12.x.
       Summary of major changes between 1.12.x and 1.14.0
         Dependencies:
    	• dbus now requires at least a basic level of support for C99 variadic
    	  macros, as implemented in gcc >= 3, all versions of Clang, and
    	  MSVC >= 2005. In practice this requirement has existed since version
    	  1.9.2, but it is now official.
    	• dbus now requires a C99-compatible va_copy() macro (or a __va_copy()
    	  macro with the same behaviour), except when building for Windows using
    	  MSVC and CMake.
    	• On Unix platforms, if getpwnam_r() and getgrnam_r() are implemented,
    	  they must be POSIX-conformant. The non-POSIX signature seen in ancient
    	  Solaris versions will no longer work.
    	• All Windows builds now require Windows Vista or later.
    	  (Note that we do not recommend or support use of dbus on operating
    	  systems outside their vendor's security support lifetime, such as Vista.)
    	• GLib >= 2.38 is required if full test coverage is enabled
    	  (reduced from 2.40 in dbus 1.12.x.)
    	• Building using CMake now requires CMake 3.4.
    	• Building documentation using CMake now requires xsltproc, Docbook DTDs
    	  (for example docbook-xml on Debian derivatives), and Docbook XSLT
    	  stylesheets (for example docbook-xsl on Debian derivatives). Using
    	  KDE's meinproc4 documentation processor is no longer supported.
         Build-time configuration changes:
    	• Move CMake build system to top level, matching normal practice for
    	  CMake projects
         Deprecations:
            **Looking through these I don't believe they will cause a problem as they are
              deprecations and not yet removed.In the future if needed we might need to set
              datadir to /etc to keep the location the same as with syscondir. This won't be
              needed if we don't use the system.d directory for dbus policies.
    	• Third-party software should install default dbus policies for the system
    	  bus into ${datadir}/dbus-1/system.d (this has been supported since dbus
    	  1.10, released in August 2015). Installing default dbus policies in
    	  ${sysconfdir}/dbus-1/system.d is now considered to be deprecated. Policy
    	  files in ${sysconfdir}/dbus-1/system.d continue to be read, but this
    	  directory should only be used by system administrators wishing to
    	  override the default policies.
    	  The ${datadir} applicable to dbus is usually /usr/share and the
    	  ${sysconfdir} is usually /etc.
    	• A similar pattern applies to the session bus policies in session.d.
    	• The dbus-send(1) man page now documents --bus and --peer instead of
    	  the old --address synonym for --peer, which has been deprecated since
    	  the introduction of --bus and --peer in 1.7.6
    	• The dbus-daemon man page now has scarier warnings about
    	  <allow_anonymous/> and non-local TCP, which are insecure and should
    	  not be used, particularly for the standard system and session buses
    	• DBusServer (and hence the dbus-daemon) no longer accepts usernames
    	  (login names) for the recommended EXTERNAL authentication mechanism,
    	  only numeric user IDs or the empty string. See 1.13.0 release notes
    	  for full details.
         New features:
    	• On Linux 4.13 or later when built against a suitable glibc version,
    	  GetConnectionCredentials() now includes UnixGroupIDs, the effective
    	  group IDs of the initiator of the connection, taken from
    	  SO_PEERGROUPS.
    	• On Linux 4.13 or later, <policy group="…"> now uses the SO_PEERGROUPS
    	  credentials-passing socket option to get the effective group IDs
    	  of the initiator of the connection. See 1.13.4 release notes for details.
    	• Add a --sender option to dbus-send, which requests a name and holds it
    	  until the signal has been sent
    	• dbus-daemon <allow> and <deny> rules can now specify a
    	  send_destination_prefix attribute, which is like a combination of
    	  send_destination and the arg0namespace keyword in match rules.
    	  See 1.13.12 release notes for more details
    	• The dbus-daemon now filters the messages that it relays, removing
    	  header fields that it does not understand. Clients must not rely on
    	  this behaviour unless they have confirmed that they are connected to
    	  a suitable message bus implementation, for example by querying its
    	  Features property.
    	• The dbus-daemon now emits a signal, ActivatableServicesChanged, when
    	  the list of activatable services may have changed. Support for this
    	  signal can be discovered by querying the Features property.
    	• It is now possible to disable traditional (non-systemd) service
    	  activation at build-time (Autotools: --disable-traditional-activation,
    	  CMake: -DENABLE_TRADITIONAL_ACTIVATION=OFF). See 1.13.10 release notes
    	  for details.
    	• The API reference manual can be built as a Qt compiled help file if
    	  qhelpgenerator(-qt5) is available. See 1.13.16 release notes for details.
         Miscellaneous behaviour changes:
    	• When using the "user bus" (--enable-user-session), put the dbus-daemon
    	  in the session slice
    	• Several environment variables set by systemd are no longer passed
    	  on to activated services
    	• If the dbus-daemon is compiled for Linux with systemd support, it
    	  now informs systemd that it is ready for use via the sd_notify()
    	  mechanism
    	• Tarball releases no longer contain pre-2007 changelogs and are now
    	  compressed with xz, making them around 35% smaller.
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>

commit 77be7ab63b0fb4be4eeaa3059d7860ab3a701729
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sun Apr 10 10:20:31 2022 +0000

    Core Update 168: Ship expat
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 54fe871c8305649b00dbd7e67bb68ccfc4c43f7d
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Tue Apr 5 15:47:15 2022 +0200

    expat: Update to version 2.4.8
    
    - Update from 2.4.6 to 2.4.8
    - Update of rootfile
    - Changelog
       Release 2.4.8 Mon March 28 2022
            Other changes:
                #587  pkg-config: Move "-lm" to section "Libs.private"
                #587  CMake|MSVC: Fix pkg-config section "Libs"
                #55 #582  CMake|macOS: Start using linker arguments
                            "-compatibility_version <version>" and
                            "-current_version <version>" in a way compatible with
                            GNU Libtool
                #590 #591  Version info bumped from 9:7:8 to 9:8:8;
                             see https://verbump.de/ for what these numbers do
            Infrastructure:
                #589  CI: Upgrade Clang from 13 to 14
    Release 2.4.7 Fri March 4 2022
            Bug fixes:
                #572 #577  Relax fix to CVE-2022-25236 (introduced with release 2.4.5)
                             with regard to all valid URI characters (RFC 3986),
                             i.e. the following set (excluding whitespace):
                             ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz
                             0123456789 % -._~ :/?#[]@ !$&'()*+,;=
            Other changes:
                #555 #570 #581  CMake|Windows: Store Expat version in the DLL
                #577  Document consequences of namespace separator choices not just
                        in doc/reference.html but also in header <expat.h>
                #577  Document Expat's lack of validation of namespace URIs against
                        RFC 3986, and that the XML 1.0r4 specification doesn't
                        require Expat to validate namespace URIs, and that Expat
                        may do more in that regard in future releases.
                        If you find need for strict RFC 3986 URI validation on
                        application level today, https://uriparser.github.io/ may
                        be of interest.
                #579  Fix documentation of XML_EndDoctypeDeclHandler in <expat.h>
                #575  Document that a call to XML_FreeContentModel can be done at
                        a later time from outside the element declaration handler
                #574  Make hardcoded namespace URIs easier to find in code
                #573  Update documentation on use of XML_POOR_ENTOPY on Solaris
                #569 #571  tests: Resolve use of macros NAN and INFINITY for GNU G++
                             4.8.2 on Solaris.
                #578 #580  Version info bumped from 9:6:8 to 9:7:8;
                             see https://verbump.de/ for what these numbers do
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 9c4e7e3b4956eb886acaaf039d31b4a26dbece8c
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sun Apr 10 10:20:11 2022 +0000

    Core Update 168: Ship libgcrypt
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 2a8de00c6fbc7625d385ebd04ad466ee8a024a12
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Wed Apr 6 15:06:12 2022 +0200

    libgcrypt: Update to version 1.10.1
    
    - Update from 1.9.4 to 1.10.1
    - Update of rootfile
    - Changelog
       Noteworthy changes in version 1.10.1 (2022-03-28)  [C24/A4/R1]
           * Bug fixes:
    	   - Fix minor memory leaks in FIPS mode.
    	   - Build fixes for MUSL libc.  [rCffaef0be61]
           * Other:
    	   - More portable integrity check in FIPS mode.  [rC9fa4c8946a,T5835]
    	   - Add X9.62 OIDs to sha256 and sha512 modules.  [rC52fd2305ba]
       Noteworthy changes in version 1.10.0 (2022-02-01)  [C24/A4/R0]
           * New and extended interfaces:
    	   - New control codes to check for FIPS 140-3 approved algorithms.
    	   - New control code to switch into non-FIPS mode.
    	   - New cipher modes SIV and GCM-SIV as specified by RFC-5297.
    	   - Extended cipher mode AESWRAP with padding as specified by
    	     RFC-5649.  [T5752]
    	   - New set of KDF functions.
    	   - New KDF modes Argon2 and Balloon.
    	   - New functions for combining hashing and signing/verification.  [T4894]
           * Performance:
    	   - Improved support for PowerPC architectures.
    	   - Improved ECC performance on zSeries/s390x by using accelerated
    	     scalar multiplication.
    	   - Many more assembler performance improvements for several
    	     architectures.
           * Bug fixes:
    	   - Fix Elgamal encryption for other implementations.
    	     [R5328,CVE-2021-40528]
    	   - Fix alignment problem on macOS.  [T5440]
    	   - Check the input length of the point in ECDH.  [T5423]
    	   - Fix an abort in gcry_pk_get_param for "Curve25519".  [T5490]
           * Other features:
    	   - The control code GCRYCTL_SET_ENFORCED_FIPS_FLAG is ignored
    	     because it is useless with the FIPS 140-3 related changes.
    	   - Update of the jitter entropy RNG code.  [T5523]
    	   - Simplification of the entropy gatherer when using the getentropy
    	     system call.
           * Interface changes relative to the 1.10.0 release:
    	   GCRYCTL_SET_DECRYPTION_TAG            NEW control code.
    	   GCRYCTL_FIPS_SERVICE_INDICATOR_CIPHER NEW control code.
    	   GCRYCTL_FIPS_SERVICE_INDICATOR_KDF    NEW control code.
    	   GCRYCTL_NO_FIPS_MODE = 83             NEW control code.
    	   GCRY_CIPHER_MODE_SIV                  NEW mode.
    	   GCRY_CIPHER_MODE_GCM_SIV              NEW mode.
    	   GCRY_CIPHER_EXTENDED                  NEW flag.
    	   GCRY_SIV_BLOCK_LEN                    NEW macro.
    	   gcry_cipher_set_decryption_tag        NEW macro.
    	   GCRY_KDF_ARGON2                       NEW constant.
    	   GCRY_KDF_BALLOON                      NEW constant.
    	   GCRY_KDF_ARGON2D                      NEW constant.
    	   GCRY_KDF_ARGON2I                      NEW constant.
    	   GCRY_KDF_ARGON2ID                     NEW constant.
    	   gcry_kdf_hd_t                         NEW type.
    	   gcry_kdf_job_fn_t                     NEW type.
    	   gcry_kdf_dispatch_job_fn_t            NEW type.
    	   gcry_kdf_wait_all_jobs_fn_t           NEW type.
    	   struct gcry_kdf_thread_ops            NEW struct.
    	   gcry_kdf_open                         NEW function.
    	   gcry_kdf_compute                      NEW function.
    	   gcry_kdf_final                        NEW function.
    	   gcry_kdf_close                        NEW function.
    	   gcry_pk_hash_sign                     NEW function.
    	   gcry_pk_hash_verify                   NEW function.
    	   gcry_pk_random_override_new           NEW function.
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>

commit bf1defce5579ed2db91d8fae4eb5549bc8471311
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sun Apr 10 10:18:50 2022 +0000

    Core Update 168: Ship libnml
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit d6aead033a752d7965a3bed6c98dcf5d289707b2
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Wed Apr 6 15:06:28 2022 +0200

    libmnl: Update to version 1.0.5
    
    - Update from 1.0.4 to 1.0.5
    - Update of rootfile not required
    - Changelog
       Version 1.0.5 changes from git commits
    	src: doc: Fix messed-up Netlink message batch diagram
    	build: If doxygen is not available, be sure to report "doxygen: no" to ./conf...
    	build: doc: get rid of the need for manual updating of Makefile
    	build: doc: "make" builds & installs a full set of man pages
    	doxygen: Fixed link to the git source tree on the website.
    	include: add MNL_SOCKET_DUMP_SIZE definition
    	doxygen: remove EXPORT_SYMBOL from the output
    	nlmsg: Fix a missing doxygen section trailer
    	src: fix doxygen function documentation
    	examples: Add rtnl-addr-add.c
    	examples: reduce LOCs during neigh attributes validation
    	examples: fix print line format
    	examples: fix neigh max attributes
    	examples: add arp cache dump example
    	libmnl: zero attribute padding
    	examples: rtnl-addr-dump: fix typo
    	callback: mark cb_ctl_array 'const' in mnl_cb_run2()
    	examples: nfct-daemon: Fix test building on musl libc
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 88e01ab8553e9fc7d7d64d2de2b3e7f03c515177
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sun Apr 10 10:18:01 2022 +0000

    Core Update 168: Remove netbpm add-on, if installed
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 00c31b29184dac2f5dadc21f9457b427a6ee3cb6
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sun Apr 10 10:13:32 2022 +0000

    Core Update 168: Remove libnl files
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 8841ef19685bcb148fdbcdd5c75b8eb96b2bb244
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Thu Apr 7 18:35:04 2022 +0200

    netpbm: Removal from IPFire
    
    - This is an addon whose purpose is defined as :-
       Netpbm is a toolkit for manipulation of graphic images, including conversion of images
       between a variety of different formats. There are over 300 separate tools in the
       package including converters for about 100 graphics formats. Examples of the sort of
       image manipulation we're talking about are: Shrinking an image by 10%; Cutting the top
       half off of an image; Making a mirror image; Creating a sequence of images that fade
       from one image to another.
    - None of the above seems to be a purpose related to a Firewall. Additionally it is
       available in a huge number of distributions, including Linux, BSD,Windows,
       MacOS X/Darwin, Solaris, AIX etc
    - This package seems to be better used on a system in the lan protected by IPFire than
       used on IPFire itself
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 411cd0ca9c52b8a57fc288b2e992d13b3ffb1215
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Thu Apr 7 18:35:03 2022 +0200

    libnl: Removal from IPFire
    
    - This is the legacy version of libnl - 1.1.4 and was released in 2013
    - libnl-3 is the running stable version - 3.5.0
    - Nothing in IPFire has libnl as a dependency. Large number of programs have libnl-3 as
       a dependency
    - libnl developer indicates that libnl-3 should be used if in any way possible and that
       the legacy version is for situations that fail to work with libnl-3
    - As everything in IPFire looks to already be using libnl-3 this patch is to remove the
       legacy version
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 22ac250b37bbce6f56ea7920e55d5ca9a70f71d3
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sun Apr 10 10:05:38 2022 +0000

    Core Update 168: Ship perl-libwww
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit c002bd1f44f4ae0c33691be3896456dc8fbd221f
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Fri Apr 8 20:49:41 2022 +0200

    perl-libwww: Update to 6.62
    
    - Update from 6.61 to 6.62
    - Update of rootfile not required
    - Changelog
    	6.62      2022-04-05 01:04:17Z
    	    - Allow downloading to a filehandle (GH#400) (Andrew Fresh)
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 6ac573bd8f4a1070e56769e1d74e8268ce8bf19f
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sun Apr 10 10:04:42 2022 +0000

    Core Update 168: Ship whois
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit f09b8111142c5d27466d40668d1bd92f60003596
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Sat Apr 9 11:00:16 2022 +0200

    whois: Update to 5.5.13
    
    For details see:
    https://raw.githubusercontent.com/rfc1036/whois/next/debian/changelog
    
    whois (5.5.13) unstable; urgency=medium
    
      * Added the .sd TLD server.
      * Updated the list of new gTLDs.
      * Added the Turkish translation, contributed by Oguz Ersen.
    
     -- Marco d'Itri <md(a)linux.it>  Fri, 08 Apr 2022 01:08:55 +0200
    
    whois (5.5.12) unstable; urgency=medium
    
      * Updated the .pro TLD server, which was totally broken.
      * Fixed the detection of Japanese locales using $LC_MESSAGES.
      * Implemented providing partial salt strings to mkpasswd.
      * Removed 2 new gTLDs which are no longer active.
      * Updated one or more translations. (Closes: #1003597)
      * Enabled full hardening in debian/rules.
    
     -- Marco d'Itri <md(a)linux.it>  Wed, 23 Feb 2022 01:03:11 +0100
    
    whois (5.5.11) unstable; urgency=medium
    
      * Implemented a --no-recursion command line option to disable recursion
        from registrar to registry servers.
      * Updated the .pro, .vu and .xxx TLD servers.
      * Updated the list of new gTLDs.
      * Removed 7 new gTLDs which are no longer active.
      * Updated make_version_h.pl to support Ubuntu no-change uploads,
        contributed by Matthias Klose. (Closes: #995873)
    
     -- Marco d'Itri <md(a)linux.it>  Mon, 03 Jan 2022 18:18:36 +0100
    
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>

commit da8ca3b1216906d2f009ee6ee09131fa9c7e65de
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sun Apr 10 09:56:44 2022 +0000

    Core Update 168: Ship changed networking initscripts
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 5806ff0cc5af4b361b3e32cb9e32d97d1f07d400
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Thu Apr 7 18:46:54 2022 +0200

    Deleted 'vnstat' calls in initscripts - those options were removed and we're using 'vnstatd', not 'vnstat'.
    
    Fixes: 12831
    
    Jonatan Schlag reported that the command line options of 'vnstat' had changed
    "...and seemed to be broken a long time".
    => https://bugzilla.ipfire.org/show_bug.cgi?id=12831#c0
    
    Several command line switches used in networking initscripts were obviously removed.
    
    Affected commands in '.../networking/any' and '.../networking/red'):
    
    ...
    /usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1
    ...
    /usr/bin/vnstat -u -i ${DEVICE} -r --disable > /dev/null 2>&1
    ...
    
    and
    ...
    /usr/bin/vnstat -u -i ppp0 -r --disable > /dev/null 2>&1
    ...
    
    Adolf Belka tested this, "looked through the changelogs" and found - besides that
    the switch '--enable' had been removed "in version 2.0 in 2018" - that '--enable', '--update'
    and '--reset' switches are either not needed or not supported anymore.
    "The old man page indicates that none of those options are used when the vnstat daemon
    is running."
    
    Since we only start and run 'vnstatd' in IPFire it was decided to remove these commands.
    
    Reported-by: jonatan.schlag <jonatan.schlag(a)ipfire.org>
    Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>

commit 18ed846002a02d51a9122133dc2314cbb6d5b04e
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Fri Apr 8 20:49:56 2022 +0200

    python3-pyparsing: Update to version 3.0.7
    
    - Update from 3.0.6 to 3.0.7
    - Update of rootfile
    - Changelog
    	Version 3.0.7 -
    	- Fixed bug #345, in which delimitedList changed expressions in place
    	  using expr.streamline(). Reported by Kim Gräsman, thanks!
    	- Fixed bug #346, when a string of word characters was passed to WordStart
    	  or WordEnd instead of just taking the default value. Originally posted
    	  as a question by Parag on StackOverflow, good catch!
    	- Fixed bug #350, in which White expressions could fail to match due to
    	  unintended whitespace-skipping. Reported by Fu Hanxi, thank you!
    	- Fixed bug #355, when a QuotedString is defined with characters in its
    	  quoteChar string containing regex-significant characters such as ., *,
    	  ?, [, ], etc.
    	- Fixed bug in ParserElement.run_tests where comments would be displayed
    	  using with_line_numbers.
    	- Added optional "min" and "max" arguments to `delimited_list`. PR
    	  submitted by Marius, thanks!
    	- Added new API change note in `whats_new_in_pyparsing_3_0_0`, regarding
    	  a bug fix in the `bool()` behavior of `ParseResults`.
    	  Prior to pyparsing 3.0.x, the `ParseResults` class implementation of
    	  `__bool__` would return `False` if the `ParseResults` item list was empty,
    	  even if it contained named results. In 3.0.0 and later, `ParseResults` will
    	  return `True` if either the item list is not empty *or* if the named
    	  results dict is not empty.
    	    # generate an empty ParseResults by parsing a blank string with
    	    # a ZeroOrMore
    	      result = Word(alphas)[...].parse_string("")
    	      print(result.as_list())
    	      print(result.as_dict())
    	      print(bool(result))
    	  Prints:
    	      []
    	      {}
    	      False
    	    # add a results name to the result
    	      result["name"] = "empty result"
    	      print(result.as_list())
    	      print(result.as_dict())
    	      print(bool(result))
    	  Prints:
    	      []
    	      {'name': 'empty result'}
    	      True
    	  In previous versions, the second call to `bool()` would return `False`.
    	- Minor enhancement to Word generation of internal regular expression, to
    	  emit consecutive characters in range, such as "ab", as "ab", not "a-b".
    	- Fixed character ranges for search terms using non-Western characters
    	  in booleansearchparser, PR submitted by tc-yu, nice work!
    	- Additional type annotations on public methods.
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>

commit b86bd4f90adc4111db864cb8c1365a0d115a6675
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sun Apr 10 09:51:22 2022 +0000

    Core Update 168: Remove libevent files
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit e2e51070a18073d6087429daa6036f8eb510886e
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Fri Apr 8 23:55:24 2022 +0200

    libevent: Remove from IPFire
    
    - Build worked without libevent without problems
    - Nothing shows up as dependent on the libevent (legacy) libraries
    - Lots of dependencies on the the libevent2 libraries
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Acked-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 943ce57701d39352f51a6b09906cd945a421829c
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sun Apr 10 09:49:55 2022 +0000

    Core Update 168: Ship libnfnetlink
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 5dcca14b51b845a56ea3d99e1772f569a259e949
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Fri Apr 8 20:49:03 2022 +0200

    libnfnetlink: Update to version 1.0.2
    
    - Update from 1.0.1 to 1.0.2
    - Update of rootfile not required
    - Changelog
       Version 1.0.2
    	* Warnings with automake-1.12
    	* Update header comments to reflect GPLv2+ license
    	* Allow building on uclinux
    	* Valgrind warnings due to uninitialized padding in netlink messages
    	* Hide private library symbols
    	* Support builds with newer doxygen versions
    	* Failing calls to getsockname() were left unnoticed
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>

commit d258332f5bb062394f524dc485153d1841e55436
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sun Apr 10 09:49:02 2022 +0000

    Core Update 168: Remove orphaned files
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit a6d966e1b79de3b052f92569f8f67b2b0753df49
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Thu Apr 7 13:04:49 2022 +0200

    sdparm: Removal from IPFire
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Acked-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 9624937d9112b92cd735391bc15b3d7aef5bedd5
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Thu Apr 7 13:04:48 2022 +0200

    pigz: Removal from IPFire
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Acked-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 85967534723f8da3f6077814dc1f04f8ffb87874
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Thu Apr 7 13:04:47 2022 +0200

    libsolv: Removal from IPFire
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Acked-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit adee5528664883cf48fd83873c978b51b11a7342
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Thu Apr 7 13:04:46 2022 +0200

    libpri: Removal from IPFire
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Acked-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 03216bd01c57262e1fa753ee4ed86cf050fc2212
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Thu Apr 7 13:04:45 2022 +0200

    libdnet: Removal from IPFire
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Acked-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 758162bdc4f5d58cd10afd3f5efbdf7a3034b5b8
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Thu Apr 7 13:04:44 2022 +0200

    libart: Removal from IPFire
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Acked-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 77c3824f285e7df66ce4a26be11dc336bc17633d
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sun Apr 10 09:42:56 2022 +0000

    Start Core Update 168
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/cfgroot/header.pl                           |   4 +-
 config/menu/20-status.menu                         |   4 +-
 config/menu/30-network.menu                        |   2 +-
 config/rootfiles/common/bind                       |  14 +-
 config/rootfiles/common/expat                      |  20 +-
 config/rootfiles/common/libart                     |  53 ---
 config/rootfiles/common/libdnet                    |  26 --
 config/rootfiles/common/libevent                   |  24 --
 config/rootfiles/common/libgcrypt                  |   2 +-
 config/rootfiles/common/libnl                      |  60 ---
 config/rootfiles/common/pigz                       |   2 -
 config/rootfiles/common/python3-setuptools-rust    |  16 +-
 config/rootfiles/common/python3-setuptools-scm     |  19 +-
 config/rootfiles/common/python3-tomli              |  10 +-
 config/rootfiles/common/sdparm                     |   6 -
 .../core/{167/filelists => 168}/core-files         |   0
 config/rootfiles/core/{167 => 168}/exclude         |   0
 .../124 => core/168}/filelists/aarch64/efibootmgr  |   0
 config/rootfiles/core/{167 => 168}/filelists/bind  |   0
 .../{oldcore/106 => core/168}/filelists/expat      |   0
 config/rootfiles/core/168/filelists/files          |   6 +
 .../{oldcore/128 => core/168}/filelists/knot       |   0
 .../{oldcore/105 => core/168}/filelists/libgcrypt  |   0
 .../{oldcore/131 => core/168}/filelists/libhtp     |   0
 .../{oldcore/106 => core/168}/filelists/libmnl     |   0
 .../92 => core/168}/filelists/libnfnetlink         |   0
 .../rootfiles/core/{167 => 168}/filelists/openssh  |   0
 .../{oldcore/100 => core/168}/filelists/openvpn    |   0
 .../165 => core/168}/filelists/perl-libwww         |   0
 .../{oldcore/100 => core/168}/filelists/squid      |   0
 .../{oldcore/131 => core/168}/filelists/suricata   |   0
 .../rootfiles/core/{167 => 168}/filelists/vnstat   |   0
 .../{oldcore/162 => core/168}/filelists/whois      |   0
 .../124 => core/168}/filelists/x86_64/efibootmgr   |   0
 .../rootfiles/{oldcore/129 => core/168}/update.sh  |  52 ++-
 config/rootfiles/{core => oldcore}/167/exclude     |   0
 .../{core => oldcore}/167/filelists/aarch64/linux  |   0
 .../{core => oldcore}/167/filelists/aarch64/u-boot |   0
 .../167/filelists/aarch64/util-linux               |   0
 .../{core => oldcore}/167/filelists/apache2        |   0
 .../{core => oldcore}/167/filelists/armv6l/linux   |   0
 .../167/filelists/armv6l/util-linux                |   0
 .../rootfiles/{core => oldcore}/167/filelists/bind |   0
 .../167/filelists/ca-certificates                  |   0
 .../{core => oldcore}/167/filelists/core-files     |   0
 .../{core => oldcore}/167/filelists/coreutils      |   0
 .../rootfiles/{core => oldcore}/167/filelists/curl |   0
 .../rootfiles/{core => oldcore}/167/filelists/ddns |   0
 .../{core => oldcore}/167/filelists/dracut         |   0
 .../{core => oldcore}/167/filelists/elinks         |   0
 .../{core => oldcore}/167/filelists/files          |   0
 .../rootfiles/{core => oldcore}/167/filelists/gzip |   0
 .../{core => oldcore}/167/filelists/harfbuzz       |   0
 .../{core => oldcore}/167/filelists/hwdata         |   0
 .../{core => oldcore}/167/filelists/iproute2       |   0
 .../{core => oldcore}/167/filelists/libdnet        |   0
 .../{core => oldcore}/167/filelists/libloc         |   0
 .../{core => oldcore}/167/filelists/misc-progs     |   0
 .../rootfiles/{core => oldcore}/167/filelists/nano |   0
 .../{core => oldcore}/167/filelists/ntfs-3g        |   0
 .../{core => oldcore}/167/filelists/openssh        |   0
 .../{core => oldcore}/167/filelists/openssl        |   0
 .../{core => oldcore}/167/filelists/pakfire        |   0
 .../{core => oldcore}/167/filelists/pango          |   0
 .../{core => oldcore}/167/filelists/pcmciautils    |   0
 .../{core => oldcore}/167/filelists/perl-CGI       |   0
 .../{core => oldcore}/167/filelists/psmisc         |   0
 .../{core => oldcore}/167/filelists/rrdtool        |   0
 .../{core => oldcore}/167/filelists/smartmontools  |   0
 .../{core => oldcore}/167/filelists/sqlite         |   0
 .../{core => oldcore}/167/filelists/strongswan     |   0
 .../rootfiles/{core => oldcore}/167/filelists/sudo |   0
 .../{core => oldcore}/167/filelists/vnstat         |   0
 .../rootfiles/{core => oldcore}/167/filelists/wget |   0
 .../{core => oldcore}/167/filelists/wireless-regdb |   0
 .../{core => oldcore}/167/filelists/x86_64/linux   |   0
 .../167/filelists/x86_64/util-linux                |   0
 .../{core => oldcore}/167/filelists/xfsprogs       |   0
 .../rootfiles/{core => oldcore}/167/filelists/xz   |   0
 .../rootfiles/{core => oldcore}/167/filelists/zlib |   0
 config/rootfiles/{core => oldcore}/167/update.sh   |   0
 config/rootfiles/packages/borgbackup               |  46 ++-
 config/rootfiles/packages/dbus                     |   7 +-
 config/rootfiles/packages/libpri                   |   4 -
 config/rootfiles/packages/libsolv                  |  52 ---
 config/rootfiles/packages/mc                       |   4 +-
 config/rootfiles/packages/netpbm                   | 397 -------------------
 config/rootfiles/packages/python3-botocore         |  35 +-
 .../rootfiles/packages/python3-charset-normalizer  |  14 +-
 config/rootfiles/packages/python3-click            |  13 +-
 config/rootfiles/packages/python3-flit             |  29 +-
 config/rootfiles/packages/python3-jmespath         |  10 +-
 config/rootfiles/packages/python3-pkgconfig        |   8 +
 config/rootfiles/packages/python3-pyparsing        |  44 +--
 config/rootfiles/packages/python3-pytz             |  12 +-
 config/rootfiles/packages/python3-s3transfer       |  12 +-
 config/rootfiles/packages/python3-semantic-version |  13 +-
 config/rootfiles/packages/python3-setuptools       | 423 ++++++++++++---------
 .../rootfiles/packages/python3-typing-extensions   |  10 +-
 config/rootfiles/packages/python3-urllib3          |  16 +-
 config/rootfiles/packages/tshark                   | 185 ++++-----
 config/ssh/ssh_config                              |  14 +-
 config/ssh/sshd_config                             |  13 +-
 html/cgi-bin/captive.cgi                           |   0
 html/cgi-bin/captive/index.cgi                     |   0
 html/cgi-bin/captive/redirect.cgi                  |   0
 html/cgi-bin/dns.cgi                               |   0
 html/cgi-bin/logs.cgi/ovpnclients.dat              |   0
 html/cgi-bin/mail.cgi                              |   0
 html/cgi-bin/netother.cgi                          |   0
 html/cgi-bin/netovpnrw.cgi                         |   0
 html/cgi-bin/netovpnsrv.cgi                        |   0
 html/html/clwarn.cgi                               |   0
 html/html/themes/ipfire/include/functions.pl       |  16 +-
 langs/de/cgi-bin/de.pl                             |   1 -
 langs/fr/cgi-bin/fr.pl                             |   1 -
 lfs/bind                                           |   4 +-
 lfs/bird                                           |   6 +-
 lfs/borgbackup                                     |   8 +-
 lfs/dbus                                           |  17 +-
 lfs/efibootmgr                                     |  11 +-
 lfs/expat                                          |   4 +-
 lfs/knot                                           |   6 +-
 lfs/libart                                         |  78 ----
 lfs/libdnet                                        |  80 ----
 lfs/libevent                                       |  78 ----
 lfs/libgcrypt                                      |   4 +-
 lfs/libhtp                                         |   6 +-
 lfs/libmnl                                         |   4 +-
 lfs/libnfnetlink                                   |   4 +-
 lfs/libnl                                          |  80 ----
 lfs/libpri                                         |  88 -----
 lfs/libsolv                                        | 104 -----
 lfs/lynis                                          |   8 +-
 lfs/mc                                             |   8 +-
 lfs/netpbm                                         |  99 -----
 lfs/nginx                                          |   8 +-
 lfs/openssh                                        |   6 +-
 lfs/openvpn                                        |   8 +-
 lfs/perl-libwww                                    |   4 +-
 lfs/pigz                                           |  80 ----
 lfs/python3-botocore                               |   6 +-
 lfs/python3-charset-normalizer                     |   8 +-
 lfs/python3-click                                  |   6 +-
 lfs/python3-flit                                   |   6 +-
 lfs/python3-jmespath                               |   6 +-
 lfs/{python3-colorama => python3-pkgconfig}        |  12 +-
 lfs/python3-pyparsing                              |   6 +-
 lfs/python3-pytz                                   |   6 +-
 lfs/python3-s3transfer                             |   6 +-
 lfs/python3-semantic-version                       |   6 +-
 lfs/python3-setuptools                             |   6 +-
 lfs/python3-setuptools-rust                        |   4 +-
 lfs/python3-setuptools-scm                         |   6 +-
 lfs/python3-tomli                                  |   6 +-
 lfs/python3-typing-extensions                      |   6 +-
 lfs/python3-urllib3                                |   6 +-
 lfs/rsync                                          |   8 +-
 lfs/sdparm                                         |  81 ----
 lfs/squid                                          |   4 +-
 lfs/suricata                                       |  12 +-
 lfs/tshark                                         |   6 +-
 lfs/vnstat                                         |   7 +-
 lfs/whois                                          |   6 +-
 lfs/wio                                            |  21 +-
 make.sh                                            |  10 +-
 src/initscripts/networking/any                     |   5 -
 src/initscripts/networking/red                     |  14 +-
 ...m-tcp-Handle-retransmitted-SYN-with-TSval.patch |   2 +-
 ....0.8-fix-level1-cache-line-size-detection.patch |   2 +-
 .../suricata-disable-sid-2210059.patch             |   0
 src/wio/main/wio.pl                                |   3 -
 src/wio/wio.cgi                                    |   3 -
 173 files changed, 758 insertions(+), 2030 deletions(-)
 delete mode 100644 config/rootfiles/common/libart
 delete mode 100644 config/rootfiles/common/libdnet
 delete mode 100644 config/rootfiles/common/libevent
 delete mode 100644 config/rootfiles/common/libnl
 delete mode 100644 config/rootfiles/common/pigz
 delete mode 100644 config/rootfiles/common/sdparm
 copy config/rootfiles/core/{167/filelists => 168}/core-files (100%)
 copy config/rootfiles/core/{167 => 168}/exclude (100%)
 copy config/rootfiles/{oldcore/124 => core/168}/filelists/aarch64/efibootmgr (100%)
 copy config/rootfiles/core/{167 => 168}/filelists/bind (100%)
 copy config/rootfiles/{oldcore/106 => core/168}/filelists/expat (100%)
 create mode 100644 config/rootfiles/core/168/filelists/files
 copy config/rootfiles/{oldcore/128 => core/168}/filelists/knot (100%)
 copy config/rootfiles/{oldcore/105 => core/168}/filelists/libgcrypt (100%)
 copy config/rootfiles/{oldcore/131 => core/168}/filelists/libhtp (100%)
 copy config/rootfiles/{oldcore/106 => core/168}/filelists/libmnl (100%)
 copy config/rootfiles/{oldcore/92 => core/168}/filelists/libnfnetlink (100%)
 copy config/rootfiles/core/{167 => 168}/filelists/openssh (100%)
 copy config/rootfiles/{oldcore/100 => core/168}/filelists/openvpn (100%)
 copy config/rootfiles/{oldcore/165 => core/168}/filelists/perl-libwww (100%)
 copy config/rootfiles/{oldcore/100 => core/168}/filelists/squid (100%)
 copy config/rootfiles/{oldcore/131 => core/168}/filelists/suricata (100%)
 copy config/rootfiles/core/{167 => 168}/filelists/vnstat (100%)
 copy config/rootfiles/{oldcore/162 => core/168}/filelists/whois (100%)
 copy config/rootfiles/{oldcore/124 => core/168}/filelists/x86_64/efibootmgr (100%)
 copy config/rootfiles/{oldcore/129 => core/168}/update.sh (72%)
 rename config/rootfiles/{core => oldcore}/167/exclude (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/aarch64/linux (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/aarch64/u-boot (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/aarch64/util-linux (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/apache2 (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/armv6l/linux (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/armv6l/util-linux (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/bind (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/ca-certificates (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/core-files (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/coreutils (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/curl (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/ddns (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/dracut (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/elinks (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/files (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/gzip (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/harfbuzz (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/hwdata (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/iproute2 (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/libdnet (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/libloc (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/misc-progs (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/nano (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/ntfs-3g (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/openssh (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/openssl (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/pakfire (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/pango (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/pcmciautils (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/perl-CGI (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/psmisc (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/rrdtool (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/smartmontools (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/sqlite (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/strongswan (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/sudo (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/vnstat (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/wget (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/wireless-regdb (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/x86_64/linux (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/x86_64/util-linux (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/xfsprogs (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/xz (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/zlib (100%)
 rename config/rootfiles/{core => oldcore}/167/update.sh (100%)
 delete mode 100644 config/rootfiles/packages/libpri
 delete mode 100644 config/rootfiles/packages/libsolv
 delete mode 100644 config/rootfiles/packages/netpbm
 create mode 100644 config/rootfiles/packages/python3-pkgconfig
 mode change 100755 => 100644 html/cgi-bin/captive.cgi
 mode change 100755 => 100644 html/cgi-bin/captive/index.cgi
 mode change 100755 => 100644 html/cgi-bin/captive/redirect.cgi
 mode change 100755 => 100644 html/cgi-bin/dns.cgi
 mode change 100755 => 100644 html/cgi-bin/logs.cgi/ovpnclients.dat
 mode change 100755 => 100644 html/cgi-bin/mail.cgi
 mode change 100755 => 100644 html/cgi-bin/netother.cgi
 mode change 100755 => 100644 html/cgi-bin/netovpnrw.cgi
 mode change 100755 => 100644 html/cgi-bin/netovpnsrv.cgi
 mode change 100755 => 100644 html/html/clwarn.cgi
 delete mode 100644 lfs/libart
 delete mode 100644 lfs/libdnet
 delete mode 100644 lfs/libevent
 delete mode 100644 lfs/libnl
 delete mode 100644 lfs/libpri
 delete mode 100644 lfs/libsolv
 delete mode 100644 lfs/netpbm
 delete mode 100644 lfs/pigz
 copy lfs/{python3-colorama => python3-pkgconfig} (90%)
 delete mode 100644 lfs/sdparm
 rename src/patches/{ => suricata}/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch (97%)
 rename src/patches/{ => suricata}/suricata-5.0.8-fix-level1-cache-line-size-detection.patch (95%)
 rename src/patches/{ => suricata}/suricata-disable-sid-2210059.patch (100%)

Difference in files:
diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 5ddea348e..65459cc92 100644
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -46,7 +46,7 @@ my $menu = \%menuhash;
 %settings = ();
 %ethsettings = ();
 %pppsettings = ();
-(a)URI = ();
+my @URI = split('\?', $ENV{'REQUEST_URI'});
 
 ### Make sure this is an SSL request
 if ($ENV{'SERVER_ADDR'} && $ENV{'HTTPS'} ne 'on') {
@@ -573,3 +573,5 @@ sub get_manualpage_url() {
 	# No manual page configured, return nothing
 	return;
 }
+
+1; # End of package "Header"
diff --git a/config/menu/20-status.menu b/config/menu/20-status.menu
index 2bcf0d5e8..f969a3b0b 100644
--- a/config/menu/20-status.menu
+++ b/config/menu/20-status.menu
@@ -49,7 +49,7 @@
 	$substatus->{'54.networkovpnsrv'} = {
 				'caption' => "$Lang::tr{'vpn statistic n2n'}",
 				'uri' => '/cgi-bin/netovpnsrv.cgi',
-				'title' => "$Lang::tr{'vpn statistics n2n'}",
+				'title' => "$Lang::tr{'vpn statistic n2n'}",
 				'enabled' => 1,
 			  };
     $substatus->{'60.hardwaregraphs'} = {
@@ -90,7 +90,7 @@
     $substatus->{'75.atm-status'} = {'caption' => 'Atm-status',
 				  'uri' => '/cgi-bin/atm-status.cgi',
 				  'title' => 'Atm-status',
-				  'enabled' => `find /sys/class/atm/*/device 2>/dev/null`,
+				  'enabled' => (`find /sys/class/atm/*/device 2>/dev/null` ? 1 : 0),
 				  };
     $substatus->{'76.mdstat'} = {'caption' => 'Mdstat',
 				  'uri' => '/cgi-bin/mdstat.cgi',
diff --git a/config/menu/30-network.menu b/config/menu/30-network.menu
index 19571a870..4ef537ed4 100644
--- a/config/menu/30-network.menu
+++ b/config/menu/30-network.menu
@@ -67,7 +67,7 @@
 				  'caption' => $Lang::tr{'aliases'},
 				  'uri' => '/cgi-bin/aliases.cgi',
 				  'title' => "$Lang::tr{'aliases'}",
-				  'enabled' => `grep "RED_TYPE=STATIC" /var/ipfire/ethernet/settings`,
+				  'enabled' => (`grep "RED_TYPE=STATIC" /var/ipfire/ethernet/settings` ? 1 : 0),
 				  };
     $subnetwork->{'80.macadressmenu'} = {
 				  'caption' => $Lang::tr{'mac address menu'},
diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind
index df3df4f47..0d41c90e5 100644
--- a/config/rootfiles/common/bind
+++ b/config/rootfiles/common/bind
@@ -274,24 +274,24 @@ usr/bin/nsupdate
 #usr/include/pk11/site.h
 #usr/include/pkcs11
 #usr/include/pkcs11/pkcs11.h
-usr/lib/libbind9-9.16.27.so
+usr/lib/libbind9-9.16.28.so
 #usr/lib/libbind9.la
 #usr/lib/libbind9.so
-usr/lib/libdns-9.16.27.so
+usr/lib/libdns-9.16.28.so
 #usr/lib/libdns.la
 #usr/lib/libdns.so
-usr/lib/libirs-9.16.27.so
+usr/lib/libirs-9.16.28.so
 #usr/lib/libirs.la
 #usr/lib/libirs.so
-usr/lib/libisc-9.16.27.so
+usr/lib/libisc-9.16.28.so
 #usr/lib/libisc.la
 #usr/lib/libisc.so
-usr/lib/libisccc-9.16.27.so
+usr/lib/libisccc-9.16.28.so
 #usr/lib/libisccc.la
 #usr/lib/libisccc.so
-usr/lib/libisccfg-9.16.27.so
+usr/lib/libisccfg-9.16.28.so
 #usr/lib/libisccfg.la
 #usr/lib/libisccfg.so
-usr/lib/libns-9.16.27.so
+usr/lib/libns-9.16.28.so
 #usr/lib/libns.la
 #usr/lib/libns.so
diff --git a/config/rootfiles/common/expat b/config/rootfiles/common/expat
index 9901085f2..3911aa90b 100644
--- a/config/rootfiles/common/expat
+++ b/config/rootfiles/common/expat
@@ -2,20 +2,20 @@
 #usr/include/expat.h
 #usr/include/expat_config.h
 #usr/include/expat_external.h
-#usr/lib/cmake/expat-2.4.6
-#usr/lib/cmake/expat-2.4.6/expat-config-version.cmake
-#usr/lib/cmake/expat-2.4.6/expat-config.cmake
-#usr/lib/cmake/expat-2.4.6/expat-noconfig.cmake
-#usr/lib/cmake/expat-2.4.6/expat.cmake
+#usr/lib/cmake/expat-2.4.8
+#usr/lib/cmake/expat-2.4.8/expat-config-version.cmake
+#usr/lib/cmake/expat-2.4.8/expat-config.cmake
+#usr/lib/cmake/expat-2.4.8/expat-noconfig.cmake
+#usr/lib/cmake/expat-2.4.8/expat.cmake
 #usr/lib/libexpat.la
 #usr/lib/libexpat.so
 usr/lib/libexpat.so.1
-usr/lib/libexpat.so.1.8.6
+#usr/lib/libexpat.so.1.8.8
 #usr/lib/pkgconfig/expat.pc
 #usr/share/doc/expat
-#usr/share/doc/expat-2.4.6
-#usr/share/doc/expat-2.4.6/ok.min.css
-#usr/share/doc/expat-2.4.6/reference.html
-#usr/share/doc/expat-2.4.6/style.css
+#usr/share/doc/expat-2.4.8
+#usr/share/doc/expat-2.4.8/ok.min.css
+#usr/share/doc/expat-2.4.8/reference.html
+#usr/share/doc/expat-2.4.8/style.css
 #usr/share/doc/expat/AUTHORS
 #usr/share/doc/expat/changelog
diff --git a/config/rootfiles/common/libart b/config/rootfiles/common/libart
deleted file mode 100644
index 7e98a600d..000000000
--- a/config/rootfiles/common/libart
+++ /dev/null
@@ -1,53 +0,0 @@
-#usr/bin/libart2-config
-#usr/include/libart-2.0
-#usr/include/libart-2.0/libart_lgpl
-#usr/include/libart-2.0/libart_lgpl/art_affine.h
-#usr/include/libart-2.0/libart_lgpl/art_alphagamma.h
-#usr/include/libart-2.0/libart_lgpl/art_bpath.h
-#usr/include/libart-2.0/libart_lgpl/art_config.h
-#usr/include/libart-2.0/libart_lgpl/art_filterlevel.h
-#usr/include/libart-2.0/libart_lgpl/art_gray_svp.h
-#usr/include/libart-2.0/libart_lgpl/art_misc.h
-#usr/include/libart-2.0/libart_lgpl/art_pathcode.h
-#usr/include/libart-2.0/libart_lgpl/art_pixbuf.h
-#usr/include/libart-2.0/libart_lgpl/art_point.h
-#usr/include/libart-2.0/libart_lgpl/art_rect.h
-#usr/include/libart-2.0/libart_lgpl/art_rect_svp.h
-#usr/include/libart-2.0/libart_lgpl/art_rect_uta.h
-#usr/include/libart-2.0/libart_lgpl/art_render.h
-#usr/include/libart-2.0/libart_lgpl/art_render_gradient.h
-#usr/include/libart-2.0/libart_lgpl/art_render_mask.h
-#usr/include/libart-2.0/libart_lgpl/art_render_svp.h
-#usr/include/libart-2.0/libart_lgpl/art_rgb.h
-#usr/include/libart-2.0/libart_lgpl/art_rgb_a_affine.h
-#usr/include/libart-2.0/libart_lgpl/art_rgb_affine.h
-#usr/include/libart-2.0/libart_lgpl/art_rgb_bitmap_affine.h
-#usr/include/libart-2.0/libart_lgpl/art_rgb_pixbuf_affine.h
-#usr/include/libart-2.0/libart_lgpl/art_rgb_rgba_affine.h
-#usr/include/libart-2.0/libart_lgpl/art_rgb_svp.h
-#usr/include/libart-2.0/libart_lgpl/art_rgba.h
-#usr/include/libart-2.0/libart_lgpl/art_svp.h
-#usr/include/libart-2.0/libart_lgpl/art_svp_intersect.h
-#usr/include/libart-2.0/libart_lgpl/art_svp_ops.h
-#usr/include/libart-2.0/libart_lgpl/art_svp_point.h
-#usr/include/libart-2.0/libart_lgpl/art_svp_render_aa.h
-#usr/include/libart-2.0/libart_lgpl/art_svp_vpath.h
-#usr/include/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h
-#usr/include/libart-2.0/libart_lgpl/art_svp_wind.h
-#usr/include/libart-2.0/libart_lgpl/art_uta.h
-#usr/include/libart-2.0/libart_lgpl/art_uta_ops.h
-#usr/include/libart-2.0/libart_lgpl/art_uta_rect.h
-#usr/include/libart-2.0/libart_lgpl/art_uta_svp.h
-#usr/include/libart-2.0/libart_lgpl/art_uta_vpath.h
-#usr/include/libart-2.0/libart_lgpl/art_vpath.h
-#usr/include/libart-2.0/libart_lgpl/art_vpath_bpath.h
-#usr/include/libart-2.0/libart_lgpl/art_vpath_dash.h
-#usr/include/libart-2.0/libart_lgpl/art_vpath_svp.h
-#usr/include/libart-2.0/libart_lgpl/libart-features.h
-#usr/include/libart-2.0/libart_lgpl/libart.h
-#usr/lib/libart_lgpl_2.a
-#usr/lib/libart_lgpl_2.la
-usr/lib/libart_lgpl_2.so
-usr/lib/libart_lgpl_2.so.2
-usr/lib/libart_lgpl_2.so.2.3.21
-#usr/lib/pkgconfig/libart-2.0.pc
diff --git a/config/rootfiles/common/libdnet b/config/rootfiles/common/libdnet
deleted file mode 100644
index 26288de23..000000000
--- a/config/rootfiles/common/libdnet
+++ /dev/null
@@ -1,26 +0,0 @@
-usr/bin/dnet-config
-#usr/include/dnet
-#usr/include/dnet.h
-#usr/include/dnet/addr.h
-#usr/include/dnet/arp.h
-#usr/include/dnet/blob.h
-#usr/include/dnet/eth.h
-#usr/include/dnet/fw.h
-#usr/include/dnet/icmp.h
-#usr/include/dnet/intf.h
-#usr/include/dnet/ip.h
-#usr/include/dnet/ip6.h
-#usr/include/dnet/os.h
-#usr/include/dnet/rand.h
-#usr/include/dnet/route.h
-#usr/include/dnet/sctp.h
-#usr/include/dnet/tcp.h
-#usr/include/dnet/tun.h
-#usr/include/dnet/udp.h
-usr/lib/libdnet.la
-#usr/lib/libdnet.so
-usr/lib/libdnet.so.1
-usr/lib/libdnet.so.1.0.1
-#usr/man/man3/dnet.3
-#usr/man/man8/dnet.8
-usr/sbin/dnet
diff --git a/config/rootfiles/common/libevent b/config/rootfiles/common/libevent
deleted file mode 100644
index 77bbade2e..000000000
--- a/config/rootfiles/common/libevent
+++ /dev/null
@@ -1,24 +0,0 @@
-#usr/bin/event_rpcgen.py
-#usr/include/evdns.h
-#usr/include/event-config.h
-#usr/include/event.h
-#usr/include/evhttp.h
-#usr/include/evrpc.h
-#usr/include/evutil.h
-usr/lib/libevent-1.4.so.2
-usr/lib/libevent-1.4.so.2.2.0
-#usr/lib/libevent.a
-#usr/lib/libevent.la
-#usr/lib/libevent.so
-usr/lib/libevent_core-1.4.so.2
-usr/lib/libevent_core-1.4.so.2.2.0
-#usr/lib/libevent_core.a
-#usr/lib/libevent_core.la
-#usr/lib/libevent_core.so
-usr/lib/libevent_extra-1.4.so.2
-usr/lib/libevent_extra-1.4.so.2.2.0
-#usr/lib/libevent_extra.a
-#usr/lib/libevent_extra.la
-#usr/lib/libevent_extra.so
-#usr/share/man/man3/evdns.3
-#usr/share/man/man3/event.3
diff --git a/config/rootfiles/common/libgcrypt b/config/rootfiles/common/libgcrypt
index 8ca5cb325..8e7f74392 100644
--- a/config/rootfiles/common/libgcrypt
+++ b/config/rootfiles/common/libgcrypt
@@ -6,7 +6,7 @@
 #usr/lib/libgcrypt.la
 #usr/lib/libgcrypt.so
 usr/lib/libgcrypt.so.20
-usr/lib/libgcrypt.so.20.3.4
+usr/lib/libgcrypt.so.20.4.1
 #usr/lib/pkgconfig/libgcrypt.pc
 #usr/share/aclocal/libgcrypt.m4
 #usr/share/info/gcrypt.info
diff --git a/config/rootfiles/common/libnl b/config/rootfiles/common/libnl
deleted file mode 100644
index 960e1c827..000000000
--- a/config/rootfiles/common/libnl
+++ /dev/null
@@ -1,60 +0,0 @@
-#usr/include/netlink
-#usr/include/netlink/addr.h
-#usr/include/netlink/attr.h
-#usr/include/netlink/cache-api.h
-#usr/include/netlink/cache.h
-#usr/include/netlink/data.h
-#usr/include/netlink/fib_lookup
-#usr/include/netlink/fib_lookup/lookup.h
-#usr/include/netlink/fib_lookup/request.h
-#usr/include/netlink/genl
-#usr/include/netlink/genl/ctrl.h
-#usr/include/netlink/genl/family.h
-#usr/include/netlink/genl/genl.h
-#usr/include/netlink/genl/mngt.h
-#usr/include/netlink/handlers.h
-#usr/include/netlink/list.h
-#usr/include/netlink/msg.h
-#usr/include/netlink/netlink-compat.h
-#usr/include/netlink/netlink-kernel.h
-#usr/include/netlink/netlink.h
-#usr/include/netlink/object-api.h
-#usr/include/netlink/object.h
-#usr/include/netlink/route
-#usr/include/netlink/route/addr.h
-#usr/include/netlink/route/class-modules.h
-#usr/include/netlink/route/class.h
-#usr/include/netlink/route/classifier-modules.h
-#usr/include/netlink/route/classifier.h
-#usr/include/netlink/route/cls
-#usr/include/netlink/route/cls/fw.h
-#usr/include/netlink/route/cls/police.h
-#usr/include/netlink/route/cls/u32.h
-#usr/include/netlink/route/link.h
-#usr/include/netlink/route/neighbour.h
-#usr/include/netlink/route/neightbl.h
-#usr/include/netlink/route/nexthop.h
-#usr/include/netlink/route/qdisc-modules.h
-#usr/include/netlink/route/qdisc.h
-#usr/include/netlink/route/route.h
-#usr/include/netlink/route/rtnl.h
-#usr/include/netlink/route/rule.h
-#usr/include/netlink/route/sch
-#usr/include/netlink/route/sch/cbq.h
-#usr/include/netlink/route/sch/dsmark.h
-#usr/include/netlink/route/sch/fifo.h
-#usr/include/netlink/route/sch/htb.h
-#usr/include/netlink/route/sch/netem.h
-#usr/include/netlink/route/sch/prio.h
-#usr/include/netlink/route/sch/red.h
-#usr/include/netlink/route/sch/sfq.h
-#usr/include/netlink/route/sch/tbf.h
-#usr/include/netlink/route/tc.h
-#usr/include/netlink/socket.h
-#usr/include/netlink/types.h
-#usr/include/netlink/utils.h
-#usr/lib/libnl.a
-usr/lib/libnl.so
-usr/lib/libnl.so.1
-usr/lib/libnl.so.1.1.4
-#usr/lib/pkgconfig/libnl-1.pc
diff --git a/config/rootfiles/common/pigz b/config/rootfiles/common/pigz
deleted file mode 100644
index 618d92464..000000000
--- a/config/rootfiles/common/pigz
+++ /dev/null
@@ -1,2 +0,0 @@
-#usr/bin/pigz
-#usr/bin/unpigz
diff --git a/config/rootfiles/common/python3-setuptools-rust b/config/rootfiles/common/python3-setuptools-rust
index cc21721c5..a35daef85 100644
--- a/config/rootfiles/common/python3-setuptools-rust
+++ b/config/rootfiles/common/python3-setuptools-rust
@@ -1,12 +1,12 @@
 usr/lib/python3.10/site-packages/setuptools_rust
-#usr/lib/python3.10/site-packages/setuptools_rust-1.1.2-py3.10.egg-info
-#usr/lib/python3.10/site-packages/setuptools_rust-1.1.2-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/setuptools_rust-1.1.2-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/setuptools_rust-1.1.2-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/setuptools_rust-1.1.2-py3.10.egg-info/entry_points.txt
-#usr/lib/python3.10/site-packages/setuptools_rust-1.1.2-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/setuptools_rust-1.1.2-py3.10.egg-info/top_level.txt
-#usr/lib/python3.10/site-packages/setuptools_rust-1.1.2-py3.10.egg-info/zip-safe
+#usr/lib/python3.10/site-packages/setuptools_rust-1.2.0-py3.10.egg-info
+#usr/lib/python3.10/site-packages/setuptools_rust-1.2.0-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/setuptools_rust-1.2.0-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/setuptools_rust-1.2.0-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/setuptools_rust-1.2.0-py3.10.egg-info/entry_points.txt
+#usr/lib/python3.10/site-packages/setuptools_rust-1.2.0-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/setuptools_rust-1.2.0-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/setuptools_rust-1.2.0-py3.10.egg-info/zip-safe
 usr/lib/python3.10/site-packages/setuptools_rust/__init__.py
 usr/lib/python3.10/site-packages/setuptools_rust/build.py
 usr/lib/python3.10/site-packages/setuptools_rust/clean.py
diff --git a/config/rootfiles/common/python3-setuptools-scm b/config/rootfiles/common/python3-setuptools-scm
index 8f16d3e91..9c37580db 100644
--- a/config/rootfiles/common/python3-setuptools-scm
+++ b/config/rootfiles/common/python3-setuptools-scm
@@ -1,14 +1,17 @@
 #usr/lib/python3.10/site-packages/setuptools_scm
-#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info
-#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/entry_points.txt
-#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/top_level.txt
-#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/zip-safe
+#usr/lib/python3.10/site-packages/setuptools_scm-6.4.2-py3.10.egg-info
+#usr/lib/python3.10/site-packages/setuptools_scm-6.4.2-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/setuptools_scm-6.4.2-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/setuptools_scm-6.4.2-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/setuptools_scm-6.4.2-py3.10.egg-info/entry_points.txt
+#usr/lib/python3.10/site-packages/setuptools_scm-6.4.2-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/setuptools_scm-6.4.2-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/setuptools_scm-6.4.2-py3.10.egg-info/zip-safe
 #usr/lib/python3.10/site-packages/setuptools_scm/__init__.py
 #usr/lib/python3.10/site-packages/setuptools_scm/__main__.py
+usr/lib/python3.10/site-packages/setuptools_scm/_entrypoints.py
+usr/lib/python3.10/site-packages/setuptools_scm/_overrides.py
+usr/lib/python3.10/site-packages/setuptools_scm/_types.py
 #usr/lib/python3.10/site-packages/setuptools_scm/_version_cls.py
 #usr/lib/python3.10/site-packages/setuptools_scm/config.py
 #usr/lib/python3.10/site-packages/setuptools_scm/discover.py
diff --git a/config/rootfiles/common/python3-tomli b/config/rootfiles/common/python3-tomli
index 5c24ff0ea..30605a46a 100644
--- a/config/rootfiles/common/python3-tomli
+++ b/config/rootfiles/common/python3-tomli
@@ -1,9 +1,9 @@
 #usr/lib/python3.10/site-packages/tomli
-#usr/lib/python3.10/site-packages/tomli-2.0.0-py3.10.egg-info
-#usr/lib/python3.10/site-packages/tomli-2.0.0-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/tomli-2.0.0-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/tomli-2.0.0-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/tomli-2.0.0-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/tomli-2.0.1-py3.10.egg-info
+#usr/lib/python3.10/site-packages/tomli-2.0.1-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/tomli-2.0.1-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/tomli-2.0.1-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/tomli-2.0.1-py3.10.egg-info/top_level.txt
 #usr/lib/python3.10/site-packages/tomli/__init__.py
 #usr/lib/python3.10/site-packages/tomli/_parser.py
 #usr/lib/python3.10/site-packages/tomli/_re.py
diff --git a/config/rootfiles/common/sdparm b/config/rootfiles/common/sdparm
deleted file mode 100644
index 439c42965..000000000
--- a/config/rootfiles/common/sdparm
+++ /dev/null
@@ -1,6 +0,0 @@
-#usr/bin/sas_disk_blink
-#usr/bin/scsi_ch_swp
-usr/bin/sdparm
-#usr/share/man/man8/sas_disk_blink.8
-#usr/share/man/man8/scsi_ch_swp.8
-#usr/share/man/man8/sdparm.8
diff --git a/config/rootfiles/core/167/filelists/core-files b/config/rootfiles/core/168/core-files
similarity index 100%
rename from config/rootfiles/core/167/filelists/core-files
rename to config/rootfiles/core/168/core-files
diff --git a/config/rootfiles/core/167/exclude b/config/rootfiles/core/168/exclude
similarity index 100%
rename from config/rootfiles/core/167/exclude
rename to config/rootfiles/core/168/exclude
diff --git a/config/rootfiles/core/168/filelists/aarch64/efibootmgr b/config/rootfiles/core/168/filelists/aarch64/efibootmgr
new file mode 120000
index 000000000..55970e1dd
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/aarch64/efibootmgr
@@ -0,0 +1 @@
+../../../../common/aarch64/efibootmgr
\ No newline at end of file
diff --git a/config/rootfiles/core/167/filelists/bind b/config/rootfiles/core/168/filelists/bind
similarity index 100%
rename from config/rootfiles/core/167/filelists/bind
rename to config/rootfiles/core/168/filelists/bind
diff --git a/config/rootfiles/core/168/filelists/expat b/config/rootfiles/core/168/filelists/expat
new file mode 120000
index 000000000..e1923cf63
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/expat
@@ -0,0 +1 @@
+../../../common/expat
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/files b/config/rootfiles/core/168/filelists/files
new file mode 100644
index 000000000..4883ff3ea
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/files
@@ -0,0 +1,6 @@
+etc/rc.d/init.d/networking/any
+etc/rc.d/init.d/networking/red
+srv/web/ipfire/html/themes/ipfire/include/functions.pl
+var/ipfire/header.pl
+var/ipfire/menu.d/20-status.menu
+var/ipfire/menu.d/30-network.menu
diff --git a/config/rootfiles/core/168/filelists/knot b/config/rootfiles/core/168/filelists/knot
new file mode 120000
index 000000000..28e96f878
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/knot
@@ -0,0 +1 @@
+../../../common/knot
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/libgcrypt b/config/rootfiles/core/168/filelists/libgcrypt
new file mode 120000
index 000000000..2df12a20e
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/libgcrypt
@@ -0,0 +1 @@
+../../../common/libgcrypt
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/libhtp b/config/rootfiles/core/168/filelists/libhtp
new file mode 120000
index 000000000..676e2c5e8
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/libhtp
@@ -0,0 +1 @@
+../../../common/libhtp
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/libmnl b/config/rootfiles/core/168/filelists/libmnl
new file mode 120000
index 000000000..f671c4175
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/libmnl
@@ -0,0 +1 @@
+../../../common/libmnl
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/libnfnetlink b/config/rootfiles/core/168/filelists/libnfnetlink
new file mode 120000
index 000000000..605e72d90
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/libnfnetlink
@@ -0,0 +1 @@
+../../../common/libnfnetlink
\ No newline at end of file
diff --git a/config/rootfiles/core/167/filelists/openssh b/config/rootfiles/core/168/filelists/openssh
similarity index 100%
rename from config/rootfiles/core/167/filelists/openssh
rename to config/rootfiles/core/168/filelists/openssh
diff --git a/config/rootfiles/core/168/filelists/openvpn b/config/rootfiles/core/168/filelists/openvpn
new file mode 120000
index 000000000..493f3f7a4
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/openvpn
@@ -0,0 +1 @@
+../../../common/openvpn
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/perl-libwww b/config/rootfiles/core/168/filelists/perl-libwww
new file mode 120000
index 000000000..6b8bff6e1
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/perl-libwww
@@ -0,0 +1 @@
+../../../common/perl-libwww
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/squid b/config/rootfiles/core/168/filelists/squid
new file mode 120000
index 000000000..2dc8372a0
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/suricata b/config/rootfiles/core/168/filelists/suricata
new file mode 120000
index 000000000..f671f6993
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/suricata
@@ -0,0 +1 @@
+../../../common/suricata
\ No newline at end of file
diff --git a/config/rootfiles/core/167/filelists/vnstat b/config/rootfiles/core/168/filelists/vnstat
similarity index 100%
rename from config/rootfiles/core/167/filelists/vnstat
rename to config/rootfiles/core/168/filelists/vnstat
diff --git a/config/rootfiles/core/168/filelists/whois b/config/rootfiles/core/168/filelists/whois
new file mode 120000
index 000000000..60cbd1894
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/whois
@@ -0,0 +1 @@
+../../../common/whois
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/x86_64/efibootmgr b/config/rootfiles/core/168/filelists/x86_64/efibootmgr
new file mode 120000
index 000000000..d6964dba9
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/x86_64/efibootmgr
@@ -0,0 +1 @@
+../../../../common/x86_64/efibootmgr
\ No newline at end of file
diff --git a/config/rootfiles/core/168/update.sh b/config/rootfiles/core/168/update.sh
new file mode 100644
index 000000000..44464725b
--- /dev/null
+++ b/config/rootfiles/core/168/update.sh
@@ -0,0 +1,105 @@
+#!/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) 2022 IPFire-Team <info(a)ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=168
+
+# 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
+
+# Remove files
+rm -rvf \
+	/usr/bin/dnet-config \
+	/usr/bin/sdparm \
+	/usr/lib/libart_lgpl_2.so* \
+	/usr/lib/libdnet.la \
+	/usr/lib/libdnet.so* \
+	/usr/lib/libevent-1.4.so* \
+	/usr/lib/libevent_core-1.4.so* \
+	/usr/lib/libevent_extra-1.4.so* \
+	/usr/lib/libnl.so* \
+	/usr/lib/libpri.so* \
+	/usr/lib/libsolv.so* \
+	/usr/lib/libsolvext.so* \
+	/usr/sbin/dnet
+
+# Remove netbpm add-on, if installed
+if [ -e "/opt/pakfire/db/installed/meta-netbpm" ]; then
+	for i in $(</opt/pakfire/db/rootfiles/netbpm); do
+		rm -rfv "/${i}"
+	done
+fi
+rm -vf \
+	/opt/pakfire/db/installed/meta-netbpm \
+	/opt/pakfire/db/meta/meta-netbpm \
+	/opt/pakfire/db/rootfiles/netbpm
+
+# Stop services
+/etc/init.d/squid stop
+/usr/local/bin/openvpnctrl -k
+/usr/local/bin/openvpnctrl -kn2n
+/etc/init.d/suricata stop
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Filesytem cleanup
+/usr/local/bin/filesystem-cleanup
+
+# Apply local configuration to sshd_config
+/usr/local/bin/sshctrl
+
+# Start services
+/etc/init.d/sshd restart
+/etc/init.d/vnstatd restart
+/etc/init.d/squid start
+/usr/local/bin/openvpnctrl -s
+/usr/local/bin/openvpnctrl -sn2n
+/etc/init.d/suricata start
+
+# 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
diff --git a/config/rootfiles/oldcore/167/exclude b/config/rootfiles/oldcore/167/exclude
new file mode 100644
index 000000000..b22e5e943
--- /dev/null
+++ b/config/rootfiles/oldcore/167/exclude
@@ -0,0 +1,35 @@
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+boot/uEnv.txt
+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
+usr/share/xt_geoip
+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/lib/location/database.db
+var/log/cache
+var/log/dhcpcd.log
+var/log/messages
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/core/167/filelists/aarch64/linux b/config/rootfiles/oldcore/167/filelists/aarch64/linux
similarity index 100%
rename from config/rootfiles/core/167/filelists/aarch64/linux
rename to config/rootfiles/oldcore/167/filelists/aarch64/linux
diff --git a/config/rootfiles/core/167/filelists/aarch64/u-boot b/config/rootfiles/oldcore/167/filelists/aarch64/u-boot
similarity index 100%
rename from config/rootfiles/core/167/filelists/aarch64/u-boot
rename to config/rootfiles/oldcore/167/filelists/aarch64/u-boot
diff --git a/config/rootfiles/core/167/filelists/aarch64/util-linux b/config/rootfiles/oldcore/167/filelists/aarch64/util-linux
similarity index 100%
rename from config/rootfiles/core/167/filelists/aarch64/util-linux
rename to config/rootfiles/oldcore/167/filelists/aarch64/util-linux
diff --git a/config/rootfiles/core/167/filelists/apache2 b/config/rootfiles/oldcore/167/filelists/apache2
similarity index 100%
rename from config/rootfiles/core/167/filelists/apache2
rename to config/rootfiles/oldcore/167/filelists/apache2
diff --git a/config/rootfiles/core/167/filelists/armv6l/linux b/config/rootfiles/oldcore/167/filelists/armv6l/linux
similarity index 100%
rename from config/rootfiles/core/167/filelists/armv6l/linux
rename to config/rootfiles/oldcore/167/filelists/armv6l/linux
diff --git a/config/rootfiles/core/167/filelists/armv6l/util-linux b/config/rootfiles/oldcore/167/filelists/armv6l/util-linux
similarity index 100%
rename from config/rootfiles/core/167/filelists/armv6l/util-linux
rename to config/rootfiles/oldcore/167/filelists/armv6l/util-linux
diff --git a/config/rootfiles/oldcore/167/filelists/bind b/config/rootfiles/oldcore/167/filelists/bind
new file mode 120000
index 000000000..48a0ebaef
--- /dev/null
+++ b/config/rootfiles/oldcore/167/filelists/bind
@@ -0,0 +1 @@
+../../../common/bind
\ No newline at end of file
diff --git a/config/rootfiles/core/167/filelists/ca-certificates b/config/rootfiles/oldcore/167/filelists/ca-certificates
similarity index 100%
rename from config/rootfiles/core/167/filelists/ca-certificates
rename to config/rootfiles/oldcore/167/filelists/ca-certificates
diff --git a/config/rootfiles/oldcore/167/filelists/core-files b/config/rootfiles/oldcore/167/filelists/core-files
new file mode 100644
index 000000000..0dec37e53
--- /dev/null
+++ b/config/rootfiles/oldcore/167/filelists/core-files
@@ -0,0 +1,5 @@
+etc/system-release
+etc/issue
+etc/os-release
+srv/web/ipfire/cgi-bin/credits.cgi
+var/ipfire/langs
diff --git a/config/rootfiles/core/167/filelists/coreutils b/config/rootfiles/oldcore/167/filelists/coreutils
similarity index 100%
rename from config/rootfiles/core/167/filelists/coreutils
rename to config/rootfiles/oldcore/167/filelists/coreutils
diff --git a/config/rootfiles/core/167/filelists/curl b/config/rootfiles/oldcore/167/filelists/curl
similarity index 100%
rename from config/rootfiles/core/167/filelists/curl
rename to config/rootfiles/oldcore/167/filelists/curl
diff --git a/config/rootfiles/core/167/filelists/ddns b/config/rootfiles/oldcore/167/filelists/ddns
similarity index 100%
rename from config/rootfiles/core/167/filelists/ddns
rename to config/rootfiles/oldcore/167/filelists/ddns
diff --git a/config/rootfiles/core/167/filelists/dracut b/config/rootfiles/oldcore/167/filelists/dracut
similarity index 100%
rename from config/rootfiles/core/167/filelists/dracut
rename to config/rootfiles/oldcore/167/filelists/dracut
diff --git a/config/rootfiles/core/167/filelists/elinks b/config/rootfiles/oldcore/167/filelists/elinks
similarity index 100%
rename from config/rootfiles/core/167/filelists/elinks
rename to config/rootfiles/oldcore/167/filelists/elinks
diff --git a/config/rootfiles/core/167/filelists/files b/config/rootfiles/oldcore/167/filelists/files
similarity index 100%
rename from config/rootfiles/core/167/filelists/files
rename to config/rootfiles/oldcore/167/filelists/files
diff --git a/config/rootfiles/core/167/filelists/gzip b/config/rootfiles/oldcore/167/filelists/gzip
similarity index 100%
rename from config/rootfiles/core/167/filelists/gzip
rename to config/rootfiles/oldcore/167/filelists/gzip
diff --git a/config/rootfiles/core/167/filelists/harfbuzz b/config/rootfiles/oldcore/167/filelists/harfbuzz
similarity index 100%
rename from config/rootfiles/core/167/filelists/harfbuzz
rename to config/rootfiles/oldcore/167/filelists/harfbuzz
diff --git a/config/rootfiles/core/167/filelists/hwdata b/config/rootfiles/oldcore/167/filelists/hwdata
similarity index 100%
rename from config/rootfiles/core/167/filelists/hwdata
rename to config/rootfiles/oldcore/167/filelists/hwdata
diff --git a/config/rootfiles/core/167/filelists/iproute2 b/config/rootfiles/oldcore/167/filelists/iproute2
similarity index 100%
rename from config/rootfiles/core/167/filelists/iproute2
rename to config/rootfiles/oldcore/167/filelists/iproute2
diff --git a/config/rootfiles/core/167/filelists/libdnet b/config/rootfiles/oldcore/167/filelists/libdnet
similarity index 100%
rename from config/rootfiles/core/167/filelists/libdnet
rename to config/rootfiles/oldcore/167/filelists/libdnet
diff --git a/config/rootfiles/core/167/filelists/libloc b/config/rootfiles/oldcore/167/filelists/libloc
similarity index 100%
rename from config/rootfiles/core/167/filelists/libloc
rename to config/rootfiles/oldcore/167/filelists/libloc
diff --git a/config/rootfiles/core/167/filelists/misc-progs b/config/rootfiles/oldcore/167/filelists/misc-progs
similarity index 100%
rename from config/rootfiles/core/167/filelists/misc-progs
rename to config/rootfiles/oldcore/167/filelists/misc-progs
diff --git a/config/rootfiles/core/167/filelists/nano b/config/rootfiles/oldcore/167/filelists/nano
similarity index 100%
rename from config/rootfiles/core/167/filelists/nano
rename to config/rootfiles/oldcore/167/filelists/nano
diff --git a/config/rootfiles/core/167/filelists/ntfs-3g b/config/rootfiles/oldcore/167/filelists/ntfs-3g
similarity index 100%
rename from config/rootfiles/core/167/filelists/ntfs-3g
rename to config/rootfiles/oldcore/167/filelists/ntfs-3g
diff --git a/config/rootfiles/oldcore/167/filelists/openssh b/config/rootfiles/oldcore/167/filelists/openssh
new file mode 120000
index 000000000..d8c77fd8e
--- /dev/null
+++ b/config/rootfiles/oldcore/167/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/core/167/filelists/openssl b/config/rootfiles/oldcore/167/filelists/openssl
similarity index 100%
rename from config/rootfiles/core/167/filelists/openssl
rename to config/rootfiles/oldcore/167/filelists/openssl
diff --git a/config/rootfiles/core/167/filelists/pakfire b/config/rootfiles/oldcore/167/filelists/pakfire
similarity index 100%
rename from config/rootfiles/core/167/filelists/pakfire
rename to config/rootfiles/oldcore/167/filelists/pakfire
diff --git a/config/rootfiles/core/167/filelists/pango b/config/rootfiles/oldcore/167/filelists/pango
similarity index 100%
rename from config/rootfiles/core/167/filelists/pango
rename to config/rootfiles/oldcore/167/filelists/pango
diff --git a/config/rootfiles/core/167/filelists/pcmciautils b/config/rootfiles/oldcore/167/filelists/pcmciautils
similarity index 100%
rename from config/rootfiles/core/167/filelists/pcmciautils
rename to config/rootfiles/oldcore/167/filelists/pcmciautils
diff --git a/config/rootfiles/core/167/filelists/perl-CGI b/config/rootfiles/oldcore/167/filelists/perl-CGI
similarity index 100%
rename from config/rootfiles/core/167/filelists/perl-CGI
rename to config/rootfiles/oldcore/167/filelists/perl-CGI
diff --git a/config/rootfiles/core/167/filelists/psmisc b/config/rootfiles/oldcore/167/filelists/psmisc
similarity index 100%
rename from config/rootfiles/core/167/filelists/psmisc
rename to config/rootfiles/oldcore/167/filelists/psmisc
diff --git a/config/rootfiles/core/167/filelists/rrdtool b/config/rootfiles/oldcore/167/filelists/rrdtool
similarity index 100%
rename from config/rootfiles/core/167/filelists/rrdtool
rename to config/rootfiles/oldcore/167/filelists/rrdtool
diff --git a/config/rootfiles/core/167/filelists/smartmontools b/config/rootfiles/oldcore/167/filelists/smartmontools
similarity index 100%
rename from config/rootfiles/core/167/filelists/smartmontools
rename to config/rootfiles/oldcore/167/filelists/smartmontools
diff --git a/config/rootfiles/core/167/filelists/sqlite b/config/rootfiles/oldcore/167/filelists/sqlite
similarity index 100%
rename from config/rootfiles/core/167/filelists/sqlite
rename to config/rootfiles/oldcore/167/filelists/sqlite
diff --git a/config/rootfiles/core/167/filelists/strongswan b/config/rootfiles/oldcore/167/filelists/strongswan
similarity index 100%
rename from config/rootfiles/core/167/filelists/strongswan
rename to config/rootfiles/oldcore/167/filelists/strongswan
diff --git a/config/rootfiles/core/167/filelists/sudo b/config/rootfiles/oldcore/167/filelists/sudo
similarity index 100%
rename from config/rootfiles/core/167/filelists/sudo
rename to config/rootfiles/oldcore/167/filelists/sudo
diff --git a/config/rootfiles/oldcore/167/filelists/vnstat b/config/rootfiles/oldcore/167/filelists/vnstat
new file mode 120000
index 000000000..2e2e6100b
--- /dev/null
+++ b/config/rootfiles/oldcore/167/filelists/vnstat
@@ -0,0 +1 @@
+../../../common/vnstat
\ No newline at end of file
diff --git a/config/rootfiles/core/167/filelists/wget b/config/rootfiles/oldcore/167/filelists/wget
similarity index 100%
rename from config/rootfiles/core/167/filelists/wget
rename to config/rootfiles/oldcore/167/filelists/wget
diff --git a/config/rootfiles/core/167/filelists/wireless-regdb b/config/rootfiles/oldcore/167/filelists/wireless-regdb
similarity index 100%
rename from config/rootfiles/core/167/filelists/wireless-regdb
rename to config/rootfiles/oldcore/167/filelists/wireless-regdb
diff --git a/config/rootfiles/core/167/filelists/x86_64/linux b/config/rootfiles/oldcore/167/filelists/x86_64/linux
similarity index 100%
rename from config/rootfiles/core/167/filelists/x86_64/linux
rename to config/rootfiles/oldcore/167/filelists/x86_64/linux
diff --git a/config/rootfiles/core/167/filelists/x86_64/util-linux b/config/rootfiles/oldcore/167/filelists/x86_64/util-linux
similarity index 100%
rename from config/rootfiles/core/167/filelists/x86_64/util-linux
rename to config/rootfiles/oldcore/167/filelists/x86_64/util-linux
diff --git a/config/rootfiles/core/167/filelists/xfsprogs b/config/rootfiles/oldcore/167/filelists/xfsprogs
similarity index 100%
rename from config/rootfiles/core/167/filelists/xfsprogs
rename to config/rootfiles/oldcore/167/filelists/xfsprogs
diff --git a/config/rootfiles/core/167/filelists/xz b/config/rootfiles/oldcore/167/filelists/xz
similarity index 100%
rename from config/rootfiles/core/167/filelists/xz
rename to config/rootfiles/oldcore/167/filelists/xz
diff --git a/config/rootfiles/core/167/filelists/zlib b/config/rootfiles/oldcore/167/filelists/zlib
similarity index 100%
rename from config/rootfiles/core/167/filelists/zlib
rename to config/rootfiles/oldcore/167/filelists/zlib
diff --git a/config/rootfiles/core/167/update.sh b/config/rootfiles/oldcore/167/update.sh
similarity index 100%
rename from config/rootfiles/core/167/update.sh
rename to config/rootfiles/oldcore/167/update.sh
diff --git a/config/rootfiles/packages/borgbackup b/config/rootfiles/packages/borgbackup
index dccaf4711..a27b7c11c 100644
--- a/config/rootfiles/packages/borgbackup
+++ b/config/rootfiles/packages/borgbackup
@@ -7,15 +7,6 @@ usr/lib/python3.10/site-packages/borg/_version.py
 #usr/lib/python3.10/site-packages/borg/algorithms
 usr/lib/python3.10/site-packages/borg/algorithms/__init__.py
 usr/lib/python3.10/site-packages/borg/algorithms/checksums.cpython-310-xxxMACHINExxx-linux-gnu.so
-#usr/lib/python3.10/site-packages/borg/algorithms/msgpack
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/__init__.py
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_packer.cpp
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_packer.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_unpacker.cpp
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_unpacker.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_version.py
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/exceptions.py
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/fallback.py
 usr/lib/python3.10/site-packages/borg/archive.py
 usr/lib/python3.10/site-packages/borg/archiver.py
 usr/lib/python3.10/site-packages/borg/cache.py
@@ -30,8 +21,22 @@ usr/lib/python3.10/site-packages/borg/crypto/keymanager.py
 usr/lib/python3.10/site-packages/borg/crypto/low_level.cpython-310-xxxMACHINExxx-linux-gnu.so
 usr/lib/python3.10/site-packages/borg/crypto/nonces.py
 usr/lib/python3.10/site-packages/borg/fuse.py
+usr/lib/python3.10/site-packages/borg/fuse_impl.py
 usr/lib/python3.10/site-packages/borg/hashindex.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/borg/helpers.py
+#usr/lib/python3.10/site-packages/borg/helpers
+usr/lib/python3.10/site-packages/borg/helpers/__init__.py
+usr/lib/python3.10/site-packages/borg/helpers/checks.py
+usr/lib/python3.10/site-packages/borg/helpers/datastruct.py
+usr/lib/python3.10/site-packages/borg/helpers/errors.py
+usr/lib/python3.10/site-packages/borg/helpers/fs.py
+usr/lib/python3.10/site-packages/borg/helpers/manifest.py
+usr/lib/python3.10/site-packages/borg/helpers/misc.py
+usr/lib/python3.10/site-packages/borg/helpers/msgpack.py
+usr/lib/python3.10/site-packages/borg/helpers/parseformat.py
+usr/lib/python3.10/site-packages/borg/helpers/process.py
+usr/lib/python3.10/site-packages/borg/helpers/progress.py
+usr/lib/python3.10/site-packages/borg/helpers/time.py
+usr/lib/python3.10/site-packages/borg/helpers/yes.py
 usr/lib/python3.10/site-packages/borg/item.cpython-310-xxxMACHINExxx-linux-gnu.so
 usr/lib/python3.10/site-packages/borg/locking.py
 usr/lib/python3.10/site-packages/borg/logger.py
@@ -45,6 +50,8 @@ usr/lib/python3.10/site-packages/borg/platform/base.py
 usr/lib/python3.10/site-packages/borg/platform/linux.cpython-310-xxxMACHINExxx-linux-gnu.so
 usr/lib/python3.10/site-packages/borg/platform/posix.cpython-310-xxxMACHINExxx-linux-gnu.so
 usr/lib/python3.10/site-packages/borg/platform/syncfilerange.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/borg/platform/xattr.py
+usr/lib/python3.10/site-packages/borg/platformflags.py
 usr/lib/python3.10/site-packages/borg/remote.py
 usr/lib/python3.10/site-packages/borg/repository.py
 usr/lib/python3.10/site-packages/borg/selftest.py
@@ -58,8 +65,11 @@ usr/lib/python3.10/site-packages/borg/testsuite/benchmark.py
 usr/lib/python3.10/site-packages/borg/testsuite/cache.py
 usr/lib/python3.10/site-packages/borg/testsuite/checksums.py
 usr/lib/python3.10/site-packages/borg/testsuite/chunker.py
+usr/lib/python3.10/site-packages/borg/testsuite/chunker_pytest.py
+usr/lib/python3.10/site-packages/borg/testsuite/chunker_slow.py
 usr/lib/python3.10/site-packages/borg/testsuite/compress.py
 usr/lib/python3.10/site-packages/borg/testsuite/crypto.py
+usr/lib/python3.10/site-packages/borg/testsuite/efficient_collection_queue.py
 usr/lib/python3.10/site-packages/borg/testsuite/file_integrity.py
 usr/lib/python3.10/site-packages/borg/testsuite/hashindex.py
 usr/lib/python3.10/site-packages/borg/testsuite/helpers.py
@@ -81,11 +91,11 @@ usr/lib/python3.10/site-packages/borg/testsuite/xattr.py
 usr/lib/python3.10/site-packages/borg/upgrader.py
 usr/lib/python3.10/site-packages/borg/version.py
 usr/lib/python3.10/site-packages/borg/xattr.py
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/PKG-INFO
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/SOURCES.txt
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/dependency_links.txt
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/entry_points.txt
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/not-zip-safe
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/requires.txt
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/entry_points.txt
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/not-zip-safe
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/top_level.txt
diff --git a/config/rootfiles/packages/dbus b/config/rootfiles/packages/dbus
index abcb6c695..82817a942 100644
--- a/config/rootfiles/packages/dbus
+++ b/config/rootfiles/packages/dbus
@@ -37,11 +37,10 @@ usr/bin/dbus-uuidgen
 #usr/lib/dbus-1.0/include
 #usr/lib/dbus-1.0/include/dbus
 #usr/lib/dbus-1.0/include/dbus/dbus-arch-deps.h
-#usr/lib/libdbus-1.a
 #usr/lib/libdbus-1.la
-usr/lib/libdbus-1.so
+#usr/lib/libdbus-1.so
 usr/lib/libdbus-1.so.3
-usr/lib/libdbus-1.so.3.19.13
+usr/lib/libdbus-1.so.3.32.0
 #usr/lib/pkgconfig/dbus-1.pc
 usr/libexec/dbus-daemon-launch-helper
 #usr/share/dbus-1
@@ -58,8 +57,10 @@ usr/share/dbus-1/system.d
 #usr/share/doc/dbus/examples/GetAllMatchRules.py
 #usr/share/doc/dbus/examples/example-session-disable-stats.conf
 #usr/share/doc/dbus/examples/example-system-enable-stats.conf
+#usr/share/doc/dbus/examples/example-system-hardening-without-traditional-activation.conf
 #usr/share/doc/dbus/system-activation.txt
 #usr/share/xml/dbus-1
 #usr/share/xml/dbus-1/busconfig.dtd
+#usr/share/xml/dbus-1/catalog.xml
 #usr/share/xml/dbus-1/introspect.dtd
 var/lib/dbus
diff --git a/config/rootfiles/packages/libpri b/config/rootfiles/packages/libpri
deleted file mode 100644
index 19fd87485..000000000
--- a/config/rootfiles/packages/libpri
+++ /dev/null
@@ -1,4 +0,0 @@
-#usr/include/libpri.h
-#usr/lib/libpri.a
-usr/lib/libpri.so
-usr/lib/libpri.so.1.4
diff --git a/config/rootfiles/packages/libsolv b/config/rootfiles/packages/libsolv
deleted file mode 100644
index 8a9c1a246..000000000
--- a/config/rootfiles/packages/libsolv
+++ /dev/null
@@ -1,52 +0,0 @@
-#usr/include/solv
-#usr/include/solv/bitmap.h
-#usr/include/solv/chksum.h
-#usr/include/solv/dataiterator.h
-#usr/include/solv/dirpool.h
-#usr/include/solv/evr.h
-#usr/include/solv/hash.h
-#usr/include/solv/knownid.h
-#usr/include/solv/policy.h
-#usr/include/solv/pool.h
-#usr/include/solv/poolarch.h
-#usr/include/solv/poolid.h
-#usr/include/solv/pooltypes.h
-#usr/include/solv/poolvendor.h
-#usr/include/solv/problems.h
-#usr/include/solv/queue.h
-#usr/include/solv/repo.h
-#usr/include/solv/repo_solv.h
-#usr/include/solv/repo_write.h
-#usr/include/solv/repodata.h
-#usr/include/solv/rules.h
-#usr/include/solv/selection.h
-#usr/include/solv/solv_xfopen.h
-#usr/include/solv/solvable.h
-#usr/include/solv/solver.h
-#usr/include/solv/solverdebug.h
-#usr/include/solv/solvversion.h
-#usr/include/solv/strpool.h
-#usr/include/solv/testcase.h
-#usr/include/solv/tools_util.h
-#usr/include/solv/transaction.h
-#usr/include/solv/util.h
-#usr/lib/libsolv.so
-usr/lib/libsolv.so.1
-#usr/lib/libsolvext.so
-usr/lib/libsolvext.so.1
-#usr/lib/pkgconfig/libsolv.pc
-#usr/lib/pkgconfig/libsolvext.pc
-#usr/share/cmake
-#usr/share/cmake/Modules
-#usr/share/cmake/Modules/FindLibSolv.cmake
-#usr/share/man/man1/dumpsolv.1
-#usr/share/man/man1/installcheck.1
-#usr/share/man/man1/mergesolv.1
-#usr/share/man/man1/repo2solv.1
-#usr/share/man/man1/solv.1
-#usr/share/man/man1/testsolv.1
-#usr/share/man/man3/libsolv-bindings.3
-#usr/share/man/man3/libsolv-constantids.3
-#usr/share/man/man3/libsolv-history.3
-#usr/share/man/man3/libsolv-pool.3
-#usr/share/man/man3/libsolv.3
diff --git a/config/rootfiles/packages/mc b/config/rootfiles/packages/mc
index 1faf7ee76..9d063581b 100644
--- a/config/rootfiles/packages/mc
+++ b/config/rootfiles/packages/mc
@@ -158,6 +158,7 @@ usr/share/mc/syntax/debian-sources-list.syntax
 usr/share/mc/syntax/diff.syntax
 usr/share/mc/syntax/dlink.syntax
 usr/share/mc/syntax/dos.syntax
+usr/share/mc/syntax/dot.syntax
 usr/share/mc/syntax/ebuild.syntax
 usr/share/mc/syntax/eiffel.syntax
 usr/share/mc/syntax/erlang.syntax
@@ -173,9 +174,9 @@ usr/share/mc/syntax/idl.syntax
 usr/share/mc/syntax/ini.syntax
 usr/share/mc/syntax/j.syntax
 usr/share/mc/syntax/jal.syntax
-usr/share/mc/syntax/json.syntax
 usr/share/mc/syntax/java.syntax
 usr/share/mc/syntax/js.syntax
+usr/share/mc/syntax/json.syntax
 usr/share/mc/syntax/kotlin.syntax
 usr/share/mc/syntax/latex.syntax
 usr/share/mc/syntax/lisp.syntax
@@ -211,6 +212,7 @@ usr/share/mc/syntax/sh.syntax
 usr/share/mc/syntax/slang.syntax
 usr/share/mc/syntax/smalltalk.syntax
 usr/share/mc/syntax/spec.syntax
+usr/share/mc/syntax/spice.syntax
 usr/share/mc/syntax/sql.syntax
 usr/share/mc/syntax/strace.syntax
 usr/share/mc/syntax/swift.syntax
diff --git a/config/rootfiles/packages/netpbm b/config/rootfiles/packages/netpbm
deleted file mode 100644
index e3e13fa36..000000000
--- a/config/rootfiles/packages/netpbm
+++ /dev/null
@@ -1,397 +0,0 @@
-#usr/bin/411toppm
-#usr/bin/anytopnm
-#usr/bin/asciitopgm
-#usr/bin/atktopbm
-#usr/bin/avstopam
-#usr/bin/bioradtopgm
-#usr/bin/bmptopnm
-#usr/bin/bmptoppm
-#usr/bin/brushtopbm
-#usr/bin/cameratopam
-#usr/bin/cistopbm
-#usr/bin/cmuwmtopbm
-#usr/bin/ddbugtopbm
-#usr/bin/doc.url
-#usr/bin/escp2topbm
-#usr/bin/eyuvtoppm
-#usr/bin/fiascotopnm
-#usr/bin/fitstopnm
-#usr/bin/fstopgm
-#usr/bin/g3topbm
-#usr/bin/gemtopbm
-#usr/bin/gemtopnm
-#usr/bin/giftopnm
-#usr/bin/gouldtoppm
-#usr/bin/hdifftopam
-#usr/bin/hipstopgm
-#usr/bin/hpcdtoppm
-#usr/bin/icontopbm
-#usr/bin/ilbmtoppm
-#usr/bin/imgtoppm
-#usr/bin/infotopam
-#usr/bin/jbigtopnm
-#usr/bin/jpeg2ktopam
-#usr/bin/jpegtopnm
-#usr/bin/leaftoppm
-#usr/bin/lispmtopgm
-#usr/bin/macptopbm
-#usr/bin/manweb
-#usr/bin/mdatopbm
-#usr/bin/mgrtopbm
-#usr/bin/mrftopbm
-#usr/bin/mtvtoppm
-#usr/bin/neotoppm
-#usr/bin/palmtopnm
-#usr/bin/pamaddnoise
-#usr/bin/pamarith
-#usr/bin/pambackground
-#usr/bin/pambayer
-#usr/bin/pamchannel
-#usr/bin/pamcomp
-#usr/bin/pamcrater
-#usr/bin/pamcut
-#usr/bin/pamdeinterlace
-#usr/bin/pamdepth
-#usr/bin/pamdice
-#usr/bin/pamditherbw
-#usr/bin/pamedge
-#usr/bin/pamendian
-#usr/bin/pamenlarge
-#usr/bin/pamexec
-#usr/bin/pamfile
-#usr/bin/pamfix
-#usr/bin/pamfixtrunc
-#usr/bin/pamflip
-#usr/bin/pamfunc
-#usr/bin/pamgauss
-#usr/bin/pamgradient
-#usr/bin/pamlookup
-#usr/bin/pammasksharpen
-#usr/bin/pammixinterlace
-#usr/bin/pammosaicknit
-#usr/bin/pamoil
-#usr/bin/pampaintspill
-#usr/bin/pamperspective
-#usr/bin/pampick
-#usr/bin/pampop9
-#usr/bin/pamrecolor
-#usr/bin/pamrgbatopng
-#usr/bin/pamrubber
-#usr/bin/pamscale
-#usr/bin/pamseq
-#usr/bin/pamshadedrelief
-#usr/bin/pamsharpmap
-#usr/bin/pamsharpness
-#usr/bin/pamsistoaglyph
-#usr/bin/pamslice
-#usr/bin/pamsplit
-#usr/bin/pamstack
-#usr/bin/pamstereogram
-#usr/bin/pamstretch
-#usr/bin/pamstretch-gen
-#usr/bin/pamsumm
-#usr/bin/pamsummcol
-#usr/bin/pamthreshold
-#usr/bin/pamtilt
-#usr/bin/pamtoavs
-#usr/bin/pamtodjvurle
-#usr/bin/pamtofits
-#usr/bin/pamtogif
-#usr/bin/pamtohdiff
-#usr/bin/pamtohtmltbl
-#usr/bin/pamtojpeg2k
-#usr/bin/pamtompfont
-#usr/bin/pamtooctaveimg
-#usr/bin/pamtopam
-#usr/bin/pamtopdbimg
-#usr/bin/pamtopfm
-#usr/bin/pamtopng
-#usr/bin/pamtopnm
-#usr/bin/pamtosrf
-#usr/bin/pamtosvg
-#usr/bin/pamtotga
-#usr/bin/pamtotiff
-#usr/bin/pamtouil
-#usr/bin/pamtowinicon
-#usr/bin/pamtoxvmini
-#usr/bin/pamundice
-#usr/bin/pamunlookup
-#usr/bin/pamvalidate
-#usr/bin/pamwipeout
-#usr/bin/pbmclean
-#usr/bin/pbmlife
-#usr/bin/pbmmake
-#usr/bin/pbmmask
-#usr/bin/pbmminkowski
-#usr/bin/pbmpage
-#usr/bin/pbmpscale
-#usr/bin/pbmreduce
-#usr/bin/pbmtext
-#usr/bin/pbmtextps
-#usr/bin/pbmto10x
-#usr/bin/pbmto4425
-#usr/bin/pbmtoascii
-#usr/bin/pbmtoatk
-#usr/bin/pbmtobbnbg
-#usr/bin/pbmtocis
-#usr/bin/pbmtocmuwm
-#usr/bin/pbmtodjvurle
-#usr/bin/pbmtoepsi
-#usr/bin/pbmtoepson
-#usr/bin/pbmtoescp2
-#usr/bin/pbmtog3
-#usr/bin/pbmtogem
-#usr/bin/pbmtogo
-#usr/bin/pbmtoibm23xx
-#usr/bin/pbmtoicon
-#usr/bin/pbmtolj
-#usr/bin/pbmtoln03
-#usr/bin/pbmtolps
-#usr/bin/pbmtomacp
-#usr/bin/pbmtomatrixorbital
-#usr/bin/pbmtomda
-#usr/bin/pbmtomgr
-#usr/bin/pbmtomrf
-#usr/bin/pbmtonokia
-#usr/bin/pbmtopgm
-#usr/bin/pbmtopi3
-#usr/bin/pbmtopk
-#usr/bin/pbmtoplot
-#usr/bin/pbmtoppa
-#usr/bin/pbmtopsg3
-#usr/bin/pbmtoptx
-#usr/bin/pbmtosunicon
-#usr/bin/pbmtowbmp
-#usr/bin/pbmtox10bm
-#usr/bin/pbmtoxbm
-#usr/bin/pbmtoybm
-#usr/bin/pbmtozinc
-#usr/bin/pbmupc
-#usr/bin/pc1toppm
-#usr/bin/pcdovtoppm
-#usr/bin/pcxtoppm
-#usr/bin/pdbimgtopam
-#usr/bin/pfmtopam
-#usr/bin/pgmabel
-#usr/bin/pgmbentley
-#usr/bin/pgmcrater
-#usr/bin/pgmdeshadow
-#usr/bin/pgmedge
-#usr/bin/pgmenhance
-#usr/bin/pgmhist
-#usr/bin/pgmkernel
-#usr/bin/pgmmake
-#usr/bin/pgmmedian
-#usr/bin/pgmminkowski
-#usr/bin/pgmmorphconv
-#usr/bin/pgmnoise
-#usr/bin/pgmnorm
-#usr/bin/pgmoil
-#usr/bin/pgmramp
-#usr/bin/pgmslice
-#usr/bin/pgmtexture
-#usr/bin/pgmtofs
-#usr/bin/pgmtolispm
-#usr/bin/pgmtopbm
-#usr/bin/pgmtopgm
-#usr/bin/pgmtoppm
-#usr/bin/pgmtosbig
-#usr/bin/pgmtost4
-#usr/bin/pi1toppm
-#usr/bin/pi3topbm
-#usr/bin/picttoppm
-#usr/bin/pjtoppm
-#usr/bin/pktopbm
-#usr/bin/pngtopam
-#usr/bin/pngtopnm
-#usr/bin/pnmalias
-#usr/bin/pnmarith
-#usr/bin/pnmcat
-#usr/bin/pnmcolormap
-#usr/bin/pnmcomp
-#usr/bin/pnmconvol
-#usr/bin/pnmcrop
-#usr/bin/pnmcut
-#usr/bin/pnmdepth
-#usr/bin/pnmenlarge
-#usr/bin/pnmfile
-#usr/bin/pnmflip
-#usr/bin/pnmgamma
-#usr/bin/pnmhisteq
-#usr/bin/pnmhistmap
-#usr/bin/pnmindex
-#usr/bin/pnminterp
-#usr/bin/pnminvert
-#usr/bin/pnmmargin
-#usr/bin/pnmmercator
-#usr/bin/pnmmontage
-#usr/bin/pnmnlfilt
-#usr/bin/pnmnoraw
-#usr/bin/pnmnorm
-#usr/bin/pnmpad
-#usr/bin/pnmpaste
-#usr/bin/pnmpsnr
-#usr/bin/pnmquant
-#usr/bin/pnmquantall
-#usr/bin/pnmremap
-#usr/bin/pnmrotate
-#usr/bin/pnmscale
-#usr/bin/pnmscalefixed
-#usr/bin/pnmshear
-#usr/bin/pnmsmooth
-#usr/bin/pnmsplit
-#usr/bin/pnmstitch
-#usr/bin/pnmtile
-#usr/bin/pnmtoddif
-#usr/bin/pnmtofiasco
-#usr/bin/pnmtofits
-#usr/bin/pnmtojbig
-usr/bin/pnmtojpeg
-#usr/bin/pnmtopalm
-#usr/bin/pnmtopclxl
-#usr/bin/pnmtoplainpnm
-usr/bin/pnmtopng
-#usr/bin/pnmtopnm
-#usr/bin/pnmtops
-#usr/bin/pnmtorast
-#usr/bin/pnmtorle
-#usr/bin/pnmtosgi
-#usr/bin/pnmtosir
-usr/bin/pnmtotiff
-#usr/bin/pnmtotiffcmyk
-#usr/bin/pnmtoxwd
-#usr/bin/ppm3d
-#usr/bin/ppmbrighten
-#usr/bin/ppmchange
-#usr/bin/ppmcie
-#usr/bin/ppmcolormask
-#usr/bin/ppmcolors
-#usr/bin/ppmdcfont
-#usr/bin/ppmddumpfont
-#usr/bin/ppmdim
-#usr/bin/ppmdist
-#usr/bin/ppmdither
-#usr/bin/ppmdmkfont
-#usr/bin/ppmdraw
-#usr/bin/ppmfade
-#usr/bin/ppmflash
-#usr/bin/ppmforge
-#usr/bin/ppmglobe
-#usr/bin/ppmhist
-#usr/bin/ppmlabel
-#usr/bin/ppmmake
-#usr/bin/ppmmix
-#usr/bin/ppmnorm
-#usr/bin/ppmntsc
-#usr/bin/ppmpat
-#usr/bin/ppmquant
-#usr/bin/ppmquantall
-#usr/bin/ppmrainbow
-#usr/bin/ppmrelief
-#usr/bin/ppmrough
-#usr/bin/ppmshadow
-#usr/bin/ppmshift
-#usr/bin/ppmspread
-#usr/bin/ppmtoacad
-#usr/bin/ppmtoapplevol
-#usr/bin/ppmtoarbtxt
-#usr/bin/ppmtoascii
-#usr/bin/ppmtobmp
-#usr/bin/ppmtoeyuv
-#usr/bin/ppmtogif
-#usr/bin/ppmtoicr
-#usr/bin/ppmtoilbm
-#usr/bin/ppmtojpeg
-#usr/bin/ppmtoleaf
-#usr/bin/ppmtolj
-#usr/bin/ppmtomap
-#usr/bin/ppmtomitsu
-#usr/bin/ppmtompeg
-#usr/bin/ppmtoneo
-#usr/bin/ppmtopcx
-#usr/bin/ppmtopgm
-#usr/bin/ppmtopi1
-#usr/bin/ppmtopict
-#usr/bin/ppmtopj
-#usr/bin/ppmtopjxl
-#usr/bin/ppmtoppm
-#usr/bin/ppmtopuzz
-#usr/bin/ppmtorgb3
-#usr/bin/ppmtosixel
-#usr/bin/ppmtospu
-#usr/bin/ppmtoterm
-#usr/bin/ppmtotga
-#usr/bin/ppmtouil
-#usr/bin/ppmtowinicon
-#usr/bin/ppmtoxpm
-#usr/bin/ppmtoyuv
-#usr/bin/ppmtoyuvsplit
-#usr/bin/ppmtv
-#usr/bin/ppmwheel
-#usr/bin/psidtopgm
-#usr/bin/pstopnm
-#usr/bin/qrttoppm
-#usr/bin/rasttopnm
-#usr/bin/rawtopgm
-#usr/bin/rawtoppm
-#usr/bin/rgb3toppm
-#usr/bin/rlatopam
-#usr/bin/rletopnm
-#usr/bin/sbigtopgm
-#usr/bin/sgitopnm
-#usr/bin/sirtopnm
-#usr/bin/sldtoppm
-#usr/bin/spctoppm
-#usr/bin/spottopgm
-#usr/bin/sputoppm
-#usr/bin/srftopam
-#usr/bin/st4topgm
-#usr/bin/sunicontopnm
-#usr/bin/svgtopam
-#usr/bin/tgatoppm
-#usr/bin/thinkjettopbm
-#usr/bin/tifftopnm
-#usr/bin/wbmptopbm
-#usr/bin/winicontopam
-#usr/bin/winicontoppm
-#usr/bin/xbmtopbm
-#usr/bin/ximtoppm
-#usr/bin/xpmtoppm
-#usr/bin/xvminitoppm
-#usr/bin/xwdtopnm
-#usr/bin/ybmtopbm
-#usr/bin/yuvsplittoppm
-#usr/bin/yuvtoppm
-#usr/bin/yuy2topam
-#usr/bin/zeisstopnm
-#usr/include/netpbm
-#usr/include/netpbm/colorname.h
-#usr/include/netpbm/mallocvar.h
-#usr/include/netpbm/pam.h
-#usr/include/netpbm/pamdraw.h
-#usr/include/netpbm/pammap.h
-#usr/include/netpbm/pbm.h
-#usr/include/netpbm/pbmfont.h
-#usr/include/netpbm/pgm.h
-#usr/include/netpbm/pm.h
-#usr/include/netpbm/pm_config.h
-#usr/include/netpbm/pm_gamma.h
-#usr/include/netpbm/pm_system.h
-#usr/include/netpbm/pnm.h
-#usr/include/netpbm/ppm.h
-#usr/include/netpbm/ppmcmap.h
-#usr/include/netpbm/ppmdfont.h
-#usr/include/netpbm/ppmdraw.h
-#usr/include/netpbm/ppmfloyd.h
-#usr/include/netpbm/runlength.h
-#usr/include/netpbm/shhopt.h
-usr/lib/libnetpbm.so
-usr/lib/libnetpbm.so.11
-usr/lib/libnetpbm.so.11.73
-#usr/share/netpbm
-usr/share/netpbm/palmcolor8.map
-usr/share/netpbm/palmgray1.map
-usr/share/netpbm/palmgray2.map
-usr/share/netpbm/palmgray4.map
-usr/share/netpbm/pcxstd.ppm
-#usr/share/netpbm/rgb.txt
diff --git a/config/rootfiles/packages/python3-botocore b/config/rootfiles/packages/python3-botocore
index c99fe5d25..638dff0eb 100644
--- a/config/rootfiles/packages/python3-botocore
+++ b/config/rootfiles/packages/python3-botocore
@@ -1,10 +1,10 @@
 #usr/lib/python3.10/site-packages/botocore
-#usr/lib/python3.10/site-packages/botocore-1.23.21-py3.10.egg-info
-#usr/lib/python3.10/site-packages/botocore-1.23.21-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/botocore-1.23.21-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/botocore-1.23.21-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/botocore-1.23.21-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/botocore-1.23.21-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info
+#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info/top_level.txt
 usr/lib/python3.10/site-packages/botocore/__init__.py
 usr/lib/python3.10/site-packages/botocore/args.py
 usr/lib/python3.10/site-packages/botocore/auth.py
@@ -159,6 +159,11 @@ usr/lib/python3.10/site-packages/botocore/crt/auth.py
 #usr/lib/python3.10/site-packages/botocore/data/batch/2016-08-10/examples-1.json
 #usr/lib/python3.10/site-packages/botocore/data/batch/2016-08-10/paginators-1.json
 #usr/lib/python3.10/site-packages/botocore/data/batch/2016-08-10/service-2.json
+#usr/lib/python3.10/site-packages/botocore/data/billingconductor
+#usr/lib/python3.10/site-packages/botocore/data/billingconductor/2021-07-30
+#usr/lib/python3.10/site-packages/botocore/data/billingconductor/2021-07-30/paginators-1.json
+#usr/lib/python3.10/site-packages/botocore/data/billingconductor/2021-07-30/service-2.json
+#usr/lib/python3.10/site-packages/botocore/data/billingconductor/2021-07-30/waiters-2.json
 #usr/lib/python3.10/site-packages/botocore/data/braket
 #usr/lib/python3.10/site-packages/botocore/data/braket/2019-09-01
 #usr/lib/python3.10/site-packages/botocore/data/braket/2019-09-01/paginators-1.json
@@ -690,6 +695,10 @@ usr/lib/python3.10/site-packages/botocore/crt/auth.py
 #usr/lib/python3.10/site-packages/botocore/data/gamelift/2015-10-01/examples-1.json
 #usr/lib/python3.10/site-packages/botocore/data/gamelift/2015-10-01/paginators-1.json
 #usr/lib/python3.10/site-packages/botocore/data/gamelift/2015-10-01/service-2.json
+#usr/lib/python3.10/site-packages/botocore/data/gamesparks
+#usr/lib/python3.10/site-packages/botocore/data/gamesparks/2021-08-17
+#usr/lib/python3.10/site-packages/botocore/data/gamesparks/2021-08-17/paginators-1.json
+#usr/lib/python3.10/site-packages/botocore/data/gamesparks/2021-08-17/service-2.json
 #usr/lib/python3.10/site-packages/botocore/data/glacier
 #usr/lib/python3.10/site-packages/botocore/data/glacier/2012-06-01
 #usr/lib/python3.10/site-packages/botocore/data/glacier/2012-06-01/examples-1.json
@@ -851,6 +860,11 @@ usr/lib/python3.10/site-packages/botocore/crt/auth.py
 #usr/lib/python3.10/site-packages/botocore/data/kendra/2019-02-03
 #usr/lib/python3.10/site-packages/botocore/data/kendra/2019-02-03/paginators-1.json
 #usr/lib/python3.10/site-packages/botocore/data/kendra/2019-02-03/service-2.json
+#usr/lib/python3.10/site-packages/botocore/data/keyspaces
+#usr/lib/python3.10/site-packages/botocore/data/keyspaces/2022-02-10
+#usr/lib/python3.10/site-packages/botocore/data/keyspaces/2022-02-10/paginators-1.json
+#usr/lib/python3.10/site-packages/botocore/data/keyspaces/2022-02-10/service-2.json
+#usr/lib/python3.10/site-packages/botocore/data/keyspaces/2022-02-10/waiters-2.json
 #usr/lib/python3.10/site-packages/botocore/data/kinesis
 #usr/lib/python3.10/site-packages/botocore/data/kinesis-video-archived-media
 #usr/lib/python3.10/site-packages/botocore/data/kinesis-video-archived-media/2017-09-30
@@ -1142,6 +1156,12 @@ usr/lib/python3.10/site-packages/botocore/crt/auth.py
 #usr/lib/python3.10/site-packages/botocore/data/pinpoint-email/2018-07-26/paginators-1.json
 #usr/lib/python3.10/site-packages/botocore/data/pinpoint-email/2018-07-26/service-2.json
 #usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice
+#usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice-v2
+#usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice-v2/2022-03-31
+#usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice-v2/2022-03-31/paginators-1.json
+#usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice-v2/2022-03-31/paginators-1.sdk-extras.json
+#usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice-v2/2022-03-31/service-2.json
+#usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice-v2/2022-03-31/waiters-2.json
 #usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice/2018-09-05
 #usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice/2018-09-05/service-2.json
 #usr/lib/python3.10/site-packages/botocore/data/pinpoint/2016-12-01
@@ -1316,6 +1336,7 @@ usr/lib/python3.10/site-packages/botocore/crt/auth.py
 #usr/lib/python3.10/site-packages/botocore/data/sdb/2009-04-15
 #usr/lib/python3.10/site-packages/botocore/data/sdb/2009-04-15/paginators-1.json
 #usr/lib/python3.10/site-packages/botocore/data/sdb/2009-04-15/service-2.json
+#usr/lib/python3.10/site-packages/botocore/data/sdk-default-configuration.json
 #usr/lib/python3.10/site-packages/botocore/data/secretsmanager
 #usr/lib/python3.10/site-packages/botocore/data/secretsmanager/2017-10-17
 #usr/lib/python3.10/site-packages/botocore/data/secretsmanager/2017-10-17/examples-1.json
@@ -1473,6 +1494,7 @@ usr/lib/python3.10/site-packages/botocore/crt/auth.py
 #usr/lib/python3.10/site-packages/botocore/data/transfer/2018-11-05
 #usr/lib/python3.10/site-packages/botocore/data/transfer/2018-11-05/paginators-1.json
 #usr/lib/python3.10/site-packages/botocore/data/transfer/2018-11-05/service-2.json
+#usr/lib/python3.10/site-packages/botocore/data/transfer/2018-11-05/waiters-2.json
 #usr/lib/python3.10/site-packages/botocore/data/translate
 #usr/lib/python3.10/site-packages/botocore/data/translate/2017-07-01
 #usr/lib/python3.10/site-packages/botocore/data/translate/2017-07-01/examples-1.json
@@ -1562,6 +1584,7 @@ usr/lib/python3.10/site-packages/botocore/exceptions.py
 usr/lib/python3.10/site-packages/botocore/handlers.py
 usr/lib/python3.10/site-packages/botocore/history.py
 usr/lib/python3.10/site-packages/botocore/hooks.py
+#usr/lib/python3.10/site-packages/botocore/httpchecksum.py
 usr/lib/python3.10/site-packages/botocore/httpsession.py
 usr/lib/python3.10/site-packages/botocore/loaders.py
 usr/lib/python3.10/site-packages/botocore/model.py
diff --git a/config/rootfiles/packages/python3-charset-normalizer b/config/rootfiles/packages/python3-charset-normalizer
index 8c754ad65..5088aa60d 100644
--- a/config/rootfiles/packages/python3-charset-normalizer
+++ b/config/rootfiles/packages/python3-charset-normalizer
@@ -1,12 +1,12 @@
 usr/bin/normalizer
 usr/lib/python3.10/site-packages/charset_normalizer
-#usr/lib/python3.10/site-packages/charset_normalizer-2.0.10-py3.10.egg-info
-#usr/lib/python3.10/site-packages/charset_normalizer-2.0.10-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/charset_normalizer-2.0.10-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/charset_normalizer-2.0.10-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/charset_normalizer-2.0.10-py3.10.egg-info/entry_points.txt
-#usr/lib/python3.10/site-packages/charset_normalizer-2.0.10-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/charset_normalizer-2.0.10-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/charset_normalizer-2.0.12-py3.10.egg-info
+#usr/lib/python3.10/site-packages/charset_normalizer-2.0.12-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/charset_normalizer-2.0.12-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/charset_normalizer-2.0.12-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/charset_normalizer-2.0.12-py3.10.egg-info/entry_points.txt
+#usr/lib/python3.10/site-packages/charset_normalizer-2.0.12-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/charset_normalizer-2.0.12-py3.10.egg-info/top_level.txt
 usr/lib/python3.10/site-packages/charset_normalizer/__init__.py
 usr/lib/python3.10/site-packages/charset_normalizer/api.py
 usr/lib/python3.10/site-packages/charset_normalizer/assets
diff --git a/config/rootfiles/packages/python3-click b/config/rootfiles/packages/python3-click
index f72d4a679..90264aa75 100644
--- a/config/rootfiles/packages/python3-click
+++ b/config/rootfiles/packages/python3-click
@@ -1,15 +1,14 @@
 usr/lib/python3.10/site-packages/click
-#usr/lib/python3.10/site-packages/click-8.0.3-py3.10.egg-info
-#usr/lib/python3.10/site-packages/click-8.0.3-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/click-8.0.3-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/click-8.0.3-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/click-8.0.3-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/click-8.0.3-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/click-8.1.2-py3.10.egg-info
+#usr/lib/python3.10/site-packages/click-8.1.2-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/click-8.1.2-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/click-8.1.2-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/click-8.1.2-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/click-8.1.2-py3.10.egg-info/top_level.txt
 usr/lib/python3.10/site-packages/click/__init__.py
 usr/lib/python3.10/site-packages/click/_compat.py
 usr/lib/python3.10/site-packages/click/_termui_impl.py
 usr/lib/python3.10/site-packages/click/_textwrap.py
-usr/lib/python3.10/site-packages/click/_unicodefun.py
 usr/lib/python3.10/site-packages/click/_winconsole.py
 usr/lib/python3.10/site-packages/click/core.py
 usr/lib/python3.10/site-packages/click/decorators.py
diff --git a/config/rootfiles/packages/python3-flit b/config/rootfiles/packages/python3-flit
index ac483dddf..2dcda51fd 100644
--- a/config/rootfiles/packages/python3-flit
+++ b/config/rootfiles/packages/python3-flit
@@ -1,11 +1,11 @@
 usr/lib/python3.10/site-packages/flit_core
-#usr/lib/python3.10/site-packages/flit_core-3.6.0.dist-info
-#usr/lib/python3.10/site-packages/flit_core-3.6.0.dist-info/INSTALLER
-#usr/lib/python3.10/site-packages/flit_core-3.6.0.dist-info/METADATA
-#usr/lib/python3.10/site-packages/flit_core-3.6.0.dist-info/RECORD
-#usr/lib/python3.10/site-packages/flit_core-3.6.0.dist-info/REQUESTED
-#usr/lib/python3.10/site-packages/flit_core-3.6.0.dist-info/WHEEL
-#usr/lib/python3.10/site-packages/flit_core-3.6.0.dist-info/direct_url.json
+#usr/lib/python3.10/site-packages/flit_core-3.7.1.dist-info
+#usr/lib/python3.10/site-packages/flit_core-3.7.1.dist-info/INSTALLER
+#usr/lib/python3.10/site-packages/flit_core-3.7.1.dist-info/METADATA
+#usr/lib/python3.10/site-packages/flit_core-3.7.1.dist-info/RECORD
+#usr/lib/python3.10/site-packages/flit_core-3.7.1.dist-info/REQUESTED
+#usr/lib/python3.10/site-packages/flit_core-3.7.1.dist-info/WHEEL
+#usr/lib/python3.10/site-packages/flit_core-3.7.1.dist-info/direct_url.json
 usr/lib/python3.10/site-packages/flit_core/__init__.py
 usr/lib/python3.10/site-packages/flit_core/buildapi.py
 usr/lib/python3.10/site-packages/flit_core/common.py
@@ -26,6 +26,11 @@ usr/lib/python3.10/site-packages/flit_core/sdist.py
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/constructed_version/pyproject.toml
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/extras-dev-conflict.toml
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/extras.toml
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/imported_version
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/imported_version/package1
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/imported_version/package1/__init__.py
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/imported_version/package1/_version.py
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/imported_version/pyproject.toml
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/inclusion
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/inclusion/LICENSES
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/inclusion/LICENSES/README
@@ -83,6 +88,16 @@ usr/lib/python3.10/site-packages/flit_core/sdist.py
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/requires-envmark.toml
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/requires-extra-envmark.toml
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/requires-requests.toml
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/LICENSE
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/README.rst
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/data
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/data/share
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/data/share/man
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/data/share/man/man1
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/data/share/man/man1/foo.1
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/module1.py
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/pyproject.toml
 #usr/lib/python3.10/site-packages/flit_core/tests/test_build_thyself.py
 #usr/lib/python3.10/site-packages/flit_core/tests/test_buildapi.py
 #usr/lib/python3.10/site-packages/flit_core/tests/test_common.py
diff --git a/config/rootfiles/packages/python3-jmespath b/config/rootfiles/packages/python3-jmespath
index 5232c958b..6e15e60fd 100644
--- a/config/rootfiles/packages/python3-jmespath
+++ b/config/rootfiles/packages/python3-jmespath
@@ -1,10 +1,10 @@
 usr/bin/jp.py
 #usr/lib/python3.10/site-packages/jmespath
-#usr/lib/python3.10/site-packages/jmespath-0.10.0-py3.10.egg-info
-#usr/lib/python3.10/site-packages/jmespath-0.10.0-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/jmespath-0.10.0-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/jmespath-0.10.0-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/jmespath-0.10.0-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/jmespath-1.0.0-py3.10.egg-info
+#usr/lib/python3.10/site-packages/jmespath-1.0.0-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/jmespath-1.0.0-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/jmespath-1.0.0-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/jmespath-1.0.0-py3.10.egg-info/top_level.txt
 usr/lib/python3.10/site-packages/jmespath/__init__.py
 usr/lib/python3.10/site-packages/jmespath/ast.py
 usr/lib/python3.10/site-packages/jmespath/compat.py
diff --git a/config/rootfiles/packages/python3-pkgconfig b/config/rootfiles/packages/python3-pkgconfig
new file mode 100644
index 000000000..54c0155a4
--- /dev/null
+++ b/config/rootfiles/packages/python3-pkgconfig
@@ -0,0 +1,8 @@
+usr/lib/python3.10/site-packages/pkgconfig
+#usr/lib/python3.10/site-packages/pkgconfig-1.5.5-py3.10.egg-info
+#usr/lib/python3.10/site-packages/pkgconfig-1.5.5-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/pkgconfig-1.5.5-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/pkgconfig-1.5.5-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/pkgconfig-1.5.5-py3.10.egg-info/top_level.txt
+usr/lib/python3.10/site-packages/pkgconfig/__init__.py
+usr/lib/python3.10/site-packages/pkgconfig/pkgconfig.py
diff --git a/config/rootfiles/packages/python3-pyparsing b/config/rootfiles/packages/python3-pyparsing
index 3dbfdcdaf..08099a30a 100644
--- a/config/rootfiles/packages/python3-pyparsing
+++ b/config/rootfiles/packages/python3-pyparsing
@@ -1,22 +1,22 @@
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/EGG-INFO
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/EGG-INFO/PKG-INFO
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/EGG-INFO/SOURCES.txt
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/EGG-INFO/dependency_links.txt
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/EGG-INFO/not-zip-safe
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/EGG-INFO/requires.txt
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/EGG-INFO/top_level.txt
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/__init__.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/actions.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/common.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/core.py
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/diagram
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/diagram/__init__.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/diagram/template.jinja2
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/exceptions.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/helpers.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/results.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/testing.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/unicode.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/util.py
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/EGG-INFO
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/EGG-INFO/PKG-INFO
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/EGG-INFO/SOURCES.txt
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/EGG-INFO/dependency_links.txt
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/EGG-INFO/not-zip-safe
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/EGG-INFO/requires.txt
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/EGG-INFO/top_level.txt
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/__init__.py
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/actions.py
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/common.py
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/core.py
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/diagram
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/diagram/__init__.py
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/diagram/template.jinja2
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/exceptions.py
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/helpers.py
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/results.py
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/testing.py
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/unicode.py
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/util.py
diff --git a/config/rootfiles/packages/python3-pytz b/config/rootfiles/packages/python3-pytz
index 5a7484621..040b17c99 100644
--- a/config/rootfiles/packages/python3-pytz
+++ b/config/rootfiles/packages/python3-pytz
@@ -1,10 +1,10 @@
 usr/lib/python3.10/site-packages/pytz
-#usr/lib/python3.10/site-packages/pytz-2021.3-py3.10.egg-info
-#usr/lib/python3.10/site-packages/pytz-2021.3-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/pytz-2021.3-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/pytz-2021.3-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/pytz-2021.3-py3.10.egg-info/top_level.txt
-#usr/lib/python3.10/site-packages/pytz-2021.3-py3.10.egg-info/zip-safe
+#usr/lib/python3.10/site-packages/pytz-2022.1-py3.10.egg-info
+#usr/lib/python3.10/site-packages/pytz-2022.1-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/pytz-2022.1-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/pytz-2022.1-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/pytz-2022.1-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/pytz-2022.1-py3.10.egg-info/zip-safe
 usr/lib/python3.10/site-packages/pytz/__init__.py
 usr/lib/python3.10/site-packages/pytz/exceptions.py
 usr/lib/python3.10/site-packages/pytz/lazy.py
diff --git a/config/rootfiles/packages/python3-s3transfer b/config/rootfiles/packages/python3-s3transfer
index 07e2def39..6723f3498 100644
--- a/config/rootfiles/packages/python3-s3transfer
+++ b/config/rootfiles/packages/python3-s3transfer
@@ -1,10 +1,10 @@
 #usr/lib/python3.10/site-packages/s3transfer
-#usr/lib/python3.10/site-packages/s3transfer-0.5.0-py3.10.egg-info
-#usr/lib/python3.10/site-packages/s3transfer-0.5.0-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/s3transfer-0.5.0-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/s3transfer-0.5.0-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/s3transfer-0.5.0-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/s3transfer-0.5.0-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/s3transfer-0.5.2-py3.10.egg-info
+#usr/lib/python3.10/site-packages/s3transfer-0.5.2-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/s3transfer-0.5.2-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/s3transfer-0.5.2-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/s3transfer-0.5.2-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/s3transfer-0.5.2-py3.10.egg-info/top_level.txt
 usr/lib/python3.10/site-packages/s3transfer/__init__.py
 usr/lib/python3.10/site-packages/s3transfer/bandwidth.py
 usr/lib/python3.10/site-packages/s3transfer/compat.py
diff --git a/config/rootfiles/packages/python3-semantic-version b/config/rootfiles/packages/python3-semantic-version
index 5c4ff5ec3..a5be99d34 100644
--- a/config/rootfiles/packages/python3-semantic-version
+++ b/config/rootfiles/packages/python3-semantic-version
@@ -1,10 +1,11 @@
 usr/lib/python3.10/site-packages/semantic_version
-#usr/lib/python3.10/site-packages/semantic_version-2.8.5-py3.10.egg-info
-#usr/lib/python3.10/site-packages/semantic_version-2.8.5-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/semantic_version-2.8.5-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/semantic_version-2.8.5-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/semantic_version-2.8.5-py3.10.egg-info/not-zip-safe
-#usr/lib/python3.10/site-packages/semantic_version-2.8.5-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/semantic_version-2.9.0-py3.10.egg-info
+#usr/lib/python3.10/site-packages/semantic_version-2.9.0-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/semantic_version-2.9.0-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/semantic_version-2.9.0-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/semantic_version-2.9.0-py3.10.egg-info/not-zip-safe
+#usr/lib/python3.10/site-packages/semantic_version-2.9.0-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/semantic_version-2.9.0-py3.10.egg-info/top_level.txt
 usr/lib/python3.10/site-packages/semantic_version/__init__.py
 usr/lib/python3.10/site-packages/semantic_version/base.py
 usr/lib/python3.10/site-packages/semantic_version/django_fields.py
diff --git a/config/rootfiles/packages/python3-setuptools b/config/rootfiles/packages/python3-setuptools
index 1f491c8a7..1f7447cb2 100644
--- a/config/rootfiles/packages/python3-setuptools
+++ b/config/rootfiles/packages/python3-setuptools
@@ -1,179 +1,252 @@
 #usr/lib/python3.10/site-packages/easy-install.pth
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/EGG-INFO
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/EGG-INFO/PKG-INFO
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/EGG-INFO/SOURCES.txt
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/EGG-INFO/dependency_links.txt
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/EGG-INFO/entry_points.txt
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/EGG-INFO/not-zip-safe
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/EGG-INFO/requires.txt
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/EGG-INFO/top_level.txt
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/_distutils_hack
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/_distutils_hack/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/_distutils_hack/override.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/__init__.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/appdirs.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/__about__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/_manylinux.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/_musllinux.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/_structures.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/markers.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/requirements.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/specifiers.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/tags.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/utils.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/version.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/pyparsing.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/extern
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/extern/__init__.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/tests
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/tests/data
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/tests/data/my-test-package-source
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/tests/data/my-test-package-source/setup.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_deprecation_warning.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/_msvccompiler.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/archive_util.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/bcppcompiler.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/ccompiler.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/cmd.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/bdist.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/bdist_dumb.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/bdist_msi.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/bdist_rpm.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/bdist_wininst.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/build.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/build_clib.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/build_ext.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/build_py.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/build_scripts.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/check.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/clean.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/config.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/install.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/install_data.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/install_egg_info.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/install_headers.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/install_lib.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/install_scripts.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/py37compat.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/register.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/sdist.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/upload.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/config.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/core.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/cygwinccompiler.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/debug.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/dep_util.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/dir_util.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/dist.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/errors.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/extension.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/fancy_getopt.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/file_util.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/filelist.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/log.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/msvc9compiler.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/msvccompiler.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/py35compat.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/py38compat.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/spawn.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/sysconfig.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/text_file.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/unixccompiler.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/util.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/version.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/versionpredicate.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_imp.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/more_itertools
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/more_itertools/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/more_itertools/more.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/more_itertools/recipes.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/ordered_set.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/__about__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/_manylinux.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/_musllinux.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/_structures.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/markers.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/requirements.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/specifiers.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/tags.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/utils.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/version.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/pyparsing.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/archive_util.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/build_meta.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/cli-32.exe
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/cli-64.exe
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/cli-arm64.exe
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/cli.exe
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/alias.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/bdist_egg.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/bdist_rpm.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/build_clib.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/build_ext.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/build_py.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/develop.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/dist_info.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/easy_install.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/egg_info.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/install.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/install_egg_info.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/install_lib.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/install_scripts.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/launcher
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/EGG-INFO
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/EGG-INFO/PKG-INFO
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/EGG-INFO/SOURCES.txt
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/EGG-INFO/dependency_links.txt
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/EGG-INFO/entry_points.txt
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/EGG-INFO/not-zip-safe
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/EGG-INFO/requires.txt
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/EGG-INFO/top_level.txt
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/_distutils_hack
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/_distutils_hack/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/_distutils_hack/override.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/__init__.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/appdirs.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/_adapters.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/_common.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/_compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/_itertools.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/_legacy.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/abc.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/readers.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/simple.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/jaraco
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/jaraco/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/jaraco/context.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/jaraco/functools.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/jaraco/text
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/jaraco/text/__init__.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/more_itertools
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/more_itertools/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/more_itertools/more.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/more_itertools/recipes.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/__about__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/_manylinux.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/_musllinux.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/_structures.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/markers.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/requirements.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/specifiers.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/tags.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/utils.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/version.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/pyparsing.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/zipp.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/extern
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/extern/__init__.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_deprecation_warning.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/_collections.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/_macos_compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/_msvccompiler.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/archive_util.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/bcppcompiler.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/ccompiler.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/cmd.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/bdist.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/bdist_dumb.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/bdist_msi.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/bdist_rpm.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/bdist_wininst.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/build.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/build_clib.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/build_ext.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/build_py.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/build_scripts.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/check.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/clean.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/config.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/install.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/install_data.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/install_egg_info.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/install_headers.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/install_lib.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/install_scripts.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/py37compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/register.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/sdist.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/upload.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/config.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/core.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/cygwinccompiler.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/debug.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/dep_util.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/dir_util.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/dist.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/errors.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/extension.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/fancy_getopt.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/file_util.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/filelist.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/log.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/msvc9compiler.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/msvccompiler.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/py35compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/py38compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/spawn.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/sysconfig.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/text_file.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/unixccompiler.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/util.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/version.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/versionpredicate.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_entry_points.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_imp.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_importlib.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_itertools.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_path.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_reqs.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/__init__.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata/_adapters.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata/_collections.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata/_compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata/_functools.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata/_itertools.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata/_meta.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata/_text.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/_adapters.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/_common.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/_compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/_itertools.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/_legacy.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/abc.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/readers.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/simple.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/jaraco
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/jaraco/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/jaraco/context.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/jaraco/functools.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/jaraco/text
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/jaraco/text/__init__.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/more_itertools
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/more_itertools/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/more_itertools/more.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/more_itertools/recipes.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/nspektr
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/nspektr/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/nspektr/_compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/ordered_set.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/__about__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/_manylinux.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/_musllinux.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/_structures.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/markers.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/requirements.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/specifiers.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/tags.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/utils.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/version.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/pyparsing.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/tomli
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/tomli/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/tomli/_parser.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/tomli/_re.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/tomli/_types.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/typing_extensions.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/zipp.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/archive_util.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/build_meta.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/cli-32.exe
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/cli-64.exe
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/cli-arm64.exe
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/cli.exe
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/alias.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/bdist_egg.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/bdist_rpm.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/build_clib.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/build_ext.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/build_py.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/develop.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/dist_info.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/easy_install.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/egg_info.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/install.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/install_egg_info.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/install_lib.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/install_scripts.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/launcher
 #manifest.xml
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/py36compat.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/register.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/rotate.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/saveopts.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/sdist.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/setopt.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/test.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/upload.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/upload_docs.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/config.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/dep_util.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/depends.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/dist.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/errors.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/extension.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/extern
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/extern/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/glob.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/gui-32.exe
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/gui-64.exe
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/gui-arm64.exe
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/gui.exe
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/installer.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/launch.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/monkey.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/msvc.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/namespaces.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/package_index.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/py34compat.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/sandbox.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/script
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/py36compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/register.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/rotate.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/saveopts.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/sdist.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/setopt.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/test.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/upload.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/upload_docs.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/_apply_pyprojecttoml.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/_validate_pyproject
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/_validate_pyproject/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/_validate_pyproject/error_reporting.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/_validate_pyproject/extra_validations.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/_validate_pyproject/fastjsonschema_exceptions.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/_validate_pyproject/fastjsonschema_validations.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/_validate_pyproject/formats.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/expand.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/pyprojecttoml.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/setupcfg.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/dep_util.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/depends.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/discovery.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/dist.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/errors.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/extension.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/extern
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/extern/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/glob.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/gui-32.exe
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/gui-64.exe
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/gui-arm64.exe
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/gui.exe
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/installer.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/launch.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/logging.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/monkey.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/msvc.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/namespaces.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/package_index.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/py34compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/sandbox.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/script
 #(dev).tmpl
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/script.tmpl
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/unicode_utils.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/version.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/wheel.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/windows_support.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/script.tmpl
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/unicode_utils.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/version.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/wheel.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/windows_support.py
 #usr/lib/python3.10/site-packages/setuptools.pth
diff --git a/config/rootfiles/packages/python3-typing-extensions b/config/rootfiles/packages/python3-typing-extensions
index 3cf68834d..fb11f5a4c 100644
--- a/config/rootfiles/packages/python3-typing-extensions
+++ b/config/rootfiles/packages/python3-typing-extensions
@@ -1,6 +1,6 @@
-#usr/lib/python3.10/site-packages/typing_extensions-4.0.1.dist-info
-#usr/lib/python3.10/site-packages/typing_extensions-4.0.1.dist-info/LICENSE
-#usr/lib/python3.10/site-packages/typing_extensions-4.0.1.dist-info/METADATA
-#usr/lib/python3.10/site-packages/typing_extensions-4.0.1.dist-info/RECORD
-#usr/lib/python3.10/site-packages/typing_extensions-4.0.1.dist-info/WHEEL
+#usr/lib/python3.10/site-packages/typing_extensions-4.1.1.dist-info
+#usr/lib/python3.10/site-packages/typing_extensions-4.1.1.dist-info/LICENSE
+#usr/lib/python3.10/site-packages/typing_extensions-4.1.1.dist-info/METADATA
+#usr/lib/python3.10/site-packages/typing_extensions-4.1.1.dist-info/RECORD
+#usr/lib/python3.10/site-packages/typing_extensions-4.1.1.dist-info/WHEEL
 usr/lib/python3.10/site-packages/typing_extensions.py
diff --git a/config/rootfiles/packages/python3-urllib3 b/config/rootfiles/packages/python3-urllib3
index 9a76302cb..5d486273e 100644
--- a/config/rootfiles/packages/python3-urllib3
+++ b/config/rootfiles/packages/python3-urllib3
@@ -1,10 +1,10 @@
 usr/lib/python3.10/site-packages/urllib3
-#usr/lib/python3.10/site-packages/urllib3-1.26.7-py3.10.egg-info
-#usr/lib/python3.10/site-packages/urllib3-1.26.7-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/urllib3-1.26.7-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/urllib3-1.26.7-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/urllib3-1.26.7-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/urllib3-1.26.7-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/urllib3-1.26.9-py3.10.egg-info
+#usr/lib/python3.10/site-packages/urllib3-1.26.9-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/urllib3-1.26.9-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/urllib3-1.26.9-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/urllib3-1.26.9-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/urllib3-1.26.9-py3.10.egg-info/top_level.txt
 #usr/lib/python3.10/site-packages/urllib3/__init__.py
 #usr/lib/python3.10/site-packages/urllib3/_collections.py
 #usr/lib/python3.10/site-packages/urllib3/_version.py
@@ -31,9 +31,6 @@ usr/lib/python3.10/site-packages/urllib3
 #usr/lib/python3.10/site-packages/urllib3/packages/backports/__init__.py
 #usr/lib/python3.10/site-packages/urllib3/packages/backports/makefile.py
 #usr/lib/python3.10/site-packages/urllib3/packages/six.py
-#usr/lib/python3.10/site-packages/urllib3/packages/ssl_match_hostname
-#usr/lib/python3.10/site-packages/urllib3/packages/ssl_match_hostname/__init__.py
-#usr/lib/python3.10/site-packages/urllib3/packages/ssl_match_hostname/_implementation.py
 #usr/lib/python3.10/site-packages/urllib3/poolmanager.py
 #usr/lib/python3.10/site-packages/urllib3/request.py
 #usr/lib/python3.10/site-packages/urllib3/response.py
@@ -46,6 +43,7 @@ usr/lib/python3.10/site-packages/urllib3
 #usr/lib/python3.10/site-packages/urllib3/util/response.py
 #usr/lib/python3.10/site-packages/urllib3/util/retry.py
 #usr/lib/python3.10/site-packages/urllib3/util/ssl_.py
+#usr/lib/python3.10/site-packages/urllib3/util/ssl_match_hostname.py
 #usr/lib/python3.10/site-packages/urllib3/util/ssltransport.py
 #usr/lib/python3.10/site-packages/urllib3/util/timeout.py
 #usr/lib/python3.10/site-packages/urllib3/util/url.py
diff --git a/config/rootfiles/packages/tshark b/config/rootfiles/packages/tshark
index f46d7ba01..937ddd3d6 100644
--- a/config/rootfiles/packages/tshark
+++ b/config/rootfiles/packages/tshark
@@ -44,6 +44,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/crc32-tvb.h
 #usr/include/wireshark/epan/crc6-tvb.h
 #usr/include/wireshark/epan/crc8-tvb.h
+#usr/include/wireshark/epan/dccpservicecodes.h
 #usr/include/wireshark/epan/decode_as.h
 #usr/include/wireshark/epan/dfilter
 #usr/include/wireshark/epan/dfilter/dfilter.h
@@ -51,6 +52,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/diam_dict.h
 #usr/include/wireshark/epan/disabled_protos.h
 #usr/include/wireshark/epan/dissectors
+#usr/include/wireshark/epan/dissectors/cond_ace_token_enum.h
 #usr/include/wireshark/epan/dissectors/file-rbm.h
 #usr/include/wireshark/epan/dissectors/packet-6lowpan.h
 #usr/include/wireshark/epan/dissectors/packet-a21.h
@@ -61,10 +63,12 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-adb_service.h
 #usr/include/wireshark/epan/dissectors/packet-afp.h
 #usr/include/wireshark/epan/dissectors/packet-alcap.h
+#usr/include/wireshark/epan/dissectors/packet-amp.h
 #usr/include/wireshark/epan/dissectors/packet-ansi_a.h
 #usr/include/wireshark/epan/dissectors/packet-ansi_map.h
 #usr/include/wireshark/epan/dissectors/packet-ansi_tcap.h
 #usr/include/wireshark/epan/dissectors/packet-arp.h
+#usr/include/wireshark/epan/dissectors/packet-asap+enrp-common.h
 #usr/include/wireshark/epan/dissectors/packet-atalk.h
 #usr/include/wireshark/epan/dissectors/packet-atm.h
 #usr/include/wireshark/epan/dissectors/packet-atn-ulcs.h
@@ -75,12 +79,16 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-bgp.h
 #usr/include/wireshark/epan/dissectors/packet-bicc_mst.h
 #usr/include/wireshark/epan/dissectors/packet-bluetooth.h
+#usr/include/wireshark/epan/dissectors/packet-bpsec.h
+#usr/include/wireshark/epan/dissectors/packet-bpv6.h
+#usr/include/wireshark/epan/dissectors/packet-bpv7.h
 #usr/include/wireshark/epan/dissectors/packet-bssap.h
 #usr/include/wireshark/epan/dissectors/packet-bssgp.h
 #usr/include/wireshark/epan/dissectors/packet-btatt.h
 #usr/include/wireshark/epan/dissectors/packet-btavctp.h
 #usr/include/wireshark/epan/dissectors/packet-btavdtp.h
 #usr/include/wireshark/epan/dissectors/packet-btavrcp.h
+#usr/include/wireshark/epan/dissectors/packet-btbredr_rf.h
 #usr/include/wireshark/epan/dissectors/packet-bthci_acl.h
 #usr/include/wireshark/epan/dissectors/packet-bthci_cmd.h
 #usr/include/wireshark/epan/dissectors/packet-bthci_evt.h
@@ -102,6 +110,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-cmp.h
 #usr/include/wireshark/epan/dissectors/packet-cms.h
 #usr/include/wireshark/epan/dissectors/packet-coap.h
+#usr/include/wireshark/epan/dissectors/packet-cose.h
 #usr/include/wireshark/epan/dissectors/packet-credssp.h
 #usr/include/wireshark/epan/dissectors/packet-crmf.h
 #usr/include/wireshark/epan/dissectors/packet-csn1.h
@@ -132,10 +141,10 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-disp.h
 #usr/include/wireshark/epan/dissectors/packet-dns.h
 #usr/include/wireshark/epan/dissectors/packet-docsis-tlv.h
+#usr/include/wireshark/epan/dissectors/packet-doip.h
 #usr/include/wireshark/epan/dissectors/packet-dop.h
 #usr/include/wireshark/epan/dissectors/packet-dsp.h
 #usr/include/wireshark/epan/dissectors/packet-dtls.h
-#usr/include/wireshark/epan/dissectors/packet-dtn.h
 #usr/include/wireshark/epan/dissectors/packet-dvbci.h
 #usr/include/wireshark/epan/dissectors/packet-e164.h
 #usr/include/wireshark/epan/dissectors/packet-e1ap.h
@@ -162,6 +171,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-fcswils.h
 #usr/include/wireshark/epan/dissectors/packet-ff.h
 #usr/include/wireshark/epan/dissectors/packet-fix.h
+#usr/include/wireshark/epan/dissectors/packet-flexray.h
 #usr/include/wireshark/epan/dissectors/packet-fmp.h
 #usr/include/wireshark/epan/dissectors/packet-frame.h
 #usr/include/wireshark/epan/dissectors/packet-ftam.h
@@ -220,6 +230,8 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-isis-clv.h
 #usr/include/wireshark/epan/dissectors/packet-isis.h
 #usr/include/wireshark/epan/dissectors/packet-isl.h
+#usr/include/wireshark/epan/dissectors/packet-iso10681.h
+#usr/include/wireshark/epan/dissectors/packet-iso15765.h
 #usr/include/wireshark/epan/dissectors/packet-isup.h
 #usr/include/wireshark/epan/dissectors/packet-its.h
 #usr/include/wireshark/epan/dissectors/packet-iwarp-ddp-rdmap.h
@@ -237,6 +249,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-lcsap.h
 #usr/include/wireshark/epan/dissectors/packet-ldap.h
 #usr/include/wireshark/epan/dissectors/packet-ldp.h
+#usr/include/wireshark/epan/dissectors/packet-lin.h
 #usr/include/wireshark/epan/dissectors/packet-link16.h
 #usr/include/wireshark/epan/dissectors/packet-lisp.h
 #usr/include/wireshark/epan/dissectors/packet-llc.h
@@ -274,6 +287,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-nisplus.h
 #usr/include/wireshark/epan/dissectors/packet-nlm.h
 #usr/include/wireshark/epan/dissectors/packet-nr-rrc.h
+#usr/include/wireshark/epan/dissectors/packet-nrppa.h
 #usr/include/wireshark/epan/dissectors/packet-nsh.h
 #usr/include/wireshark/epan/dissectors/packet-ntlmssp.h
 #usr/include/wireshark/epan/dissectors/packet-ntp.h
@@ -292,6 +306,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-pcnfsd.h
 #usr/include/wireshark/epan/dissectors/packet-pdcp-lte.h
 #usr/include/wireshark/epan/dissectors/packet-pdcp-nr.h
+#usr/include/wireshark/epan/dissectors/packet-pdu-transport.h
 #usr/include/wireshark/epan/dissectors/packet-per.h
 #usr/include/wireshark/epan/dissectors/packet-pkcs1.h
 #usr/include/wireshark/epan/dissectors/packet-pkcs12.h
@@ -334,7 +349,6 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-rtcp.h
 #usr/include/wireshark/epan/dissectors/packet-rtp-events.h
 #usr/include/wireshark/epan/dissectors/packet-rtp.h
-#usr/include/wireshark/epan/dissectors/packet-rtps.h
 #usr/include/wireshark/epan/dissectors/packet-rtse.h
 #usr/include/wireshark/epan/dissectors/packet-rtsp.h
 #usr/include/wireshark/epan/dissectors/packet-rx.h
@@ -367,6 +381,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-smrse.h
 #usr/include/wireshark/epan/dissectors/packet-snmp.h
 #usr/include/wireshark/epan/dissectors/packet-socketcan.h
+#usr/include/wireshark/epan/dissectors/packet-someip.h
 #usr/include/wireshark/epan/dissectors/packet-spice.h
 #usr/include/wireshark/epan/dissectors/packet-sprt.h
 #usr/include/wireshark/epan/dissectors/packet-sscop.h
@@ -380,6 +395,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-tacacs.h
 #usr/include/wireshark/epan/dissectors/packet-tcap.h
 #usr/include/wireshark/epan/dissectors/packet-tcp.h
+#usr/include/wireshark/epan/dissectors/packet-tcpclv3.h
 #usr/include/wireshark/epan/dissectors/packet-tetra.h
 #usr/include/wireshark/epan/dissectors/packet-thrift.h
 #usr/include/wireshark/epan/dissectors/packet-tls-utils.h
@@ -391,6 +407,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-tte.h
 #usr/include/wireshark/epan/dissectors/packet-ua.h
 #usr/include/wireshark/epan/dissectors/packet-uaudp.h
+#usr/include/wireshark/epan/dissectors/packet-uavcan-dsdl.h
 #usr/include/wireshark/epan/dissectors/packet-ubertooth.h
 #usr/include/wireshark/epan/dissectors/packet-udp.h
 #usr/include/wireshark/epan/dissectors/packet-umts_fp.h
@@ -478,6 +495,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/packet.h
 #usr/include/wireshark/epan/packet_info.h
 #usr/include/wireshark/epan/params.h
+#usr/include/wireshark/epan/pci-ids.h
 #usr/include/wireshark/epan/plugin_if.h
 #usr/include/wireshark/epan/ppptypes.h
 #usr/include/wireshark/epan/prefs-int.h
@@ -522,27 +540,12 @@ usr/bin/tshark
 #usr/include/wireshark/epan/uat.h
 #usr/include/wireshark/epan/unit_strings.h
 #usr/include/wireshark/epan/value_string.h
-#usr/include/wireshark/epan/wmem
-#usr/include/wireshark/epan/wmem/wmem.h
-#usr/include/wireshark/epan/wmem/wmem_array.h
-#usr/include/wireshark/epan/wmem/wmem_core.h
-#usr/include/wireshark/epan/wmem/wmem_interval_tree.h
-#usr/include/wireshark/epan/wmem/wmem_list.h
-#usr/include/wireshark/epan/wmem/wmem_map.h
-#usr/include/wireshark/epan/wmem/wmem_miscutl.h
-#usr/include/wireshark/epan/wmem/wmem_queue.h
-#usr/include/wireshark/epan/wmem/wmem_scopes.h
-#usr/include/wireshark/epan/wmem/wmem_stack.h
-#usr/include/wireshark/epan/wmem/wmem_strbuf.h
-#usr/include/wireshark/epan/wmem/wmem_strutl.h
-#usr/include/wireshark/epan/wmem/wmem_tree.h
-#usr/include/wireshark/epan/wmem/wmem_user_cb.h
+#usr/include/wireshark/epan/wmem_scopes.h
+#usr/include/wireshark/epan/wscbor.h
 #usr/include/wireshark/epan/x264_prt_id.h
 #usr/include/wireshark/epan/xdlc.h
 #usr/include/wireshark/file.h
 #usr/include/wireshark/globals.h
-#usr/include/wireshark/log.h
-#usr/include/wireshark/version_info.h
 #usr/include/wireshark/wiretap
 #usr/include/wireshark/wiretap/file_wrappers.h
 #usr/include/wireshark/wiretap/merge.h
@@ -550,13 +553,16 @@ usr/bin/tshark
 #usr/include/wireshark/wiretap/pcapng_module.h
 #usr/include/wireshark/wiretap/secrets-types.h
 #usr/include/wireshark/wiretap/wtap.h
+#usr/include/wireshark/wiretap/wtap_modules.h
 #usr/include/wireshark/wiretap/wtap_opttypes.h
 #usr/include/wireshark/ws_attributes.h
 #usr/include/wireshark/ws_compiler_tests.h
 #usr/include/wireshark/ws_diag_control.h
+#usr/include/wireshark/ws_log_defs.h
 #usr/include/wireshark/ws_symbol_export.h
 #usr/include/wireshark/ws_version.h
 #usr/include/wireshark/wsutil
+#usr/include/wireshark/wsutil/802_11-utils.h
 #usr/include/wireshark/wsutil/adler32.h
 #usr/include/wireshark/wsutil/base32.h
 #usr/include/wireshark/wsutil/bits_count_ones.h
@@ -580,9 +586,10 @@ usr/bin/tshark
 #usr/include/wireshark/wsutil/curve25519.h
 #usr/include/wireshark/wsutil/eax.h
 #usr/include/wireshark/wsutil/epochs.h
+#usr/include/wireshark/wsutil/exported_pdu_tlvs.h
 #usr/include/wireshark/wsutil/filesystem.h
-#usr/include/wireshark/wsutil/frequency-utils.h
 #usr/include/wireshark/wsutil/g711.h
+#usr/include/wireshark/wsutil/glib-compat.h
 #usr/include/wireshark/wsutil/inet_addr.h
 #usr/include/wireshark/wsutil/inet_ipv4.h
 #usr/include/wireshark/wsutil/inet_ipv6.h
@@ -595,7 +602,6 @@ usr/bin/tshark
 #usr/include/wireshark/wsutil/os_version_info.h
 #usr/include/wireshark/wsutil/pint.h
 #usr/include/wireshark/wsutil/please_report_bug.h
-#usr/include/wireshark/wsutil/plugins.h
 #usr/include/wireshark/wsutil/pow2.h
 #usr/include/wireshark/wsutil/privileges.h
 #usr/include/wireshark/wsutil/processes.h
@@ -608,25 +614,43 @@ usr/bin/tshark
 #usr/include/wireshark/wsutil/strtoi.h
 #usr/include/wireshark/wsutil/tempfile.h
 #usr/include/wireshark/wsutil/time_util.h
+#usr/include/wireshark/wsutil/to_str.h
 #usr/include/wireshark/wsutil/type_util.h
 #usr/include/wireshark/wsutil/unicode-utils.h
 #usr/include/wireshark/wsutil/utf8_entities.h
+#usr/include/wireshark/wsutil/wmem
+#usr/include/wireshark/wsutil/wmem/wmem.h
+#usr/include/wireshark/wsutil/wmem/wmem_array.h
+#usr/include/wireshark/wsutil/wmem/wmem_core.h
+#usr/include/wireshark/wsutil/wmem/wmem_interval_tree.h
+#usr/include/wireshark/wsutil/wmem/wmem_list.h
+#usr/include/wireshark/wsutil/wmem/wmem_map.h
+#usr/include/wireshark/wsutil/wmem/wmem_miscutl.h
+#usr/include/wireshark/wsutil/wmem/wmem_queue.h
+#usr/include/wireshark/wsutil/wmem/wmem_stack.h
+#usr/include/wireshark/wsutil/wmem/wmem_strbuf.h
+#usr/include/wireshark/wsutil/wmem/wmem_strutl.h
+#usr/include/wireshark/wsutil/wmem/wmem_tree.h
+#usr/include/wireshark/wsutil/wmem/wmem_user_cb.h
+#usr/include/wireshark/wsutil/ws_assert.h
 #usr/include/wireshark/wsutil/ws_cpuid.h
+#usr/include/wireshark/wsutil/ws_getopt.h
 #usr/include/wireshark/wsutil/ws_mempbrk.h
 #usr/include/wireshark/wsutil/ws_mempbrk_int.h
 #usr/include/wireshark/wsutil/ws_pipe.h
-#usr/include/wireshark/wsutil/ws_printf.h
+#usr/include/wireshark/wsutil/ws_roundup.h
 #usr/include/wireshark/wsutil/wsjson.h
+#usr/include/wireshark/wsutil/wslog.h
 #usr/include/wireshark/wsutil/xtea.h
 #usr/lib/libwireshark.so
-usr/lib/libwireshark.so.14
-usr/lib/libwireshark.so.14.0.7
+usr/lib/libwireshark.so.15
+usr/lib/libwireshark.so.15.0.3
 #usr/lib/libwiretap.so
-usr/lib/libwiretap.so.11
-usr/lib/libwiretap.so.11.0.7
+usr/lib/libwiretap.so.12
+usr/lib/libwiretap.so.12.0.3
 #usr/lib/libwsutil.so
-usr/lib/libwsutil.so.12
-usr/lib/libwsutil.so.12.0.0
+usr/lib/libwsutil.so.13
+usr/lib/libwsutil.so.13.1.0
 #usr/lib/pkgconfig/wireshark.pc
 #usr/lib/wireshark
 #usr/lib/wireshark/cmake
@@ -648,81 +672,34 @@ usr/lib/wireshark/extcap/randpktdump
 usr/lib/wireshark/extcap/sshdump
 usr/lib/wireshark/extcap/udpdump
 #usr/lib/wireshark/plugins
-#usr/lib/wireshark/plugins/3.4
-#usr/lib/wireshark/plugins/3.4/codecs
-usr/lib/wireshark/plugins/3.4/codecs/g711.so
-usr/lib/wireshark/plugins/3.4/codecs/g722.so
-usr/lib/wireshark/plugins/3.4/codecs/g726.so
-usr/lib/wireshark/plugins/3.4/codecs/l16mono.so
-usr/lib/wireshark/plugins/3.4/codecs/opus_dec.so
-#usr/lib/wireshark/plugins/3.4/epan
-usr/lib/wireshark/plugins/3.4/epan/ethercat.so
-usr/lib/wireshark/plugins/3.4/epan/gryphon.so
-usr/lib/wireshark/plugins/3.4/epan/irda.so
-usr/lib/wireshark/plugins/3.4/epan/mate.so
-usr/lib/wireshark/plugins/3.4/epan/opcua.so
-usr/lib/wireshark/plugins/3.4/epan/profinet.so
-usr/lib/wireshark/plugins/3.4/epan/stats_tree.so
-usr/lib/wireshark/plugins/3.4/epan/transum.so
-usr/lib/wireshark/plugins/3.4/epan/unistim.so
-usr/lib/wireshark/plugins/3.4/epan/wimax.so
-usr/lib/wireshark/plugins/3.4/epan/wimaxasncp.so
-usr/lib/wireshark/plugins/3.4/epan/wimaxmacphy.so
-#usr/lib/wireshark/plugins/3.4/wiretap
-usr/lib/wireshark/plugins/3.4/wiretap/usbdump.so
-#usr/share/doc/wireshark
-#usr/share/doc/wireshark/androiddump.html
-#usr/share/doc/wireshark/capinfos.html
-#usr/share/doc/wireshark/captype.html
-#usr/share/doc/wireshark/ciscodump.html
-#usr/share/doc/wireshark/dftest.html
-#usr/share/doc/wireshark/dpauxmon.html
-#usr/share/doc/wireshark/dumpcap.html
-#usr/share/doc/wireshark/editcap.html
-#usr/share/doc/wireshark/extcap.html
-#usr/share/doc/wireshark/mergecap.html
-#usr/share/doc/wireshark/randpkt.html
-#usr/share/doc/wireshark/randpktdump.html
-#usr/share/doc/wireshark/rawshark.html
-#usr/share/doc/wireshark/reordercap.html
-#usr/share/doc/wireshark/sshdump.html
-#usr/share/doc/wireshark/text2pcap.html
-#usr/share/doc/wireshark/tshark.html
-#usr/share/doc/wireshark/udpdump.html
-#usr/share/doc/wireshark/wireshark-filter.html
-#usr/share/doc/wireshark/wireshark.html
-#usr/share/man/man1/androiddump.1
-#usr/share/man/man1/capinfos.1
-#usr/share/man/man1/captype.1
-#usr/share/man/man1/ciscodump.1
-#usr/share/man/man1/dftest.1
-#usr/share/man/man1/dpauxmon.1
-#usr/share/man/man1/dumpcap.1
-#usr/share/man/man1/editcap.1
-#usr/share/man/man1/mergecap.1
-#usr/share/man/man1/randpkt.1
-#usr/share/man/man1/randpktdump.1
-#usr/share/man/man1/rawshark.1
-#usr/share/man/man1/reordercap.1
-#usr/share/man/man1/sshdump.1
-#usr/share/man/man1/text2pcap.1
-#usr/share/man/man1/tshark.1
-#usr/share/man/man1/udpdump.1
-#usr/share/man/man1/wireshark.1
-#usr/share/man/man4/extcap.4
-#usr/share/man/man4/wireshark-filter.4
+#usr/lib/wireshark/plugins/3.6
+#usr/lib/wireshark/plugins/3.6/codecs
+usr/lib/wireshark/plugins/3.6/codecs/g711.so
+usr/lib/wireshark/plugins/3.6/codecs/g722.so
+usr/lib/wireshark/plugins/3.6/codecs/g726.so
+usr/lib/wireshark/plugins/3.6/codecs/l16mono.so
+usr/lib/wireshark/plugins/3.6/codecs/opus_dec.so
+#usr/lib/wireshark/plugins/3.6/epan
+usr/lib/wireshark/plugins/3.6/epan/ethercat.so
+usr/lib/wireshark/plugins/3.6/epan/gryphon.so
+usr/lib/wireshark/plugins/3.6/epan/irda.so
+usr/lib/wireshark/plugins/3.6/epan/mate.so
+usr/lib/wireshark/plugins/3.6/epan/opcua.so
+usr/lib/wireshark/plugins/3.6/epan/profinet.so
+usr/lib/wireshark/plugins/3.6/epan/stats_tree.so
+usr/lib/wireshark/plugins/3.6/epan/transum.so
+usr/lib/wireshark/plugins/3.6/epan/unistim.so
+usr/lib/wireshark/plugins/3.6/epan/wimax.so
+usr/lib/wireshark/plugins/3.6/epan/wimaxasncp.so
+usr/lib/wireshark/plugins/3.6/epan/wimaxmacphy.so
+#usr/lib/wireshark/plugins/3.6/wiretap
+usr/lib/wireshark/plugins/3.6/wiretap/usbdump.so
 #usr/share/wireshark
-#usr/share/wireshark/AUTHORS-SHORT
 #usr/share/wireshark/COPYING
-#usr/share/wireshark/androiddump.html
-#usr/share/wireshark/capinfos.html
-#usr/share/wireshark/captype.html
 usr/share/wireshark/cfilters
-#usr/share/wireshark/ciscodump.html
 usr/share/wireshark/colorfilters
 #usr/share/wireshark/dfilter_macros
 usr/share/wireshark/dfilters
-#usr/share/wireshark/dftest.html
 #usr/share/wireshark/diameter
 usr/share/wireshark/diameter/AlcatelLucent.xml
 usr/share/wireshark/diameter/Cisco.xml
@@ -768,13 +745,9 @@ usr/share/wireshark/dtds/smil.dtd
 usr/share/wireshark/dtds/watcherinfo.dtd
 usr/share/wireshark/dtds/xcap-caps.dtd
 usr/share/wireshark/dtds/xcap-error.dtd
-#usr/share/wireshark/dumpcap.html
-#usr/share/wireshark/editcap.html
 usr/share/wireshark/enterprises.tsv
-#usr/share/wireshark/extcap.html
 #usr/share/wireshark/ipmap.html
 #usr/share/wireshark/manuf
-#usr/share/wireshark/mergecap.html
 #usr/share/wireshark/pdml2html.xsl
 #usr/share/wireshark/profiles
 #usr/share/wireshark/profiles/Bluetooth
@@ -996,22 +969,12 @@ usr/share/wireshark/radius/dictionary.yubico
 usr/share/wireshark/radius/dictionary.zeus
 usr/share/wireshark/radius/dictionary.zte
 usr/share/wireshark/radius/dictionary.zyxel
-#usr/share/wireshark/randpkt.html
-#usr/share/wireshark/randpktdump.html
-#usr/share/wireshark/rawshark.html
-#usr/share/wireshark/reordercap.html
 usr/share/wireshark/services
 usr/share/wireshark/smi_modules
-#usr/share/wireshark/sshdump.html
-#usr/share/wireshark/text2pcap.html
 #usr/share/wireshark/tpncp
 usr/share/wireshark/tpncp/tpncp.dat
-#usr/share/wireshark/tshark.html
-#usr/share/wireshark/udpdump.html
 #usr/share/wireshark/wimaxasncp
 usr/share/wireshark/wimaxasncp/dictionary.dtd
 usr/share/wireshark/wimaxasncp/dictionary.xml
-#usr/share/wireshark/wireshark-filter.html
-#usr/share/wireshark/wireshark.html
 usr/share/wireshark/wka
 usr/share/wireshark/ws.css
diff --git a/config/ssh/ssh_config b/config/ssh/ssh_config
index 2e2ee60c3..85c069dda 100644
--- a/config/ssh/ssh_config
+++ b/config/ssh/ssh_config
@@ -5,23 +5,27 @@
 
 # Set some basic hardening options for all connections
 Host *
-        # Disable Roaming as it is known to be vulnerable
+        # Disable undocumented roaming feature as it is known to be vulnerable
         UseRoaming no
 
         # Only use secure crypto algorithms
-        KexAlgorithms curve25519-sha256(a)libssh.org,diffie-hellman-group-exchange-sha256
+        KexAlgorithms sntrup761x25519-sha512(a)openssh.com,curve25519-sha256,curve25519-sha256(a)libssh.org,diffie-hellman-group-exchange-sha256
         Ciphers chacha20-poly1305(a)openssh.com,aes256-gcm(a)openssh.com,aes128-gcm(a)openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
         MACs hmac-sha2-512-etm(a)openssh.com,hmac-sha2-256-etm(a)openssh.com,umac-128-etm(a)openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128(a)openssh.com
 
-        # Always visualise server host keys (but helps to identify key based MITM attacks)
+        # Always visualise server host keys (helps to identify key based MITM attacks)
         VisualHostKey yes
 
         # Use SSHFP (might work on some up-to-date networks) to look up host keys
         VerifyHostKeyDNS yes
 
-        # send keep-alive messages to connected server to avoid broken connections
+        # Send SSH-based keep alive messages to connected server to avoid broken connections
         ServerAliveInterval 10
-        ServerAliveCountMax 6
+        ServerAliveCountMax 30
+
+	# Disable TCP keep alive messages since they can be spoofed and we have SSH-based
+	# keep alive messages enabled; there is no need to do things twice here
+	TCPKeepAlive no
 
         # Ensure only allowed authentication methods are used
         PreferredAuthentications publickey,keyboard-interactive,password
diff --git a/config/ssh/sshd_config b/config/ssh/sshd_config
index bea5cee53..76c9b3eb1 100644
--- a/config/ssh/sshd_config
+++ b/config/ssh/sshd_config
@@ -19,9 +19,8 @@ LoginGraceTime 30s
 # Limit maximum instanctes to prevent DoS
 MaxStartups 5
 
-# Only allow safe crypto algorithms (may break some _very_ outdated clients)
-# See also: https://stribika.github.io/2015/01/04/secure-secure-shell.html
-KexAlgorithms curve25519-sha256(a)libssh.org,diffie-hellman-group-exchange-sha256
+# Only allow safe crypto algorithms
+KexAlgorithms sntrup761x25519-sha512(a)openssh.com,curve25519-sha256,curve25519-sha256(a)libssh.org,diffie-hellman-group-exchange-sha256
 Ciphers chacha20-poly1305(a)openssh.com,aes256-gcm(a)openssh.com,aes128-gcm(a)openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
 MACs hmac-sha2-512-etm(a)openssh.com,hmac-sha2-256-etm(a)openssh.com,umac-128-etm(a)openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128(a)openssh.com
 
@@ -47,11 +46,13 @@ AllowTcpForwarding no
 AllowAgentForwarding no
 PermitOpen none
 
-# Detect broken sessions by sending keep-alive messages to clients via SSH connection
+# Send SSH-based keep alive messages to connected clients to avoid broken connections
 ClientAliveInterval 10
+ClientAliveCountMax 30
 
-# Close unresponsive SSH sessions which fail to answer keep-alive
-ClientAliveCountMax 6
+# Since TCP keep alive messages can be spoofed and we have the SSH-based already,
+# there is no need for this to be enabled as well
+TCPKeepAlive no
 
 # Add support for SFTP
 Subsystem	sftp	/usr/lib/openssh/sftp-server
diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi
old mode 100755
new mode 100644
diff --git a/html/cgi-bin/captive/index.cgi b/html/cgi-bin/captive/index.cgi
old mode 100755
new mode 100644
diff --git a/html/cgi-bin/captive/redirect.cgi b/html/cgi-bin/captive/redirect.cgi
old mode 100755
new mode 100644
diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi
old mode 100755
new mode 100644
diff --git a/html/cgi-bin/logs.cgi/ovpnclients.dat b/html/cgi-bin/logs.cgi/ovpnclients.dat
old mode 100755
new mode 100644
diff --git a/html/cgi-bin/mail.cgi b/html/cgi-bin/mail.cgi
old mode 100755
new mode 100644
diff --git a/html/cgi-bin/netother.cgi b/html/cgi-bin/netother.cgi
old mode 100755
new mode 100644
diff --git a/html/cgi-bin/netovpnrw.cgi b/html/cgi-bin/netovpnrw.cgi
old mode 100755
new mode 100644
diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi
old mode 100755
new mode 100644
diff --git a/html/html/clwarn.cgi b/html/html/clwarn.cgi
old mode 100755
new mode 100644
diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl
index d74c962e4..f2b8e9925 100644
--- a/html/html/themes/ipfire/include/functions.pl
+++ b/html/html/themes/ipfire/include/functions.pl
@@ -31,8 +31,6 @@
 # IPFire default theme.                                                       #
 ###############################################################################
 
-require "${General::swroot}/lang.pl";
-
 ###############################################################################
 #
 # print menu html elements for submenu entries
@@ -101,20 +99,15 @@ sub openpage {
 	my $title = shift;
 	my $boh = shift;
 	my $extrahead = shift;
-	my $suppressMenu = shift;
+	my $suppressMenu = shift // 0;
 	my @tmp = split(/\./, basename($0));
 	my $scriptName = @tmp[0];
 
-	@URI=split ('\?',  $ENV{'REQUEST_URI'} );
-	&General::readhash("${swroot}/main/settings", \%settings);
-	&genmenu();
-
 	my $headline = "IPFire";
 	if (($settings{'WINDOWWITHHOSTNAME'} eq 'on') || ($settings{'WINDOWWITHHOSTNAME'} eq '')) {
 		$headline =  "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}";
 	}
 
-
 print <<END;
 <!DOCTYPE html>
 <html>
@@ -165,7 +158,10 @@ print <<END
 END
 ;
 
-&showmenu() if ($suppressMenu != 1);
+unless($suppressMenu) {
+	&genmenu();
+	&showmenu();
+}
 
 print <<END
 	<div class="bigbox fixed">
@@ -270,5 +266,3 @@ sub openbox {
 sub closebox {
 	print "</div>";
 }
-
-1;
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 6094c191a..1145745e0 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -2874,7 +2874,6 @@
 'vpn start action start' => 'Immer An',
 'vpn statistic n2n' => 'OpenVPN: Netz-zu-Netz-Statistik',
 'vpn statistic rw' => 'OpenVPN: Roadwarrior-Statistik',
-'vpn statistics n2n' => 'OpenVPN: Netz-zu-Netz-Statistiken',
 'vpn subjectaltname' => 'SubjectAlternativeName',
 'vpn subjectaltname missing' => 'SubjectAlternativeName darf nicht leer bleiben.',
 'vpn wait' => 'WARTE',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 03fc754df..23c01ddb8 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -2949,7 +2949,6 @@
 'vpn start action start' => 'Toujours démarré',
 'vpn statistic n2n' => 'OpenVPN (site-à-site)',
 'vpn statistic rw' => 'OpenVPN (client nomade)',
-'vpn statistics n2n' => 'OpenVPN (site-à-site)',
 'vpn subjectaltname' => 'Nom de l\'objet',
 'vpn subjectaltname missing' => 'Le nom de l\'objet ne peut être vide.',
 'vpn wait' => 'ATTENTE',
diff --git a/lfs/bind b/lfs/bind
index c558cfa01..e3efc84a1 100644
--- a/lfs/bind
+++ b/lfs/bind
@@ -25,7 +25,7 @@
 
 include Config
 
-VER        = 9.16.27
+VER        = 9.16.28
 
 THISAPP    = bind-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 37b49ce81aa5122493a4feb2bb7be53c5d46ff2ce28456aec31ce1332520a09c10bb2293c736bffe7badbc2bc3d156c05f83367678bd101e17b99ca3ff69bebf
+$(DL_FILE)_BLAKE2 = 55932faa004c2021cd4c3384c14d4a58ca43d5a853602e271b58c9022256a5ec2eb1317168ac07c2b233b19407ddfb8c7f64a50d93169207cb3b4fe535a78afa
 
 install : $(TARGET)
 
diff --git a/lfs/bird b/lfs/bird
index c140aa811..591ccc6a7 100644
--- a/lfs/bird
+++ b/lfs/bird
@@ -26,7 +26,7 @@ include Config
 
 SUMMARY    = The BIRD Internet Routing Daemon
 
-VER        = 2.0.8
+VER        = 2.0.9
 
 THISAPP    = bird-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = bird
-PAK_VER    = 8
+PAK_VER    = 9
 
 DEPS       =
 
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 4b36688ac85967ad8c39d9c37dc717d77b1cb5c3ec44a0cf4e84ff38b8d1710d10653a1333b50cd2ede79fd7f012ec86de0baefc9ac18435693ec5b3e43b8a3a
+$(DL_FILE)_BLAKE2 = 5226058ba8989a28e8151906e194fd3065276034f1304e0e45772b17f3d8095eff6add211320a23418bfb57b2c16c96594fb85345355e3b870d7bfa2cfe119b9
 
 install : $(TARGET)
 
diff --git a/lfs/borgbackup b/lfs/borgbackup
index 9244900bf..bfdc9e3ff 100644
--- a/lfs/borgbackup
+++ b/lfs/borgbackup
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.1.17
+VER        = 1.2.0
 SUMMARY    = Deduplicating backup program with compression and authenticated encryption
 
 THISAPP    = borgbackup-$(VER)
@@ -33,9 +33,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = borgbackup
-PAK_VER    = 10
+PAK_VER    = 11
 
-DEPS       =
+DEPS       = python3-pkgconfig
 
 SERVICES   =
 
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 3ceb51f3c2e4ee4e38495ca0bdef2d5c1b30225afe9a3c9987a82f4a1facd4aa203fb21512e655fbbab400bcbd412ff4aefa80242aa21a579e086d38bf3e1078
+$(DL_FILE)_BLAKE2 = 9e6cb8d85ca196cbdd6baba694bc7987d63f85d2ba0e25f3ac1e59400882fff71e29b04ca218ee78f23daeb52d13547062b0c80bd0d3f5b460b28b4f274d11ec
 
 install : $(TARGET)
 
diff --git a/lfs/dbus b/lfs/dbus
index c854359a0..c816b2c07 100644
--- a/lfs/dbus
+++ b/lfs/dbus
@@ -26,15 +26,15 @@ include Config
 
 SUMMARY    = D-Bus Message Bus System
 
-VER        = 1.12.20
+VER        = 1.14.0
 
 THISAPP    = dbus-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = dbus
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       =
 
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = b467526e7e0281db7b8c7c178469fe006dab29ccb1ea197c02495bd297e8de766230b68ed86c4a7e05dbe09ca30ce941a15e0bf8030fe0df66c04febf0534b3b
+$(DL_FILE)_BLAKE2 = ae0ebc2779e840e2d83f633029f81fba0e35969648dddce0280640dd9bee3f9508aa7fb6aef696d1c4c56d40f91b754941f847525afaee5cc3170ad23a7eddbf
 
 install : $(TARGET)
 
@@ -81,9 +81,12 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_SRC)/dbus*
-	cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
-				     --localstatedir=/var
+	cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure \
+	                    --prefix=/usr \
+	                    --sysconfdir=/etc \
+				        --localstatedir=/var \
+				        --disable-static
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
diff --git a/lfs/efibootmgr b/lfs/efibootmgr
index 9eb9a5304..2b399349c 100644
--- a/lfs/efibootmgr
+++ b/lfs/efibootmgr
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 16
+VER        = 17
 
 THISAPP    = efibootmgr-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 3d09a9d3c4ecd48010315fccae60ab408c0d08e9c734e86a944130ea03e038835fa08745819f5353efbbe36f5017be64faded4b625ef0a0b55d4ca0d612ef232
+$(DL_FILE)_BLAKE2 = a1995a5df74766f762d2eb971fd6095edea8d0a498c9dd1100515866b40c38ae2f299aae51f12767850ec23fbe4709c2c7428dd48755fbec499669b69f6432c9
 
 install : $(TARGET)
 
@@ -72,6 +72,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
+	# Compile fix
+	cd $(DIR_APP) && sed -e '/extern int efi_set_verbose/d' -i src/efibootmgr.c
+
 	cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
 		EFIDIR=$(SNAME) $(MAKETUNING)
 	cd $(DIR_APP) && make install EFIDIR=$(SNAME)
diff --git a/lfs/expat b/lfs/expat
index 244139682..76f5a8e94 100644
--- a/lfs/expat
+++ b/lfs/expat
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.4.6
+VER        = 2.4.8
 
 THISAPP    = expat-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 4f41b019107f1dfc5d1b45fd5844069472e5ad2e5208ef5d7b9e4a9bdb020440d46c5ef1c7cc34fb846fc1f63b37b5ac57b692dfdcb59e52c94383945b0f456d
+$(DL_FILE)_BLAKE2 = a829bd94d2cc9b305874ae2539dd4388ea99eaed21d2da17bbd99a1e7735b0f7cb910d096f72c71b128dcb8ffdff9021109e7ff5e562d8cefad228fd8d66f897
 
 install : $(TARGET)
 
diff --git a/lfs/knot b/lfs/knot
index e3a9924d4..0c0c033c0 100644
--- a/lfs/knot
+++ b/lfs/knot
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.1.1
+VER        = 3.1.7
 
 THISAPP    = knot-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = d6f9d29de153b5bdea8a294ae3d65131a0bdcc339ecdc507a9e1429a9cc50752e91f14ea84a7446de76869c6f129d571e9b6b4f9b048618941c4f4c0d667dbff
+$(DL_FILE)_BLAKE2 = d0e5c999c1b4bca89b86ad956dd91643f795fcba94757e34c44e3e6b925030c332da9cb0bfd72d6ae0f32b3016a8c50d821cfcc513268682dd6b5715714d9047
 
 install : $(TARGET)
 
diff --git a/lfs/libart b/lfs/libart
deleted file mode 100644
index b5f463683..000000000
--- a/lfs/libart
+++ /dev/null
@@ -1,78 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 2.3.21
-
-THISAPP    = libart_lgpl-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = 581fbe3b0c52e69543eebb244f9a49046437d907d498aff1fddead24930f7e33067c7ea657917860a1171251b77b09b9520244a2216122c28bf83a71dcb3128b
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
-	@$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && ./configure --prefix=/usr
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make install
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/libdnet b/lfs/libdnet
deleted file mode 100644
index 073685791..000000000
--- a/lfs/libdnet
+++ /dev/null
@@ -1,80 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 1.14
-
-THISAPP    = libdnet-libdnet-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = 97e241fc374fc9489e70d440db5e19199f4e653650af85e24af56bbbc0167db1c451349c43fcb630a26c61f8ca15c58f5c879e0d82654e275189ca3e140bb22a
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
-	@$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && ./configure \
-			--prefix=/usr \
-			--disable-static
-	cd $(DIR_APP) && make
-	cd $(DIR_APP) && make install
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/libevent b/lfs/libevent
deleted file mode 100644
index 7a043a6ed..000000000
--- a/lfs/libevent
+++ /dev/null
@@ -1,78 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 1.4.14b-stable
-
-THISAPP    = libevent-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = e4d5c6ff7b479544bf583b8e40c3273237f6d3e0acd07b73b6aebeaac670198d1f9ad269429afc985a488f7ce14343788d7d9bcb78de617d8781bed09de48856
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
-	@$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && ./configure --prefix=/usr
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make install
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/libgcrypt b/lfs/libgcrypt
index 04ced7775..bf81a0645 100644
--- a/lfs/libgcrypt
+++ b/lfs/libgcrypt
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.9.4
+VER        = 1.10.1
 
 THISAPP    = libgcrypt-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = b8244bc12a68955797b0c2b474ac5c95df1014231f7180a2ffa113e3aacedc98eed60ee1e4b30b032a5fcd6a04855ae07142c223906d5db9c28328a71e014f33
+$(DL_FILE)_BLAKE2 = 46f30459891183b6d9ec18f1c7907fee0ad156c7dd75044f3db2b4d1c19dc6f30b2dfa6f85bc82adc9243aaba913e40fb6faf77d2226ca5a33897220d032437a
 
 install : $(TARGET)
 
diff --git a/lfs/libhtp b/lfs/libhtp
index 3dad9955b..ffc82f8cd 100644
--- a/lfs/libhtp
+++ b/lfs/libhtp
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.5.39
+VER        = 0.5.40
 
 THISAPP    = libhtp-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = fec9e2b0dd867becde972e9e2bf572a21d90acc747a8ee8338e2fe68240d690706db01b12c3cf8c6bf1b5d4415da4e4a5bf92a056e1dff96f54a9ac569906712
+$(DL_FILE)_BLAKE2 = 37239d8d0afb6841c54bab1669a17ec7336b10998f8835ef91cf9556dd7449991ce6fb04a408d16b431ba6327b32f6f509a79a4c79ffc6e88e555fcf2e9f2cce
 
 install : $(TARGET)
 
diff --git a/lfs/libmnl b/lfs/libmnl
index 72273e3aa..9a96cdb7c 100644
--- a/lfs/libmnl
+++ b/lfs/libmnl
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.0.4
+VER        = 1.0.5
 
 THISAPP    = libmnl-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = e24ae3e7a8bcfe35a04256c495bb3e9a5ec41b6bea9b7ffa0a8ebc82ce847921d4a44e5be3558239fee5008c10541a9ac3614d1a6b80d280b632a76da16be5e8
+$(DL_FILE)_BLAKE2 = 760ec6f7eaf3f2c6be6edf848551e4c7d16ae7cbe49f9cde297f5df06174fb7f9f490118942225558f0a89dabe9a4901c1b3b23fa1203132e36b86e6332564d6
 
 install : $(TARGET)
 
diff --git a/lfs/libnfnetlink b/lfs/libnfnetlink
index 38f9cdc10..f5a15d5c3 100644
--- a/lfs/libnfnetlink
+++ b/lfs/libnfnetlink
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.0.1
+VER        = 1.0.2
 
 THISAPP    = libnfnetlink-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 18d6f702afffa1bf2cb6978426f4a1aeab8692a288686c099eb7dfabff23648b4b0f1ac14b4661f16e3d50b6e7d29090d58ce715dac107acb12648e93c5df4f3
+$(DL_FILE)_BLAKE2 = 81c954f6ca2738b321e9319d20741aa15376e88e5f7a0ce1cfa2b02cd104f98d020ab6206bfbc79fc66655f8e40a17bfb65cbce0b1684d9373b809de5a433fc4
 
 install : $(TARGET)
 
diff --git a/lfs/libnl b/lfs/libnl
deleted file mode 100644
index 61b458cac..000000000
--- a/lfs/libnl
+++ /dev/null
@@ -1,80 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 1.1.4
-
-THISAPP    = libnl-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = e6466e15db17fe4725674d77c6cdcefac73e51346f6f4378bc3ea8409c1534519cc28f1123c8201e78f6b95254701a2f9591f907b3cc597ac1210fd3f8b832ea
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-dist:
-	@$(PAK)
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
-	@$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make install
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/libsolv b/lfs/libsolv
deleted file mode 100644
index d6efc6488..000000000
--- a/lfs/libsolv
+++ /dev/null
@@ -1,104 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info(a)ipfire.org>                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-SUMMARY    = Package dependency solver using a satisfiability algorithm
-
-VER        = 0.7.19
-
-THISAPP    = libsolv-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-PROG       = libsolv
-DEPS       =
-PAK_VER    = 4
-
-SERVICES   =
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = 32fa800eb3d6ff764499816af9cff3c11210e3845ed28902ee3c2865b4842df1db2a659e1453ac1f7541e6188e264e943b8271465bef0a78a3a982a112b0c58c
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-dist :
-	@$(PAK)
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
-	@$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-
-	# Who releases code with -Werror?
-	cd $(DIR_APP) && sed -e "s/-Werror//g" -i CMakeLists.txt
-
-	# Disable bindings, examples and tools.
-	cd $(DIR_APP) && sed "/bindings/d" -i CMakeLists.txt
-	cd $(DIR_APP) && sed "/examples/d" -i CMakeLists.txt
-	cd $(DIR_APP) && sed "/tools/d" -i CMakeLists.txt
-
-	cd $(DIR_APP) && mkdir build
-	cd $(DIR_APP)/build && cmake .. \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=1 \
-		-DENABLE_PERL=0 \
-		-DENABLE_PYTHON=0 \
-		-DENABLE_RUBY=0
-	cd $(DIR_APP)/build && make $(PARALELLISMFLAGS)
-	cd $(DIR_APP)/build && make install
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/lynis b/lfs/lynis
index c2fa262b0..bc6b29297 100644
--- a/lfs/lynis
+++ b/lfs/lynis
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -26,7 +26,7 @@ include Config
 
 SUMMARY    = Security and System auditing tool
 
-VER        = 3.0.6
+VER        = 3.0.7
 
 THISAPP    = lynis-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -35,7 +35,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 PROG       = lynis
-PAK_VER    = 10
+PAK_VER    = 11
 
 DEPS       =
 
@@ -49,7 +49,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 49abad8af63e4eeb3585a241d34433f85f84719a0bbd0c2c1f87a2ab45fc0f88193236f3b10261a59e1c6efd9352134a29b8f311c5a5a749eccede2c8353c6e7
+$(DL_FILE)_BLAKE2 = d9cddcba9c83ddee08ea38c8e80bf6f0a78179ad102673a876a1fe3d4544612e945d8637a8d026ce7bff72b09d6274223031e1cb6fc74596b2c65f0380fecd67
 
 install : $(TARGET)
 
diff --git a/lfs/mc b/lfs/mc
index 36d60b416..5c77e544d 100644
--- a/lfs/mc
+++ b/lfs/mc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -26,7 +26,7 @@ include Config
 
 SUMMARY    = Midnight Commander
 
-VER        = 4.8.27
+VER        = 4.8.28
 
 THISAPP    = mc-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mc
-PAK_VER    = 22
+PAK_VER    = 23
 
 DEPS       =
 
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = efb0f3a8beb7285a793085a8e3b3a49619d0f8a4babff7de90f7a462cf6c013bbc08b92bc48e2c2e2204799332cd0160a86e201d9368cabde78e653b4306763f
+$(DL_FILE)_BLAKE2 = f4218e6c166df85b7b3736f0fd1414c9507c72074f06001f12b114ce6c6fbbf3688ab850aa70f5063eb3920736f878e113eb39a5d261ccfc3ffa9dab473a8436
 
 install : $(TARGET)
 
diff --git a/lfs/netpbm b/lfs/netpbm
deleted file mode 100644
index 03f537abd..000000000
--- a/lfs/netpbm
+++ /dev/null
@@ -1,99 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info(a)ipfire.org>                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-SUMMARY    = A Graphics Conversion Package
-
-VER        = 10.73.31
-
-THISAPP    = netpbm-$(VER)
-DL_FILE    = $(THISAPP).tgz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = netpbm
-PAK_VER    = 3
-
-DEPS       =
-
-SERVICES   =
-
-CFLAGS    += -flax-vector-conversions
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = 6bac4048e60e1605edb8d65be51c153431b03f305057dd64e4da912633a539d987cc6bda71960799004cc70faf957fa3e504ed6f24b6c3bb8996b90d34529309
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-dist:
-	@$(PAK)
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
-	@$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	rm -rf /usr/netpbm
-	cp $(DIR_SRC)/config/netpbm/config.mk $(DIR_APP)
-	cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" #The build of this version cannot be parallelized
-	cd $(DIR_APP) && make package PKGDIR=/usr/netpbm
-	mkdir -pv /usr/include/netpbm
-	mkdir -pv /usr/share/netpbm
-	mv -fv /usr/netpbm/include/netpbm/* /usr/include/netpbm
-	mv -fv /usr/netpbm/lib/* /usr/lib
-	mv -fv /usr/netpbm/bin/* /usr/bin
-	mv -fv /usr/netpbm/misc/* /usr/share/netpbm
-	rm -Rfv /usr/netpbm/
-	cd /usr/lib && ln -sfv libnetpbm.so.11.73 libnetpbm.so
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/nginx b/lfs/nginx
index bf5ebb1a3..a624ca44e 100644
--- a/lfs/nginx
+++ b/lfs/nginx
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -25,7 +25,7 @@
 include Config
 
 SUMMARY    = A HTTP server and IMAP/POP3 proxy server
-VER        = 1.19.2
+VER        = 1.20.2
 
 THISAPP    = nginx-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG	   = nginx
-PAK_VER	   = 11
+PAK_VER	   = 12
 
 DEPS       =
 
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = db00b5945ed82fe90059269ba987931642981a2b8fa1cb24e0d842b97d89857993f99443c644d9217af29430b868ee8efd90dbc5daefd719d0f98c0766601554
+$(DL_FILE)_BLAKE2 = dc2fb9e7316ccac433c1f06c59d2738358c16194fe0ece80f54d145e2c4e3c3a8d6ebc4badb97580a000d721197a865bcc8c94a4d671af94be4bc3181974c586
 
 install : $(TARGET)
 
diff --git a/lfs/openssh b/lfs/openssh
index 8c958e9fe..302ae6041 100644
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 8.9p1
+VER        = 9.0p1
 
 THISAPP    = openssh-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 02934da7f7a2954141888e63e81e38fad4fb8558ddd1032de44f69684802c62771fdd7e9e470e0715059635999c8f9d2ab95f6351217e236573ead83a867f59b
+$(DL_FILE)_BLAKE2 = 49724a400951964d659d136908657940f79e150056728cc4dadf8ff8652a832f7fd46eebb47b15085e57fca4b00c77d1ec4dd1b056ea2bbcee89f54a121ed5e2
 
 install : $(TARGET)
 
diff --git a/lfs/openvpn b/lfs/openvpn
index 9b2e7853c..27a052ae1 100644
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 2.5.4
+VER        = 2.5.6
 
 THISAPP    = openvpn-$(VER)
-DL_FILE    = $(THISAPP).tar.xz
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = ebc711981ab93da69ba033f3cf1ea1c99e86f700ec98809a3c401d59a6ecf53f977935aafd37df0233a0498762db01bed0555aeb99ab7e7903274e4d78997301
+$(DL_FILE)_BLAKE2 = d0466d2b95dae892606b6369d2c227add1de43fb708bf1c31a3ef78b28fc37382d501cc559767c8c8358ec28b88d3eb80a0eb915d7872ce30757c7080a37fde2
 
 install : $(TARGET)
 
@@ -69,7 +69,7 @@ $(subst %,%_BLAKE2,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure \
 		--prefix=/usr \
 		--sysconfdir=/var/ipfire/ovpn \
diff --git a/lfs/perl-libwww b/lfs/perl-libwww
index b10df97ed..cec71ffca 100644
--- a/lfs/perl-libwww
+++ b/lfs/perl-libwww
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 6.61
+VER        = 6.62
 
 THISAPP    = libwww-perl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 962e81682cad3c12d24d150db4559a133047379aea7f4835d10041591d95cfde2090f5f3fe22750d971524dbae8aaa3c185a5f37f75ad1ce66ba58038164b09c
+$(DL_FILE)_BLAKE2 = 8ffdb0572b161d0f8215978749ef620e83b1f54d404bbb9667e85d51cd81a73fc0904fe9af247602587681e8a9e6faca2cd8b868ea8a3376d2e82ae41b9a27ec
 
 install : $(TARGET)
 
diff --git a/lfs/pigz b/lfs/pigz
deleted file mode 100644
index 7fe9177ef..000000000
--- a/lfs/pigz
+++ /dev/null
@@ -1,80 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 2.6
-
-THISAPP    = pigz-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = 8e1a8ca593896fc947a7d6ffaa71d9be69d347f7cf1ed2f635b8480aa05708f4679a4768cf3a18ac515ea94dd8352dd4158bd3c9d1b6fdebd82ad1b582d04cba
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-dist:
-	@$(PAK)
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
-	@$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" $(MAKETUNING)
-	cd $(DIR_APP) && install -m 755 pigz /usr/bin/pigz
-	ln -svf pigz /usr/bin/unpigz
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/python3-botocore b/lfs/python3-botocore
index e310d2394..cbda1ca52 100644
--- a/lfs/python3-botocore
+++ b/lfs/python3-botocore
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.23.21
+VER        = 1.24.37
 SUMMARY    = Python interface for AWS
 
 THISAPP    = botocore-$(VER)
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-botocore
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = python3-dateutil python3-jmespath python3-urllib3
 
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 18dbd124834a16e5ebf925e8bd1c38ac86a87bbf2c7f10afb2b885833d95bf16893ea287585b3c70d656b888fd59e02b8e1ab4b9eec06d57ba9d1693e1a3fed2
+$(DL_FILE)_BLAKE2 = 5e5495ba399e910479c0172eb4c572a5c0371db720906586c88dc59d8bfc58a50699b05125e1e554a8571b64654604447be1e1a4bfdc2b992272101060638908
 
 install : $(TARGET)
 
diff --git a/lfs/python3-charset-normalizer b/lfs/python3-charset-normalizer
index 1a235915c..ef4feb91c 100644
--- a/lfs/python3-charset-normalizer
+++ b/lfs/python3-charset-normalizer
@@ -24,15 +24,15 @@
 
 include Config
 
-VER        = 2.0.10
+VER        = 2.0.12
 
-THISAPP    = charset_normalizer-$(VER)
+THISAPP    = charset-normalizer-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-charset-normalizer
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       =
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 935af7625c138f8751de60c4179ee6b0195e99366c7bbecd8e9dfdf09ea557e2eb7cb86830321f91b3b7aa3fc1b3cc376266a4c22d23aabc6dfa6b9db57beb45
+$(DL_FILE)_BLAKE2 = 01a7bbc89df0236ea2383589acd76880065c28137eb201cce7795a7ca4b7c2d471f0b16e68c2022b943e1b4cde530e726cffc36112b0b3626ee32904805b76f3
 
 install : $(TARGET)
 
diff --git a/lfs/python3-click b/lfs/python3-click
index e923a8d00..615f5e399 100644
--- a/lfs/python3-click
+++ b/lfs/python3-click
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 8.0.3
+VER        = 8.1.2
 
 THISAPP    = click-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-click
-PAK_VER    = 1
+PAK_VER    = 2
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 9e42e167e26a03b4ddb238943ed5cb4d291231ceb0f56a6e74f9930c8f64f4ae44b0495a85c6abcb2167dc633bbc5e90d1a21da843a799e266e6560a7b3b909d
+$(DL_FILE)_BLAKE2 = e0ac04e4583dadba61ca42640f6d75ade30c62bd46b5fd0d15378e00f102f29160190c8ebb01de637c5446d9d06b687bddba4b78b3b3c80bb6e64ba46df866fa
 
 install : $(TARGET)
 
diff --git a/lfs/python3-flit b/lfs/python3-flit
index c445b623b..36cd59596 100644
--- a/lfs/python3-flit
+++ b/lfs/python3-flit
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.6.0
+VER        = 3.7.1
 
 THISAPP    = flit-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-flit
-PAK_VER    = 1
+PAK_VER    = 2
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = c0f81d1429f9f8a51804c1f13cf936272d7c0fe2ba7a19d477a26b42dbde01c539ca0169ae195e9cbf3ef97764b938b6f3241b48e8a48955e0dadf541a116521
+$(DL_FILE)_BLAKE2 = b94f8bbe00c2c5fb28bddbdcf240255ed53ec3b24d2eab1a33e37261cf32a92a0171ea01ad1488384c15f46acbf84d47c4679b318932a3ee78f22c1d161156b0
 
 install : $(TARGET)
 
diff --git a/lfs/python3-jmespath b/lfs/python3-jmespath
index 3b6fc8d09..f3bb34ff3 100644
--- a/lfs/python3-jmespath
+++ b/lfs/python3-jmespath
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.10.0
+VER        = 1.0.0
 SUMMARY    = Python module for declarative JSON document element extraction
 
 THISAPP    = jmespath-$(VER)
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/jmespath-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-jmespath
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       =
 
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 8d827e61363a8d9e974ab465efd05e50ba9ce7a35e2457b43bbdd33a740c5d40dd8c397767709c4a96e157ec31f2e9388ecaed25191ceb77b0574fb4372d5247
+$(DL_FILE)_BLAKE2 = 579a9b3273fb266ea4974aef7a266d084f00169ee645ec8cebbe9d8e838bd4d69c03e952e84a430d6a47de14ee7c7830fffc07dd049929a05945f23dff43f194
 
 install : $(TARGET)
 
diff --git a/lfs/libpri b/lfs/python3-pkgconfig
similarity index 85%
rename from lfs/libpri
rename to lfs/python3-pkgconfig
index 3236bbff8..a91aca39b 100644
--- a/lfs/libpri
+++ b/lfs/python3-pkgconfig
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,17 +24,16 @@
 
 include Config
 
-SUMMARY    = An implementation of Primary Rate ISDN
+VER        = 1.5.5
+SUMMARY    = Python module to interface Python with pkg-config
 
-VER        = 1.4.10.2
-
-THISAPP    = libpri-$(VER)
+THISAPP    = pkgconfig-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = libpri
-PAK_VER    = 2
+PROG       = python3-pkgconfig
+PAK_VER    = 1
 
 DEPS       =
 
@@ -48,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 62f642ced45c969bf1bc3117110b35e891497de7414da11f622de868188b4b0558194cb39f4bb8941e6229fba1974a4905163f1df92f6f3c25411cf9cfa9b22f
+$(DL_FILE)_BLAKE2 = 0eb3ff11b1fdcd3b1b4d3310d408d5f9a036a48c0f3176d77a13e566df35beea8ee6b3afe4c7643cc1808584e525f4d0fac9ab706b751c933f853ed1e9aecd0e
 
 install : $(TARGET)
 
@@ -59,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 b2 : $(subst %,%_BLAKE2,$(objects))
 
 dist:
-	$(PAK)
+	@$(PAK)
 
 ###############################################################################
 # Downloading, checking, b2sum
@@ -81,8 +80,7 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && make $(MAKETUNING) clean all KVERS=$(KVER) \
-		CFLAGS="$(CFLAGS)"
-	cd $(DIR_APP) && make install KVERS=$(KVER)
+	cd $(DIR_APP) && python3 setup.py build
+	cd $(DIR_APP) && python3 setup.py install --root=/
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/python3-pyparsing b/lfs/python3-pyparsing
index 270466f44..14920ecce 100644
--- a/lfs/python3-pyparsing
+++ b/lfs/python3-pyparsing
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.0.6
+VER        = 3.0.7
 SUMMARY    = Grammar Parser Library for Python
 
 THISAPP    = pyparsing-$(VER)
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-pyparsing
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       =
 
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = bf79fdb20c6dbcec5a79956ed8c68e56edbadd4d71f44a35107dfb0652c1d2ecbc980c95e729f35f94dce5783ad8159848563dadc529d0f4b48a1ce61e12a3aa
+$(DL_FILE)_BLAKE2 = 1f098dd2ae6ffef6f98a44137769198ebad6af1642c1bc784284bedbcd28c617993fb51901d179962ca05f3f8699d24c04b0df5e5e5168a572c0deb506ad4e54
 
 install : $(TARGET)
 
diff --git a/lfs/python3-pytz b/lfs/python3-pytz
index 68b7ad652..5567ce74f 100644
--- a/lfs/python3-pytz
+++ b/lfs/python3-pytz
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2021.3
+VER        = 2022.1
 
 THISAPP    = pytz-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-pytz
-PAK_VER    = 1
+PAK_VER    = 2
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = a5f67650cc4eeaa8030fc7d5b7a66bcc397b95e41b492367981580678e1d535cdb425066d4821d9c5f94e4fd813c669987560030c046fc63ecffa2f46e0c3f89
+$(DL_FILE)_BLAKE2 = 9a745629a9e4547f8c8765353e58baa6d63e3e6b357e9ca88f69928fb9350cebb6bb3371eee419b4b92b29e6253f8c24af8c781f10d72211d78cb699043496fe
 
 install : $(TARGET)
 
diff --git a/lfs/python3-s3transfer b/lfs/python3-s3transfer
index a8b2e459b..3c18becc2 100644
--- a/lfs/python3-s3transfer
+++ b/lfs/python3-s3transfer
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.5.0
+VER        = 0.5.2
 SUMMARY    = Python S3 transfer manager
 
 THISAPP    = s3transfer-$(VER)
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-s3transfer
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       =
 
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 2ce9235fbffc4c42682345873becac6f0d574ac44de523e10178bf7d115b261acbd1753b1a41ca301b72fa96a6a93314572fe12ea4d286a325a0a36e3cf56b36
+$(DL_FILE)_BLAKE2 = 55adab89ca04a9ed1f0195237cab55f97769a8f865e645437df6d95effcf1a27a734f1577daa981261123b681044b540ebbb876e1a8a3b4cf1cf4e5018f2c213
 
 install : $(TARGET)
 
diff --git a/lfs/python3-semantic-version b/lfs/python3-semantic-version
index 2153b0403..8b9979cf4 100644
--- a/lfs/python3-semantic-version
+++ b/lfs/python3-semantic-version
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.8.5
+VER        = 2.9.0
 
 THISAPP    = semantic_version-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-semantic-version
-PAK_VER    = 1
+PAK_VER    = 2
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 5f966ca68358d4963b3a41574c100a8f78275445285aebbfa47d1febb0b7a2eb3a638254d4d1bd8e093acbef47a101ef0a0d7a86475313aefa211d2a0a3cfc19
+$(DL_FILE)_BLAKE2 = c487c49ad17e7ca224ca4b6602abb42d1406dad8d70a3f5d0c536160e5b2d706ff0e1497961e3b9e0391c6d773ab7d0e9699f171f5781cec1d36025450cb7019
 
 install : $(TARGET)
 
diff --git a/lfs/python3-setuptools b/lfs/python3-setuptools
index 992583153..3575a7a77 100644
--- a/lfs/python3-setuptools
+++ b/lfs/python3-setuptools
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 59.5.0
+VER        = 62.0.0
 SUMMARY    = Enhancements to distutils for building and distributing Python packages
 
 THISAPP    = setuptools-$(VER)
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-setuptools
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       =
 
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 51b3435a1d7962a06f7cf07c31487a1404274a54a1fae0567c3953686cbf3b3160327a56c599e80ce70fe8f56dc817fc76d0e4371d3622b5c6235b0fdc555980
+$(DL_FILE)_BLAKE2 = 688afed5a19e70a0fd7ab91a8d137e6641597d9f9acf31826216cd59e4632872a9661fe9ca18e45aec5cd40e52956147aa8d40ac2c376380ffa0f01dc2997e63
 
 install : $(TARGET)
 
diff --git a/lfs/python3-setuptools-rust b/lfs/python3-setuptools-rust
index 8d8b2cc4b..4bf85961c 100644
--- a/lfs/python3-setuptools-rust
+++ b/lfs/python3-setuptools-rust
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.1.2
+VER        = 1.2.0
 
 THISAPP    = setuptools-rust-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 2b66f886db4be992be5f910cd56d1449f0f23d306880755692a53216e6c764bc6ec34e552f5485f444408421ccaeb8cc353d5553cf8a95a1a4daa815f5600167
+$(DL_FILE)_BLAKE2 = 9028e3c02cf1090aaba5c78495d01eb01d3608242ab6b3fab2b76928e199a93bad2e1dbcd94d24689c7d42160c4dd409656f230493801906fc15f4235de7b68c
 
 install : $(TARGET)
 
diff --git a/lfs/python3-setuptools-scm b/lfs/python3-setuptools-scm
index 8e29b2798..561138c0a 100644
--- a/lfs/python3-setuptools-scm
+++ b/lfs/python3-setuptools-scm
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 6.3.2
+VER        = 6.4.2
 SUMMARY    = Python setuptools handler for SCM tags
 
 THISAPP    = setuptools_scm-$(VER)
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-setuptools-scm
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       =
 
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 4291f3810dc5ea111a6bad1bf37c8704a7eb6cdd112ea476d629d6175c43cc7d8f78d450181c0e588a5f3fc0fc092fedb41fcb6e198a42f730f9fc6b8d96e343
+$(DL_FILE)_BLAKE2 = e1b5191425cf5db8334761a6857b0bc39c547c167901cbdf8401af441c5941cd75744162417ff42dbac792ae867d71c7576c5e9e533fe8039a75954f4c2ba439
 
 install : $(TARGET)
 
diff --git a/lfs/python3-tomli b/lfs/python3-tomli
index bfa6e0a3a..d543b69b9 100644
--- a/lfs/python3-tomli
+++ b/lfs/python3-tomli
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.0.0
+VER        = 2.0.1
 
 THISAPP    = tomli-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-tomli
-PAK_VER    = 1
+PAK_VER    = 2
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = b3b17674ed08250e85b3b3b4e57364f201f3c795b6792155a220af5c682eede584aaac02159b5829b70ad7c196036e94d0db1983c7c581b67c574d392026234f
+$(DL_FILE)_BLAKE2 = e0e8b6e73ab39fcc6ec7a29cd4368d66b997e4c48b98a38d43ba813e841f33fef305028425474f67aee931118bbf2f05c147b65af729c34d67834802b6a42ad8
 
 install : $(TARGET)
 
diff --git a/lfs/python3-typing-extensions b/lfs/python3-typing-extensions
index a7686547a..c3b306097 100644
--- a/lfs/python3-typing-extensions
+++ b/lfs/python3-typing-extensions
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.0.1
+VER        = 4.1.1
 
 THISAPP    = typing_extensions-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-typing-extensions
-PAK_VER    = 1
+PAK_VER    = 2
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 66fb0fdb73d434333347b953b6ffb982247f3869a4678f6f6ac6a95cec51bccd2d1109d6e9d9f611786bd3ef144175a1b21a43b5346d5a88c1eb99ad31246528
+$(DL_FILE)_BLAKE2 = 18953565f4181d648faf780db8594963813d0b26d479e5235cd75d262490b479e957f55734bb6d6d22c31fe2ccec1ac5490e7a64a469528d386e5de2751c6b1a
 
 install : $(TARGET)
 
diff --git a/lfs/python3-urllib3 b/lfs/python3-urllib3
index ec43d9cd3..411a52b8d 100644
--- a/lfs/python3-urllib3
+++ b/lfs/python3-urllib3
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.26.7
+VER        = 1.26.9
 SUMMARY   = HTTP library with thread-safe connection pooling, file post, and more
 
 THISAPP    = urllib3-$(VER)
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-urllib3
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       =
 
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 5a95ea4df2e5a66ac7f3059b5453e122ae0e40531a23cb743e5a9574778a370d0cee3cb63fe6b29483b27c4a6ec498266ec5a0434db882ce0a79fb8d8400e08d
+$(DL_FILE)_BLAKE2 = 1c6b51e4243c18c25bcb53158e645ea71fe33e0d09ca029256bcbe05bf178ba600dd8911c71730bdefc3cf9f65cdfd5740f579d17d293f9ac7c5d3cbff478b6f
 
 install : $(TARGET)
 
diff --git a/lfs/rsync b/lfs/rsync
index 7422a5d13..f40c28ce2 100644
--- a/lfs/rsync
+++ b/lfs/rsync
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -26,7 +26,7 @@ include Config
 
 SUMMARY    = Versatile tool for fast incremental file transfer
 
-VER        = 3.2.3
+VER        = 3.2.4
 
 THISAPP    = rsync-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = rsync
-PAK_VER    = 13
+PAK_VER    = 14
 
 DEPS       =
 
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 085adb55d0d7e3d063fa198912fd09df67b63800a65baff5315ccb7dfc0e9d703eef30a7f2e72e3b271162c280abd9809b3f736704752c1663eed65ad8e0ac25
+$(DL_FILE)_BLAKE2 = a67fcb9619874f1c5346a876138e59f4bf508a90736f830fb2b4eaf180ab11f15a0a7db9b3b28c3b990b77c2b0973d8e668bf509e4134f464159ed3172f53d80
 
 install : $(TARGET)
 
diff --git a/lfs/sdparm b/lfs/sdparm
deleted file mode 100644
index d77542db0..000000000
--- a/lfs/sdparm
+++ /dev/null
@@ -1,81 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 1.12
-
-THISAPP    = sdparm-$(VER)
-DL_FILE    = $(THISAPP).tgz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = 8c872967f859763c5d8fc9e086175010c474e2332e82d79da76bfec636e90cbf54256f0b3c046db159e69b0d1ee64595757177901c48db66d2ea77ad53d623d6
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-dist:
-	@$(PAK)
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
-	@$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && ./configure --prefix=/usr
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make install
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/squid b/lfs/squid
index ceaddac86..7b77e568f 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.4.1
+VER        = 5.5
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 3281f592c342b59a1017f4c0829543c857d61c4d1e191461f6e69bda2dc61ff59d5b92a04744dcebb75bd1b5d85c214c1f0bea78a791033a50f29891b6995fb8
+$(DL_FILE)_BLAKE2 = aef52ba0b47098f823d3f2bbe55e015c12b853bcc0a414bc94a4103009a05fee2c33263b8ade9b31cd22068e964d7f37fc0a497877d26ff836bc2193a6d0e8fc
 
 install : $(TARGET)
 
diff --git a/lfs/suricata b/lfs/suricata
index 80e0923d3..4a9dcdb1d 100644
--- a/lfs/suricata
+++ b/lfs/suricata
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.0.8
+VER        = 5.0.9
 
 THISAPP    = suricata-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 5c13aea176b6666477c620d1ed294310ee84ec706abbc740a23d66722297c09b61f253bbe17700cd58f8ce439987c9b13f312aba37d911b6522e4848e7c1b0cd
+$(DL_FILE)_BLAKE2 = 02ab99585233a47b1577e55060ba1141c339718e5bd39b6f4d38bb9384fd459aae353f313083048128507f9023a8bcfea3e5a5bcc9ea0c75cfc9c288ca9db6b6
 
 install : $(TARGET)
 
@@ -70,9 +70,9 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata-disable-sid-2210059.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata-5.0.8-fix-level1-cache-line-size-detection.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata/suricata-disable-sid-2210059.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata/suricata-5.0.8-fix-level1-cache-line-size-detection.patch
 	cd $(DIR_APP) && LDFLAGS="$(LDFLAGS)" ./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
diff --git a/lfs/tshark b/lfs/tshark
index be732c97e..eb89f7474 100644
--- a/lfs/tshark
+++ b/lfs/tshark
@@ -26,7 +26,7 @@ include Config
 
 SUMMARY    = A Network Traffic Analyser
 
-VER        = 3.4.7
+VER        = 3.6.3
 
 THISAPP    = wireshark-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -35,7 +35,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tshark
 DEPS       = krb5 c-ares
-PAK_VER    = 11
+PAK_VER    = 12
 
 SERVICES   =
 
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 0a6112ed667739935417350660e31d64747cb81295db058e0a27c38387b2ed2b9806f8d61925c262d531fb96d87e230d1cd5d511ae0bdba973373835bf5d7bc5
+$(DL_FILE)_BLAKE2 = 3b636867d946f0cf748eb719874e815c919ee9cedd21a7e9034d54b4cb87ae4a09ec02a199e1ec8051e421fe2929983d659f340ccfd12ab35e1ecd52000964fd
 
 install : $(TARGET)
 
diff --git a/lfs/vnstat b/lfs/vnstat
index e4859be0b..a7b28f3fd 100644
--- a/lfs/vnstat
+++ b/lfs/vnstat
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.7
+VER        = 2.9
 
 THISAPP    = vnstat-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = f7b50cccfe4b62bce45751e6029650dc6d8ac7b7925cc4177fb1772c6d842b5201f6834d5e6374016b4c42374660b1c127d5b021adffe873de0a4c484171b6b3
+$(DL_FILE)_BLAKE2 = 1671fe49f3add0087431b57aaa69d4c6280066a299e6899c00cd5bf6ec21380d1457295f884f683ebfb89959eea08a9d900e898a865e3f6ff2a82ecf354d974a
 
 install : $(TARGET)
 
@@ -80,6 +80,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	cd $(DIR_APP) && make all $(MAKETUNING)		LOCAL_CONFIGURE_OPTIONS="--enable-readline=yes"
 	cd $(DIR_APP) && make install
+	sed -i 's|^;||g' /etc/vnstat.conf
 	sed -i 's|SaveInterval 5|SaveInterval 1|g' /etc/vnstat.conf
 	sed -i 's|/var/lib/vnstat|/var/log/vnstat|g' /etc/vnstat.conf
 	sed -i 's|/var/log/vnstat/vnstat.log|/var/log/vnstat.log|g' /etc/vnstat.conf
diff --git a/lfs/whois b/lfs/whois
index 5dee31d4a..19989af36 100644
--- a/lfs/whois
+++ b/lfs/whois
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.5.10
+VER        = 5.5.13
 
 THISAPP    = whois_$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = f3a2c6d0f46f2091ce8e201a1a670d144b4707cd6928a80da76c6b302fb105dab11d7bf90ac8473d40c0da0ad709956ab3d4b9a2db861b7111603b6037593cf3
+$(DL_FILE)_BLAKE2 = 6ce90ad907c4ea79301adbcda5a402344df9f283ac258a3186f5c405e0abfb97f603f3f163652f1cf03a1fc60290b8f9f54b509bf7d9fd3cec12189eeeaaffe5
 
 install : $(TARGET)
 
diff --git a/lfs/wio b/lfs/wio
index a87fa635e..be80cef22 100644
--- a/lfs/wio
+++ b/lfs/wio
@@ -1,6 +1,21 @@
 ###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) 2007-2021  IPFire Team  <info(a)ipfire.org>                     #
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2022  IPFire Team  <info(a)ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -17,7 +32,7 @@ THISAPP    = wio-$(VER)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = wio
-PAK_VER    = 14
+PAK_VER    = 15
 
 DEPS       =
 
diff --git a/make.sh b/make.sh
index 95e6e89db..bf2fce168 100755
--- a/make.sh
+++ b/make.sh
@@ -1204,7 +1204,6 @@ buildipfire() {
   lfsmake2 nettle
   lfsmake2 json-c
   lfsmake2 libconfig
-  lfsmake2 libevent
   lfsmake2 libevent2
   lfsmake2 expat
   lfsmake2 apr
@@ -1318,7 +1317,6 @@ buildipfire() {
   lfsmake2 ca-certificates
   lfsmake2 fireinfo
   lfsmake2 libnet
-  lfsmake2 libnl
   lfsmake2 libnl-3
   lfsmake2 libidn
   lfsmake2 nasm
@@ -1331,7 +1329,6 @@ buildipfire() {
   lfsmake2 libexif
   lfsmake2 libpng
   lfsmake2 libtiff
-  lfsmake2 libart
   lfsmake2 gd
   lfsmake2 slang
   lfsmake2 newt
@@ -1379,7 +1376,6 @@ buildipfire() {
   lfsmake2 perl-HTTP-Date
   lfsmake2 gnupg
   lfsmake2 hdparm
-  lfsmake2 sdparm
   lfsmake2 whatmask
   lfsmake2 libtirpc
   lfsmake2 conntrack-tools
@@ -1439,7 +1435,6 @@ buildipfire() {
   lfsmake2 pango
   lfsmake2 rrdtool
   lfsmake2 setup
-  lfsmake2 libdnet
   lfsmake2 jansson
   lfsmake2 yaml
   lfsmake2 libhtp
@@ -1537,7 +1532,6 @@ buildipfire() {
   lfsmake2 libusbredir
   lfsmake2 libseccomp
   lfsmake2 qemu
-  lfsmake2 netpbm
   lfsmake2 netsnmpd
   lfsmake2 nagios_nrpe
   lfsmake2 nagios-plugins
@@ -1592,7 +1586,6 @@ buildipfire() {
   lfsmake2 monit
   lfsmake2 nut
   lfsmake2 watchdog
-  lfsmake2 libpri
   lfsmake2 usb_modeswitch
   lfsmake2 usb_modeswitch_data
   lfsmake2 zerofree
@@ -1605,7 +1598,6 @@ buildipfire() {
   lfsmake2 u-boot
   lfsmake2 u-boot-friendlyarm
   lfsmake2 wireless-regdb
-  lfsmake2 libsolv
   lfsmake2 ddns
   lfsmake2 python3-pycparser
   lfsmake2 python3-charset-normalizer
@@ -1641,6 +1633,7 @@ buildipfire() {
   lfsmake2 python3-click
   lfsmake2 python3-arrow
   lfsmake2 python3-terminaltables
+  lfsmake2 python3-pkgconfig
   lfsmake2 aws-cli
   lfsmake2 oci-python-sdk
   lfsmake2 oci-cli
@@ -1677,7 +1670,6 @@ buildipfire() {
   lfsmake2 perl-IO-String
   lfsmake2 perl-PDF-API2
   lfsmake2 proxy-accounting
-  lfsmake2 pigz
   lfsmake2 tmux
   lfsmake2 perl-Text-CSV_XS
   lfsmake2 lua
diff --git a/src/initscripts/networking/any b/src/initscripts/networking/any
index 0facf23d8..15197badb 100644
--- a/src/initscripts/networking/any
+++ b/src/initscripts/networking/any
@@ -83,9 +83,6 @@ case "${1}" in
 			fi
 		fi
 
-		# Create & Enable vnstat data collection
-		/usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1
-
 		if [ ! "${ADDRESS}" == "1.1.1.1" ]; then
 			boot_mesg "Adding IPv4 address ${ADDRESS} to the ${DEVICE} interface..."
 			ip addr add ${args} dev ${DEVICE}
@@ -100,8 +97,6 @@ case "${1}" in
 			evaluate_retval
 		fi
 
-		# Disable vnstat collection
-		/usr/bin/vnstat -u -i ${DEVICE}	-r --disable > /dev/null 2>&1
 		exit 0;
 		;;
 esac
diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red
index 38129deeb..fc10e077a 100644
--- a/src/initscripts/networking/red
+++ b/src/initscripts/networking/red
@@ -103,9 +103,6 @@ case "${1}" in
 			fi
 		fi
 
-		## Create & Enable vnstat
-		/usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1
-
 		if [ "${TYPE}" == "STATIC" ]; then
 			# Set the MTU
 			if [ -n "${MTU}" ]; then
@@ -176,9 +173,6 @@ case "${1}" in
 				dhcpcd_start "${DEVICE}"
 			fi
 
-			## Create & Enable vnstat
-			/usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1
-
 		elif [ "$TYPE" == "PPPOE" ]; then
 
 			if ( ps ax | grep -q [p]ppd ); then 
@@ -459,8 +453,7 @@ case "${1}" in
 				evaluate_retval
 				# echo PPP: /usr/sbin/pppd pty "$PPPOE_CMD" $PPP_STD_OPTIONS $DEBUG $DEMAND $PPPD_SYNC
 			fi
-			## Create & Enable vnstat
-			/usr/bin/vnstat -u -i ppp0 -r --enable --force > /dev/null 2>&1
+
 			/etc/rc.d/init.d/connectd start
 			# Add a NaN value to ppp0 rrd to supress spikes at reconnect
 			rrdtool update $RRDLOG/collectd/localhost/interface/if_octets-ppp0.rrd \
@@ -485,8 +478,6 @@ case "${1}" in
 
 		elif [ "$TYPE" == "PPPOE" ]; then
 			boot_mesg "Bringing down the PPP interface ..."
-			## Disable vnstat collection
-			/usr/bin/vnstat -u -i ppp0 -r --disable > /dev/null 2>&1
 			rm -f /var/ipfire/red/keepconnected
 			killall -w -s TERM /usr/sbin/pppd 2>/dev/null
 			evaluate_retval
@@ -533,9 +524,6 @@ case "${1}" in
 		killall -w -s KILL pptp >/dev/null 2>&1
 		killall -w -s KILL br2684ctl >/dev/null 2>&1
 
-		## Disable vnstat collection
-		/usr/bin/vnstat -u -i ${DEVICE} -r --disable > /dev/null 2>&1
-
 		exit 0;
 		;;
 esac
diff --git a/src/patches/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch b/src/patches/suricata/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch
similarity index 97%
rename from src/patches/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch
rename to src/patches/suricata/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch
index fcea77cfa..6bc745a0f 100644
--- a/src/patches/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch
+++ b/src/patches/suricata/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch
@@ -26,7 +26,7 @@ diff --git a/src/stream-tcp.c b/src/stream-tcp.c
 index 1cff19fa5..af681760b 100644
 --- a/src/stream-tcp.c
 +++ b/src/stream-tcp.c
-@@ -1643,6 +1643,23 @@ static int StreamTcpPacketStateSynSent(ThreadVars *tv, Packet *p,
+@@ -1641,6 +1641,23 @@ static int StreamTcpPacketStateSynSent(ThreadVars *tv, Packet *p,
                      "ssn->client.last_ack %"PRIu32"", ssn,
                      ssn->client.isn, ssn->client.next_seq,
                      ssn->client.last_ack);
diff --git a/src/patches/suricata-5.0.8-fix-level1-cache-line-size-detection.patch b/src/patches/suricata/suricata-5.0.8-fix-level1-cache-line-size-detection.patch
similarity index 95%
rename from src/patches/suricata-5.0.8-fix-level1-cache-line-size-detection.patch
rename to src/patches/suricata/suricata-5.0.8-fix-level1-cache-line-size-detection.patch
index a6747a2a7..68a21f1e9 100644
--- a/src/patches/suricata-5.0.8-fix-level1-cache-line-size-detection.patch
+++ b/src/patches/suricata/suricata-5.0.8-fix-level1-cache-line-size-detection.patch
@@ -2,7 +2,7 @@ diff --git a/configure.ac b/configure.ac
 index d56d3a550..81abf8f00 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2313,7 +2313,7 @@ fi
+@@ -2318,7 +2318,7 @@ fi
      AC_PATH_PROG(HAVE_GETCONF_CMD, getconf, "no")
      if test "$HAVE_GETCONF_CMD" != "no"; then
          CLS=$(getconf LEVEL1_DCACHE_LINESIZE)
diff --git a/src/patches/suricata-disable-sid-2210059.patch b/src/patches/suricata/suricata-disable-sid-2210059.patch
similarity index 100%
rename from src/patches/suricata-disable-sid-2210059.patch
rename to src/patches/suricata/suricata-disable-sid-2210059.patch
diff --git a/src/wio/main/wio.pl b/src/wio/main/wio.pl
index 91c6c1494..78c91eeb9 100644
--- a/src/wio/main/wio.pl
+++ b/src/wio/main/wio.pl
@@ -98,9 +98,6 @@ my ( $ping_i, $ping_t, $ping_ib, $ping_tb, $ping_iv, $ping_tv, $pingmode ) = '';
 my ( @tmp, @arptmp, @myarray, @status, @arpclients ) = '';
 my @ifaces = ('GREEN','BLUE','ORANGE');
 
-if ( $netsettings{'RED_TYPE'} eq 'STATIC' || $netsettings{'RED_TYPE'} eq 'DHCP' ) {
-	push (@ifaces, "RED");
-}
 
 if ( $mailsettings{'USEMAIL'} eq 'on' ) { $mailen = 'on'; }
 else { $mailen = 'off'; }
diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi
index 1dcec52fe..a61102894 100644
--- a/src/wio/wio.cgi
+++ b/src/wio/wio.cgi
@@ -128,9 +128,6 @@ my @devs_alt   = ('green','blue','orange','red');
 
 my %ifacecolor = ( GREEN => 'wio_run_green', BLUE => 'wio_run_blue', ORANGE => 'wio_run_orange');
 
-#if ( $netsettings{'RED_TYPE'} eq 'STATIC' || $netsettings{'RED_TYPE'} eq 'DHCP' ) {
-#	%ifacecolor = ( %ifacecolor, RED => 'wio_run_red' );
-#}
 
 &loadips();
 


hooks/post-receive
--
IPFire 2.x development tree

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-04-24 10:28 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-24 10:28 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 87dcb206d025556d9c939fd7f003ad75ff93b61f Peter Müller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox