From nobody Wed Jan 24 12:05:24 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 4TKjMT6JMrz58814; Wed, 24 Jan 2024 12:05:25 +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 4TKjMT5nTsz4NwD; Wed, 24 Jan 2024 12:05:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706097925; 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=MHocrKvq6D+K1dhdeYlcmEOqnk6UVJsnK8JtpP6nENA=; b=dpxQO3IRHCIf7hnhtY+aEm/Mi6X3LoFSeBq3RBs7Fz7itaRTMkn0HSbWltKcQR2Y+QXxvj jqLeiHKB2fazjWYGn7rP/ugLr/NWTRg7sGQbHG2n+grArxmPaLnwdZJRmG0uR9uYFsCAm3 /DXCCJbqN3C22VQLLkXTocPir6NgzyRGfHcskgLpy2FyQF07s68KC9c3DL1EhI6Yz8p8RX KojztUuklfyj0ikO2M9s5Zgy1t5eI2yyFcMQg3uI/vDWdc53U+Ad7j0XQr3m/PknV0YvNg KTN+QnMJc+7/9rpSnybqhwBvud6LmZoPgU3SUsV8E6yR5WUySndqaOCd0a22+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706097925; 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=MHocrKvq6D+K1dhdeYlcmEOqnk6UVJsnK8JtpP6nENA=; b=OA/qBqNKHloMxJ7CXpDgzNcWqu2cdYvkxMjkGbQn4jwDAFtxqnp1sHr19Q8uZM2A/xYfQT m59xI30uydMuM2Bj+hEyuojt0HFtipUosTCi4fdQHg9I1+cpbGP9QddAKUYNhq5FAdWq87 +4OPU2Gr8xzC48taqpcdsu+P/66viJ+kmzp+bLjzWCgwu0HMsE26AYb1Z5mpFGww+0vVj/ duoUj/joudMCj15dxoRjXhYBB3yipauhok+xocvr2wJ9yAklz5jH0Davl2OC+hajs4E7jR w6J3CCjHREBHug40Z0Ci6yq7Yx6IzSoD627GHQ3mZD5g0Eg7RpoeYSsz6QZVDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706097925; a=rsa-sha256; cv=none; b=eWY6zk3w6XJBNnJ8PhtKJggCc7F/7ZGC23BI4x5gJEqeXtsO4SN84HEecluSrpsivq59KP ndzcrL07uNYhlbklJy97Bnu6jzens6X8D8pH2c0MUT6bB/VcGE8LSctRdFH69cN6j+wODw l1Es8NOJTqVqil0x39p6TvU3PWCyoFRA6lm2C8x1g9WBWDp36lbl/b0wUnGiykhwFYxHEX L6WvL2z3zHFDuH9voiUHM8zzo/XKNpKZnql+KJA+5JL8uknoV8U/cTdb4oSX3eFYDSYg1G x1++hir/xZBnZP3p+LiNanpl6DPBfd7G3SU78yj8J1Jjm0x1SKcweCfpzyVBJg== 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 4TKjMT4rwMzDgn; Wed, 24 Jan 2024 12:05:25 +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 40OC5O3u032255; Wed, 24 Jan 2024 12:05:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OC5OFr032252; Wed, 24 Jan 2024 12:05:24 GMT (envelope-from git) Date: Wed, 24 Jan 2024 12:05:24 GMT Message-Id: <202401241205.40OC5OFr032252@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: dd5dabe28483 - stable/14 - periodic: Fix periodic reports when log files are not compressed. 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: nyan X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dd5dabe284831a40bb8ef4749b352c03bf9f4a44 Auto-Submitted: auto-generated The branch stable/14 has been updated by nyan: URL: https://cgit.FreeBSD.org/src/commit/?id=dd5dabe284831a40bb8ef4749b352c03bf9f4a44 commit dd5dabe284831a40bb8ef4749b352c03bf9f4a44 Author: Yoshihiro Takahashi AuthorDate: 2024-01-10 11:48:56 +0000 Commit: Yoshihiro Takahashi CommitDate: 2024-01-24 12:04:50 +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 | 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 }