IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7825 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 28e8d436fc14cc2a0bcc16251756951178b8f6f0
by Peter Müller 21 Apr '24

21 Apr '24

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 28e8d436fc14cc2a0bcc16251756951178b8f6f0 (commit) via e212c7293d717aa70c9b03ad0b282dd76e6d68e6 (commit) via 9fbb9c39fb13dbfbe90c3038fcb5abbe771ad91f (commit) from 9ce9514bad8109a9ffa0f4206a7668757221287c (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 28e8d436fc14cc2a0bcc16251756951178b8f6f0 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sun Apr 21 21:10:52 2024 +0000 Remove orphaned Apache patch See: https://lists.ipfire.org/hyperkitty/list/development@lists.ipfire.org/messa… Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit e212c7293d717aa70c9b03ad0b282dd76e6d68e6 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sun Apr 21 21:10:29 2024 +0000 Core Update 186: Ship and restart Apache Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 9fbb9c39fb13dbfbe90c3038fcb5abbe771ad91f Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun Apr 21 14:55:25 2024 +0200 apache: Update to 2.4.59 For details see: https://dlcdn.apache.org/httpd/CHANGES_2.4.59 Fixes CVE-2024-27316 / CVE-2024-24795 / CVE-2023-38709 Previously applied patch (apache-2.4.58_mod_xml2enc_remove_dependency_on_xmlstring_header.patch) has been removed - is now included. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../{oldcore/114 => core/186}/filelists/apache2 | 0 config/rootfiles/core/186/update.sh | 2 ++ lfs/apache2 | 7 +++---- ...enc_remove_dependency_on_xmlstring_header.patch | 24 ---------------------- 4 files changed, 5 insertions(+), 28 deletions(-) copy config/rootfiles/{oldcore/114 => core/186}/filelists/apache2 (100%) delete mode 100644 src/patches/apache-2.4.58_mod_xml2enc_remove_dependency_on_xmlstring_header.patch Difference in files: diff --git a/config/rootfiles/core/186/filelists/apache2 b/config/rootfiles/core/186/filelists/apache2 new file mode 120000 index 000000000..eef95efa7 --- /dev/null +++ b/config/rootfiles/core/186/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/186/update.sh b/config/rootfiles/core/186/update.sh index 33e253804..444b041a4 100644 --- a/config/rootfiles/core/186/update.sh +++ b/config/rootfiles/core/186/update.sh @@ -44,6 +44,7 @@ for (( i=1; i<=$core; i++ )); do done # Stop services +/etc/rc.d/init.d/apache stop KVER="xxxKVERxxx" @@ -116,6 +117,7 @@ ldconfig /usr/local/bin/filesystem-cleanup # Start services +/etc/rc.d/init.d/apache start # Build initial ramdisks dracut --regenerate-all --force diff --git a/lfs/apache2 b/lfs/apache2 index c1973e6d5..0851471fe 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -25,7 +25,7 @@ include Config -VER = 2.4.58 +VER = 2.4.59 THISAPP = httpd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 2105b8fada99f1dda55201ed89ed5326f0edb078d352cbff44f02cde80d129b65b63e07366a9a744ba474be5687fa8d3d2d8ddc64ac914b47166607f3f4a9de2 +$(DL_FILE)_BLAKE2 = 836e3538a120d71c016149397a4efd61ae6acd8a8fb9d2ce117c7d86209c4b40c0be3c464007891f28c58182e9d40a8793abe9e94e642354492954af91d9878c install : $(TARGET) @@ -75,7 +75,6 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/apache-2.4.58_mod_xml2enc_remove_dependency_on_xmlstring_header.patch ### Add IPFire's layout, too echo "# IPFire layout" >> $(DIR_APP)/config.layout echo "<Layout IPFire>" >> $(DIR_APP)/config.layout diff --git a/src/patches/apache-2.4.58_mod_xml2enc_remove_dependency_on_xmlstring_header.patch b/src/patches/apache-2.4.58_mod_xml2enc_remove_dependency_on_xmlstring_header.patch deleted file mode 100644 index c190a2648..000000000 --- a/src/patches/apache-2.4.58_mod_xml2enc_remove_dependency_on_xmlstring_header.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur httpd-2.4.58-orig/changes-entries/xmlchar.txt httpd-2.4.58/changes-entries/xmlchar.txt ---- httpd-2.4.58-orig/changes-entries/xmlchar.txt 1970-01-01 01:00:00.000000000 +0100 -+++ httpd-2.4.58/changes-entries/xmlchar.txt 2023-12-18 12:31:00.719087460 +0100 -@@ -0,0 +1,2 @@ -+ *) mod_xml2enc: Tolerate libxml2 2.12.0 and later. -+ [ttachi <tachihara AT hotmail.com>] -diff -Naur httpd-2.4.58-orig/modules/filters/mod_xml2enc.c httpd-2.4.58/modules/filters/mod_xml2enc.c ---- httpd-2.4.58-orig/modules/filters/mod_xml2enc.c 2020-02-21 01:33:40.000000000 +0100 -+++ httpd-2.4.58/modules/filters/mod_xml2enc.c 2023-12-18 12:32:34.248535392 +0100 -@@ -206,11 +206,11 @@ - } - } - } -- -+ - /* to sniff, first we look for BOM */ - if (ctx->xml2enc == XML_CHAR_ENCODING_NONE) { -- ctx->xml2enc = xmlDetectCharEncoding((const xmlChar*)ctx->buf, -- ctx->bytes); -+ ctx->xml2enc = xmlDetectCharEncoding((const unsigned char*)ctx->buf, -+ ctx->bytes); - if (HAVE_ENCODING(ctx->xml2enc)) { - ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01432) - "Got charset from XML rules.") ; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9ce9514bad8109a9ffa0f4206a7668757221287c
by Peter Müller 21 Apr '24

21 Apr '24

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 9ce9514bad8109a9ffa0f4206a7668757221287c (commit) from 658e1675f7da0d7d02216a083f71e34d4eeabd5e (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 9ce9514bad8109a9ffa0f4206a7668757221287c Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sun Apr 21 20:09:40 2024 +0000 libloc: Adjust changed URL format Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/libloc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Difference in files: diff --git a/lfs/libloc b/lfs/libloc index ddd38e941..8e753672a 100644 --- a/lfs/libloc +++ b/lfs/libloc @@ -26,6 +26,7 @@ include Config VER = 0.9.17 DB_DATE = 2024-04-16 +DB_TIME = 03:45 THISAPP = libloc-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -41,7 +42,7 @@ objects = $(DL_FILE) \ location-$(DB_DATE).db.xz $(DL_FILE) = https://source.ipfire.org/releases/libloc/$(DL_FILE) -location-$(DB_DATE).db.xz = https://location.ipfire.org/databases/1/archive/location-$(DB_DATE).db.xz +location-$(DB_DATE).db.xz = https://location.ipfire.org/databases/1/archive/location-$(DB_DATE)-$(DB_TI… $(DL_FILE)_BLAKE2 = b0bf860ebaccd3cb49c58c066c430f7a1f936a2029957db9b88e22c04240af0268a8f6388e8ca512102f14033037a2ab8bbb93fe83e525b9859c790c5c382df4 location-$(DB_DATE).db.xz_BLAKE2 = f60ca7c2e3ac7cb7e6dc94501f0028dfb76f65330ba4f35934addc65bac8af9b3ce0149956aa3ca9211c9843b34d94255328af840d250f1e4612d9af90e7b6e9 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 658e1675f7da0d7d02216a083f71e34d4eeabd5e
by Peter Müller 21 Apr '24

21 Apr '24

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 658e1675f7da0d7d02216a083f71e34d4eeabd5e (commit) via 3cc7b53a8774f750dc0bdeb66715ec013586c0ae (commit) from ba5da82e9be39e2236a709c9d61f48b217c5dd35 (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 658e1675f7da0d7d02216a083f71e34d4eeabd5e Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sun Apr 21 20:06:52 2024 +0000 langs: Update Spamhaus DROP URL Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 3cc7b53a8774f750dc0bdeb66715ec013586c0ae Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sun Apr 21 20:04:51 2024 +0000 libloc: Update location database shipped with new installations Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: langs/de/cgi-bin/de.pl | 2 +- langs/en/cgi-bin/en.pl | 2 +- langs/es/cgi-bin/es.pl | 2 +- langs/fr/cgi-bin/fr.pl | 2 +- lfs/libloc | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) Difference in files: diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index b7b86fc7fc..4dbd049c9c 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -908,7 +908,7 @@ 'drop action1' => 'Standardverhalten der (Outgoing) Firewall in Modus "Blocked"', 'drop action2' => 'Standardverhalten der (Input) Firewall', 'drop forward' => 'Verworfene, von der Firewall weitergeleitete Pakete protokollieren', -'drop hostile' => 'Pakete von und zu bösartigen Netzen (<a href="https://www.spamhaus.org/drop/" target="_blank">Spamhaus DROP</a>-Listing, etc.) verwerfen', +'drop hostile' => 'Pakete von und zu bösartigen Netzen (<a href="https://www.spamhaus.org/blocklists/do-not-route-or-peer/" target="_blank">Spamhaus DROP</a>-Listing, etc.) verwerfen', 'drop input' => 'Verworfene eingehende Pakete protokollieren', 'drop newnotsyn' => 'Verworfene neue Pakete ohne SYN-Markierung protokollieren (NewNotSYN)', 'drop outgoing' => 'Verworfene, von der Firewall ausgehende Pakete protokollieren', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index ee3a6c5aa8..1df6bf48d0 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -952,7 +952,7 @@ 'drop action1' => 'Default behaviour of (outgoing) firewall in mode "Blocked"', 'drop action2' => 'Default behaviour of (input) firewall', 'drop forward' => 'Log dropped forward packets', -'drop hostile' => 'Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/drop/" target="_blank">Spamhaus DROP</a>, etc.)', +'drop hostile' => 'Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/blocklists/do-not-route-or-peer/" target="_blank">Spamhaus DROP</a>, etc.)', 'drop input' => 'Log dropped input packets', 'drop newnotsyn' => 'Log dropped new not SYN packets', 'drop outgoing' => 'Log dropped outgoing packets', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 04549ba83c..1e1a0d9860 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -952,7 +952,7 @@ 'drop action1' => 'Comportamiento predeterminado del Cortafuegos (saliente) en modo "Bloqueado"', 'drop action2' => 'Comportamiento predeterminado del Cortafuegos (de entrada)', 'drop forward' => 'Registrar paquetes de reenvío descartados', -'drop hostile' => 'Descartar paquetes desde y hacia redes hostiles (enumeradas en <a href="https://www.spamhaus.org/drop/" target="_blank">Spamhaus DROP</a>, etc.)', +'drop hostile' => 'Descartar paquetes desde y hacia redes hostiles (enumeradas en <a href="https://www.spamhaus.org/blocklists/do-not-route-or-peer/" target="_blank">Spamhaus DROP</a>, etc.)', 'drop input' => 'Registrar paquetes descartados', 'drop newnotsyn' => 'Registrar nuevos paquetes not syn descartados', 'drop outgoing' => 'Registrar paquetes salientes descartados', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 6034de409d..65a0c95fc4 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -957,7 +957,7 @@ 'drop action1' => 'Comportement par défaut du pare-feu (sortant) en mode "Bloqué"', 'drop action2' => 'Comportement par défaut du pare-feu (entrant)', 'drop forward' => 'Abandon des paquets avancés par le journal', -'drop hostile' => 'Abandonner les paquets depuis et vers des réseaux hostiles (répertoriés sur <a href="https://www.spamhaus.org/drop/" target="_blank">Spamhaus DROP</a>, etc.)', +'drop hostile' => 'Abandonner les paquets depuis et vers des réseaux hostiles (répertoriés sur <a href="https://www.spamhaus.org/blocklists/do-not-route-or-peer/" target="_blank">Spamhaus DROP</a>, etc.)', 'drop input' => 'Suppression des paquets entrants du journal', 'drop newnotsyn' => 'Supprimer les anciens paquets de synchronisation du journal', 'drop outgoing' => 'Abandon des paquets sortants par le journal', diff --git a/lfs/libloc b/lfs/libloc index 35a711286f..ddd38e941c 100644 --- a/lfs/libloc +++ b/lfs/libloc @@ -25,7 +25,7 @@ include Config VER = 0.9.17 -DB_DATE = 2024-02-17 +DB_DATE = 2024-04-16 THISAPP = libloc-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -44,7 +44,7 @@ $(DL_FILE) = https://source.ipfire.org/releases/libloc/$(DL_F location-$(DB_DATE).db.xz = https://location.ipfire.org/databases/1/archive/location-$(DB_DATE).db.xz $(DL_FILE)_BLAKE2 = b0bf860ebaccd3cb49c58c066c430f7a1f936a2029957db9b88e22c04240af0268a8f6388e8ca512102f14033037a2ab8bbb93fe83e525b9859c790c5c382df4 -location-$(DB_DATE).db.xz_BLAKE2 = 36432bed306871e96a741d364fdefaa677d47245e38596d1c7fb6a8f0a143e3ffa549e16effa58289b5481220b0a2560255e75b0bfe53219b1400d6d250aa02b +location-$(DB_DATE).db.xz_BLAKE2 = f60ca7c2e3ac7cb7e6dc94501f0028dfb76f65330ba4f35934addc65bac8af9b3ce0149956aa3ca9211c9843b34d94255328af840d250f1e4612d9af90e7b6e9 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ba5da82e9be39e2236a709c9d61f48b217c5dd35
by Arne Fitzenreiter 19 Apr '24

19 Apr '24

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 ba5da82e9be39e2236a709c9d61f48b217c5dd35 (commit) via 4fdaa9577b45487dd13df467d09817beafc1e1f1 (commit) via 6408ff8d6a952cd88927a7ba6a7aece6cdfb04c0 (commit) via 78e2c1dce515487d7db912970a1e12202990662d (commit) via fc2b1edc73a536a231a9e89e795ba55e42b902c8 (commit) via 238a47874fe044ae90129bde10b267063c4305f5 (commit) via 2841a675482879a5eb6bfeaabb268066af762e9d (commit) via 3162b6ccfa2fb22513c7d23d29f0509343f46828 (commit) via 1db5f96c5ebbb2074c9c0a3edf29866c4769da11 (commit) via eb0de6531c441663477cf7e139f1bd5321630eef (commit) via 4f455c488ee8542bea4ccbe439351b3e9973c6e4 (commit) via 9c28cd59c1b4f535382e5e4e7952d921af8cc03b (commit) via e33ee46e621eb6967c954a9d3b4683880e372579 (commit) via 87a97a431915849cf6d19e1b7137b4fb0b6dd91d (commit) from dbda89e0fce3514f6d1d1f3d2499d7d26227f34b (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 ba5da82e9be39e2236a709c9d61f48b217c5dd35 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 19 19:55:13 2024 +0000 core186: ship ipblocklist sources Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 4fdaa9577b45487dd13df467d09817beafc1e1f1 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Fri Apr 19 15:39:41 2024 +0200 backup.pl: removes any references to ALIENVAULT & SPAMHAUSEDROP from restores - This patch ensures that if a restore is carried out from an earlier version that includes ALIENVAULT and/or SPAMHAUS_EDROP that the references will be removed. - This is the same code as was put into the update.sh file with the previous patch of this set. Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 6408ff8d6a952cd88927a7ba6a7aece6cdfb04c0 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Fri Apr 19 15:39:40 2024 +0200 update.sh: Remove existing entries for ALIENVAULT & SPAMHAUS_EDROP - This removes any time entries in the modified file for either ALIENVAULT or SPAMHAUS_EDROP. - This also removes any blocklists for either of these sources from the /var/lib/ipblocklist directory. - This patch will ensure that any reference to either of these sources is removed from the ipblocklist files. Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 78e2c1dce515487d7db912970a1e12202990662d Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Fri Apr 19 15:39:39 2024 +0200 sources: Removal of ALIENVAULT and SPAMHAUS_EDROP from ipblocklist sources - ALIENVAULT has not been updated since at least Nov 2022 but probably earlier. There is no date for the file to be downloaded but a forum user has log messages from Nov 2022 that indicate the file had not changed as therefore no download occurred. - AT&T aquired AlienVault in August 2018. Somewhere between 2018 and 2022 the list stopped getting updated. AlienVault references on the AT&T website are now for a different product. - Discussed in IPFire conf call of April 2024 and agreed to remove the ALIENVAULT blocklist. - On Apr 10th the Spamhaus eDROP list was merged with the Spamhaus DROP list. The eDROP list is still available but is now empty. Trying to select the SPAMHAUS_EDROP list gives an error message that the blocklist was found to be empty. - This patch removes both the ALIENVAULT and the SPAMHAUS_EDROP lists from the ipblocklist sources file. Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit fc2b1edc73a536a231a9e89e795ba55e42b902c8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 19 18:53:27 2024 +0000 core185: ship fixes for bug12763 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 238a47874fe044ae90129bde10b267063c4305f5 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Apr 11 17:01:08 2024 +0200 oci-setup: Fixes bug12763 - This ensures that all ip route and ip rule commands are redirected to null if the output is not used to feed into a variable. - This will prevent any error messages related to empty iproute tables being displayed during boot if an empty table is accessed. Fixes: Bug#12763 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 2841a675482879a5eb6bfeaabb268066af762e9d Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Apr 11 17:01:07 2024 +0200 gcp-setup: Fixes bug12763 - This ensures that all ip route and ip rule commands are redirected to null if the output is not used to feed into a variable. - This will prevent any error messages related to empty iproute tables being displayed during boot if an empty table is accessed. Fixes: Bug#12763 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 3162b6ccfa2fb22513c7d23d29f0509343f46828 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Apr 11 17:01:06 2024 +0200 exoscale-setup: Fixes bug12763 - This ensures that all ip route and ip rule commands are redirected to null if the output is not used to feed into a variable. - This will prevent any error messages related to empty iproute tables being displayed during boot if an empty table is accessed. Fixes: Bug#12763 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 1db5f96c5ebbb2074c9c0a3edf29866c4769da11 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Apr 11 17:01:05 2024 +0200 azure-setup: Fixes bug12763 - This ensures that all ip route and ip rule commands are redirected to null if the output is not used to feed into a variable. - This will prevent any error messages related to empty iproute tables being displayed during boot if an empty table is accessed. Fixes: Bug#12763 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit eb0de6531c441663477cf7e139f1bd5321630eef Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Apr 11 17:01:04 2024 +0200 aws-setup: Fixes bug12763 - This ensures that all ip route and ip rule commands are redirected to null if the output is not used to feed into a variable. - This will prevent any error messages related to empty iproute tables being displayed during boot if an empty table is accessed. Fixes: Bug#12763 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 4f455c488ee8542bea4ccbe439351b3e9973c6e4 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Apr 11 17:01:03 2024 +0200 ip-up: Fixes bug12763 - This ensures that all ip route and ip rule commands are redirected to null if the output is not used to feed into a variable. - This will prevent any error messages related to empty iproute tables being displayed during boot if an empty table is accessed. Fixes: Bug#12763 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 9c28cd59c1b4f535382e5e4e7952d921af8cc03b Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Apr 11 17:01:02 2024 +0200 red: Fixes bug12763 - This ensures that all ip route and ip rule commands are redirected to null if the output is not used to feed into a variable. - This will prevent any error messages related to empty iproute tables being displayed during boot if an empty table is accessed. Fixes: Bug#12763 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit e33ee46e621eb6967c954a9d3b4683880e372579 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Apr 11 17:01:01 2024 +0200 static-routes: Fixes bug12763 - This ensures that all ip route and ip rule commands are redirected to null if the output is not used to feed into a variable. - This will prevent any error messages related to empty iproute tables being displayed during boot. - Tested on my vm system and confirmed that the fix in ipsec-interfaces stops the "FIB table does not exist" and "RTNETLINK answers: no such file or directory" messages during boot. Fixes: Bug#12763 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 87a97a431915849cf6d19e1b7137b4fb0b6dd91d Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Apr 11 17:01:00 2024 +0200 ipsec-interfaces: Fixes bug12763 - Some of the ip route commands are not redirected to null. This causes the "FIB table does not exist" message from bug12763 - This patch makes all ip route commands get redirected to null, preventing the error message from being seen at boot. - One of the ip rule commands is not redirected to null. This causes the "RTNETLINK answers: no such file or directory" message. - This patch makes all ip rule commands get redirected to null, preventing the error message from being seen at boot. - Additional patches in this set ensure that all ip route and ip rule commands in all IPFire code is redirected to null unless the output of the ip route or ip rule command is used in a variable for use elsewhere in the code. - Tested on my vm system and confirmed that the fix in ipsec-interfaces stops the "FIB table does not exist" and "RTNETLINK answers: no such file or directory" messages during boot. Fixes: Bug#12763 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/backup/backup.pl | 13 ++++++++++++- config/ipblocklist/sources | 12 ------------ config/rootfiles/core/186/filelists/files | 10 ++++++++++ config/rootfiles/core/186/update.sh | 11 +++++++++++ src/initscripts/helper/aws-setup | 2 +- src/initscripts/helper/azure-setup | 2 +- src/initscripts/helper/exoscale-setup | 2 +- src/initscripts/helper/gcp-setup | 4 ++-- src/initscripts/helper/oci-setup | 4 ++-- src/initscripts/networking/red | 4 ++-- src/initscripts/system/static-routes | 6 +++--- src/ppp/ip-up | 2 +- src/scripts/ipsec-interfaces | 8 ++++---- 13 files changed, 50 insertions(+), 30 deletions(-) Difference in files: diff --git a/config/backup/backup.pl b/config/backup/backup.pl index b434207400..d848084e94 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -193,7 +193,7 @@ restore_backup() { # Update OpenVPN CRL /etc/fcron.daily/openvpn-crl-updater - + # Update OpenVPN N2N Client Configs ## Add providers legacy default line to n2n client config files # Check if ovpnconfig exists and is not empty @@ -246,6 +246,17 @@ restore_backup() { -signkey /etc/httpd/server.key \ -out /etc/httpd/server.crt &>/dev/null fi + + # Remove any entry for ALIENVAULT or SPAMHAUS_EDROP from the ipblocklist modified file + # and the associated ipblocklist files from the /var/lib/ipblocklist directory + sed -i '/ALIENVAULT=/d' /var/ipfire/ipblocklist/modified + sed -i '/SPAMHAUS_EDROP=/d' /var/ipfire/ipblocklist/modified + if [ -e /var/lib/ipblocklist/ALIENVAULT.conf ]; then + rm /var/lib/ipblocklist/ALIENVAULT.conf + fi + if [ -e /var/lib/ipblocklist/SPAMHAUS_EDROP.conf ]; then + rm /var/lib/ipblocklist/SPAMHAUS_EDROP.conf + fi return 0 } diff --git a/config/ipblocklist/sources b/config/ipblocklist/sources index be0cf0229d..0835c0f9c3 100644 --- a/config/ipblocklist/sources +++ b/config/ipblocklist/sources @@ -55,12 +55,6 @@ our %sources = ( 'EMERGING_FWRULE' => { 'name' => 'Emerging Threats Blocklis 'parser' => 'ip-or-net-list', 'rate' => '12h', 'category' => 'reputation' }, - 'SPAMHAUS_EDROP' => { 'name' => "Spamhaus Extended Don't Route or Peer List", - 'url' => 'https://www.spamhaus.org/drop/edrop.txt', - 'info' => 'https://www.spamhaus.org/drop/', - 'parser' => 'ip-or-net-list', - 'rate' => '1h', - 'category' => 'reputation' }, 'DSHIELD' => { 'name' => 'Dshield.org Recommended Block List', 'url' => 'https://www.dshield.org/block.txt', 'info' => 'https://dshield.org/', @@ -106,12 +100,6 @@ our %sources = ( 'EMERGING_FWRULE' => { 'name' => 'Emerging Threats Blocklis 'parser' => 'ip-or-net-list',, 'rate' => '1h', 'category' => 'application' }, - 'ALIENVAULT' => { 'name' => 'AlienVault IP Reputation database', - 'url' => 'https://reputation.alienvault.com/reputation.generic', - 'info' => 'https://www.alienvault.com/resource-center/videos/what-is-ip-domain-reputat…', - 'parser' => 'ip-or-net-list', - 'rate' => '1h', - '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', diff --git a/config/rootfiles/core/186/filelists/files b/config/rootfiles/core/186/filelists/files index 86c9d666a6..c1bb727bd4 100644 --- a/config/rootfiles/core/186/filelists/files +++ b/config/rootfiles/core/186/filelists/files @@ -1,6 +1,16 @@ +etc/rc.d/helper/aws-setup +etc/rc.d/helper/azure-setup +etc/rc.d/helper/exoscale-setup +etc/rc.d/helper/gcp-setup +etc/rc.d/helper/oci-setup +etc/rc.d/init.d/networking/red +etc/rc.d/init.d/static-routes +etc/ppp/ip-up etc/rc.d/init.d/functions etc/rc.d/init.d/grub-btrfsd etc/rc.d/rc0.d/K01grub-btrfsd etc/rc.d/rc3.d/S99grub-btrfsd etc/rc.d/rc6.d/K01grub-btrfsd srv/web/ipfire/cgi-bin/vulnerabilities.cgi +usr/local/bin/ipsec-interfaces +var/ipfire/ipblocklist/sources diff --git a/config/rootfiles/core/186/update.sh b/config/rootfiles/core/186/update.sh index 80510b9342..33e253804b 100644 --- a/config/rootfiles/core/186/update.sh +++ b/config/rootfiles/core/186/update.sh @@ -137,6 +137,17 @@ if [ -e /boot/pakfire-kernel-update ]; then /boot/pakfire-kernel-update ${KVER} fi +# Remove any entry for ALIENVAULT or SPAMHAUS_EDROP from the ipblocklist modified file +# and the associated ipblocklist files from the /var/lib/ipblocklist directory +sed -i '/ALIENVAULT=/d' /var/ipfire/ipblocklist/modified +sed -i '/SPAMHAUS_EDROP=/d' /var/ipfire/ipblocklist/modified +if [ -e /var/lib/ipblocklist/ALIENVAULT.conf ]; then + rm /var/lib/ipblocklist/ALIENVAULT.conf +fi +if [ -e /var/lib/ipblocklist/SPAMHAUS_EDROP.conf ]; then + rm /var/lib/ipblocklist/SPAMHAUS_EDROP.conf +fi + # This update needs a reboot... touch /var/run/need_reboot diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup index f14f4eb578..0bcf755720 100644 --- a/src/initscripts/helper/aws-setup +++ b/src/initscripts/helper/aws-setup @@ -278,7 +278,7 @@ case "${reason}" in ip addr add "${new_ip_address}/${new_subnet_mask}" dev "${interface}" # Add the default route - ip route add default via "${new_routers}" + ip route add default via "${new_routers}" >/dev/null 2>&1 # Setup DNS for domain_name_server in ${new_domain_name_servers}; do diff --git a/src/initscripts/helper/azure-setup b/src/initscripts/helper/azure-setup index 7a4422a353..eff963a4b1 100644 --- a/src/initscripts/helper/azure-setup +++ b/src/initscripts/helper/azure-setup @@ -298,7 +298,7 @@ case "${reason}" in ip addr add "${new_ip_address}/${new_subnet_mask}" dev "${interface}" # Add the default route - ip route add default via "${new_routers}" + ip route add default via "${new_routers}" >/dev/null 2>&1 # Setup DNS for domain_name_server in ${new_domain_name_servers}; do diff --git a/src/initscripts/helper/exoscale-setup b/src/initscripts/helper/exoscale-setup index 02fdda2a35..acf5e4e4b9 100644 --- a/src/initscripts/helper/exoscale-setup +++ b/src/initscripts/helper/exoscale-setup @@ -227,7 +227,7 @@ case "${reason}" in ip addr add "${new_ip_address}/${new_subnet_mask}" dev "${interface}" # Add the default route - ip route add default via "${new_routers}" + ip route add default via "${new_routers}" >/dev/null 2>&1 # Setup DNS for domain_name_server in ${new_domain_name_servers}; do diff --git a/src/initscripts/helper/gcp-setup b/src/initscripts/helper/gcp-setup index 4f5148c3e2..8273b70b4f 100644 --- a/src/initscripts/helper/gcp-setup +++ b/src/initscripts/helper/gcp-setup @@ -268,8 +268,8 @@ case "${reason}" in ip addr add "${new_ip_address}/${new_subnet_mask}" dev "${interface}" # Add the default route - ip route add "${new_routers}" dev "${interface}" - ip route add default via "${new_routers}" + ip route add "${new_routers}" dev "${interface}" >/dev/null 2>&1 + ip route add default via "${new_routers}" >/dev/null 2>&1 # Setup DNS for domain_name_server in ${new_domain_name_servers}; do diff --git a/src/initscripts/helper/oci-setup b/src/initscripts/helper/oci-setup index 312014b74c..7275373438 100644 --- a/src/initscripts/helper/oci-setup +++ b/src/initscripts/helper/oci-setup @@ -304,8 +304,8 @@ case "${reason}" in ip addr add "${new_ip_address}/${new_subnet_mask}" dev "${interface}" # Add the default route - ip route add "${new_routers}" dev "${interface}" - ip route add default via "${new_routers}" + ip route add "${new_routers}" dev "${interface}" >/dev/null 2>&1 + ip route add default via "${new_routers}" >/dev/null 2>&1 # Setup DNS for domain_name_server in ${new_domain_name_servers}; do diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red index beb665e5f4..51bf95a436 100644 --- a/src/initscripts/networking/red +++ b/src/initscripts/networking/red @@ -129,10 +129,10 @@ case "${1}" in touch /var/ipfire/red/active # Create route to default gateway - ip route add ${GATEWAY} dev ${DEVICE} + ip route add ${GATEWAY} dev ${DEVICE} >/dev/null 2>&1 boot_mesg "Setting up default gateway ${GATEWAY}..." - ip route add default via ${GATEWAY} dev ${DEVICE} + ip route add default via ${GATEWAY} dev ${DEVICE} >/dev/null 2>&1 evaluate_retval if [ -d "/sys/class/net/${DEVICE}" ]; then diff --git a/src/initscripts/system/static-routes b/src/initscripts/system/static-routes index 85785e9af8..9aacc8db5f 100644 --- a/src/initscripts/system/static-routes +++ b/src/initscripts/system/static-routes @@ -29,14 +29,14 @@ function init_table() { return fi - ip rule add table static + ip rule add table static >/dev/null 2>&1 } function create_all_routes() { local file=${1} shift - # Remote all routes. + # Remove all routes. ip route flush table static >/dev/null 2>&1 local status @@ -54,7 +54,7 @@ function create_all_routes() { continue fi - ip route add ${network} via ${gateway} table static proto static + ip route add ${network} via ${gateway} table static proto static >/dev/null 2>&1 done < ${file} } diff --git a/src/ppp/ip-up b/src/ppp/ip-up index 2e636e72d9..5f4ee77265 100644 --- a/src/ppp/ip-up +++ b/src/ppp/ip-up @@ -33,7 +33,7 @@ echo -n "$4" > /var/ipfire/red/local-ipaddress echo -n "$5" > /var/ipfire/red/remote-ipaddress touch /var/ipfire/red/active -/sbin/ip route replace default via ${IPREMOTE} dev ppp0 +/sbin/ip route replace default via ${IPREMOTE} dev ppp0 >/dev/null 2>&1 run_subdir ${rc_base}/init.d/networking/red.up/ #Check if gateway has answerd to ping, if not replace with ping.ipfire.org diff --git a/src/scripts/ipsec-interfaces b/src/scripts/ipsec-interfaces index 23512b9bd9..974d3ac845 100644 --- a/src/scripts/ipsec-interfaces +++ b/src/scripts/ipsec-interfaces @@ -107,15 +107,15 @@ main() { local interfaces=() # Flush IPsec routes - ip route flush table "${ROUTE_TABLE}" + ip route flush table "${ROUTE_TABLE}" >/dev/null 2>&1 # Remove lookups - ip rule del lookup "${ROUTE_TABLE}" + ip rule del lookup "${ROUTE_TABLE}" >/dev/null 2>&1 # We are done when IPsec is not enabled if [ "${ENABLED}" = "on" ]; then # Enable route table lookup - ip rule add lookup "${ROUTE_TABLE}" prio "${ROUTE_TABLE_PRIO}" + ip rule add lookup "${ROUTE_TABLE}" prio "${ROUTE_TABLE_PRIO}" >/dev/null 2>&1 while IFS="," read -r "${VARS[@]}"; do # Check if the connection is enabled @@ -158,7 +158,7 @@ main() { log "Creating route to ${rightsubnet} (via ${address} and ${RED_INTF})" ip route add table "${ROUTE_TABLE}" "${rightsubnet}" proto static \ - dev "${RED_INTF}" src "${address}" + dev "${RED_INTF}" src "${address}" >/dev/null 2>&1 done # No interface processing required hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a8e7c5ff8617fbda3fbc2460b860b31d25741c94
by Arne Fitzenreiter 17 Apr '24

17 Apr '24

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 a8e7c5ff8617fbda3fbc2460b860b31d25741c94 (commit) from 24f2ab15c632081d51781eafad330710056f6faa (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 a8e7c5ff8617fbda3fbc2460b860b31d25741c94 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Apr 17 19:39:14 2024 +0200 kernel: update to 6.6.28 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 2 +- config/kernel/kernel.config.x86_64-ipfire | 6 ++---- config/rootfiles/common/x86_64/linux | 2 +- lfs/linux | 4 ++-- 4 files changed, 6 insertions(+), 8 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 836c48b01..b85d7add9 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.6.27-ipfire Kernel Configuration +# Linux/arm64 6.6.28-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index d36fc381c..8ce66cb4f 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.27-ipfire Kernel Configuration +# Linux/x86 6.6.28-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -510,9 +510,7 @@ CONFIG_CPU_SRSO=y CONFIG_SLS=y # CONFIG_GDS_FORCE_MITIGATION is not set CONFIG_MITIGATION_RFDS=y -# CONFIG_SPECTRE_BHI_ON is not set -# CONFIG_SPECTRE_BHI_OFF is not set -CONFIG_SPECTRE_BHI_AUTO=y +CONFIG_MITIGATION_SPECTRE_BHI=y CONFIG_ARCH_HAS_ADD_PAGES=y # diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index 724518812..8458d510d 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -9205,6 +9205,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/MISC_RTSX_PCI #lib/modules/KVER-ipfire/build/include/config/MISC_RTSX_USB #lib/modules/KVER-ipfire/build/include/config/MITIGATION_RFDS +#lib/modules/KVER-ipfire/build/include/config/MITIGATION_SPECTRE_BHI #lib/modules/KVER-ipfire/build/include/config/MLX4_CORE #lib/modules/KVER-ipfire/build/include/config/MLX4_CORE_GEN2 #lib/modules/KVER-ipfire/build/include/config/MLX4_EN @@ -10994,7 +10995,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/SPARSEMEM_VMEMMAP #lib/modules/KVER-ipfire/build/include/config/SPARSEMEM_VMEMMAP_ENABLE #lib/modules/KVER-ipfire/build/include/config/SPARSE_IRQ -#lib/modules/KVER-ipfire/build/include/config/SPECTRE_BHI_AUTO #lib/modules/KVER-ipfire/build/include/config/SPECULATION_MITIGATIONS #lib/modules/KVER-ipfire/build/include/config/SPLIT_PTLOCK_CPUS #lib/modules/KVER-ipfire/build/include/config/SPMI diff --git a/lfs/linux b/lfs/linux index 0016a76f5..9cd16cb35 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.6.27 +VER = 6.6.28 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -72,7 +72,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 386ceee8c6f48936461a6b5a770a7ade5ebb81cf936ee3712a7ebcf6a938490d8829babe15bf7a58cc0fc64f5f0cbb6bc501d3612eab6faa9531e00c929b4bb1 +$(DL_FILE)_BLAKE2 = 688c9b46f36a0ef8dedbfe27681878216e9b11faa05bb3f8a5f257d6536df2a3260c2ecac33d67b6b1a27dfb747a86ae8911a0bc2c6376f062fd04595e05b199 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 24f2ab15c632081d51781eafad330710056f6faa
by Arne Fitzenreiter 16 Apr '24

16 Apr '24

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 24f2ab15c632081d51781eafad330710056f6faa (commit) from 4b5d8a37b69c29dae49a6cf561ed669aa44f4d64 (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 24f2ab15c632081d51781eafad330710056f6faa Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Apr 16 06:50:49 2024 +0200 kernel: rootfile update Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/aarch64/linux | 3 +-- config/rootfiles/common/x86_64/linux | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) Difference in files: diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 5659c4c5f..f98b42734 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -10110,7 +10110,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/NXP_C45_TJA11XX_PHY #lib/modules/KVER-ipfire/build/include/config/NXP_CBTX_PHY #lib/modules/KVER-ipfire/build/include/config/NXP_TJA11XX_PHY -#lib/modules/KVER-ipfire/build/include/config/N_GSM #lib/modules/KVER-ipfire/build/include/config/N_HDLC #lib/modules/KVER-ipfire/build/include/config/OBJAGG #lib/modules/KVER-ipfire/build/include/config/OCTEONTX2_AF @@ -18926,6 +18925,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/scripts/mod/modpost.c #lib/modules/KVER-ipfire/build/scripts/mod/modpost.h #lib/modules/KVER-ipfire/build/scripts/mod/sumversion.c +#lib/modules/KVER-ipfire/build/scripts/mod/symsearch.c #lib/modules/KVER-ipfire/build/scripts/module.lds #lib/modules/KVER-ipfire/build/scripts/module.lds.S #lib/modules/KVER-ipfire/build/scripts/modules-check.sh @@ -22235,7 +22235,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/thermal/imx_thermal.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/thermal/qoriq_thermal.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/tty -#lib/modules/KVER-ipfire/kernel/drivers/tty/n_gsm.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/tty/n_hdlc.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/tty/serial #lib/modules/KVER-ipfire/kernel/drivers/tty/serial/8250 diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index 5b4599c61..724518812 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -9891,7 +9891,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/NXP_C45_TJA11XX_PHY #lib/modules/KVER-ipfire/build/include/config/NXP_CBTX_PHY #lib/modules/KVER-ipfire/build/include/config/NXP_TJA11XX_PHY -#lib/modules/KVER-ipfire/build/include/config/N_GSM #lib/modules/KVER-ipfire/build/include/config/N_HDLC #lib/modules/KVER-ipfire/build/include/config/OBJAGG #lib/modules/KVER-ipfire/build/include/config/OBJTOOL @@ -22620,7 +22619,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/thermal/intel/intel_tcc_cooling.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/thermal/intel/x86_pkg_temp_thermal.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/tty -#lib/modules/KVER-ipfire/kernel/drivers/tty/n_gsm.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/tty/n_hdlc.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/tty/nozomi.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/tty/serial hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree tag, v2.29-core185, created. 76ba16aef070d5efd10325b8a34a134ec04dcaf2
by Michael Tremer 14 Apr '24

14 Apr '24

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 tag, v2.29-core185 has been created at 76ba16aef070d5efd10325b8a34a134ec04dcaf2 (commit) - Log ----------------------------------------------------------------- commit 76ba16aef070d5efd10325b8a34a134ec04dcaf2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 9 10:51:18 2024 +0100 suricata: Change midstream policy to "pass-flow" Pass packet isn't allowed here. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core185, created. 76ba16aef070d5efd10325b8a34a134ec04dcaf2
by Michael Tremer 14 Apr '24

14 Apr '24

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, core185 has been created at 76ba16aef070d5efd10325b8a34a134ec04dcaf2 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4b5d8a37b69c29dae49a6cf561ed669aa44f4d64
by Arne Fitzenreiter 14 Apr '24

14 Apr '24

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 4b5d8a37b69c29dae49a6cf561ed669aa44f4d64 (commit) via 991b7eb4e2c7086aaa01700357f9d166143cbd56 (commit) from 31a8214d1651e556f3eac2d8fd19ca9ec5bde724 (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 4b5d8a37b69c29dae49a6cf561ed669aa44f4d64 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Apr 14 14:38:32 2024 +0200 kernel: disable CONFIG_N_GSM this feature should not used by IPFire and there is a possible unfixed race condition that can used for a privilege elevation attack. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 991b7eb4e2c7086aaa01700357f9d166143cbd56 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Apr 14 14:38:00 2024 +0200 kernel: update to 6.6.27 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 4 ++-- config/kernel/kernel.config.riscv64-ipfire | 2 +- config/kernel/kernel.config.x86_64-ipfire | 4 ++-- lfs/linux | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 1689aaea8..836c48b01 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.6.26-ipfire Kernel Configuration +# Linux/arm64 6.6.27-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -3654,7 +3654,7 @@ CONFIG_SERIAL_NONSTANDARD=y # CONFIG_MOXA_INTELLIO is not set # CONFIG_MOXA_SMARTIO is not set CONFIG_N_HDLC=m -CONFIG_N_GSM=m +# CONFIG_N_GSM is not set # CONFIG_NOZOMI is not set # CONFIG_NULL_TTY is not set CONFIG_HVC_DRIVER=y diff --git a/config/kernel/kernel.config.riscv64-ipfire b/config/kernel/kernel.config.riscv64-ipfire index 4617615d5..2bd39e7de 100644 --- a/config/kernel/kernel.config.riscv64-ipfire +++ b/config/kernel/kernel.config.riscv64-ipfire @@ -3319,7 +3319,7 @@ CONFIG_SERIAL_NONSTANDARD=y CONFIG_N_HDLC=m # CONFIG_GOLDFISH_TTY is not set # CONFIG_IPWIRELESS is not set -CONFIG_N_GSM=m +# CONFIG_N_GSM is not set CONFIG_NOZOMI=m # CONFIG_NULL_TTY is not set CONFIG_HVC_DRIVER=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index edecade1d..d36fc381c 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.26-ipfire Kernel Configuration +# Linux/x86 6.6.27-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -3562,7 +3562,7 @@ CONFIG_SERIAL_NONSTANDARD=y # CONFIG_MOXA_INTELLIO is not set # CONFIG_MOXA_SMARTIO is not set CONFIG_N_HDLC=m -CONFIG_N_GSM=m +# CONFIG_N_GSM is not set CONFIG_NOZOMI=m # CONFIG_NULL_TTY is not set CONFIG_HVC_DRIVER=y diff --git a/lfs/linux b/lfs/linux index f01c5101f..0016a76f5 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.6.26 +VER = 6.6.27 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -72,7 +72,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 633ef0a386e6877811466c9ac937440709ec878b6ed4d26df874d524d9d6e3d92e0d73a6916bade1fffe297345e72253274fd57ccbab5addd461e10569bc702d +$(DL_FILE)_BLAKE2 = 386ceee8c6f48936461a6b5a770a7ade5ebb81cf936ee3712a7ebcf6a938490d8829babe15bf7a58cc0fc64f5f0cbb6bc501d3612eab6faa9531e00c929b4bb1 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 31a8214d1651e556f3eac2d8fd19ca9ec5bde724
by Arne Fitzenreiter 11 Apr '24

11 Apr '24

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 31a8214d1651e556f3eac2d8fd19ca9ec5bde724 (commit) from 103aa06884f0d4a29e041545f091546fd384d654 (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 31a8214d1651e556f3eac2d8fd19ca9ec5bde724 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Apr 11 12:55:25 2024 +0200 kernel: update to 6.6.26 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 2 +- config/kernel/kernel.config.x86_64-ipfire | 5 ++++- config/rootfiles/common/x86_64/linux | 2 ++ lfs/linux | 6 +++--- .../linux/{linux-6.6-layer7.patch => linux-6.6.26-layer7.patch} | 6 +++--- 5 files changed, 13 insertions(+), 8 deletions(-) rename src/patches/linux/{linux-6.6-layer7.patch => linux-6.6.26-layer7.patch} (99%) Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 6552e2a641..1689aaea80 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.6.25-ipfire Kernel Configuration +# Linux/arm64 6.6.26-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 5ecc7f15b9..edecade1d1 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.25-ipfire Kernel Configuration +# Linux/x86 6.6.26-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -510,6 +510,9 @@ CONFIG_CPU_SRSO=y CONFIG_SLS=y # CONFIG_GDS_FORCE_MITIGATION is not set CONFIG_MITIGATION_RFDS=y +# CONFIG_SPECTRE_BHI_ON is not set +# CONFIG_SPECTRE_BHI_OFF is not set +CONFIG_SPECTRE_BHI_AUTO=y CONFIG_ARCH_HAS_ADD_PAGES=y # diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index e74e1f98c2..5b4599c617 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -10995,6 +10995,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/SPARSEMEM_VMEMMAP #lib/modules/KVER-ipfire/build/include/config/SPARSEMEM_VMEMMAP_ENABLE #lib/modules/KVER-ipfire/build/include/config/SPARSE_IRQ +#lib/modules/KVER-ipfire/build/include/config/SPECTRE_BHI_AUTO #lib/modules/KVER-ipfire/build/include/config/SPECULATION_MITIGATIONS #lib/modules/KVER-ipfire/build/include/config/SPLIT_PTLOCK_CPUS #lib/modules/KVER-ipfire/build/include/config/SPMI @@ -18938,6 +18939,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/scripts/mod/modpost.c #lib/modules/KVER-ipfire/build/scripts/mod/modpost.h #lib/modules/KVER-ipfire/build/scripts/mod/sumversion.c +#lib/modules/KVER-ipfire/build/scripts/mod/symsearch.c #lib/modules/KVER-ipfire/build/scripts/module.lds #lib/modules/KVER-ipfire/build/scripts/module.lds.S #lib/modules/KVER-ipfire/build/scripts/modules-check.sh diff --git a/lfs/linux b/lfs/linux index e10ce532aa..f01c5101fd 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.6.25 +VER = 6.6.26 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -72,7 +72,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = d744ef7ea55202d5cb9adad2d7b22bc8be81bb4b5a03fe52e063192557eadf28d5e62612b6a517ec3180441d8fcec3582a53383df644c32bb45f3e969298af56 +$(DL_FILE)_BLAKE2 = 633ef0a386e6877811466c9ac937440709ec878b6ed4d26df874d524d9d6e3d92e0d73a6916bade1fffe297345e72253274fd57ccbab5addd461e10569bc702d install : $(TARGET) @@ -109,7 +109,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ln -svf linux-$(VER) $(DIR_SRC)/linux # Layer7-patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-6.6-layer7.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-6.6.26-layer7.patch # DVB Patches cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pll.patch diff --git a/src/patches/linux/linux-6.6-layer7.patch b/src/patches/linux/linux-6.6.26-layer7.patch similarity index 99% rename from src/patches/linux/linux-6.6-layer7.patch rename to src/patches/linux/linux-6.6.26-layer7.patch index 571ea7af1b..967598a5b0 100644 --- a/src/patches/linux/linux-6.6-layer7.patch +++ b/src/patches/linux/linux-6.6.26-layer7.patch @@ -1,8 +1,8 @@ diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h -index 97bfef071255..b41174c29ca0 100644 +index 9e61f6df6bc5..f781cbe021f9 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -890,6 +890,9 @@ struct sk_buff { +@@ -885,6 +885,9 @@ struct sk_buff { #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) unsigned long _nfct; @@ -103,7 +103,7 @@ index d4958e7e7631..eea1eb1206fa 100644 obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c -index 9f6f2e643575..ea2fb2889155 100644 +index e4ae2a08da6a..f694cb91f176 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -592,6 +592,11 @@ void nf_ct_destroy(struct nf_conntrack *nfct) hooks/post-receive -- IPFire 2.x development tree

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM