IPFire-SCM May 2022

ipfire-scm@lists.ipfire.org

1 participants
37 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. de5896985ccb3c9c732315ddd17106e5c4b1bafe
by Peter Müller 31 May '22

31 May '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 de5896985ccb3c9c732315ddd17106e5c4b1bafe (commit) from 4f4b7fbc13d3fcc50d0acc93ae20ecef7c4466dc (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 de5896985ccb3c9c732315ddd17106e5c4b1bafe Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Tue May 31 17:21:54 2022 +0000 intel-microcode: Update rootfile Reported-by: Jon Murphy <jcmurphy26(a)gmail.com> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/x86_64/intel-microcode | 6 ++++++ 1 file changed, 6 insertions(+) Difference in files: diff --git a/config/rootfiles/common/x86_64/intel-microcode b/config/rootfiles/common/x86_64/intel-microcode index 068cc36d3..568e9d481 100644 --- a/config/rootfiles/common/x86_64/intel-microcode +++ b/config/rootfiles/common/x86_64/intel-microcode @@ -95,6 +95,10 @@ lib/firmware/intel-ucode/06-8e-0a lib/firmware/intel-ucode/06-8e-0b lib/firmware/intel-ucode/06-8e-0c lib/firmware/intel-ucode/06-96-01 +lib/firmware/intel-ucode/06-97-02 +lib/firmware/intel-ucode/06-97-05 +lib/firmware/intel-ucode/06-9a-03 +lib/firmware/intel-ucode/06-9a-04 lib/firmware/intel-ucode/06-9c-00 lib/firmware/intel-ucode/06-9e-09 lib/firmware/intel-ucode/06-9e-0a @@ -107,6 +111,8 @@ lib/firmware/intel-ucode/06-a5-05 lib/firmware/intel-ucode/06-a6-00 lib/firmware/intel-ucode/06-a6-01 lib/firmware/intel-ucode/06-a7-01 +lib/firmware/intel-ucode/06-bf-02 +lib/firmware/intel-ucode/06-bf-05 lib/firmware/intel-ucode/0f-00-07 lib/firmware/intel-ucode/0f-00-0a lib/firmware/intel-ucode/0f-01-02 hooks/post-receive -- IPFire 2.x development tree

1 0

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

30 May '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 4f4b7fbc13d3fcc50d0acc93ae20ecef7c4466dc (commit) from 71d53192d37db0d86a9dc04b11aa40016ba09b47 (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 4f4b7fbc13d3fcc50d0acc93ae20ecef7c4466dc Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Mon May 30 20:00:53 2022 +0000 Update contributor list Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/credits.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 26cbc4f6d..bfb792540 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -73,8 +73,8 @@ Jan Paul Tücking, Jonatan Schlag, Dirk Wagner, Marcel Lorenz, -Alf Høgemark, Leo-Andres Hofmann, +Alf Høgemark, Ben Schweikert, Daniel Weismüller, Peter Pfeiffer, hooks/post-receive -- IPFire 2.x development tree

1 0

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

