From nobody Tue Jan 30 11:44:35 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPNch0g7pz58hGs; Tue, 30 Jan 2024 11:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TPNcg6vgXz4PKS; Tue, 30 Jan 2024 11:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706615076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gW+bUr8Y2L5MIRQJnrBvPNJ9OoY6ppJGq8kxoHt4fEI=; b=R4VmO1tfNf0BV6GPzqOdHvPPNmG9gP2/oeHt/T6QEZgLGGc5LnTH0mBztMu0yRLDvmR9Fu iJ23Z+nGKq2brWTGh1JmmPW3kPazHgYWcJrcQAkZtl16ihRPV+ExxVrmOCWXxaS3of4s2v /WsU42cM8LdEqLKVM93JVL8Pe9rLeIb7SIVXQ3LlJ1KDwRIN6OsYuKUzy+mYRWwuVXw6E1 aKEBQFEam55bf/sujrpge41Kbx5WyzKEH7KPT/A7nsbieMjvuQOsCHSmCm+4o1aUwbUQYB kSsDeYWnh8pTAuMf/A/zjbt4zYZMrZPGtFVlAZI0wI6Kq2hseRJbVRhkf9egLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706615076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gW+bUr8Y2L5MIRQJnrBvPNJ9OoY6ppJGq8kxoHt4fEI=; b=jfAjXeLhIJ/h/Wn+dW2ykMv4GYKFNdjJzq9g57dbIcwQG5yIDSB3scQHMNFBurT3jLV5B2 9ERqOQ/BY16/LH03FsUzOaTpCQ0zwe46Iqjb8VdnHFZYP5SsMu7vWConKdgCjL8tjbI27v pTHUMFTNoMSYHOu+0sZU1qtFPDyvDbGGAw/J3UuLLHc5ohyNUUH0BF98Li7nKNgnho3vIe cM3ChiMv/sqyQwOYqaxclw/7oEYu8An3sI2yAnXWNuMm/wqpGAFsL5kCWOuLEgc9oRaPdP 2aEkQfjKyh0bc0hXbtUN0I91ZcnYbHQnYC3j+9NYr58oYMMs81T9EYLzQcb4nA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706615076; a=rsa-sha256; cv=none; b=MHJYtaZ+Udq3RKyL7P/bkH6sWxHyBd17JqHKu/bv+zV1tqSC2vBWY+EplLA5OeuhrZdBN5 ZgWGnOw1+0hL5pDXbYSA+arxEpWKWJ9O2rYthV/Dx12M9xwQYvG7noQ00Oomk1R4I3eLYq oYhdv0hdF6cr2mgHwqqVOTVqE3dOx6EUmRFLckPwrOjfDGonupXjaSa9RDEWOcBwU8IOkA 9kj5zfI7+r04bjg/dCY9VNogUHSVRqNTDEJyxOpzs+lDSlU2SHa8gW1y5JYce+aGCtDgEg jLvbDEGGAIww1YrZit7aGcPsAZuUEJhqOv4K4WJ0SBW2Urk0KEVN6FQVUC8Shw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TPNcg5yN3zZlK; Tue, 30 Jan 2024 11:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40UBiZi0042944; Tue, 30 Jan 2024 11:44:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40UBiZ0S042941; Tue, 30 Jan 2024 11:44:35 GMT (envelope-from git) Date: Tue, 30 Jan 2024 11:44:35 GMT Message-Id: <202401301144.40UBiZ0S042941@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 4c14a3a6aebe - stable/13 - periodic: Make daily diff(1) output as small is possible List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4c14a3a6aebe94d61da00c2dac2ef4bb2d9a2b3b Auto-Submitted: auto-generated The branch stable/13 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=4c14a3a6aebe94d61da00c2dac2ef4bb2d9a2b3b commit 4c14a3a6aebe94d61da00c2dac2ef4bb2d9a2b3b Author: Michael Osipov AuthorDate: 2023-11-24 09:26:41 +0000 Commit: Michael Osipov 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(-) diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5 index 1edc8bf14767..ab13ad7c2b66 100644 --- a/share/man/man5/periodic.conf.5 +++ b/share/man/man5/periodic.conf.5 @@ -650,6 +650,9 @@ All scripts must be absolute path names. Set to the arguments to pass to the .Xr diff 1 utility when generating differences. +The default is +.Fl b +.Fl U Cm 0 . .El .Pp The following variables are used by the standard scripts that reside in diff --git a/usr.sbin/periodic/etc/daily/200.backup-passwd b/usr.sbin/periodic/etc/daily/200.backup-passwd index e165e7f0f0ed..7cd52fc7be4b 100755 --- a/usr.sbin/periodic/etc/daily/200.backup-passwd +++ b/usr.sbin/periodic/etc/daily/200.backup-passwd @@ -40,7 +40,7 @@ case "$daily_backup_passwd_enable" in then [ $rc -lt 1 ] && rc=1 echo "$host passwd diffs:" - diff ${daily_diff_flags:--u} -I '^#' $bak/master.passwd.bak /etc/master.passwd |\ + diff ${daily_diff_flags} -I '^#' $bak/master.passwd.bak /etc/master.passwd |\ sed 's/^\([-+ ][^:]*\):[^:]*:/\1:(password):/' mv $bak/master.passwd.bak $bak/master.passwd.bak2 cp -p /etc/master.passwd $bak/master.passwd.bak || rc=3 @@ -57,7 +57,7 @@ case "$daily_backup_passwd_enable" in then [ $rc -lt 1 ] && rc=1 echo "$host group diffs:" - diff ${daily_diff_flags:--u} $bak/group.bak /etc/group + diff ${daily_diff_flags} $bak/group.bak /etc/group mv $bak/group.bak $bak/group.bak2 cp -p /etc/group $bak/group.bak || rc=3 fi diff --git a/usr.sbin/periodic/etc/daily/210.backup-aliases b/usr.sbin/periodic/etc/daily/210.backup-aliases index 25e2bd021a84..d236d9615dba 100755 --- a/usr.sbin/periodic/etc/daily/210.backup-aliases +++ b/usr.sbin/periodic/etc/daily/210.backup-aliases @@ -34,7 +34,7 @@ case "$daily_backup_aliases_enable" in then [ $rc -lt 1 ] && rc=1 echo "$host aliases diffs:" - diff ${daily_diff_flags:--u} $bak/aliases.bak /etc/mail/aliases + diff ${daily_diff_flags} $bak/aliases.bak /etc/mail/aliases mv $bak/aliases.bak $bak/aliases.bak2 cp -p /etc/mail/aliases $bak/aliases.bak || rc=3 fi diff --git a/usr.sbin/periodic/periodic.conf b/usr.sbin/periodic/periodic.conf index 6f52f3f1aacf..9fc2ad3af0d0 100644 --- a/usr.sbin/periodic/periodic.conf +++ b/usr.sbin/periodic/periodic.conf @@ -31,7 +31,7 @@ anticongestion_sleeptime=3600 # that output. $daily_output might be set to /var/log/daily.log if you # wish to log the daily output and have the files rotated by newsyslog(8) # -daily_diff_flags="" # flags for diff output +daily_diff_flags="-b -U 0" # flags for diff output daily_output="root" # user or /file daily_show_success="YES" # scripts returning 0 daily_show_info="YES" # scripts returning 1