IPFire-SCM September 2022

ipfire-scm@lists.ipfire.org

1 participants
31 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2a06a0057120d25fe55f9c326a44c4f6cc3399d4
by Peter Müller 30 Sep '22

30 Sep '22

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5a44d68fc77bf72adf2d2d961e044510bfebd4f5
by Peter Müller 30 Sep '22

30 Sep '22

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6e8e9cba2a2865dd207dfbf8224e3a6c92941d9d
by Peter Müller 30 Sep '22

30 Sep '22

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 6e8e9cba2a2865dd207dfbf8224e3a6c92941d9d (commit) via 2689789ec088dfb2a24d4b9ae85b001a4b8576fb (commit) via 2f0fb4492901771f6a830876155f3caf0b9d560b (commit) via 12697266f4004bf3dc99296bb56d76213cccf0c0 (commit) via b655b21a45b550714e8bb75efeae5bdd36791956 (commit) via 520d214419650f90cb9491b6aea5cfe3763688b8 (commit) via bd053b99b3feb2e7036822dbbac24b5ce80ce2df (commit) from d62babe08e3284c3f18ad574b2a255195348c309 (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 6e8e9cba2a2865dd207dfbf8224e3a6c92941d9d Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Fri Sep 30 17:20:37 2022 +0000 linux: Update to 5.15.71 Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 2689789ec088dfb2a24d4b9ae85b001a4b8576fb Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Fri Sep 30 17:20:17 2022 +0000 configroot: Increase verbosiness of chown operations Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 2f0fb4492901771f6a830876155f3caf0b9d560b Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Fri Sep 30 15:48:03 2022 +0000 Core Update 171: Ship and restart Suricata Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 12697266f4004bf3dc99296bb56d76213cccf0c0 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Thu Sep 29 22:21:57 2022 +0200 libhtp: Update to 0.5.41 Needed for 'suricata 6.0.8' For details see: https://github.com/OISF/libhtp/releases/tag/0.5.41 "trim white space of invalid folding for first header clear buffered data for body data minor optimization for decompression code" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> commit b655b21a45b550714e8bb75efeae5bdd36791956 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Thu Sep 29 22:21:56 2022 +0200 suricata: Update to 6.0.8 Changelog: "6.0.8 -- 2022-09-27 Task #5552: libhtp 0.5.41 6.0.7 -- 2022-09-27 Security #5430: mqtt: DOS by quadratic with too many transactions in one parse (6.0.x backport) Bug #5559: BUG_ON triggered from TmThreadsInjectFlowById (6.0.x backport) Bug #5549: Failed assert DeStateSearchState (6.0.x) Bug #5548: tcp: assertion failed in DoInsertSegment (BUG_ON) (6.0.x) Bug #5547: rules: less strict parsing of unexpected flowbit options Bug #5546: rules: don't error on bad hex in content Bug #5540: detect: transform strip whitespace creates a 0-sized variable-length array: backport6 Bug #5505: http2: slow http2_frames_get_header_value_vec because of allocation [backport6] Bug #5471: Reject action is no longer working (6.0.x backport) Bug #5467: rules: more graceful handling of anomalies for stable versions Bug #5459: Counters are not initialized in all places. (6.0.x backport) Bug #5448: nfs: add maximum number of operations per compound (6.0.x backport) Bug #5436: Infinite loop if the sniffing interface temporarily goes down (6.0.x backports) Bug #5335: flow: vlan.use-for-tracking is not used for ICMPv4 (6.0.x backport) Bug #4421: flow manager: using too much CPU during idle (6.0.x backport) Feature #5535: ips: add "reject" action to exception policies (6.0.x backport) Feature #5500: ips: midstream: add "exception policy" for midstream (6.0.x backport) Task #5551: doc: add exception policy documentation (6.0.x) Task #5533: detect/parse: add tests for parsing signatures with reject and drop action (6.0.x backport) Task #5525: exceptions: error out when invalid configuration value is passed (6.0.x backport) Task #5381: add `alert-queue-expand-fails` command-line option (6.0.x backport) Task #5328: python: distutils deprecation warning (6.0.x backport)" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> commit 520d214419650f90cb9491b6aea5cfe3763688b8 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Tue Sep 27 10:54:45 2022 +0000 Core Update 171: Fix backup {ex,in}clude file permissions Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit bd053b99b3feb2e7036822dbbac24b5ce80ce2df Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Mon Sep 26 18:50:08 2022 +0000 backup: Set owner of {ex,in}clude{,.user} files to "root" Since these files are static, there is no legitimate reason why they should be owned (hence writable) by "nobody". Also, according to configroot's LFS file, this is the intended behaviour for the *.user files, which is then overwritten by the backup LFS file. Therefore, set the file mode of these statically - configroot does not feature other files in /var/ipfire/backup/ anyway. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/suricata | 4 ++++ config/rootfiles/{oldcore/131 => core/171}/filelists/libhtp | 0 config/rootfiles/{oldcore/131 => core/171}/filelists/suricata | 0 config/rootfiles/core/171/update.sh | 7 +++++++ lfs/backup | 6 +++--- lfs/configroot | 8 ++++---- lfs/libhtp | 4 ++-- lfs/linux | 4 ++-- lfs/suricata | 4 ++-- .../suricata-5.0.8-fix-level1-cache-line-size-detection.patch | 2 +- 10 files changed, 25 insertions(+), 14 deletions(-) copy config/rootfiles/{oldcore/131 => core/171}/filelists/libhtp (100%) copy config/rootfiles/{oldcore/131 => core/171}/filelists/suricata (100%) Difference in files: diff --git a/config/rootfiles/common/suricata b/config/rootfiles/common/suricata index 043aba072..df297ebd6 100644 --- a/config/rootfiles/common/suricata +++ b/config/rootfiles/common/suricata @@ -1,6 +1,7 @@ etc/suricata etc/suricata/suricata.yaml usr/bin/suricata +#usr/include/suricata-plugin.h usr/sbin/convert-ids-backend-files #usr/share/doc/suricata #usr/share/doc/suricata/AUTHORS @@ -29,13 +30,16 @@ usr/share/suricata #usr/share/suricata/rules/dns-events.rules #usr/share/suricata/rules/files.rules #usr/share/suricata/rules/http-events.rules +#usr/share/suricata/rules/http2-events.rules #usr/share/suricata/rules/ipsec-events.rules #usr/share/suricata/rules/kerberos-events.rules #usr/share/suricata/rules/modbus-events.rules +#usr/share/suricata/rules/mqtt-events.rules #usr/share/suricata/rules/nfs-events.rules #usr/share/suricata/rules/ntp-events.rules #usr/share/suricata/rules/smb-events.rules #usr/share/suricata/rules/smtp-events.rules +#usr/share/suricata/rules/ssh-events.rules #usr/share/suricata/rules/stream-events.rules #usr/share/suricata/rules/tls-events.rules #usr/share/suricata/threshold.config diff --git a/config/rootfiles/core/171/filelists/libhtp b/config/rootfiles/core/171/filelists/libhtp new file mode 120000 index 000000000..676e2c5e8 --- /dev/null +++ b/config/rootfiles/core/171/filelists/libhtp @@ -0,0 +1 @@ +../../../common/libhtp \ No newline at end of file diff --git a/config/rootfiles/core/171/filelists/suricata b/config/rootfiles/core/171/filelists/suricata new file mode 120000 index 000000000..f671f6993 --- /dev/null +++ b/config/rootfiles/core/171/filelists/suricata @@ -0,0 +1 @@ +../../../common/suricata \ No newline at end of file diff --git a/config/rootfiles/core/171/update.sh b/config/rootfiles/core/171/update.sh index f626ed3b6..a8172a929 100644 --- a/config/rootfiles/core/171/update.sh +++ b/config/rootfiles/core/171/update.sh @@ -50,6 +50,7 @@ done /usr/local/bin/openvpnctrl -k /usr/local/bin/openvpnctrl -kn2n /etc/rc.d/init.d/ipsec stop +/etc/init.d/rc.d/suricata stop /etc/rc.d/init.d/collectd stop KVER="xxxKVERxxx" @@ -221,8 +222,14 @@ ldconfig # Rebuild fcrontab from scratch /usr/bin/fcrontab -z +# Fix backup file permissions +chown -v root:root /var/ipfire/backup/{in,ex}clude* + # Start services /etc/rc.d/init.d/collectd start +if grep -q "ENABLED=on" /var/ipfire/suricata/settings; then + /etc/rc.d/init.d/suricata start +fi /etc/rc.d/init.d/unbound start /etc/rc.d/init.d/apache start if grep -q "ENABLED=on" /var/ipfire/ovpn/settings; then diff --git a/lfs/backup b/lfs/backup index 6f686bf22..cf1e58c7e 100644 --- a/lfs/backup +++ b/lfs/backup @@ -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 # @@ -61,10 +61,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) -mkdir -p /var/ipfire/backup/bin install -v -m 755 -o root $(DIR_SRC)/config/backup/backup.pl /var/ipfire/backup/bin - install -v -m 644 $(DIR_SRC)/config/backup/include /var/ipfire/backup/ - install -v -m 644 $(DIR_SRC)/config/backup/exclude /var/ipfire/backup/ chown nobody:nobody -R /var/ipfire/backup/ chown root:root -R /var/ipfire/backup/bin/ + install -v -m 644 $(DIR_SRC)/config/backup/include /var/ipfire/backup/ + install -v -m 644 $(DIR_SRC)/config/backup/exclude /var/ipfire/backup/ -mkdir -p /var/ipfire/backup/addons -mkdir -p /var/ipfire/backup/addons/includes -mkdir -p /var/ipfire/backup/addons/backup diff --git a/lfs/configroot b/lfs/configroot index 31b9a9463..f278ccf77 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -167,10 +167,10 @@ $(TARGET) : cp $(DIR_SRC)/langs/*/cgi-bin/*.pl $(CONFIG_ROOT)/langs/ # Configroot permissions - chown -R nobody:nobody $(CONFIG_ROOT) - chown root:root $(CONFIG_ROOT) - for i in backup/ *.pl addon-lang/ langs/ ; do \ - chown -R root:root $(CONFIG_ROOT)/$$i; \ + chown -Rv nobody:nobody $(CONFIG_ROOT) + chown root:root $(CONFIG_ROOT) + for i in backup/exclude.user backup/include.user *.pl addon-lang/ langs/ ; do \ + chown -Rv root:root $(CONFIG_ROOT)/$$i; \ done chown -Rv root:root $(CONFIG_ROOT)/*/bin chown root:nobody $(CONFIG_ROOT)/dhcpc diff --git a/lfs/libhtp b/lfs/libhtp index ffc82f8cd..e3be4a73a 100644 --- a/lfs/libhtp +++ b/lfs/libhtp @@ -24,7 +24,7 @@ include Config -VER = 0.5.40 +VER = 0.5.41 THISAPP = libhtp-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 37239d8d0afb6841c54bab1669a17ec7336b10998f8835ef91cf9556dd7449991ce6fb04a408d16b431ba6327b32f6f509a79a4c79ffc6e88e555fcf2e9f2cce +$(DL_FILE)_BLAKE2 = e6e790f76b8d08b89ffc483a218dd1b3a6f910ff1fe8e44d48bfaae2189d9df567c0199e9f20fde05dc4059f75a1e3c34f4f76f2c8818dc7ca4111538095e16d install : $(TARGET) diff --git a/lfs/linux b/lfs/linux index a1b32cc25..d35057b22 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 5.15.68 +VER = 5.15.71 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 = b97474cbe59654ac29a5f514c08a85db9ec330f58e08de53386d4fcedeab3845d6ea5b55e478a49fa94466eda296f80c7835704e2a13d1d56f6e38ed51953ca1 +$(DL_FILE)_BLAKE2 = 77da2393a31b6c6fed7cdfef61a112ae49fcdfce96968daf8c7a690a6e65025c7238c1fe084d0bfda403dc56db877b6db99def12803e840cacf318da40327d7b arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 58a70e757a9121a0aac83604a37aa787ec7ac0ee4970c5a3ac3bcb2dbaca32b00089cae6c0da5cf2fe0a2e156427b5165c6a86e0371a3e896f4c7cdd699c34a0 install : $(TARGET) diff --git a/lfs/suricata b/lfs/suricata index 1fbc2c185..857fb4e7b 100644 --- a/lfs/suricata +++ b/lfs/suricata @@ -24,7 +24,7 @@ include Config -VER = 5.0.10 +VER = 6.0.8 THISAPP = suricata-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = b5c83b9882e89894c3dedb7f536d584a20bbeab24236752e528171db6589a6308422c8b0be4f433fc63b8cfc227aa0b67935a4aece943b10f4577398ea9ed467 +$(DL_FILE)_BLAKE2 = 1e445885f3a672081cbb8f17de9fb0fa21a2c618b80ea8d3d9362c0475149d833986cac047ad90b1c1a5b5b19025ff501a695e0f197c00457859b3858f51ecba install : $(TARGET) diff --git a/src/patches/suricata/suricata-5.0.8-fix-level1-cache-line-size-detection.patch b/src/patches/suricata/suricata-5.0.8-fix-level1-cache-line-size-detection.patch index 68a21f1e9..5aaabb167 100644 --- a/src/patches/suricata/suricata-5.0.8-fix-level1-cache-line-size-detection.patch +++ b/src/patches/suricata/suricata-5.0.8-fix-level1-cache-line-size-detection.patch @@ -2,7 +2,7 @@ diff --git a/configure.ac b/configure.ac index d56d3a550..81abf8f00 100644 --- a/configure.ac +++ b/configure.ac -@@ -2318,7 +2318,7 @@ fi +@@ -2390,7 +2390,7 @@ fi AC_PATH_PROG(HAVE_GETCONF_CMD, getconf, "no") if test "$HAVE_GETCONF_CMD" != "no"; then CLS=$(getconf LEVEL1_DCACHE_LINESIZE) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d62babe08e3284c3f18ad574b2a255195348c309
by Peter Müller 26 Sep '22

26 Sep '22

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4075ce139b0531e4e90880d76a3db086bee229c9
by Peter Müller 26 Sep '22

26 Sep '22

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 4075ce139b0531e4e90880d76a3db086bee229c9 (commit) via f128ac2a5c88d7094c768fdcada1d0c5d0f81ab1 (commit) from 1c154e5180a9920e579c8b6dccafc5540f0d6123 (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 4075ce139b0531e4e90880d76a3db086bee229c9 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Mon Sep 26 08:54:36 2022 +0000 Core Update 171: Ship ipblocklist/sources Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit f128ac2a5c88d7094c768fdcada1d0c5d0f81ab1 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sat Sep 24 13:53:12 2022 +0200 ipblocklist-sources: Correct the info url - Fixes bug#12938 - With the .html ending the link gets a 404 Page not found error Fixes: Bug#12938 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/ipblocklist/sources | 4 ++-- config/rootfiles/core/171/filelists/files | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/ipblocklist/sources b/config/ipblocklist/sources index a6f82354c..be0cf0229 100644 --- a/config/ipblocklist/sources +++ b/config/ipblocklist/sources @@ -114,13 +114,13 @@ our %sources = ( 'EMERGING_FWRULE' => { 'name' => 'Emerging Threats Blocklis 'category' => 'reputation' }, 'BOGON' => { 'name' => 'Bogus address list (Martian)', 'url' => 'https://www.team-cymru.org/Services/Bogons/bogon-bn-agg.txt', - 'info' => 'https://www.team-cymru.com/bogon-reference.html', + 'info' => 'https://www.team-cymru.com/bogon-reference', 'parser' => 'ip-or-net-list', 'rate' => '1d', 'category' => 'invalid' }, 'BOGON_FULL' => { 'name' => 'Full Bogus Address List', 'url' => 'https://www.team-cymru.org/Services/Bogons/fullbogons-ipv4.txt', - 'info' => 'https://www.team-cymru.com/bogon-reference.html', + 'info' => 'https://www.team-cymru.com/bogon-reference', 'parser' => 'ip-or-net-list', 'rate' => '4h', 'category' => 'invalid', diff --git a/config/rootfiles/core/171/filelists/files b/config/rootfiles/core/171/filelists/files index f6803cffa..1e6bdd1a7 100644 --- a/config/rootfiles/core/171/filelists/files +++ b/config/rootfiles/core/171/filelists/files @@ -133,5 +133,6 @@ srv/web/ipfire/cgi-bin/index.cgi srv/web/ipfire/cgi-bin/logs.cgi/log.dat srv/web/ipfire/cgi-bin/logs.cgi/urlfilter.dat usr/local/bin/backupiso +var/ipfire/ipblocklist/sources var/ipfire/main/manualpages var/spool/cron/root.orig hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1c154e5180a9920e579c8b6dccafc5540f0d6123
by Peter Müller 23 Sep '22

23 Sep '22

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 1c154e5180a9920e579c8b6dccafc5540f0d6123 (commit) via aa4d18a8fbcdfc6123b3aea85a8df4d71e7a22e4 (commit) via 80305dd4d3c783bc1ee4cb5b3936235117d40c6d (commit) via abb32f5e608d3e5f0c3176a4087426affbc860a3 (commit) via a76f7d82240ccfe47765eabe84b24fef98e0e2f0 (commit) via 75bbee2ae34e169393fe00e90b84ab0c8e3fdb5b (commit) via c073cb7f920c5047029f76147b5124e9aa191e0d (commit) via 73b404314372b36c788b709bcf18793f0a1abcbc (commit) via c2993d5e587f5111943d3d0452e8a9b1646b69f0 (commit) via a15c20fde98a4ab34242dd3cefd9bbb890394188 (commit) via 7bb62b122541633c0e79538120b1175faaa521bb (commit) via 64fc136084e7fa759c7261a3f6e54d9eea72d5fc (commit) via 21236acd00c12ea0c33a8f5b4a8829e0310b3290 (commit) from abb185bf5ab05fae490db310c6c166dc33a380b7 (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 1c154e5180a9920e579c8b6dccafc5540f0d6123 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Fri Sep 23 10:43:27 2022 +0000 Core Update 171: Ship expat Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit aa4d18a8fbcdfc6123b3aea85a8df4d71e7a22e4 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Sep 21 19:16:11 2022 +0200 expat: Update to version 2.4.9 - Update from version 2.4.8 to 2.4.9 - Update of rootfile - Changelog Release 2.4.9 Tue September 20 2022 Security fixes: #629 #640 CVE-2022-40674 -- Heap use-after-free vulnerability in function doContent. Expected impact is denial of service or potentially arbitrary code execution. Bug fixes: #634 MinGW: Fix mis-compilation for -D__USE_MINGW_ANSI_STDIO=0 #614 docs: Fix documentation on effect of switch XML_DTD on symbol visibility in doc/reference.html Other changes: #638 MinGW: Make fix-xmltest-log.sh drop more Wine bug output #596 #625 Autotools: Sync CMake templates with CMake 3.22 #608 CMake: Migrate from use of CMAKE_*_POSTFIX to dedicated variables EXPAT_*_POSTFIX to stop affecting other projects #597 #599 Windows|CMake: Add missing -DXML_STATIC to test runners and fuzzers #512 #621 Windows|CMake: Render .def file from a template to fix linking with -DEXPAT_DTD=OFF and/or -DEXPAT_ATTR_INFO=ON #611 #621 MinGW|CMake: Apply MSVC .def file when linking #622 #624 MinGW|CMake: Sync library name with GNU Autotools, i.e. produce libexpat-1.dll rather than libexpat.dll by default. Filename libexpat.dll.a is unaffected. #632 MinGW|CMake: Set missing variable CMAKE_RC_COMPILER in toolchain file "cmake/mingw-toolchain.cmake" to avoid error "windres: Command not found" on e.g. Ubuntu 20.04 #597 #627 CMake: Unify inconsistent use of set() and option() in context of public build time options to take need for set(.. FORCE) in projects using Expat by means of add_subdirectory(..) off Expat's users' shoulders #626 #641 Stop exporting API symbols when building a static library #644 Resolve use of deprecated "fgrep" by "grep -F" #620 CMake: Make documentation on variables a bit more consistent #636 CMake: Drop leading whitespace from a #cmakedefine line in file expat_config.h.cmake #594 xmlwf: Fix harmless variable mix-up in function nsattcmp #592 #593 #610 Address Cppcheck warnings #643 Address Clang 15 compiler warnings #642 #644 Version info bumped from 9:8:8 to 9:9:8; see https://verbump.de/ for what these numbers do Infrastructure: #597 #598 CI: Windows: Start covering MSVC 2022 #619 CI: macOS: Migrate off deprecated macOS 10.15 #632 CI: Linux: Make migration off deprecated Ubuntu 18.04 work #643 CI: Upgrade Clang from 14 to 15 #637 apply-clang-format.sh: Add support for BSD find #633 coverage.sh: Exclude MinGW headers #635 coverage.sh: Fix name collision for -funsigned-char Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> commit 80305dd4d3c783bc1ee4cb5b3936235117d40c6d Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Fri Sep 23 10:42:14 2022 +0000 Core Update 171: Delete stale Bind 9.16.32 libraries Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit abb32f5e608d3e5f0c3176a4087426affbc860a3 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Sep 23 09:03:02 2022 +0200 bind: Update to 9.16.33 For details see: https://downloads.isc.org/isc/bind9/9.16.33/doc/arm/html/notes.html#notes-f… "Security Fixes Previously, there was no limit to the number of database lookups performed while processing large delegations, which could be abused to severely impact the performance of named running as a recursive resolver. This has been fixed. (CVE-2022-2795) ISC would like to thank Yehuda Afek from Tel-Aviv University and Anat Bremler-Barr & Shani Stajnrod from Reichman University for bringing this vulnerability to our attention. [GL #3394] named running as a resolver with the stale-answer-client-timeout option set to 0 could crash with an assertion failure, when there was a stale CNAME in the cache for the incoming query. This has been fixed. (CVE-2022-3080) [GL #3517] A memory leak was fixed that could be externally triggered in the DNSSEC verification code for the ECDSA algorithm. (CVE-2022-38177) [GL #3487] Memory leaks were fixed that could be externally triggered in the DNSSEC verification code for the EdDSA algorithm. (CVE-2022-38178) [GL #3487] Feature Changes Response Rate Limiting (RRL) code now treats all QNAMEs that are subject to wildcard processing within a given zone as the same name, to prevent circumventing the limits enforced by RRL. [GL #3459] Zones using dnssec-policy now require dynamic DNS or inline-signing to be configured explicitly. [GL #3381] A backward-compatible approach was implemented for encoding internationalized domain names (IDN) in dig and converting the domain to IDNA2008 form; if that fails, BIND tries an IDNA2003 conversion. [GL #3485] Bug Fixes A serve-stale bug was fixed, where BIND would try to return stale data from cache for lookups that received duplicate queries or queries that would be dropped. This bug resulted in premature SERVFAIL responses, and has now been resolved. [GL #2982]" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> commit a76f7d82240ccfe47765eabe84b24fef98e0e2f0 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Fri Sep 23 10:39:57 2022 +0000 Core Update 171: Ship manualpages Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 75bbee2ae34e169393fe00e90b84ab0c8e3fdb5b Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Sep 22 13:43:10 2022 +0200 manualpages: Correct link to wiki for Network (other) - Network (other) help link was set to go to Network (internal) wiki page Link modified - Running the check_manualpages.pl script requires it to be executable so the build changed the permissions mode from 644 to 755 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org> commit c073cb7f920c5047029f76147b5124e9aa191e0d Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Fri Sep 23 10:39:04 2022 +0000 Core Update 171: Ship and rebuild crontab Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 73b404314372b36c788b709bcf18793f0a1abcbc Author: Jon Murphy <jon.murphy(a)ipfire.org> Date: Wed Aug 24 19:31:29 2022 -0500 crontab: add periodic cleanup the collectd RRD (graphs) - Created (mostly) for old openvpn graphs - RRD removed when no graph modification for +365 days - chosen since graph max out is 365 days - fcron job runs once per week - chosen since this is just a cleanup and it doesnt need to run everyday Note: logging can be added if needed. Signed-off-by: Jon Murphy <jon.murphy(a)ipfire.org> Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c2993d5e587f5111943d3d0452e8a9b1646b69f0 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Fri Sep 23 10:37:33 2022 +0000 Core Update 171: Ship log.dat Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit a15c20fde98a4ab34242dd3cefd9bbb890394188 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Sep 19 15:15:18 2022 +0200 log.dat: Add NUT entry for System Logs - Fixes bug#12921 - Also aligned all the code entries in %sections and %trsections Suggested-by: Michael <ip.fire(a)die-fritzens.de> Tested-by: Michael <ip.fire(a)die-fritzens.de> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org> commit 7bb62b122541633c0e79538120b1175faaa521bb Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Sep 21 12:37:19 2022 +0200 cpufrequtils: Remove SERVICES entry for this package - fixes Bug#12933 - cpufrequtils is a set of "tools" to manage and set cpu freq settings. - There is an initscript but this is only loading the cpu dependent kernel modules that are required by cpufrequtils. - Therefore cpufrequtils is not a service but a set of tools that are used when required. - SERVICES line made blank so that this addon does not show up in the services addon table. - Modified install initscript line to not use SERVICES variable Fixes: Bug#12933 Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org> commit 64fc136084e7fa759c7261a3f6e54d9eea72d5fc Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Fri Sep 23 10:35:39 2022 +0000 Core Update 171: Ship and restart Unbound Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 21236acd00c12ea0c33a8f5b4a8829e0310b3290 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Sep 23 09:09:38 2022 +0200 unbound: Update to 1.16.3 For details see: https://lists.nlnetlabs.nl/pipermail/unbound-users/2022-September/007885.ht… "This release fixes CVE-2022-3204 Non-Responsive Delegation Attack. It was reported by Yehuda Afek from Tel-Aviv University and Anat Bremler-Barr and Shani Stajnrod from Reichman University. This fixes for better performance when under load, by cutting promiscuous queries for nameserver discovery and limiting the number of times a delegation point can look in the cache for missing records. Bug Fixes - Patch for CVE-2022-3204 Non-Responsive Delegation Attack." Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/cfgroot/manualpages | 2 +- config/cron/crontab | 3 +++ config/rootfiles/common/bind | 17 +++++++---------- config/rootfiles/common/expat | 20 ++++++++++---------- config/rootfiles/common/unbound | 2 +- .../{oldcore/106 => core/171}/filelists/expat | 0 config/rootfiles/core/171/filelists/files | 3 +++ .../{oldcore/106 => core/171}/filelists/unbound | 0 config/rootfiles/core/171/update.sh | 14 ++++++++++++++ html/cgi-bin/logs.cgi/log.dat | 14 ++++++++------ lfs/bind | 4 ++-- lfs/cpufrequtils | 6 +++--- lfs/expat | 4 ++-- lfs/unbound | 4 ++-- tools/check_manualpages.pl | 0 15 files changed, 56 insertions(+), 37 deletions(-) copy config/rootfiles/{oldcore/106 => core/171}/filelists/expat (100%) copy config/rootfiles/{oldcore/106 => core/171}/filelists/unbound (100%) mode change 100644 => 100755 tools/check_manualpages.pl Difference in files: diff --git a/config/cfgroot/manualpages b/config/cfgroot/manualpages index c0cefed5e..0b904de42 100644 --- a/config/cfgroot/manualpages +++ b/config/cfgroot/manualpages @@ -22,7 +22,7 @@ services.cgi=configuration/status/services media.cgi=configuration/status/drives netexternal.cgi=configuration/status/network_ext netinternal.cgi=configuration/status/network_int -netother.cgi=configuration/status/network_int +netother.cgi=configuration/status/network_other netovpnrw.cgi=configuration/status/network_ovpnrw #netovpnsrv.cgi= wio.cgi=addons/wio diff --git a/config/cron/crontab b/config/cron/crontab index b727531fc..7088e0b75 100644 --- a/config/cron/crontab +++ b/config/cron/crontab @@ -80,5 +80,8 @@ HOME=/ # Cleanup the mail spool directory %weekly * * /usr/sbin/dma-cleanup-spool +# Cleanup the collectd RRD (graphs) +%weekly * * /bin/find /var/log/rrd -mtime +365 -type f -name '*.rrd' -delete -o -type d -empty -delete + # Update DNS trust anchor %daily,random * * @runas(nobody) /usr/sbin/unbound-anchor -a /var/lib/unbound/root.key -c /etc/unbound/icannbundle.pem diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind index 5aea1853b..879f8c832 100644 --- a/config/rootfiles/common/bind +++ b/config/rootfiles/common/bind @@ -157,7 +157,6 @@ usr/bin/nsupdate #usr/include/isc/heap.h #usr/include/isc/hex.h #usr/include/isc/hmac.h -#usr/include/isc/hp.h #usr/include/isc/ht.h #usr/include/isc/httpd.h #usr/include/isc/interfaceiter.h @@ -175,7 +174,6 @@ usr/bin/nsupdate #usr/include/isc/mem.h #usr/include/isc/meminfo.h #usr/include/isc/mutex.h -#usr/include/isc/mutexatomic.h #usr/include/isc/mutexblock.h #usr/include/isc/net.h #usr/include/isc/netaddr.h @@ -191,7 +189,6 @@ usr/bin/nsupdate #usr/include/isc/pool.h #usr/include/isc/portset.h #usr/include/isc/print.h -#usr/include/isc/queue.h #usr/include/isc/quota.h #usr/include/isc/radix.h #usr/include/isc/random.h @@ -274,24 +271,24 @@ usr/bin/nsupdate #usr/include/pk11/site.h #usr/include/pkcs11 #usr/include/pkcs11/pkcs11.h -usr/lib/libbind9-9.16.32.so +usr/lib/libbind9-9.16.33.so #usr/lib/libbind9.la #usr/lib/libbind9.so -usr/lib/libdns-9.16.32.so +usr/lib/libdns-9.16.33.so #usr/lib/libdns.la #usr/lib/libdns.so -usr/lib/libirs-9.16.32.so +usr/lib/libirs-9.16.33.so #usr/lib/libirs.la #usr/lib/libirs.so -usr/lib/libisc-9.16.32.so +usr/lib/libisc-9.16.33.so #usr/lib/libisc.la #usr/lib/libisc.so -usr/lib/libisccc-9.16.32.so +usr/lib/libisccc-9.16.33.so #usr/lib/libisccc.la #usr/lib/libisccc.so -usr/lib/libisccfg-9.16.32.so +usr/lib/libisccfg-9.16.33.so #usr/lib/libisccfg.la #usr/lib/libisccfg.so -usr/lib/libns-9.16.32.so +usr/lib/libns-9.16.33.so #usr/lib/libns.la #usr/lib/libns.so diff --git a/config/rootfiles/common/expat b/config/rootfiles/common/expat index 69b3fbfe6..8feb895b3 100644 --- a/config/rootfiles/common/expat +++ b/config/rootfiles/common/expat @@ -2,20 +2,20 @@ #usr/include/expat.h #usr/include/expat_config.h #usr/include/expat_external.h -#usr/lib/cmake/expat-2.4.8 -#usr/lib/cmake/expat-2.4.8/expat-config-version.cmake -#usr/lib/cmake/expat-2.4.8/expat-config.cmake -#usr/lib/cmake/expat-2.4.8/expat-noconfig.cmake -#usr/lib/cmake/expat-2.4.8/expat.cmake +#usr/lib/cmake/expat-2.4.9 +#usr/lib/cmake/expat-2.4.9/expat-config-version.cmake +#usr/lib/cmake/expat-2.4.9/expat-config.cmake +#usr/lib/cmake/expat-2.4.9/expat-noconfig.cmake +#usr/lib/cmake/expat-2.4.9/expat.cmake #usr/lib/libexpat.la #usr/lib/libexpat.so usr/lib/libexpat.so.1 -usr/lib/libexpat.so.1.8.8 +usr/lib/libexpat.so.1.8.9 #usr/lib/pkgconfig/expat.pc #usr/share/doc/expat -#usr/share/doc/expat-2.4.8 -#usr/share/doc/expat-2.4.8/ok.min.css -#usr/share/doc/expat-2.4.8/reference.html -#usr/share/doc/expat-2.4.8/style.css +#usr/share/doc/expat-2.4.9 +#usr/share/doc/expat-2.4.9/ok.min.css +#usr/share/doc/expat-2.4.9/reference.html +#usr/share/doc/expat-2.4.9/style.css #usr/share/doc/expat/AUTHORS #usr/share/doc/expat/changelog diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound index 7fc4f191a..7af787f29 100644 --- a/config/rootfiles/common/unbound +++ b/config/rootfiles/common/unbound @@ -11,7 +11,7 @@ etc/unbound/unbound.conf #usr/lib/libunbound.la #usr/lib/libunbound.so usr/lib/libunbound.so.8 -usr/lib/libunbound.so.8.1.18 +usr/lib/libunbound.so.8.1.19 #usr/lib/pkgconfig/libunbound.pc usr/sbin/unbound usr/sbin/unbound-anchor diff --git a/config/rootfiles/core/171/filelists/expat b/config/rootfiles/core/171/filelists/expat new file mode 120000 index 000000000..e1923cf63 --- /dev/null +++ b/config/rootfiles/core/171/filelists/expat @@ -0,0 +1 @@ +../../../common/expat \ No newline at end of file diff --git a/config/rootfiles/core/171/filelists/files b/config/rootfiles/core/171/filelists/files index 6ce89137f..f6803cffa 100644 --- a/config/rootfiles/core/171/filelists/files +++ b/config/rootfiles/core/171/filelists/files @@ -130,5 +130,8 @@ lib/firmware/wfx/brd4001a.pds lib/firmware/wfx/brd8022a.pds lib/firmware/wfx/brd8023a.pds srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/logs.cgi/log.dat srv/web/ipfire/cgi-bin/logs.cgi/urlfilter.dat usr/local/bin/backupiso +var/ipfire/main/manualpages +var/spool/cron/root.orig diff --git a/config/rootfiles/core/171/filelists/unbound b/config/rootfiles/core/171/filelists/unbound new file mode 120000 index 000000000..66adf0924 --- /dev/null +++ b/config/rootfiles/core/171/filelists/unbound @@ -0,0 +1 @@ +../../../common/unbound \ No newline at end of file diff --git a/config/rootfiles/core/171/update.sh b/config/rootfiles/core/171/update.sh index 1332f676d..ed9ed6ad7 100644 --- a/config/rootfiles/core/171/update.sh +++ b/config/rootfiles/core/171/update.sh @@ -45,6 +45,7 @@ done # Stop services /etc/rc.d/init.d/apache stop +/etc/rc.d/init.d/unbound stop /etc/rc.d/init.d/squid stop /usr/local/bin/openvpnctrl -k /usr/local/bin/openvpnctrl -kn2n @@ -174,17 +175,26 @@ rm -rvf \ /usr/bin/perl5.32* \ /usr/lib/libbfd-2.37.so \ /usr/lib/libbind9-9.16.31.so \ + /usr/lib/libbind9-9.16.32.so \ /usr/lib/libdns-9.16.31.so \ + /usr/lib/libdns-9.16.32.so \ /usr/lib/libefiboot.so.1.37 \ /usr/lib/libefivar.so.1.37 \ + /usr/lib/libexpat.so.1.8.8 \ /usr/lib/libhogweed.so.6.4 \ /usr/lib/libirs-9.16.31.so \ + /usr/lib/libirs-9.16.32.so \ /usr/lib/libisc-9.16.31.so \ + /usr/lib/libisc-9.16.32.so \ /usr/lib/libisccc-9.16.31.so \ + /usr/lib/libisccc-9.16.32.so \ /usr/lib/libisccfg-9.16.31.so \ + /usr/lib/libisccfg-9.16.32.so \ /usr/lib/libnettle.so.8.4 \ /usr/lib/libns-9.16.31.so \ + /usr/lib/libns-9.16.32.so \ /usr/lib/libopcodes-2.37.so \ + /usr/lib/libunbound.so.8.1.18 \ /usr/lib/perl5/5.32* \ /usr/lib/perl5/site_perl/5.32* @@ -200,8 +210,12 @@ ldconfig # Filesytem cleanup /usr/local/bin/filesystem-cleanup +# Rebuild fcrontab from scratch +/usr/bin/fcrontab -z + # Start services /etc/rc.d/init.d/collectd start +/etc/rc.d/init.d/unbound start /etc/rc.d/init.d/apache start if grep -q "ENABLED=on" /var/ipfire/ovpn/settings; then /usr/local/bin/openvpnctrl -s diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index 20f61d4ea..5fb1fcd5d 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -50,7 +50,7 @@ $cgiparams{'SECTION'} = 'ipfire'; my %sections = ( 'auth' => '(\w+$pam_unix$\[.*\]: )', - 'wio' => '(wio:|wio\[.*\])', + 'wio' => '(wio:|wio\[.*\])', 'captive' => '(Captive:)', 'clamav' => '(clamd\[.*\]: |freshclam\[.*\]: )', 'collectd' => '(collectd\[.*\]: )', @@ -65,11 +65,12 @@ my %sections = ( 'kernel' => '(kernel: (?!DROP_))', 'monit' => '(monit\[.*?\]: )', 'ntp' => '(ntpd(?:ate)?\[.*\]: )', - 'oinkmaster' => '(oinkmaster\[.*\]: )', + 'nut' => '(upsmon\[.*?\]: )', + 'oinkmaster' => '(oinkmaster\[.*\]: )', 'openvpn' => '(openvpnserver\[.*\]: |.*n2n\[.*\]: )', 'pakfire' => '(pakfire:)', 'red' => '(red:|pppd\[.*\]: |chat\[.*\]|pppoe\[.*\]|pptp\[.*\]|pppoa\[.*\]|pppoa3\[.*\]|pppoeci\[.*\]|ipppd|ipppd\[.*\]|kernel: ippp\d|kernel: isdn.*|ibod\[.*\]|dhcpcd\[.*\]|modem_run\[.*\])', - 'samba' => '(nmbd|smbd|winbind)\[\d+\]:', + 'samba' => '(nmbd|smbd|winbind)\[\d+\]:', 'suricata' => '(suricata: )', 'squid' => '(squid\[.*\]: |squid: )', 'ssh' => '(sshd(?:$.*$)?\[.*\]: )', @@ -81,7 +82,7 @@ my %sections = ( # Translations for the %sections array. my %trsections = ( 'auth' => "$Lang::tr{'loginlogout'}", - 'wio' => 'Who Is Online?', + 'wio' => 'Who Is Online?', 'captive' => $Lang::tr{'Captive'}, 'clamav' => 'ClamAV', 'collectd' => 'Collectd', @@ -96,11 +97,12 @@ my %trsections = ( 'kernel' => "$Lang::tr{'kernel'}", 'monit' => 'Monit', 'ntp' => 'NTP', - 'oinkmaster' => 'Oinkmaster', + 'nut' => 'NUT', + 'oinkmaster' => 'Oinkmaster', 'openvpn' => 'OpenVPN', 'pakfire' => 'Pakfire', 'red' => 'RED', - 'samba' => $Lang::tr{'samba'}, + 'samba' => $Lang::tr{'samba'}, 'suricata' => "$Lang::tr{'intrusion detection'}", 'squid' => "$Lang::tr{'web proxy'}", 'ssh' => 'SSH', diff --git a/lfs/bind b/lfs/bind index bb5c26e1e..aeff480a2 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@ include Config -VER = 9.16.32 +VER = 9.16.33 THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = df6f2c878138015da580dfaf0e16b5a97b11ead9f99c1425a09da8484954196ea3dafb828ac3ab386200ce2b180646c7eb1e0e62a84c153162270a4a1e19a5fc +$(DL_FILE)_BLAKE2 = 4246b61ce91af3d494ace4b8065b4c0043b2cfaf28c6de326691a969837e7d1cfbc0dac6b1e1a5182fc32af68048abcfa1202d00022951f3caa13afb03ebeb69 install : $(TARGET) diff --git a/lfs/cpufrequtils b/lfs/cpufrequtils index 752964198..dab254014 100644 --- a/lfs/cpufrequtils +++ b/lfs/cpufrequtils @@ -34,11 +34,11 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cpufrequtils -PAK_VER = 11 +PAK_VER = 12 DEPS = -SERVICES = cpufreq +SERVICES = ############################################################################### # Top-level Rules @@ -91,7 +91,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make install #install initscripts - $(call INSTALL_INITSCRIPTS,$(SERVICES)) + $(call INSTALL_INITSCRIPTS,cpufreq) @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/expat b/lfs/expat index 76f5a8e94..a1a1326d0 100644 --- a/lfs/expat +++ b/lfs/expat @@ -24,7 +24,7 @@ include Config -VER = 2.4.8 +VER = 2.4.9 THISAPP = expat-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = a829bd94d2cc9b305874ae2539dd4388ea99eaed21d2da17bbd99a1e7735b0f7cb910d096f72c71b128dcb8ffdff9021109e7ff5e562d8cefad228fd8d66f897 +$(DL_FILE)_BLAKE2 = d60183f96f3359acc069af638cc8d16ba19f51fbd8a61eddd80c2babddde357dcf0561e87af901f53617bfd9452e146c9dd9f317729cd3648b65832a38388640 install : $(TARGET) diff --git a/lfs/unbound b/lfs/unbound index 5a3c70caf..636fe8bf9 100644 --- a/lfs/unbound +++ b/lfs/unbound @@ -24,7 +24,7 @@ include Config -VER = 1.16.2 +VER = 1.16.3 THISAPP = unbound-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 2f7f119d12807ff5c000fd500be72a0825614da3e1f079f9b8d15a651bda2fa0b41599a55c6f76b17ff56120aa61e48042469063f08dd199333520172ca16750 +$(DL_FILE)_BLAKE2 = b97deade78ab903363e06ff9d71b9895c754378ec276bb17556de62c48a88af5fbabd26f97fb47313d1e631fe75dee245aa38fbf42a865ac3e764882a1124a51 install : $(TARGET) diff --git a/tools/check_manualpages.pl b/tools/check_manualpages.pl old mode 100644 new mode 100755 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. abb185bf5ab05fae490db310c6c166dc33a380b7
by Peter Müller 21 Sep '22

21 Sep '22

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 abb185bf5ab05fae490db310c6c166dc33a380b7 (commit) from d33651d74f2479bb169dcda6934dceb40132b77b (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 abb185bf5ab05fae490db310c6c166dc33a380b7 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Wed Sep 21 13:36:59 2022 +0000 linux: Align configurations and rootfiles for ARM Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 48 ++++++++---------------------- config/kernel/kernel.config.armv6l-ipfire | 47 +++++++---------------------- config/rootfiles/common/aarch64/linux | 24 +++++++-------- config/rootfiles/common/armv6l/linux | 14 ++++----- 4 files changed, 40 insertions(+), 93 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 1e08153c4..836e2b15f 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,15 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.15.59-ipfire Kernel Configuration +# Linux/arm64 5.15.68-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=110300 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=23700 +CONFIG_AS_VERSION=23900 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=23700 +CONFIG_LD_VERSION=23900 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y @@ -64,7 +64,6 @@ CONFIG_IRQ_MSI_IOMMU=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y -# CONFIG_GENERIC_IRQ_DEBUGFS is not set # end of IRQ subsystem CONFIG_GENERIC_TIME_VSYSCALL=y @@ -138,7 +137,6 @@ CONFIG_RCU_NEED_SEGCBLIST=y CONFIG_LOG_BUF_SHIFT=18 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 -# CONFIG_PRINTK_INDEX is not set CONFIG_GENERIC_SCHED_CLOCK=y # @@ -354,6 +352,8 @@ CONFIG_ARM64_ERRATUM_1286807=y CONFIG_ARM64_ERRATUM_1463225=y CONFIG_ARM64_ERRATUM_1542419=y CONFIG_ARM64_ERRATUM_1508412=y +CONFIG_ARM64_ERRATUM_2441009=y +CONFIG_ARM64_ERRATUM_2457168=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23154=y CONFIG_CAVIUM_ERRATUM_27456=y @@ -453,7 +453,6 @@ CONFIG_ARM64_TLB_RANGE=y # CONFIG_AS_HAS_ARMV8_5=y CONFIG_ARM64_BTI=y -CONFIG_ARM64_BTI_KERNEL=y CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y CONFIG_ARM64_E0PD=y CONFIG_ARCH_RANDOM=y @@ -589,7 +588,6 @@ CONFIG_ACPI_TABLE_UPGRADE=y # CONFIG_ACPI_PCI_SLOT is not set CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_HED=y -# CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_BGRT is not set CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y CONFIG_HAVE_ACPI_APEI=y @@ -597,7 +595,6 @@ CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_GHES=y CONFIG_ACPI_APEI_PCIEAER=y CONFIG_ACPI_APEI_SEA=y -# CONFIG_ACPI_APEI_EINJ is not set # CONFIG_ACPI_APEI_ERST_DEBUG is not set CONFIG_ACPI_CONFIGFS=m CONFIG_ACPI_IORT=y @@ -655,6 +652,7 @@ CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y CONFIG_HAVE_NMI=y CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_GENERIC_SMP_IDLE_THREAD=y @@ -723,7 +721,6 @@ CONFIG_STRICT_MODULE_RWX=y CONFIG_HAVE_ARCH_COMPILER_H=y CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y CONFIG_ARCH_USE_MEMREMAP_PROT=y -# CONFIG_LOCK_EVENT_COUNTS is not set CONFIG_ARCH_HAS_RELR=y CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y @@ -731,7 +728,6 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y # # GCOV-based kernel profiling # -# CONFIG_GCOV_KERNEL is not set CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y # end of GCOV-based kernel profiling @@ -782,8 +778,6 @@ CONFIG_BLK_DEV_THROTTLING=y # CONFIG_BLK_CGROUP_IOLATENCY is not set # CONFIG_BLK_CGROUP_IOCOST is not set # CONFIG_BLK_CGROUP_IOPRIO is not set -CONFIG_BLK_DEBUG_FS=y -CONFIG_BLK_DEBUG_FS_ZONED=y # CONFIG_BLK_SED_OPAL is not set CONFIG_BLK_INLINE_ENCRYPTION=y CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y @@ -943,7 +937,6 @@ CONFIG_CLEANCACHE=y CONFIG_FRONTSWAP=y CONFIG_CMA=y # CONFIG_CMA_DEBUG is not set -# CONFIG_CMA_DEBUGFS is not set # CONFIG_CMA_SYSFS is not set CONFIG_CMA_AREAS=7 # CONFIG_ZSWAP is not set @@ -959,7 +952,10 @@ CONFIG_ZONE_DMA=y CONFIG_ZONE_DMA32=y CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y # CONFIG_PERCPU_STATS is not set -# CONFIG_GUP_TEST is not set + +# +# GUP_TEST needs to have DEBUG_FS enabled +# CONFIG_ARCH_HAS_PTE_SPECIAL=y CONFIG_MAPPING_DIRTY_HELPERS=y @@ -1450,7 +1446,6 @@ CONFIG_ATM_CLIP=m CONFIG_ATM_BR2684=m # CONFIG_ATM_BR2684_IPFILTER is not set CONFIG_L2TP=m -# CONFIG_L2TP_DEBUGFS is not set CONFIG_L2TP_V3=y CONFIG_L2TP_IP=m CONFIG_L2TP_ETH=m @@ -1661,7 +1656,6 @@ CONFIG_CFG80211_EXTRA_REGDB_KEYDIR="" CONFIG_CFG80211_REG_CELLULAR_HINTS=y CONFIG_CFG80211_REG_RELAX_NO_IR=y CONFIG_CFG80211_DEFAULT_PS=y -# CONFIG_CFG80211_DEBUGFS is not set CONFIG_CFG80211_CRDA_SUPPORT=y CONFIG_CFG80211_WEXT=y CONFIG_CFG80211_WEXT_EXPORT=y @@ -1677,7 +1671,6 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" CONFIG_MAC80211_MESH=y CONFIG_MAC80211_LEDS=y -# CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_MESSAGE_TRACING is not set # CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 @@ -1854,7 +1847,6 @@ CONFIG_SUN50I_DE2_BUS=y CONFIG_SUNXI_RSB=y CONFIG_VEXPRESS_CONFIG=y CONFIG_MHI_BUS=m -# CONFIG_MHI_BUS_DEBUG is not set # CONFIG_MHI_BUS_PCI_GENERIC is not set # end of Bus devices @@ -2661,10 +2653,8 @@ CONFIG_MVPP2=m CONFIG_MVPP2_PTP=y # CONFIG_PXA168_ETH is not set CONFIG_SKGE=m -# CONFIG_SKGE_DEBUG is not set CONFIG_SKGE_GENESIS=y CONFIG_SKY2=m -# CONFIG_SKY2_DEBUG is not set CONFIG_OCTEONTX2_MBOX=m CONFIG_OCTEONTX2_AF=m # CONFIG_NDC_DIS_DYNAMIC_CACHING is not set @@ -2986,7 +2976,6 @@ CONFIG_ATH9K_BTCOEX_SUPPORT=y CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y CONFIG_ATH9K_AHB=y -# CONFIG_ATH9K_DEBUGFS is not set CONFIG_ATH9K_DFS_CERTIFIED=y # CONFIG_ATH9K_DYNACK is not set # CONFIG_ATH9K_WOW is not set @@ -2995,7 +2984,6 @@ CONFIG_ATH9K_RFKILL=y CONFIG_ATH9K_PCOEM=y CONFIG_ATH9K_PCI_NO_EEPROM=m CONFIG_ATH9K_HTC=m -# CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_ATH9K_HWRNG=y CONFIG_CARL9170=m CONFIG_CARL9170_LEDS=y @@ -3011,7 +2999,6 @@ CONFIG_ATH10K_AHB=y CONFIG_ATH10K_SDIO=m CONFIG_ATH10K_USB=m CONFIG_ATH10K_DEBUG=y -# CONFIG_ATH10K_DEBUGFS is not set # CONFIG_ATH10K_TRACING is not set CONFIG_ATH10K_DFS_CERTIFIED=y CONFIG_WCN36XX=m @@ -3251,7 +3238,6 @@ CONFIG_VIRT_WIFI=m CONFIG_VMXNET3=m # CONFIG_FUJITSU_ES is not set -# CONFIG_NETDEVSIM is not set CONFIG_NET_FAILOVER=m # CONFIG_ISDN is not set @@ -5370,7 +5356,7 @@ CONFIG_DRM_PANEL_BRIDGE=y # CONFIG_DRM_CDNS_DSI is not set # CONFIG_DRM_CHIPONE_ICN6211 is not set # CONFIG_DRM_CHRONTEL_CH7033 is not set -# CONFIG_DRM_DISPLAY_CONNECTOR is not set +CONFIG_DRM_DISPLAY_CONNECTOR=m # CONFIG_DRM_LONTIUM_LT8912B is not set # CONFIG_DRM_LONTIUM_LT9611 is not set # CONFIG_DRM_LONTIUM_LT9611UXC is not set @@ -5575,7 +5561,6 @@ CONFIG_SND_DEBUG=y # CONFIG_SND_DEBUG_VERBOSE is not set CONFIG_SND_PCM_XRUN_DEBUG=y # CONFIG_SND_CTL_VALIDATION is not set -# CONFIG_SND_JACK_INJECTION_DEBUG is not set CONFIG_SND_VMASTER=y CONFIG_SND_CTL_LED=m CONFIG_SND_SEQUENCER=m @@ -6345,7 +6330,6 @@ CONFIG_USB_ULPI_VIEWPORT=y CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set -# CONFIG_USB_GADGET_DEBUG_FS is not set CONFIG_USB_GADGET_VBUS_DRAW=500 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 @@ -6720,7 +6704,6 @@ CONFIG_DMA_ENGINE_RAID=y # DMABUF options # CONFIG_SYNC_FILE=y -# CONFIG_SW_SYNC is not set # CONFIG_UDMABUF is not set # CONFIG_DMABUF_MOVE_NOTIFY is not set # CONFIG_DMABUF_DEBUG is not set @@ -6948,7 +6931,6 @@ CONFIG_IOMMU_SUPPORT=y # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set # end of Generic IOMMU Pagetable Support -# CONFIG_IOMMU_DEBUGFS is not set CONFIG_IOMMU_DEFAULT_DMA_STRICT=y # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set @@ -7366,8 +7348,7 @@ CONFIG_NTFS3_FS_POSIX_ACL=y # CONFIG_PROC_FS=y # CONFIG_PROC_KCORE is not set -CONFIG_PROC_VMCORE=y -# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set +# CONFIG_PROC_VMCORE is not set CONFIG_PROC_SYSCTL=y CONFIG_PROC_PAGE_MONITOR=y # CONFIG_PROC_CHILDREN is not set @@ -7419,7 +7400,6 @@ CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y CONFIG_PSTORE_COMPRESS_DEFAULT="deflate" # CONFIG_PSTORE_CONSOLE is not set # CONFIG_PSTORE_PMSG is not set -# CONFIG_PSTORE_FTRACE is not set # CONFIG_PSTORE_RAM is not set # CONFIG_PSTORE_BLK is not set # CONFIG_SYSV_FS is not set @@ -7699,7 +7679,6 @@ CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRC32=y CONFIG_CRYPTO_XXHASH=m CONFIG_CRYPTO_BLAKE2B=m -# CONFIG_CRYPTO_BLAKE2S is not set CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_POLY1305=m @@ -7791,7 +7770,6 @@ CONFIG_CRYPTO_DEV_VIRTIO=m # CONFIG_CRYPTO_DEV_HISI_HPRE is not set # CONFIG_CRYPTO_DEV_HISI_TRNG is not set CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m -# CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y CONFIG_X509_CERTIFICATE_PARSER=y @@ -7942,7 +7920,6 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y # CONFIG_CMA_SIZE_SEL_MAX is not set CONFIG_CMA_ALIGNMENT=8 # CONFIG_DMA_API_DEBUG is not set -# CONFIG_DMA_MAP_BENCHMARK is not set CONFIG_SGL_ALLOC=y CONFIG_CPU_RMAP=y CONFIG_DQL=y @@ -8038,7 +8015,6 @@ CONFIG_ARCH_HAS_DEBUG_WX=y CONFIG_DEBUG_WX=y CONFIG_GENERIC_PTDUMP=y CONFIG_PTDUMP_CORE=y -# CONFIG_PTDUMP_DEBUGFS is not set # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_STATS is not set CONFIG_HAVE_DEBUG_KMEMLEAK=y diff --git a/config/kernel/kernel.config.armv6l-ipfire b/config/kernel/kernel.config.armv6l-ipfire index 2247e66c5..ae611fc6f 100644 --- a/config/kernel/kernel.config.armv6l-ipfire +++ b/config/kernel/kernel.config.armv6l-ipfire @@ -1,15 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.15.59-ipfire Kernel Configuration +# Linux/arm 5.15.68-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=110300 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=23700 +CONFIG_AS_VERSION=23900 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=23700 +CONFIG_LD_VERSION=23900 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y @@ -72,7 +72,6 @@ CONFIG_GENERIC_MSI_IRQ_DOMAIN=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y -# CONFIG_GENERIC_IRQ_DEBUGFS is not set # end of IRQ subsystem CONFIG_GENERIC_IRQ_MULTI_HANDLER=y @@ -145,7 +144,6 @@ CONFIG_RCU_NEED_SEGCBLIST=y CONFIG_LOG_BUF_SHIFT=18 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 -# CONFIG_PRINTK_INDEX is not set CONFIG_GENERIC_SCHED_CLOCK=y # @@ -728,7 +726,7 @@ CONFIG_ARM_CRYPTO=y CONFIG_CRYPTO_SHA1_ARM=m CONFIG_CRYPTO_SHA256_ARM=m CONFIG_CRYPTO_SHA512_ARM=m -CONFIG_CRYPTO_BLAKE2S_ARM=m +CONFIG_CRYPTO_BLAKE2S_ARM=y CONFIG_CRYPTO_AES_ARM=m CONFIG_CRYPTO_CHACHA20_NEON=m CONFIG_CRYPTO_POLY1305_ARM=m @@ -793,14 +791,12 @@ CONFIG_STRICT_KERNEL_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_STRICT_MODULE_RWX=y CONFIG_ARCH_HAS_PHYS_TO_DMA=y -# CONFIG_LOCK_EVENT_COUNTS is not set CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y CONFIG_HAVE_ARCH_PFN_VALID=y # # GCOV-based kernel profiling # -# CONFIG_GCOV_KERNEL is not set CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y # end of GCOV-based kernel profiling @@ -851,8 +847,6 @@ CONFIG_BLK_DEV_THROTTLING=y # CONFIG_BLK_CGROUP_IOLATENCY is not set # CONFIG_BLK_CGROUP_IOCOST is not set # CONFIG_BLK_CGROUP_IOPRIO is not set -CONFIG_BLK_DEBUG_FS=y -CONFIG_BLK_DEBUG_FS_ZONED=y # CONFIG_BLK_SED_OPAL is not set # CONFIG_BLK_INLINE_ENCRYPTION is not set @@ -950,7 +944,6 @@ CONFIG_CLEANCACHE=y CONFIG_FRONTSWAP=y CONFIG_CMA=y # CONFIG_CMA_DEBUG is not set -# CONFIG_CMA_DEBUGFS is not set # CONFIG_CMA_SYSFS is not set CONFIG_CMA_AREAS=7 # CONFIG_ZSWAP is not set @@ -960,7 +953,10 @@ CONFIG_GENERIC_EARLY_IOREMAP=y # CONFIG_IDLE_PAGE_TRACKING is not set CONFIG_ZONE_DMA=y # CONFIG_PERCPU_STATS is not set -# CONFIG_GUP_TEST is not set + +# +# GUP_TEST needs to have DEBUG_FS enabled +# CONFIG_KMAP_LOCAL=y CONFIG_KMAP_LOCAL_NON_LINEAR_PTE_ARRAY=y @@ -1459,7 +1455,6 @@ CONFIG_ATM_CLIP=m CONFIG_ATM_BR2684=m # CONFIG_ATM_BR2684_IPFILTER is not set CONFIG_L2TP=m -# CONFIG_L2TP_DEBUGFS is not set CONFIG_L2TP_V3=y CONFIG_L2TP_IP=m CONFIG_L2TP_ETH=m @@ -1671,7 +1666,6 @@ CONFIG_CFG80211_EXTRA_REGDB_KEYDIR="" CONFIG_CFG80211_REG_CELLULAR_HINTS=y CONFIG_CFG80211_REG_RELAX_NO_IR=y CONFIG_CFG80211_DEFAULT_PS=y -# CONFIG_CFG80211_DEBUGFS is not set CONFIG_CFG80211_CRDA_SUPPORT=y CONFIG_CFG80211_WEXT=y CONFIG_CFG80211_WEXT_EXPORT=y @@ -1687,7 +1681,6 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" CONFIG_MAC80211_MESH=y CONFIG_MAC80211_LEDS=y -# CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_MESSAGE_TRACING is not set # CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 @@ -1867,7 +1860,6 @@ CONFIG_SUNXI_RSB=y CONFIG_TI_SYSC=y CONFIG_VEXPRESS_CONFIG=y CONFIG_MHI_BUS=m -# CONFIG_MHI_BUS_DEBUG is not set # CONFIG_MHI_BUS_PCI_GENERIC is not set # end of Bus devices @@ -2659,10 +2651,8 @@ CONFIG_MVPP2=m # CONFIG_MVPP2_PTP is not set # CONFIG_PXA168_ETH is not set CONFIG_SKGE=m -# CONFIG_SKGE_DEBUG is not set CONFIG_SKGE_GENESIS=y CONFIG_SKY2=m -# CONFIG_SKY2_DEBUG is not set CONFIG_PRESTERA=m CONFIG_PRESTERA_PCI=m CONFIG_NET_VENDOR_MELLANOX=y @@ -2978,7 +2968,6 @@ CONFIG_ATH9K_BTCOEX_SUPPORT=y CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y CONFIG_ATH9K_AHB=y -# CONFIG_ATH9K_DEBUGFS is not set CONFIG_ATH9K_DFS_CERTIFIED=y # CONFIG_ATH9K_DYNACK is not set # CONFIG_ATH9K_WOW is not set @@ -2987,7 +2976,6 @@ CONFIG_ATH9K_RFKILL=y CONFIG_ATH9K_PCOEM=y CONFIG_ATH9K_PCI_NO_EEPROM=m CONFIG_ATH9K_HTC=m -# CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_ATH9K_HWRNG=y CONFIG_CARL9170=m CONFIG_CARL9170_LEDS=y @@ -3003,7 +2991,6 @@ CONFIG_ATH10K_AHB=y CONFIG_ATH10K_SDIO=m CONFIG_ATH10K_USB=m CONFIG_ATH10K_DEBUG=y -# CONFIG_ATH10K_DEBUGFS is not set # CONFIG_ATH10K_TRACING is not set CONFIG_ATH10K_DFS_CERTIFIED=y CONFIG_WCN36XX=m @@ -3242,7 +3229,6 @@ CONFIG_USB_NET_RNDIS_WLAN=m # end of Wireless WAN CONFIG_VMXNET3=m -# CONFIG_NETDEVSIM is not set # CONFIG_NET_FAILOVER is not set # CONFIG_ISDN is not set @@ -4456,7 +4442,6 @@ CONFIG_REGULATOR_VEXPRESS=y CONFIG_CEC_CORE=m CONFIG_CEC_NOTIFIER=y CONFIG_CEC_PIN=y -# CONFIG_CEC_PIN_ERROR_INJ is not set # CONFIG_MEDIA_CEC_SUPPORT is not set CONFIG_MEDIA_SUPPORT=m # CONFIG_MEDIA_SUPPORT_FILTER is not set @@ -5245,7 +5230,6 @@ CONFIG_DRM_SUN8I_MIXER=m CONFIG_DRM_SUN8I_TCON_TOP=m CONFIG_DRM_OMAP=m # CONFIG_OMAP2_DSS_DEBUG is not set -# CONFIG_OMAP2_DSS_DEBUGFS is not set CONFIG_OMAP2_DSS_DPI=y CONFIG_OMAP2_DSS_VENC=y CONFIG_OMAP2_DSS_HDMI_COMMON=y @@ -5325,7 +5309,7 @@ CONFIG_DRM_PANEL_BRIDGE=y # CONFIG_DRM_CDNS_DSI is not set # CONFIG_DRM_CHIPONE_ICN6211 is not set # CONFIG_DRM_CHRONTEL_CH7033 is not set -# CONFIG_DRM_DISPLAY_CONNECTOR is not set +CONFIG_DRM_DISPLAY_CONNECTOR=m # CONFIG_DRM_LONTIUM_LT8912B is not set # CONFIG_DRM_LONTIUM_LT9611 is not set # CONFIG_DRM_LONTIUM_LT9611UXC is not set @@ -5530,7 +5514,6 @@ CONFIG_SND_DEBUG=y # CONFIG_SND_DEBUG_VERBOSE is not set CONFIG_SND_PCM_XRUN_DEBUG=y # CONFIG_SND_CTL_VALIDATION is not set -# CONFIG_SND_JACK_INJECTION_DEBUG is not set CONFIG_SND_VMASTER=y CONFIG_SND_CTL_LED=m CONFIG_SND_SEQUENCER=m @@ -6185,6 +6168,7 @@ CONFIG_USB_MUSB_DUAL_ROLE=y # Platform Glue Layer # CONFIG_USB_MUSB_SUNXI=m +# CONFIG_USB_MUSB_TUSB6010 is not set CONFIG_USB_MUSB_OMAP2PLUS=m CONFIG_USB_MUSB_AM35X=m CONFIG_USB_MUSB_DSPS=m @@ -6341,7 +6325,6 @@ CONFIG_USB_ULPI_VIEWPORT=y CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set -# CONFIG_USB_GADGET_DEBUG_FS is not set CONFIG_USB_GADGET_VBUS_DRAW=500 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 @@ -6727,7 +6710,6 @@ CONFIG_DMA_ENGINE_RAID=y # DMABUF options # CONFIG_SYNC_FILE=y -# CONFIG_SW_SYNC is not set # CONFIG_UDMABUF is not set # CONFIG_DMABUF_MOVE_NOTIFY is not set # CONFIG_DMABUF_DEBUG is not set @@ -6966,7 +6948,6 @@ CONFIG_IOMMU_SUPPORT=y # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set # end of Generic IOMMU Pagetable Support -# CONFIG_IOMMU_DEBUGFS is not set CONFIG_IOMMU_DEFAULT_DMA_STRICT=y # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set @@ -7385,8 +7366,7 @@ CONFIG_NTFS3_FS_POSIX_ACL=y # Pseudo filesystems # CONFIG_PROC_FS=y -CONFIG_PROC_VMCORE=y -# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set +# CONFIG_PROC_VMCORE is not set CONFIG_PROC_SYSCTL=y CONFIG_PROC_PAGE_MONITOR=y # CONFIG_PROC_CHILDREN is not set @@ -7433,7 +7413,6 @@ CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y CONFIG_PSTORE_COMPRESS_DEFAULT="deflate" # CONFIG_PSTORE_CONSOLE is not set # CONFIG_PSTORE_PMSG is not set -# CONFIG_PSTORE_FTRACE is not set # CONFIG_PSTORE_RAM is not set # CONFIG_PSTORE_BLK is not set # CONFIG_SYSV_FS is not set @@ -7709,7 +7688,6 @@ CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRC32=y CONFIG_CRYPTO_XXHASH=m CONFIG_CRYPTO_BLAKE2B=m -# CONFIG_CRYPTO_BLAKE2S is not set CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_POLY1305=m @@ -7780,7 +7758,6 @@ CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_DEV_ALLWINNER=y CONFIG_CRYPTO_DEV_SUN4I_SS=y CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y -# CONFIG_CRYPTO_DEV_SUN4I_SS_DEBUG is not set # CONFIG_CRYPTO_DEV_SUN8I_CE is not set # CONFIG_CRYPTO_DEV_SUN8I_SS is not set CONFIG_CRYPTO_DEV_HIFN_795X=m @@ -7801,7 +7778,6 @@ CONFIG_CRYPTO_DEV_ROCKCHIP=y # CONFIG_CRYPTO_DEV_SAFEXCEL is not set # CONFIG_CRYPTO_DEV_CCREE is not set CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m -# CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y CONFIG_X509_CERTIFICATE_PARSER=y @@ -7935,7 +7911,6 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y # CONFIG_CMA_SIZE_SEL_MAX is not set CONFIG_CMA_ALIGNMENT=8 # CONFIG_DMA_API_DEBUG is not set -# CONFIG_DMA_MAP_BENCHMARK is not set CONFIG_SGL_ALLOC=y CONFIG_CPU_RMAP=y CONFIG_DQL=y diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 4abb066b8..47930e94b 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -6531,7 +6531,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/ARM64_AMU_EXTN #lib/modules/KVER-ipfire/build/include/config/ARM64_AS_HAS_MTE #lib/modules/KVER-ipfire/build/include/config/ARM64_BTI -#lib/modules/KVER-ipfire/build/include/config/ARM64_BTI_KERNEL #lib/modules/KVER-ipfire/build/include/config/ARM64_CNP #lib/modules/KVER-ipfire/build/include/config/ARM64_CONT_PMD_SHIFT #lib/modules/KVER-ipfire/build/include/config/ARM64_CONT_PTE_SHIFT @@ -6547,6 +6546,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_1508412 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_1530923 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_1542419 +#lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_2441009 +#lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_2457168 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_819472 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_824069 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_826319 @@ -6776,8 +6777,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/BITREVERSE #lib/modules/KVER-ipfire/build/include/config/BLK_CGROUP #lib/modules/KVER-ipfire/build/include/config/BLK_CGROUP_RWSTAT -#lib/modules/KVER-ipfire/build/include/config/BLK_DEBUG_FS -#lib/modules/KVER-ipfire/build/include/config/BLK_DEBUG_FS_ZONED #lib/modules/KVER-ipfire/build/include/config/BLK_DEV #lib/modules/KVER-ipfire/build/include/config/BLK_DEV_BSG #lib/modules/KVER-ipfire/build/include/config/BLK_DEV_BSGLIB @@ -6878,8 +6877,8 @@ 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_GOTO_TIED_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 #lib/modules/KVER-ipfire/build/include/config/CC_HAS_BRANCH_PROT_PAC_RET_BTI @@ -7184,8 +7183,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/DE2104X #lib/modules/KVER-ipfire/build/include/config/DE2104X_DSL #lib/modules/KVER-ipfire/build/include/config/DEBUG_BUGVERBOSE -#lib/modules/KVER-ipfire/build/include/config/DEBUG_FS -#lib/modules/KVER-ipfire/build/include/config/DEBUG_FS_ALLOW_ALL #lib/modules/KVER-ipfire/build/include/config/DEBUG_KERNEL #lib/modules/KVER-ipfire/build/include/config/DEBUG_MISC #lib/modules/KVER-ipfire/build/include/config/DEBUG_SHIRQ @@ -7270,6 +7267,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/DRM_ANALOGIX_ANX78XX #lib/modules/KVER-ipfire/build/include/config/DRM_ANALOGIX_DP #lib/modules/KVER-ipfire/build/include/config/DRM_BRIDGE +#lib/modules/KVER-ipfire/build/include/config/DRM_DISPLAY_CONNECTOR #lib/modules/KVER-ipfire/build/include/config/DRM_DP_AUX_BUS #lib/modules/KVER-ipfire/build/include/config/DRM_DW_HDMI #lib/modules/KVER-ipfire/build/include/config/DRM_DW_HDMI_AHB_AUDIO @@ -7646,8 +7644,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/GARP #lib/modules/KVER-ipfire/build/include/config/GCC_PLUGINS #lib/modules/KVER-ipfire/build/include/config/GCC_PLUGIN_LATENT_ENTROPY -#lib/modules/KVER-ipfire/build/include/config/GCC_PLUGIN_RANDSTRUCT -#lib/modules/KVER-ipfire/build/include/config/GCC_PLUGIN_RANDSTRUCT_PERFORMANCE #lib/modules/KVER-ipfire/build/include/config/GCC_PLUGIN_STRUCTLEAK #lib/modules/KVER-ipfire/build/include/config/GCC_PLUGIN_STRUCTLEAK_BYREF_ALL #lib/modules/KVER-ipfire/build/include/config/GCC_VERSION @@ -7744,7 +7740,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/HAVE_ARCH_KGDB #lib/modules/KVER-ipfire/build/include/config/HAVE_ARCH_MMAP_RND_BITS #lib/modules/KVER-ipfire/build/include/config/HAVE_ARCH_MMAP_RND_COMPAT_BITS -#lib/modules/KVER-ipfire/build/include/config/HAVE_ARCH_PFN_VALID #lib/modules/KVER-ipfire/build/include/config/HAVE_ARCH_PREL32_RELOCATIONS #lib/modules/KVER-ipfire/build/include/config/HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET #lib/modules/KVER-ipfire/build/include/config/HAVE_ARCH_SECCOMP @@ -7888,7 +7883,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/HW_RANDOM_ARM_SMCCC_TRNG #lib/modules/KVER-ipfire/build/include/config/HW_RANDOM_BA431 #lib/modules/KVER-ipfire/build/include/config/HW_RANDOM_BCM2835 -#lib/modules/KVER-ipfire/build/include/config/HW_RANDOM_CAVIUM #lib/modules/KVER-ipfire/build/include/config/HW_RANDOM_CCTRNG #lib/modules/KVER-ipfire/build/include/config/HW_RANDOM_IPROC_RNG200 #lib/modules/KVER-ipfire/build/include/config/HW_RANDOM_MESON @@ -9850,7 +9844,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/SKY2 #lib/modules/KVER-ipfire/build/include/config/SLAB_FREELIST_HARDENED #lib/modules/KVER-ipfire/build/include/config/SLAB_FREELIST_RANDOM -#lib/modules/KVER-ipfire/build/include/config/SLAB_MERGE_DEFAULT #lib/modules/KVER-ipfire/build/include/config/SLHC #lib/modules/KVER-ipfire/build/include/config/SLICOSS #lib/modules/KVER-ipfire/build/include/config/SLUB @@ -10203,6 +10196,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/TRACER_MAX_TRACE #lib/modules/KVER-ipfire/build/include/config/TRACER_SNAPSHOT #lib/modules/KVER-ipfire/build/include/config/TRACE_CLOCK +#lib/modules/KVER-ipfire/build/include/config/TRACE_IRQFLAGS_NMI_SUPPORT #lib/modules/KVER-ipfire/build/include/config/TRACE_IRQFLAGS_SUPPORT #lib/modules/KVER-ipfire/build/include/config/TRACING #lib/modules/KVER-ipfire/build/include/config/TRACING_SUPPORT @@ -11692,7 +11686,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/generated/autoconf.h #lib/modules/KVER-ipfire/build/include/generated/bounds.h #lib/modules/KVER-ipfire/build/include/generated/compile.h -#lib/modules/KVER-ipfire/build/include/generated/randomize_layout_hash.h #lib/modules/KVER-ipfire/build/include/generated/timeconst.h #lib/modules/KVER-ipfire/build/include/generated/uapi #lib/modules/KVER-ipfire/build/include/generated/uapi/linux @@ -17106,6 +17099,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/scripts/dtc/version_gen.h #lib/modules/KVER-ipfire/build/scripts/dtc/yamltree.c #lib/modules/KVER-ipfire/build/scripts/dummy-tools +#lib/modules/KVER-ipfire/build/scripts/dummy-tools/dummy-plugin-dir +#lib/modules/KVER-ipfire/build/scripts/dummy-tools/dummy-plugin-dir/include +#lib/modules/KVER-ipfire/build/scripts/dummy-tools/dummy-plugin-dir/include/plugin-version.h #lib/modules/KVER-ipfire/build/scripts/dummy-tools/gcc #lib/modules/KVER-ipfire/build/scripts/dummy-tools/ld #lib/modules/KVER-ipfire/build/scripts/dummy-tools/nm @@ -17138,8 +17134,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/scripts/gcc-plugins/latent_entropy_plugin.c #lib/modules/KVER-ipfire/build/scripts/gcc-plugins/latent_entropy_plugin.so #lib/modules/KVER-ipfire/build/scripts/gcc-plugins/randomize_layout_plugin.c -#lib/modules/KVER-ipfire/build/scripts/gcc-plugins/randomize_layout_plugin.so -#lib/modules/KVER-ipfire/build/scripts/gcc-plugins/randomize_layout_seed.h #lib/modules/KVER-ipfire/build/scripts/gcc-plugins/sancov_plugin.c #lib/modules/KVER-ipfire/build/scripts/gcc-plugins/stackleak_plugin.c #lib/modules/KVER-ipfire/build/scripts/gcc-plugins/structleak_plugin.c @@ -17346,6 +17340,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/scripts/package/mkdebian #lib/modules/KVER-ipfire/build/scripts/package/mkspec #lib/modules/KVER-ipfire/build/scripts/package/snapcraft.template +#lib/modules/KVER-ipfire/build/scripts/pahole-flags.sh #lib/modules/KVER-ipfire/build/scripts/parse-maintainers.pl #lib/modules/KVER-ipfire/build/scripts/patch-kernel #lib/modules/KVER-ipfire/build/scripts/profile2linkerlist.pl @@ -18483,6 +18478,7 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/bridge/analogix/analogix_dp.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/bridge/analogix/anx7625.ko.xz +#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/bridge/display-connector.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/bridge/nxp-ptn3460.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/bridge/parade-ps8622.ko.xz diff --git a/config/rootfiles/common/armv6l/linux b/config/rootfiles/common/armv6l/linux index 8409c63f6..bcebe11ca 100644 --- a/config/rootfiles/common/armv6l/linux +++ b/config/rootfiles/common/armv6l/linux @@ -7221,8 +7221,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/BITREVERSE #lib/modules/KVER-ipfire/build/include/config/BLK_CGROUP #lib/modules/KVER-ipfire/build/include/config/BLK_CGROUP_RWSTAT -#lib/modules/KVER-ipfire/build/include/config/BLK_DEBUG_FS -#lib/modules/KVER-ipfire/build/include/config/BLK_DEBUG_FS_ZONED #lib/modules/KVER-ipfire/build/include/config/BLK_DEV #lib/modules/KVER-ipfire/build/include/config/BLK_DEV_BSG #lib/modules/KVER-ipfire/build/include/config/BLK_DEV_BSGLIB @@ -7317,8 +7315,8 @@ 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_GOTO_TIED_OUTPUT #lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_INLINE #lib/modules/KVER-ipfire/build/include/config/CC_HAS_KASAN_GENERIC #lib/modules/KVER-ipfire/build/include/config/CC_HAS_NO_PROFILE_FN_ATTR @@ -7637,8 +7635,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/DE2104X_DSL #lib/modules/KVER-ipfire/build/include/config/DEBUG_ALIGN_RODATA #lib/modules/KVER-ipfire/build/include/config/DEBUG_BUGVERBOSE -#lib/modules/KVER-ipfire/build/include/config/DEBUG_FS -#lib/modules/KVER-ipfire/build/include/config/DEBUG_FS_ALLOW_ALL #lib/modules/KVER-ipfire/build/include/config/DEBUG_KERNEL #lib/modules/KVER-ipfire/build/include/config/DEBUG_LL_INCLUDE #lib/modules/KVER-ipfire/build/include/config/DEBUG_MISC @@ -7724,6 +7720,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/DRM_ANALOGIX_DP #lib/modules/KVER-ipfire/build/include/config/DRM_ARMADA #lib/modules/KVER-ipfire/build/include/config/DRM_BRIDGE +#lib/modules/KVER-ipfire/build/include/config/DRM_DISPLAY_CONNECTOR #lib/modules/KVER-ipfire/build/include/config/DRM_DP_AUX_BUS #lib/modules/KVER-ipfire/build/include/config/DRM_DW_HDMI #lib/modules/KVER-ipfire/build/include/config/DRM_DW_HDMI_AHB_AUDIO @@ -10278,7 +10275,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/SKY2 #lib/modules/KVER-ipfire/build/include/config/SLAB_FREELIST_HARDENED #lib/modules/KVER-ipfire/build/include/config/SLAB_FREELIST_RANDOM -#lib/modules/KVER-ipfire/build/include/config/SLAB_MERGE_DEFAULT #lib/modules/KVER-ipfire/build/include/config/SLHC #lib/modules/KVER-ipfire/build/include/config/SLICOSS #lib/modules/KVER-ipfire/build/include/config/SLUB @@ -17555,6 +17551,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/scripts/dtc/version_gen.h #lib/modules/KVER-ipfire/build/scripts/dtc/yamltree.c #lib/modules/KVER-ipfire/build/scripts/dummy-tools +#lib/modules/KVER-ipfire/build/scripts/dummy-tools/dummy-plugin-dir +#lib/modules/KVER-ipfire/build/scripts/dummy-tools/dummy-plugin-dir/include +#lib/modules/KVER-ipfire/build/scripts/dummy-tools/dummy-plugin-dir/include/plugin-version.h #lib/modules/KVER-ipfire/build/scripts/dummy-tools/gcc #lib/modules/KVER-ipfire/build/scripts/dummy-tools/ld #lib/modules/KVER-ipfire/build/scripts/dummy-tools/nm @@ -17794,6 +17793,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/scripts/package/mkdebian #lib/modules/KVER-ipfire/build/scripts/package/mkspec #lib/modules/KVER-ipfire/build/scripts/package/snapcraft.template +#lib/modules/KVER-ipfire/build/scripts/pahole-flags.sh #lib/modules/KVER-ipfire/build/scripts/parse-maintainers.pl #lib/modules/KVER-ipfire/build/scripts/patch-kernel #lib/modules/KVER-ipfire/build/scripts/profile2linkerlist.pl @@ -18738,7 +18738,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/arch/arm #lib/modules/KVER-ipfire/kernel/arch/arm/crypto #lib/modules/KVER-ipfire/kernel/arch/arm/crypto/aes-arm.ko.xz -#lib/modules/KVER-ipfire/kernel/arch/arm/crypto/blake2s-arm.ko.xz #lib/modules/KVER-ipfire/kernel/arch/arm/crypto/chacha-neon.ko.xz #lib/modules/KVER-ipfire/kernel/arch/arm/crypto/poly1305-arm.ko.xz #lib/modules/KVER-ipfire/kernel/arch/arm/crypto/sha1-arm.ko.xz @@ -18904,6 +18903,7 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/bridge/analogix #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/bridge/analogix/analogix_dp.ko.xz +#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/bridge/display-connector.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/bridge/nxp-ptn3460.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/bridge/parade-ps8622.ko.xz hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d33651d74f2479bb169dcda6934dceb40132b77b
by Peter Müller 20 Sep '22

20 Sep '22

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 d33651d74f2479bb169dcda6934dceb40132b77b (commit) via 423685839a056f233b5289e2c47a55da47cebc47 (commit) via ae185d6f9d0578486f9a91c5e371f159a5a41a23 (commit) via 12d339e725cf093947c2d0243a724e014d5ef8d4 (commit) from ae49226866aef4b8ec700be2e739871c694d55c8 (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 d33651d74f2479bb169dcda6934dceb40132b77b Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Tue Sep 20 14:30:28 2022 +0000 linux: Prepare CONFIG_DEBUG_FS disabling on non-x86_64 architectures Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 423685839a056f233b5289e2c47a55da47cebc47 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Tue Sep 20 10:39:08 2022 +0000 Core Update 171: Ship kernel and regenerate initial ramdisks locally Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit ae185d6f9d0578486f9a91c5e371f159a5a41a23 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Mon Sep 19 12:28:14 2022 +0000 linux: Update to 5.15.68 Please refer to https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.68 for the changelog of this release. Due to the lack of local build hardware, ARM rootfile and configuration changes have been omitted. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 12d339e725cf093947c2d0243a724e014d5ef8d4 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Sep 17 19:24:46 2022 +0000 kernel: Disable CONFIG_DEBUG_FS According to the kernel's documentation, > debugfs is a virtual file system that kernel developers use to put > debugging files into. Enable this option to be able to read and > write to these files. There is no legitimate reason why one has to do so on an IPFire machine. Further, the vast debugging options (i.e. related to various drivers) have never been enabled, limiting the use of this virtual file system even further. This patch therefore proposes to disable it entirely, since its potential security impact outweights its benefits. Due to operational constraints, changes to ARM kernel configurations will be made if this patch is approved for x86_64. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 5 +- config/kernel/kernel.config.armv6l-ipfire | 5 +- config/kernel/kernel.config.riscv64-ipfire | 5 +- config/kernel/kernel.config.x86_64-ipfire | 56 +++------------- config/rootfiles/common/x86_64/linux | 6 +- .../124 => core/171}/filelists/aarch64/linux | 0 .../159 => core/171}/filelists/armv6l/linux | 0 .../100 => core/171}/filelists/x86_64/linux | 0 config/rootfiles/core/171/update.sh | 77 ++++++++++++++++++++++ lfs/linux | 4 +- 10 files changed, 96 insertions(+), 62 deletions(-) copy config/rootfiles/{oldcore/124 => core/171}/filelists/aarch64/linux (100%) copy config/rootfiles/{oldcore/159 => core/171}/filelists/armv6l/linux (100%) copy config/rootfiles/{oldcore/100 => core/171}/filelists/x86_64/linux (100%) Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index b557f4cf3..1e08153c4 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -8014,10 +8014,7 @@ CONFIG_FRAME_POINTER=y # Generic Kernel Debugging Instruments # # CONFIG_MAGIC_SYSRQ is not set -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_FS_ALLOW_ALL=y -# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set -# CONFIG_DEBUG_FS_ALLOW_NONE is not set +# CONFIG_DEBUG_FS is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y diff --git a/config/kernel/kernel.config.armv6l-ipfire b/config/kernel/kernel.config.armv6l-ipfire index b8e0ee70c..2247e66c5 100644 --- a/config/kernel/kernel.config.armv6l-ipfire +++ b/config/kernel/kernel.config.armv6l-ipfire @@ -8005,10 +8005,7 @@ CONFIG_FRAME_POINTER=y # Generic Kernel Debugging Instruments # # CONFIG_MAGIC_SYSRQ is not set -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_FS_ALLOW_ALL=y -# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set -# CONFIG_DEBUG_FS_ALLOW_NONE is not set +# CONFIG_DEBUG_FS is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set # CONFIG_UBSAN is not set diff --git a/config/kernel/kernel.config.riscv64-ipfire b/config/kernel/kernel.config.riscv64-ipfire index 37d5366af..51f6442be 100644 --- a/config/kernel/kernel.config.riscv64-ipfire +++ b/config/kernel/kernel.config.riscv64-ipfire @@ -6602,10 +6602,7 @@ CONFIG_FRAME_POINTER=y # Generic Kernel Debugging Instruments # # CONFIG_MAGIC_SYSRQ is not set -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_FS_ALLOW_ALL=y -# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set -# CONFIG_DEBUG_FS_ALLOW_NONE is not set +# CONFIG_DEBUG_FS is not set CONFIG_HAVE_ARCH_KGDB=y CONFIG_HAVE_ARCH_KGDB_QXFER_PKT=y # CONFIG_KGDB is not set diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index aa1e847dd..d005f98d4 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,15 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.15.59-ipfire Kernel Configuration +# Linux/x86 5.15.68-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=110300 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=23700 +CONFIG_AS_VERSION=23900 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=23700 +CONFIG_LD_VERSION=23900 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y @@ -78,7 +78,6 @@ CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y CONFIG_GENERIC_IRQ_RESERVATION_MODE=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y -# CONFIG_GENERIC_IRQ_DEBUGFS is not set # end of IRQ subsystem CONFIG_CLOCKSOURCE_WATCHDOG=y @@ -158,7 +157,6 @@ CONFIG_RCU_NEED_SEGCBLIST=y CONFIG_LOG_BUF_SHIFT=18 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 -# CONFIG_PRINTK_INDEX is not set CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y # @@ -330,7 +328,6 @@ CONFIG_X86_EXTENDED_PLATFORM=y CONFIG_X86_INTEL_LPSS=y CONFIG_X86_AMD_PLATFORM_DEVICE=y CONFIG_IOSF_MBI=y -# CONFIG_IOSF_MBI_DEBUG is not set CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_HYPERVISOR_GUEST=y @@ -348,7 +345,6 @@ CONFIG_XEN_PVHVM=y CONFIG_XEN_PVHVM_SMP=y CONFIG_XEN_PVHVM_GUEST=y CONFIG_XEN_SAVE_RESTORE=y -CONFIG_XEN_DEBUG_FS=y CONFIG_XEN_PVH=y CONFIG_XEN_DOM0=y CONFIG_KVM_GUEST=y @@ -398,7 +394,6 @@ CONFIG_X86_MCELOG_LEGACY=y CONFIG_X86_MCE_INTEL=y CONFIG_X86_MCE_AMD=y CONFIG_X86_MCE_THRESHOLD=y -# CONFIG_X86_MCE_INJECT is not set # # Performance monitoring @@ -421,7 +416,6 @@ CONFIG_X86_MSR=y CONFIG_X86_CPUID=y # CONFIG_X86_5LEVEL is not set CONFIG_X86_DIRECT_GBPAGES=y -# CONFIG_X86_CPA_STATISTICS is not set # CONFIG_AMD_MEM_ENCRYPT is not set # CONFIG_NUMA is not set CONFIG_ARCH_SPARSEMEM_ENABLE=y @@ -543,7 +537,6 @@ CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_HOTPLUG_IOAPIC=y CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y -# CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_BGRT is not set # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set CONFIG_ACPI_NFIT=m @@ -554,7 +547,6 @@ CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_GHES=y CONFIG_ACPI_APEI_PCIEAER=y CONFIG_ACPI_APEI_MEMORY_FAILURE=y -# CONFIG_ACPI_APEI_EINJ is not set # CONFIG_ACPI_APEI_ERST_DEBUG is not set # CONFIG_ACPI_DPTF is not set CONFIG_ACPI_WATCHDOG=y @@ -691,6 +683,7 @@ CONFIG_HAVE_KPROBES_ON_FTRACE=y CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y CONFIG_HAVE_NMI=y CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_GENERIC_SMP_IDLE_THREAD=y @@ -772,7 +765,6 @@ CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_STRICT_MODULE_RWX=y CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y CONFIG_ARCH_USE_MEMREMAP_PROT=y -CONFIG_LOCK_EVENT_COUNTS=y CONFIG_ARCH_HAS_MEM_ENCRYPT=y CONFIG_HAVE_STATIC_CALL=y CONFIG_HAVE_STATIC_CALL_INLINE=y @@ -785,7 +777,6 @@ CONFIG_ARCH_HAS_PARANOID_L1D_FLUSH=y # # GCOV-based kernel profiling # -# CONFIG_GCOV_KERNEL is not set CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y # end of GCOV-based kernel profiling @@ -837,8 +828,6 @@ CONFIG_BLK_DEV_THROTTLING=y # CONFIG_BLK_CGROUP_FC_APPID is not set # CONFIG_BLK_CGROUP_IOCOST is not set # CONFIG_BLK_CGROUP_IOPRIO is not set -CONFIG_BLK_DEBUG_FS=y -CONFIG_BLK_DEBUG_FS_ZONED=y # CONFIG_BLK_SED_OPAL is not set CONFIG_BLK_INLINE_ENCRYPTION=y CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y @@ -971,7 +960,10 @@ CONFIG_VMAP_PFN=y CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y CONFIG_ARCH_HAS_PKEYS=y # CONFIG_PERCPU_STATS is not set -# CONFIG_GUP_TEST is not set + +# +# GUP_TEST needs to have DEBUG_FS enabled +# # CONFIG_READ_ONLY_THP_FOR_FS is not set CONFIG_ARCH_HAS_PTE_SPECIAL=y CONFIG_MAPPING_DIRTY_HELPERS=y @@ -1464,7 +1456,6 @@ CONFIG_ATM_CLIP=m CONFIG_ATM_BR2684=m # CONFIG_ATM_BR2684_IPFILTER is not set CONFIG_L2TP=m -# CONFIG_L2TP_DEBUGFS is not set CONFIG_L2TP_V3=y CONFIG_L2TP_IP=m CONFIG_L2TP_ETH=m @@ -1677,7 +1668,6 @@ CONFIG_CFG80211_EXTRA_REGDB_KEYDIR="" CONFIG_CFG80211_REG_CELLULAR_HINTS=y CONFIG_CFG80211_REG_RELAX_NO_IR=y CONFIG_CFG80211_DEFAULT_PS=y -# CONFIG_CFG80211_DEBUGFS is not set CONFIG_CFG80211_CRDA_SUPPORT=y CONFIG_CFG80211_WEXT=y CONFIG_CFG80211_WEXT_EXPORT=y @@ -1693,7 +1683,6 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" CONFIG_MAC80211_MESH=y CONFIG_MAC80211_LEDS=y -# CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_MESSAGE_TRACING is not set # CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 @@ -1867,7 +1856,6 @@ CONFIG_DMA_SHARED_BUFFER=y # Bus devices # CONFIG_MHI_BUS=m -# CONFIG_MHI_BUS_DEBUG is not set # CONFIG_MHI_BUS_PCI_GENERIC is not set # end of Bus devices @@ -2168,7 +2156,6 @@ CONFIG_LIBFCOE=m CONFIG_FCOE=m CONFIG_FCOE_FNIC=m CONFIG_SCSI_SNIC=m -CONFIG_SCSI_SNIC_DEBUG_FS=y CONFIG_SCSI_DMX3191D=m CONFIG_SCSI_FDOMAIN=m CONFIG_SCSI_FDOMAIN_PCI=m @@ -2195,7 +2182,6 @@ CONFIG_SCSI_QLA_ISCSI=m CONFIG_QEDI=m CONFIG_QEDF=m CONFIG_SCSI_LPFC=m -# CONFIG_SCSI_LPFC_DEBUG_FS is not set CONFIG_SCSI_DC395x=m CONFIG_SCSI_AM53C974=m CONFIG_SCSI_WD719X=m @@ -2626,10 +2612,8 @@ CONFIG_NET_VENDOR_LITEX=y CONFIG_NET_VENDOR_MARVELL=y CONFIG_MVMDIO=m CONFIG_SKGE=m -# CONFIG_SKGE_DEBUG is not set CONFIG_SKGE_GENESIS=y CONFIG_SKY2=m -# CONFIG_SKY2_DEBUG is not set CONFIG_PRESTERA=m CONFIG_PRESTERA_PCI=m CONFIG_NET_VENDOR_MELLANOX=y @@ -2955,7 +2939,6 @@ CONFIG_ATH9K_BTCOEX_SUPPORT=y CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y CONFIG_ATH9K_AHB=y -# CONFIG_ATH9K_DEBUGFS is not set CONFIG_ATH9K_DFS_CERTIFIED=y # CONFIG_ATH9K_DYNACK is not set # CONFIG_ATH9K_WOW is not set @@ -2964,7 +2947,6 @@ CONFIG_ATH9K_RFKILL=y CONFIG_ATH9K_PCOEM=y CONFIG_ATH9K_PCI_NO_EEPROM=m CONFIG_ATH9K_HTC=m -# CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_ATH9K_HWRNG=y CONFIG_CARL9170=m CONFIG_CARL9170_LEDS=y @@ -2975,14 +2957,12 @@ CONFIG_AR5523=m CONFIG_WIL6210=m CONFIG_WIL6210_ISR_COR=y CONFIG_WIL6210_TRACING=y -# CONFIG_WIL6210_DEBUGFS is not set CONFIG_ATH10K=m CONFIG_ATH10K_CE=y CONFIG_ATH10K_PCI=m CONFIG_ATH10K_SDIO=m CONFIG_ATH10K_USB=m CONFIG_ATH10K_DEBUG=y -# CONFIG_ATH10K_DEBUGFS is not set # CONFIG_ATH10K_TRACING is not set CONFIG_ATH10K_DFS_CERTIFIED=y CONFIG_WCN36XX=m @@ -3241,7 +3221,6 @@ CONFIG_XEN_NETDEV_BACKEND=m CONFIG_VMXNET3=m CONFIG_FUJITSU_ES=m CONFIG_HYPERV_NET=m -# CONFIG_NETDEVSIM is not set CONFIG_NET_FAILOVER=m # CONFIG_ISDN is not set @@ -5116,7 +5095,6 @@ CONFIG_DRM_AMDGPU=m CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMD_DC_DCN=y # CONFIG_DRM_AMD_DC_HDCP is not set -# CONFIG_DRM_AMD_SECURE_DISPLAY is not set # end of Display Engine Configuration # CONFIG_HSA_AMD is not set @@ -5371,7 +5349,6 @@ CONFIG_SND_DEBUG=y # CONFIG_SND_DEBUG_VERBOSE is not set CONFIG_SND_PCM_XRUN_DEBUG=y # CONFIG_SND_CTL_VALIDATION is not set -# CONFIG_SND_JACK_INJECTION_DEBUG is not set CONFIG_SND_VMASTER=y CONFIG_SND_DMA_SGBUF=y CONFIG_SND_CTL_LED=m @@ -6211,7 +6188,6 @@ CONFIG_DMA_ENGINE_RAID=y # DMABUF options # CONFIG_SYNC_FILE=y -CONFIG_SW_SYNC=y # CONFIG_UDMABUF is not set # CONFIG_DMABUF_MOVE_NOTIFY is not set # CONFIG_DMABUF_DEBUG is not set @@ -6487,7 +6463,6 @@ CONFIG_IOMMU_SUPPORT=y CONFIG_IOMMU_IO_PGTABLE=y # end of Generic IOMMU Pagetable Support -# CONFIG_IOMMU_DEBUGFS is not set CONFIG_IOMMU_DEFAULT_DMA_STRICT=y # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set @@ -6633,7 +6608,6 @@ CONFIG_GENERIC_PHY=y # end of Performance monitor support CONFIG_RAS=y -# CONFIG_RAS_CEC is not set # CONFIG_USB4 is not set # @@ -6838,7 +6812,6 @@ CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y CONFIG_PSTORE_COMPRESS_DEFAULT="deflate" # CONFIG_PSTORE_CONSOLE is not set # CONFIG_PSTORE_PMSG is not set -# CONFIG_PSTORE_FTRACE is not set # CONFIG_PSTORE_RAM is not set # CONFIG_PSTORE_BLK is not set # CONFIG_SYSV_FS is not set @@ -7124,8 +7097,7 @@ CONFIG_CRYPTO_CRC32=y CONFIG_CRYPTO_CRC32_PCLMUL=m CONFIG_CRYPTO_XXHASH=m CONFIG_CRYPTO_BLAKE2B=m -# CONFIG_CRYPTO_BLAKE2S is not set -CONFIG_CRYPTO_BLAKE2S_X86=m +CONFIG_CRYPTO_BLAKE2S_X86=y CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m CONFIG_CRYPTO_GHASH=m @@ -7369,7 +7341,6 @@ CONFIG_NEED_DMA_MAP_STATE=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_SWIOTLB=y # CONFIG_DMA_API_DEBUG is not set -# CONFIG_DMA_MAP_BENCHMARK is not set CONFIG_SGL_ALLOC=y CONFIG_CHECK_SIGNATURE=y CONFIG_CPU_RMAP=y @@ -7443,10 +7414,7 @@ CONFIG_STACK_VALIDATION=y # Generic Kernel Debugging Instruments # # CONFIG_MAGIC_SYSRQ is not set -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_FS_ALLOW_ALL=y -# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set -# CONFIG_DEBUG_FS_ALLOW_NONE is not set +# CONFIG_DEBUG_FS is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y @@ -7472,7 +7440,6 @@ CONFIG_ARCH_HAS_DEBUG_WX=y CONFIG_DEBUG_WX=y CONFIG_GENERIC_PTDUMP=y CONFIG_PTDUMP_CORE=y -# CONFIG_PTDUMP_DEBUGFS is not set # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_STATS is not set CONFIG_HAVE_DEBUG_KMEMLEAK=y @@ -7652,7 +7619,6 @@ CONFIG_IO_STRICT_DEVMEM=y # # x86 Debugging # -CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y # CONFIG_X86_VERBOSE_BOOTUP is not set CONFIG_EARLY_PRINTK=y # CONFIG_EARLY_PRINTK_DBGP is not set @@ -7665,7 +7631,6 @@ CONFIG_IO_DELAY_0X80=y # CONFIG_IO_DELAY_0XED is not set # CONFIG_IO_DELAY_UDELAY is not set # CONFIG_IO_DELAY_NONE is not set -# CONFIG_DEBUG_BOOT_PARAMS is not set # CONFIG_CPA_DEBUG is not set # CONFIG_DEBUG_ENTRY is not set # CONFIG_DEBUG_NMI_SELFTEST is not set @@ -7688,6 +7653,5 @@ CONFIG_CC_HAS_SANCOV_TRACE_PC=y # CONFIG_RUNTIME_TESTING_MENU is not set CONFIG_ARCH_USE_MEMTEST=y # CONFIG_MEMTEST is not set -# CONFIG_HYPERV_TESTING is not set # end of Kernel Testing and Coverage # end of Kernel hacking diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index 99fa8ffdc..518230b39 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -10135,7 +10135,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/SKY2 #lib/modules/KVER-ipfire/build/include/config/SLAB_FREELIST_HARDENED #lib/modules/KVER-ipfire/build/include/config/SLAB_FREELIST_RANDOM -#lib/modules/KVER-ipfire/build/include/config/SLAB_MERGE_DEFAULT #lib/modules/KVER-ipfire/build/include/config/SLHC #lib/modules/KVER-ipfire/build/include/config/SLICOSS #lib/modules/KVER-ipfire/build/include/config/SLS @@ -17543,6 +17542,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/scripts/dtc/version_gen.h #lib/modules/KVER-ipfire/build/scripts/dtc/yamltree.c #lib/modules/KVER-ipfire/build/scripts/dummy-tools +#lib/modules/KVER-ipfire/build/scripts/dummy-tools/dummy-plugin-dir +#lib/modules/KVER-ipfire/build/scripts/dummy-tools/dummy-plugin-dir/include +#lib/modules/KVER-ipfire/build/scripts/dummy-tools/dummy-plugin-dir/include/plugin-version.h #lib/modules/KVER-ipfire/build/scripts/dummy-tools/gcc #lib/modules/KVER-ipfire/build/scripts/dummy-tools/ld #lib/modules/KVER-ipfire/build/scripts/dummy-tools/nm @@ -17781,6 +17783,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/scripts/package/mkdebian #lib/modules/KVER-ipfire/build/scripts/package/mkspec #lib/modules/KVER-ipfire/build/scripts/package/snapcraft.template +#lib/modules/KVER-ipfire/build/scripts/pahole-flags.sh #lib/modules/KVER-ipfire/build/scripts/parse-maintainers.pl #lib/modules/KVER-ipfire/build/scripts/patch-kernel #lib/modules/KVER-ipfire/build/scripts/profile2linkerlist.pl @@ -18724,7 +18727,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/arch #lib/modules/KVER-ipfire/kernel/arch/x86 #lib/modules/KVER-ipfire/kernel/arch/x86/crypto -#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/blake2s-x86_64.ko.xz #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/blowfish-x86_64.ko.xz #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/camellia-aesni-avx-x86_64.ko.xz #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/camellia-aesni-avx2.ko.xz diff --git a/config/rootfiles/core/171/filelists/aarch64/linux b/config/rootfiles/core/171/filelists/aarch64/linux new file mode 120000 index 000000000..3a2532bc7 --- /dev/null +++ b/config/rootfiles/core/171/filelists/aarch64/linux @@ -0,0 +1 @@ +../../../../common/aarch64/linux \ No newline at end of file diff --git a/config/rootfiles/core/171/filelists/armv6l/linux b/config/rootfiles/core/171/filelists/armv6l/linux new file mode 120000 index 000000000..aee1f4d73 --- /dev/null +++ b/config/rootfiles/core/171/filelists/armv6l/linux @@ -0,0 +1 @@ +../../../../common/armv6l/linux \ No newline at end of file diff --git a/config/rootfiles/core/171/filelists/x86_64/linux b/config/rootfiles/core/171/filelists/x86_64/linux new file mode 120000 index 000000000..0615b5b9a --- /dev/null +++ b/config/rootfiles/core/171/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/171/update.sh b/config/rootfiles/core/171/update.sh index 86efc8afc..1332f676d 100644 --- a/config/rootfiles/core/171/update.sh +++ b/config/rootfiles/core/171/update.sh @@ -26,6 +26,18 @@ core=171 +exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + # force fsck at next boot, this may fix free space on xfs + touch /forcefsck + # don't start pakfire again at error + killall -KILL pak_update + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + # Remove old core updates from pakfire cache to save space... for (( i=1; i<=$core; i++ )); do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire @@ -39,6 +51,44 @@ done /etc/rc.d/init.d/ipsec stop /etc/rc.d/init.d/collectd stop +KVER="xxxKVERxxx" + +# Backup uEnv.txt if exist +if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org +fi + +# Do some sanity checks prior to the kernel update +case $(uname -r) in + *-ipfire*) + # Ok. + ;; + *) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 100000 ]; then + exit_with_error "ERROR cannot update because not enough free space on root." 2 + exit 2 +fi + +# Remove the old kernel +rm -rvf \ + /boot/System.map-* \ + /boot/config-* \ + /boot/ipfirerd-* \ + /boot/initramfs-* \ + /boot/vmlinuz-* \ + /boot/uImage-* \ + /boot/zImage-* \ + /boot/uInit-* \ + /boot/dtb-* \ + /lib/modules + # Remove files rm -rvf \ /lib/firmware/3com/3C359.bin \ @@ -164,9 +214,36 @@ if [ -f /var/ipfire/proxy/enable ]; then /etc/init.d/squid start fi +# Regenerate all initrds +dracut --regenerate-all --force +case "$(uname -m)" in + armv*) + mkimage -A arm -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire + rm /boot/initramfs-${KVER}-ipfire.img + ;; + aarch64) + mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire + # dont remove initramfs because grub need this to boot. + ;; +esac + # This update needs a reboot... touch /var/run/need_reboot +# remove lm_sensor config after collectd was started +# to reserch sensors at next boot with updated kernel +rm -f /etc/sysconfig/lm_sensors + +# Upadate Kernel version in uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt +fi + +# Call user update script (needed for some ARM boards) +if [ -e /boot/pakfire-kernel-update ]; then + /boot/pakfire-kernel-update ${KVER} +fi + # Finish /etc/init.d/fireinfo start sendprofile diff --git a/lfs/linux b/lfs/linux index e80f99601..a1b32cc25 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 5.15.59 +VER = 5.15.68 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 = c601b25663f73438daa40f1a72039a4ca6a027cd356a9cca3f00341a8aab0845893d4ac848a43a34758c0959e38b11ac8857777531cf1472b18f3373ba6c426b +$(DL_FILE)_BLAKE2 = b97474cbe59654ac29a5f514c08a85db9ec330f58e08de53386d4fcedeab3845d6ea5b55e478a49fa94466eda296f80c7835704e2a13d1d56f6e38ed51953ca1 arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 58a70e757a9121a0aac83604a37aa787ec7ac0ee4970c5a3ac3bcb2dbaca32b00089cae6c0da5cf2fe0a2e156427b5165c6a86e0371a3e896f4c7cdd699c34a0 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ae49226866aef4b8ec700be2e739871c694d55c8
by Peter Müller 19 Sep '22

19 Sep '22

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 ae49226866aef4b8ec700be2e739871c694d55c8 (commit) via c799e441a447863ff94cd27eb418616bc1200855 (commit) via e80e1fda2d8de851db1a489a89ab828061c671c2 (commit) from ee1cfd760cc2851930ee8528b4d38b405d535d3c (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 ae49226866aef4b8ec700be2e739871c694d55c8 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Mon Sep 19 12:37:45 2022 +0000 Core Update 171: Ship backupiso Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit c799e441a447863ff94cd27eb418616bc1200855 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Sep 18 13:45:17 2022 +0200 backupiso: Update to ISO file naming - bug#12932 - commit https://git.ipfire.org/?p=ipfire-2.x.git;a=commit;h=fbd0608c2cb5372fff78570… aligned the ISO file name to the image file name. This change also needed to be added to backupiso as the filename is used to download the iso from the IPFire server when creating an ISO backup. Fixes: Bug#12932 Suggested-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org> commit e80e1fda2d8de851db1a489a89ab828061c671c2 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sun Sep 18 20:55:51 2022 +0000 Guardian: Bump package version for Perl changes Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/171/filelists/files | 1 + lfs/guardian | 4 ++-- src/scripts/backupiso | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/rootfiles/core/171/filelists/files b/config/rootfiles/core/171/filelists/files index d5654ef6f..6ce89137f 100644 --- a/config/rootfiles/core/171/filelists/files +++ b/config/rootfiles/core/171/filelists/files @@ -131,3 +131,4 @@ lib/firmware/wfx/brd8022a.pds lib/firmware/wfx/brd8023a.pds srv/web/ipfire/cgi-bin/index.cgi srv/web/ipfire/cgi-bin/logs.cgi/urlfilter.dat +usr/local/bin/backupiso diff --git a/lfs/guardian b/lfs/guardian index 91d02a8bc..6eaa50aac 100644 --- a/lfs/guardian +++ b/lfs/guardian @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 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 # @@ -35,7 +35,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = guardian -PAK_VER = 26 +PAK_VER = 27 DEPS = perl-inotify2 perl-Net-IP diff --git a/src/scripts/backupiso b/src/scripts/backupiso index ef017e3be..2a016e067 100644 --- a/src/scripts/backupiso +++ b/src/scripts/backupiso @@ -35,7 +35,7 @@ case "${arch}" in esac URL="https://downloads.ipfire.org/releases/ipfire-2.x/$IPFVER-core$COREVER/" -ISO="ipfire-$IPFVER.$arch-full-core$COREVER.iso" +ISO="ipfire-$IPFVER-core$COREVER-$arch.iso" makeiso() { local dir="${1}" hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ee1cfd760cc2851930ee8528b4d38b405d535d3c
by Peter Müller 18 Sep '22

18 Sep '22

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM September 2022