Date: Tue, 30 Jan 2024 11:42:08 GMT From: Michael Osipov <michaelo@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 538994626b9f - stable/14 - periodic: Make security diff(1) output as small is possible Message-ID: <202401301142.40UBg8vq042215@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by michaelo: 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(-) diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5 index 3ad39070839f..f434069bc96e 100644 --- a/share/man/man5/periodic.conf.5 +++ b/share/man/man5/periodic.conf.5 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 9, 2022 +.Dd December 31, 2023 .Dt PERIODIC.CONF 5 .Os .Sh NAME @@ -807,7 +807,8 @@ Set to the arguments to pass to the .Xr diff 1 utility when generating differences. The default is -.Fl b u . +.Fl b +.Fl U Cm 0 . .It Va security_status_chksetuid_enable .Pq Vt bool Set to diff --git a/usr.sbin/periodic/periodic.conf b/usr.sbin/periodic/periodic.conf index 8a69a7e703aa..0c35d33b63aa 100644 --- a/usr.sbin/periodic/periodic.conf +++ b/usr.sbin/periodic/periodic.conf @@ -248,7 +248,7 @@ security_show_badconfig="NO" # scripts returning 2 # These options are used by the security periodic(8) scripts spawned in # daily and weekly 450.status-security. security_status_logdir="/var/log" # Directory for logs -security_status_diff_flags="-b -u" # flags for diff output +security_status_diff_flags="-b -U 0" # flags for diff output # Each of the security_status_*_period options below can have one of the # following values:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401301142.40UBg8vq042215>