HardenedBSD/src e2f6bafshare/man/man5 periodic.conf.5, usr.sbin/periodic periodic.conf

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
DeltaFile
+2-2usr.sbin/periodic/etc/daily/200.backup-passwd
+3-0share/man/man5/periodic.conf.5
+1-1usr.sbin/periodic/etc/daily/210.backup-aliases
+1-1usr.sbin/periodic/periodic.conf
+7-44 files

HardenedBSD/src 15e35d0share/man/man5 periodic.conf.5, usr.sbin/periodic/etc/daily 200.backup-passwd 210.backup-aliases

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
DeltaFile
+5-0share/man/man5/periodic.conf.5
+2-2usr.sbin/periodic/etc/daily/200.backup-passwd
+1-1usr.sbin/periodic/etc/daily/210.backup-aliases
+1-1usr.sbin/periodic/etc/daily/221.backup-gpart
+1-1usr.sbin/periodic/etc/daily/222.backup-gmirror
+1-1usr.sbin/periodic/etc/daily/223.backup-zfs
+11-61 files not shown
+12-67 files

HardenedBSD/src 3aa71eashare/man/man5 periodic.conf.5, usr.sbin/periodic periodic.conf

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
DeltaFile
+3-2share/man/man5/periodic.conf.5
+1-1usr.sbin/periodic/periodic.conf
+4-32 files

HardenedBSD/src cb0c532contrib/less screen.c, sys/kern vfs_subr.c

Merge remote-tracking branch 'internal/freebsd/13-stable/main' into hardened/13-stable/master

Conflicts:
        bin/cat/cat.c
        lib/libc/gen/auxv.3
        libexec/rc/rc.d/archdep
        share/man/man5/src.conf.5
        sys/amd64/amd64/elf_machdep.c
        sys/amd64/cloudabi64/cloudabi64_sysvec.c
        sys/amd64/linux/linux_sysvec.c
        sys/amd64/linux32/linux32_sysvec.c
        sys/arm/arm/elf_machdep.c
        sys/arm64/linux/linux_sysvec.c
        sys/compat/ia32/ia32_sysvec.c
        sys/i386/cloudabi32/cloudabi32_sysvec.c
        sys/i386/linux/imgact_linux.c
        sys/i386/linux/linux_sysvec.c
        sys/kern/imgact_aout.c
        sys/kern/kern_module.c

    [22 lines not shown]
DeltaFile
+175-44sys/vm/vm_map.c
+97-38sys/kern/vfs_subr.c
+64-0tests/sys/vm/stack/stack_dlopen_exec_test.c
+57-0tests/sys/vm/stack/stack_mprotect_exec_test.c
+42-11contrib/less/screen.c
+51-0tests/sys/vm/soxstack/soxstack.c
+486-9331,889 files not shown
+1,170-49,85331,895 files

HardenedBSD/src 023fc80tests/sys/cddl/zfs/tests/cli_root/zfs_share setup.ksh zfs_share.cfg, tests/sys/cddl/zfs/tests/migration migration_004_pos.ksh

Remove $FreeBSD$: one-line sh pattern

Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/

Similar commit in main:
(cherry picked from commit d0b2dbfa0ecf)
DeltaFile
+0-2tests/sys/cddl/zfs/tests/cli_root/zfs_share/setup.ksh
+0-2tests/sys/cddl/zfs/tests/migration/migration_004_pos.ksh
+0-2tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share.cfg
+0-2tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share_001_pos.ksh
+0-2tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share_002_pos.ksh
+0-2tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share_003_pos.ksh
+0-129,627 files not shown
+0-11,2189,633 files

HardenedBSD/src acf3d6esys/arm64/arm64 pl031_rtc.c, sys/compat/linux linux_socket.c

Merge remote-tracking branch 'internal/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        tools/build/options/WITH_OFED_EXTRA (deleted)
        usr.sbin/rpc.yppasswdd/Makefile (unresolved)
DeltaFile
+697-0sys/dev/virtio/gpu/virtio_gpu.c
+454-0sys/dev/virtio/gpu/virtio_gpu.h
+153-0sys/arm64/arm64/pl031_rtc.c
+80-52sys/compat/linux/linux_socket.c
+107-0tools/build/freebsd-yeet.pl
+87-11sys/dev/ixl/ixl_pf_main.c
+1,578-6331,042 files not shown
+2,188-48,40531,048 files

HardenedBSD/src 2226d61sys/arm64/arm64 pl031_rtc.c, sys/compat/linux linux_socket.c

Merge remote-tracking branch 'internal/freebsd/current/main' into hardened/current/master

Conflicts:
        bin/cat/cat.c (unresolved)
        lib/csu/aarch64/crt1_c.c (unresolved)
        lib/csu/amd64/crt1_c.c (unresolved)
        lib/csu/i386/crt1_c.c (unresolved)
        lib/csu/powerpc64/crt1_c.c (unresolved)
        lib/csu/powerpc64/reloc.c (unresolved)
        lib/csu/riscv/crt1_c.c (unresolved)
        lib/libc/gen/auxv.3 (unresolved)
        lib/libcasper/services/cap_net/cap_net.3 (unresolved)
        sys/amd64/amd64/elf_machdep.c (unresolved)
        sys/amd64/include/sgxreg.h (deleted)
        sys/amd64/linux/linux_sysvec.c (unresolved)
        sys/amd64/linux32/linux32_sysvec.c (unresolved)
        sys/amd64/sgx/sgx.c (deleted)
        sys/amd64/sgx/sgx_linux.c (deleted)
        sys/amd64/sgx/sgxvar.h (deleted)

    [29 lines not shown]
DeltaFile
+697-0sys/dev/virtio/gpu/virtio_gpu.c
+454-0sys/dev/virtio/gpu/virtio_gpu.h
+153-0sys/arm64/arm64/pl031_rtc.c
+80-52sys/compat/linux/linux_socket.c
+107-0tools/build/freebsd-yeet.pl
+87-11sys/dev/ixl/ixl_pf_main.c
+1,578-6331,044 files not shown
+2,304-48,37531,050 files

HardenedBSD/src d0b2dbftests/sys/cddl/zfs/tests/cli_root/zfs_clone zfs_clone_006_pos.ksh zfs_clone_005_pos.ksh

Remove $FreeBSD$: one-line sh pattern

Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/
DeltaFile
+0-2tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone_006_pos.ksh
+0-2tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone_005_pos.ksh
+0-2tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone_004_pos.ksh
+0-2tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone_003_pos.ksh
+0-2tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone_002_pos.ksh
+0-2tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone_001_neg.ksh
+0-129,444 files not shown
+0-11,0209,450 files

HardenedBSD/src 0cf9eberelease/tools gce.conf ec2.conf, sys/fs/nfs nfs_commonsubs.c

Merge remote-tracking branch 'freebsd/stable/13' into hardened/13-stable/master
DeltaFile
+7-2usr.sbin/periodic/periodic.8
+8-0usr.sbin/periodic/periodic.sh
+4-3release/tools/gce.conf
+3-3usr.sbin/periodic/periodic.conf
+5-0sys/fs/nfs/nfs_commonsubs.c
+3-1release/tools/ec2.conf
+30-94 files not shown
+35-1310 files

HardenedBSD/src 9000459usr.sbin/periodic periodic.8 periodic.sh

periodic: Honor kern.localbase

Take kern.localbase into account with fallback to /usr/local and
also allow for LOCALBASE/etc/periodic.conf (similarly to what
many other utilities do).

Reviewed by:            imp
Differential Revision:  https://reviews.freebsd.org/D40435

(cherry picked from commit e5d7100c09e03e66535eee69d7e454c01e4a9d28)
DeltaFile
+7-2usr.sbin/periodic/periodic.8
+8-0usr.sbin/periodic/periodic.sh
+3-3usr.sbin/periodic/periodic.conf
+18-53 files

HardenedBSD/src 10e4da8share/man/man4 hwpmc.4, sys/contrib/openzfs/module/zfs refcount.c

Merge remote-tracking branch 'github/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+158-214usr.sbin/bhyve/snapshot.c
+99-90sys/contrib/openzfs/module/zfs/refcount.c
+128-41share/man/man4/hwpmc.4
+94-58sys/netlink/route/iface.c
+78-68sys/net/if.h
+48-94usr.sbin/bhyve/pci_emul.c
+605-56575 files not shown
+1,561-92681 files

HardenedBSD/src 0dbca78share/man/man4 hwpmc.4, sys/contrib/openzfs/module/zfs refcount.c

Merge remote-tracking branch 'freebsd/main' into hardened/current/master
DeltaFile
+158-214usr.sbin/bhyve/snapshot.c
+99-90sys/contrib/openzfs/module/zfs/refcount.c
+128-41share/man/man4/hwpmc.4
+94-58sys/netlink/route/iface.c
+78-68sys/net/if.h
+48-94usr.sbin/bhyve/pci_emul.c
+605-56575 files not shown
+1,561-92681 files

