From nobody Wed Jan 10 11:51:16 2024 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 4T95jc64gmz56lmR; Wed, 10 Jan 2024 11:51:16 +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 4T95jc5cJMz4SB4; Wed, 10 Jan 2024 11:51:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704887476; 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=3rICxalQZWJ8I8xyyAn2oI+gsyjsJwGogwrvA0Sii/0=; b=pyzj+IUU4l+WVpGsrDzyNLPndAWRsdUaMOGm87pMv923OVLrzPd8rAJrl61rt3vRv0/nxm r+SG0KIyH/AcDoX5+3c8fBudWtPLjN6YAZZxmfMM+HUhTFIGBqGw4Ps1rWL/HtOco6wDhT Z9wu9jTbSwa3eCeGxCKcowCyFrecJAvUqBAeJ74P9dvzg4yTqd482JDyp2+afH/gsNvP9P c2MDyenZurpQ2J2DuuV/Y/hxpGMFAIfg7lX3Mnwqa04EjHipVL9ZfPx5KV/KROBg/I428h 2J/pp5gdUExzG7QwhMzeEOI2SdcvGTy0JjS69TH+HFZREj7BRqRF4vy7FwoFcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704887476; 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=3rICxalQZWJ8I8xyyAn2oI+gsyjsJwGogwrvA0Sii/0=; b=kpl6rA+VoDVNp4l9LsvVvgQjFxQ4StM0lF+rBbm2f8e25WifJm8m7oSeYdOM+tpHuMVKxt 8nH8sqPfdWV3PzxrjabtB2IkdUu1UP8l4f/CeTNhzY7idJCd4Sep3N0EsRpVt+cp/rP8tb AyKzQcrkXJ1h21QUufwXdEyMa1Wz8ZDoedRATKit3IhGbezPi5ekEDWC7l2nD3/PeZEGxs T14o3VpDAiejUlti1mv/3ZQBa0Cwe5Xvy18JyvGJkiKkk2KM2iqjysDnQI/GbAIA72dG8k rlN5xlY5QMS7JfXrgUn/Hb4DKJDaaNoJ8JyI513CzMLYF+tXBJX5/wmmtX8+jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704887476; a=rsa-sha256; cv=none; b=l4E2UWr/LEssE+p3MZLCEZC40wun6UQtZShpD7qCFNYbPJafjbKPEUJ4Yy7xrzncm8TcQo wVaW3i5wPry0Vyi8SE3M6EB7YzPMO7a9b1yA/+Ct0JsoVycckMb8qmIJf9XEed6j5dCq1T H2mUXOI8htMX+1NcmxtFIKsGxqO++6GPRrzTBw25+vcdiFdy1/i89ak1zoSeWWZER2LN4Q yjmJpBxxOHbrejUn935epbnb+tPrsaxXACIHRpw6I2LVlpO28+bf6SytKXxiSdjtUQ9a8/ arIEJ8CktgRt4yFGqBKzLJkJuMaf9nH1AWICs4OxiE2HR9C4BqtlHYK76hXMxQ== 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 4T95jc4glPzZZD; Wed, 10 Jan 2024 11:51:16 +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 40ABpG32089034; Wed, 10 Jan 2024 11:51:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40ABpG4x089031; Wed, 10 Jan 2024 11:51:16 GMT (envelope-from git) Date: Wed, 10 Jan 2024 11:51:16 GMT Message-Id: <202401101151.40ABpG4x089031@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Yoshihiro Takahashi Subject: git: 1fa4ddcc6de6 - main - periodic: Fix periodic reports when log files are not compressed. 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: nyan X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1fa4ddcc6de6a0c46416f719a5b7efa1169f51ce Auto-Submitted: auto-generated The branch main has been updated by nyan: URL: https://cgit.FreeBSD.org/src/commit/?id=1fa4ddcc6de6a0c46416f719a5b7efa1169f51ce commit 1fa4ddcc6de6a0c46416f719a5b7efa1169f51ce Author: Yoshihiro Takahashi AuthorDate: 2024-01-10 11:48:56 +0000 Commit: Yoshihiro Takahashi CommitDate: 2024-01-10 11:48:56 +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 --- usr.sbin/periodic/etc/security/800.loginfail | 7 +------ usr.sbin/periodic/etc/security/900.tcpwrap | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/usr.sbin/periodic/etc/security/800.loginfail b/usr.sbin/periodic/etc/security/800.loginfail index 4329728f9505..c5a3a972aaa1 100755 --- a/usr.sbin/periodic/etc/security/800.loginfail +++ b/usr.sbin/periodic/etc/security/800.loginfail @@ -49,12 +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;; - *.xz) xzcat -f $f;; - *.zst) zstdcat -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 ae081ded6a95..55fa58f4df39 100755 --- a/usr.sbin/periodic/etc/security/900.tcpwrap +++ b/usr.sbin/periodic/etc/security/900.tcpwrap @@ -49,12 +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;; - *.xz) xzcat -f $f;; - *.zst) zstdcat -f $f;; - esac + zcat -f $f done [ -f ${LOG}/messages ] && cat $LOG/messages }