From nobody Tue Jan 30 11:44:33 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 4TPNcf0cZ1z58hPk; Tue, 30 Jan 2024 11:44:34 +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 4TPNcd6rbGz4PFF; Tue, 30 Jan 2024 11:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706615074; 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=oUZFNWD8gPThTMW4iWYlAAEGjZxWXi/9yVOpPgxKQNU=; b=LwqrlviKrOp5ztZ7qEwY1z/Po1OphiTYde1V6dv4d305kFX0zgZjOhyqtcBM4iVmsGrU2C 1md53M7a6JY2wQMFe8MiA6R1ircKClrsCCBld3BDXtdZZQQYTLhaljxxFPHgR5vb5gvkTK ZA2AUdBy53Funn8MJXi/MOAwltNDg3lLpa/HQgcH6rTJKf593FBtixUGW0L+Eitr/VHKeS RD/MyMGiVBcm33enrqciRIFlkF2mMhpq+EVWtYSPWFRJnfqhdIcW+n6idO+KMqSCt7OW6f mh20mm+Nsh62hRsrmFbIftivjOvheZicRA/n81kJizIkJicKxmqpQdV46D1nNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706615074; 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=oUZFNWD8gPThTMW4iWYlAAEGjZxWXi/9yVOpPgxKQNU=; b=EqswnecBZUiPxdv6y3CdhjtZZkUhqp/lO4rRyaVdr2L4qGT2uv2c3Ok4zc0GBKUuEiwnND x5vwVTtKgr1gFVp0pp0phQklYE0843OdxeN0PR+VL438pBrX6IlWd5HGSyOsJ3HYOBLPrh gorc1/S2D2NNeAZTgoR9gQQWtp8d+XK/I/9+ly2OHAVNUWqAglQOkBhQ1e4A6hodETGv2J H181/F8kcAuBUgRk0zKTxQ1D4R/2IETvwiftdyfAGWjgNU4zSZbQzmCgaJbGiAxqt3PfMk YOw9IDQGNv3PFrdE7YWJb46GVFQRfV2zdFPDbYMJp22dxN2nXR1KRPDd2+6dIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706615074; a=rsa-sha256; cv=none; b=ye5GTCn3zx2AY33R5gX9jhK3eIQowmU9hDc5A4YsddrdRrDWYlIJUa4dUjYamEOAVfegef mnagvIYuxJKCrG/A8yPDKuIWcfehR+RElkADb6Dcdijy0cEPkZ1vPTVRqeCwS7zHl+Bhvo Z2LebDQzZCbxdhTXryDzPn5/ApVRu7oZGqnrSRX9UazaC6ZX3l3EdF4pdvFRZmeV3gZFZO cVJk/Ng/EV5dDATmtJncyYhd8PAN2w/eq6gM2678Vq+Bb+UqMJnMui3qwcbWMtWJlFeZya bj9CoFbYbekkphZFMgZmXP6+1l3KLyZ+LP397a/kbGIdBfUOPXhrp3zV7XbxHw== 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 4TPNcd4cNCzZKJ; Tue, 30 Jan 2024 11:44:33 +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 40UBiXua042828; Tue, 30 Jan 2024 11:44:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40UBiX2e042825; Tue, 30 Jan 2024 11:44:33 GMT (envelope-from git) Date: Tue, 30 Jan 2024 11:44:33 GMT Message-Id: <202401301144.40UBiX2e042825@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: 6d9195b5f763 - stable/13 - periodic: Make security 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: 6d9195b5f763803f2bce37e0283563db76950aae Auto-Submitted: auto-generated The branch stable/13 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=6d9195b5f763803f2bce37e0283563db76950aae commit 6d9195b5f763803f2bce37e0283563db76950aae Author: Michael Osipov AuthorDate: 2023-11-24 09:26:41 +0000 Commit: Michael Osipov 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(-) diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5 index 681f3696b87f..6043263f3e3a 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 November 7, 2020 +.Dd December 31, 2023 .Dt PERIODIC.CONF 5 .Os .Sh NAME @@ -813,7 +813,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 d37928d09925..2da2ac1ae384 100644 --- a/usr.sbin/periodic/periodic.conf +++ b/usr.sbin/periodic/periodic.conf @@ -251,7 +251,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: