IPFire-SCM December 2023

ipfire-scm@lists.ipfire.org

1 participants
33 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1604674b51373aa592d6f353f8ccf5fef61be80a
by Michael Tremer 20 Dec '23

20 Dec '23

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 1604674b51373aa592d6f353f8ccf5fef61be80a (commit) via cdbaf83bb6e4a932899ce2cb256a3a57cfc1f70c (commit) via 276fe09afc6496979291c2f2fd87ae98aadc058e (commit) from 73b04029c9761944e404da9c20fda6483049d459 (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 1604674b51373aa592d6f353f8ccf5fef61be80a Merge: 73b04029c cdbaf83bb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Dec 20 10:58:13 2023 +0000 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/oldcore/182/filelists/files | 1 + lfs/squid | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/oldcore/182/filelists/files b/config/rootfiles/oldcore/182/filelists/files index fa692030b..72c12c5ca 100644 --- a/config/rootfiles/oldcore/182/filelists/files +++ b/config/rootfiles/oldcore/182/filelists/files @@ -250,3 +250,4 @@ lib/firmware/rtw89/rtw8852b_fw-1.bin srv/web/ipfire/cgi-bin/connections.cgi srv/web/ipfire/cgi-bin/dhcp.cgi srv/web/ipfire/cgi-bin/tor.cgi +usr/lib/libgcc_s.so.1 diff --git a/lfs/squid b/lfs/squid index d92341794..c0f465c16 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 6.5 +VER = 6.6 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 91ed91f9b0f56f440a7f15a63bbc3e19537b60bc8b31b5bf7e16884367d0da060c5490e1721dbd7c5fce7f4a4e958fb3554d6bdc5b55f568598f907722b651de +$(DL_FILE)_BLAKE2 = 7c3c96f5cd5f819f6f020fb3e63ee8d9bb26b7fb4ff4405d7963a643c6766344e6492505bc1b33f3040ad800b3d7a3ad6a4b067b031ac4d178ddcac04c6e74dc install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. cdbaf83bb6e4a932899ce2cb256a3a57cfc1f70c
by Michael Tremer 20 Dec '23

20 Dec '23

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 cdbaf83bb6e4a932899ce2cb256a3a57cfc1f70c (commit) from 276fe09afc6496979291c2f2fd87ae98aadc058e (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 cdbaf83bb6e4a932899ce2cb256a3a57cfc1f70c Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Dec 9 08:56:58 2023 +0100 squid: Update to 6.6 For details see: https://github.com/squid-cache/squid/commits/v6 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/squid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/lfs/squid b/lfs/squid index d92341794..c0f465c16 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 6.5 +VER = 6.6 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 91ed91f9b0f56f440a7f15a63bbc3e19537b60bc8b31b5bf7e16884367d0da060c5490e1721dbd7c5fce7f4a4e958fb3554d6bdc5b55f568598f907722b651de +$(DL_FILE)_BLAKE2 = 7c3c96f5cd5f819f6f020fb3e63ee8d9bb26b7fb4ff4405d7963a643c6766344e6492505bc1b33f3040ad800b3d7a3ad6a4b067b031ac4d178ddcac04c6e74dc install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 276fe09afc6496979291c2f2fd87ae98aadc058e
by Arne Fitzenreiter 20 Dec '23

20 Dec '23

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 73b04029c9761944e404da9c20fda6483049d459
by Arne Fitzenreiter 20 Dec '23

20 Dec '23

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 73b04029c9761944e404da9c20fda6483049d459 (commit) from 0348f6b23f98b2e6109241b0d97424a676cde560 (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 73b04029c9761944e404da9c20fda6483049d459 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Dec 20 08:44:10 2023 +0100 dracut: fix early_microcode put into ramdisk the kernel has no CONFIG_MICROCODE_{AMD|INTEL} anymore so this patch change the check to CONFIG_MICROCODE. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../{oldcore/167 => core/183}/filelists/dracut | 0 lfs/dracut | 1 + ...ut-056-fix_early_microcode_for_kernel_6.6.patch | 30 ++++++++++++++++++++++ 3 files changed, 31 insertions(+) copy config/rootfiles/{oldcore/167 => core/183}/filelists/dracut (100%) create mode 100644 src/patches/dracut/dracut-056-fix_early_microcode_for_kernel_6.6.patch Difference in files: diff --git a/config/rootfiles/core/183/filelists/dracut b/config/rootfiles/core/183/filelists/dracut new file mode 120000 index 000000000..160869946 --- /dev/null +++ b/config/rootfiles/core/183/filelists/dracut @@ -0,0 +1 @@ +../../../common/dracut \ No newline at end of file diff --git a/lfs/dracut b/lfs/dracut index cf8cd5cb5..de48ae61f 100644 --- a/lfs/dracut +++ b/lfs/dracut @@ -73,6 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # https://bugzilla.ipfire.org/show_bug.cgi?id=12842 cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dracut-059-fix-e2fsck-call.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dracut/dracut-056-fix_early_microcode_for_kernel_6.6.patch cd $(DIR_APP) && ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc cd $(DIR_APP) && make $(MAKETUNING) diff --git a/src/patches/dracut/dracut-056-fix_early_microcode_for_kernel_6.6.patch b/src/patches/dracut/dracut-056-fix_early_microcode_for_kernel_6.6.patch new file mode 100644 index 000000000..dc9e7c3e9 --- /dev/null +++ b/src/patches/dracut/dracut-056-fix_early_microcode_for_kernel_6.6.patch @@ -0,0 +1,30 @@ +diff -Naur dracut-056.prg/dracut.sh dracut-056/dracut.sh +--- dracut-056.prg/dracut.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/dracut.sh 2023-12-19 23:30:27.720703043 +0100 +@@ -1385,22 +1385,21 @@ + if [[ $early_microcode == yes ]]; then + if [[ $hostonly ]]; then + if [[ $(get_cpu_vendor) == "AMD" ]]; then +- check_kernel_config CONFIG_MICROCODE_AMD || unset early_microcode ++ check_kernel_config CONFIG_MICROCODE || unset early_microcode + elif [[ $(get_cpu_vendor) == "Intel" ]]; then +- check_kernel_config CONFIG_MICROCODE_INTEL || unset early_microcode ++ check_kernel_config CONFIG_MICROCODE || unset early_microcode + else + unset early_microcode + fi + else +- ! check_kernel_config CONFIG_MICROCODE_AMD \ +- && ! check_kernel_config CONFIG_MICROCODE_INTEL \ ++ ! check_kernel_config CONFIG_MICROCODE \ + && unset early_microcode + fi + # Do not complain on non-x86 architectures as it makes no sense + case $(uname -m) in + x86_64 | i?86) + [[ $early_microcode != yes ]] \ +- && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y" ++ && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE!=y" + ;; + *) ;; + esac hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0348f6b23f98b2e6109241b0d97424a676cde560
by Arne Fitzenreiter 19 Dec '23

19 Dec '23

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 0348f6b23f98b2e6109241b0d97424a676cde560 (commit) via d3b2b04672209aa5971e69d99c4fa64da875a370 (commit) via 6c85ffbfd45a3c2f23e6b8f512c40cf9b0678d86 (commit) via cb58d049e0e121466fb2eb0694fa7b8e715b6f2c (commit) via 8064dce996a356e228be5fdd900a6733df3f47b7 (commit) via 1513ac881469b8ecf6421d589f4aca1d0130c86c (commit) via 71070690da3fa83c1f948c2c577cb9e171078da9 (commit) via 633c7318279d99e98e8cdf077c4f3ab922744212 (commit) via d7d963ed862b2c607dbb43a037f24c075896e378 (commit) via 3931b56d765904ba0a1ef2b857f861374f9d53f9 (commit) via 19471f2951ae48e28a3ab331d4d370488a371dba (commit) via 84f8640da0f2550a9b2a35299a0dd5d7059c4d19 (commit) via ece94c7edfa45b724ef05b57ff7a8a18c43fb99b (commit) from 010869713142e1cc8874e59409e446a075a2878d (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 0348f6b23f98b2e6109241b0d97424a676cde560 Merge: 010869713 d3b2b0467 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Dec 19 17:55:21 2023 +0100 Merge remote-tracking branch 'origin/master' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/oldcore/182/update.sh | 9 +- config/rootfiles/packages/alsa | 166 ++++++++++++++++----------------- lfs/alsa | 2 +- src/initscripts/packages/alsa | 8 +- src/paks/alsa/uninstall.sh | 3 - 5 files changed, 89 insertions(+), 99 deletions(-) Difference in files: diff --git a/config/rootfiles/oldcore/182/update.sh b/config/rootfiles/oldcore/182/update.sh index dc961f1e3..e906a8c60 100644 --- a/config/rootfiles/oldcore/182/update.sh +++ b/config/rootfiles/oldcore/182/update.sh @@ -54,19 +54,12 @@ rm -rvf \ /lib/firmware/cxgb4/t6fw-1.27.3* \ /lib/firmware/ctefx.bin \ /lib/firmware/ctspeq.bin \ - /lib/firmware/ess \ /lib/firmware/intel/ibt-* \ - /lib/firmware/korg \ /lib/firmware/mediatek/BT_RAM_CODE_* \ /lib/firmware/nxp \ - /lib/firmware/sb16 \ - /lib/firmware/yamaha \ /lib/udev/rules.d/64-xfs.rules \ /usr/bin/gawk-5.2* \ - /usr/lib/grub/{arm64-efi,i386-pc,riscv64-efi,x86_64-efi}/gmodule.pl \ - /usr/lib/liblzma.so.5.4* \ - /usr/lib/libqpdf.so.29.5* \ - /usr/lib/libsodium.so.23* + /usr/lib/grub/{arm64-efi,i386-pc,riscv64-efi,x86_64-efi}/gmodule.pl # update linker config ldconfig diff --git a/config/rootfiles/packages/alsa b/config/rootfiles/packages/alsa index a18368e4a..a04de0db4 100644 --- a/config/rootfiles/packages/alsa +++ b/config/rootfiles/packages/alsa @@ -17,8 +17,8 @@ lib/firmware/cs46xx/cwcdma lib/firmware/cs46xx/cwcsnoop lib/firmware/ctefx-desktop.bin lib/firmware/ctefx-r3di.bin -#lib/firmware/ctefx.bin -#lib/firmware/ctspeq.bin +lib/firmware/ctefx.bin +lib/firmware/ctspeq.bin lib/firmware/digiface_firmware.bin lib/firmware/digiface_firmware_rev11.bin #lib/firmware/ea @@ -59,10 +59,10 @@ lib/firmware/emu/emu1010b.fw lib/firmware/emu/hana.fw lib/firmware/emu/micro_dock.fw #lib/firmware/ess -#lib/firmware/ess/maestro3_assp_kernel.fw -#lib/firmware/ess/maestro3_assp_minisrc.fw +lib/firmware/ess/maestro3_assp_kernel.fw +lib/firmware/ess/maestro3_assp_minisrc.fw #lib/firmware/korg -#lib/firmware/korg/k1212.dsp +lib/firmware/korg/k1212.dsp #lib/firmware/mixart lib/firmware/mixart/miXart8.elf lib/firmware/mixart/miXart8.xlx @@ -94,11 +94,11 @@ lib/firmware/pcxhr/xlxc924.dat lib/firmware/pcxhr/xlxint.dat lib/firmware/rpm_firmware.bin #lib/firmware/sb16 -#lib/firmware/sb16/alaw_main.csp -#lib/firmware/sb16/ima_adpcm_capture.csp -#lib/firmware/sb16/ima_adpcm_init.csp -#lib/firmware/sb16/ima_adpcm_playback.csp -#lib/firmware/sb16/mulaw_main.csp +lib/firmware/sb16/alaw_main.csp +lib/firmware/sb16/ima_adpcm_capture.csp +lib/firmware/sb16/ima_adpcm_init.csp +lib/firmware/sb16/ima_adpcm_playback.csp +lib/firmware/sb16/mulaw_main.csp #lib/firmware/turtlebeach lib/firmware/turtlebeach/msndinit.bin lib/firmware/turtlebeach/msndperm.bin @@ -119,11 +119,11 @@ lib/firmware/vx/x1_1_vx2.xlx lib/firmware/vx/x1_1_vxp.xlx lib/firmware/vx/x1_2_v22.xlx #lib/firmware/yamaha -#lib/firmware/yamaha/ds1_ctrl.fw -#lib/firmware/yamaha/ds1_dsp.fw -#lib/firmware/yamaha/ds1e_ctrl.fw -#lib/firmware/yamaha/yss225_registers.bin -#lib/udev/rules.d/90-alsa-restore.rules +lib/firmware/yamaha/ds1_ctrl.fw +lib/firmware/yamaha/ds1_dsp.fw +lib/firmware/yamaha/ds1e_ctrl.fw +lib/firmware/yamaha/yss225_registers.bin +lib/udev/rules.d/90-alsa-restore.rules usr/bin/aconnect usr/bin/alsabat usr/bin/alsaloop @@ -212,78 +212,78 @@ usr/lib/libatopology.so.2.0.0 usr/local/share/alsa #usr/local/share/alsa/firmware #usr/local/share/alsa/firmware/hdsploader -#usr/local/share/alsa/firmware/hdsploader/digiface_firmware.bin -#usr/local/share/alsa/firmware/hdsploader/digiface_firmware_rev11.bin -#usr/local/share/alsa/firmware/hdsploader/multiface_firmware.bin -#usr/local/share/alsa/firmware/hdsploader/multiface_firmware_rev11.bin -#usr/local/share/alsa/firmware/hdsploader/rpm_firmware.bin +usr/local/share/alsa/firmware/hdsploader/digiface_firmware.bin +usr/local/share/alsa/firmware/hdsploader/digiface_firmware_rev11.bin +usr/local/share/alsa/firmware/hdsploader/multiface_firmware.bin +usr/local/share/alsa/firmware/hdsploader/multiface_firmware_rev11.bin +usr/local/share/alsa/firmware/hdsploader/rpm_firmware.bin #usr/local/share/alsa/firmware/mixartloader -#usr/local/share/alsa/firmware/mixartloader/miXart.conf -#usr/local/share/alsa/firmware/mixartloader/miXart8.elf -#usr/local/share/alsa/firmware/mixartloader/miXart8.xlx -#usr/local/share/alsa/firmware/mixartloader/miXart8AES.xlx +usr/local/share/alsa/firmware/mixartloader/miXart.conf +usr/local/share/alsa/firmware/mixartloader/miXart8.elf +usr/local/share/alsa/firmware/mixartloader/miXart8.xlx +usr/local/share/alsa/firmware/mixartloader/miXart8AES.xlx #usr/local/share/alsa/firmware/pcxhrloader -#usr/local/share/alsa/firmware/pcxhrloader/b321_512.b56 -#usr/local/share/alsa/firmware/pcxhrloader/d321_512.d56 -#usr/local/share/alsa/firmware/pcxhrloader/dspb1222e.b56 -#usr/local/share/alsa/firmware/pcxhrloader/dspb1222hr.b56 -#usr/local/share/alsa/firmware/pcxhrloader/dspb882e.b56 -#usr/local/share/alsa/firmware/pcxhrloader/dspb882hr.b56 -#usr/local/share/alsa/firmware/pcxhrloader/dspb924.b56 -#usr/local/share/alsa/firmware/pcxhrloader/dspd1222.d56 -#usr/local/share/alsa/firmware/pcxhrloader/dspd222.d56 -#usr/local/share/alsa/firmware/pcxhrloader/dspd882.d56 -#usr/local/share/alsa/firmware/pcxhrloader/dspe882.e56 -#usr/local/share/alsa/firmware/pcxhrloader/dspe924.e56 -#usr/local/share/alsa/firmware/pcxhrloader/e321_512.e56 -#usr/local/share/alsa/firmware/pcxhrloader/pcxhr.conf -#usr/local/share/alsa/firmware/pcxhrloader/pcxhr0.conf -#usr/local/share/alsa/firmware/pcxhrloader/pcxhr1.conf -#usr/local/share/alsa/firmware/pcxhrloader/pcxhr2.conf -#usr/local/share/alsa/firmware/pcxhrloader/pcxhr3.conf -#usr/local/share/alsa/firmware/pcxhrloader/pcxhr4.conf -#usr/local/share/alsa/firmware/pcxhrloader/pcxhr5.conf -#usr/local/share/alsa/firmware/pcxhrloader/xc_1_882.dat -#usr/local/share/alsa/firmware/pcxhrloader/xi_1_882.dat -#usr/local/share/alsa/firmware/pcxhrloader/xlxc1222e.dat -#usr/local/share/alsa/firmware/pcxhrloader/xlxc1222hr.dat -#usr/local/share/alsa/firmware/pcxhrloader/xlxc222.dat -#usr/local/share/alsa/firmware/pcxhrloader/xlxc882e.dat -#usr/local/share/alsa/firmware/pcxhrloader/xlxc882hr.dat -#usr/local/share/alsa/firmware/pcxhrloader/xlxc924.dat -#usr/local/share/alsa/firmware/pcxhrloader/xlxint.dat +usr/local/share/alsa/firmware/pcxhrloader/b321_512.b56 +usr/local/share/alsa/firmware/pcxhrloader/d321_512.d56 +usr/local/share/alsa/firmware/pcxhrloader/dspb1222e.b56 +usr/local/share/alsa/firmware/pcxhrloader/dspb1222hr.b56 +usr/local/share/alsa/firmware/pcxhrloader/dspb882e.b56 +usr/local/share/alsa/firmware/pcxhrloader/dspb882hr.b56 +usr/local/share/alsa/firmware/pcxhrloader/dspb924.b56 +usr/local/share/alsa/firmware/pcxhrloader/dspd1222.d56 +usr/local/share/alsa/firmware/pcxhrloader/dspd222.d56 +usr/local/share/alsa/firmware/pcxhrloader/dspd882.d56 +usr/local/share/alsa/firmware/pcxhrloader/dspe882.e56 +usr/local/share/alsa/firmware/pcxhrloader/dspe924.e56 +usr/local/share/alsa/firmware/pcxhrloader/e321_512.e56 +usr/local/share/alsa/firmware/pcxhrloader/pcxhr.conf +usr/local/share/alsa/firmware/pcxhrloader/pcxhr0.conf +usr/local/share/alsa/firmware/pcxhrloader/pcxhr1.conf +usr/local/share/alsa/firmware/pcxhrloader/pcxhr2.conf +usr/local/share/alsa/firmware/pcxhrloader/pcxhr3.conf +usr/local/share/alsa/firmware/pcxhrloader/pcxhr4.conf +usr/local/share/alsa/firmware/pcxhrloader/pcxhr5.conf +usr/local/share/alsa/firmware/pcxhrloader/xc_1_882.dat +usr/local/share/alsa/firmware/pcxhrloader/xi_1_882.dat +usr/local/share/alsa/firmware/pcxhrloader/xlxc1222e.dat +usr/local/share/alsa/firmware/pcxhrloader/xlxc1222hr.dat +usr/local/share/alsa/firmware/pcxhrloader/xlxc222.dat +usr/local/share/alsa/firmware/pcxhrloader/xlxc882e.dat +usr/local/share/alsa/firmware/pcxhrloader/xlxc882hr.dat +usr/local/share/alsa/firmware/pcxhrloader/xlxc924.dat +usr/local/share/alsa/firmware/pcxhrloader/xlxint.dat #usr/local/share/alsa/firmware/usx2yloader -#usr/local/share/alsa/firmware/usx2yloader/tascam_loader.ihx -#usr/local/share/alsa/firmware/usx2yloader/us122.conf -#usr/local/share/alsa/firmware/usx2yloader/us122.prepad -#usr/local/share/alsa/firmware/usx2yloader/us122.rbt -#usr/local/share/alsa/firmware/usx2yloader/us122fw.ihx -#usr/local/share/alsa/firmware/usx2yloader/us224.conf -#usr/local/share/alsa/firmware/usx2yloader/us224.prepad -#usr/local/share/alsa/firmware/usx2yloader/us224.rbt -#usr/local/share/alsa/firmware/usx2yloader/us224fw.ihx -#usr/local/share/alsa/firmware/usx2yloader/us428.conf -#usr/local/share/alsa/firmware/usx2yloader/us428.prepad -#usr/local/share/alsa/firmware/usx2yloader/us428.rbt -#usr/local/share/alsa/firmware/usx2yloader/us428fw.ihx +usr/local/share/alsa/firmware/usx2yloader/tascam_loader.ihx +usr/local/share/alsa/firmware/usx2yloader/us122.conf +usr/local/share/alsa/firmware/usx2yloader/us122.prepad +usr/local/share/alsa/firmware/usx2yloader/us122.rbt +usr/local/share/alsa/firmware/usx2yloader/us122fw.ihx +usr/local/share/alsa/firmware/usx2yloader/us224.conf +usr/local/share/alsa/firmware/usx2yloader/us224.prepad +usr/local/share/alsa/firmware/usx2yloader/us224.rbt +usr/local/share/alsa/firmware/usx2yloader/us224fw.ihx +usr/local/share/alsa/firmware/usx2yloader/us428.conf +usr/local/share/alsa/firmware/usx2yloader/us428.prepad +usr/local/share/alsa/firmware/usx2yloader/us428.rbt +usr/local/share/alsa/firmware/usx2yloader/us428fw.ihx #usr/local/share/alsa/firmware/vxloader -#usr/local/share/alsa/firmware/vxloader/bd56002.boot -#usr/local/share/alsa/firmware/vxloader/bd563s3.boot -#usr/local/share/alsa/firmware/vxloader/bd563v2.boot -#usr/local/share/alsa/firmware/vxloader/bx_1_vp4.b56 -#usr/local/share/alsa/firmware/vxloader/bx_1_vxp.b56 -#usr/local/share/alsa/firmware/vxloader/l_1_v22.d56 -#usr/local/share/alsa/firmware/vxloader/l_1_vp4.d56 -#usr/local/share/alsa/firmware/vxloader/l_1_vx2.d56 -#usr/local/share/alsa/firmware/vxloader/l_1_vxp.d56 -#usr/local/share/alsa/firmware/vxloader/vx222.conf -#usr/local/share/alsa/firmware/vxloader/vxboard.conf -#usr/local/share/alsa/firmware/vxloader/vxp440.conf -#usr/local/share/alsa/firmware/vxloader/vxpocket.conf -#usr/local/share/alsa/firmware/vxloader/x1_1_vp4.rbt -#usr/local/share/alsa/firmware/vxloader/x1_1_vx2.rbt -#usr/local/share/alsa/firmware/vxloader/x1_1_vxp.rbt -#usr/local/share/alsa/firmware/vxloader/x1_2_v22.rbt +usr/local/share/alsa/firmware/vxloader/bd56002.boot +usr/local/share/alsa/firmware/vxloader/bd563s3.boot +usr/local/share/alsa/firmware/vxloader/bd563v2.boot +usr/local/share/alsa/firmware/vxloader/bx_1_vp4.b56 +usr/local/share/alsa/firmware/vxloader/bx_1_vxp.b56 +usr/local/share/alsa/firmware/vxloader/l_1_v22.d56 +usr/local/share/alsa/firmware/vxloader/l_1_vp4.d56 +usr/local/share/alsa/firmware/vxloader/l_1_vx2.d56 +usr/local/share/alsa/firmware/vxloader/l_1_vxp.d56 +usr/local/share/alsa/firmware/vxloader/vx222.conf +usr/local/share/alsa/firmware/vxloader/vxboard.conf +usr/local/share/alsa/firmware/vxloader/vxp440.conf +usr/local/share/alsa/firmware/vxloader/vxpocket.conf +usr/local/share/alsa/firmware/vxloader/x1_1_vp4.rbt +usr/local/share/alsa/firmware/vxloader/x1_1_vx2.rbt +usr/local/share/alsa/firmware/vxloader/x1_1_vxp.rbt +usr/local/share/alsa/firmware/vxloader/x1_2_v22.rbt usr/sbin/alsa-info.sh usr/sbin/alsabat-test.sh usr/sbin/alsaconf diff --git a/lfs/alsa b/lfs/alsa index a0a517ed8..55b4f7152 100644 --- a/lfs/alsa +++ b/lfs/alsa @@ -38,7 +38,7 @@ DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) PROG = alsa -PAK_VER = 18 +PAK_VER = 20 DEPS = diff --git a/src/initscripts/packages/alsa b/src/initscripts/packages/alsa index 348e33846..8c0a2cbd2 100644 --- a/src/initscripts/packages/alsa +++ b/src/initscripts/packages/alsa @@ -24,12 +24,12 @@ case "$1" in start) + modprobe snd_pcm_oss >/dev/null 2>&1 + modprobe snd_mixer_oss >/dev/null 2>&1 boot_mesg "Starting ALSA... Restoring volumes..." - modprobe snd_pcm_oss >/dev/null 2>&1 || failed=1 - modprobe snd_mixer_oss >/dev/null 2>&1 || failed=1 - (exit ${failed}) - evaluate_retval loadproc /usr/sbin/alsactl restore + evaluate_retval + exit 0 ;; stop) boot_mesg "Stopping ALSA... Saving volumes..." diff --git a/src/paks/alsa/uninstall.sh b/src/paks/alsa/uninstall.sh index ce88c294b..a02e2bbf9 100644 --- a/src/paks/alsa/uninstall.sh +++ b/src/paks/alsa/uninstall.sh @@ -24,9 +24,6 @@ . /opt/pakfire/lib/functions.sh stop_service ${NAME} make_backup ${NAME} -# unload alsa related modules -modprobe -r snd_pcm_oss >/dev/null 2>&1 || failed=1 -modprobe -r snd_timer >/dev/null 2>&1 || failed=1 remove_files rm -rf /etc/rc.d/rc*.d/*alsa exit 0 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. d3b2b04672209aa5971e69d99c4fa64da875a370
by Arne Fitzenreiter 19 Dec '23

19 Dec '23

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 d3b2b04672209aa5971e69d99c4fa64da875a370 (commit) via 6c85ffbfd45a3c2f23e6b8f512c40cf9b0678d86 (commit) via cb58d049e0e121466fb2eb0694fa7b8e715b6f2c (commit) from 8064dce996a356e228be5fdd900a6733df3f47b7 (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 d3b2b04672209aa5971e69d99c4fa64da875a370 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Dec 19 11:45:26 2023 +0100 alsa: bump package version Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 6c85ffbfd45a3c2f23e6b8f512c40cf9b0678d86 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Dec 19 11:44:03 2023 +0100 alsa: remove kernel module unload at uninstall this sometimes result in unstable/crashing kernel. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit cb58d049e0e121466fb2eb0694fa7b8e715b6f2c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Dec 19 11:35:53 2023 +0100 alsa: don't report failed module loads this will stop pakfire if the kernel was updated before the alsa update. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/alsa | 2 +- src/initscripts/packages/alsa | 8 ++++---- src/paks/alsa/uninstall.sh | 3 --- 3 files changed, 5 insertions(+), 8 deletions(-) Difference in files: diff --git a/lfs/alsa b/lfs/alsa index a2b34f83e..55b4f7152 100644 --- a/lfs/alsa +++ b/lfs/alsa @@ -38,7 +38,7 @@ DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) PROG = alsa -PAK_VER = 19 +PAK_VER = 20 DEPS = diff --git a/src/initscripts/packages/alsa b/src/initscripts/packages/alsa index 348e33846..8c0a2cbd2 100644 --- a/src/initscripts/packages/alsa +++ b/src/initscripts/packages/alsa @@ -24,12 +24,12 @@ case "$1" in start) + modprobe snd_pcm_oss >/dev/null 2>&1 + modprobe snd_mixer_oss >/dev/null 2>&1 boot_mesg "Starting ALSA... Restoring volumes..." - modprobe snd_pcm_oss >/dev/null 2>&1 || failed=1 - modprobe snd_mixer_oss >/dev/null 2>&1 || failed=1 - (exit ${failed}) - evaluate_retval loadproc /usr/sbin/alsactl restore + evaluate_retval + exit 0 ;; stop) boot_mesg "Stopping ALSA... Saving volumes..." diff --git a/src/paks/alsa/uninstall.sh b/src/paks/alsa/uninstall.sh index ce88c294b..a02e2bbf9 100644 --- a/src/paks/alsa/uninstall.sh +++ b/src/paks/alsa/uninstall.sh @@ -24,9 +24,6 @@ . /opt/pakfire/lib/functions.sh stop_service ${NAME} make_backup ${NAME} -# unload alsa related modules -modprobe -r snd_pcm_oss >/dev/null 2>&1 || failed=1 -modprobe -r snd_timer >/dev/null 2>&1 || failed=1 remove_files rm -rf /etc/rc.d/rc*.d/*alsa exit 0 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. c7cd601dacbf126856295e966fffc2b8520a46b7
by Michael Tremer 13 Dec '23

13 Dec '23

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 3.x development tree". The branch, master has been updated via c7cd601dacbf126856295e966fffc2b8520a46b7 (commit) via 717ebff950f907ae38380614f4c26641341a882a (commit) via 73edd0fb4f6fdb001028070cedd04ecaeeb6e4a7 (commit) from 5652c2fd3711c1de47ad1e754e7fd28929e21c16 (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 c7cd601dacbf126856295e966fffc2b8520a46b7 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue Dec 12 19:00:44 2023 +0100 json-c: Update to version 0.17-20230812 - IPFire-3.x - Update from version 0.16-20220414 to 0.17020230812 - Changelog 0.17 (up to commit 077661f, 2023-08-08) New features * json_patch: add first implementation only with patch application * Add --disable-static and --disable-dynamic options to the cmake-configure script. * Add -DBUILD_APPS=NO option to disable app build * Minimum cmake version is now 3.9 Significant changes and bug fixes * When serializing with JSON_C_TO_STRING_PRETTY set, keep the opening and closing curly or square braces on same line for empty objects or arrays. * Disable locale handling when targeting a uClibc system due to problems with its duplocale() function. * When parsing with JSON_TOKENER_STRICT set, integer overflow/underflow now result in a json_tokener_error_parse_number. Without that flag values are capped at INT64_MIN/UINT64_MAX. * Fix memory leak with emtpy strings in json_object_set_string * json_object_from_fd_ex: fail if file is too large (>=INT_MAX bytes) * Add back json_number_chars, but only because it's part of the public API. * Entirely drop mode bits from open(O_RDONLY) to avoid warnings on certain platforms. * Specify dependent libraries, including -lbsd, in a more consistent way so linking against a static json-c works better * Fix a variety of build problems and add & improve tests * Update RFC reference to https://www.rfc-editor.org/rfc/rfc8259 Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 717ebff950f907ae38380614f4c26641341a882a Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue Dec 12 18:21:58 2023 +0100 keyutils: Update to version 1.6.3 - IPFire-3.x - Update from version 1.6.1 to 1.6.3 - The old url and download url have not been updated for 4 years. Current updates are now done in the new git repository https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/ The two latest updates, 1.6.2 and 1.6.3 were both released in 2020 - Changelog is not available. All changes can be found by reviewing the commits in the new git repository. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 73edd0fb4f6fdb001028070cedd04ecaeeb6e4a7 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue Dec 12 16:08:24 2023 +0100 less: Update to version 643 - IPFire-3.x - Update from version 608 to 643 - Changelog 643 Fix problem when a program piping into less reads from the tty, like sudo asking for password (github #368). Fix search modifier ^E after ^W. Fix bug using negated (^N) search (github #374). Fix bug setting colors with -D on Windows build (github #386). Fix reading special chars like PageDown on Windows (github #378). Fix mouse wheel scrolling on Windows (github #379). Fix erroneous EOF when terminal window size changes (github #372). Fix compile error with some definitions of ECHONL (github #395). Fix crash on Windows when writing logfile (github #405). Fix regression in exit code when stdin is /dev/null and output is a file (github #373). Add lesstest test suite to production release (github #344). Change lesstest output to conform with automake Simple Test Format (github #399). 633 Add LESSUTFCHARDEF environment variable (github #275). Add # command (github #330). Add ^S search modifier (github #196). Add --wordwrap option (github #113). Add --no-vbell option (github #304). Add --no-search-headers option (github #44). Add --modelines option (github #89). Add --intr option (github #224). Add --proc-backspace, --proc-tab and --proc-return options (github #335). Add --show-preproc-errors option (github #258). Add LESS_LINES and LESS_COLUMNS environment variables (github #84). Add LESS_DATA_DELAY environment variable (github #337). Allow empty "lines" field in --header option. Update Unicode tables. Improve ability of ^X to interrupt F command (github #49). Status column (-J) shows off-screen matches. Parenthesized sub-patterns in searches are colored with unique colors, if supported by the regular expression library (github #196). Don't allow opening a tty as file input unless -f is set (github #309). Don't require newline input after +&... option (github #339). Fix incorrect handling of some Private Use Unicode characters. Fix ANSI color bug when overstriking with colored chars (github #276). Fix compiler const warning (github #279). Fix signal race in iread (github #280). Fix reading procfs files on Linux (github #282). Fix --ignore-case with ctrl-R (no regex) search (github #300). Fix bug doing repeat search after setting & filter (github #299). Fix bug doing repeat search before non-repeat search. Fix crash with -R and certain line lengths (github #338). Fix input of Windows dead keys (github #352). Don't retain search options from a cancelled search (github #302). Don't call realpath on fake filenames like "-" (github #289). Implement lesstest test suite. Convert function parameter definitions from K&R to C89 (github #316). Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: json-c/json-c.nm | 6 +++--- keyutils/keyutils.nm | 7 +++---- less/less.nm | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) Difference in files: diff --git a/json-c/json-c.nm b/json-c/json-c.nm index fcca69087..e61f3d875 100644 --- a/json-c/json-c.nm +++ b/json-c/json-c.nm @@ -4,8 +4,8 @@ ############################################################################### name = json-c -version = 0.16 -reldate = 20220414 +version = 0.17 +reldate = 20230812 release = 1 thisapp = %{name}-%{version}-%{reldate} @@ -21,7 +21,7 @@ description objects. end -source_dl = https://github.com/json-c/json-c/archive/ +source_dl = https://github.com/json-c/json-c/archive/refs/tags/ build requires diff --git a/keyutils/keyutils.nm b/keyutils/keyutils.nm index 2fec320d1..1297bd4c4 100644 --- a/keyutils/keyutils.nm +++ b/keyutils/keyutils.nm @@ -4,11 +4,11 @@ ############################################################################### name = keyutils -version = 1.6.1 +version = 1.6.3 release = 1 groups = System/Tools -url = http://people.redhat.com/~dhowells/keyutils/ +url = https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/ license = GPLv2+ and LGPLv2+ summary = Linux Key Management Utilities @@ -18,8 +18,7 @@ description instantiated. end -source_dl = http://people.redhat.com/~dhowells/keyutils/ -sources = %{thisapp}.tar.bz2 +source_dl = https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snaps… build requires diff --git a/less/less.nm b/less/less.nm index 2f5e6992c..3efc1479a 100644 --- a/less/less.nm +++ b/less/less.nm @@ -4,7 +4,7 @@ ############################################################################### name = less -version = 608 +version = 643 release = 1 groups = Applications/Text hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 010869713142e1cc8874e59409e446a075a2878d
by Arne Fitzenreiter 12 Dec '23

12 Dec '23

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 010869713142e1cc8874e59409e446a075a2878d (commit) from 5109f8ee7fad608b9e85e61a1ab1a2608f09b106 (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 010869713142e1cc8874e59409e446a075a2878d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Dec 12 21:12:37 2023 +0100 kernel: update to 6.6.6 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 | 2 +- lfs/linux | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 3aa84cda0..9ece8d936 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.5-ipfire Kernel Configuration +# Linux/arm64 6.6.6-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 4e8831f68..1b6864254 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.5-ipfire Kernel Configuration +# Linux/x86 6.6.6-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/lfs/linux b/lfs/linux index 71ed83ad6..2985cbe5e 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.6.5 +VER = 6.6.6 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -72,7 +72,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 9d66d720f2f037cfd480835ab38807fe5aabcff09bd210c5cb0dc80bd3e1182434df9f04a286df4e8cbc508ac984ecba12d2098a3296e3aac60afad94c085876 +$(DL_FILE)_BLAKE2 = aef38e65d2bcccabb6d96691f96e5c0b3961e4e6125a33feb7ee99cd95c480984e35cc1e72bfa8da60ca76a40744054b8817012f6ebf85fc66161b802be73fb6 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core181, updated. 06c935a01b31e806226064bf95883f686a643604
by Arne Fitzenreiter 09 Dec '23

09 Dec '23

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, core181 has been updated via 06c935a01b31e806226064bf95883f686a643604 (commit) from 84f8640da0f2550a9b2a35299a0dd5d7059c4d19 (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 06c935a01b31e806226064bf95883f686a643604 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Dec 9 09:38:28 2023 +0100 core181: stop udev and apache before replacing update udev and apache while the running result in a hanging state that prevent restart and also save unmounting of "/" at reboot. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/181/update.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/core/181/update.sh b/config/rootfiles/core/181/update.sh index 0dc22d122..5248072db 100644 --- a/config/rootfiles/core/181/update.sh +++ b/config/rootfiles/core/181/update.sh @@ -84,6 +84,10 @@ rm -rvf \ /boot/dtb-* \ /lib/modules +# Stop services +/etc/init.d/udev stop +/etc/init.d/apache stop + # Extract files extract_files @@ -109,8 +113,8 @@ ldconfig # Start services telinit u -/etc/init.d/udev restart -/etc/init.d/apache restart +/etc/init.d/udev start +/etc/init.d/apache start # Rebuild initial ramdisks dracut --regenerate-all --force hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5109f8ee7fad608b9e85e61a1ab1a2608f09b106
by Arne Fitzenreiter 08 Dec '23

08 Dec '23

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 5109f8ee7fad608b9e85e61a1ab1a2608f09b106 (commit) via 9d77a9a5cb558c0b6aeda0752de9c9d2fdd2b582 (commit) via 935e7e115e515aae442983ffafa596f916fc9720 (commit) via 365306f5e504f0de56e786dd505c5cb92da9ead3 (commit) via e3544476b9c42dc8b50a9dee342549a3b01bb3f4 (commit) from 185217edbcea3327a877bd5d90aa901b79b9c363 (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 5109f8ee7fad608b9e85e61a1ab1a2608f09b106 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Dec 8 16:12:17 2023 +0100 kernel: update to 6.6.5 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 9d77a9a5cb558c0b6aeda0752de9c9d2fdd2b582 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Dec 7 10:19:37 2023 +0100 installer: update filecount Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 935e7e115e515aae442983ffafa596f916fc9720 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Dec 7 10:07:07 2023 +0100 core183: update disk-space/size check Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 365306f5e504f0de56e786dd505c5cb92da9ead3 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Dec 7 08:11:08 2023 +0100 core183: ship kbd Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit e3544476b9c42dc8b50a9dee342549a3b01bb3f4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Dec 7 08:08:05 2023 +0100 kbd: imclude eurlatgr font this font is now default for european languages. 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 | 2 +- config/rootfiles/common/kbd | 2 +- config/rootfiles/{oldcore/112 => core/183}/filelists/kbd | 0 config/rootfiles/core/183/update.sh | 10 ++++++---- lfs/linux | 4 ++-- src/installer/main.c | 2 +- 7 files changed, 12 insertions(+), 10 deletions(-) copy config/rootfiles/{oldcore/112 => core/183}/filelists/kbd (100%) Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 9fc4e33b2..3aa84cda0 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.4-ipfire Kernel Configuration +# Linux/arm64 6.6.5-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 090cf0ef4..4e8831f68 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.4-ipfire Kernel Configuration +# Linux/x86 6.6.5-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/config/rootfiles/common/kbd b/config/rootfiles/common/kbd index 3c18ff27e..a50a252a9 100644 --- a/config/rootfiles/common/kbd +++ b/config/rootfiles/common/kbd @@ -85,7 +85,7 @@ lib/kbd/consolefonts/LatArCyrHeb-16.psfu.gz #lib/kbd/consolefonts/drdos8x16.psfu.gz #lib/kbd/consolefonts/drdos8x6.psfu.gz #lib/kbd/consolefonts/drdos8x8.psfu.gz -#lib/kbd/consolefonts/eurlatgr.psfu.gz +lib/kbd/consolefonts/eurlatgr.psfu.gz #lib/kbd/consolefonts/gr737a-8x8.psfu.gz #lib/kbd/consolefonts/gr737a-9x14.psfu.gz #lib/kbd/consolefonts/gr737a-9x16.psfu.gz diff --git a/config/rootfiles/core/183/filelists/kbd b/config/rootfiles/core/183/filelists/kbd new file mode 120000 index 000000000..9b85839b1 --- /dev/null +++ b/config/rootfiles/core/183/filelists/kbd @@ -0,0 +1 @@ +../../../common/kbd \ No newline at end of file diff --git a/config/rootfiles/core/183/update.sh b/config/rootfiles/core/183/update.sh index 842e6f638..8eaab80c2 100644 --- a/config/rootfiles/core/183/update.sh +++ b/config/rootfiles/core/183/update.sh @@ -62,12 +62,14 @@ case $(uname -r) in ;; esac -# Check diskspace on root +# Check diskspace on root and size of boot ROOTSPACE=$( df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1 ) - -if [ $ROOTSPACE -lt 100000 ]; then +if [ $ROOTSPACE -lt 200000 ]; then exit_with_error "ERROR cannot update because not enough free space on root." 2 - exit 2 +fi +BOOTSIZE=$( df /boot -Pk | sed "s| * | |g" | cut -d" " -f2 | tail -n 1 ) +if [ $BOOTSIZE -lt 100000 ]; then + exit_with_error "ERROR cannot update. BOOT partition is to small." 3 fi # Remove the old kernel diff --git a/lfs/linux b/lfs/linux index e558d1272..71ed83ad6 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.6.4 +VER = 6.6.5 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -72,7 +72,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 75f20de7474f45966a32f7a1e5f9beadb2b4e111fe9c0ab769ccaa203e798f1a1b0ee05c3cb14de6bb609e2e9df1e238deeadfc21dbf08c6b407c9530bac11ef +$(DL_FILE)_BLAKE2 = 9d66d720f2f037cfd480835ab38807fe5aabcff09bd210c5cb0dc80bd3e1182434df9f04a286df4e8cbc508ac984ecba12d2098a3296e3aac60afad94c085876 install : $(TARGET) diff --git a/src/installer/main.c b/src/installer/main.c index 51e69751a..cddb0d91a 100644 --- a/src/installer/main.c +++ b/src/installer/main.c @@ -23,7 +23,7 @@ #include <libintl.h> #define _(x) dgettext("installer", x) -#define INST_FILECOUNT 28000 +#define INST_FILECOUNT 30000 #define LICENSE_FILE "/cdrom/COPYING" #define SOURCE_TEMPFILE "/tmp/downloads/image.iso" 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 December 2023