HardenedBSD/src e5d7100usr.sbin/periodic periodic.8 periodic.sh

periodic: Honor kern.localbase

Take kern.localbase into account with fallback to /usr/local and
also allow for LOCALBASE/etc/periodic.conf (similarly to what
many other utilities do).

Reviewed by:            imp
Differential Revision:  https://reviews.freebsd.org/D40435
MFC after:              2 weeks
DeltaFile
+7-2usr.sbin/periodic/periodic.8
+5-1usr.sbin/periodic/periodic.sh
+3-3usr.sbin/periodic/periodic.conf
+15-63 files

HardenedBSD/src 31367a1contrib/sqlite3 sqlite3.c, share/colldef_unicode zh_CN.UTF-8.src

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
DeltaFile
+40,646-40,658share/colldef_unicode/zh_CN.UTF-8.src
+46,300-0sys/contrib/dev/rtw88/rtw8822c_table.c
+0-27,824sys/contrib/openzfs/module/zstd/lib/zstd.c
+22,204-0sys/contrib/dev/rtw88/rtw8822b_table.c
+9,441-436sys/contrib/zlib/crc32.h
+5,931-3,922contrib/sqlite3/sqlite3.c
+124,522-72,84014,231 files not shown
+826,315-442,38114,237 files

HardenedBSD/src ffffd8dshare/man/man9 device_get_property.9, sys/dev/acpica acpi.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+143-37usr.sbin/bhyve/pci_passthru.c
+111-6usr.sbin/bhyve/pci_emul.c
+46-3sys/dev/fdt/simplebus.c
+37-3sys/kern/subr_bus.c
+24-2share/man/man9/device_get_property.9
+21-2sys/dev/acpica/acpi.c
+382-5322 files not shown
+514-10528 files

HardenedBSD/src 0784121share/man/man5 periodic.conf.5, usr.sbin/periodic periodic.conf

pfdenied: support reporting on additional anchors

The security/520-pfdenied script only reports blocked packets from the
main ruleset or any blocklistd(8) anchor.

Add an option to periodic.conf(5) to make it possible to specify
additional anchors to report.

PR:             262446
Reviewed by:    kp
DeltaFile
+8-1share/man/man5/periodic.conf.5
+1-1usr.sbin/periodic/etc/security/520.pfdenied
+1-0usr.sbin/periodic/periodic.conf
+10-23 files

HardenedBSD/src 143d88b. ObsoleteFiles.inc, share/man/man5 periodic.conf.5

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+0-34usr.sbin/periodic/etc/daily/330.news
+1-7share/man/man5/periodic.conf.5
+0-3usr.sbin/periodic/periodic.conf
+3-0ObsoleteFiles.inc
+0-1usr.sbin/periodic/etc/daily/Makefile
+4-455 files

HardenedBSD/src 901c52f. ObsoleteFiles.inc, share/man/man5 periodic.conf.5

periodic: remove obsolete news.expire

With the initial import of 386BSD 0.1 in 1993, the daily execution of
/etc/news.expire was introduced (see commit 1bf9d5d9518e).

In 1997, this was brought into periodic resulting in daily/330.news
(see commit 28dce04d1975). But as far as I see, /etc/news.expire has
never existed.

PR:         256238
MFC after:  1 week
Differential Revision:  https://reviews.freebsd.org/D30631
DeltaFile
+0-34usr.sbin/periodic/etc/daily/330.news
+1-7share/man/man5/periodic.conf.5
+3-0ObsoleteFiles.inc
+0-3usr.sbin/periodic/periodic.conf
+0-1usr.sbin/periodic/etc/daily/Makefile
+4-455 files

HardenedBSD/src 4cb7675sbin/ping/tests in_cksum_test.c, sys/fs/fuse fuse_vnops.c

Merge remote-tracking branch 'freebsd/stable/12' into hardened/12-stable/master
DeltaFile
+224-0usr.sbin/daemon/tests/daemon_test.sh
+156-0tests/sys/fs/fusefs/read.cc
+20-64sbin/ping/tests/in_cksum_test.c
+10-11sys/fs/fuse/fuse_vnops.c
+10-6sys/kern/vfs_bio.c
+4-6sys/kern/vfs_subr.c
+424-8715 files not shown
+474-10421 files

HardenedBSD/src 8461b8fusr.sbin/periodic periodic.conf

periodic: by default, skip 221.backup-gpart in jails

It can still be enabled as usual in /etc/periodic.conf

