From nobody Wed Jan 24 12:09:51 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 4TKjSb52Ghz588MM; Wed, 24 Jan 2024 12:09:51 +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 4TKjSb47CTz4P9k; Wed, 24 Jan 2024 12:09:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706098191; 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=e9S1mn+jl0WBGaiss+T2Aq6XBCzZUdbRhbeQEkEDtLY=; b=IB6mDLrynrQATdcKWlpbs85B39F3+qKtr+VzAYaBXeXzDqQoYp8Xsq0gUMfgBQGoYdqDzZ 1RRLWlTeoVxnLNdxbYyIq3YO3IDRWLfUDXLDl9mOnEKA0cl88NdXG2bTld/DhbYaYEvlIn p/UISAsXXjtYFqcWPeMhRnOpmqEeFcyMkKz4wPRpb4dHMth2xLMpVHJ/fYLkY+mpmbB/W3 gqJWwjfBRzPEZpjP2NEfhM9zcRDyAKUnYkRbTtqGMIldNi6blBG+ban2CChGHcfmDz4FrS S2C52jGdVyuUld5QZiGLaIWeGq4iOXjumemz3GQ6eyM6N//qAGJHwn8MqhwEfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706098191; 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=e9S1mn+jl0WBGaiss+T2Aq6XBCzZUdbRhbeQEkEDtLY=; b=J3Bn+wlklf4g0x+SfUhTIleZekHdj+cWcEG8/s6gcz7WmIEKNV8Exl4CyOXNRgDHKJZmeM QpgNnmUujgmnEHo9p/8Lf4peygETUBBe96TW7BtVLr/yDdZbvQqyoTSx1R7xoVH483Bp0P MbTmBPig2t/MhabUPF/QSXcMICLK45KzvAlg0n6zfV38GuWkEU6XMf3wPZ0Yvn26y5aFFr ksscRfPJ2tXrue9oa86goMn/FPnaa0b4jT5U0X/eQAZjSPzPVNCrMpt1Q6O0p0+vqc/48p YwdvsmILJejEGaz11+iV6zK7XzPQQ8/dY+TJuaobqcKqXAqXLgqqRakkOY963w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706098191; a=rsa-sha256; cv=none; b=iJCIiG0TtgaRRjLL6wbojO32AkCRqE1Yq8TmFXG9SMdZXO3dOQPKA3U0DQ2hAoO2BJm6xD 1jTprbRWZysnfA1c5Tng4QnLKBmn11U1hyT1MgFtCB4uwo24yd6K8SwBBJGRuNCPQclr1X DWwvenourxd13e7FkU9uP3N7Dw/ngdWJegKCji8hLuo0DggJhf5biPot1rUacUYNZbjOFS jDnazDesbXDEOoT2uf3KhS8VgnrtCQKbbVJJ/nLzGq7ortVk7S0K3DPGm28Jk2D+OB2GyJ 1ZhGuPG2soBfnpUc5SUwWhBNfu7CNeatL0+wXNw3zSCuPBPaHiC3lJK4P00PcQ== 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 4TKjSb3BFtz1CGh; Wed, 24 Jan 2024 12:09:51 +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 40OC9p4f032979; Wed, 24 Jan 2024 12:09:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OC9pxY032976; Wed, 24 Jan 2024 12:09:51 GMT (envelope-from git) Date: Wed, 24 Jan 2024 12:09:51 GMT Message-Id: <202401241209.40OC9pxY032976@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Yoshihiro Takahashi Subject: git: f148fbe15373 - stable/13 - periodic: Fix periodic reports when log files are not compressed. 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: nyan X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f148fbe153738776c0e2263754e38cf7e0beb63e Auto-Submitted: auto-generated The branch stable/13 has been updated by nyan: URL: https://cgit.FreeBSD.org/src/commit/?id=f148fbe153738776c0e2263754e38cf7e0beb63e commit f148fbe153738776c0e2263754e38cf7e0beb63e Author: Yoshihiro Takahashi AuthorDate: 2024-01-10 11:48:56 +0000 Commit: Yoshihiro Takahashi CommitDate: 2024-01-24 12:08:58 +0000 periodic: Fix periodic reports when log files are not compressed. The modern zcat(1) is capable of handling compressed and uncompressed text files, so we can simply use zcat command. PR: 253168 Reviewed by: delphij MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D43357 (cherry picked from commit 1fa4ddcc6de6a0c46416f719a5b7efa1169f51ce) --- usr.sbin/periodic/etc/security/800.loginfail | 5 +---- usr.sbin/periodic/etc/security/900.tcpwrap | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/usr.sbin/periodic/etc/security/800.loginfail b/usr.sbin/periodic/etc/security/800.loginfail index 713f4fed47bf..c5a3a972aaa1 100755 --- a/usr.sbin/periodic/etc/security/800.loginfail +++ b/usr.sbin/periodic/etc/security/800.loginfail @@ -49,10 +49,7 @@ catmsgs() { sort -t. -r -n -k 2,2 | while read f do - case $f in - *.gz) zcat -f $f;; - *.bz2) bzcat -f $f;; - esac + zcat -f $f done [ -f ${LOG}/auth.log ] && cat $LOG/auth.log } diff --git a/usr.sbin/periodic/etc/security/900.tcpwrap b/usr.sbin/periodic/etc/security/900.tcpwrap index 132bc9865b18..55fa58f4df39 100755 --- a/usr.sbin/periodic/etc/security/900.tcpwrap +++ b/usr.sbin/periodic/etc/security/900.tcpwrap @@ -49,10 +49,7 @@ catmsgs() { sort -t. -r -n -k 2,2 | while read f do - case $f in - *.gz) zcat -f $f;; - *.bz2) bzcat -f $f;; - esac + zcat -f $f done [ -f ${LOG}/messages ] && cat $LOG/messages }