30 May '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 71d53192d37db0d86a9dc04b11aa40016ba09b47 (commit) via 69aac83da960bc89783aa8dc5373b907cccc60f8 (commit) from 8077bacb826bb336d98d90c628ad8fece098dc16 (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 71d53192d37db0d86a9dc04b11aa40016ba09b47 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 19 08:56:34 2022 +0000 core168: Add script to automatically repair MDRAID arrays Please see the header of the script for more details. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 69aac83da960bc89783aa8dc5373b907cccc60f8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 19 08:56:33 2022 +0000 core168: Add rd.auto to kernel command line This parameter will enable dracut to automatically launch any MDRAID arrays at boot time. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/aarch64/stage2 | 1 + config/rootfiles/common/armv6l/stage2 | 1 + config/rootfiles/common/x86_64/stage2 | 1 + config/rootfiles/core/168/update.sh | 7 ++ src/scripts/repair-mdraid | 169 +++++++++++++++++++++++++++++++++ 5 files changed, 179 insertions(+) create mode 100644 src/scripts/repair-mdraid Difference in files: diff --git a/config/rootfiles/common/aarch64/stage2 b/config/rootfiles/common/aarch64/stage2 index 352c704d4..e328a4526 100644 --- a/config/rootfiles/common/aarch64/stage2 +++ b/config/rootfiles/common/aarch64/stage2 @@ -99,6 +99,7 @@ usr/local/bin/ipsec-interfaces usr/local/bin/makegraphs usr/local/bin/qosd usr/local/bin/readhash +usr/local/bin/repair-mdraid usr/local/bin/run-parts usr/local/bin/scanhd usr/local/bin/settime diff --git a/config/rootfiles/common/armv6l/stage2 b/config/rootfiles/common/armv6l/stage2 index 198461a01..2bd00d968 100644 --- a/config/rootfiles/common/armv6l/stage2 +++ b/config/rootfiles/common/armv6l/stage2 @@ -97,6 +97,7 @@ usr/local/bin/ipsec-interfaces usr/local/bin/makegraphs usr/local/bin/qosd usr/local/bin/readhash +usr/local/bin/repair-mdraid usr/local/bin/run-parts usr/local/bin/scanhd usr/local/bin/settime diff --git a/config/rootfiles/common/x86_64/stage2 b/config/rootfiles/common/x86_64/stage2 index b03a7fecf..586b88e3d 100644 --- a/config/rootfiles/common/x86_64/stage2 +++ b/config/rootfiles/common/x86_64/stage2 @@ -99,6 +99,7 @@ usr/local/bin/ipsec-interfaces usr/local/bin/makegraphs usr/local/bin/qosd usr/local/bin/readhash +usr/local/bin/repair-mdraid usr/local/bin/run-parts usr/local/bin/scanhd usr/local/bin/settime diff --git a/config/rootfiles/core/168/update.sh b/config/rootfiles/core/168/update.sh index e11e08b7f..84dec941c 100644 --- a/config/rootfiles/core/168/update.sh +++ b/config/rootfiles/core/168/update.sh @@ -120,6 +120,13 @@ case "$(uname -m)" in ;; esac +# Add rd.auto to kernel command line +if ! grep -q rd.auto /etc/default/grub; then + sed -e "s/panic=10/& rd.auto/" -i /etc/default/grub +fi + +# Repair any broken MDRAID arrays +/usr/local/bin/repair-mdraid # Start services /etc/init.d/fcron restart diff --git a/src/scripts/repair-mdraid b/src/scripts/repair-mdraid new file mode 100644 index 000000000..a622ff71d --- /dev/null +++ b/src/scripts/repair-mdraid @@ -0,0 +1,169 @@ +#!/bin/bash +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### +# +# This script is supposed to repair any broken RAID installations +# where the system has been booted from only one of the RAID devices +# without the software RAID being activated first. +# +# This script does as follows: +# +# * It tries to find an inactive RAID called "ipfire:0" +# * It will then destroy any devices that are still part of this RAID. +# This is required because if the RAID is being assembled correctly, +# data from the disk that has NOT been mounted will be replicated +# back to the device that has been changed. That causes that any +# data that has been written to the mounted disk will be lost. +# To avoid this, we will partially destroy the RAID. +# * We will then erase any partition tables and destroy any filesystems +# on the devices so that they do not get accidentially mounted again. +# * The system will then need to be rebooted where the RAID will be +# mounted again in a degraded state which might take some extra +# time at boot (the system stands still for about a minute). +# * After the system has been booted up correctly, we will re-add +# the devices back to the RAID which will resync and the system +# will be back to its intended configuration. + +find_inactive_raid() { + local status + local device + local arg + local args + + while read -r status device args; do + if [ "${status}" = "INACTIVE-ARRAY" ]; then + for arg in ${args}; do + case "${arg}" in + name=ipfire:0) + echo "${device}" + return 0 + ;; + esac + done + fi + done <<< "$(mdadm --detail --scan)" + + return 1 +} + +find_root() { + local device + local mp + local fs + local args + + while read -r device mp fs args; do + if [ "${mp}" = "/" ]; then + echo "${device:0:-1}" + return 0 + fi + done < /proc/mounts + + return 1 +} + +find_raid_devices() { + local raid="${1}" + + local IFS=, + + local device + for device in $(mdadm -v --detail --scan "${raid}" | awk -F= '/^[ ]+devices/ { print $2 }'); do + echo "${device}" + done + + return 0 +} + +destroy_everything() { + local device="${1}" + local part + + # Destroy the RAID superblock + mdadm --zero-superblock "${device}" + + # Wipe the partition table + wipefs -a "${device}" + + # Wipe any partition signatures + for part in ${device}*; do + wipefs -a "${part}" + done +} + +raid_rebuild() { + local devices=( "$@" ) + + cat > /etc/rc.d/rcsysinit.d/S99fix-raid <<EOF +#!/bin/bash + +case "\${1}" in + start) + if [ -e "/dev/md/ipfire:0" ]; then + for device in ${devices[@]}; do + mdadm --add "/dev/md/ipfire:0" "\${device}" + done + + # Delete this script + rm "\${0}" + fi + ;; +esac +EOF + + chmod a+x /etc/rc.d/rcsysinit.d/S99fix-raid +} + +main() { + local raid="$(find_inactive_raid)" + + # Nothing to do if no RAID device found + if [ -z "${raid}" ]; then + return 0 + fi + + echo "Fixing RAID ${raid}..." + + local root="$(find_root)" + + # Finding any devices in this RAID + local devices=( + $(find_raid_devices "${raid}") + ) + + # Stop the RAID + mdadm --stop "${raid}" &>/dev/null + + # Destroy any useful data on all remaining RAID devices + local device + for device in ${devices[@]}; do + # Skip root + [ "${device}" = "${root}" ] && continue + + destroy_everything "${device}" + done &>/dev/null + + # Re-add devices to the RAID + raid_rebuild "${device}" + + return 0 +} + +main "$@" || return $? hooks/post-receive -- IPFire 2.x development tree

1 0

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

20 May '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 8077bacb826bb336d98d90c628ad8fece098dc16 (commit) from b630a9a8a8dab5e558c0929191ee25da2e9d5068 (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 8077bacb826bb336d98d90c628ad8fece098dc16 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Wed May 18 17:49:00 2022 +0000 strongSwan: Bring back firewall rules for permitting IP-in-IP, ESP and AH traffic Fixes: #12866 Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/patches/strongswan-ipfire.patch | 54 +++++++++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 14 deletions(-) Difference in files: diff --git a/src/patches/strongswan-ipfire.patch b/src/patches/strongswan-ipfire.patch index 0f2be7483..d8e35cd52 100644 --- a/src/patches/strongswan-ipfire.patch +++ b/src/patches/strongswan-ipfire.patch @@ -1,13 +1,13 @@ -commit 654e2b7688c5fbd4e1fc46648bc1864301fb6027 -Author: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Mon Mar 21 19:49:02 2022 +0000 +commit b439f74361d393bcb85109b6c41a905cf613a296 +Author: Peter Müller <peter.mueller(a)ipfire.org> +Date: Wed May 18 17:46:57 2022 +0000 IPFire modifications to _updown script - Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> + Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> diff --git a/src/_updown/_updown.in b/src/_updown/_updown.in -index 34eaf68c7..514ecb578 100644 +index 34eaf68c7..9ed387a0a 100644 --- a/src/_updown/_updown.in +++ b/src/_updown/_updown.in @@ -242,10 +242,10 @@ up-host:iptables) @@ -98,7 +98,7 @@ index 34eaf68c7..514ecb578 100644 -s $PLUTO_PEER -d $PLUTO_ME $IPSEC_POLICY_IN -j ACCEPT fi # -@@ -342,10 +324,10 @@ up-client:iptables) +@@ -342,47 +324,37 @@ up-client:iptables) if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ] then logger -t $TAG -p $FAC_PRIO \ @@ -110,8 +110,20 @@ index 34eaf68c7..514ecb578 100644 + "client+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" fi fi ++ ++ # Open Firewall for IPinIP + AH + ESP Traffic ++ iptables --wait -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p IPIP \ ++ -s $PLUTO_PEER $S_PEER_PORT \ ++ -d $PLUTO_ME $D_MY_PORT -j ACCEPT ++ iptables --wait -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p AH \ ++ -s $PLUTO_PEER $S_PEER_PORT \ ++ -d $PLUTO_ME $D_MY_PORT -j ACCEPT ++ iptables --wait -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p ESP \ ++ -s $PLUTO_PEER $S_PEER_PORT \ ++ -d $PLUTO_ME $D_MY_PORT -j ACCEPT ++ ;; -@@ -353,36 +335,14 @@ down-client:iptables) + down-client:iptables) # connection to client subnet, with (left/right)firewall=yes, going down # This is used only by the default updown script, not by your custom # ones, so do not mess with it; see CAUTION comment up at top. @@ -149,7 +161,7 @@ index 34eaf68c7..514ecb578 100644 -s $PLUTO_PEER -d $PLUTO_ME $IPSEC_POLICY_IN -j ACCEPT fi # -@@ -392,10 +352,10 @@ down-client:iptables) +@@ -392,12 +364,24 @@ down-client:iptables) if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ] then logger -t $TAG -p $FAC_PRIO -- \ @@ -161,8 +173,22 @@ index 34eaf68c7..514ecb578 100644 + "client- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" fi fi ++ ++ # Close Firewall for IPinIP + AH + ESP Traffic ++ iptables --wait -D IPSECINPUT -i $PLUTO_INTERFACE -p IPIP \ ++ -s $PLUTO_PEER $S_PEER_PORT \ ++ -d $PLUTO_ME $D_MY_PORT -j ACCEPT ++ iptables --wait -D IPSECINPUT -i $PLUTO_INTERFACE -p AH \ ++ -s $PLUTO_PEER $S_PEER_PORT \ ++ -d $PLUTO_ME $D_MY_PORT -j ACCEPT ++ iptables --wait -D IPSECINPUT -i $PLUTO_INTERFACE -p ESP \ ++ -s $PLUTO_PEER $S_PEER_PORT \ ++ -d $PLUTO_ME $D_MY_PORT -j ACCEPT ++ ;; -@@ -422,10 +382,10 @@ up-host-v6:iptables) + # + # IPv6 +@@ -422,10 +406,10 @@ up-host-v6:iptables) # connection to me, with (left/right)firewall=yes, coming up # This is used only by the default updown script, not by your custom # ones, so do not mess with it; see CAUTION comment up at top. @@ -175,7 +201,7 @@ index 34eaf68c7..514ecb578 100644 -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \ -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT # -@@ -454,10 +414,10 @@ down-host-v6:iptables) +@@ -454,10 +438,10 @@ down-host-v6:iptables) # connection to me, with (left/right)firewall=yes, going down # This is used only by the default updown script, not by your custom # ones, so do not mess with it; see CAUTION comment up at top. @@ -188,7 +214,7 @@ index 34eaf68c7..514ecb578 100644 -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \ -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT # -@@ -487,10 +447,10 @@ up-client-v6:iptables) +@@ -487,10 +471,10 @@ up-client-v6:iptables) # ones, so do not mess with it; see CAUTION comment up at top. if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/128" ] then @@ -201,7 +227,7 @@ index 34eaf68c7..514ecb578 100644 -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT fi -@@ -499,10 +459,10 @@ up-client-v6:iptables) +@@ -499,10 +483,10 @@ up-client-v6:iptables) # or sometimes host access via the internal IP is needed if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ] then @@ -214,7 +240,7 @@ index 34eaf68c7..514ecb578 100644 -s $PLUTO_MY_CLIENT $S_MY_PORT \ -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j ACCEPT fi -@@ -535,11 +495,11 @@ down-client-v6:iptables) +@@ -535,11 +519,11 @@ down-client-v6:iptables) # ones, so do not mess with it; see CAUTION comment up at top. if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/128" ] then @@ -228,7 +254,7 @@ index 34eaf68c7..514ecb578 100644 -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ -d $PLUTO_MY_CLIENT $D_MY_PORT \ $IPSEC_POLICY_IN -j ACCEPT -@@ -549,11 +509,11 @@ down-client-v6:iptables) +@@ -549,11 +533,11 @@ down-client-v6:iptables) # or sometimes host access via the internal IP is needed if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ] then hooks/post-receive -- IPFire 2.x development tree

1 0

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