PR:             256253
Reported by:    delphij
Submitted by:   Miroslav Lachman <000.fbsd at quip.cz>

(cherry picked from commit fcf2227a557552e45646bbcf2422a98baab5c8a8)
DeltaFile
+6-1usr.sbin/periodic/periodic.conf
+6-11 files

HardenedBSD/src d429ecacontrib/apr configure, contrib/apr-util configure

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
DeltaFile
+0-32,465contrib/apr/configure
+31,999-0contrib/arm-optimized-routines/math/test/traces/sincosf.txt
+0-30,335contrib/subversion/configure
+0-25,340contrib/apr-util/configure
+0-16,709contrib/subversion/subversion/libsvn_wc/wc_db.c
+16,000-0contrib/arm-optimized-routines/math/test/traces/exp.txt
+47,999-104,84910,834 files not shown
+702,320-1,092,88210,840 files

HardenedBSD/src 26441b9sys/fs/fuse fuse_ipc.c fuse_vfsops.c, tests/sys/fs/fusefs mockfs.cc

Merge branch 'freebsd/13-stable/main' into hardened/13-stable/master

* freebsd/13-stable/main:
  periodic: by default, skip 221.backup-gpart in jails
  fusefs: ensure that FUSE ops' headers' unique values are actually unique
  fusefs: also debug INIT operations in the test suite
  fusefs: delete dead code
  fusefs: support EVFILT_WRITE on /dev/fuse
  fusefs: improve warnings about buggy FUSE servers
  fusefs: delete dead code
  vn_fullpath.9: update args after rev 364633
  id: sanitize arguments better
DeltaFile
+28-26sys/fs/fuse/fuse_ipc.c
+28-3tests/sys/fs/fusefs/mockfs.cc
+19-2sys/fs/fuse/fuse_vfsops.c
+19-1sys/fs/fuse/fuse_device.c
+8-11sys/fs/fuse/fuse_internal.c
+9-9sys/fs/fuse/fuse_vnops.c
+111-526 files not shown
+136-6712 files

HardenedBSD/src fd5b089usr.sbin/periodic periodic.conf

periodic: by default, skip 221.backup-gpart in jails

It can still be enabled as usual in /etc/periodic.conf

PR:             256253
Reported by:    delphij
Submitted by:   Miroslav Lachman <000.fbsd at quip.cz>

(cherry picked from commit fcf2227a557552e45646bbcf2422a98baab5c8a8)
DeltaFile
+6-1usr.sbin/periodic/periodic.conf
+6-11 files

HardenedBSD/src 121f5bbsecure/caroot/blacklisted Chambers_of_Commerce_Root_-_2008.pem Global_Chambersign_Root_-_2008.pem, secure/caroot/untrusted Chambers_of_Commerce_Root_-_2008.pem Global_Chambersign_Root_-_2008.pem

Merge branch 'freebsd/current/main' into hardened/current/master

* freebsd/current/main:
  NOTES: fix typo
  man9: add hz(9) and hardclock(9)
  NOTES: Update the HZ entry with latest advice.
  periodic: by default, skip 221.backup-gpart in jails
  secure/caroot, certctl: Rename secure/caroot/blacklisted
  devmatch: improve naming of devmatch config variable
DeltaFile
+0-152secure/caroot/blacklisted/Chambers_of_Commerce_Root_-_2008.pem
+152-0secure/caroot/untrusted/Chambers_of_Commerce_Root_-_2008.pem
+0-151secure/caroot/blacklisted/Global_Chambersign_Root_-_2008.pem
+151-0secure/caroot/untrusted/Global_Chambersign_Root_-_2008.pem
+0-141secure/caroot/blacklisted/LuxTrust_Global_Root_2.pem
+141-0secure/caroot/untrusted/LuxTrust_Global_Root_2.pem
+444-44485 files not shown
+4,073-3,80191 files

HardenedBSD/src fcf2227usr.sbin/periodic periodic.conf

periodic: by default, skip 221.backup-gpart in jails

It can still be enabled as usual in /etc/periodic.conf

PR:             256253
Reported by:    delphij
Submitted by:   Miroslav Lachman <000.fbsd at quip.cz>
MFC after:      2 weeks
DeltaFile
+6-1usr.sbin/periodic/periodic.conf
+6-11 files

HardenedBSD/src 34ab832contrib/binutils Makefile.in, contrib/terminus ter-u32n.bdf ter-u32b.bdf

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        Makefile.inc1 (unresolved)
        share/man/man5/src.conf.5 (unresolved)
        targets/pseudo/bootstrap-tools/Makefile (unresolved)
        tools/build/options/WITH_OFED_EXTRA (deleted)
DeltaFile
+71,590-432tools/tools/locale/etc/final-maps/widths.txt
+52,834-0contrib/terminus/ter-u32n.bdf
+52,834-0contrib/terminus/ter-u32b.bdf
+0-49,485contrib/binutils/Makefile.in
+47,418-0contrib/terminus/ter-u28b.bdf
+47,418-0contrib/terminus/ter-u28n.bdf
+272,094-49,91725,491 files not shown
+3,013,181-3,285,38525,497 files

HardenedBSD/src c7ce6b0contrib/libstdc++ configure, lib/clang/liblldb LLDBWrapLua.cpp

Merge branch 'hardened/current/master' into hardened/current/uninit-autoinit
DeltaFile
+0-111,817contrib/libstdc++/configure
+72,183-0lib/clang/liblldb/LLDBWrapLua.cpp
+71,590-432tools/tools/locale/etc/final-maps/widths.txt
+31,726-39,305share/ctypedef/ja_JP.eucJP.src
+59,521-0sys/contrib/dev/iwm/iwm-9000-34.fw.uu
+59,517-0sys/contrib/dev/iwm/iwm-9260-34.fw.uu
+294,537-151,55460,534 files not shown
+10,288,584-10,879,88160,540 files

HardenedBSD/src 95bac85share/man/man5 periodic.conf.5 mount.conf.5, usr.sbin/periodic periodic.conf

Merge branch 'freebsd/12-stable/master' into hardened/12-stable/master

* freebsd/12-stable/master:
  MFC r363169 by allanjude: Actually install the new 221.backup-gpart periodic script
  MFC r367436 and r367443 by rew:
  MFC r366615: man5: Fix a few typos spotted by igor
DeltaFile
+78-0usr.sbin/periodic/etc/daily/223.backup-zfs
+72-0usr.sbin/periodic/etc/daily/222.backup-gmirror
+67-2share/man/man5/periodic.conf.5
+14-1usr.sbin/periodic/periodic.conf
+4-1usr.sbin/periodic/etc/daily/Makefile
+1-2share/man/man5/mount.conf.5
+236-61 files not shown
+237-77 files

HardenedBSD/src b3415e1share/man/man5 periodic.conf.5, usr.sbin/periodic periodic.conf

MFC r367436 and r367443 by rew:

r367436
Add a periodic script to backup output generated from `zfs list`, `zfs get`,
`zpool list`, and `zpool get` commands.

Disabled by default.

r367443
Add a periodic script to backup output generated from `gmirror list`.

Disabled by default.

PR:             86388
Submitted by:   Miroslav Lachman <000 dot fbsd at quip dot cz>
Reported by:    Seklecki <Seklecki at FreeBSD dot org>
Reviewed by:    allanjude, 0mp, gbe
Event:          July 2020 Bugathon
Differential Revision:  https://reviews.freebsd.org/D25638
Differential Revision:  https://reviews.freebsd.org/D25631
DeltaFile
+78-0usr.sbin/periodic/etc/daily/223.backup-zfs
+72-0usr.sbin/periodic/etc/daily/222.backup-gmirror
+66-1share/man/man5/periodic.conf.5
+14-1usr.sbin/periodic/periodic.conf
+3-1usr.sbin/periodic/etc/daily/Makefile
+233-35 files

HardenedBSD/src 016ac5fshare/man/man5 periodic.conf.5, usr.sbin/periodic periodic.conf

MFC r367436 and r367443 by rew:

r367436
Add a periodic script to backup output generated from `zfs list`, `zfs get`,
`zpool list`, and `zpool get` commands.

Disabled by default.

r367443
Add a periodic script to backup output generated from `gmirror list`.

Disabled by default.

PR:             86388
Submitted by:   Miroslav Lachman <000 dot fbsd at quip dot cz>
Reported by:    Seklecki <Seklecki at FreeBSD dot org>
Reviewed by:    allanjude, 0mp, gbe
Event:          July 2020 Bugathon
Differential Revision:  https://reviews.freebsd.org/D25638
Differential Revision:  https://reviews.freebsd.org/D25631
DeltaFile
+78-0usr.sbin/periodic/etc/daily/223.backup-zfs
+72-0usr.sbin/periodic/etc/daily/222.backup-gmirror
+66-1share/man/man5/periodic.conf.5
+14-1usr.sbin/periodic/periodic.conf
+3-1usr.sbin/periodic/etc/daily/Makefile
+233-35 files