public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. b89454b52a0f29cb4336c1e57f6a856cfa16fb3c
@ 2021-08-09 15:37 Arne Fitzenreiter
  0 siblings, 0 replies; only message in thread
From: Arne Fitzenreiter @ 2021-08-09 15:37 UTC (permalink / raw)
  To: ipfire-scm

[-- Attachment #1: Type: text/plain, Size: 75029 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  b89454b52a0f29cb4336c1e57f6a856cfa16fb3c (commit)
       via  b6eb1746c6790abe99eebda4c34e6533d169996f (commit)
       via  07335498ff089b09efe347dd348414aa26cd8ba1 (commit)
       via  ae367b9c8fbe5e59b9e2d313efc0be8fdd1b0ae8 (commit)
       via  6bebdc5c5653663c3f6fcfabbd4e2f426ca72c5a (commit)
       via  6f36132e6890f4a423de2a0df14ccf3c720110c1 (commit)
       via  9e47307d1b862d27931b0bf56bcfdc44381c9162 (commit)
       via  db4e10a6ecdb59a6f19249873ba5d50b22db6a68 (commit)
       via  4bf13a6a473945181338e3c24c257fbe3fe3f7f6 (commit)
      from  ff54a798a546a54cba7e3ca06a6743a9eaa67bc3 (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 b89454b52a0f29cb4336c1e57f6a856cfa16fb3c
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Wed Jun 30 19:47:07 2021 +0200

    iperf3: Update to version 3.10.1
    
    - Update from 3.9 to 3.10.1
    - Update of rootfile not required
    - Changelog
       iperf-3.10.1 2021-06-03
         * Notable user-visible changes
           * Fixed a problem with autoconf scripts that made builds fail in
             some environments (#1154 / #1155).
         * Developer-visible changes
           * GNU autoconf 2.71 or newer is now required to regenerate iperf3's
             configure scripts.
       iperf 3.10 2021-05-26
         * Notable user-visible changes
           * Fix a bug where some --reverse tests didn't terminate (#982 /
             #1054).
           * Responsiveness of control connections is slightly improved (#1045
             / #1046 / #1063).
           * The allowable clock skew when doing authentication between client
             and server is now configurable with the new --time-skew-threshold
             (#1065 / #1070).
           * Bitrate throttling using the -b option now works when a burst size
             is specified (#1090).
           * A bug with calculating CPU utilization has been fixed (#1076 /
             #1077).
           * A --bind-dev option to support binding sockets to a given network
             interface has been added to make iperf3 work better with
             multi-homed machines and/or VRFs (#817 / #1089 / #1097).
           * --pidfile now works with --client mode (#1110).
           * The server is now less likely to get stuck due to network errors
             (#1101, #1125), controlled by the new --rcv-timeout option.
           * Fixed a few bugs in termination conditions for byte or
             block-limited tests (#1113, #1114, #1115).
           * Added tcp_info.snd_wnd to JSON output (#1148).
           * Some bugs with garbled JSON output have been fixed (#1086, #1118,
             #1143 / #1146).
           * Support for setting the IPv4 don't-fragment (DF) bit has been
             added with the new --dont-fragment option (#1119).
           * A failure with not being able to read the congestion control
             algorithm under WSL1 has been fixed (#1061 / #1126).
           * Error handling and error messages now make more sense in cases
             where sockets were not successfully opened (#1129 / #1132 /
             #1136, #1135 / #1138, #1128 / #1139).
           * Some buffer overflow hazards were fixed (#1134).
         * Notable developer-visible changes
           * It is now possible to use the API to set/get the congestion
             control algorithm (#1036 / #1112).
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit b6eb1746c6790abe99eebda4c34e6533d169996f
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Wed Jun 30 19:46:50 2021 +0200

    intltool: Update to version 0.51.0
    
    - Update from 0.40.5 (2008) to 0.51.0 (2015 - latest release)
    - Update of rootfile3 not required
    - Changelog is too long to include here
       Changes from version 0.41.0 to 0.51.0 can be found at https://launchpad.net/intltool/+download
        and in the ChangeLog files in the Source Tarballs
       Changes prior to 0.41.0 can be found at https://download.gnome.org/sources/intltool/
        in the ChangeLog files in the Source Tarballs
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 07335498ff089b09efe347dd348414aa26cd8ba1
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Wed Jun 30 19:46:31 2021 +0200

    ghostscript: Update version to 9.54.0
    
    - Update from 9.53.3 to 9.54.0
    - Update rootfile
    - delete patch related to FT_CALLBACK_DEF as fix has been implemented in the source
       tarball
    - Changelog highlights
       Version 9.54.0 (2021-03-30)
         The 9.54.0 release is a maintenance release, and also adds new functionality.
         Highlights in this release include:
           Overprint simulation is now available to all output devices, allowing quality previewing/proofing of PostScript and PDF jobs that rely on overprint. See the -dOverprint option documentation in: Overprint
           The "docxwrite" device adds the ability to output to Microsoft Word "docx" format. See: docxwrite
           The pdfwrite device is now capable of using the Tesseract OCR engine when it is built into Ghostscript to improve searchability and copy and paste functionality when the input lacks the metadata for that purpose. See: UseOCR
           Ghostscript/GhostPDL now includes a "map text to black" function, where text drawn by an input job (except when drawn using a Type 3 font) can be forced to draw in solid black. See: BlackText
           Ghostscript/GhostPDL now supports simple N-up imposition "internally". See: NupControl
           Our efforts in code hygiene and maintainability continue.
           The usual round of bug fixes, compatibility changes, and incremental improvements.
       Full details of above highlights can be found at https://www.ghostscript.com/doc/9.54.0/History9.htm
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit ae367b9c8fbe5e59b9e2d313efc0be8fdd1b0ae8
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Wed Jun 30 19:46:07 2021 +0200

    alsa: Update to version 1.2.5.1
    
    - Not really sure if a sound support capability is really appropriate for a firewall. I
       wouldn't have it. However if it stays as an add-on then it should be up to date.
    - Update alsa-lib from 1.0.27.1 (2013) to 1.2.5.1 (2021)
    - Update alsa-utils from 1.0.27.1 (2013) to 1.2.5.1 (2021)
    - Update alsa-firmware from 1.0.27 (2013) to 1.2.4 (2020)
    - Update rootfile
    - Changelog is too large to include here. Changes back to 2019-11-20 can be found at
       https://www.alsa-project.org/wiki/Main_Page
       Earlier changes have to be found from the git commits at
       https://github.com/alsa-project/alsa-lib and
       https://github.com/alsa-project/alsa-utils
       There is no changelog or git commits that I have been able to find for alsa-firmware
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 6bebdc5c5653663c3f6fcfabbd4e2f426ca72c5a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Mon Aug 9 07:52:24 2021 +0000

    core160: add fwhost.cgi
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 6f36132e6890f4a423de2a0df14ccf3c720110c1
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Thu Apr 22 22:20:00 2021 +0200

    fwhosts.cgi: properly fetch configured IPsec N2N subnets
    
    Previously, the getcolor() function did not correctly process IPsec
    N2N connections with more than one remote network configured, resulting
    in networks mistakenly marked as being part of a VPN connection, or vice
    versa.
    
    Fixes: #11235
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
    Acked-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 9e47307d1b862d27931b0bf56bcfdc44381c9162
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Mon Aug 9 07:47:45 2021 +0000

    core160: add general-functions.pl
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit db4e10a6ecdb59a6f19249873ba5d50b22db6a68
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Thu Apr 22 18:15:22 2021 +0200

    general-functions.pl: do not miscalculate when enumerating IPsec N2N subnet membership
    
    Fixes: #11235
    
    Cc: Alexander Marx <alexander.marx(a)ipfire.org>
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 4bf13a6a473945181338e3c24c257fbe3fe3f7f6
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Mon Aug 9 07:05:56 2021 +0000

    core160: begin updater
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 config/cfgroot/general-functions.pl                |   2 +-
 config/rootfiles/{oldcore/153 => core/160}/exclude |   0
 config/rootfiles/core/160/filelists/files          |   2 +
 .../155 => core/160}/filelists/release-files       |   0
 .../rootfiles/{oldcore/152 => core/160}/update.sh  |   6 +-
 config/rootfiles/{core => oldcore}/159/exclude     |   0
 .../159/filelists/aarch64/binutils                 |   0
 .../{core => oldcore}/159/filelists/aarch64/gcc    |   0
 .../{core => oldcore}/159/filelists/aarch64/glibc  |   0
 .../{core => oldcore}/159/filelists/aarch64/grub   |   0
 .../{core => oldcore}/159/filelists/aarch64/linux  |   0
 .../159/filelists/aarch64/linux-initrd             |   0
 .../159/filelists/aarch64/rpi-firmware             |   0
 .../159/filelists/aarch64/swconfig                 |   0
 .../{core => oldcore}/159/filelists/aarch64/u-boot |   0
 .../159/filelists/aarch64/u-boot-mkimage           |   0
 .../159/filelists/armv6l/binutils                  |   0
 .../{core => oldcore}/159/filelists/armv6l/boost   |   0
 .../{core => oldcore}/159/filelists/armv6l/gcc     |   0
 .../{core => oldcore}/159/filelists/armv6l/glibc   |   0
 .../{core => oldcore}/159/filelists/armv6l/linux   |   0
 .../159/filelists/armv6l/linux-initrd              |   0
 .../{core => oldcore}/159/filelists/armv6l/pakfire |   0
 .../{core => oldcore}/159/filelists/armv6l/python3 |   0
 .../159/filelists/armv6l/rpi-firmware              |   0
 .../159/filelists/armv6l/swconfig                  |   0
 .../{core => oldcore}/159/filelists/armv6l/u-boot  |   0
 .../159/filelists/armv6l/u-boot-friendlyarm        |   0
 .../159/filelists/armv6l/u-boot-mkimage            |   0
 .../{core => oldcore}/159/filelists/collectd       |   0
 .../{core => oldcore}/159/filelists/core-files     |   0
 .../{core => oldcore}/159/filelists/dhcpcd         |   0
 .../{core => oldcore}/159/filelists/etherwake      |   0
 .../{core => oldcore}/159/filelists/files          |   0
 .../rootfiles/{core => oldcore}/159/filelists/fuse |   0
 .../{core => oldcore}/159/filelists/gettext        |   0
 .../{core => oldcore}/159/filelists/i586/binutils  |   0
 .../{core => oldcore}/159/filelists/i586/gcc       |   0
 .../{core => oldcore}/159/filelists/i586/glibc     |   0
 .../{core => oldcore}/159/filelists/i586/grub      |   0
 .../{core => oldcore}/159/filelists/i586/hyperscan |   0
 .../{core => oldcore}/159/filelists/i586/linux     |   0
 .../159/filelists/i586/linux-initrd                |   0
 .../{core => oldcore}/159/filelists/i586/python3   |   0
 .../{core => oldcore}/159/filelists/libstatgrab    |   0
 .../{core => oldcore}/159/filelists/libusb         |   0
 .../{core => oldcore}/159/filelists/libxcrypt      |   0
 .../{core => oldcore}/159/filelists/linux-atm      |   0
 .../{core => oldcore}/159/filelists/openssh        |   0
 .../{core => oldcore}/159/filelists/python3        |   0
 .../{core => oldcore}/159/filelists/squid          |   0
 .../159/filelists/x86_64/binutils                  |   0
 .../{core => oldcore}/159/filelists/x86_64/gcc     |   0
 .../{core => oldcore}/159/filelists/x86_64/glibc   |   0
 .../{core => oldcore}/159/filelists/x86_64/grub    |   0
 .../159/filelists/x86_64/hyperscan                 |   0
 .../{core => oldcore}/159/filelists/x86_64/linux   |   0
 .../159/filelists/x86_64/linux-initrd              |   0
 .../{core => oldcore}/159/filelists/xtables-addons |   0
 .../rootfiles/{core => oldcore}/159/filelists/zstd |   0
 config/rootfiles/{core => oldcore}/159/update.sh   |   0
 config/rootfiles/packages/alsa                     | 118 +++---
 config/rootfiles/packages/ghostscript              | 403 +++++++++++----------
 html/cgi-bin/fwhosts.cgi                           |  12 +-
 lfs/alsa                                           |  14 +-
 lfs/ghostscript                                    |   7 +-
 lfs/intltool                                       |  10 +-
 lfs/iperf3                                         |   6 +-
 make.sh                                            |   2 +-
 ...LLBACK_DEF-with-Freetype-2.10.3-and-later.patch |  50 ---
 70 files changed, 284 insertions(+), 348 deletions(-)
 copy config/rootfiles/{oldcore/153 => core/160}/exclude (100%)
 create mode 100644 config/rootfiles/core/160/filelists/files
 copy config/rootfiles/{oldcore/155 => core/160}/filelists/release-files (100%)
 copy config/rootfiles/{oldcore/152 => core/160}/update.sh (94%)
 rename config/rootfiles/{core => oldcore}/159/exclude (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/aarch64/binutils (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/aarch64/gcc (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/aarch64/glibc (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/aarch64/grub (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/aarch64/linux (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/aarch64/linux-initrd (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/aarch64/rpi-firmware (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/aarch64/swconfig (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/aarch64/u-boot (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/aarch64/u-boot-mkimage (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/armv6l/binutils (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/armv6l/boost (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/armv6l/gcc (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/armv6l/glibc (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/armv6l/linux (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/armv6l/linux-initrd (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/armv6l/pakfire (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/armv6l/python3 (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/armv6l/rpi-firmware (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/armv6l/swconfig (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/armv6l/u-boot (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/armv6l/u-boot-friendlyarm (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/armv6l/u-boot-mkimage (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/collectd (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/core-files (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/dhcpcd (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/etherwake (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/files (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/fuse (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/gettext (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/i586/binutils (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/i586/gcc (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/i586/glibc (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/i586/grub (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/i586/hyperscan (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/i586/linux (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/i586/linux-initrd (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/i586/python3 (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/libstatgrab (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/libusb (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/libxcrypt (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/linux-atm (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/openssh (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/python3 (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/squid (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/x86_64/binutils (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/x86_64/gcc (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/x86_64/glibc (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/x86_64/grub (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/x86_64/hyperscan (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/x86_64/linux (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/x86_64/linux-initrd (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/xtables-addons (100%)
 rename config/rootfiles/{core => oldcore}/159/filelists/zstd (100%)
 rename config/rootfiles/{core => oldcore}/159/update.sh (100%)
 delete mode 100644 src/patches/ghostscript-drop-use-of-FT_CALLBACK_DEF-with-Freetype-2.10.3-and-later.patch

Difference in files:
diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 550afcf82..c7df46489 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -601,7 +601,7 @@ sub checksubnets
 		foreach my $key (keys %ipsecconf){
 			if ($ipsecconf{$key}[11] ne '' && $ipsecconf{$key}[36] eq ""){
 				foreach my $ipsecsubitem (split(/\|/, $ipsecconf{$key}[11])) {
-					my ($ipsecip,$ipsecsub) = split (/\//, $ipsecconf{$key}[11]);
+					my ($ipsecip,$ipsecsub) = split (/\//, $ipsecsubitem);
 					$ipsecsub=&iporsubtodec($ipsecsub);
 					if($ipsecconf{$key}[1] ne $ccdname){
 						if ( &IpInSubnet ($ip,$ipsecip,$ipsecsub) ){
diff --git a/config/rootfiles/core/160/exclude b/config/rootfiles/core/160/exclude
new file mode 100644
index 000000000..818039f4a
--- /dev/null
+++ b/config/rootfiles/core/160/exclude
@@ -0,0 +1,34 @@
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+etc/alternatives
+etc/collectd.custom
+etc/default/grub
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+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/160/filelists/files b/config/rootfiles/core/160/filelists/files
new file mode 100644
index 000000000..e68e90a52
--- /dev/null
+++ b/config/rootfiles/core/160/filelists/files
@@ -0,0 +1,2 @@
+srv/web/ipfire/cgi-bin/fwhosts.cgi
+var/ipfire/general-functions.pl
diff --git a/config/rootfiles/core/160/filelists/release-files b/config/rootfiles/core/160/filelists/release-files
new file mode 100644
index 000000000..0dec37e53
--- /dev/null
+++ b/config/rootfiles/core/160/filelists/release-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/160/update.sh b/config/rootfiles/core/160/update.sh
new file mode 100644
index 000000000..deaa652d1
--- /dev/null
+++ b/config/rootfiles/core/160/update.sh
@@ -0,0 +1,67 @@
+#!/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) 2021 IPFire-Team <info(a)ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=160
+
+# 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
+
+# Stop services
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Filesytem cleanup
+/usr/local/bin/filesystem-cleanup
+
+# Start services
+
+# 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/core/159/exclude b/config/rootfiles/oldcore/159/exclude
similarity index 100%
rename from config/rootfiles/core/159/exclude
rename to config/rootfiles/oldcore/159/exclude
diff --git a/config/rootfiles/core/159/filelists/aarch64/binutils b/config/rootfiles/oldcore/159/filelists/aarch64/binutils
similarity index 100%
rename from config/rootfiles/core/159/filelists/aarch64/binutils
rename to config/rootfiles/oldcore/159/filelists/aarch64/binutils
diff --git a/config/rootfiles/core/159/filelists/aarch64/gcc b/config/rootfiles/oldcore/159/filelists/aarch64/gcc
similarity index 100%
rename from config/rootfiles/core/159/filelists/aarch64/gcc
rename to config/rootfiles/oldcore/159/filelists/aarch64/gcc
diff --git a/config/rootfiles/core/159/filelists/aarch64/glibc b/config/rootfiles/oldcore/159/filelists/aarch64/glibc
similarity index 100%
rename from config/rootfiles/core/159/filelists/aarch64/glibc
rename to config/rootfiles/oldcore/159/filelists/aarch64/glibc
diff --git a/config/rootfiles/core/159/filelists/aarch64/grub b/config/rootfiles/oldcore/159/filelists/aarch64/grub
similarity index 100%
rename from config/rootfiles/core/159/filelists/aarch64/grub
rename to config/rootfiles/oldcore/159/filelists/aarch64/grub
diff --git a/config/rootfiles/core/159/filelists/aarch64/linux b/config/rootfiles/oldcore/159/filelists/aarch64/linux
similarity index 100%
rename from config/rootfiles/core/159/filelists/aarch64/linux
rename to config/rootfiles/oldcore/159/filelists/aarch64/linux
diff --git a/config/rootfiles/core/159/filelists/aarch64/linux-initrd b/config/rootfiles/oldcore/159/filelists/aarch64/linux-initrd
similarity index 100%
rename from config/rootfiles/core/159/filelists/aarch64/linux-initrd
rename to config/rootfiles/oldcore/159/filelists/aarch64/linux-initrd
diff --git a/config/rootfiles/core/159/filelists/aarch64/rpi-firmware b/config/rootfiles/oldcore/159/filelists/aarch64/rpi-firmware
similarity index 100%
rename from config/rootfiles/core/159/filelists/aarch64/rpi-firmware
rename to config/rootfiles/oldcore/159/filelists/aarch64/rpi-firmware
diff --git a/config/rootfiles/core/159/filelists/aarch64/swconfig b/config/rootfiles/oldcore/159/filelists/aarch64/swconfig
similarity index 100%
rename from config/rootfiles/core/159/filelists/aarch64/swconfig
rename to config/rootfiles/oldcore/159/filelists/aarch64/swconfig
diff --git a/config/rootfiles/core/159/filelists/aarch64/u-boot b/config/rootfiles/oldcore/159/filelists/aarch64/u-boot
similarity index 100%
rename from config/rootfiles/core/159/filelists/aarch64/u-boot
rename to config/rootfiles/oldcore/159/filelists/aarch64/u-boot
diff --git a/config/rootfiles/core/159/filelists/aarch64/u-boot-mkimage b/config/rootfiles/oldcore/159/filelists/aarch64/u-boot-mkimage
similarity index 100%
rename from config/rootfiles/core/159/filelists/aarch64/u-boot-mkimage
rename to config/rootfiles/oldcore/159/filelists/aarch64/u-boot-mkimage
diff --git a/config/rootfiles/core/159/filelists/armv6l/binutils b/config/rootfiles/oldcore/159/filelists/armv6l/binutils
similarity index 100%
rename from config/rootfiles/core/159/filelists/armv6l/binutils
rename to config/rootfiles/oldcore/159/filelists/armv6l/binutils
diff --git a/config/rootfiles/core/159/filelists/armv6l/boost b/config/rootfiles/oldcore/159/filelists/armv6l/boost
similarity index 100%
rename from config/rootfiles/core/159/filelists/armv6l/boost
rename to config/rootfiles/oldcore/159/filelists/armv6l/boost
diff --git a/config/rootfiles/core/159/filelists/armv6l/gcc b/config/rootfiles/oldcore/159/filelists/armv6l/gcc
similarity index 100%
rename from config/rootfiles/core/159/filelists/armv6l/gcc
rename to config/rootfiles/oldcore/159/filelists/armv6l/gcc
diff --git a/config/rootfiles/core/159/filelists/armv6l/glibc b/config/rootfiles/oldcore/159/filelists/armv6l/glibc
similarity index 100%
rename from config/rootfiles/core/159/filelists/armv6l/glibc
rename to config/rootfiles/oldcore/159/filelists/armv6l/glibc
diff --git a/config/rootfiles/core/159/filelists/armv6l/linux b/config/rootfiles/oldcore/159/filelists/armv6l/linux
similarity index 100%
rename from config/rootfiles/core/159/filelists/armv6l/linux
rename to config/rootfiles/oldcore/159/filelists/armv6l/linux
diff --git a/config/rootfiles/core/159/filelists/armv6l/linux-initrd b/config/rootfiles/oldcore/159/filelists/armv6l/linux-initrd
similarity index 100%
rename from config/rootfiles/core/159/filelists/armv6l/linux-initrd
rename to config/rootfiles/oldcore/159/filelists/armv6l/linux-initrd
diff --git a/config/rootfiles/core/159/filelists/armv6l/pakfire b/config/rootfiles/oldcore/159/filelists/armv6l/pakfire
similarity index 100%
rename from config/rootfiles/core/159/filelists/armv6l/pakfire
rename to config/rootfiles/oldcore/159/filelists/armv6l/pakfire
diff --git a/config/rootfiles/core/159/filelists/armv6l/python3 b/config/rootfiles/oldcore/159/filelists/armv6l/python3
similarity index 100%
rename from config/rootfiles/core/159/filelists/armv6l/python3
rename to config/rootfiles/oldcore/159/filelists/armv6l/python3
diff --git a/config/rootfiles/core/159/filelists/armv6l/rpi-firmware b/config/rootfiles/oldcore/159/filelists/armv6l/rpi-firmware
similarity index 100%
rename from config/rootfiles/core/159/filelists/armv6l/rpi-firmware
rename to config/rootfiles/oldcore/159/filelists/armv6l/rpi-firmware
diff --git a/config/rootfiles/core/159/filelists/armv6l/swconfig b/config/rootfiles/oldcore/159/filelists/armv6l/swconfig
similarity index 100%
rename from config/rootfiles/core/159/filelists/armv6l/swconfig
rename to config/rootfiles/oldcore/159/filelists/armv6l/swconfig
diff --git a/config/rootfiles/core/159/filelists/armv6l/u-boot b/config/rootfiles/oldcore/159/filelists/armv6l/u-boot
similarity index 100%
rename from config/rootfiles/core/159/filelists/armv6l/u-boot
rename to config/rootfiles/oldcore/159/filelists/armv6l/u-boot
diff --git a/config/rootfiles/core/159/filelists/armv6l/u-boot-friendlyarm b/config/rootfiles/oldcore/159/filelists/armv6l/u-boot-friendlyarm
similarity index 100%
rename from config/rootfiles/core/159/filelists/armv6l/u-boot-friendlyarm
rename to config/rootfiles/oldcore/159/filelists/armv6l/u-boot-friendlyarm
diff --git a/config/rootfiles/core/159/filelists/armv6l/u-boot-mkimage b/config/rootfiles/oldcore/159/filelists/armv6l/u-boot-mkimage
similarity index 100%
rename from config/rootfiles/core/159/filelists/armv6l/u-boot-mkimage
rename to config/rootfiles/oldcore/159/filelists/armv6l/u-boot-mkimage
diff --git a/config/rootfiles/core/159/filelists/collectd b/config/rootfiles/oldcore/159/filelists/collectd
similarity index 100%
rename from config/rootfiles/core/159/filelists/collectd
rename to config/rootfiles/oldcore/159/filelists/collectd
diff --git a/config/rootfiles/core/159/filelists/core-files b/config/rootfiles/oldcore/159/filelists/core-files
similarity index 100%
rename from config/rootfiles/core/159/filelists/core-files
rename to config/rootfiles/oldcore/159/filelists/core-files
diff --git a/config/rootfiles/core/159/filelists/dhcpcd b/config/rootfiles/oldcore/159/filelists/dhcpcd
similarity index 100%
rename from config/rootfiles/core/159/filelists/dhcpcd
rename to config/rootfiles/oldcore/159/filelists/dhcpcd
diff --git a/config/rootfiles/core/159/filelists/etherwake b/config/rootfiles/oldcore/159/filelists/etherwake
similarity index 100%
rename from config/rootfiles/core/159/filelists/etherwake
rename to config/rootfiles/oldcore/159/filelists/etherwake
diff --git a/config/rootfiles/core/159/filelists/files b/config/rootfiles/oldcore/159/filelists/files
similarity index 100%
rename from config/rootfiles/core/159/filelists/files
rename to config/rootfiles/oldcore/159/filelists/files
diff --git a/config/rootfiles/core/159/filelists/fuse b/config/rootfiles/oldcore/159/filelists/fuse
similarity index 100%
rename from config/rootfiles/core/159/filelists/fuse
rename to config/rootfiles/oldcore/159/filelists/fuse
diff --git a/config/rootfiles/core/159/filelists/gettext b/config/rootfiles/oldcore/159/filelists/gettext
similarity index 100%
rename from config/rootfiles/core/159/filelists/gettext
rename to config/rootfiles/oldcore/159/filelists/gettext
diff --git a/config/rootfiles/core/159/filelists/i586/binutils b/config/rootfiles/oldcore/159/filelists/i586/binutils
similarity index 100%
rename from config/rootfiles/core/159/filelists/i586/binutils
rename to config/rootfiles/oldcore/159/filelists/i586/binutils
diff --git a/config/rootfiles/core/159/filelists/i586/gcc b/config/rootfiles/oldcore/159/filelists/i586/gcc
similarity index 100%
rename from config/rootfiles/core/159/filelists/i586/gcc
rename to config/rootfiles/oldcore/159/filelists/i586/gcc
diff --git a/config/rootfiles/core/159/filelists/i586/glibc b/config/rootfiles/oldcore/159/filelists/i586/glibc
similarity index 100%
rename from config/rootfiles/core/159/filelists/i586/glibc
rename to config/rootfiles/oldcore/159/filelists/i586/glibc
diff --git a/config/rootfiles/core/159/filelists/i586/grub b/config/rootfiles/oldcore/159/filelists/i586/grub
similarity index 100%
rename from config/rootfiles/core/159/filelists/i586/grub
rename to config/rootfiles/oldcore/159/filelists/i586/grub
diff --git a/config/rootfiles/core/159/filelists/i586/hyperscan b/config/rootfiles/oldcore/159/filelists/i586/hyperscan
similarity index 100%
rename from config/rootfiles/core/159/filelists/i586/hyperscan
rename to config/rootfiles/oldcore/159/filelists/i586/hyperscan
diff --git a/config/rootfiles/core/159/filelists/i586/linux b/config/rootfiles/oldcore/159/filelists/i586/linux
similarity index 100%
rename from config/rootfiles/core/159/filelists/i586/linux
rename to config/rootfiles/oldcore/159/filelists/i586/linux
diff --git a/config/rootfiles/core/159/filelists/i586/linux-initrd b/config/rootfiles/oldcore/159/filelists/i586/linux-initrd
similarity index 100%
rename from config/rootfiles/core/159/filelists/i586/linux-initrd
rename to config/rootfiles/oldcore/159/filelists/i586/linux-initrd
diff --git a/config/rootfiles/core/159/filelists/i586/python3 b/config/rootfiles/oldcore/159/filelists/i586/python3
similarity index 100%
rename from config/rootfiles/core/159/filelists/i586/python3
rename to config/rootfiles/oldcore/159/filelists/i586/python3
diff --git a/config/rootfiles/core/159/filelists/libstatgrab b/config/rootfiles/oldcore/159/filelists/libstatgrab
similarity index 100%
rename from config/rootfiles/core/159/filelists/libstatgrab
rename to config/rootfiles/oldcore/159/filelists/libstatgrab
diff --git a/config/rootfiles/core/159/filelists/libusb b/config/rootfiles/oldcore/159/filelists/libusb
similarity index 100%
rename from config/rootfiles/core/159/filelists/libusb
rename to config/rootfiles/oldcore/159/filelists/libusb
diff --git a/config/rootfiles/core/159/filelists/libxcrypt b/config/rootfiles/oldcore/159/filelists/libxcrypt
similarity index 100%
rename from config/rootfiles/core/159/filelists/libxcrypt
rename to config/rootfiles/oldcore/159/filelists/libxcrypt
diff --git a/config/rootfiles/core/159/filelists/linux-atm b/config/rootfiles/oldcore/159/filelists/linux-atm
similarity index 100%
rename from config/rootfiles/core/159/filelists/linux-atm
rename to config/rootfiles/oldcore/159/filelists/linux-atm
diff --git a/config/rootfiles/core/159/filelists/openssh b/config/rootfiles/oldcore/159/filelists/openssh
similarity index 100%
rename from config/rootfiles/core/159/filelists/openssh
rename to config/rootfiles/oldcore/159/filelists/openssh
diff --git a/config/rootfiles/core/159/filelists/python3 b/config/rootfiles/oldcore/159/filelists/python3
similarity index 100%
rename from config/rootfiles/core/159/filelists/python3
rename to config/rootfiles/oldcore/159/filelists/python3
diff --git a/config/rootfiles/core/159/filelists/squid b/config/rootfiles/oldcore/159/filelists/squid
similarity index 100%
rename from config/rootfiles/core/159/filelists/squid
rename to config/rootfiles/oldcore/159/filelists/squid
diff --git a/config/rootfiles/core/159/filelists/x86_64/binutils b/config/rootfiles/oldcore/159/filelists/x86_64/binutils
similarity index 100%
rename from config/rootfiles/core/159/filelists/x86_64/binutils
rename to config/rootfiles/oldcore/159/filelists/x86_64/binutils
diff --git a/config/rootfiles/core/159/filelists/x86_64/gcc b/config/rootfiles/oldcore/159/filelists/x86_64/gcc
similarity index 100%
rename from config/rootfiles/core/159/filelists/x86_64/gcc
rename to config/rootfiles/oldcore/159/filelists/x86_64/gcc
diff --git a/config/rootfiles/core/159/filelists/x86_64/glibc b/config/rootfiles/oldcore/159/filelists/x86_64/glibc
similarity index 100%
rename from config/rootfiles/core/159/filelists/x86_64/glibc
rename to config/rootfiles/oldcore/159/filelists/x86_64/glibc
diff --git a/config/rootfiles/core/159/filelists/x86_64/grub b/config/rootfiles/oldcore/159/filelists/x86_64/grub
similarity index 100%
rename from config/rootfiles/core/159/filelists/x86_64/grub
rename to config/rootfiles/oldcore/159/filelists/x86_64/grub
diff --git a/config/rootfiles/core/159/filelists/x86_64/hyperscan b/config/rootfiles/oldcore/159/filelists/x86_64/hyperscan
similarity index 100%
rename from config/rootfiles/core/159/filelists/x86_64/hyperscan
rename to config/rootfiles/oldcore/159/filelists/x86_64/hyperscan
diff --git a/config/rootfiles/core/159/filelists/x86_64/linux b/config/rootfiles/oldcore/159/filelists/x86_64/linux
similarity index 100%
rename from config/rootfiles/core/159/filelists/x86_64/linux
rename to config/rootfiles/oldcore/159/filelists/x86_64/linux
diff --git a/config/rootfiles/core/159/filelists/x86_64/linux-initrd b/config/rootfiles/oldcore/159/filelists/x86_64/linux-initrd
similarity index 100%
rename from config/rootfiles/core/159/filelists/x86_64/linux-initrd
rename to config/rootfiles/oldcore/159/filelists/x86_64/linux-initrd
diff --git a/config/rootfiles/core/159/filelists/xtables-addons b/config/rootfiles/oldcore/159/filelists/xtables-addons
similarity index 100%
rename from config/rootfiles/core/159/filelists/xtables-addons
rename to config/rootfiles/oldcore/159/filelists/xtables-addons
diff --git a/config/rootfiles/core/159/filelists/zstd b/config/rootfiles/oldcore/159/filelists/zstd
similarity index 100%
rename from config/rootfiles/core/159/filelists/zstd
rename to config/rootfiles/oldcore/159/filelists/zstd
diff --git a/config/rootfiles/core/159/update.sh b/config/rootfiles/oldcore/159/update.sh
similarity index 100%
rename from config/rootfiles/core/159/update.sh
rename to config/rootfiles/oldcore/159/update.sh
diff --git a/config/rootfiles/packages/alsa b/config/rootfiles/packages/alsa
index 1c0d744ab..a704727ec 100644
--- a/config/rootfiles/packages/alsa
+++ b/config/rootfiles/packages/alsa
@@ -1,6 +1,6 @@
+etc/rc.d/init.d/alsa
 lib/firmware/aica_firmware.bin
 #lib/firmware/asihpi
-lib/firmware/asihpi/dsp2400.bin
 lib/firmware/asihpi/dsp5000.bin
 lib/firmware/asihpi/dsp6200.bin
 lib/firmware/asihpi/dsp6205.bin
@@ -8,8 +8,15 @@ lib/firmware/asihpi/dsp6400.bin
 lib/firmware/asihpi/dsp6600.bin
 lib/firmware/asihpi/dsp8700.bin
 lib/firmware/asihpi/dsp8900.bin
-lib/firmware/ctefx.bin
-lib/firmware/ctspeq.bin
+#lib/firmware/cs46xx
+lib/firmware/cs46xx/ba1
+lib/firmware/cs46xx/cwc4630
+lib/firmware/cs46xx/cwcasync
+lib/firmware/cs46xx/cwcbinhack
+lib/firmware/cs46xx/cwcdma
+lib/firmware/cs46xx/cwcsnoop
+lib/firmware/ctefx-desktop.bin
+lib/firmware/ctefx-r3di.bin
 lib/firmware/digiface_firmware.bin
 lib/firmware/digiface_firmware_rev11.bin
 #lib/firmware/ea
@@ -98,9 +105,12 @@ lib/firmware/vx/x1_1_vp4.xlx
 lib/firmware/vx/x1_1_vx2.xlx
 lib/firmware/vx/x1_1_vxp.xlx
 lib/firmware/vx/x1_2_v22.xlx
+#lib/udev/rules.d/90-alsa-restore.rules
 usr/bin/aconnect
+usr/bin/alsabat
 usr/bin/alsaloop
 usr/bin/alsamixer
+usr/bin/alsatplg
 usr/bin/alsaucm
 usr/bin/amidi
 usr/bin/amixer
@@ -111,19 +121,19 @@ usr/bin/arecordmidi
 usr/bin/aseqdump
 usr/bin/aseqnet
 usr/bin/aserver
+usr/bin/axfer
 usr/bin/iecset
 usr/bin/speaker-test
 #usr/include/alsa
-#usr/include/alsa/alisp.h
 #usr/include/alsa/asoundef.h
 #usr/include/alsa/asoundlib.h
 #usr/include/alsa/conf.h
 #usr/include/alsa/control.h
 #usr/include/alsa/control_external.h
+#usr/include/alsa/control_plugin.h
 #usr/include/alsa/error.h
 #usr/include/alsa/global.h
 #usr/include/alsa/hwdep.h
-#usr/include/alsa/iatomic.h
 #usr/include/alsa/input.h
 #usr/include/alsa/mixer.h
 #usr/include/alsa/mixer_abst.h
@@ -141,31 +151,39 @@ usr/bin/speaker-test
 #usr/include/alsa/seq_midi_event.h
 #usr/include/alsa/seqmid.h
 #usr/include/alsa/sound
+#usr/include/alsa/sound/asoc.h
 #usr/include/alsa/sound/asound_fm.h
 #usr/include/alsa/sound/emu10k1.h
 #usr/include/alsa/sound/hdsp.h
 usr/include/alsa/sound/hdspm.h
 #usr/include/alsa/sound/sb16_csp.h
 #usr/include/alsa/sound/sscape_ioctl.h
+#usr/include/alsa/sound/tlv.h
 #usr/include/alsa/sound/type_compat.h
+#usr/include/alsa/sound/uapi
+#usr/include/alsa/sound/uapi/asoc.h
+#usr/include/alsa/sound/uapi/asound_fm.h
+#usr/include/alsa/sound/uapi/emu10k1.h
+#usr/include/alsa/sound/uapi/hdsp.h
+#usr/include/alsa/sound/uapi/hdspm.h
+#usr/include/alsa/sound/uapi/sb16_csp.h
+#usr/include/alsa/sound/uapi/sscape_ioctl.h
+#usr/include/alsa/sound/uapi/tlv.h
 #usr/include/alsa/timer.h
+#usr/include/alsa/topology.h
 #usr/include/alsa/use-case.h
 #usr/include/alsa/version.h
+#usr/include/asoundlib.h
 #usr/include/sys/asoundlib.h
-#usr/lib/alsa-lib
-#usr/lib/alsa-lib/smixer
-#usr/lib/alsa-lib/smixer/smixer-ac97.la
-usr/lib/alsa-lib/smixer/smixer-ac97.so
-#usr/lib/alsa-lib/smixer/smixer-hda.la
-usr/lib/alsa-lib/smixer/smixer-hda.so
-#usr/lib/alsa-lib/smixer/smixer-python.la
-usr/lib/alsa-lib/smixer/smixer-python.so
-#usr/lib/alsa-lib/smixer/smixer-sbase.la
-usr/lib/alsa-lib/smixer/smixer-sbase.so
 #usr/lib/libasound.la
-usr/lib/libasound.so
+#usr/lib/libasound.so
 usr/lib/libasound.so.2
 usr/lib/libasound.so.2.0.0
+#usr/lib/libatopology.la
+#usr/lib/libatopology.so
+usr/lib/libatopology.so.2
+usr/lib/libatopology.so.2.0.0
+#usr/lib/pkgconfig/alsa-topology.pc
 #usr/lib/pkgconfig/alsa.pc
 usr/local/share/alsa
 #usr/local/share/alsa/firmware
@@ -242,13 +260,13 @@ usr/local/share/alsa/firmware/hdsploader/rpm_firmware.bin
 #usr/local/share/alsa/firmware/vxloader/x1_1_vx2.rbt
 #usr/local/share/alsa/firmware/vxloader/x1_1_vxp.rbt
 #usr/local/share/alsa/firmware/vxloader/x1_2_v22.rbt
+usr/sbin/alsa-info.sh
+usr/sbin/alsabat-test.sh
 usr/sbin/alsaconf
 usr/sbin/alsactl
 #usr/share/aclocal/alsa.m4
 usr/share/alsa
 #usr/share/alsa/alsa.conf
-#usr/share/alsa/alsa.conf.d
-usr/share/alsa/alsa.conf.d/README
 #usr/share/alsa/cards
 #usr/share/alsa/cards/AACI.conf
 #usr/share/alsa/cards/ATIIXP-MODEM.conf
@@ -279,11 +297,13 @@ usr/share/alsa/alsa.conf.d/README
 #usr/share/alsa/cards/FireWave.conf
 #usr/share/alsa/cards/GUS.conf
 #usr/share/alsa/cards/HDA-Intel.conf
+#usr/share/alsa/cards/HdmiLpeAudio.conf
 #usr/share/alsa/cards/ICE1712.conf
 #usr/share/alsa/cards/ICE1724.conf
 #usr/share/alsa/cards/ICH-MODEM.conf
 #usr/share/alsa/cards/ICH.conf
 #usr/share/alsa/cards/ICH4.conf
+#usr/share/alsa/cards/Loopback.conf
 #usr/share/alsa/cards/Maestro3.conf
 #usr/share/alsa/cards/NFORCE.conf
 #usr/share/alsa/cards/PC-Speaker.conf
@@ -293,10 +313,7 @@ usr/share/alsa/alsa.conf.d/README
 #usr/share/alsa/cards/RME9636.conf
 #usr/share/alsa/cards/RME9652.conf
 #usr/share/alsa/cards/SB-XFi.conf
-#usr/share/alsa/cards/SI7018
 #usr/share/alsa/cards/SI7018.conf
-#usr/share/alsa/cards/SI7018/sndoc-mixer.alisp
-#usr/share/alsa/cards/SI7018/sndop-mixer.alisp
 #usr/share/alsa/cards/TRID4DWAVENX.conf
 #usr/share/alsa/cards/USB-Audio.conf
 #usr/share/alsa/cards/VIA686A.conf
@@ -307,10 +324,14 @@ usr/share/alsa/alsa.conf.d/README
 #usr/share/alsa/cards/VXPocket.conf
 #usr/share/alsa/cards/VXPocket440.conf
 #usr/share/alsa/cards/YMF744.conf
-#usr/share/alsa/cards/aliases.alisp
 #usr/share/alsa/cards/aliases.conf
+#usr/share/alsa/cards/pistachio-card.conf
+#usr/share/alsa/cards/vc4-hdmi.conf
+#usr/share/alsa/ctl
+#usr/share/alsa/ctl/default.conf
 #usr/share/alsa/init
 #usr/share/alsa/init/00main
+#usr/share/alsa/init/ca0106
 #usr/share/alsa/init/default
 #usr/share/alsa/init/hda
 #usr/share/alsa/init/help
@@ -328,52 +349,25 @@ usr/share/alsa/alsa.conf.d/README
 #usr/share/alsa/pcm/modem.conf
 #usr/share/alsa/pcm/rear.conf
 #usr/share/alsa/pcm/side.conf
+#usr/share/alsa/pcm/surround21.conf
 #usr/share/alsa/pcm/surround40.conf
 #usr/share/alsa/pcm/surround41.conf
 #usr/share/alsa/pcm/surround50.conf
 #usr/share/alsa/pcm/surround51.conf
 #usr/share/alsa/pcm/surround71.conf
-#usr/share/alsa/smixer.conf
-#usr/share/alsa/sndo-mixer.alisp
 #usr/share/alsa/speaker-test
 #usr/share/alsa/speaker-test/sample_map.csv
-#usr/share/alsa/ucm
-usr/share/alsa/ucm/DAISY-I2S
-usr/share/alsa/ucm/DAISY-I2S/DAISY-I2S.conf
-usr/share/alsa/ucm/DAISY-I2S/HiFi.conf
-#usr/share/alsa/ucm/PandaBoard
-usr/share/alsa/ucm/PandaBoard/FMAnalog
-usr/share/alsa/ucm/PandaBoard/PandaBoard.conf
-usr/share/alsa/ucm/PandaBoard/hifi
-usr/share/alsa/ucm/PandaBoard/hifiLP
-usr/share/alsa/ucm/PandaBoard/record
-usr/share/alsa/ucm/PandaBoard/voice
-usr/share/alsa/ucm/PandaBoard/voiceCall
-#usr/share/alsa/ucm/PandaBoardES
-usr/share/alsa/ucm/PandaBoardES/FMAnalog
-usr/share/alsa/ucm/PandaBoardES/PandaBoardES.conf
-usr/share/alsa/ucm/PandaBoardES/hifi
-usr/share/alsa/ucm/PandaBoardES/hifiLP
-usr/share/alsa/ucm/PandaBoardES/record
-usr/share/alsa/ucm/PandaBoardES/voice
-usr/share/alsa/ucm/PandaBoardES/voiceCall
-#usr/share/alsa/ucm/SDP4430
-usr/share/alsa/ucm/SDP4430/FMAnalog
-usr/share/alsa/ucm/SDP4430/SDP4430.conf
-usr/share/alsa/ucm/SDP4430/hifi
-usr/share/alsa/ucm/SDP4430/hifiLP
-usr/share/alsa/ucm/SDP4430/record
-usr/share/alsa/ucm/SDP4430/voice
-usr/share/alsa/ucm/SDP4430/voiceCall
-#usr/share/alsa/ucm/tegraalc5632
-usr/share/alsa/ucm/tegraalc5632/tegraalc5632.conf
 #usr/share/locale/de/LC_MESSAGES/alsa-utils.mo
+#usr/share/locale/eu/LC_MESSAGES/alsa-utils.mo
 #usr/share/locale/fr/LC_MESSAGES/alsa-utils.mo
 #usr/share/locale/ja/LC_MESSAGES/alsa-utils.mo
 #usr/share/locale/ja/LC_MESSAGES/alsaconf.mo
 #usr/share/locale/ru/LC_MESSAGES/alsaconf.mo
+#usr/share/locale/sk/LC_MESSAGES/alsa-utils.mo
 #usr/share/man/fr/man8/alsaconf.8
 #usr/share/man/man1/aconnect.1
+#usr/share/man/man1/alsa-info.sh.1
+#usr/share/man/man1/alsabat.1
 #usr/share/man/man1/alsactl.1
 #usr/share/man/man1/alsaloop.1
 #usr/share/man/man1/alsamixer.1
@@ -385,6 +379,9 @@ usr/share/alsa/ucm/tegraalc5632/tegraalc5632.conf
 #usr/share/man/man1/arecordmidi.1
 #usr/share/man/man1/aseqdump.1
 #usr/share/man/man1/aseqnet.1
+#usr/share/man/man1/axfer-list.1
+#usr/share/man/man1/axfer-transfer.1
+#usr/share/man/man1/axfer.1
 #usr/share/man/man1/iecset.1
 #usr/share/man/man1/speaker-test.1
 #usr/share/man/man8/alsaconf.8
@@ -400,16 +397,3 @@ usr/share/sounds/alsa
 #usr/share/sounds/alsa/Side_Left.wav
 #usr/share/sounds/alsa/Side_Right.wav
 var/lib/alsa
-etc/rc.d/init.d/alsa
-lib/firmware/ess/maestro3_assp_kernel.fw
-lib/firmware/ess/maestro3_assp_minisrc.fw
-lib/firmware/korg/k1212.dsp
-lib/firmware/sb16/alaw_main.csp
-lib/firmware/sb16/ima_adpcm_capture.csp
-lib/firmware/sb16/ima_adpcm_init.csp
-lib/firmware/sb16/ima_adpcm_playback.csp
-lib/firmware/sb16/mulaw_main.csp
-lib/firmware/yamaha/ds1_ctrl.fw
-lib/firmware/yamaha/ds1_dsp.fw
-lib/firmware/yamaha/ds1e_ctrl.fw
-lib/firmware/yamaha/yss225_registers.bin
diff --git a/config/rootfiles/packages/ghostscript b/config/rootfiles/packages/ghostscript
index 983d0b766..45337fc36 100644
--- a/config/rootfiles/packages/ghostscript
+++ b/config/rootfiles/packages/ghostscript
@@ -25,208 +25,209 @@ usr/bin/ps2ps
 usr/bin/ps2ps2
 usr/bin/unix-lpr.sh
 #usr/share/doc/ghostscript
-#usr/share/doc/ghostscript/9.53.3
-#usr/share/doc/ghostscript/9.53.3/API.htm
-#usr/share/doc/ghostscript/9.53.3/C-style.htm
-#usr/share/doc/ghostscript/9.53.3/COPYING
-#usr/share/doc/ghostscript/9.53.3/Commprod.htm
-#usr/share/doc/ghostscript/9.53.3/DLL.htm
-#usr/share/doc/ghostscript/9.53.3/Deprecated.htm
-#usr/share/doc/ghostscript/9.53.3/Develop.htm
-#usr/share/doc/ghostscript/9.53.3/Devices.htm
-#usr/share/doc/ghostscript/9.53.3/Drivers.htm
-#usr/share/doc/ghostscript/9.53.3/Fonts.htm
-#usr/share/doc/ghostscript/9.53.3/GS9_Color_Management.pdf
-#usr/share/doc/ghostscript/9.53.3/History9.htm
-#usr/share/doc/ghostscript/9.53.3/Install.htm
-#usr/share/doc/ghostscript/9.53.3/Language.htm
-#usr/share/doc/ghostscript/9.53.3/Lib.htm
-#usr/share/doc/ghostscript/9.53.3/Make.htm
-#usr/share/doc/ghostscript/9.53.3/News.htm
-#usr/share/doc/ghostscript/9.53.3/Ps-style.htm
-#usr/share/doc/ghostscript/9.53.3/Ps2epsi.htm
-#usr/share/doc/ghostscript/9.53.3/Psfiles.htm
-#usr/share/doc/ghostscript/9.53.3/Readme.htm
-#usr/share/doc/ghostscript/9.53.3/Release.htm
-#usr/share/doc/ghostscript/9.53.3/SavedPages.htm
-#usr/share/doc/ghostscript/9.53.3/Source.htm
-#usr/share/doc/ghostscript/9.53.3/Unix-lpr.htm
-#usr/share/doc/ghostscript/9.53.3/Use.htm
-#usr/share/doc/ghostscript/9.53.3/VectorDevices.htm
-#usr/share/doc/ghostscript/9.53.3/WhatIsGS.htm
-#usr/share/doc/ghostscript/9.53.3/gdevds32.c
-#usr/share/doc/ghostscript/9.53.3/gs-style.css
-#usr/share/doc/ghostscript/9.53.3/images
-#usr/share/doc/ghostscript/9.53.3/images/Artifex_logo.png
-#usr/share/doc/ghostscript/9.53.3/images/favicon.png
-#usr/share/doc/ghostscript/9.53.3/images/ghostscript_logo.png
-#usr/share/doc/ghostscript/9.53.3/images/hamburger-light.png
-#usr/share/doc/ghostscript/9.53.3/images/x-light.png
-#usr/share/doc/ghostscript/9.53.3/index.html
-#usr/share/doc/ghostscript/9.53.3/index.js
-#usr/share/doc/ghostscript/9.53.3/pscet_status.txt
-#usr/share/doc/ghostscript/9.53.3/sample_downscale_device.htm
-#usr/share/doc/ghostscript/9.53.3/style.css
-#usr/share/doc/ghostscript/9.53.3/subclass.htm
-#usr/share/doc/ghostscript/9.53.3/thirdparty.htm
+#usr/share/doc/ghostscript/9.54.0
+#usr/share/doc/ghostscript/9.54.0/API.htm
+#usr/share/doc/ghostscript/9.54.0/C-style.htm
+#usr/share/doc/ghostscript/9.54.0/COPYING
+#usr/share/doc/ghostscript/9.54.0/Commprod.htm
+#usr/share/doc/ghostscript/9.54.0/DLL.htm
+#usr/share/doc/ghostscript/9.54.0/Deprecated.htm
+#usr/share/doc/ghostscript/9.54.0/Develop.htm
+#usr/share/doc/ghostscript/9.54.0/Devices.htm
+#usr/share/doc/ghostscript/9.54.0/Drivers.htm
+#usr/share/doc/ghostscript/9.54.0/Fonts.htm
+#usr/share/doc/ghostscript/9.54.0/GS9_Color_Management.pdf
+#usr/share/doc/ghostscript/9.54.0/History9.htm
+#usr/share/doc/ghostscript/9.54.0/Install.htm
+#usr/share/doc/ghostscript/9.54.0/Language.htm
+#usr/share/doc/ghostscript/9.54.0/Lib.htm
+#usr/share/doc/ghostscript/9.54.0/Make.htm
+#usr/share/doc/ghostscript/9.54.0/News.htm
+#usr/share/doc/ghostscript/9.54.0/Ps-style.htm
+#usr/share/doc/ghostscript/9.54.0/Ps2epsi.htm
+#usr/share/doc/ghostscript/9.54.0/Psfiles.htm
+#usr/share/doc/ghostscript/9.54.0/Readme.htm
+#usr/share/doc/ghostscript/9.54.0/Release.htm
+#usr/share/doc/ghostscript/9.54.0/SavedPages.htm
+#usr/share/doc/ghostscript/9.54.0/Source.htm
+#usr/share/doc/ghostscript/9.54.0/Unix-lpr.htm
+#usr/share/doc/ghostscript/9.54.0/Use.htm
+#usr/share/doc/ghostscript/9.54.0/VectorDevices.htm
+#usr/share/doc/ghostscript/9.54.0/WhatIsGS.htm
+#usr/share/doc/ghostscript/9.54.0/gdevds32.c
+#usr/share/doc/ghostscript/9.54.0/gs-style.css
+#usr/share/doc/ghostscript/9.54.0/images
+#usr/share/doc/ghostscript/9.54.0/images/Artifex_logo.png
+#usr/share/doc/ghostscript/9.54.0/images/favicon.png
+#usr/share/doc/ghostscript/9.54.0/images/ghostscript_logo.png
+#usr/share/doc/ghostscript/9.54.0/images/hamburger-light.png
+#usr/share/doc/ghostscript/9.54.0/images/x-light.png
+#usr/share/doc/ghostscript/9.54.0/index.html
+#usr/share/doc/ghostscript/9.54.0/index.js
+#usr/share/doc/ghostscript/9.54.0/pscet_status.txt
+#usr/share/doc/ghostscript/9.54.0/sample_downscale_device.htm
+#usr/share/doc/ghostscript/9.54.0/style.css
+#usr/share/doc/ghostscript/9.54.0/subclass.htm
+#usr/share/doc/ghostscript/9.54.0/thirdparty.htm
 #usr/share/ghostscript
-#usr/share/ghostscript/9.53.3
-#usr/share/ghostscript/9.53.3/lib
-#usr/share/ghostscript/9.53.3/lib/PDFA_def.ps
-#usr/share/ghostscript/9.53.3/lib/PDFX_def.ps
-#usr/share/ghostscript/9.53.3/lib/PM760p.upp
-#usr/share/ghostscript/9.53.3/lib/PM760pl.upp
-#usr/share/ghostscript/9.53.3/lib/PM820p.upp
-#usr/share/ghostscript/9.53.3/lib/PM820pl.upp
-#usr/share/ghostscript/9.53.3/lib/Stc670p.upp
-#usr/share/ghostscript/9.53.3/lib/Stc670pl.upp
-#usr/share/ghostscript/9.53.3/lib/Stc680p.upp
-#usr/share/ghostscript/9.53.3/lib/Stc680pl.upp
-#usr/share/ghostscript/9.53.3/lib/Stc740p.upp
-#usr/share/ghostscript/9.53.3/lib/Stc740pl.upp
-#usr/share/ghostscript/9.53.3/lib/Stc760p.upp
-#usr/share/ghostscript/9.53.3/lib/Stc760pl.upp
-#usr/share/ghostscript/9.53.3/lib/Stc777p.upp
-#usr/share/ghostscript/9.53.3/lib/Stc777pl.upp
-#usr/share/ghostscript/9.53.3/lib/Stp720p.upp
-#usr/share/ghostscript/9.53.3/lib/Stp720pl.upp
-#usr/share/ghostscript/9.53.3/lib/Stp870p.upp
-#usr/share/ghostscript/9.53.3/lib/Stp870pl.upp
-#usr/share/ghostscript/9.53.3/lib/acctest.ps
-#usr/share/ghostscript/9.53.3/lib/align.ps
-#usr/share/ghostscript/9.53.3/lib/bj8.rpd
-#usr/share/ghostscript/9.53.3/lib/bj8gc12f.upp
-#usr/share/ghostscript/9.53.3/lib/bj8hg12f.upp
-#usr/share/ghostscript/9.53.3/lib/bj8oh06n.upp
-#usr/share/ghostscript/9.53.3/lib/bj8pa06n.upp
-#usr/share/ghostscript/9.53.3/lib/bj8pp12f.upp
-#usr/share/ghostscript/9.53.3/lib/bj8ts06n.upp
-#usr/share/ghostscript/9.53.3/lib/bjc6000a1.upp
-#usr/share/ghostscript/9.53.3/lib/bjc6000b1.upp
-#usr/share/ghostscript/9.53.3/lib/bjc610a0.upp
-#usr/share/ghostscript/9.53.3/lib/bjc610a1.upp
-#usr/share/ghostscript/9.53.3/lib/bjc610a2.upp
-#usr/share/ghostscript/9.53.3/lib/bjc610a3.upp
-#usr/share/ghostscript/9.53.3/lib/bjc610a4.upp
-#usr/share/ghostscript/9.53.3/lib/bjc610a5.upp
-#usr/share/ghostscript/9.53.3/lib/bjc610a6.upp
-#usr/share/ghostscript/9.53.3/lib/bjc610a7.upp
-#usr/share/ghostscript/9.53.3/lib/bjc610a8.upp
-#usr/share/ghostscript/9.53.3/lib/bjc610b1.upp
-#usr/share/ghostscript/9.53.3/lib/bjc610b2.upp
-#usr/share/ghostscript/9.53.3/lib/bjc610b3.upp
-#usr/share/ghostscript/9.53.3/lib/bjc610b4.upp
-#usr/share/ghostscript/9.53.3/lib/bjc610b6.upp
-#usr/share/ghostscript/9.53.3/lib/bjc610b7.upp
-#usr/share/ghostscript/9.53.3/lib/bjc610b8.upp
-#usr/share/ghostscript/9.53.3/lib/caption.ps
-#usr/share/ghostscript/9.53.3/lib/cbjc600.ppd
-#usr/share/ghostscript/9.53.3/lib/cbjc800.ppd
-#usr/share/ghostscript/9.53.3/lib/cdj550.upp
-#usr/share/ghostscript/9.53.3/lib/cdj690.upp
-#usr/share/ghostscript/9.53.3/lib/cdj690ec.upp
-#usr/share/ghostscript/9.53.3/lib/cid2code.ps
-#usr/share/ghostscript/9.53.3/lib/dnj750c.upp
-#usr/share/ghostscript/9.53.3/lib/dnj750m.upp
-#usr/share/ghostscript/9.53.3/lib/docie.ps
-#usr/share/ghostscript/9.53.3/lib/font2pcl.ps
-#usr/share/ghostscript/9.53.3/lib/ghostpdf.ppd
-#usr/share/ghostscript/9.53.3/lib/gs_ce_e.ps
-#usr/share/ghostscript/9.53.3/lib/gs_il2_e.ps
-#usr/share/ghostscript/9.53.3/lib/gs_kanji.ps
-#usr/share/ghostscript/9.53.3/lib/gs_ksb_e.ps
-#usr/share/ghostscript/9.53.3/lib/gs_l.xbm
-#usr/share/ghostscript/9.53.3/lib/gs_l.xpm
-#usr/share/ghostscript/9.53.3/lib/gs_l_m.xbm
-#usr/share/ghostscript/9.53.3/lib/gs_lgo_e.ps
-#usr/share/ghostscript/9.53.3/lib/gs_lgx_e.ps
-#usr/share/ghostscript/9.53.3/lib/gs_m.xbm
-#usr/share/ghostscript/9.53.3/lib/gs_m.xpm
-#usr/share/ghostscript/9.53.3/lib/gs_m_m.xbm
-#usr/share/ghostscript/9.53.3/lib/gs_s.xbm
-#usr/share/ghostscript/9.53.3/lib/gs_s.xpm
-#usr/share/ghostscript/9.53.3/lib/gs_s_m.xbm
-#usr/share/ghostscript/9.53.3/lib/gs_t.xbm
-#usr/share/ghostscript/9.53.3/lib/gs_t.xpm
-#usr/share/ghostscript/9.53.3/lib/gs_t_m.xbm
-#usr/share/ghostscript/9.53.3/lib/gs_wl1_e.ps
-#usr/share/ghostscript/9.53.3/lib/gs_wl2_e.ps
-#usr/share/ghostscript/9.53.3/lib/gs_wl5_e.ps
-#usr/share/ghostscript/9.53.3/lib/gslp.ps
-#usr/share/ghostscript/9.53.3/lib/gsnup.ps
-#usr/share/ghostscript/9.53.3/lib/ht_ccsto.ps
-#usr/share/ghostscript/9.53.3/lib/image-qa.ps
-#usr/share/ghostscript/9.53.3/lib/jispaper.ps
-#usr/share/ghostscript/9.53.3/lib/landscap.ps
-#usr/share/ghostscript/9.53.3/lib/lines.ps
-#usr/share/ghostscript/9.53.3/lib/mkcidfm.ps
-#usr/share/ghostscript/9.53.3/lib/necp2x.upp
-#usr/share/ghostscript/9.53.3/lib/necp2x6.upp
-#usr/share/ghostscript/9.53.3/lib/pdf2dsc.ps
-#usr/share/ghostscript/9.53.3/lib/pdf_info.ps
-#usr/share/ghostscript/9.53.3/lib/pf2afm.ps
-#usr/share/ghostscript/9.53.3/lib/pfbtopfa.ps
-#usr/share/ghostscript/9.53.3/lib/ppath.ps
-#usr/share/ghostscript/9.53.3/lib/pphs.ps
-#usr/share/ghostscript/9.53.3/lib/prfont.ps
-#usr/share/ghostscript/9.53.3/lib/printafm.ps
-#usr/share/ghostscript/9.53.3/lib/ps2ai.ps
-#usr/share/ghostscript/9.53.3/lib/ps2epsi.ps
-#usr/share/ghostscript/9.53.3/lib/ras1.upp
-#usr/share/ghostscript/9.53.3/lib/ras24.upp
-#usr/share/ghostscript/9.53.3/lib/ras3.upp
-#usr/share/ghostscript/9.53.3/lib/ras32.upp
-#usr/share/ghostscript/9.53.3/lib/ras4.upp
-#usr/share/ghostscript/9.53.3/lib/ras8m.upp
-#usr/share/ghostscript/9.53.3/lib/rollconv.ps
-#usr/share/ghostscript/9.53.3/lib/s400a1.upp
-#usr/share/ghostscript/9.53.3/lib/s400b1.upp
-#usr/share/ghostscript/9.53.3/lib/sharp.upp
-#usr/share/ghostscript/9.53.3/lib/sipixa6.upp
-#usr/share/ghostscript/9.53.3/lib/st640ih.upp
-#usr/share/ghostscript/9.53.3/lib/st640ihg.upp
-#usr/share/ghostscript/9.53.3/lib/st640p.upp
-#usr/share/ghostscript/9.53.3/lib/st640pg.upp
-#usr/share/ghostscript/9.53.3/lib/st640pl.upp
-#usr/share/ghostscript/9.53.3/lib/st640plg.upp
-#usr/share/ghostscript/9.53.3/lib/stc.upp
-#usr/share/ghostscript/9.53.3/lib/stc1520h.upp
-#usr/share/ghostscript/9.53.3/lib/stc2.upp
-#usr/share/ghostscript/9.53.3/lib/stc200_h.upp
-#usr/share/ghostscript/9.53.3/lib/stc2_h.upp
-#usr/share/ghostscript/9.53.3/lib/stc2s_h.upp
-#usr/share/ghostscript/9.53.3/lib/stc300.upp
-#usr/share/ghostscript/9.53.3/lib/stc300bl.upp
-#usr/share/ghostscript/9.53.3/lib/stc300bm.upp
-#usr/share/ghostscript/9.53.3/lib/stc500p.upp
-#usr/share/ghostscript/9.53.3/lib/stc500ph.upp
-#usr/share/ghostscript/9.53.3/lib/stc600ih.upp
-#usr/share/ghostscript/9.53.3/lib/stc600p.upp
-#usr/share/ghostscript/9.53.3/lib/stc600pl.upp
-#usr/share/ghostscript/9.53.3/lib/stc640p.upp
-#usr/share/ghostscript/9.53.3/lib/stc740ih.upp
-#usr/share/ghostscript/9.53.3/lib/stc800ih.upp
-#usr/share/ghostscript/9.53.3/lib/stc800p.upp
-#usr/share/ghostscript/9.53.3/lib/stc800pl.upp
-#usr/share/ghostscript/9.53.3/lib/stc_h.upp
-#usr/share/ghostscript/9.53.3/lib/stc_l.upp
-#usr/share/ghostscript/9.53.3/lib/stcany.upp
-#usr/share/ghostscript/9.53.3/lib/stcany_h.upp
-#usr/share/ghostscript/9.53.3/lib/stcinfo.ps
-#usr/share/ghostscript/9.53.3/lib/stcolor.ps
-#usr/share/ghostscript/9.53.3/lib/stocht.ps
-#usr/share/ghostscript/9.53.3/lib/traceimg.ps
-#usr/share/ghostscript/9.53.3/lib/traceop.ps
-#usr/share/ghostscript/9.53.3/lib/uninfo.ps
-#usr/share/ghostscript/9.53.3/lib/viewcmyk.ps
-#usr/share/ghostscript/9.53.3/lib/viewgif.ps
-#usr/share/ghostscript/9.53.3/lib/viewjpeg.ps
-#usr/share/ghostscript/9.53.3/lib/viewmiff.ps
-#usr/share/ghostscript/9.53.3/lib/viewpbm.ps
-#usr/share/ghostscript/9.53.3/lib/viewpcx.ps
-#usr/share/ghostscript/9.53.3/lib/viewps2a.ps
-#usr/share/ghostscript/9.53.3/lib/winmaps.ps
-#usr/share/ghostscript/9.53.3/lib/zeroline.ps
+#usr/share/ghostscript/9.54.0
+#usr/share/ghostscript/9.54.0/lib
+usr/share/ghostscript/9.54.0/lib/PDFA_def.ps
+usr/share/ghostscript/9.54.0/lib/PDFX_def.ps
+usr/share/ghostscript/9.54.0/lib/PM760p.upp
+usr/share/ghostscript/9.54.0/lib/PM760pl.upp
+usr/share/ghostscript/9.54.0/lib/PM820p.upp
+usr/share/ghostscript/9.54.0/lib/PM820pl.upp
+usr/share/ghostscript/9.54.0/lib/Stc670p.upp
+usr/share/ghostscript/9.54.0/lib/Stc670pl.upp
+usr/share/ghostscript/9.54.0/lib/Stc680p.upp
+usr/share/ghostscript/9.54.0/lib/Stc680pl.upp
+usr/share/ghostscript/9.54.0/lib/Stc740p.upp
+usr/share/ghostscript/9.54.0/lib/Stc740pl.upp
+usr/share/ghostscript/9.54.0/lib/Stc760p.upp
+usr/share/ghostscript/9.54.0/lib/Stc760pl.upp
+usr/share/ghostscript/9.54.0/lib/Stc777p.upp
+usr/share/ghostscript/9.54.0/lib/Stc777pl.upp
+usr/share/ghostscript/9.54.0/lib/Stp720p.upp
+usr/share/ghostscript/9.54.0/lib/Stp720pl.upp
+usr/share/ghostscript/9.54.0/lib/Stp870p.upp
+usr/share/ghostscript/9.54.0/lib/Stp870pl.upp
+usr/share/ghostscript/9.54.0/lib/acctest.ps
+usr/share/ghostscript/9.54.0/lib/align.ps
+usr/share/ghostscript/9.54.0/lib/bj8.rpd
+usr/share/ghostscript/9.54.0/lib/bj8gc12f.upp
+usr/share/ghostscript/9.54.0/lib/bj8hg12f.upp
+usr/share/ghostscript/9.54.0/lib/bj8oh06n.upp
+usr/share/ghostscript/9.54.0/lib/bj8pa06n.upp
+usr/share/ghostscript/9.54.0/lib/bj8pp12f.upp
+usr/share/ghostscript/9.54.0/lib/bj8ts06n.upp
+usr/share/ghostscript/9.54.0/lib/bjc6000a1.upp
+usr/share/ghostscript/9.54.0/lib/bjc6000b1.upp
+usr/share/ghostscript/9.54.0/lib/bjc610a0.upp
+usr/share/ghostscript/9.54.0/lib/bjc610a1.upp
+usr/share/ghostscript/9.54.0/lib/bjc610a2.upp
+usr/share/ghostscript/9.54.0/lib/bjc610a3.upp
+usr/share/ghostscript/9.54.0/lib/bjc610a4.upp
+usr/share/ghostscript/9.54.0/lib/bjc610a5.upp
+usr/share/ghostscript/9.54.0/lib/bjc610a6.upp
+usr/share/ghostscript/9.54.0/lib/bjc610a7.upp
+usr/share/ghostscript/9.54.0/lib/bjc610a8.upp
+usr/share/ghostscript/9.54.0/lib/bjc610b1.upp
+usr/share/ghostscript/9.54.0/lib/bjc610b2.upp
+usr/share/ghostscript/9.54.0/lib/bjc610b3.upp
+usr/share/ghostscript/9.54.0/lib/bjc610b4.upp
+usr/share/ghostscript/9.54.0/lib/bjc610b6.upp
+usr/share/ghostscript/9.54.0/lib/bjc610b7.upp
+usr/share/ghostscript/9.54.0/lib/bjc610b8.upp
+usr/share/ghostscript/9.54.0/lib/caption.ps
+usr/share/ghostscript/9.54.0/lib/cbjc600.ppd
+usr/share/ghostscript/9.54.0/lib/cbjc800.ppd
+usr/share/ghostscript/9.54.0/lib/cdj550.upp
+usr/share/ghostscript/9.54.0/lib/cdj690.upp
+usr/share/ghostscript/9.54.0/lib/cdj690ec.upp
+usr/share/ghostscript/9.54.0/lib/cid2code.ps
+usr/share/ghostscript/9.54.0/lib/dnj750c.upp
+usr/share/ghostscript/9.54.0/lib/dnj750m.upp
+usr/share/ghostscript/9.54.0/lib/docie.ps
+usr/share/ghostscript/9.54.0/lib/font2pcl.ps
+usr/share/ghostscript/9.54.0/lib/ghostpdf.ppd
+usr/share/ghostscript/9.54.0/lib/gs_ce_e.ps
+usr/share/ghostscript/9.54.0/lib/gs_css_e.ps
+usr/share/ghostscript/9.54.0/lib/gs_il2_e.ps
+usr/share/ghostscript/9.54.0/lib/gs_kanji.ps
+usr/share/ghostscript/9.54.0/lib/gs_ksb_e.ps
+usr/share/ghostscript/9.54.0/lib/gs_l.xbm
+usr/share/ghostscript/9.54.0/lib/gs_l.xpm
+usr/share/ghostscript/9.54.0/lib/gs_l_m.xbm
+usr/share/ghostscript/9.54.0/lib/gs_lgo_e.ps
+usr/share/ghostscript/9.54.0/lib/gs_lgx_e.ps
+usr/share/ghostscript/9.54.0/lib/gs_m.xbm
+usr/share/ghostscript/9.54.0/lib/gs_m.xpm
+usr/share/ghostscript/9.54.0/lib/gs_m_m.xbm
+usr/share/ghostscript/9.54.0/lib/gs_s.xbm
+usr/share/ghostscript/9.54.0/lib/gs_s.xpm
+usr/share/ghostscript/9.54.0/lib/gs_s_m.xbm
+usr/share/ghostscript/9.54.0/lib/gs_t.xbm
+usr/share/ghostscript/9.54.0/lib/gs_t.xpm
+usr/share/ghostscript/9.54.0/lib/gs_t_m.xbm
+usr/share/ghostscript/9.54.0/lib/gs_wl1_e.ps
+usr/share/ghostscript/9.54.0/lib/gs_wl2_e.ps
+usr/share/ghostscript/9.54.0/lib/gs_wl5_e.ps
+usr/share/ghostscript/9.54.0/lib/gslp.ps
+usr/share/ghostscript/9.54.0/lib/gsnup.ps
+usr/share/ghostscript/9.54.0/lib/ht_ccsto.ps
+usr/share/ghostscript/9.54.0/lib/image-qa.ps
+usr/share/ghostscript/9.54.0/lib/jispaper.ps
+usr/share/ghostscript/9.54.0/lib/landscap.ps
+usr/share/ghostscript/9.54.0/lib/lines.ps
+usr/share/ghostscript/9.54.0/lib/mkcidfm.ps
+usr/share/ghostscript/9.54.0/lib/necp2x.upp
+usr/share/ghostscript/9.54.0/lib/necp2x6.upp
+usr/share/ghostscript/9.54.0/lib/pdf2dsc.ps
+usr/share/ghostscript/9.54.0/lib/pdf_info.ps
+usr/share/ghostscript/9.54.0/lib/pf2afm.ps
+usr/share/ghostscript/9.54.0/lib/pfbtopfa.ps
+usr/share/ghostscript/9.54.0/lib/ppath.ps
+usr/share/ghostscript/9.54.0/lib/pphs.ps
+usr/share/ghostscript/9.54.0/lib/prfont.ps
+usr/share/ghostscript/9.54.0/lib/printafm.ps
+usr/share/ghostscript/9.54.0/lib/ps2ai.ps
+usr/share/ghostscript/9.54.0/lib/ps2epsi.ps
+usr/share/ghostscript/9.54.0/lib/ras1.upp
+usr/share/ghostscript/9.54.0/lib/ras24.upp
+usr/share/ghostscript/9.54.0/lib/ras3.upp
+usr/share/ghostscript/9.54.0/lib/ras32.upp
+usr/share/ghostscript/9.54.0/lib/ras4.upp
+usr/share/ghostscript/9.54.0/lib/ras8m.upp
+usr/share/ghostscript/9.54.0/lib/rollconv.ps
+usr/share/ghostscript/9.54.0/lib/s400a1.upp
+usr/share/ghostscript/9.54.0/lib/s400b1.upp
+usr/share/ghostscript/9.54.0/lib/sharp.upp
+usr/share/ghostscript/9.54.0/lib/sipixa6.upp
+usr/share/ghostscript/9.54.0/lib/st640ih.upp
+usr/share/ghostscript/9.54.0/lib/st640ihg.upp
+usr/share/ghostscript/9.54.0/lib/st640p.upp
+usr/share/ghostscript/9.54.0/lib/st640pg.upp
+usr/share/ghostscript/9.54.0/lib/st640pl.upp
+usr/share/ghostscript/9.54.0/lib/st640plg.upp
+usr/share/ghostscript/9.54.0/lib/stc.upp
+usr/share/ghostscript/9.54.0/lib/stc1520h.upp
+usr/share/ghostscript/9.54.0/lib/stc2.upp
+usr/share/ghostscript/9.54.0/lib/stc200_h.upp
+usr/share/ghostscript/9.54.0/lib/stc2_h.upp
+usr/share/ghostscript/9.54.0/lib/stc2s_h.upp
+usr/share/ghostscript/9.54.0/lib/stc300.upp
+usr/share/ghostscript/9.54.0/lib/stc300bl.upp
+usr/share/ghostscript/9.54.0/lib/stc300bm.upp
+usr/share/ghostscript/9.54.0/lib/stc500p.upp
+usr/share/ghostscript/9.54.0/lib/stc500ph.upp
+usr/share/ghostscript/9.54.0/lib/stc600ih.upp
+usr/share/ghostscript/9.54.0/lib/stc600p.upp
+usr/share/ghostscript/9.54.0/lib/stc600pl.upp
+usr/share/ghostscript/9.54.0/lib/stc640p.upp
+usr/share/ghostscript/9.54.0/lib/stc740ih.upp
+usr/share/ghostscript/9.54.0/lib/stc800ih.upp
+usr/share/ghostscript/9.54.0/lib/stc800p.upp
+usr/share/ghostscript/9.54.0/lib/stc800pl.upp
+usr/share/ghostscript/9.54.0/lib/stc_h.upp
+usr/share/ghostscript/9.54.0/lib/stc_l.upp
+usr/share/ghostscript/9.54.0/lib/stcany.upp
+usr/share/ghostscript/9.54.0/lib/stcany_h.upp
+usr/share/ghostscript/9.54.0/lib/stcinfo.ps
+usr/share/ghostscript/9.54.0/lib/stcolor.ps
+usr/share/ghostscript/9.54.0/lib/stocht.ps
+usr/share/ghostscript/9.54.0/lib/traceimg.ps
+usr/share/ghostscript/9.54.0/lib/traceop.ps
+usr/share/ghostscript/9.54.0/lib/uninfo.ps
+usr/share/ghostscript/9.54.0/lib/viewcmyk.ps
+usr/share/ghostscript/9.54.0/lib/viewgif.ps
+usr/share/ghostscript/9.54.0/lib/viewjpeg.ps
+usr/share/ghostscript/9.54.0/lib/viewmiff.ps
+usr/share/ghostscript/9.54.0/lib/viewpbm.ps
+usr/share/ghostscript/9.54.0/lib/viewpcx.ps
+usr/share/ghostscript/9.54.0/lib/viewps2a.ps
+usr/share/ghostscript/9.54.0/lib/winmaps.ps
+usr/share/ghostscript/9.54.0/lib/zeroline.ps
 #usr/share/ghostscript/fonts
 #usr/share/ghostscript/fonts/COPYING
 #usr/share/ghostscript/fonts/ChangeLog
diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index 35611ac08..0da771a5a 100644
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -1974,11 +1974,13 @@ sub getcolor
 		#Check if IP is part of a IPsec N2N network
 		foreach my $key (sort keys %ipsecconf){
 			if ($ipsecconf{$key}[11]){
-				my ($a,$b) = split("/",$ipsecconf{$key}[11]);
-				$b=&General::iporsubtodec($b);
-				if (&General::IpInSubnet($sip,$a,$b)){
-					$tdcolor="<font style='color: $Header::colourvpn;'>$c</font>";
-					return $tdcolor;
+				foreach my $ipsecsubitem (split(/\|/, $ipsecconf{$key}[11])) {
+					my ($a,$b) = split("/",$ipsecsubitem);
+					$b=&General::iporsubtodec($b);
+					if (&General::IpInSubnet($sip,$a,$b)){
+						$tdcolor="<font style='color: $Header::colourvpn;'>$c</font>";
+						return $tdcolor;
+					}
 				}
 			}
 		}
diff --git a/lfs/alsa b/lfs/alsa
index 23ad58cf6..264849e11 100644
--- a/lfs/alsa
+++ b/lfs/alsa
@@ -25,9 +25,9 @@
 include Config
 
 
-VER        = 1.0.27.1
-UVER       = 1.0.27.1
-FVER       = 1.0.27
+VER        = 1.2.5.1
+UVER       = 1.2.5.1
+FVER       = 1.2.4
 
 VERSUFIX   = ipfire$(KCFG)
 
@@ -36,7 +36,7 @@ DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 PROG       = alsa
-PAK_VER    = 12
+PAK_VER    = 13
 
 DEPS       =
 
@@ -52,9 +52,9 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 alsa-utils-$(UVER).tar.bz2 = $(DL_FROM)/alsa-utils-$(UVER).tar.bz2
 alsa-firmware-$(FVER).tar.bz2 = $(DL_FROM)/alsa-firmware-$(FVER).tar.bz2
 
-$(DL_FILE)_MD5 = 17102aaab10e9d4b19f6b02937bab015
-alsa-utils-$(UVER).tar.bz2_MD5 = 3d81357b997744a139881ef72bc6921a
-alsa-firmware-$(FVER).tar.bz2_MD5 = b373b350d5151dd7d64db2fc12936b04
+$(DL_FILE)_MD5 = c8335793e7828803311edc48fb71662e
+alsa-utils-$(UVER).tar.bz2_MD5 = 8f142bebff84ff05438b46a0e896f53a
+alsa-firmware-$(FVER).tar.bz2_MD5 = ee6c1d24a1a4ac1d86992b408ed710a2
 
 install : $(TARGET)
 
diff --git a/lfs/ghostscript b/lfs/ghostscript
index 696f95b29..1ee14a16e 100644
--- a/lfs/ghostscript
+++ b/lfs/ghostscript
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 9.53.3
+VER        = 9.54.0
 
 THISAPP    = ghostscript-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ghostscript
-PAK_VER    = 7
+PAK_VER    = 8
 
 DEPS       = cups dbus libtiff
 
@@ -48,7 +48,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 ghostscript-fonts-std-8.11.tar.gz = $(URL_IPFIRE)/ghostscript-fonts-std-8.11.tar.gz
 gnu-gs-fonts-other-6.0.tar.gz = $(URL_IPFIRE)/gnu-gs-fonts-other-6.0.tar.gz
 
-$(DL_FILE)_MD5 = bf0b41d6e19fdeb4b050afad309248d2
+$(DL_FILE)_MD5 = 72535d31018129a1a8ff636a47ba1f92
 ghostscript-fonts-std-8.11.tar.gz_MD5 = 6865682b095f8c4500c54b285ff05ef6
 gnu-gs-fonts-other-6.0.tar.gz_MD5 = 33457d3f37de7ef03d2eea05a9e6aa4f
 
@@ -83,7 +83,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ghostscript-drop-use-of-FT_CALLBACK_DEF-with-Freetype-2.10.3-and-later.patch
 	cd $(DIR_APP) && rm -rf expat freetype icclib jasper jpeg jpegxr \
 		lcms lcms2 libpng openjpeg zlib cups/libs
 	cd $(DIR_APP) && \
diff --git a/lfs/intltool b/lfs/intltool
index 234262f62..bc5008a52 100644
--- a/lfs/intltool
+++ b/lfs/intltool
@@ -24,15 +24,15 @@
 
 include Config
 
-VER        = 0.40.5
+VER        = 0.51.0
 
 THISAPP    = intltool-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = intltool
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       =
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 3e7ded6f50d88cf8b8bb505eaf591775
+$(DL_FILE)_MD5 = 12e517cac2b57a0121cda351570f1e63
 
 install : $(TARGET)
 
@@ -77,7 +77,7 @@ dist:
 
 $(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
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install
diff --git a/lfs/iperf3 b/lfs/iperf3
index e40feaed8..ba3b1b942 100644
--- a/lfs/iperf3
+++ b/lfs/iperf3
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.9
+VER        = 3.10.1
 
 THISAPP    = iperf-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = iperf3
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       =
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 510fdb0943e88da5e0063f4599fa14f3
+$(DL_FILE)_MD5 = 9c981555af2eb9479135c5247c30d2ca
 
 install : $(TARGET)
 check : $(patsubst %,$(DIR_CHK)/%,$(objects))
diff --git a/make.sh b/make.sh
index d78fb2ff0..0baf2050d 100755
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 # If you update the version don't forget to update backupiso and add it to core update
 VERSION="2.27"							# Version number
-CORE="159"							# Core Level (Filename)
+CORE="160"							# Core Level (Filename)
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir
 MAX_RETRIES=1							# prefetch/check loop
diff --git a/src/patches/ghostscript-drop-use-of-FT_CALLBACK_DEF-with-Freetype-2.10.3-and-later.patch b/src/patches/ghostscript-drop-use-of-FT_CALLBACK_DEF-with-Freetype-2.10.3-and-later.patch
deleted file mode 100644
index 78014667d..000000000
--- a/src/patches/ghostscript-drop-use-of-FT_CALLBACK_DEF-with-Freetype-2.10.3-and-later.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 41ef9a0bc36b9db7115fbe9623f989bfb47bbade Mon Sep 17 00:00:00 2001
-From: Chris Liddell <chris.liddell(a)artifex.com>
-Date: Tue, 20 Oct 2020 09:49:45 +0100
-Subject: [PATCH] Bug 702985: drop use of FT_CALLBACK_DEF() def
-
-From 2.10.3, Freetype disappeared the FT_CALLBACK_DEF() macro, which is what
-we used when defining our callbacks from Freetype.
-
-No guidance forthcoming from the Freetype developer who made those changes,
-so change to explicitly declaring the callbacks file static.
-
-Should fix the reported build failures.
----
- base/fapi_ft.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/base/fapi_ft.c b/base/fapi_ft.c
-index 65fa6dcf4..21aef2f06 100644
---- a/base/fapi_ft.c
-+++ b/base/fapi_ft.c
-@@ -125,7 +125,7 @@ static void
- delete_inc_int_info(gs_fapi_server * a_server,
-                     FT_IncrementalRec * a_inc_int_info);
- 
--FT_CALLBACK_DEF(void *)
-+static void *
- FF_alloc(FT_Memory memory, long size)
- {
-     gs_memory_t *mem = (gs_memory_t *) memory->user;
-@@ -133,7 +133,7 @@ FF_alloc(FT_Memory memory, long size)
-     return (gs_malloc(mem, size, 1, "FF_alloc"));
- }
- 
--FT_CALLBACK_DEF(void *)
-+static void *
-     FF_realloc(FT_Memory memory, long cur_size, long new_size, void *block)
- {
-     gs_memory_t *mem = (gs_memory_t *) memory->user;
-@@ -153,7 +153,7 @@ FT_CALLBACK_DEF(void *)
-     return (tmp);
- }
- 
--FT_CALLBACK_DEF(void)
-+static void
-     FF_free(FT_Memory memory, void *block)
- {
-     gs_memory_t *mem = (gs_memory_t *) memory->user;
--- 
-2.17.1
-


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

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

only message in thread, other threads:[~2021-08-09 15:37 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-09 15:37 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. b89454b52a0f29cb4336c1e57f6a856cfa16fb3c Arne Fitzenreiter

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