18 May '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 b630a9a8a8dab5e558c0929191ee25da2e9d5068 (commit) from 1c1d9fd7bfdf5495069c3119982753a9ddc5fe24 (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 b630a9a8a8dab5e558c0929191ee25da2e9d5068 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Wed May 18 17:42:24 2022 +0000 Core Update 168: fcrontab != crontab Silly me. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/168/filelists/files | 1 - 1 file changed, 1 deletion(-) Difference in files: diff --git a/config/rootfiles/core/168/filelists/files b/config/rootfiles/core/168/filelists/files index 159d43d86..5f5e172df 100644 --- a/config/rootfiles/core/168/filelists/files +++ b/config/rootfiles/core/168/filelists/files @@ -391,7 +391,6 @@ lib/firmware/rtw88/rtw8821c_fw.bin lib/firmware/rtw88/rtw8822c_fw.bin lib/firmware/rtw89/rtw8852a_fw.bin lib/firmware/wfx/wfm_wf200_C0.sec -usr/bin/fcrontab usr/lib/firewall/rules.pl usr/local/bin/update-ids-ruleset usr/sbin/convert-ids-backend-files hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1c1d9fd7bfdf5495069c3119982753a9ddc5fe24
by Peter Müller 16 May '22

16 May '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 1c1d9fd7bfdf5495069c3119982753a9ddc5fe24 (commit) from bbd4767fcf3086800e96aa449c6fa526ad662288 (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 1c1d9fd7bfdf5495069c3119982753a9ddc5fe24 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 16 14:48:14 2022 +0000 dracut: Enable automatic assembly of any RAID/LVM devices This has changed in dracut 24 and we have used various hacks to enable this behaviour again when it would have been so easy to just enable this parameter. Fixes: #12862 - Upgrade from Core 166 to 167 does not use RAID anymore Reported-by: Dirk Sihling <dsihling(a)web.de> Reported-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/grub2/default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/config/grub2/default b/config/grub2/default index c1b78237e..127d33445 100644 --- a/config/grub2/default +++ b/config/grub2/default @@ -1,6 +1,6 @@ GRUB_TIMEOUT=5 GRUB_DISTRIBUTOR="$(sed 's, release .*$,,g' /etc/system-release)" GRUB_DEFAULT=saved -GRUB_CMDLINE_LINUX="panic=10" +GRUB_CMDLINE_LINUX="rd.auto panic=10" GRUB_DISABLE_RECOVERY="true" GRUB_BACKGROUND="/boot/grub/splash.png" hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. bbd4767fcf3086800e96aa449c6fa526ad662288
by Michael Tremer 16 May '22

