Development June 2022

development@lists.ipfire.org

15 participants
66 discussions

[PATCH] bind: Update to 9.16.30
by Matthias Fischer 16 Jun '22

16 Jun '22

For details see: https://downloads.isc.org/isc/bind9/9.16.30/doc/arm/html/notes.html#notes-f… "Bug Fixes The fetches-per-server quota is designed to adjust itself downward automatically when an authoritative server times out too frequently. Due to a coding error, that adjustment was applied incorrectly, so that the quota for a congested server was always set to 1. This has been fixed. [GL #3327] DNSSEC-signed catalog zones were not being processed correctly. This has been fixed. [GL #3380] Key files were updated every time the dnssec-policy key manager ran, whether the metadata had changed or not. named now checks whether changes were applied before writing out the key files. [GL #3302]" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/bind | 14 +++++++------- lfs/bind | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind index 0d41c90e5..60ec36f45 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.28.so +usr/lib/libbind9-9.16.30.so #usr/lib/libbind9.la #usr/lib/libbind9.so -usr/lib/libdns-9.16.28.so +usr/lib/libdns-9.16.30.so #usr/lib/libdns.la #usr/lib/libdns.so -usr/lib/libirs-9.16.28.so +usr/lib/libirs-9.16.30.so #usr/lib/libirs.la #usr/lib/libirs.so -usr/lib/libisc-9.16.28.so +usr/lib/libisc-9.16.30.so #usr/lib/libisc.la #usr/lib/libisc.so -usr/lib/libisccc-9.16.28.so +usr/lib/libisccc-9.16.30.so #usr/lib/libisccc.la #usr/lib/libisccc.so -usr/lib/libisccfg-9.16.28.so +usr/lib/libisccfg-9.16.30.so #usr/lib/libisccfg.la #usr/lib/libisccfg.so -usr/lib/libns-9.16.28.so +usr/lib/libns-9.16.30.so #usr/lib/libns.la #usr/lib/libns.so diff --git a/lfs/bind b/lfs/bind index e3efc84a1..a492624f8 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@ include Config -VER = 9.16.28 +VER = 9.16.30 THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 55932faa004c2021cd4c3384c14d4a58ca43d5a853602e271b58c9022256a5ec2eb1317168ac07c2b233b19407ddfb8c7f64a50d93169207cb3b4fe535a78afa +$(DL_FILE)_BLAKE2 = 35fe14b58a018df25563e58a9632b4431f740bc7a708eb823117541548d23b1855e43058cf7323361ca904d5e59d687e282abb73dc8b617e4eb25ef113168e93 install : $(TARGET) -- 2.25.1

2 1

Several errors in /var/log/httpd/error_log during Pakfire update to Core 168
by Matthias Fischer 16 Jun '22

16 Jun '22

Hi all, although the update to Core 168 via pakfire ran without visible errors and system is up and running, I've found some errors in '/var/log/httpd/error_log' after upgrading - please see attached log. On the one hand there are several access errors: ... exec of '/srv/web/ipfire/cgi-bin/pakfire.cgi' failed ... On the other hand (verified) a perl library is missing: ... Can't locate HTTP/Date.pm: /usr/lib/perl5/site_perl/5.32.1/x86_64-linux-thread-multi/HTTP/Date.pm BEGIN failed--compilation aborted at /usr/lib/perl5/site_perl/5.32.1/LWP/UserAgent.pm line 11. Compilation failed in require at /opt/pakfire/lib/functions.pl line 27. BEGIN failed--compilation aborted at /opt/pakfire/lib/functions.pl line 27. Compilation failed in require at /srv/web/ipfire/cgi-bin/pakfire.cgi line 33. ... Can anone confirm? Should I raise a bug report? Best, Matthias

5 10

Core Update 169 merge window closes by the end of this week
by Peter Müller 16 Jun '22

16 Jun '22

