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 24c8e6a6df46745963afd1f9f67fca0350f477c6 (commit) via f1b067357224363b138eb8e2b74822051adbc9ef (commit) via db27cae56e627a887159c46198d9141be760b777 (commit) from e1aca5fdc11cd6f9dfc132eac12b2f19900db37d (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 24c8e6a6df46745963afd1f9f67fca0350f477c6 Merge: e1aca5fdc f1b067357 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Apr 11 10:16:55 2022 +0000

Merge branch 'next'

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/aarch64/linux | 4 ++-- config/rootfiles/common/armv6l/linux | 5 ++++- lfs/gzip | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-)

Difference in files: diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 34a347e1e..2f8a3fd82 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -818,6 +818,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/arch/arm64/include/asm/vdso/gettimeofday.h #lib/modules/KVER-ipfire/build/arch/arm64/include/asm/vdso/processor.h #lib/modules/KVER-ipfire/build/arch/arm64/include/asm/vdso/vsyscall.h +#lib/modules/KVER-ipfire/build/arch/arm64/include/asm/vectors.h #lib/modules/KVER-ipfire/build/arch/arm64/include/asm/vermagic.h #lib/modules/KVER-ipfire/build/arch/arm64/include/asm/virt.h #lib/modules/KVER-ipfire/build/arch/arm64/include/asm/vmalloc.h @@ -6427,7 +6428,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/ARCH_HAS_DMA_PREP_COHERENT #lib/modules/KVER-ipfire/build/include/config/ARCH_HAS_ELF_RANDOMIZE #lib/modules/KVER-ipfire/build/include/config/ARCH_HAS_FAST_MULTIPLIER -#lib/modules/KVER-ipfire/build/include/config/ARCH_HAS_FILTER_PGPROT #lib/modules/KVER-ipfire/build/include/config/ARCH_HAS_FORTIFY_SOURCE #lib/modules/KVER-ipfire/build/include/config/ARCH_HAS_GCOV_PROFILE_ALL #lib/modules/KVER-ipfire/build/include/config/ARCH_HAS_GIGANTIC_PAGE @@ -8504,6 +8504,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/MISC_RTSX #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/MITIGATE_SPECTRE_BRANCH_HISTORY #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_DEBUG @@ -9184,7 +9185,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/OF_IRQ #lib/modules/KVER-ipfire/build/include/config/OF_KOBJ #lib/modules/KVER-ipfire/build/include/config/OF_MDIO -#lib/modules/KVER-ipfire/build/include/config/OF_NET #lib/modules/KVER-ipfire/build/include/config/OF_OVERLAY #lib/modules/KVER-ipfire/build/include/config/OF_RESERVED_MEM #lib/modules/KVER-ipfire/build/include/config/OF_RESOLVE diff --git a/config/rootfiles/common/armv6l/linux b/config/rootfiles/common/armv6l/linux index fd85de41b..55cdefc16 100644 --- a/config/rootfiles/common/armv6l/linux +++ b/config/rootfiles/common/armv6l/linux @@ -450,6 +450,7 @@ boot/dtb-KVER-ipfire #boot/dtb-KVER-ipfire/meson8b-mxq.dtb #boot/dtb-KVER-ipfire/meson8b-odroidc1.dtb #boot/dtb-KVER-ipfire/meson8m2-mxiii-plus.dtb +#boot/dtb-KVER-ipfire/omap3-beagle-ab4.dtb #boot/dtb-KVER-ipfire/omap3-beagle-xm-ab.dtb #boot/dtb-KVER-ipfire/omap3-beagle-xm.dtb #boot/dtb-KVER-ipfire/omap3-beagle.dtb @@ -946,6 +947,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/arch/arm/include/asm/smp_scu.h #lib/modules/KVER-ipfire/build/arch/arm/include/asm/smp_twd.h #lib/modules/KVER-ipfire/build/arch/arm/include/asm/sparsemem.h +#lib/modules/KVER-ipfire/build/arch/arm/include/asm/spectre.h #lib/modules/KVER-ipfire/build/arch/arm/include/asm/spinlock.h #lib/modules/KVER-ipfire/build/arch/arm/include/asm/spinlock_types.h #lib/modules/KVER-ipfire/build/arch/arm/include/asm/stackprotector.h @@ -8080,6 +8082,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/GENERIC_CLOCKEVENTS #lib/modules/KVER-ipfire/build/include/config/GENERIC_CLOCKEVENTS_BROADCAST #lib/modules/KVER-ipfire/build/include/config/GENERIC_CPU_AUTOPROBE +#lib/modules/KVER-ipfire/build/include/config/GENERIC_CPU_VULNERABILITIES #lib/modules/KVER-ipfire/build/include/config/GENERIC_EARLY_IOREMAP #lib/modules/KVER-ipfire/build/include/config/GENERIC_GETTIMEOFDAY #lib/modules/KVER-ipfire/build/include/config/GENERIC_HWEIGHT @@ -8142,6 +8145,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/HARDENED_USERCOPY #lib/modules/KVER-ipfire/build/include/config/HARDENED_USERCOPY_FALLBACK #lib/modules/KVER-ipfire/build/include/config/HARDENED_USERCOPY_PAGESPAN +#lib/modules/KVER-ipfire/build/include/config/HARDEN_BRANCH_HISTORY #lib/modules/KVER-ipfire/build/include/config/HARDEN_BRANCH_PREDICTOR #lib/modules/KVER-ipfire/build/include/config/HARDIRQS_SW_RESEND #lib/modules/KVER-ipfire/build/include/config/HAS_DMA @@ -9581,7 +9585,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/OF_IRQ #lib/modules/KVER-ipfire/build/include/config/OF_KOBJ #lib/modules/KVER-ipfire/build/include/config/OF_MDIO -#lib/modules/KVER-ipfire/build/include/config/OF_NET #lib/modules/KVER-ipfire/build/include/config/OF_OVERLAY #lib/modules/KVER-ipfire/build/include/config/OF_RESERVED_MEM #lib/modules/KVER-ipfire/build/include/config/OF_RESOLVE diff --git a/lfs/gzip b/lfs/gzip index 809c6a91f..c669c235f 100644 --- a/lfs/gzip +++ b/lfs/gzip @@ -84,7 +84,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make install ifeq "$(ROOT)" "" mv -v /bin/{gzexe,zcmp,zdiff,zegrep} /usr/bin - mv -v /bin/{zfgrep,zforce,zgrep,zless,zmore,znew} /usr/bin + mv -v /bin/{zfgrep,zforce,zgrep,zmore,znew} /usr/bin + ln -s /usr/bin/zmore /usr/bin/zless endif @rm -rf $(DIR_APP) @$(POSTBUILD)

hooks/post-receive -- IPFire 2.x development tree