16 May '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, master has been updated via bbd4767fcf3086800e96aa449c6fa526ad662288 (commit) via 4eb6ba2bd56029a8756d75b2a34c9fbe68650740 (commit) via 691a83f2374d85f834c24d3d82525bc554ad4f25 (commit) via 0f3b6da86d3e239badea7c46aca05189a940b469 (commit) via e2f4f99e498a89157e85e8e4b983e61568956e9e (commit) via ceb8b07b2cfedc5ec84576dd85db80bd83ce7ab1 (commit) from 9f42266a5957dd9da1f6eb68a8602429a3e993da (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 bbd4767fcf3086800e96aa449c6fa526ad662288 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Mon May 16 07:12:23 2022 +0000 Core Update 168: Ship liburcu Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 4eb6ba2bd56029a8756d75b2a34c9fbe68650740 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri May 13 23:26:34 2022 +0200 poppler: Fix rootfile. libpoppler.so.120.0.0 contains all the functions and symbols which are required by the tools linked against it. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 691a83f2374d85f834c24d3d82525bc554ad4f25 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri May 13 23:20:44 2022 +0200 libinih: Fix rootfile. Some tools of the xfsprogs are linked against libinih and therefore we need to ship those libs. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 0f3b6da86d3e239badea7c46aca05189a940b469 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri May 13 23:17:48 2022 +0200 liburcu: Fix rootfile. At least the xfsprogs is linked agains the urcu libraries and therefore requires them to run and deal with xfs filesystems. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org> commit e2f4f99e498a89157e85e8e4b983e61568956e9e Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri May 13 19:10:44 2022 +0200 update-ids-ruleset: Silent script if no providers settings file exists. Only try to read-in the providers settings file, in case it exists. Otherwise the script produces an error message, about the missing file, each time it gets executed. Because of the fcron job this would be twice a day in most cases. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ceb8b07b2cfedc5ec84576dd85db80bd83ce7ab1 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri May 13 18:55:48 2022 +0200 pango: Fix rootfile. The main libraries libpangocairo and libpangosoft2 accidently have been marked to be not shipped or part of the system. They are required by collecty and various other libraries or binaries. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/libinih | 4 +-- config/rootfiles/common/liburcu | 32 +++++++++++----------- config/rootfiles/common/pango | 4 +-- config/rootfiles/common/poppler | 2 +- .../{oldcore/163 => core/168}/filelists/liburcu | 0 src/scripts/update-ids-ruleset | 4 +-- 6 files changed, 23 insertions(+), 23 deletions(-) copy config/rootfiles/{oldcore/163 => core/168}/filelists/liburcu (100%) Difference in files: diff --git a/config/rootfiles/common/libinih b/config/rootfiles/common/libinih index c8a467edc..af22932dc 100644 --- a/config/rootfiles/common/libinih +++ b/config/rootfiles/common/libinih @@ -1,8 +1,8 @@ #usr/include/INIReader.h #usr/include/ini.h #usr/lib/libINIReader.so -#usr/lib/libINIReader.so.0 +usr/lib/libINIReader.so.0 #usr/lib/libinih.so -#usr/lib/libinih.so.0 +usr/lib/libinih.so.0 #usr/lib/pkgconfig/INIReader.pc #usr/lib/pkgconfig/inih.pc diff --git a/config/rootfiles/common/liburcu b/config/rootfiles/common/liburcu index f1de29d87..ab8cb0649 100644 --- a/config/rootfiles/common/liburcu +++ b/config/rootfiles/common/liburcu @@ -101,36 +101,36 @@ #usr/include/urcu/wfstack.h #usr/lib/liburcu-bp.la #usr/lib/liburcu-bp.so -#usr/lib/liburcu-bp.so.8 -#usr/lib/liburcu-bp.so.8.0.0 +usr/lib/liburcu-bp.so.8 +usr/lib/liburcu-bp.so.8.0.0 #usr/lib/liburcu-cds.la #usr/lib/liburcu-cds.so -#usr/lib/liburcu-cds.so.8 -#usr/lib/liburcu-cds.so.8.0.0 +usr/lib/liburcu-cds.so.8 +usr/lib/liburcu-cds.so.8.0.0 #usr/lib/liburcu-common.la #usr/lib/liburcu-common.so -#usr/lib/liburcu-common.so.8 -#usr/lib/liburcu-common.so.8.0.0 +usr/lib/liburcu-common.so.8 +usr/lib/liburcu-common.so.8.0.0 #usr/lib/liburcu-mb.la #usr/lib/liburcu-mb.so -#usr/lib/liburcu-mb.so.8 -#usr/lib/liburcu-mb.so.8.0.0 +usr/lib/liburcu-mb.so.8 +usr/lib/liburcu-mb.so.8.0.0 #usr/lib/liburcu-memb.la #usr/lib/liburcu-memb.so -#usr/lib/liburcu-memb.so.8 -#usr/lib/liburcu-memb.so.8.0.0 +usr/lib/liburcu-memb.so.8 +usr/lib/liburcu-memb.so.8.0.0 #usr/lib/liburcu-qsbr.la #usr/lib/liburcu-qsbr.so -#usr/lib/liburcu-qsbr.so.8 -#usr/lib/liburcu-qsbr.so.8.0.0 +usr/lib/liburcu-qsbr.so.8 +usr/lib/liburcu-qsbr.so.8.0.0 #usr/lib/liburcu-signal.la #usr/lib/liburcu-signal.so -#usr/lib/liburcu-signal.so.8 -#usr/lib/liburcu-signal.so.8.0.0 +usr/lib/liburcu-signal.so.8 +usr/lib/liburcu-signal.so.8.0.0 #usr/lib/liburcu.la #usr/lib/liburcu.so -#usr/lib/liburcu.so.8 -#usr/lib/liburcu.so.8.0.0 +usr/lib/liburcu.so.8 +usr/lib/liburcu.so.8.0.0 #usr/lib/pkgconfig/liburcu-bp.pc #usr/lib/pkgconfig/liburcu-cds.pc #usr/lib/pkgconfig/liburcu-mb.pc diff --git a/config/rootfiles/common/pango b/config/rootfiles/common/pango index fe3164613..1ca33d42b 100644 --- a/config/rootfiles/common/pango +++ b/config/rootfiles/common/pango @@ -44,10 +44,10 @@ usr/lib/libpango-1.0.so.0 usr/lib/libpango-1.0.so.0.5000.6 #usr/lib/libpangocairo-1.0.so usr/lib/libpangocairo-1.0.so.0 -#usr/lib/libpangocairo-1.0.so.0.5000.6 +usr/lib/libpangocairo-1.0.so.0.5000.6 #usr/lib/libpangoft2-1.0.so usr/lib/libpangoft2-1.0.so.0 -#usr/lib/libpangoft2-1.0.so.0.5000.6 +usr/lib/libpangoft2-1.0.so.0.5000.6 #usr/lib/pkgconfig/pango.pc #usr/lib/pkgconfig/pangocairo.pc #usr/lib/pkgconfig/pangofc.pc diff --git a/config/rootfiles/common/poppler b/config/rootfiles/common/poppler index 0ea058043..5c6f48e00 100644 --- a/config/rootfiles/common/poppler +++ b/config/rootfiles/common/poppler @@ -174,7 +174,7 @@ usr/lib/libpoppler-glib.so.8 usr/lib/libpoppler-glib.so.8.23.0 #usr/lib/libpoppler.so usr/lib/libpoppler.so.120 -#usr/lib/libpoppler.so.120.0.0 +usr/lib/libpoppler.so.120.0.0 #usr/lib/pkgconfig/poppler-cpp.pc #usr/lib/pkgconfig/poppler-glib.pc #usr/lib/pkgconfig/poppler.pc diff --git a/config/rootfiles/core/168/filelists/liburcu b/config/rootfiles/core/168/filelists/liburcu new file mode 120000 index 000000000..d19012e04 --- /dev/null +++ b/config/rootfiles/core/168/filelists/liburcu @@ -0,0 +1 @@ +../../../common/liburcu \ No newline at end of file diff --git a/src/scripts/update-ids-ruleset b/src/scripts/update-ids-ruleset index e9a082e62..553c1a1e1 100644 --- a/src/scripts/update-ids-ruleset +++ b/src/scripts/update-ids-ruleset @@ -95,8 +95,8 @@ if ($return) { # The script has requested a lock, so set locket to "1". $locked = "1"; -# Grab the configured providers. -&General::readhasharray("$IDS::providers_settings_file", \%providers); +# Grab the configured providers, if the providers settings file exists. +&General::readhasharray("$IDS::providers_settings_file", \%providers) if (-f "$IDS::providers_settings_file"); # Loop through the array of available providers. foreach my $id (keys %providers) { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bbd4767fcf3086800e96aa449c6fa526ad662288
by Peter Müller 16 May '22

