From nobody Sun Dec 31 10:17:05 2023 X-Original-To: dev-commits-src-main@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 4T2w5Y724Fz55QYg; Sun, 31 Dec 2023 10:17:05 +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 4T2w5Y6Cq6z3PbQ; Sun, 31 Dec 2023 10:17:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704017825; 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=SQCDAeNP/2Jh/LwWSulSqndvyPrDKsfUUVKwX+R9xew=; b=cpKqxBG58S7MdHD+UZ6WNZGzmJtITWIOMZ8sXWsJiSugTvxJ3cIs+A3IBU6yN7J8TuNePL Z558ZehJLwUp4nZHpWhnvQngC5HJ+TfagtV7Vd7OL5t9sscAjtXf14o4dRuNOP/u9+slAK RSb/Y92Pn58O+Qrr91NwBfGhrz9Sf1pAM+Fck9BFc9FyaE4hRAk4xoO6VY/7TeYGJYnvXi 9zdx/WH1LayitXYJZpMqbIPWA8y7G5Dx+nifvXwWbXwhNNAR3M+6g6JwFk4rnkN4TvS8Vp z0l1ioWitKGgP6yxHblYN4CS+Yv3/vWYPRKVWA0vvQ8BS59WPdOkau/UqbmCYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704017825; a=rsa-sha256; cv=none; b=mmFoG+tuBi2mNI60boDFNLfcx97SLEYpMVl0jz1Cv18g1E/wpTVuvynSjeIP4t2p/lXjLg bylio0x6myUj7pFc2Tya/89akrd6AFPhrZxQfVfzbGYXLl9VOyUFewtpnSaOwIaqWR3/Ro jfpTGr/eHuzR8nihfjNaJpSIARc1/rUxkV0KsPi+8ddTe7Tjd8Ww9FkHYQb3nKUZREsMEA qb65diaLB9PxD5Lzmi9peVNg1HfdKajaibGizFSUK/HAQrGPPZM4v3fRgj/oU18qsWKQ6p 7TyOlLWCDbyCLMMx7Tycv44k7I0JMFS7f8yCFZyi9SJ/uekKmBwPlBhxTcY2nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704017825; 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=SQCDAeNP/2Jh/LwWSulSqndvyPrDKsfUUVKwX+R9xew=; b=cAsgaV4Qm3LWaGoqj6vtAwUrqfddN/xctF95vdSH+PcXmipQWJlfavDst+CwfFx8LXy1Vl p5trq+kVzFxfC8Ik00zEtFmBLD15G4BGdSupdwoFyL6K0qb/ZitpotfAtFWGQDPC9IJt6f Kfvho/hOV2biYV8/AYDeQoohQ6aoV4emeD40uzvFVrucEHdXtUb/iw5Y2taJ5GIXc6Wb78 OINs4qvWq9aiU2ayKEeor0CvjjqIJzC9crgmko40LftFlvabPYMc6VgtEQxZ19/goginvv 7/hwB00o8Gy1dF+cHUk7EIlE/dA6+IIfX0p7Trcbu+T9uYLQHQ6IgFfwAxwbAQ== 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 4T2w5Y53LZzVsY; Sun, 31 Dec 2023 10:17:05 +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 3BVAH5EF021643; Sun, 31 Dec 2023 10:17:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BVAH5Qb021640; Sun, 31 Dec 2023 10:17:05 GMT (envelope-from git) Date: Sun, 31 Dec 2023 10:17:05 GMT Message-Id: <202312311017.3BVAH5Qb021640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Osipov Subject: git: 3aa71ea7c231 - main - periodic: Make security diff(1) output as small is possible List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 3aa71ea7c231a4e60a7e1b9b677e379e17432fc8 Auto-Submitted: auto-generated The branch main has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=3aa71ea7c231a4e60a7e1b9b677e379e17432fc8 commit 3aa71ea7c231a4e60a7e1b9b677e379e17432fc8 Author: Michael Osipov AuthorDate: 2023-11-24 09:26:41 +0000 Commit: Michael Osipov 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(-) 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: