Some periodic scripts use diff(1) to show differences: ======= root@deblndw013x3j:/etc/periodic # grep -r "diff " /etc/periodic /etc/periodic/daily/221.backup-gpart: [ -n "$show_diff" ] && diff "${file}.bak" "${file}.tmp" /etc/periodic/daily/210.backup-aliases: diff -u $bak/aliases.bak /etc/mail/aliases /etc/periodic/daily/200.backup-passwd: diff -uI '^#' $bak/master.passwd.bak /etc/master.passwd |\ /etc/periodic/daily/200.backup-passwd: diff -u $bak/group.bak /etc/group /etc/periodic/daily/222.backup-gmirror: [ -n "$show_diff" ] && diff "${file}.bak" "${file}.tmp" /etc/periodic/daily/223.backup-zfs: [ -n "$show_diff" ] && diff "${file}.bak" "${file}.tmp" /etc/periodic/security/200.chkmounts: check_diff mount - "${host} changes in mounted filesystems:" /etc/periodic/security/510.ipfdenied: check_diff new_only ipf ${TMP} "${host} ipf denied packets:" /etc/periodic/security/700.kernelmsg: check_diff new_only dmesg - "${host} kernel log messages:" /etc/periodic/security/100.chksetuid: check_diff setuid - "${host} setuid diffs:" /etc/periodic/security/610.ipf6denied: check_diff new_only ipf6 ${TMP} "${host} ipf6 denied packets:" /etc/periodic/security/security.functions: diff ${security_status_diff_flags} ${LOG}/${label}.today \ /etc/periodic/security/520.pfdenied: check_diff new_only pf ${TMP} "${host} pf denied packets:" /etc/periodic/security/500.ipfwdenied: check_diff new_only ipfw ${TMP} "${host} ipfw denied packets:" ================ To reduce email output it should use "-U 0" by default to omit unaffected lines in the diffed files.
Here is an example of output noise: > deblndw011x.ad001.siemens.net changes in mounted filesystems: > --- /var/log/mount.today 2023-03-12 03:30:32.000000000 +0100 > +++ /tmp/security.zltUP9qB 2023-03-17 03:24:27.760079000 +0100 > @@ -15,6 +15,7 @@ > /dev/gvinum/poudriere /var/poudriere ufs rw 2 2 > /dev/gvinum/svn /var/svn ufs rw 2 2 > /usr/jails/basejail /usr/jails/deblndw011x1j.ad001.siemens.net/basejail nullfs ro 0 0 > +deblndw001x:/home /net/home nfs rw,nosuid 0 0 > devfs /compat/linux/dev devfs rw 0 0 > devfs /dev devfs rw 0 0 > devfs /usr/jails/deblndw011x1j.ad001.siemens.net/dev devfs rw 0 0 One line is bloated to 7 due to context of 3.
I can provide a Git-formatted patch here.
Working on a patch...
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=3aa71ea7c231a4e60a7e1b9b677e379e17432fc8 commit 3aa71ea7c231a4e60a7e1b9b677e379e17432fc8 Author: Michael Osipov <michaelo@FreeBSD.org> AuthorDate: 2023-11-24 09:26:41 +0000 Commit: Michael Osipov <michaelo@FreeBSD.org> CommitDate: 2023-12-31 10:16:30 +0000 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 share/man/man5/periodic.conf.5 | 5 +++-- usr.sbin/periodic/periodic.conf | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=15e35d058cff847d1a7bc671fcf48b99f5d2f73b commit 15e35d058cff847d1a7bc671fcf48b99f5d2f73b Author: Michael Osipov <michaelo@FreeBSD.org> AuthorDate: 2023-11-24 09:26:41 +0000 Commit: Michael Osipov <michaelo@FreeBSD.org> CommitDate: 2023-12-31 10:22:19 +0000 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 share/man/man5/periodic.conf.5 | 5 +++++ usr.sbin/periodic/etc/daily/200.backup-passwd | 4 ++-- usr.sbin/periodic/etc/daily/210.backup-aliases | 2 +- usr.sbin/periodic/etc/daily/221.backup-gpart | 2 +- usr.sbin/periodic/etc/daily/222.backup-gmirror | 2 +- usr.sbin/periodic/etc/daily/223.backup-zfs | 2 +- usr.sbin/periodic/periodic.conf | 1 + 7 files changed, 12 insertions(+), 6 deletions(-)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=e2f6bafc3887c7752986526f3758525d24701fce commit e2f6bafc3887c7752986526f3758525d24701fce Author: Michael Osipov <michaelo@FreeBSD.org> AuthorDate: 2023-11-24 09:26:41 +0000 Commit: Michael Osipov <michaelo@FreeBSD.org> CommitDate: 2023-12-31 10:24:43 +0000 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 share/man/man5/periodic.conf.5 | 3 +++ usr.sbin/periodic/etc/daily/200.backup-passwd | 4 ++-- usr.sbin/periodic/etc/daily/210.backup-aliases | 2 +- usr.sbin/periodic/periodic.conf | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-)
A commit in branch stable/14 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=128e78ffb0847640ca5b411b4f55eb915d7ca15e commit 128e78ffb0847640ca5b411b4f55eb915d7ca15e Author: Michael Osipov <michaelo@FreeBSD.org> AuthorDate: 2023-11-24 09:26:41 +0000 Commit: Michael Osipov <michaelo@FreeBSD.org> CommitDate: 2024-01-30 11:41:38 +0000 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) share/man/man5/periodic.conf.5 | 3 +++ usr.sbin/periodic/etc/daily/200.backup-passwd | 4 ++-- usr.sbin/periodic/etc/daily/210.backup-aliases | 2 +- usr.sbin/periodic/periodic.conf | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-)
A commit in branch stable/14 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=538994626b9f80a016bbb593d30cda2fac12f5e6 commit 538994626b9f80a016bbb593d30cda2fac12f5e6 Author: Michael Osipov <michaelo@FreeBSD.org> AuthorDate: 2023-11-24 09:26:41 +0000 Commit: Michael Osipov <michaelo@FreeBSD.org> CommitDate: 2024-01-30 11:40:48 +0000 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) share/man/man5/periodic.conf.5 | 5 +++-- usr.sbin/periodic/periodic.conf | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
A commit in branch stable/14 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=37dc394170a5cbb85adde6753bd33f9d10b87022 commit 37dc394170a5cbb85adde6753bd33f9d10b87022 Author: Michael Osipov <michaelo@FreeBSD.org> AuthorDate: 2023-11-24 09:26:41 +0000 Commit: Michael Osipov <michaelo@FreeBSD.org> CommitDate: 2024-01-30 11:41:30 +0000 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) share/man/man5/periodic.conf.5 | 5 +++++ usr.sbin/periodic/etc/daily/200.backup-passwd | 4 ++-- usr.sbin/periodic/etc/daily/210.backup-aliases | 2 +- usr.sbin/periodic/etc/daily/221.backup-gpart | 2 +- usr.sbin/periodic/etc/daily/222.backup-gmirror | 2 +- usr.sbin/periodic/etc/daily/223.backup-zfs | 2 +- usr.sbin/periodic/periodic.conf | 1 + 7 files changed, 12 insertions(+), 6 deletions(-)
A commit in branch stable/13 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=4c14a3a6aebe94d61da00c2dac2ef4bb2d9a2b3b commit 4c14a3a6aebe94d61da00c2dac2ef4bb2d9a2b3b Author: Michael Osipov <michaelo@FreeBSD.org> AuthorDate: 2023-11-24 09:26:41 +0000 Commit: Michael Osipov <michaelo@FreeBSD.org> CommitDate: 2024-01-30 11:44:14 +0000 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) share/man/man5/periodic.conf.5 | 3 +++ usr.sbin/periodic/etc/daily/200.backup-passwd | 4 ++-- usr.sbin/periodic/etc/daily/210.backup-aliases | 2 +- usr.sbin/periodic/periodic.conf | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-)
A commit in branch stable/13 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=6455c2cf85a920577dfe6bced32f97d9216abc73 commit 6455c2cf85a920577dfe6bced32f97d9216abc73 Author: Michael Osipov <michaelo@FreeBSD.org> AuthorDate: 2023-11-24 09:26:41 +0000 Commit: Michael Osipov <michaelo@FreeBSD.org> CommitDate: 2024-01-30 11:43:54 +0000 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) share/man/man5/periodic.conf.5 | 5 +++++ usr.sbin/periodic/etc/daily/200.backup-passwd | 4 ++-- usr.sbin/periodic/etc/daily/210.backup-aliases | 2 +- usr.sbin/periodic/etc/daily/221.backup-gpart | 2 +- usr.sbin/periodic/etc/daily/222.backup-gmirror | 2 +- usr.sbin/periodic/etc/daily/223.backup-zfs | 2 +- usr.sbin/periodic/periodic.conf | 1 + 7 files changed, 12 insertions(+), 6 deletions(-)
A commit in branch stable/13 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=6d9195b5f763803f2bce37e0283563db76950aae commit 6d9195b5f763803f2bce37e0283563db76950aae Author: Michael Osipov <michaelo@FreeBSD.org> AuthorDate: 2023-11-24 09:26:41 +0000 Commit: Michael Osipov <michaelo@FreeBSD.org> CommitDate: 2024-01-30 11:43:33 +0000 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) share/man/man5/periodic.conf.5 | 5 +++-- usr.sbin/periodic/periodic.conf | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
Fixed in main, stable/14, stable/13.