16 May '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 bbd4767fcf3086800e96aa449c6fa526ad662288 (commit) via 4eb6ba2bd56029a8756d75b2a34c9fbe68650740 (commit) via 691a83f2374d85f834c24d3d82525bc554ad4f25 (commit) via 0f3b6da86d3e239badea7c46aca05189a940b469 (commit) from e2f4f99e498a89157e85e8e4b983e61568956e9e (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 bbd4767fcf3086800e96aa449c6fa526ad662288 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Mon May 16 07:12:23 2022 +0000 Core Update 168: Ship liburcu Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 4eb6ba2bd56029a8756d75b2a34c9fbe68650740 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri May 13 23:26:34 2022 +0200 poppler: Fix rootfile. libpoppler.so.120.0.0 contains all the functions and symbols which are required by the tools linked against it. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 691a83f2374d85f834c24d3d82525bc554ad4f25 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri May 13 23:20:44 2022 +0200 libinih: Fix rootfile. Some tools of the xfsprogs are linked against libinih and therefore we need to ship those libs. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 0f3b6da86d3e239badea7c46aca05189a940b469 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri May 13 23:17:48 2022 +0200 liburcu: Fix rootfile. At least the xfsprogs is linked agains the urcu libraries and therefore requires them to run and deal with xfs filesystems. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/libinih | 4 +-- config/rootfiles/common/liburcu | 32 +++++++++++----------- config/rootfiles/common/poppler | 2 +- .../{oldcore/163 => core/168}/filelists/liburcu | 0 4 files changed, 19 insertions(+), 19 deletions(-) copy config/rootfiles/{oldcore/163 => core/168}/filelists/liburcu (100%) Difference in files: diff --git a/config/rootfiles/common/libinih b/config/rootfiles/common/libinih index c8a467edc..af22932dc 100644 --- a/config/rootfiles/common/libinih +++ b/config/rootfiles/common/libinih @@ -1,8 +1,8 @@ #usr/include/INIReader.h #usr/include/ini.h #usr/lib/libINIReader.so -#usr/lib/libINIReader.so.0 +usr/lib/libINIReader.so.0 #usr/lib/libinih.so -#usr/lib/libinih.so.0 +usr/lib/libinih.so.0 #usr/lib/pkgconfig/INIReader.pc #usr/lib/pkgconfig/inih.pc diff --git a/config/rootfiles/common/liburcu b/config/rootfiles/common/liburcu index f1de29d87..ab8cb0649 100644 --- a/config/rootfiles/common/liburcu +++ b/config/rootfiles/common/liburcu @@ -101,36 +101,36 @@ #usr/include/urcu/wfstack.h #usr/lib/liburcu-bp.la #usr/lib/liburcu-bp.so -#usr/lib/liburcu-bp.so.8 -#usr/lib/liburcu-bp.so.8.0.0 +usr/lib/liburcu-bp.so.8 +usr/lib/liburcu-bp.so.8.0.0 #usr/lib/liburcu-cds.la #usr/lib/liburcu-cds.so -#usr/lib/liburcu-cds.so.8 -#usr/lib/liburcu-cds.so.8.0.0 +usr/lib/liburcu-cds.so.8 +usr/lib/liburcu-cds.so.8.0.0 #usr/lib/liburcu-common.la #usr/lib/liburcu-common.so -#usr/lib/liburcu-common.so.8 -#usr/lib/liburcu-common.so.8.0.0 +usr/lib/liburcu-common.so.8 +usr/lib/liburcu-common.so.8.0.0 #usr/lib/liburcu-mb.la #usr/lib/liburcu-mb.so -#usr/lib/liburcu-mb.so.8 -#usr/lib/liburcu-mb.so.8.0.0 +usr/lib/liburcu-mb.so.8 +usr/lib/liburcu-mb.so.8.0.0 #usr/lib/liburcu-memb.la #usr/lib/liburcu-memb.so -#usr/lib/liburcu-memb.so.8 -#usr/lib/liburcu-memb.so.8.0.0 +usr/lib/liburcu-memb.so.8 +usr/lib/liburcu-memb.so.8.0.0 #usr/lib/liburcu-qsbr.la #usr/lib/liburcu-qsbr.so -#usr/lib/liburcu-qsbr.so.8 -#usr/lib/liburcu-qsbr.so.8.0.0 +usr/lib/liburcu-qsbr.so.8 +usr/lib/liburcu-qsbr.so.8.0.0 #usr/lib/liburcu-signal.la #usr/lib/liburcu-signal.so -#usr/lib/liburcu-signal.so.8 -#usr/lib/liburcu-signal.so.8.0.0 +usr/lib/liburcu-signal.so.8 +usr/lib/liburcu-signal.so.8.0.0 #usr/lib/liburcu.la #usr/lib/liburcu.so -#usr/lib/liburcu.so.8 -#usr/lib/liburcu.so.8.0.0 +usr/lib/liburcu.so.8 +usr/lib/liburcu.so.8.0.0 #usr/lib/pkgconfig/liburcu-bp.pc #usr/lib/pkgconfig/liburcu-cds.pc #usr/lib/pkgconfig/liburcu-mb.pc diff --git a/config/rootfiles/common/poppler b/config/rootfiles/common/poppler index 0ea058043..5c6f48e00 100644 --- a/config/rootfiles/common/poppler +++ b/config/rootfiles/common/poppler @@ -174,7 +174,7 @@ usr/lib/libpoppler-glib.so.8 usr/lib/libpoppler-glib.so.8.23.0 #usr/lib/libpoppler.so usr/lib/libpoppler.so.120 -#usr/lib/libpoppler.so.120.0.0 +usr/lib/libpoppler.so.120.0.0 #usr/lib/pkgconfig/poppler-cpp.pc #usr/lib/pkgconfig/poppler-glib.pc #usr/lib/pkgconfig/poppler.pc diff --git a/config/rootfiles/core/168/filelists/liburcu b/config/rootfiles/core/168/filelists/liburcu new file mode 120000 index 000000000..d19012e04 --- /dev/null +++ b/config/rootfiles/core/168/filelists/liburcu @@ -0,0 +1 @@ +../../../common/liburcu \ No newline at end of file hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e2f4f99e498a89157e85e8e4b983e61568956e9e
by Michael Tremer 13 May '22

13 May '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 e2f4f99e498a89157e85e8e4b983e61568956e9e (commit) via ceb8b07b2cfedc5ec84576dd85db80bd83ce7ab1 (commit) from 9f42266a5957dd9da1f6eb68a8602429a3e993da (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 e2f4f99e498a89157e85e8e4b983e61568956e9e Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri May 13 19:10:44 2022 +0200 update-ids-ruleset: Silent script if no providers settings file exists. Only try to read-in the providers settings file, in case it exists. Otherwise the script produces an error message, about the missing file, each time it gets executed. Because of the fcron job this would be twice a day in most cases. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ceb8b07b2cfedc5ec84576dd85db80bd83ce7ab1 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri May 13 18:55:48 2022 +0200 pango: Fix rootfile. The main libraries libpangocairo and libpangosoft2 accidently have been marked to be not shipped or part of the system. They are required by collecty and various other libraries or binaries. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/pango | 4 ++-- src/scripts/update-ids-ruleset | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/rootfiles/common/pango b/config/rootfiles/common/pango index fe3164613..1ca33d42b 100644 --- a/config/rootfiles/common/pango +++ b/config/rootfiles/common/pango @@ -44,10 +44,10 @@ usr/lib/libpango-1.0.so.0 usr/lib/libpango-1.0.so.0.5000.6 #usr/lib/libpangocairo-1.0.so usr/lib/libpangocairo-1.0.so.0 -#usr/lib/libpangocairo-1.0.so.0.5000.6 +usr/lib/libpangocairo-1.0.so.0.5000.6 #usr/lib/libpangoft2-1.0.so usr/lib/libpangoft2-1.0.so.0 -#usr/lib/libpangoft2-1.0.so.0.5000.6 +usr/lib/libpangoft2-1.0.so.0.5000.6 #usr/lib/pkgconfig/pango.pc #usr/lib/pkgconfig/pangocairo.pc #usr/lib/pkgconfig/pangofc.pc diff --git a/src/scripts/update-ids-ruleset b/src/scripts/update-ids-ruleset index e9a082e62..553c1a1e1 100644 --- a/src/scripts/update-ids-ruleset +++ b/src/scripts/update-ids-ruleset @@ -95,8 +95,8 @@ if ($return) { # The script has requested a lock, so set locket to "1". $locked = "1"; -# Grab the configured providers. -&General::readhasharray("$IDS::providers_settings_file", \%providers); +# Grab the configured providers, if the providers settings file exists. +&General::readhasharray("$IDS::providers_settings_file", \%providers) if (-f "$IDS::providers_settings_file"); # Loop through the array of available providers. foreach my $id (keys %providers) { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 9f42266a5957dd9da1f6eb68a8602429a3e993da
by Michael Tremer 13 May '22

