From nobody Tue Jan 30 11:42:08 2024 X-Original-To: dev-commits-src-branches@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 4TPNYr6S6bz58hCl; Tue, 30 Jan 2024 11:42:08 +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 4TPNYr5Chqz4NFY; Tue, 30 Jan 2024 11:42:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706614928; 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=DPEf3WUDF7f/wJhZI42uA3rqh5FgNBxnMNHvrXJXbDY=; b=BpJ+jYmQFV9ppfg/e+wqA/BVPrBT7st0Ozz/Z3pL3ugFRYMcUqlWabS8avb6knQsBPxXww s7mumrpiJFCeZu4aCCx1FI+DHTa4v0Uz5C+x1hZsiR315VP7fACjGpS7IKPz3xSGP8a/Or tLdzgw/sU4ue3qx3Lm/0NG8Mj6UHcFUv9NNj/JJzo+I0oJJKq2ueTV5w2Ifudvqeu6ddF8 Cqgu24E083UpUIFJ+uIpfHfqljtdQCjlwXZzf8hPb+cpPtMY58cGDZYodkoVzKLip9lcwz U4sda3qfBm5IgcdUEmWp6QryPzEeIFIXXPrCt2Vl1dBpnbokgKUWx/ElRHhzKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706614928; 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=DPEf3WUDF7f/wJhZI42uA3rqh5FgNBxnMNHvrXJXbDY=; b=izPjE2lOkwVZvyxqPG8bMvPakLW+ZmqBIoCPRZfhkU5SypllxJNMh4PI92irzNRgXZYWL5 9Ykqqd2olrRu2u79hq2DC8aCKSs1Vb1J5k3jqEaL3GVCkoM/hzfQ4LlQ3bGtQPelJGdajf wOLxlDX5TdKkpgkuiA1YWQr796UM2G7C5IVEEBe4HPQ6/4kWSK/bnNj8AHwZDurwLSI+po PCxO87hUtzivoOPcdSzeCC2TrsDNyQ0mdik2yOvMndh5z7M1JG6zKTGPgmToD/Ozd16BhV oNVSlVf33GOZE4WdVQShyZv1YjpHMM0hoUtmut9BHiMvQRhdsNwB3eflwI0VWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706614928; a=rsa-sha256; cv=none; b=GTQ7InWZoQR9E9auUUomlCwQGGqyD1xg2QTaA7uibH/bBHIUduSkq48I6eVHwLGw+xn0Hf /2xX1OGKciGFq9tbQ/rY4i5Rl2nt0jXHevdqKJTJHMHqNydjYABzSpnbISAm04A/Krld7v gUf4FZAAps6QCmhzphlXuqs/rIUdC0uzyputPBNYwFZdf3BN3im9VcVlQfXPBldHSai7hv sZTGjo0MwCnQGUmLPhAajCs+xXe+6xZbupEHm2CjVlyEQnELiSzznPWSXDKyHNcPhvtbl2 g+oEwCHhOE6rz9l1Uad8Fdh9Zje3p1DWUrot8FJ37RVkUYFLVI4BTAvKYMcAbA== 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 4TPNYr4GTlzZnf; Tue, 30 Jan 2024 11:42:08 +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 40UBg8ms042218; Tue, 30 Jan 2024 11:42:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40UBg8vq042215; Tue, 30 Jan 2024 11:42:08 GMT (envelope-from git) Date: Tue, 30 Jan 2024 11:42:08 GMT Message-Id: <202401301142.40UBg8vq042215@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: 538994626b9f - stable/14 - periodic: Make security diff(1) output as small is possible List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 538994626b9f80a016bbb593d30cda2fac12f5e6 Auto-Submitted: auto-generated The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=538994626b9f80a016bbb593d30cda2fac12f5e6 commit 538994626b9f80a016bbb593d30cda2fac12f5e6 Author: Michael Osipov AuthorDate: 2023-11-24 09:26:41 +0000 Commit: Michael Osipov 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: