Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
| Delta | File | |
|---|---|---|
| +4 | -8 | usr.sbin/periodic/periodic.sh |
| +9 | -0 | usr.sbin/periodic/periodic.conf |
| +5 | -2 | tests/sys/netinet/carp.sh |
| +0 | -4 | sbin/ifconfig/carp.c |
| +18 | -14 | 4 files |
periodic: set _localbase for periodic scripts from within periodic.conf Set _localbase variable from within /etc/defaults/periodic.conf for use by periodic scripts. This fixes e5d7100c09, no other functional changes intended. Reported by: gahr, otis Reviewed by: markj, gahr MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47486 (cherry picked from commit c8b89c11a1181e900acb638cfde7a55e92553175)
| Delta | File | |
|---|---|---|
| +4 | -8 | usr.sbin/periodic/periodic.sh |
| +9 | -0 | usr.sbin/periodic/periodic.conf |
| +13 | -8 | 2 files |
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
| Delta | File | |
|---|---|---|
| +175 | -511 | sys/rpc/rpcsec_tls/rpctls_impl.c |
| +521 | -0 | sys/rpc/clnt_nl.c |
| +164 | -217 | usr.sbin/rpc.tlsservd/rpc.tlsservd.c |
| +372 | -0 | lib/libc/rpc/svc_nl.c |
| +161 | -0 | usr.bin/genl/parser_rpc.c |
| +19 | -101 | usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c |
| +1,412 | -829 | 64 files not shown |
| +1,923 | -1,312 | 70 files |
Merge branch 'hardened/current/periodic_chkfileperm2' into 'hardened/current/master' HBSD: maintain secure file / directory permissions See merge request hardenedbsd/HardenedBSD!99
HBSD: maintain secure file ownership and permissions This change maintains secure file ownership and permissions through the periodic utility. The file list is described by a mtree(8) specification, and the mtree(8) utility is run at daily intervals. The mtree(8) utility will detect files that don't match the specification, and adjust ownership and permissions only when necessary. The mtree(8) specification is only used by periodic for the time being, but if necessary, it could be used in other contexts. It could also be modified to suit the user's preferences as well. Credit to lattera / shawn.webb for suggesting the use of mtree(8). It works much better than the previous approach that has been abandoned in favor of mtree(8)
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
| Delta | File | |
|---|---|---|
| +5,487 | -2,363 | contrib/spleen/spleen-32x64.bdf |
| +2,899 | -2,834 | libexec/rtld-elf/rtld.c |
| +3,009 | -1,293 | contrib/spleen/spleen-16x32.bdf |
| +2,930 | -0 | sys/dev/usb/net/if_umb.c |
| +1,754 | -742 | contrib/spleen/spleen-8x16.bdf |
| +2,362 | -6 | contrib/spleen/spleen-12x24.bdf |
| +18,441 | -7,238 | 61 files not shown |
| +24,037 | -8,251 | 67 files |
Merge branch 'freebsd/current/main' into hardened/current/master
| Delta | File | |
|---|---|---|
| +66 | -57 | sys/vm/vm_phys.c |
| +50 | -47 | sys/vm/vm_page.c |
| +57 | -10 | sys/powerpc/powerpc/cpu.c |
| +12 | -31 | tests/sys/netinet/fibs_test.sh |
| +20 | -15 | sys/vm/vm_reserv.c |
| +11 | -9 | sbin/kldstat/kldstat.8 |
| +216 | -169 | 7 files not shown |
| +241 | -188 | 13 files |
periodic: set _localbase for periodic scripts from within periodic.conf Set _localbase variable from within /etc/defaults/periodic.conf for use by periodic scripts. This fixes e5d7100c09, no other functional changes intended. Reported by: gahr, otis Reviewed by: markj, gahr MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47486
| Delta | File | |
|---|---|---|
| +4 | -8 | usr.sbin/periodic/periodic.sh |
| +9 | -0 | usr.sbin/periodic/periodic.conf |
| +13 | -8 | 2 files |
Merge remote-tracking branch 'internal/hardened/current/master' into hardened/current/cross-dso-cfi
Conflicts:
share/man/man5/src.conf.5 (unresolved)
| Delta | File | |
|---|---|---|
| +91,515 | -0 | sys/dev/bnxt/bnxt_en/hsi_struct_def.h |
| +0 | -78,381 | sys/dev/bnxt/hsi_struct_def.h |
| +26,616 | -0 | contrib/unbound/configure~ |
| +9,508 | -8,602 | contrib/xz/ChangeLog |
| +7,476 | -5,132 | contrib/unbound/configure |
| +5,330 | -4,740 | contrib/ncurses/misc/terminfo.src |
| +140,445 | -96,855 | 7,018 files not shown |
| +517,509 | -231,700 | 7,024 files |
Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
Merge branch 'freebsd/13-stable/main' into hardened/13-stable/master
periodic.conf: remove long deprecated security_daily_compat_var() This function is documented to be gone in after 11. Time to remove this compat shim. PR: 275296 Reviewed by: jrm (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D44796 (cherry picked from commit aa48259f337100e79933d660fec8856371f761ed)
periodic.conf: remove long deprecated security_daily_compat_var() This function is documented to be gone in after 11. Time to remove this compat shim. PR: 275296 Reviewed by: jrm (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D44796 (cherry picked from commit aa48259f337100e79933d660fec8856371f761ed)
Merge branch 'freebsd/current/main' into hardened/current/master
periodic.conf: remove long deprecated security_daily_compat_var() This function is documented to be gone in after 11. Time to remove this compat shim. PR: 275296 Reviewed by: jrm (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D44796
Merge remote-tracking branch 'internal/hardened/current/master' into hardened/current/cross-dso-cfi
Conflicts:
cddl/lib/libnvpair/Makefile (unresolved)
share/man/man5/src.conf.5 (unresolved)
| Delta | File | |
|---|---|---|
| +20,997 | -20,920 | contrib/llvm-project/llvm/lib/Support/UnicodeNameToCodepointGenerated.cpp |
| +8,621 | -6,629 | contrib/xz/ChangeLog |
| +4,499 | -5,385 | contrib/llvm-project/libcxx/src/locale.cpp |
| +3,748 | -4,889 | contrib/llvm-project/libcxx/include/regex |
| +7,713 | -0 | contrib/unbound/util/configparser.c |
| +7,627 | -0 | contrib/unbound/util/configlexer.c |
| +53,205 | -37,823 | 15,239 files not shown |
| +1,349,003 | -1,091,480 | 15,245 files |
Merge remote-tracking branch 'origin/freebsd/14-stable/main' into hardened/14-stable/master
Conflicts:
release/Makefile (unresolved)
share/mk/src.opts.mk (unresolved)
| Delta | File | |
|---|---|---|
| +351 | -770 | sys/dev/sound/pcm/dsp.c |
| +0 | -705 | sys/dev/sound/clone.c |
| +642 | -0 | stand/i386/libi386/textvidc.c |
| +0 | -638 | stand/kboot/main.c |
| +637 | -0 | stand/kboot/kboot/main.c |
| +0 | -626 | stand/kboot/hostdisk.c |
| +1,630 | -2,739 | 430 files not shown |
| +11,154 | -11,299 | 436 files |
periodic/daily/801.trim-zfs: Add a daily zfs trim script
As mentioned in zpoolprops(7), on some SSDs, it may not be desirable to
use ZFS autotrim because a large number of trim requests can degrade
disk performance; instead, the pool should be manually trimmed at
regular intervals.
Add a new daily periodic script for this purpose, 801.trim-zfs. If
enabled (daily_trim_zfs_enable=YES; the default is NO), it will run a
'zpool trim' operation on all online pools, or on the pools listed in
'daily_trim_zfs_pools'.
The trim is not started if the pool is degraded (which matches the
behaviour of the existing 800.scrub-zfs script) or if a trim is already
running on that pool. Having autotrim enabled does not inhibit the
periodic trim; it's sometimes desirable to run periodic trims even with
autotrim enabled, because autotrim can elide trims for very small
regions.
[6 lines not shown]| Delta | File | |
|---|---|---|
| +59 | -0 | usr.sbin/periodic/etc/daily/801.trim-zfs |
| +10 | -1 | share/man/man5/periodic.conf.5 |
| +5 | -0 | usr.sbin/periodic/periodic.conf |
| +2 | -1 | usr.sbin/periodic/etc/daily/Makefile |
| +76 | -2 | 4 files |
Merge branch 'freebsd/current/main' into hardened/current/master
| Delta | File | |
|---|---|---|
| +333 | -652 | sys/kern/uipc_usrreq.c |
| +59 | -0 | usr.sbin/periodic/etc/daily/801.trim-zfs |
| +16 | -39 | sys/dev/pci/pci_host_generic.c |
| +42 | -8 | sys/conf/NOTES |
| +15 | -7 | sys/fs/unionfs/union_vnops.c |
| +0 | -18 | sys/i386/conf/NOTES |
| +465 | -724 | 11 files not shown |
| +500 | -776 | 17 files |
periodic/daily/801.trim-zfs: Add a daily zfs trim script
As mentioned in zpoolprops(7), on some SSDs, it may not be desirable to
use ZFS autotrim because a large number of trim requests can degrade
disk performance; instead, the pool should be manually trimmed at
regular intervals.
Add a new daily periodic script for this purpose, 801.trim-zfs. If
enabled (daily_trim_zfs_enable=YES; the default is NO), it will run a
'zpool trim' operation on all online pools, or on the pools listed in
'daily_trim_zfs_pools'.
The trim is not started if the pool is degraded (which matches the
behaviour of the existing 800.scrub-zfs script) or if a trim is already
running on that pool. Having autotrim enabled does not inhibit the
periodic trim; it's sometimes desirable to run periodic trims even with
autotrim enabled, because autotrim can elide trims for very small
regions.
[4 lines not shown]| Delta | File | |
|---|---|---|
| +59 | -0 | usr.sbin/periodic/etc/daily/801.trim-zfs |
| +10 | -1 | share/man/man5/periodic.conf.5 |
| +5 | -0 | usr.sbin/periodic/periodic.conf |
| +2 | -1 | usr.sbin/periodic/etc/daily/Makefile |
| +76 | -2 | 4 files |
Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
| Delta | File | |
|---|---|---|
| +391 | -78 | sys/dev/sound/pci/hdspe-pcm.c |
| +233 | -45 | sys/dev/sound/pci/hdspe.c |
| +51 | -12 | sys/dev/sound/pci/hdspe.h |
| +49 | -1 | share/man/man4/snd_hdspe.4 |
| +28 | -15 | sys/kern/subr_bus.c |
| +1 | -25 | sys/dev/usb/usb_util.c |
| +753 | -176 | 40 files not shown |
| +863 | -274 | 46 files |
Merge branch 'freebsd/13-stable/main' into hardened/13-stable/master
periodic: Make daily diff(1) output as small is possible Make, by default, daily diff(1) ignore whitespace changes and the unified output a context of zero (0) lines. This reduces output of unrelated lines in e-mails delivered to root. PR: 270266 Approved by: jrm (mentor), karels MFC after: 1 month Relnotes: yes Differential Revision: https://reviews.freebsd.org/D42762 (cherry picked from commit e2f6bafc3887c7752986526f3758525d24701fce)
| Delta | File | |
|---|---|---|
| +2 | -2 | usr.sbin/periodic/etc/daily/200.backup-passwd |
| +3 | -0 | share/man/man5/periodic.conf.5 |
| +1 | -1 | usr.sbin/periodic/periodic.conf |
| +1 | -1 | usr.sbin/periodic/etc/daily/210.backup-aliases |
| +7 | -4 | 4 files |
periodic: Make daily diff(1) flags configurable with daily_diff_flags PR: 270266 Approved by: jrm (mentor), karels MFC after: 1 month Relnotes: yes Differential Revision: https://reviews.freebsd.org/D42900 (cherry picked from commit 15e35d058cff847d1a7bc671fcf48b99f5d2f73b)
periodic: Make security diff(1) output as small is possible Make, by default, security diff(1) produce a unified output with a context of zero (0) lines. This reduces output of unrelated lines in e-mails delivered to root. PR: 270266 Approved by: jrm (mentor), karels MFC after: 1 month Relnotes: yes Differential Revision: https://reviews.freebsd.org/D43071 (cherry picked from commit 3aa71ea7c231a4e60a7e1b9b677e379e17432fc8)
| Delta | File | |
|---|---|---|
| +3 | -2 | share/man/man5/periodic.conf.5 |
| +1 | -1 | usr.sbin/periodic/periodic.conf |
| +4 | -3 | 2 files |
periodic: Make daily diff(1) output as small is possible Make, by default, daily diff(1) ignore whitespace changes and the unified output a context of zero (0) lines. This reduces output of unrelated lines in e-mails delivered to root. PR: 270266 Approved by: jrm (mentor), karels MFC after: 1 month Relnotes: yes Differential Revision: https://reviews.freebsd.org/D42762 (cherry picked from commit e2f6bafc3887c7752986526f3758525d24701fce)
| Delta | File | |
|---|---|---|
| +2 | -2 | usr.sbin/periodic/etc/daily/200.backup-passwd |
| +3 | -0 | share/man/man5/periodic.conf.5 |
| +1 | -1 | usr.sbin/periodic/periodic.conf |
| +1 | -1 | usr.sbin/periodic/etc/daily/210.backup-aliases |
| +7 | -4 | 4 files |
periodic: Make daily diff(1) flags configurable with daily_diff_flags PR: 270266 Approved by: jrm (mentor), karels MFC after: 1 month Relnotes: yes Differential Revision: https://reviews.freebsd.org/D42900 (cherry picked from commit 15e35d058cff847d1a7bc671fcf48b99f5d2f73b)
periodic: Make security diff(1) output as small is possible Make, by default, security diff(1) produce a unified output with a context of zero (0) lines. This reduces output of unrelated lines in e-mails delivered to root. PR: 270266 Approved by: jrm (mentor), karels MFC after: 1 month Relnotes: yes Differential Revision: https://reviews.freebsd.org/D43071 (cherry picked from commit 3aa71ea7c231a4e60a7e1b9b677e379e17432fc8)
| Delta | File | |
|---|---|---|
| +3 | -2 | share/man/man5/periodic.conf.5 |
| +1 | -1 | usr.sbin/periodic/periodic.conf |
| +4 | -3 | 2 files |
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
Merge branch 'freebsd/current/main' into hardened/current/master