IPFire-SCM June 2020

ipfire-scm@lists.ipfire.org

1 participants
30 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e9c62e37f42cbdf7c071abe6cb12ba81e0f3c123
by Arne Fitzenreiter 13 Jun '20

13 Jun '20

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4d43b3dcb1b31444ff49f3cc0ea4b04d4e6599fb
by Arne Fitzenreiter 12 Jun '20

12 Jun '20

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f3a59d63e27648c56da7296f48fe7382d8daedad
by Arne Fitzenreiter 12 Jun '20

12 Jun '20

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 f3a59d63e27648c56da7296f48fe7382d8daedad (commit) from 92e828b3b0b59a29736b10c1b29bd7583950835a (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 f3a59d63e27648c56da7296f48fe7382d8daedad Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jun 12 16:04:48 2020 +0200 kernel: update to 4.14.184 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 9 ++++----- config/kernel/kernel.config.armv5tel-ipfire-multi | 10 ++++------ config/kernel/kernel.config.i586-ipfire | 4 ++-- config/kernel/kernel.config.x86_64-ipfire | 4 ++-- config/rootfiles/common/aarch64/linux | 8 ++++++++ config/rootfiles/common/armv5tel/linux-multi | 6 ++++++ config/rootfiles/common/i586/linux | 6 ------ config/rootfiles/common/x86_64/linux | 6 ------ lfs/linux | 8 ++++---- 9 files changed, 30 insertions(+), 31 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index e78564569..c616cbb85 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 4.14.183-ipfire Kernel Configuration +# Linux/arm64 4.14.184-ipfire Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -227,7 +227,7 @@ CONFIG_TRACEPOINTS=y # CONFIG_KPROBES is not set CONFIG_JUMP_LABEL=y CONFIG_STATIC_KEYS_SELFTEST=y -# CONFIG_UPROBES is not set +CONFIG_UPROBES=y # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_KPROBES=y @@ -251,7 +251,6 @@ CONFIG_HAVE_CMPXCHG_LOCAL=y CONFIG_HAVE_CMPXCHG_DOUBLE=y CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_GCC_PLUGINS=y CONFIG_GCC_PLUGINS=y # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set @@ -299,6 +298,7 @@ CONFIG_REFCOUNT_FULL=y # CONFIG_GCOV_KERNEL is not set CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 CONFIG_MODULES=y @@ -525,7 +525,6 @@ CONFIG_HOLES_IN_ZONE=y CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set -CONFIG_SECCOMP=y CONFIG_HZ_100=y # CONFIG_HZ_250 is not set # CONFIG_HZ_300 is not set @@ -6362,6 +6361,7 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_PAGE_REF is not set # CONFIG_DEBUG_RODATA_TEST is not set # CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK is not set @@ -6459,7 +6459,6 @@ CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set -# CONFIG_PROFILE_ALL_BRANCHES is not set CONFIG_STACK_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y CONFIG_UPROBE_EVENTS=y diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi index 10ae01dcc..5280a6a62 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.14.183-ipfire-multi Kernel Configuration +# Linux/arm 4.14.184-ipfire-multi Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -225,7 +225,7 @@ CONFIG_HAVE_OPROFILE=y # CONFIG_KPROBES is not set CONFIG_JUMP_LABEL=y CONFIG_STATIC_KEYS_SELFTEST=y -# CONFIG_UPROBES is not set +CONFIG_UPROBES=y # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y @@ -247,7 +247,6 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_GCC_PLUGINS=y CONFIG_GCC_PLUGINS=y # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set @@ -294,6 +293,7 @@ CONFIG_REFCOUNT_FULL=y # CONFIG_GCOV_KERNEL is not set CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 CONFIG_MODULES=y @@ -782,7 +782,6 @@ CONFIG_ARCH_NR_GPIO=512 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set -CONFIG_SECCOMP=y CONFIG_HZ_FIXED=0 CONFIG_HZ_100=y # CONFIG_HZ_200 is not set @@ -840,7 +839,6 @@ CONFIG_SWIOTLB=y CONFIG_IOMMU_HELPER=y # CONFIG_PARAVIRT is not set # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set -CONFIG_RANDOMIZE_BASE=y # # Boot options @@ -6848,6 +6846,7 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_PAGE_REF is not set # CONFIG_DEBUG_RODATA_TEST is not set # CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK is not set @@ -7027,7 +7026,6 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y CONFIG_HARDENED_USERCOPY=y CONFIG_HARDENED_USERCOPY_PAGESPAN=y -CONFIG_FORTIFY_SOURCE=y # CONFIG_STATIC_USERMODEHELPER is not set # CONFIG_SECURITY_SMACK is not set # CONFIG_SECURITY_TOMOYO is not set diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 3cb89c86d..3e31119f6 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.183-ipfire Kernel Configuration +# Linux/x86 4.14.184-ipfire Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -242,7 +242,7 @@ CONFIG_OPROFILE_NMI_TIMER=y # CONFIG_KPROBES is not set CONFIG_JUMP_LABEL=y CONFIG_STATIC_KEYS_SELFTEST=y -# CONFIG_UPROBES is not set +CONFIG_UPROBES=y # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 974316c5d..f6953482f 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 4.14.183-ipfire Kernel Configuration +# Linux/x86 4.14.184-ipfire Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -251,7 +251,7 @@ CONFIG_OPROFILE_NMI_TIMER=y # CONFIG_KPROBES is not set CONFIG_JUMP_LABEL=y CONFIG_STATIC_KEYS_SELFTEST=y -# CONFIG_UPROBES is not set +CONFIG_UPROBES=y # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 5c2bba93f..2ca6e69ac 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -7172,6 +7172,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/force/max #lib/modules/KVER-ipfire/build/include/config/force/max/zoneorder.h #lib/modules/KVER-ipfire/build/include/config/forcedeth.h +#lib/modules/KVER-ipfire/build/include/config/fortify +#lib/modules/KVER-ipfire/build/include/config/fortify/source.h #lib/modules/KVER-ipfire/build/include/config/frame #lib/modules/KVER-ipfire/build/include/config/frame/pointer.h #lib/modules/KVER-ipfire/build/include/config/frame/vector.h @@ -7320,6 +7322,10 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/harden #lib/modules/KVER-ipfire/build/include/config/harden/branch #lib/modules/KVER-ipfire/build/include/config/harden/branch/predictor.h +#lib/modules/KVER-ipfire/build/include/config/hardened +#lib/modules/KVER-ipfire/build/include/config/hardened/usercopy +#lib/modules/KVER-ipfire/build/include/config/hardened/usercopy.h +#lib/modules/KVER-ipfire/build/include/config/hardened/usercopy/pagespan.h #lib/modules/KVER-ipfire/build/include/config/hardirqs #lib/modules/KVER-ipfire/build/include/config/hardirqs/sw #lib/modules/KVER-ipfire/build/include/config/hardirqs/sw/resend.h @@ -9828,12 +9834,14 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/slab/freelist/random.h #lib/modules/KVER-ipfire/build/include/config/slab/merge #lib/modules/KVER-ipfire/build/include/config/slab/merge/default.h +#lib/modules/KVER-ipfire/build/include/config/slabinfo.h #lib/modules/KVER-ipfire/build/include/config/slhc.h #lib/modules/KVER-ipfire/build/include/config/slicoss.h #lib/modules/KVER-ipfire/build/include/config/slub #lib/modules/KVER-ipfire/build/include/config/slub.h #lib/modules/KVER-ipfire/build/include/config/slub/cpu #lib/modules/KVER-ipfire/build/include/config/slub/cpu/partial.h +#lib/modules/KVER-ipfire/build/include/config/slub/debug.h #lib/modules/KVER-ipfire/build/include/config/smc91x.h #lib/modules/KVER-ipfire/build/include/config/smp.h #lib/modules/KVER-ipfire/build/include/config/sms diff --git a/config/rootfiles/common/armv5tel/linux-multi b/config/rootfiles/common/armv5tel/linux-multi index aab9e1737..26e448ea2 100644 --- a/config/rootfiles/common/armv5tel/linux-multi +++ b/config/rootfiles/common/armv5tel/linux-multi @@ -8008,6 +8008,10 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/include/config/harden #lib/modules/KVER-ipfire-multi/build/include/config/harden/branch #lib/modules/KVER-ipfire-multi/build/include/config/harden/branch/predictor.h +#lib/modules/KVER-ipfire-multi/build/include/config/hardened +#lib/modules/KVER-ipfire-multi/build/include/config/hardened/usercopy +#lib/modules/KVER-ipfire-multi/build/include/config/hardened/usercopy.h +#lib/modules/KVER-ipfire-multi/build/include/config/hardened/usercopy/pagespan.h #lib/modules/KVER-ipfire-multi/build/include/config/hardirqs #lib/modules/KVER-ipfire-multi/build/include/config/hardirqs/sw #lib/modules/KVER-ipfire-multi/build/include/config/hardirqs/sw/resend.h @@ -10754,12 +10758,14 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/include/config/slab/freelist/random.h #lib/modules/KVER-ipfire-multi/build/include/config/slab/merge #lib/modules/KVER-ipfire-multi/build/include/config/slab/merge/default.h +#lib/modules/KVER-ipfire-multi/build/include/config/slabinfo.h #lib/modules/KVER-ipfire-multi/build/include/config/slhc.h #lib/modules/KVER-ipfire-multi/build/include/config/slicoss.h #lib/modules/KVER-ipfire-multi/build/include/config/slub #lib/modules/KVER-ipfire-multi/build/include/config/slub.h #lib/modules/KVER-ipfire-multi/build/include/config/slub/cpu #lib/modules/KVER-ipfire-multi/build/include/config/slub/cpu/partial.h +#lib/modules/KVER-ipfire-multi/build/include/config/slub/debug.h #lib/modules/KVER-ipfire-multi/build/include/config/smc911x.h #lib/modules/KVER-ipfire-multi/build/include/config/smc91x.h #lib/modules/KVER-ipfire-multi/build/include/config/smp diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux index e7829cade..e611843cb 100644 --- a/config/rootfiles/common/i586/linux +++ b/config/rootfiles/common/i586/linux @@ -5942,8 +5942,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/acpi/cpu #lib/modules/KVER-ipfire/build/include/config/acpi/cpu/freq #lib/modules/KVER-ipfire/build/include/config/acpi/cpu/freq/pss.h -#lib/modules/KVER-ipfire/build/include/config/acpi/custom -#lib/modules/KVER-ipfire/build/include/config/acpi/custom/method.h #lib/modules/KVER-ipfire/build/include/config/acpi/dock.h #lib/modules/KVER-ipfire/build/include/config/acpi/ec #lib/modules/KVER-ipfire/build/include/config/acpi/ec/debugfs.h @@ -9025,9 +9023,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/mmu #lib/modules/KVER-ipfire/build/include/config/mmu.h #lib/modules/KVER-ipfire/build/include/config/mmu/notifier.h -#lib/modules/KVER-ipfire/build/include/config/modify -#lib/modules/KVER-ipfire/build/include/config/modify/ldt -#lib/modules/KVER-ipfire/build/include/config/modify/ldt/syscall.h #lib/modules/KVER-ipfire/build/include/config/module #lib/modules/KVER-ipfire/build/include/config/module/compress #lib/modules/KVER-ipfire/build/include/config/module/compress.h @@ -18519,7 +18514,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/acpi/acpi_extlog.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/acpi/acpi_ipmi.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/acpi/acpi_pad.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/acpi/custom_method.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/acpi/dptf #lib/modules/KVER-ipfire/kernel/drivers/acpi/dptf/dptf_power.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/acpi/ec_sys.ko.xz diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index caea5dae1..787ffa05e 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -5945,8 +5945,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/acpi/cpu #lib/modules/KVER-ipfire/build/include/config/acpi/cpu/freq #lib/modules/KVER-ipfire/build/include/config/acpi/cpu/freq/pss.h -#lib/modules/KVER-ipfire/build/include/config/acpi/custom -#lib/modules/KVER-ipfire/build/include/config/acpi/custom/method.h #lib/modules/KVER-ipfire/build/include/config/acpi/dock.h #lib/modules/KVER-ipfire/build/include/config/acpi/ec #lib/modules/KVER-ipfire/build/include/config/acpi/ec/debugfs.h @@ -9078,9 +9076,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/mmu #lib/modules/KVER-ipfire/build/include/config/mmu.h #lib/modules/KVER-ipfire/build/include/config/mmu/notifier.h -#lib/modules/KVER-ipfire/build/include/config/modify -#lib/modules/KVER-ipfire/build/include/config/modify/ldt -#lib/modules/KVER-ipfire/build/include/config/modify/ldt/syscall.h #lib/modules/KVER-ipfire/build/include/config/module #lib/modules/KVER-ipfire/build/include/config/module/compress #lib/modules/KVER-ipfire/build/include/config/module/compress.h @@ -18558,7 +18553,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/acpi/acpi_extlog.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/acpi/acpi_ipmi.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/acpi/acpi_pad.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/acpi/custom_method.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/acpi/dptf #lib/modules/KVER-ipfire/kernel/drivers/acpi/dptf/dptf_power.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/acpi/ec_sys.ko.xz diff --git a/lfs/linux b/lfs/linux index b71f0ead3..1d706b4a1 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -VER = 4.14.183 -ARM_PATCHES = 4.14.183-ipfire0 +VER = 4.14.184 +ARM_PATCHES = 4.14.184-ipfire0 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -79,8 +79,8 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_MD5 = bd6db02bdbe35609756842b8c4c72cad -arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 55f6b8d709919adb8791e507836ceedc +$(DL_FILE)_MD5 = 8d6e90aa90d2ae927f27404cb7674f28 +arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = e7a545581a7bd2333eaf271fba1aeadd install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 92e828b3b0b59a29736b10c1b29bd7583950835a
by Arne Fitzenreiter 10 Jun '20

10 Jun '20

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a5e577d083a3413c0bd8a49c38dca1f689a6378a
by Arne Fitzenreiter 10 Jun '20

10 Jun '20

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 a5e577d083a3413c0bd8a49c38dca1f689a6378a (commit) via 3eb393ff2e44a97d32c91621b093253ebde6d1fa (commit) via 4ee87ee248256a19800f42fde0c54d46895646d2 (commit) from 325a2680c8ff52116915b9a011ea555e82b5ee6e (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 a5e577d083a3413c0bd8a49c38dca1f689a6378a Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Tue Jun 9 17:57:51 2020 +0000 kernel: enable CONFIG_FORTIFY_SOURCE on armv5tel Partially fixes: #12369 Cc: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 3eb393ff2e44a97d32c91621b093253ebde6d1fa Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Tue Jun 9 17:55:58 2020 +0000 kernel: enable CONFIG_FORTIFY_SOUCRE on aarch64 Partially fixes: #12369 Cc: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 4ee87ee248256a19800f42fde0c54d46895646d2 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Tue Jun 9 17:50:14 2020 +0000 kernel: enable CONFIG_SLUB_DEBUG on aarch64 and armv5tel Fixes: #12377 Cc: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 4 ++-- config/kernel/kernel.config.armv5tel-ipfire-multi | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index e0f2f6df8..605c0886a 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -211,7 +211,7 @@ CONFIG_HAVE_PERF_EVENTS=y CONFIG_PERF_EVENTS=y # CONFIG_DEBUG_PERF_USE_VMALLOC is not set CONFIG_VM_EVENT_COUNTERS=y -# CONFIG_SLUB_DEBUG is not set +CONFIG_SLUB_DEBUG=y # CONFIG_SLUB_MEMCG_SYSFS_ON is not set # CONFIG_COMPAT_BRK is not set # CONFIG_SLAB is not set @@ -6543,7 +6543,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y CONFIG_HARDENED_USERCOPY=y CONFIG_HARDENED_USERCOPY_PAGESPAN=y -# CONFIG_FORTIFY_SOURCE is not set +CONFIG_FORTIFY_SOURCE=y # CONFIG_STATIC_USERMODEHELPER is not set # CONFIG_SECURITY_SMACK is not set # CONFIG_SECURITY_TOMOYO is not set diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi index f0ddcec34..e190d8990 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi @@ -208,7 +208,7 @@ CONFIG_PERF_USE_VMALLOC=y CONFIG_PERF_EVENTS=y # CONFIG_DEBUG_PERF_USE_VMALLOC is not set CONFIG_VM_EVENT_COUNTERS=y -# CONFIG_SLUB_DEBUG is not set +CONFIG_SLUB_DEBUG=y # CONFIG_SLUB_MEMCG_SYSFS_ON is not set # CONFIG_COMPAT_BRK is not set # CONFIG_SLAB is not set @@ -7027,6 +7027,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y CONFIG_HARDENED_USERCOPY=y CONFIG_HARDENED_USERCOPY_PAGESPAN=y +CONFIG_FORTIFY_SOURCE=y # CONFIG_STATIC_USERMODEHELPER is not set # CONFIG_SECURITY_SMACK is not set # CONFIG_SECURITY_TOMOYO is not set hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 325a2680c8ff52116915b9a011ea555e82b5ee6e
by Arne Fitzenreiter 10 Jun '20

10 Jun '20

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 325a2680c8ff52116915b9a011ea555e82b5ee6e (commit) via 2b51e4aeab59de9f1f5a5ef9ded26111ef7b231c (commit) from e694bbd17fc39e2dc4d7cbce8bf990941ed5c360 (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 325a2680c8ff52116915b9a011ea555e82b5ee6e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jun 10 16:21:49 2020 +0200 kernel: fix diabling CONFIG_MODFIFY_LDT_SYSCALL Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 2b51e4aeab59de9f1f5a5ef9ded26111ef7b231c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jun 10 16:20:34 2020 +0200 Revert "kernel: enable CONFIG_RANDOMIZE_BASE on aarch64" with enabled CONFIG_RAMDOIZE_BASE the linking of xtables and maybee other external kernel modules fail on aarch64 This reverts commit 8379ab44b8b0d7efd24101dbfe32913d4cebcb2e. ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 2 +- config/kernel/kernel.config.i586-ipfire | 4 ++-- config/kernel/kernel.config.x86_64-ipfire | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index da99a23db..e0f2f6df8 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -609,7 +609,7 @@ CONFIG_ARM64_VHE=y CONFIG_ARM64_UAO=y # CONFIG_ARM64_PMEM is not set CONFIG_ARM64_MODULE_CMODEL_LARGE=y -CONFIG_RANDOMIZE_BASE=y +# CONFIG_RANDOMIZE_BASE is not set # # Boot options diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 578931497..55fc6828d 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -529,7 +529,6 @@ CONFIG_PERF_EVENTS_INTEL_CSTATE=y CONFIG_PERF_EVENTS_AMD_POWER=m # CONFIG_X86_LEGACY_VM86 is not set # CONFIG_VM86 is not set -# CONFIG_X86_16BIT is not set CONFIG_TOSHIBA=m CONFIG_I8K=m # CONFIG_X86_REBOOTFIXUPS is not set @@ -600,7 +599,6 @@ CONFIG_HIGHPTE=y CONFIG_X86_CHECK_BIOS_CORRUPTION=y CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y CONFIG_X86_RESERVE_LOW=64 -# CONFIG_MATH_EMULATION is not set CONFIG_MTRR=y CONFIG_MTRR_SANITIZER=y CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1 @@ -633,6 +631,7 @@ CONFIG_HOTPLUG_CPU=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_COMPAT_VDSO is not set # CONFIG_CMDLINE_BOOL is not set +# CONFIG_MODIFY_LDT_SYSCALL is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # @@ -684,6 +683,7 @@ CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_HOTPLUG_IOAPIC=y CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y +# CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_BGRT is not set # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set CONFIG_HAVE_ACPI_APEI=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 6a5fbbfe9..f64332227 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -533,7 +533,6 @@ CONFIG_PERF_EVENTS_INTEL_RAPL=y CONFIG_PERF_EVENTS_INTEL_CSTATE=y CONFIG_PERF_EVENTS_AMD_POWER=m # CONFIG_VM86 is not set -# CONFIG_X86_16BIT is not set CONFIG_X86_VSYSCALL_EMULATION=y CONFIG_I8K=m CONFIG_MICROCODE=y @@ -650,6 +649,7 @@ CONFIG_HOTPLUG_CPU=y # CONFIG_LEGACY_VSYSCALL_EMULATE is not set CONFIG_LEGACY_VSYSCALL_NONE=y # CONFIG_CMDLINE_BOOL is not set +# CONFIG_MODIFY_LDT_SYSCALL is not set CONFIG_HAVE_LIVEPATCH=y # CONFIG_LIVEPATCH is not set CONFIG_ARCH_HAS_ADD_PAGES=y @@ -706,6 +706,7 @@ CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_HOTPLUG_IOAPIC=y CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y +# CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_BGRT is not set # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set CONFIG_ACPI_NFIT=m hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e694bbd17fc39e2dc4d7cbce8bf990941ed5c360
by Arne Fitzenreiter 09 Jun '20

09 Jun '20

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 e694bbd17fc39e2dc4d7cbce8bf990941ed5c360 (commit) via 8379ab44b8b0d7efd24101dbfe32913d4cebcb2e (commit) from e4d1f968695b6f8d020cd8bf5a650402a61d46ad (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 e694bbd17fc39e2dc4d7cbce8bf990941ed5c360 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Tue Jun 9 17:18:49 2020 +0000 kernel: enable CONFIG_RANDOMIZE_BASE on armv5tel Partially fixes: #12363 Cc: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 8379ab44b8b0d7efd24101dbfe32913d4cebcb2e Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sun Jun 7 16:49:01 2020 +0000 kernel: enable CONFIG_RANDOMIZE_BASE on aarch64 Partially fixes: #12363 Cc: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 2 +- config/kernel/kernel.config.armv5tel-ipfire-multi | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index e0f2f6df8..da99a23db 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -609,7 +609,7 @@ CONFIG_ARM64_VHE=y CONFIG_ARM64_UAO=y # CONFIG_ARM64_PMEM is not set CONFIG_ARM64_MODULE_CMODEL_LARGE=y -# CONFIG_RANDOMIZE_BASE is not set +CONFIG_RANDOMIZE_BASE=y # # Boot options diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi index 15183300f..f0ddcec34 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi @@ -840,6 +840,7 @@ CONFIG_SWIOTLB=y CONFIG_IOMMU_HELPER=y # CONFIG_PARAVIRT is not set # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set +CONFIG_RANDOMIZE_BASE=y # # Boot options hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e4d1f968695b6f8d020cd8bf5a650402a61d46ad
by Arne Fitzenreiter 09 Jun '20

09 Jun '20

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7617da3bba48d40284c2fd93d0265a0bce64aed0
by Arne Fitzenreiter 08 Jun '20

08 Jun '20

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 7617da3bba48d40284c2fd93d0265a0bce64aed0 (commit) via d7174d7c3ae2eb21fef0e832955c6ba9024a7c0e (commit) via b1f24c43538fbe2976c96cf21890fbc8dcdeb9d9 (commit) from 8a86d257cf9e4669786dbef26ecb5071cb7511fb (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 7617da3bba48d40284c2fd93d0265a0bce64aed0 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sun Jun 7 16:57:59 2020 +0000 kernel: enable CONFIG_SECCOMP on aarch64 and armv5tel Fixes: #12366 Cc: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit d7174d7c3ae2eb21fef0e832955c6ba9024a7c0e Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sun Jun 7 16:40:35 2020 +0000 kernel: disable CONFIG_ACPI_CUSTOM_METHOD on x86_64 and i586 This is dangerous as it allows replacing the running kernel without rebooting. Kernel Self Protection Project people recommend to keep it disabled. Fixes: #12372 Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit b1f24c43538fbe2976c96cf21890fbc8dcdeb9d9 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sun Jun 7 16:32:26 2020 +0000 kernel: disable CONFIG_MODIFY_LDT_SYSCALL on i586 and x86_64 Fixes: #12382 Cc: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 2 ++ config/kernel/kernel.config.armv5tel-ipfire-multi | 2 ++ config/kernel/kernel.config.i586-ipfire | 2 -- config/kernel/kernel.config.x86_64-ipfire | 2 -- 4 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 dcd21e820..8e4f650a5 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -251,6 +251,7 @@ CONFIG_HAVE_CMPXCHG_LOCAL=y CONFIG_HAVE_CMPXCHG_DOUBLE=y CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_GCC_PLUGINS=y CONFIG_GCC_PLUGINS=y # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set @@ -524,6 +525,7 @@ CONFIG_HOLES_IN_ZONE=y CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set +CONFIG_SECCOMP=y CONFIG_HZ_100=y # CONFIG_HZ_250 is not set # CONFIG_HZ_300 is not set diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi index 9c7ecb524..ee63c2392 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi @@ -247,6 +247,7 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_GCC_PLUGINS=y CONFIG_GCC_PLUGINS=y # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set @@ -781,6 +782,7 @@ CONFIG_ARCH_NR_GPIO=512 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set +CONFIG_SECCOMP=y CONFIG_HZ_FIXED=0 CONFIG_HZ_100=y # CONFIG_HZ_200 is not set diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 0b6e0ca08..578931497 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -633,7 +633,6 @@ CONFIG_HOTPLUG_CPU=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_COMPAT_VDSO is not set # CONFIG_CMDLINE_BOOL is not set -CONFIG_MODIFY_LDT_SYSCALL=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # @@ -685,7 +684,6 @@ CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_HOTPLUG_IOAPIC=y CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y -CONFIG_ACPI_CUSTOM_METHOD=m # CONFIG_ACPI_BGRT is not set # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set CONFIG_HAVE_ACPI_APEI=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 27b073ec7..6a5fbbfe9 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -650,7 +650,6 @@ CONFIG_HOTPLUG_CPU=y # CONFIG_LEGACY_VSYSCALL_EMULATE is not set CONFIG_LEGACY_VSYSCALL_NONE=y # CONFIG_CMDLINE_BOOL is not set -CONFIG_MODIFY_LDT_SYSCALL=y CONFIG_HAVE_LIVEPATCH=y # CONFIG_LIVEPATCH is not set CONFIG_ARCH_HAS_ADD_PAGES=y @@ -707,7 +706,6 @@ CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_HOTPLUG_IOAPIC=y CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y -CONFIG_ACPI_CUSTOM_METHOD=m # CONFIG_ACPI_BGRT is not set # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set CONFIG_ACPI_NFIT=m hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8a86d257cf9e4669786dbef26ecb5071cb7511fb
by Arne Fitzenreiter 05 Jun '20

05 Jun '20

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 8a86d257cf9e4669786dbef26ecb5071cb7511fb (commit) via 625104ec57dfe53f0973ccb98d0f9b4f37c385a3 (commit) via 405c7326d2b712d5b212ac4112959f1a109c720a (commit) via 4963d555f601367b5da92d3a6dcdfa750a915e0b (commit) from 90c1e763b6651adc17ba210611bfb323265b20ab (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 8a86d257cf9e4669786dbef26ecb5071cb7511fb Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jun 5 20:43:58 2020 +0000 squid-accounting: remove deps that are moved to core Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 625104ec57dfe53f0973ccb98d0f9b4f37c385a3 Merge: 90c1e763b 405c7326d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jun 4 15:16:39 2020 +0000 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/oldcore/145/update.sh | 5 ++++- lfs/squid-accounting | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/rootfiles/oldcore/145/update.sh b/config/rootfiles/oldcore/145/update.sh index 38653b730..4b59a03dc 100644 --- a/config/rootfiles/oldcore/145/update.sh +++ b/config/rootfiles/oldcore/145/update.sh @@ -78,7 +78,10 @@ for package in perl-DBI perl-DBD-SQLite; do done # Enable OpenVPN metrics collection -grep -q "^client-connect" /var/ipfire/ovpn/server.conf || cat <<EOF >> /var/ipfire/ovpn/server.conf +sed -E -i /var/ipfire/ovpn/server.conf \ + -e "/^client-(dis)?connect/d" + +cat <<EOF >> /var/ipfire/ovpn/server.conf # Log clients connecting/disconnecting client-connect "/usr/sbin/openvpn-metrics client-connect" client-disconnect "/usr/sbin/openvpn-metrics client-disconnect" diff --git a/lfs/squid-accounting b/lfs/squid-accounting index bc39142cf..77742554e 100644 --- a/lfs/squid-accounting +++ b/lfs/squid-accounting @@ -15,9 +15,9 @@ THISAPP = squid-accounting-$(VER) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = squid-accounting -PAK_VER = 12 +PAK_VER = 13 -DEPS = perl-DBI perl-DBD-SQLite perl-File-ReadBackwards +DEPS = perl-File-ReadBackwards ############################################################################### # Top-level Rules 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 June 2020