13 May '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, master has been updated via 9f42266a5957dd9da1f6eb68a8602429a3e993da (commit) via 8615d42ce7d77016aed51ea0528119f38e589e5d (commit) via 27d1dc083ecc49cd11f57b975f8daf599eb436f4 (commit) via b074ebd6ad688124d5dfdcc2ed614040553afd7e (commit) via 1ad192722a9ecd0b0f0afc008da020b9534e57d6 (commit) via 675849974918df21c717c26bf6e974fa2f9d7f67 (commit) from 91f1aaaa869df6fe9a04d3aefb36f021e9945ad7 (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 9f42266a5957dd9da1f6eb68a8602429a3e993da Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Fri May 13 09:22:35 2022 +0000 strongswan: Update rootfile Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 8615d42ce7d77016aed51ea0528119f38e589e5d Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri May 13 06:30:57 2022 +0200 expat: Fix rootfile. The libexpat.so.1 file is just a symlink to libexpat.so.1.8.8 which contains all the functions and symbols required by the binaries, linked against it. Therefore this file needs to be present on the systems. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> commit 27d1dc083ecc49cd11f57b975f8daf599eb436f4 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu May 12 18:06:59 2022 +0000 Core Update 168: Ship and restart strongSwan Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit b074ebd6ad688124d5dfdcc2ed614040553afd7e Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu May 12 18:04:52 2022 +0000 strongSwan: Update to 5.9.6 See: https://github.com/strongswan/strongswan/releases/tag/5.9.6 Since this addresses security issues, and also with regards to reports such as https://community.ipfire.org/t/core-update-167-ipsec-issue/7893, I take the liberty to push this straight into Core Update 168. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 1ad192722a9ecd0b0f0afc008da020b9534e57d6 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu May 12 17:53:50 2022 +0000 intel-microcode: Update to 20220510 Please refer to https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/release… for further details. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 675849974918df21c717c26bf6e974fa2f9d7f67 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu May 12 17:27:34 2022 +0000 Core Update 168: Ship core-files https://community.ipfire.org/t/core-168-testing-working/7901/7 Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/expat | 2 +- config/rootfiles/common/strongswan | 3 +++ config/rootfiles/core/168/{ => filelists}/core-files | 0 config/rootfiles/{oldcore/106 => core/168}/filelists/strongswan | 0 config/rootfiles/core/168/update.sh | 4 ++++ lfs/intel-microcode | 4 ++-- lfs/strongswan | 4 ++-- 7 files changed, 12 insertions(+), 5 deletions(-) copy config/rootfiles/core/168/{ => filelists}/core-files (100%) copy config/rootfiles/{oldcore/106 => core/168}/filelists/strongswan (100%) Difference in files: diff --git a/config/rootfiles/common/expat b/config/rootfiles/common/expat index 3911aa90b..69b3fbfe6 100644 --- a/config/rootfiles/common/expat +++ b/config/rootfiles/common/expat @@ -10,7 +10,7 @@ #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.8 #usr/lib/pkgconfig/expat.pc #usr/share/doc/expat #usr/share/doc/expat-2.4.8 diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan index ff363f08c..e9d84808a 100644 --- a/config/rootfiles/common/strongswan +++ b/config/rootfiles/common/strongswan @@ -40,6 +40,7 @@ etc/strongswan.d/charon/gcm.conf etc/strongswan.d/charon/gcrypt.conf etc/strongswan.d/charon/gmp.conf etc/strongswan.d/charon/hmac.conf +etc/strongswan.d/charon/kdf.conf etc/strongswan.d/charon/kernel-netlink.conf etc/strongswan.d/charon/md5.conf etc/strongswan.d/charon/mgf1.conf @@ -137,6 +138,7 @@ usr/lib/ipsec/plugins/libstrongswan-gcm.so usr/lib/ipsec/plugins/libstrongswan-gcrypt.so usr/lib/ipsec/plugins/libstrongswan-gmp.so usr/lib/ipsec/plugins/libstrongswan-hmac.so +usr/lib/ipsec/plugins/libstrongswan-kdf.so usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.so usr/lib/ipsec/plugins/libstrongswan-md5.so usr/lib/ipsec/plugins/libstrongswan-mgf1.so @@ -225,6 +227,7 @@ usr/sbin/swanctl #usr/share/strongswan/templates/config/plugins/gcrypt.conf #usr/share/strongswan/templates/config/plugins/gmp.conf #usr/share/strongswan/templates/config/plugins/hmac.conf +#usr/share/strongswan/templates/config/plugins/kdf.conf #usr/share/strongswan/templates/config/plugins/kernel-netlink.conf #usr/share/strongswan/templates/config/plugins/md5.conf #usr/share/strongswan/templates/config/plugins/mgf1.conf diff --git a/config/rootfiles/core/168/filelists/core-files b/config/rootfiles/core/168/filelists/core-files new file mode 100644 index 000000000..0dec37e53 --- /dev/null +++ b/config/rootfiles/core/168/filelists/core-files @@ -0,0 +1,5 @@ +etc/system-release +etc/issue +etc/os-release +srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/langs diff --git a/config/rootfiles/core/168/filelists/strongswan b/config/rootfiles/core/168/filelists/strongswan new file mode 120000 index 000000000..90c727e26 --- /dev/null +++ b/config/rootfiles/core/168/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/168/update.sh b/config/rootfiles/core/168/update.sh index d21f648dd..e11e08b7f 100644 --- a/config/rootfiles/core/168/update.sh +++ b/config/rootfiles/core/168/update.sh @@ -32,6 +32,7 @@ for (( i=1; i<=$core; i++ )); do done # Stop services +/etc/init.d/ipsec stop /etc/init.d/squid stop /usr/local/bin/openvpnctrl -k /usr/local/bin/openvpnctrl -kn2n @@ -128,6 +129,9 @@ esac /usr/local/bin/openvpnctrl -s /usr/local/bin/openvpnctrl -sn2n /etc/init.d/suricata start +if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then + /etc/init.d/ipsec start +fi # This update needs a reboot... touch /var/run/need_reboot diff --git a/lfs/intel-microcode b/lfs/intel-microcode index 73ccb4623..34dfe901e 100644 --- a/lfs/intel-microcode +++ b/lfs/intel-microcode @@ -24,7 +24,7 @@ include Config -VER = 20220419 +VER = 20220510 THISAPP = Intel-Linux-Processor-Microcode-Data-Files-microcode-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 69d296efad5329324a47640eace5d1a10e38b85cb8b7ac5baa9f14c40391ff809ae17cb7814f99f2e43910fe4c4b02dc77ffea7bb5f2b58069b2c17029e9f76a +$(DL_FILE)_BLAKE2 = 5f8c238b00970ddda132dbcf9059df759bb768e1eb2fe0b9912ffe69cf9a6104b32ea816e7574660ea74e3d08af1aa45cc46b5f38d0b315e6e466d8ca466f37d install : $(TARGET) diff --git a/lfs/strongswan b/lfs/strongswan index ae1be29f4..a32c103d7 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -24,7 +24,7 @@ include Config -VER = 5.9.5 +VER = 5.9.6 THISAPP = strongswan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 8b3adc44d5f5eb3824845ce9eda75e7b75f0f7394fbe84f827f4a8177e5299ca7170103ee6cd76e1e18aef85d7f124a43a505ceaf41ec4ed575eb214ebb6af21 +$(DL_FILE)_BLAKE2 = 4021a10611e66f9e2e4e432bdfb9de0f94d27ba1be1b7d4e4b8bf3cd797c123658993e60eb3d49c424b479558e9581bb069a345a70f55850d1faf5abaa401246 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM May 2022