Hello development folks, as discussed yesterday (https://wiki.ipfire.org/devel/telco/2022-06-13), I would like to close the merge window for Core Update 169 by the end of this week (i.e. Sunday). Currently, the update features a toolchain update, to bring some GCC fixes to our users. An updated kernel plugs several recently disclosed security vulnerabilities, some of them related to BPF. None of them is critical and/or remotely exploitable, but they leverage local privilege escalation, which we don't want in IPFire. :-) Lastly, an updated linux-firmware petting zoo brings all the shiny proprietary firmware of various vendors to our users, and we can only hope that they benefit from whatever changes were made in all these binary blobs. Currently, the update is pretty large (95 MBytes) already. Should any of you have changes in the pipeline that are space-intensive, I would like to abstain from including them in C169, and rather put them into C170. Michael's OpenVPN 2FA merge request is yet to come, and I need to update U-Boot. To cut it short, please submit patches you want to have in C169 soon. It is my intention to provide our users with a testing Core Update as soon as possible, ideally not waiting as long for the final release as we unfortunately had to with C168. Stay safe, and best regards, Peter Müller

2 1

[PATCH] dnsdist: Update to 1.7.2
by Michael Tremer 15 Jun '22

15 Jun '22

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- lfs/dnsdist | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/dnsdist b/lfs/dnsdist index 06ed4e88e..9b668f40a 100644 --- a/lfs/dnsdist +++ b/lfs/dnsdist @@ -26,7 +26,7 @@ include Config SUMMARY = A highly DNS-, DoS- and abuse-aware loadbalancer -VER = 1.7.0 +VER = 1.7.2 THISAPP = dnsdist-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = dnsdist -PAK_VER = 11 +PAK_VER = 12 SUP_ARCH = x86_64 aarch64 @@ -52,7 +52,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 3766da5f63df6390f555307d665efcbb2ad1462abae3af44503479d4c6ae6453e43527d2bcac718fabeb8b60ec989f264860532b480c465afc440405f9efac74 +$(DL_FILE)_BLAKE2 = cf2a9853be4c896b3909f871fad771d4298eb2586702a8a85eff2c612d275214cdad82e93961f4cfd58300f5629f06569c51a2c4f15de58188a69116bd5275de install : $(TARGET) -- 2.30.2

2 1

U-Boot is in need of an update
by Peter Müller 13 Jun '22

13 Jun '22

Hello Arne, first and foremost, I hope you are well or at least being on the path of recovery. The other day, I stumbled across https://research.nccgroup.com/2022/06/03/technical-advisory-multiple-vulner…, which reminded me again of wanting to ask you about an update of U-Boot. Since I do not have any ARM installations in production, and certainly do not have both experience and a hardware arsenal close to yours, it would be great if you could have a look at it. By the way: For Core Update 169, I currently plan to ship both a (smaller) linux- firmware update and a new kernel. According to the nightly build, we are currently at 21 MByte, so this might fit in. :-) Have a nice weekend! Thanks, and best regards, Peter Müller

2 1

[PATCH] localnet: Add "edns0" to /etc/resolv.conf options for RFC 2671 support
by Peter Müller 13 Jun '22

13 Jun '22

Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- src/initscripts/system/localnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/initscripts/system/localnet b/src/initscripts/system/localnet index f260a1f29..ffa05e397 100644 --- a/src/initscripts/system/localnet +++ b/src/initscripts/system/localnet @@ -26,7 +26,7 @@ write_resolv_conf() { ( [ -n "${DOMAINNAME}" ] && echo "search ${DOMAINNAME}" echo "nameserver 127.0.0.1" - echo "options trust-ad" + echo "options edns0 trust-ad" ) > /etc/resolv.conf } -- 2.35.3

2 1

[PATCH] sysctl: For the sake of completeness, do not accept IPv6 redirects
by Peter Müller 13 Jun '22

13 Jun '22

While IPFire 2.x' web interface does not support IPv6, users can technically run it with IPv6 by conducting the necessary configuration changes manually. To provide these systems as well, we should disable acceptance of ICMPv6 redirect packets - which is apparently not default in Linux, yet. :-/ Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- config/etc/sysctl.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf index 7fe397bb7..6bf3bc887 100644 --- a/config/etc/sysctl.conf +++ b/config/etc/sysctl.conf @@ -31,6 +31,10 @@ vm.min_free_kbytes = 8192 net.ipv6.conf.all.disable_ipv6 = 1 net.ipv6.conf.default.disable_ipv6 = 1 +# However, enable some IPv6 hardening sysctl's in case this system is run customly _with_ IPv6. +net.ipv6.conf.all.accept_redirects = 0 +net.ipv6.conf.default.accept_redirects = 0 + # Enable netfilter accounting net.netfilter.nf_conntrack_acct = 1 -- 2.35.3

2 1

[PATCH] flash-images: Harden mount options of /boot
by Peter Müller 13 Jun '22

13 Jun '22

Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- lfs/flash-images | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/flash-images b/lfs/flash-images index 3cf81fb6d..8a033c310 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -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 # @@ -167,7 +167,7 @@ endif # Create /etc/fstab printf "$(FSTAB_FMT)" "$$(blkid -o value -s UUID $(PART_BOOT))" "/boot" \ - "auto" "defaults" 1 2 > $(MNThdd)/etc/fstab + "auto" "defaults,nodev,noexec,nosuid" 1 2 > $(MNThdd)/etc/fstab ifeq "$(EFI)" "1" printf "$(FSTAB_FMT)" "$$(blkid -o value -s UUID $(PART_EFI))" "/boot/efi" \ "auto" "defaults" 1 2 >> $(MNThdd)/etc/fstab -- 2.35.3

2 1

[PATCH] linux-firmware: Update to 20220610
by Peter Müller 13 Jun '22

13 Jun '22

No changelog is provided, please refer to https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/ for all activity since the previous version. This patch includes necessary directives for shipping added or modified firmware files with Core Update 169, and deleting appropriate files on existing installations. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- config/rootfiles/common/linux-firmware | 109 ++++++++---- config/rootfiles/core/169/filelists/files | 206 +++++++++++++++++++++- config/rootfiles/core/169/update.sh | 33 ++++ lfs/linux-firmware | 4 +- 4 files changed, 315 insertions(+), 37 deletions(-) diff --git a/config/rootfiles/common/linux-firmware b/config/rootfiles/common/linux-firmware index 8d18c5258..319d7dcc9 100644 --- a/config/rootfiles/common/linux-firmware +++ b/config/rootfiles/common/linux-firmware @@ -620,11 +620,12 @@ lib/firmware/ath10k/QCA9984/hw1.0/firmware-5.bin #lib/firmware/ath10k/QCA9984/hw1.0/notice_ath10k_firmware-5.txt #lib/firmware/ath10k/QCA99X0 #lib/firmware/ath10k/QCA99X0/hw2.0 -lib/firmware/ath10k/QCA99X0/hw2.0/board.bin +lib/firmware/ath10k/QCA99X0/hw2.0/board-2.bin lib/firmware/ath10k/QCA99X0/hw2.0/firmware-5.bin #lib/firmware/ath10k/QCA99X0/hw2.0/notice_ath10k_firmware-5.txt #lib/firmware/ath10k/WCN3990 lib/firmware/ath10k/WCN3990/hw1.0 +lib/firmware/ath10k/WCN3990/hw1.0/board-2.bin lib/firmware/ath10k/WCN3990/hw1.0/firmware-5.bin #lib/firmware/ath10k/WCN3990/hw1.0/notice.txt_wlanmdsp lib/firmware/ath10k/WCN3990/hw1.0/wlanmdsp.mbn @@ -673,6 +674,26 @@ lib/firmware/ath11k/QCA6390/hw2.0 lib/firmware/ath11k/QCA6390/hw2.0/amss.bin lib/firmware/ath11k/QCA6390/hw2.0/board-2.bin lib/firmware/ath11k/QCA6390/hw2.0/m3.bin +#lib/firmware/ath11k/QCN9074 +#lib/firmware/ath11k/QCN9074/hw1.0 +#lib/firmware/ath11k/QCN9074/hw1.0/Notice.txt +lib/firmware/ath11k/QCN9074/hw1.0/amss.bin +lib/firmware/ath11k/QCN9074/hw1.0/board-2.bin +lib/firmware/ath11k/QCN9074/hw1.0/m3.bin +#lib/firmware/ath11k/WCN6750 +#lib/firmware/ath11k/WCN6750/hw1.0 +#lib/firmware/ath11k/WCN6750/hw1.0/Notice.txt +lib/firmware/ath11k/WCN6750/hw1.0/board-2.bin +lib/firmware/ath11k/WCN6750/hw1.0/wpss.b00 +lib/firmware/ath11k/WCN6750/hw1.0/wpss.b01 +lib/firmware/ath11k/WCN6750/hw1.0/wpss.b02 +lib/firmware/ath11k/WCN6750/hw1.0/wpss.b03 +lib/firmware/ath11k/WCN6750/hw1.0/wpss.b04 +lib/firmware/ath11k/WCN6750/hw1.0/wpss.b05 +lib/firmware/ath11k/WCN6750/hw1.0/wpss.b06 +lib/firmware/ath11k/WCN6750/hw1.0/wpss.b07 +lib/firmware/ath11k/WCN6750/hw1.0/wpss.b08 +lib/firmware/ath11k/WCN6750/hw1.0/wpss.mdt #lib/firmware/ath11k/WCN6855 #lib/firmware/ath11k/WCN6855/hw2.0 #lib/firmware/ath11k/WCN6855/hw2.0/Notice.txt @@ -862,6 +883,8 @@ lib/firmware/brcm/brcmfmac4339-sdio.bin lib/firmware/brcm/brcmfmac43430-sdio.AP6212.txt lib/firmware/brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt lib/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt +lib/firmware/brcm/brcmfmac43430-sdio.beagle,beaglev-starlight-jh7100-a1.txt +lib/firmware/brcm/brcmfmac43430-sdio.beagle,beaglev-starlight-jh7100-r0.txt lib/firmware/brcm/brcmfmac43430-sdio.bin lib/firmware/brcm/brcmfmac43430-sdio.clm_blob lib/firmware/brcm/brcmfmac43430-sdio.friendlyarm,nanopi-r1.txt @@ -871,6 +894,7 @@ lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-plus.txt lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-ultra.txt lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-zero.txt lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m3.txt +lib/firmware/brcm/brcmfmac43430-sdio.starfive,visionfive-v1.txt lib/firmware/brcm/brcmfmac43430a0-sdio.ONDA-V80_PLUS.txt lib/firmware/brcm/brcmfmac43430a0-sdio.bin lib/firmware/brcm/brcmfmac43430a0-sdio.ilife-S806.txt @@ -881,6 +905,7 @@ lib/firmware/brcm/brcmfmac43455-sdio.Raspberry_Pi_Foundation-Raspberry_Pi_Comput lib/firmware/brcm/brcmfmac43455-sdio.acepc-t8.txt lib/firmware/brcm/brcmfmac43455-sdio.bin lib/firmware/brcm/brcmfmac43455-sdio.clm_blob +lib/firmware/brcm/brcmfmac43455-sdio.pine64,quartz64-b.txt lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt @@ -1093,6 +1118,7 @@ lib/firmware/i915/adlp_dmc_ver2_14.bin lib/firmware/i915/adlp_dmc_ver2_16.bin lib/firmware/i915/adlp_guc_62.0.3.bin lib/firmware/i915/adlp_guc_69.0.3.bin +lib/firmware/i915/adlp_guc_70.1.1.bin lib/firmware/i915/adls_dmc_ver2_01.bin lib/firmware/i915/bxt_dmc_ver1.bin lib/firmware/i915/bxt_dmc_ver1_07.bin @@ -1101,6 +1127,7 @@ lib/firmware/i915/bxt_guc_33.0.0.bin lib/firmware/i915/bxt_guc_49.0.1.bin lib/firmware/i915/bxt_guc_62.0.0.bin lib/firmware/i915/bxt_guc_69.0.3.bin +lib/firmware/i915/bxt_guc_70.1.1.bin lib/firmware/i915/bxt_guc_ver8_7.bin lib/firmware/i915/bxt_guc_ver9_29.bin lib/firmware/i915/bxt_huc_2.0.0.bin @@ -1110,6 +1137,7 @@ lib/firmware/i915/cml_guc_33.0.0.bin lib/firmware/i915/cml_guc_49.0.1.bin lib/firmware/i915/cml_guc_62.0.0.bin lib/firmware/i915/cml_guc_69.0.3.bin +lib/firmware/i915/cml_guc_70.1.1.bin lib/firmware/i915/cml_huc_4.0.0.bin lib/firmware/i915/cnl_dmc_ver1_06.bin lib/firmware/i915/cnl_dmc_ver1_07.bin @@ -1117,12 +1145,16 @@ lib/firmware/i915/dg1_dmc_ver2_02.bin lib/firmware/i915/dg1_guc_49.0.1.bin lib/firmware/i915/dg1_guc_62.0.0.bin lib/firmware/i915/dg1_guc_69.0.3.bin +lib/firmware/i915/dg1_guc_70.1.1.bin lib/firmware/i915/dg1_huc_7.7.1.bin lib/firmware/i915/dg1_huc_7.9.3.bin +lib/firmware/i915/dg2_dmc_ver2_06.bin +lib/firmware/i915/dg2_guc_70.1.2.bin lib/firmware/i915/ehl_guc_33.0.4.bin lib/firmware/i915/ehl_guc_49.0.1.bin lib/firmware/i915/ehl_guc_62.0.0.bin lib/firmware/i915/ehl_guc_69.0.3.bin +lib/firmware/i915/ehl_guc_70.1.1.bin lib/firmware/i915/ehl_huc_9.0.0.bin lib/firmware/i915/glk_dmc_ver1_04.bin lib/firmware/i915/glk_guc_32.0.3.bin @@ -1130,6 +1162,7 @@ lib/firmware/i915/glk_guc_33.0.0.bin lib/firmware/i915/glk_guc_49.0.1.bin lib/firmware/i915/glk_guc_62.0.0.bin lib/firmware/i915/glk_guc_69.0.3.bin +lib/firmware/i915/glk_guc_70.1.1.bin lib/firmware/i915/glk_huc_4.0.0.bin lib/firmware/i915/glk_huc_ver03_01_2893.bin lib/firmware/i915/icl_dmc_ver1_07.bin @@ -1139,6 +1172,7 @@ lib/firmware/i915/icl_guc_33.0.0.bin lib/firmware/i915/icl_guc_49.0.1.bin lib/firmware/i915/icl_guc_62.0.0.bin lib/firmware/i915/icl_guc_69.0.3.bin +lib/firmware/i915/icl_guc_70.1.1.bin lib/firmware/i915/icl_huc_9.0.0.bin lib/firmware/i915/icl_huc_ver8_4_3238.bin lib/firmware/i915/kbl_dmc_ver1.bin @@ -1149,6 +1183,7 @@ lib/firmware/i915/kbl_guc_33.0.0.bin lib/firmware/i915/kbl_guc_49.0.1.bin lib/firmware/i915/kbl_guc_62.0.0.bin lib/firmware/i915/kbl_guc_69.0.3.bin +lib/firmware/i915/kbl_guc_70.1.1.bin lib/firmware/i915/kbl_guc_ver9_14.bin lib/firmware/i915/kbl_guc_ver9_39.bin lib/firmware/i915/kbl_huc_4.0.0.bin @@ -1164,6 +1199,7 @@ lib/firmware/i915/skl_guc_33.0.0.bin lib/firmware/i915/skl_guc_49.0.1.bin lib/firmware/i915/skl_guc_62.0.0.bin lib/firmware/i915/skl_guc_69.0.3.bin +lib/firmware/i915/skl_guc_70.1.1.bin lib/firmware/i915/skl_guc_ver1.bin lib/firmware/i915/skl_guc_ver4.bin lib/firmware/i915/skl_guc_ver6.bin @@ -1179,6 +1215,7 @@ lib/firmware/i915/tgl_guc_35.2.0.bin lib/firmware/i915/tgl_guc_49.0.1.bin lib/firmware/i915/tgl_guc_62.0.0.bin lib/firmware/i915/tgl_guc_69.0.3.bin +lib/firmware/i915/tgl_guc_70.1.1.bin lib/firmware/i915/tgl_huc_7.0.12.bin lib/firmware/i915/tgl_huc_7.0.3.bin lib/firmware/i915/tgl_huc_7.5.0.bin @@ -1296,7 +1333,7 @@ lib/firmware/intel/ice/ddp-comms lib/firmware/intel/ice/ddp-comms/ice_comms-1.3.31.0.pkg lib/firmware/intel/ice/ddp-wireless_edge lib/firmware/intel/ice/ddp-wireless_edge/ice_wireless_edge-1.3.7.0.pkg -lib/firmware/intel/ice/ddp/ice-1.3.26.0.pkg +lib/firmware/intel/ice/ddp/ice-1.3.28.0.pkg lib/firmware/intel/ice/ddp/ice.pkg lib/firmware/intel/ipu3-fw.bin lib/firmware/intel/irci_irci_ecr-master_20161208_0213_20170112_1500.bin @@ -1313,15 +1350,7 @@ lib/firmware/iwlwifi-105-6.ucode lib/firmware/iwlwifi-135-6.ucode lib/firmware/iwlwifi-2000-6.ucode lib/firmware/iwlwifi-2030-6.ucode -lib/firmware/iwlwifi-3160-10.ucode -lib/firmware/iwlwifi-3160-12.ucode -lib/firmware/iwlwifi-3160-13.ucode -lib/firmware/iwlwifi-3160-16.ucode lib/firmware/iwlwifi-3160-17.ucode -lib/firmware/iwlwifi-3160-7.ucode -lib/firmware/iwlwifi-3160-8.ucode -lib/firmware/iwlwifi-3160-9.ucode -lib/firmware/iwlwifi-3168-21.ucode lib/firmware/iwlwifi-3168-22.ucode lib/firmware/iwlwifi-3168-27.ucode lib/firmware/iwlwifi-3168-29.ucode @@ -1338,39 +1367,16 @@ lib/firmware/iwlwifi-6000g2b-5.ucode lib/firmware/iwlwifi-6000g2b-6.ucode lib/firmware/iwlwifi-6050-4.ucode lib/firmware/iwlwifi-6050-5.ucode -lib/firmware/iwlwifi-7260-10.ucode -lib/firmware/iwlwifi-7260-12.ucode -lib/firmware/iwlwifi-7260-13.ucode -lib/firmware/iwlwifi-7260-16.ucode lib/firmware/iwlwifi-7260-17.ucode -lib/firmware/iwlwifi-7260-7.ucode -lib/firmware/iwlwifi-7260-8.ucode -lib/firmware/iwlwifi-7260-9.ucode -lib/firmware/iwlwifi-7265-10.ucode -lib/firmware/iwlwifi-7265-12.ucode -lib/firmware/iwlwifi-7265-13.ucode -lib/firmware/iwlwifi-7265-16.ucode lib/firmware/iwlwifi-7265-17.ucode -lib/firmware/iwlwifi-7265-8.ucode -lib/firmware/iwlwifi-7265-9.ucode -lib/firmware/iwlwifi-7265D-10.ucode -lib/firmware/iwlwifi-7265D-12.ucode -lib/firmware/iwlwifi-7265D-13.ucode -lib/firmware/iwlwifi-7265D-16.ucode -lib/firmware/iwlwifi-7265D-17.ucode -lib/firmware/iwlwifi-7265D-21.ucode lib/firmware/iwlwifi-7265D-22.ucode lib/firmware/iwlwifi-7265D-27.ucode lib/firmware/iwlwifi-7265D-29.ucode -lib/firmware/iwlwifi-8000C-13.ucode -lib/firmware/iwlwifi-8000C-16.ucode -lib/firmware/iwlwifi-8000C-21.ucode lib/firmware/iwlwifi-8000C-22.ucode lib/firmware/iwlwifi-8000C-27.ucode lib/firmware/iwlwifi-8000C-31.ucode lib/firmware/iwlwifi-8000C-34.ucode lib/firmware/iwlwifi-8000C-36.ucode -lib/firmware/iwlwifi-8265-21.ucode lib/firmware/iwlwifi-8265-22.ucode lib/firmware/iwlwifi-8265-27.ucode lib/firmware/iwlwifi-8265-31.ucode @@ -1398,6 +1404,7 @@ lib/firmware/iwlwifi-Qu-b0-hr-b0-63.ucode lib/firmware/iwlwifi-Qu-b0-hr-b0-66.ucode lib/firmware/iwlwifi-Qu-b0-hr-b0-68.ucode lib/firmware/iwlwifi-Qu-b0-hr-b0-71.ucode +lib/firmware/iwlwifi-Qu-b0-hr-b0-73.ucode lib/firmware/iwlwifi-Qu-b0-jf-b0-48.ucode lib/firmware/iwlwifi-Qu-b0-jf-b0-50.ucode lib/firmware/iwlwifi-Qu-b0-jf-b0-53.ucode @@ -1408,6 +1415,7 @@ lib/firmware/iwlwifi-Qu-b0-jf-b0-63.ucode lib/firmware/iwlwifi-Qu-b0-jf-b0-66.ucode lib/firmware/iwlwifi-Qu-b0-jf-b0-68.ucode lib/firmware/iwlwifi-Qu-b0-jf-b0-71.ucode +lib/firmware/iwlwifi-Qu-b0-jf-b0-73.ucode lib/firmware/iwlwifi-Qu-c0-hr-b0-48.ucode lib/firmware/iwlwifi-Qu-c0-hr-b0-50.ucode lib/firmware/iwlwifi-Qu-c0-hr-b0-53.ucode @@ -1418,6 +1426,7 @@ lib/firmware/iwlwifi-Qu-c0-hr-b0-63.ucode lib/firmware/iwlwifi-Qu-c0-hr-b0-66.ucode lib/firmware/iwlwifi-Qu-c0-hr-b0-68.ucode lib/firmware/iwlwifi-Qu-c0-hr-b0-71.ucode +lib/firmware/iwlwifi-Qu-c0-hr-b0-73.ucode lib/firmware/iwlwifi-Qu-c0-jf-b0-48.ucode lib/firmware/iwlwifi-Qu-c0-jf-b0-50.ucode lib/firmware/iwlwifi-Qu-c0-jf-b0-53.ucode @@ -1428,6 +1437,7 @@ lib/firmware/iwlwifi-Qu-c0-jf-b0-63.ucode lib/firmware/iwlwifi-Qu-c0-jf-b0-66.ucode lib/firmware/iwlwifi-Qu-c0-jf-b0-68.ucode lib/firmware/iwlwifi-Qu-c0-jf-b0-71.ucode +lib/firmware/iwlwifi-Qu-c0-jf-b0-73.ucode lib/firmware/iwlwifi-QuZ-a0-hr-b0-48.ucode lib/firmware/iwlwifi-QuZ-a0-hr-b0-50.ucode lib/firmware/iwlwifi-QuZ-a0-hr-b0-53.ucode @@ -1439,6 +1449,7 @@ lib/firmware/iwlwifi-QuZ-a0-hr-b0-66.ucode lib/firmware/iwlwifi-QuZ-a0-hr-b0-67.ucode lib/firmware/iwlwifi-QuZ-a0-hr-b0-68.ucode lib/firmware/iwlwifi-QuZ-a0-hr-b0-71.ucode +lib/firmware/iwlwifi-QuZ-a0-hr-b0-73.ucode lib/firmware/iwlwifi-QuZ-a0-jf-b0-48.ucode lib/firmware/iwlwifi-QuZ-a0-jf-b0-50.ucode lib/firmware/iwlwifi-QuZ-a0-jf-b0-53.ucode @@ -1449,6 +1460,7 @@ lib/firmware/iwlwifi-QuZ-a0-jf-b0-63.ucode lib/firmware/iwlwifi-QuZ-a0-jf-b0-66.ucode lib/firmware/iwlwifi-QuZ-a0-jf-b0-68.ucode lib/firmware/iwlwifi-QuZ-a0-jf-b0-71.ucode +lib/firmware/iwlwifi-QuZ-a0-jf-b0-73.ucode lib/firmware/iwlwifi-cc-a0-46.ucode lib/firmware/iwlwifi-cc-a0-48.ucode lib/firmware/iwlwifi-cc-a0-50.ucode @@ -1461,21 +1473,26 @@ lib/firmware/iwlwifi-cc-a0-66.ucode lib/firmware/iwlwifi-cc-a0-67.ucode lib/firmware/iwlwifi-cc-a0-68.ucode lib/firmware/iwlwifi-cc-a0-71.ucode +lib/firmware/iwlwifi-cc-a0-73.ucode lib/firmware/iwlwifi-so-a0-gf-a0-64.ucode lib/firmware/iwlwifi-so-a0-gf-a0-67.ucode lib/firmware/iwlwifi-so-a0-gf-a0-68.ucode lib/firmware/iwlwifi-so-a0-gf-a0-71.ucode +lib/firmware/iwlwifi-so-a0-gf-a0-73.ucode lib/firmware/iwlwifi-so-a0-gf-a0.pnvm lib/firmware/iwlwifi-so-a0-gf4-a0-67.ucode lib/firmware/iwlwifi-so-a0-gf4-a0-68.ucode lib/firmware/iwlwifi-so-a0-gf4-a0-71.ucode +lib/firmware/iwlwifi-so-a0-gf4-a0-73.ucode lib/firmware/iwlwifi-so-a0-gf4-a0.pnvm lib/firmware/iwlwifi-so-a0-hr-b0-64.ucode lib/firmware/iwlwifi-so-a0-hr-b0-68.ucode lib/firmware/iwlwifi-so-a0-hr-b0-71.ucode +lib/firmware/iwlwifi-so-a0-hr-b0-73.ucode lib/firmware/iwlwifi-so-a0-jf-b0-64.ucode lib/firmware/iwlwifi-so-a0-jf-b0-68.ucode lib/firmware/iwlwifi-so-a0-jf-b0-71.ucode +lib/firmware/iwlwifi-so-a0-jf-b0-73.ucode lib/firmware/iwlwifi-ty-a0-gf-a0-59.ucode lib/firmware/iwlwifi-ty-a0-gf-a0-62.ucode lib/firmware/iwlwifi-ty-a0-gf-a0-63.ucode @@ -1483,6 +1500,7 @@ lib/firmware/iwlwifi-ty-a0-gf-a0-66.ucode lib/firmware/iwlwifi-ty-a0-gf-a0-67.ucode lib/firmware/iwlwifi-ty-a0-gf-a0-68.ucode lib/firmware/iwlwifi-ty-a0-gf-a0-71.ucode +lib/firmware/iwlwifi-ty-a0-gf-a0-73.ucode lib/firmware/iwlwifi-ty-a0-gf-a0.pnvm #lib/firmware/kaweth lib/firmware/kaweth/new_code.bin @@ -1591,7 +1609,13 @@ lib/firmware/mediatek/mt8173/vpu_d.bin lib/firmware/mediatek/mt8173/vpu_p.bin #lib/firmware/mediatek/mt8183 lib/firmware/mediatek/mt8183/scp.img +#lib/firmware/mediatek/mt8192 +lib/firmware/mediatek/mt8192/scp.img +#lib/firmware/mediatek/mt8195 +lib/firmware/mediatek/mt8195/scp.img #lib/firmware/mellanox +#lib/firmware/mellanox/lc_ini_bundle_2010_1006.bin +#lib/firmware/mellanox/lc_ini_bundle_2010_1502.bin #lib/firmware/mellanox/mlxsw_spectrum-13.1420.122.mfa2 #lib/firmware/mellanox/mlxsw_spectrum-13.1530.152.mfa2 #lib/firmware/mellanox/mlxsw_spectrum-13.1620.192.mfa2 @@ -1615,6 +1639,7 @@ lib/firmware/mediatek/mt8183/scp.img #lib/firmware/mellanox/mlxsw_spectrum-13.2010.1006.mfa2 #lib/firmware/mellanox/mlxsw_spectrum-13.2010.1232.mfa2 #lib/firmware/mellanox/mlxsw_spectrum-13.2010.1406.mfa2 +#lib/firmware/mellanox/mlxsw_spectrum-13.2010.1502.mfa2 #lib/firmware/mellanox/mlxsw_spectrum2-29.2000.2308.mfa2 #lib/firmware/mellanox/mlxsw_spectrum2-29.2000.2714.mfa2 #lib/firmware/mellanox/mlxsw_spectrum2-29.2007.1168.mfa2 @@ -1630,6 +1655,7 @@ lib/firmware/mediatek/mt8183/scp.img #lib/firmware/mellanox/mlxsw_spectrum2-29.2010.1006.mfa2 #lib/firmware/mellanox/mlxsw_spectrum2-29.2010.1232.mfa2 #lib/firmware/mellanox/mlxsw_spectrum2-29.2010.1406.mfa2 +#lib/firmware/mellanox/mlxsw_spectrum2-29.2010.1502.mfa2 #lib/firmware/mellanox/mlxsw_spectrum3-30.2007.1168.mfa2 #lib/firmware/mellanox/mlxsw_spectrum3-30.2008.1036.mfa2 #lib/firmware/mellanox/mlxsw_spectrum3-30.2008.1310.mfa2 @@ -1643,6 +1669,7 @@ lib/firmware/mediatek/mt8183/scp.img #lib/firmware/mellanox/mlxsw_spectrum3-30.2010.1006.mfa2 #lib/firmware/mellanox/mlxsw_spectrum3-30.2010.1232.mfa2 #lib/firmware/mellanox/mlxsw_spectrum3-30.2010.1406.mfa2 +#lib/firmware/mellanox/mlxsw_spectrum3-30.2010.1502.mfa2 #lib/firmware/meson #lib/firmware/meson/vdec lib/firmware/meson/vdec/g12a_h264.bin @@ -2420,6 +2447,10 @@ lib/firmware/qca/rampatch_usb_00130201.bin #lib/firmware/qcom lib/firmware/qcom/a300_pfp.fw lib/firmware/qcom/a300_pm4.fw +lib/firmware/qcom/a330_pfp.fw +lib/firmware/qcom/a330_pm4.fw +lib/firmware/qcom/a420_pfp.fw +lib/firmware/qcom/a420_pm4.fw lib/firmware/qcom/a530_pfp.fw lib/firmware/qcom/a530_pm4.fw lib/firmware/qcom/a530_zap.b00 @@ -2433,6 +2464,15 @@ lib/firmware/qcom/a650_gmu.bin lib/firmware/qcom/a650_sqe.fw lib/firmware/qcom/a660_gmu.bin lib/firmware/qcom/a660_sqe.fw +#lib/firmware/qcom/apq8096 +lib/firmware/qcom/apq8096/adsp.mbn +lib/firmware/qcom/apq8096/adspr.jsn +lib/firmware/qcom/apq8096/adspua.jsn +lib/firmware/qcom/apq8096/mba.mbn +lib/firmware/qcom/apq8096/modem.mbn +lib/firmware/qcom/apq8096/modemr.jsn +lib/firmware/qcom/leia_pfp_470.fw +lib/firmware/qcom/leia_pm4_470.fw #lib/firmware/qcom/sdm845 #lib/firmware/qcom/sdm845/a630_zap.mbn #lib/firmware/qcom/sdm845/adsp.mbn @@ -2847,6 +2887,8 @@ lib/firmware/rtl_bt/rtl8852au_config.bin lib/firmware/rtl_bt/rtl8852au_fw.bin lib/firmware/rtl_bt/rtl8852bu_config.bin lib/firmware/rtl_bt/rtl8852bu_fw.bin +lib/firmware/rtl_bt/rtl8852cu_config.bin +lib/firmware/rtl_bt/rtl8852cu_fw.bin #lib/firmware/rtl_nic lib/firmware/rtl_nic/rtl8105e-1.fw lib/firmware/rtl_nic/rtl8106e-1.fw @@ -2926,6 +2968,7 @@ lib/firmware/rtw88/rtw8822c_fw.bin lib/firmware/rtw88/rtw8822c_wow_fw.bin lib/firmware/rtw89 lib/firmware/rtw89/rtw8852a_fw.bin +lib/firmware/rtw89/rtw8852c_fw.bin lib/firmware/s2250.fw lib/firmware/s2250_loader.fw lib/firmware/s5p-mfc-v6-v2.fw diff --git a/config/rootfiles/core/169/filelists/files b/config/rootfiles/core/169/filelists/files index 21f5764f1..c7ff548a5 100644 --- a/config/rootfiles/core/169/filelists/files +++ b/config/rootfiles/core/169/filelists/files @@ -1,8 +1,210 @@ -etc/rc.d/helper/oci-setup -etc/rc.d/helper/azure-setup etc/rc.d/helper/aws-setup +etc/rc.d/helper/azure-setup etc/rc.d/helper/exoscale-setup etc/rc.d/helper/gcp-setup +etc/rc.d/helper/oci-setup +lib/firmware/amdgpu/aldebaran_mec2.bin +lib/firmware/amdgpu/aldebaran_mec.bin +lib/firmware/amdgpu/aldebaran_rlc.bin +lib/firmware/amdgpu/aldebaran_smc.bin +lib/firmware/amdgpu/aldebaran_sos.bin +lib/firmware/amdgpu/aldebaran_ta.bin +lib/firmware/amdgpu/beige_goby_ce.bin +lib/firmware/amdgpu/beige_goby_dmcub.bin +lib/firmware/amdgpu/beige_goby_me.bin +lib/firmware/amdgpu/beige_goby_mec2.bin +lib/firmware/amdgpu/beige_goby_mec.bin +lib/firmware/amdgpu/beige_goby_pfp.bin +lib/firmware/amdgpu/beige_goby_smc.bin +lib/firmware/amdgpu/beige_goby_ta.bin +lib/firmware/amdgpu/beige_goby_vcn.bin +lib/firmware/amdgpu/dcn_3_1_6_dmcub.bin +lib/firmware/amdgpu/dimgrey_cavefish_ce.bin +lib/firmware/amdgpu/dimgrey_cavefish_dmcub.bin +lib/firmware/amdgpu/dimgrey_cavefish_me.bin +lib/firmware/amdgpu/dimgrey_cavefish_mec2.bin +lib/firmware/amdgpu/dimgrey_cavefish_mec.bin +lib/firmware/amdgpu/dimgrey_cavefish_pfp.bin +lib/firmware/amdgpu/dimgrey_cavefish_smc.bin +lib/firmware/amdgpu/dimgrey_cavefish_sos.bin +lib/firmware/amdgpu/dimgrey_cavefish_ta.bin +lib/firmware/amdgpu/dimgrey_cavefish_vcn.bin +lib/firmware/amdgpu/gc_10_3_7_rlc.bin +lib/firmware/amdgpu/green_sardine_asd.bin +lib/firmware/amdgpu/green_sardine_dmcub.bin +lib/firmware/amdgpu/green_sardine_ta.bin +lib/firmware/amdgpu/navi10_asd.bin +lib/firmware/amdgpu/navi10_ce.bin +lib/firmware/amdgpu/navi10_me.bin +lib/firmware/amdgpu/navi10_mec2.bin +lib/firmware/amdgpu/navi10_mec.bin +lib/firmware/amdgpu/navi10_pfp.bin +lib/firmware/amdgpu/navi10_sos.bin +lib/firmware/amdgpu/navi10_ta.bin +lib/firmware/amdgpu/navi12_asd.bin +lib/firmware/amdgpu/navi12_ce.bin +lib/firmware/amdgpu/navi12_me.bin +lib/firmware/amdgpu/navi12_mec2.bin +lib/firmware/amdgpu/navi12_mec.bin +lib/firmware/amdgpu/navi12_pfp.bin +lib/firmware/amdgpu/navi12_rlc.bin +lib/firmware/amdgpu/navi12_sos.bin +lib/firmware/amdgpu/navi12_ta.bin +lib/firmware/amdgpu/navi14_asd.bin +lib/firmware/amdgpu/navi14_ce.bin +lib/firmware/amdgpu/navi14_me.bin +lib/firmware/amdgpu/navi14_mec2.bin +lib/firmware/amdgpu/navi14_mec.bin +lib/firmware/amdgpu/navi14_pfp.bin +lib/firmware/amdgpu/navi14_sos.bin +lib/firmware/amdgpu/navi14_ta.bin +lib/firmware/amdgpu/navy_flounder_ce.bin +lib/firmware/amdgpu/navy_flounder_dmcub.bin +lib/firmware/amdgpu/navy_flounder_me.bin +lib/firmware/amdgpu/navy_flounder_mec2.bin +lib/firmware/amdgpu/navy_flounder_mec.bin +lib/firmware/amdgpu/navy_flounder_pfp.bin +lib/firmware/amdgpu/navy_flounder_rlc.bin +lib/firmware/amdgpu/navy_flounder_sdma.bin +lib/firmware/amdgpu/navy_flounder_ta.bin +lib/firmware/amdgpu/navy_flounder_vcn.bin +lib/firmware/amdgpu/picasso_asd.bin +lib/firmware/amdgpu/picasso_ta.bin +lib/firmware/amdgpu/psp_13_0_8_asd.bin +lib/firmware/amdgpu/psp_13_0_8_ta.bin +lib/firmware/amdgpu/raven2_asd.bin +lib/firmware/amdgpu/raven2_ta.bin +lib/firmware/amdgpu/raven_asd.bin +lib/firmware/amdgpu/raven_ta.bin +lib/firmware/amdgpu/renoir_asd.bin +lib/firmware/amdgpu/renoir_dmcub.bin +lib/firmware/amdgpu/renoir_ta.bin +lib/firmware/amdgpu/sienna_cichlid_ce.bin +lib/firmware/amdgpu/sienna_cichlid_dmcub.bin +lib/firmware/amdgpu/sienna_cichlid_me.bin +lib/firmware/amdgpu/sienna_cichlid_mec2.bin +lib/firmware/amdgpu/sienna_cichlid_mec.bin +lib/firmware/amdgpu/sienna_cichlid_pfp.bin +lib/firmware/amdgpu/sienna_cichlid_sos.bin +lib/firmware/amdgpu/sienna_cichlid_ta.bin +lib/firmware/amdgpu/sienna_cichlid_vcn.bin +lib/firmware/amdgpu/vangogh_asd.bin +lib/firmware/amdgpu/vangogh_ce.bin +lib/firmware/amdgpu/vangogh_me.bin +lib/firmware/amdgpu/vangogh_mec2.bin +lib/firmware/amdgpu/vangogh_mec.bin +lib/firmware/amdgpu/vangogh_pfp.bin +lib/firmware/amdgpu/vangogh_rlc.bin +lib/firmware/amdgpu/vega10_asd.bin +lib/firmware/amdgpu/vega12_asd.bin +lib/firmware/amdgpu/vega20_asd.bin +lib/firmware/amdgpu/yellow_carp_asd.bin +lib/firmware/amdgpu/yellow_carp_ce.bin +lib/firmware/amdgpu/yellow_carp_dmcub.bin +lib/firmware/amdgpu/yellow_carp_me.bin +lib/firmware/amdgpu/yellow_carp_mec2.bin +lib/firmware/amdgpu/yellow_carp_mec.bin +lib/firmware/amdgpu/yellow_carp_pfp.bin +lib/firmware/amdgpu/yellow_carp_ta.bin +lib/firmware/ath10k/QCA4019/hw1.0/board-2.bin +lib/firmware/ath10k/QCA9888/hw2.0/board-2.bin +lib/firmware/ath10k/QCA9888/hw2.0/firmware-5.bin +lib/firmware/ath10k/QCA9984/hw1.0/firmware-5.bin +lib/firmware/ath10k/QCA99X0/hw2.0/board-2.bin +lib/firmware/ath10k/WCN3990/hw1.0/board-2.bin +lib/firmware/ath11k/QCN9074/hw1.0/amss.bin +lib/firmware/ath11k/QCN9074/hw1.0/board-2.bin +lib/firmware/ath11k/QCN9074/hw1.0/m3.bin +lib/firmware/ath11k/WCN6750/hw1.0/board-2.bin +lib/firmware/ath11k/WCN6750/hw1.0/wpss.b00 +lib/firmware/ath11k/WCN6750/hw1.0/wpss.b01 +lib/firmware/ath11k/WCN6750/hw1.0/wpss.b02 +lib/firmware/ath11k/WCN6750/hw1.0/wpss.b03 +lib/firmware/ath11k/WCN6750/hw1.0/wpss.b04 +lib/firmware/ath11k/WCN6750/hw1.0/wpss.b05 +lib/firmware/ath11k/WCN6750/hw1.0/wpss.b06 +lib/firmware/ath11k/WCN6750/hw1.0/wpss.b07 +lib/firmware/ath11k/WCN6750/hw1.0/wpss.b08 +lib/firmware/ath11k/WCN6750/hw1.0/wpss.mdt +lib/firmware/ath11k/WCN6855/hw2.0/amss.bin +lib/firmware/atmel/wilc1000_wifi_firmware-1.bin +lib/firmware/brcm/brcmfmac43430-sdio.beagle,beaglev-starlight-jh7100-a1.txt +lib/firmware/brcm/brcmfmac43430-sdio.beagle,beaglev-starlight-jh7100-r0.txt +lib/firmware/brcm/brcmfmac43430-sdio.starfive,visionfive-v1.txt +lib/firmware/brcm/brcmfmac43455-sdio.pine64,quartz64-b.txt +lib/firmware/i915/adlp_guc_70.1.1.bin +lib/firmware/i915/bxt_guc_70.1.1.bin +lib/firmware/i915/cml_guc_70.1.1.bin +lib/firmware/i915/dg1_guc_70.1.1.bin +lib/firmware/i915/dg2_dmc_ver2_06.bin +lib/firmware/i915/dg2_guc_70.1.2.bin +lib/firmware/i915/ehl_guc_70.1.1.bin +lib/firmware/i915/glk_guc_70.1.1.bin +lib/firmware/i915/icl_guc_70.1.1.bin +lib/firmware/i915/kbl_guc_70.1.1.bin +lib/firmware/i915/skl_guc_70.1.1.bin +lib/firmware/i915/tgl_guc_70.1.1.bin +lib/firmware/intel/ibt-0040-0041.sfi +lib/firmware/intel/ibt-0040-1020.sfi +lib/firmware/intel/ibt-0040-2120.sfi +lib/firmware/intel/ibt-0040-4150.sfi +lib/firmware/intel/ibt-0041-0041.sfi +lib/firmware/intel/ibt-1040-0041.sfi +lib/firmware/intel/ibt-1040-1020.sfi +lib/firmware/intel/ibt-1040-2120.sfi +lib/firmware/intel/ibt-1040-4150.sfi +lib/firmware/intel/ibt-19-0-0.sfi +lib/firmware/intel/ibt-19-0-1.sfi +lib/firmware/intel/ibt-19-0-4.sfi +lib/firmware/intel/ibt-19-16-4.sfi +lib/firmware/intel/ibt-19-240-1.sfi +lib/firmware/intel/ibt-19-240-4.sfi +lib/firmware/intel/ibt-19-32-0.sfi +lib/firmware/intel/ibt-19-32-1.sfi +lib/firmware/intel/ibt-19-32-4.sfi +lib/firmware/intel/ibt-20-0-3.sfi +lib/firmware/intel/ibt-20-1-3.sfi +lib/firmware/intel/ibt-20-1-4.sfi +lib/firmware/intel/ice/ddp/ice-1.3.28.0.pkg +lib/firmware/iwlwifi-9000-pu-b0-jf-b0-46.ucode +lib/firmware/iwlwifi-9260-th-b0-jf-b0-46.ucode +lib/firmware/iwlwifi-cc-a0-73.ucode +lib/firmware/iwlwifi-Qu-b0-hr-b0-73.ucode +lib/firmware/iwlwifi-Qu-b0-jf-b0-73.ucode +lib/firmware/iwlwifi-Qu-c0-hr-b0-73.ucode +lib/firmware/iwlwifi-Qu-c0-jf-b0-73.ucode +lib/firmware/iwlwifi-QuZ-a0-hr-b0-73.ucode +lib/firmware/iwlwifi-QuZ-a0-jf-b0-73.ucode +lib/firmware/iwlwifi-so-a0-gf4-a0-73.ucode +lib/firmware/iwlwifi-so-a0-gf4-a0.pnvm +lib/firmware/iwlwifi-so-a0-gf-a0-73.ucode +lib/firmware/iwlwifi-so-a0-gf-a0.pnvm +lib/firmware/iwlwifi-so-a0-hr-b0-73.ucode +lib/firmware/iwlwifi-so-a0-jf-b0-73.ucode +lib/firmware/iwlwifi-ty-a0-gf-a0-73.ucode +lib/firmware/iwlwifi-ty-a0-gf-a0.pnvm +lib/firmware/mediatek/BT_RAM_CODE_MT7922_1_1_hdr.bin +lib/firmware/mediatek/mt8183/scp.img +lib/firmware/mediatek/mt8192/scp.img +lib/firmware/mediatek/mt8195/scp.img +lib/firmware/mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin +lib/firmware/mediatek/WIFI_RAM_CODE_MT7922_1.bin +lib/firmware/qcom/a330_pfp.fw +lib/firmware/qcom/a330_pm4.fw +lib/firmware/qcom/a420_pfp.fw +lib/firmware/qcom/a420_pm4.fw +lib/firmware/qcom/apq8096/adsp.mbn +lib/firmware/qcom/apq8096/adspr.jsn +lib/firmware/qcom/apq8096/adspua.jsn +lib/firmware/qcom/apq8096/mba.mbn +lib/firmware/qcom/apq8096/modem.mbn +lib/firmware/qcom/apq8096/modemr.jsn +lib/firmware/qcom/leia_pfp_470.fw +lib/firmware/qcom/leia_pm4_470.fw +lib/firmware/rtl_bt/rtl8852au_fw.bin +lib/firmware/rtl_bt/rtl8852cu_config.bin +lib/firmware/rtl_bt/rtl8852cu_fw.bin +lib/firmware/rtw89/rtw8852c_fw.bin opt/pakfire/etc/pakfire.conf srv/web/ipfire/html/themes/ipfire/include/functions.pl usr/sbin/setup diff --git a/config/rootfiles/core/169/update.sh b/config/rootfiles/core/169/update.sh index 40b09bd8a..da748e570 100644 --- a/config/rootfiles/core/169/update.sh +++ b/config/rootfiles/core/169/update.sh @@ -37,6 +37,39 @@ done # Remove files rm -rvf \ + /lib/firmware/ath10k/QCA99X0/hw2.0/board.bin \ + /lib/firmware/intel/ice/ddp/ice-1.3.26.0.pkg \ + /lib/firmware/iwlwifi-3160-10.ucode \ + /lib/firmware/iwlwifi-3160-12.ucode \ + /lib/firmware/iwlwifi-3160-13.ucode \ + /lib/firmware/iwlwifi-3160-16.ucode \ + /lib/firmware/iwlwifi-3160-7.ucode \ + /lib/firmware/iwlwifi-3160-8.ucode \ + /lib/firmware/iwlwifi-3160-9.ucode \ + /lib/firmware/iwlwifi-3168-21.ucode \ + /lib/firmware/iwlwifi-7260-10.ucode \ + /lib/firmware/iwlwifi-7260-12.ucode \ + /lib/firmware/iwlwifi-7260-13.ucode \ + /lib/firmware/iwlwifi-7260-16.ucode \ + /lib/firmware/iwlwifi-7260-7.ucode \ + /lib/firmware/iwlwifi-7260-8.ucode \ + /lib/firmware/iwlwifi-7260-9.ucode \ + /lib/firmware/iwlwifi-7265-10.ucode \ + /lib/firmware/iwlwifi-7265-12.ucode \ + /lib/firmware/iwlwifi-7265-13.ucode \ + /lib/firmware/iwlwifi-7265-16.ucode \ + /lib/firmware/iwlwifi-7265-8.ucode \ + /lib/firmware/iwlwifi-7265-9.ucode \ + /lib/firmware/iwlwifi-7265D-10.ucode \ + /lib/firmware/iwlwifi-7265D-12.ucode \ + /lib/firmware/iwlwifi-7265D-13.ucode \ + /lib/firmware/iwlwifi-7265D-16.ucode \ + /lib/firmware/iwlwifi-7265D-17.ucode \ + /lib/firmware/iwlwifi-7265D-21.ucode \ + /lib/firmware/iwlwifi-8000C-13.ucode \ + /lib/firmware/iwlwifi-8000C-16.ucode \ + /lib/firmware/iwlwifi-8000C-21.ucode \ + /lib/firmware/iwlwifi-8265-21.ucode \ /lib/libxtables.so.12.4.0 \ /lib/xtables/libip6t_DNAT.so \ /lib/xtables/libip6t_REDIRECT.so \ diff --git a/lfs/linux-firmware b/lfs/linux-firmware index fd150c011..04dc4f7ce 100644 --- a/lfs/linux-firmware +++ b/lfs/linux-firmware @@ -24,7 +24,7 @@ include Config -VER = 20220411 +VER = 20220610 THISAPP = linux-firmware-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 92aa5dd25de0779a597f1fd13a039b7bf131c4e8a760b5a6c77273d4c07a12b1ed8dfa3ea8a2f38b6362070318ed4e7d4f207e301a9c891d43c1a205cf9a00c1 +$(DL_FILE)_BLAKE2 = 88ec19a24e634702b640cdf5de66179ee9cd1ca627a8c8a45a109b94b6efac7f7534d3663b8c8a123fbe77e6e440db31ef03b28b957f056db1d1f9425b8a9a10 install : $(TARGET) -- 2.35.3

2 2

[PATCH] linux: Update to 5.15.46
by Peter Müller 13 Jun '22

13 Jun '22

Please refer to https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.46 for the changelog of this version. Due to operational constraints, ARM rootfile changes are simulated. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- config/rootfiles/common/aarch64/linux | 5 +- config/rootfiles/common/armv6l/linux | 4 +- config/rootfiles/common/x86_64/linux | 6 +- lfs/linux | 6 +- ...ayer7.patch => linux-5.15.46-layer7.patch} | 82 +++++++++---------- 5 files changed, 48 insertions(+), 55 deletions(-) rename src/patches/linux/{linux-5.15.17-layer7.patch => linux-5.15.46-layer7.patch} (94%) diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index a88af0a37..73177bd71 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -6878,6 +6878,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/CC_CAN_LINK #lib/modules/KVER-ipfire/build/include/config/CC_CAN_LINK_STATIC #lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_GOTO +#lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_GOTO_TIED_OUTPUT #lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_GOTO_OUTPUT #lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_INLINE #lib/modules/KVER-ipfire/build/include/config/CC_HAS_BRANCH_PROT_PAC_RET @@ -7107,7 +7108,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/CRYPTO_KPP2 #lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_AES #lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_ARC4 -#lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_BLAKE2S #lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_BLAKE2S_GENERIC #lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_CHACHA #lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_CHACHA20POLY1305 @@ -15293,7 +15293,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/trace/events/qdisc.h #lib/modules/KVER-ipfire/build/include/trace/events/qla.h #lib/modules/KVER-ipfire/build/include/trace/events/qrtr.h -#lib/modules/KVER-ipfire/build/include/trace/events/random.h #lib/modules/KVER-ipfire/build/include/trace/events/rcu.h #lib/modules/KVER-ipfire/build/include/trace/events/rdma.h #lib/modules/KVER-ipfire/build/include/trace/events/rdma_core.h @@ -20520,8 +20519,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/lib/crc8.ko.xz #lib/modules/KVER-ipfire/kernel/lib/crypto #lib/modules/KVER-ipfire/kernel/lib/crypto/libarc4.ko.xz -#lib/modules/KVER-ipfire/kernel/lib/crypto/libblake2s-generic.ko.xz -#lib/modules/KVER-ipfire/kernel/lib/crypto/libblake2s.ko.xz #lib/modules/KVER-ipfire/kernel/lib/crypto/libchacha.ko.xz #lib/modules/KVER-ipfire/kernel/lib/crypto/libchacha20poly1305.ko.xz #lib/modules/KVER-ipfire/kernel/lib/crypto/libcurve25519-generic.ko.xz diff --git a/config/rootfiles/common/armv6l/linux b/config/rootfiles/common/armv6l/linux index 11da0fb3c..e8e10463c 100644 --- a/config/rootfiles/common/armv6l/linux +++ b/config/rootfiles/common/armv6l/linux @@ -7317,6 +7317,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/CC_CAN_LINK #lib/modules/KVER-ipfire/build/include/config/CC_CAN_LINK_STATIC #lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_GOTO +#lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_GOTO_TIED_OUTPUT #lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_GOTO_OUTPUT #lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_INLINE #lib/modules/KVER-ipfire/build/include/config/CC_HAS_KASAN_GENERIC @@ -7569,7 +7570,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/CRYPTO_KPP2 #lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_AES #lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_ARC4 -#lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_BLAKE2S #lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_CHACHA #lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_CHACHA20POLY1305 #lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_CHACHA_GENERIC @@ -15743,7 +15743,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/trace/events/qdisc.h #lib/modules/KVER-ipfire/build/include/trace/events/qla.h #lib/modules/KVER-ipfire/build/include/trace/events/qrtr.h -#lib/modules/KVER-ipfire/build/include/trace/events/random.h #lib/modules/KVER-ipfire/build/include/trace/events/rcu.h #lib/modules/KVER-ipfire/build/include/trace/events/rdma.h #lib/modules/KVER-ipfire/build/include/trace/events/rdma_core.h @@ -20739,7 +20738,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/lib/crc8.ko.xz #lib/modules/KVER-ipfire/kernel/lib/crypto #lib/modules/KVER-ipfire/kernel/lib/crypto/libarc4.ko.xz -#lib/modules/KVER-ipfire/kernel/lib/crypto/libblake2s.ko.xz #lib/modules/KVER-ipfire/kernel/lib/crypto/libchacha.ko.xz #lib/modules/KVER-ipfire/kernel/lib/crypto/libchacha20poly1305.ko.xz #lib/modules/KVER-ipfire/kernel/lib/crypto/libcurve25519-generic.ko.xz diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index a578435d3..04e636046 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -6780,12 +6780,14 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/CC_CAN_LINK_STATIC #lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_GOTO #lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_GOTO_OUTPUT +#lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_GOTO_TIED_OUTPUT #lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_INLINE #lib/modules/KVER-ipfire/build/include/config/CC_HAS_INT128 #lib/modules/KVER-ipfire/build/include/config/CC_HAS_KASAN_GENERIC #lib/modules/KVER-ipfire/build/include/config/CC_HAS_NO_PROFILE_FN_ATTR #lib/modules/KVER-ipfire/build/include/config/CC_HAS_SANCOV_TRACE_PC #lib/modules/KVER-ipfire/build/include/config/CC_HAS_SANE_STACKPROTECTOR +#lib/modules/KVER-ipfire/build/include/config/CC_HAS_SLS #lib/modules/KVER-ipfire/build/include/config/CC_HAS_WORKING_NOSANITIZE_ADDRESS #lib/modules/KVER-ipfire/build/include/config/CC_HAS_ZERO_CALL_USED_REGS #lib/modules/KVER-ipfire/build/include/config/CC_IS_GCC @@ -6999,7 +7001,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/CRYPTO_KPP2 #lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_AES #lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_ARC4 -#lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_BLAKE2S #lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_BLAKE2S_GENERIC #lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_CHACHA #lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_CHACHA20POLY1305 @@ -15730,7 +15731,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/trace/events/qdisc.h #lib/modules/KVER-ipfire/build/include/trace/events/qla.h #lib/modules/KVER-ipfire/build/include/trace/events/qrtr.h -#lib/modules/KVER-ipfire/build/include/trace/events/random.h #lib/modules/KVER-ipfire/build/include/trace/events/rcu.h #lib/modules/KVER-ipfire/build/include/trace/events/rdma.h #lib/modules/KVER-ipfire/build/include/trace/events/rdma_core.h @@ -21621,8 +21621,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/lib/crc8.ko.xz #lib/modules/KVER-ipfire/kernel/lib/crypto #lib/modules/KVER-ipfire/kernel/lib/crypto/libarc4.ko.xz -#lib/modules/KVER-ipfire/kernel/lib/crypto/libblake2s-generic.ko.xz -#lib/modules/KVER-ipfire/kernel/lib/crypto/libblake2s.ko.xz #lib/modules/KVER-ipfire/kernel/lib/crypto/libchacha.ko.xz #lib/modules/KVER-ipfire/kernel/lib/crypto/libchacha20poly1305.ko.xz #lib/modules/KVER-ipfire/kernel/lib/crypto/libcurve25519-generic.ko.xz diff --git a/lfs/linux b/lfs/linux index d9637ef94..df3b348d4 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 5.15.35 +VER = 5.15.46 ARM_PATCHES = 5.15-ipfire5 THISAPP = linux-$(VER) @@ -78,7 +78,7 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_BLAKE2 = 15f1af609ae4a233dc6bdae84c1231c2335be6320ddbb9a5d76c7983498a9ca72c13b55cc1408dac477f707fb84df99435994c1a7eeb91396481c2f7b11ecc2e +$(DL_FILE)_BLAKE2 = 26fdc4bbed153f7a5a511b7c1a804f794dd6e4b8b44d0317a4cad304b2c824183fd6054b7ca94f22b3e49e22a13ec9dbd24373b628b01bdcdb5392eafe6b3dbe arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 58a70e757a9121a0aac83604a37aa787ec7ac0ee4970c5a3ac3bcb2dbaca32b00089cae6c0da5cf2fe0a2e156427b5165c6a86e0371a3e896f4c7cdd699c34a0 install : $(TARGET) @@ -116,7 +116,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ln -svf linux-$(VER) $(DIR_SRC)/linux # Layer7-patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.15.17-layer7.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.15.46-layer7.patch # DVB Patches cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pll.patch diff --git a/src/patches/linux/linux-5.15.17-layer7.patch b/src/patches/linux/linux-5.15.46-layer7.patch similarity index 94% rename from src/patches/linux/linux-5.15.17-layer7.patch rename to src/patches/linux/linux-5.15.46-layer7.patch index 0dafa16c7..d6b46142c 100644 --- a/src/patches/linux/linux-5.15.17-layer7.patch +++ b/src/patches/linux/linux-5.15.46-layer7.patch @@ -1,6 +1,6 @@ -diff -Naur a/include/linux/skbuff.h b/include/linux/skbuff.h ---- a/include/linux/skbuff.h 2022-01-27 10:05:44.000000000 +0000 -+++ b/include/linux/skbuff.h 2022-01-29 08:04:32.984637671 +0000 +diff -Naur linux-5.15.46.orig/include/linux/skbuff.h linux-5.15.46/include/linux/skbuff.h +--- linux-5.15.46.orig/include/linux/skbuff.h 2022-06-11 14:51:47.639775333 +0000 ++++ linux-5.15.46/include/linux/skbuff.h 2022-06-11 14:53:07.977494189 +0000 @@ -772,6 +772,9 @@ #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) unsigned long _nfct; @@ -11,10 +11,10 @@ diff -Naur a/include/linux/skbuff.h b/include/linux/skbuff.h unsigned int len, data_len; __u16 mac_len, -diff -Naur a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h ---- a/include/net/netfilter/nf_conntrack.h 2022-01-27 10:05:44.000000000 +0000 -+++ b/include/net/netfilter/nf_conntrack.h 2022-01-29 08:04:32.984637671 +0000 -@@ -117,6 +117,23 @@ +diff -Naur linux-5.15.46.orig/include/net/netfilter/nf_conntrack.h linux-5.15.46/include/net/netfilter/nf_conntrack.h +--- linux-5.15.46.orig/include/net/netfilter/nf_conntrack.h 2022-06-11 14:51:48.471834543 +0000 ++++ linux-5.15.46/include/net/netfilter/nf_conntrack.h 2022-06-11 14:53:07.977494189 +0000 +@@ -119,6 +119,23 @@ /* Extensions */ struct nf_ct_ext *ext; @@ -38,9 +38,9 @@ diff -Naur a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_con /* Storage reserved for other modules, must be the last member */ union nf_conntrack_proto proto; }; -diff -Naur a/include/uapi/linux/netfilter/xt_layer7.h b/include/uapi/linux/netfilter/xt_layer7.h ---- a/include/uapi/linux/netfilter/xt_layer7.h 1970-01-01 00:00:00.000000000 +0000 -+++ b/include/uapi/linux/netfilter/xt_layer7.h 2022-01-29 08:04:32.984637671 +0000 +diff -Naur linux-5.15.46.orig/include/uapi/linux/netfilter/xt_layer7.h linux-5.15.46/include/uapi/linux/netfilter/xt_layer7.h +--- linux-5.15.46.orig/include/uapi/linux/netfilter/xt_layer7.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-5.15.46/include/uapi/linux/netfilter/xt_layer7.h 2022-06-11 14:53:07.977494189 +0000 @@ -0,0 +1,13 @@ +#ifndef _XT_LAYER7_H +#define _XT_LAYER7_H @@ -55,9 +55,9 @@ diff -Naur a/include/uapi/linux/netfilter/xt_layer7.h b/include/uapi/linux/netfi +}; + +#endif /* _XT_LAYER7_H */ -diff -Naur a/net/netfilter/Kconfig b/net/netfilter/Kconfig ---- a/net/netfilter/Kconfig 2022-01-27 10:05:44.000000000 +0000 -+++ b/net/netfilter/Kconfig 2022-01-29 08:04:32.988637605 +0000 +diff -Naur linux-5.15.46.orig/net/netfilter/Kconfig linux-5.15.46/net/netfilter/Kconfig +--- linux-5.15.46.orig/net/netfilter/Kconfig 2022-06-11 14:51:48.599843652 +0000 ++++ linux-5.15.46/net/netfilter/Kconfig 2022-06-11 14:53:07.977494189 +0000 @@ -1389,6 +1389,26 @@ To compile it as a module, choose M here. If unsure, say N. @@ -85,9 +85,9 @@ diff -Naur a/net/netfilter/Kconfig b/net/netfilter/Kconfig config NETFILTER_XT_MATCH_LENGTH tristate '"length" match support' depends on NETFILTER_ADVANCED -diff -Naur a/net/netfilter/Makefile b/net/netfilter/Makefile ---- a/net/netfilter/Makefile 2022-01-27 10:05:44.000000000 +0000 -+++ b/net/netfilter/Makefile 2022-01-29 08:04:32.988637605 +0000 +diff -Naur linux-5.15.46.orig/net/netfilter/Makefile linux-5.15.46/net/netfilter/Makefile +--- linux-5.15.46.orig/net/netfilter/Makefile 2022-06-11 14:51:48.599843652 +0000 ++++ linux-5.15.46/net/netfilter/Makefile 2022-06-11 14:53:07.981494474 +0000 @@ -201,6 +201,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o @@ -96,10 +96,10 @@ diff -Naur a/net/netfilter/Makefile b/net/netfilter/Makefile obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o -diff -Naur a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c ---- a/net/netfilter/nf_conntrack_core.c 2022-01-27 10:05:44.000000000 +0000 -+++ b/net/netfilter/nf_conntrack_core.c 2022-01-29 08:04:32.992637539 +0000 -@@ -636,6 +636,11 @@ +diff -Naur linux-5.15.46.orig/net/netfilter/nf_conntrack_core.c linux-5.15.46/net/netfilter/nf_conntrack_core.c +--- linux-5.15.46.orig/net/netfilter/nf_conntrack_core.c 2022-06-11 14:51:48.599843652 +0000 ++++ linux-5.15.46/net/netfilter/nf_conntrack_core.c 2022-06-11 14:53:07.981494474 +0000 +@@ -648,6 +648,11 @@ */ nf_ct_remove_expectations(ct); @@ -111,24 +111,24 @@ diff -Naur a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core nf_ct_del_from_dying_or_unconfirmed_list(ct); local_bh_enable(); -diff -Naur a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c ---- a/net/netfilter/nf_conntrack_standalone.c 2022-01-27 10:05:44.000000000 +0000 -+++ b/net/netfilter/nf_conntrack_standalone.c 2022-01-29 08:04:32.992637539 +0000 +diff -Naur linux-5.15.46.orig/net/netfilter/nf_conntrack_standalone.c linux-5.15.46/net/netfilter/nf_conntrack_standalone.c +--- linux-5.15.46.orig/net/netfilter/nf_conntrack_standalone.c 2022-06-11 14:51:48.603843938 +0000 ++++ linux-5.15.46/net/netfilter/nf_conntrack_standalone.c 2022-06-11 14:54:23.322859367 +0000 @@ -370,6 +370,11 @@ ct_show_zone(s, ct, NF_CT_DEFAULT_ZONE_DIR); ct_show_delta_time(s, ct); -+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE) ++ #if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE) + if(ct->layer7.app_proto) + seq_printf(s, "l7proto=%s ", ct->layer7.app_proto); -+#endif ++ #endif + - seq_printf(s, "use=%u\n", atomic_read(&ct->ct_general.use)); + seq_printf(s, "use=%u\n", refcount_read(&ct->ct_general.use)); if (seq_has_overflowed(s)) -diff -Naur a/net/netfilter/regexp/regexp.c b/net/netfilter/regexp/regexp.c ---- a/net/netfilter/regexp/regexp.c 1970-01-01 00:00:00.000000000 +0000 -+++ b/net/netfilter/regexp/regexp.c 2022-01-29 08:04:32.992637539 +0000 +diff -Naur linux-5.15.46.orig/net/netfilter/regexp/regexp.c linux-5.15.46/net/netfilter/regexp/regexp.c +--- linux-5.15.46.orig/net/netfilter/regexp/regexp.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-5.15.46/net/netfilter/regexp/regexp.c 2022-06-11 14:53:07.985494758 +0000 @@ -0,0 +1,1197 @@ +/* + * regcomp and regexec -- regsub and regerror are elsewhere @@ -1327,9 +1327,9 @@ diff -Naur a/net/netfilter/regexp/regexp.c b/net/netfilter/regexp/regexp.c +#endif + + -diff -Naur a/net/netfilter/regexp/regexp.h b/net/netfilter/regexp/regexp.h ---- a/net/netfilter/regexp/regexp.h 1970-01-01 00:00:00.000000000 +0000 -+++ b/net/netfilter/regexp/regexp.h 2022-01-29 08:04:32.992637539 +0000 +diff -Naur linux-5.15.46.orig/net/netfilter/regexp/regexp.h linux-5.15.46/net/netfilter/regexp/regexp.h +--- linux-5.15.46.orig/net/netfilter/regexp/regexp.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-5.15.46/net/netfilter/regexp/regexp.h 2022-06-11 14:53:07.985494758 +0000 @@ -0,0 +1,41 @@ +/* + * Definitions etc. for regexp(3) routines. @@ -1372,18 +1372,18 @@ diff -Naur a/net/netfilter/regexp/regexp.h b/net/netfilter/regexp/regexp.h +void regerror(char *s); + +#endif -diff -Naur a/net/netfilter/regexp/regmagic.h b/net/netfilter/regexp/regmagic.h ---- a/net/netfilter/regexp/regmagic.h 1970-01-01 00:00:00.000000000 +0000 -+++ b/net/netfilter/regexp/regmagic.h 2022-01-29 08:04:32.992637539 +0000 +diff -Naur linux-5.15.46.orig/net/netfilter/regexp/regmagic.h linux-5.15.46/net/netfilter/regexp/regmagic.h +--- linux-5.15.46.orig/net/netfilter/regexp/regmagic.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-5.15.46/net/netfilter/regexp/regmagic.h 2022-06-11 14:53:07.985494758 +0000 @@ -0,0 +1,5 @@ +/* + * The first byte of the regexp internal "program" is actually this magic + * number; the start node begins in the second byte. + */ +#define MAGIC 0234 -diff -Naur a/net/netfilter/regexp/regsub.c b/net/netfilter/regexp/regsub.c ---- a/net/netfilter/regexp/regsub.c 1970-01-01 00:00:00.000000000 +0000 -+++ b/net/netfilter/regexp/regsub.c 2022-01-29 08:04:32.992637539 +0000 +diff -Naur linux-5.15.46.orig/net/netfilter/regexp/regsub.c linux-5.15.46/net/netfilter/regexp/regsub.c +--- linux-5.15.46.orig/net/netfilter/regexp/regsub.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-5.15.46/net/netfilter/regexp/regsub.c 2022-06-11 14:53:07.985494758 +0000 @@ -0,0 +1,95 @@ +/* + * regsub @@ -1480,9 +1480,9 @@ diff -Naur a/net/netfilter/regexp/regsub.c b/net/netfilter/regexp/regsub.c + } + *dst++ = '\0'; +} -diff -Naur a/net/netfilter/xt_layer7.c b/net/netfilter/xt_layer7.c ---- a/net/netfilter/xt_layer7.c 1970-01-01 00:00:00.000000000 +0000 -+++ b/net/netfilter/xt_layer7.c 2022-01-29 08:04:32.992637539 +0000 +diff -Naur linux-5.15.46.orig/net/netfilter/xt_layer7.c linux-5.15.46/net/netfilter/xt_layer7.c +--- linux-5.15.46.orig/net/netfilter/xt_layer7.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-5.15.46/net/netfilter/xt_layer7.c 2022-06-11 14:53:07.985494758 +0000 @@ -0,0 +1,666 @@ +/* + Kernel module to match application layer (OSI layer 7) data in connections. -- 2.35.3

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development June 2022