From nobody Thu Mar 02 09:09:09 2023 X-Original-To: dev-commits-ports-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 4PS4zV2yB8z3vZMf; Thu, 2 Mar 2023 09:09:10 +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 4PS4zT66fnz3mc7; Thu, 2 Mar 2023 09:09:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677748149; 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=P62QCeb/+uf0URGdd/RlCeanLTgcnuyGK9j8kpmGVD8=; b=qud6S2Th64lZ0jDkbr8CW4TEQV7EfbQx9DixBFJm1Nd7Rr7lBrwUbyRoDQNd0kyjIDI69a Cpr8FnEU0K/KIHRnsrwIWVWWuCYGC0+rMcNRJ9Z59N15/aLmTF47YMdFwNSiqHFwlUBSQP VzpVK7NDj23bId2aU/q6ifpu1eDgvK0JSBgaXE+uHs0GBA3CwgEHpurPcYJyPIsiEfQjU1 1KG8ySvFLsCowCkALFm0lXvhVDI7nSG3RgzQM4QmV5s/WZPrQEj7XdCnoYwjet+znb5BSI Ly+v6tlDq+I893PYfHKtoqOrMQIyJa7uOUED4PrFnmietkQbUNu/xZ/t4QiPcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677748149; 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=P62QCeb/+uf0URGdd/RlCeanLTgcnuyGK9j8kpmGVD8=; b=uong4xsdgN1CenLbylqf0adr2n8vdcagD8oWPFEIRXCZeLTlk4QX3MnD9nOECLVGS7F4HV 4ZAaqJW+2ZuL7ODAPyZ33iUM65tfIW1jHomPu2u3ORec2IVXL7ejSYr0lU6y6DJQA100yI cFaqtxJnRpNYtIlZjrVyJt+Be81ZoctDIUIwYgTZOJ6NBAXovVCzSe2zcMRhBXe7W7qNm/ gndpk3AuI6U9d+cV9Kyg8lPaFHQleltSxSRCMgeKIPnmDwXac71agARsRMhLKdA8J5Ja3t UojHORzIr2daAiZWEh+FPnK+61cyTQVJvwXwqwVlbG5hSR7w2xwqsQd2rdln8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677748149; a=rsa-sha256; cv=none; b=uaGq/dL5hrNjEc9SQbdSBsFJ+P3RUdbnyrRmtYijTzLp7E+N0iTMgtSpkvqcPLQIDZR5NZ uYSzthFHfwMm4jih2/ocNkaOvzAKqe8wIlljpGk1Eua8sSNEM1UpAyQmzgAorstOofTLJr eobTsIGZYwJJM9yKlYO7D+OZTqVs6szmS3AlZyyfnopBW3PnyoBclgcPZi8aL3JH4eWPQJ 1CFanlpwPB4cyssvUHkYBljB+jXshlFAJGrbr++sbsmuh8U39QrmzXYRxg8zigXjskUWNP p3wN5CZbkn+nDtbnUrL36qa5/UBqjQCLNqwoZiw0aXkHZYkdb4NDSV6wKAlVww== 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 4PS4zT5Bs7z19KZ; Thu, 2 Mar 2023 09:09:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 322999kQ032466; Thu, 2 Mar 2023 09:09:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322999mh032465; Thu, 2 Mar 2023 09:09:09 GMT (envelope-from git) Date: Thu, 2 Mar 2023 09:09:09 GMT Message-Id: <202303020909.322999mh032465@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: f17b760c1184 - main - security/logcheck: Update to 1.4.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f17b760c1184575885bb643f040f5e4242529635 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=f17b760c1184575885bb643f040f5e4242529635 commit f17b760c1184575885bb643f040f5e4242529635 Author: Yasuhiro Kimura AuthorDate: 2023-03-02 08:32:04 +0000 Commit: Yasuhiro Kimura CommitDate: 2023-03-02 09:08:34 +0000 security/logcheck: Update to 1.4.2 ChangeLog: https://salsa.debian.org/debian/logcheck/-/blob/debian/1.4.2/debian/changelog --- security/logcheck/Makefile | 2 +- security/logcheck/distinfo | 6 +++--- security/logcheck/files/patch-docs_README.logcheck | 13 ++++-------- .../logcheck/files/patch-etc_logcheck.logfiles | 4 ++-- security/logcheck/files/patch-src_logcheck | 24 +++++++++++++++++++--- 5 files changed, 31 insertions(+), 18 deletions(-) diff --git a/security/logcheck/Makefile b/security/logcheck/Makefile index 11831dceaf40..57395e7ab68f 100644 --- a/security/logcheck/Makefile +++ b/security/logcheck/Makefile @@ -1,5 +1,5 @@ PORTNAME= logcheck -DISTVERSION= 1.4.1 +DISTVERSION= 1.4.2 CATEGORIES= security MASTER_SITES= DEBIAN_POOL DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/security/logcheck/distinfo b/security/logcheck/distinfo index f8a41fb03453..f7eae3d435d1 100644 --- a/security/logcheck/distinfo +++ b/security/logcheck/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676208609 -SHA256 (logcheck_1.4.1.tar.xz) = 6ea06d7a4607c025cb45d7ab230d8b0245b26015a03f13ce109874817ca2d853 -SIZE (logcheck_1.4.1.tar.xz) = 138260 +TIMESTAMP = 1677745122 +SHA256 (logcheck_1.4.2.tar.xz) = 0c651deb31dc201f1584ecea292b259932bae6e3e8cef846db3109e89a7f217e +SIZE (logcheck_1.4.2.tar.xz) = 138440 diff --git a/security/logcheck/files/patch-docs_README.logcheck b/security/logcheck/files/patch-docs_README.logcheck index 0ad63ce7b395..13c4a91bb864 100644 --- a/security/logcheck/files/patch-docs_README.logcheck +++ b/security/logcheck/files/patch-docs_README.logcheck @@ -1,13 +1,8 @@ ---- docs/README.logcheck.orig 2017-01-25 21:08:04 UTC +--- docs/README.logcheck.orig 2023-03-01 22:37:09 UTC +++ docs/README.logcheck -@@ -17,11 +17,11 @@ don't start overlapping. - ====================================================================== - LOG ENTRIES - ----------- --These are taken from a specified set of logfiles (usually syslog and -+These are taken from a specified set of logfiles (usually messages and - auth.log); a special Perl utility named "logtail" is used which - "bookmarks" its place in the logs, so that events aren't reported +@@ -21,7 +21,7 @@ These are taken from a specified set of logfiles (usua + journal and syslog); a special Perl utility named "logtail" is used + which "bookmarks" its place in the logs, so that events aren't reported twice in successive logcheck runs. The offset records are stored as -(eg) "/var/lib/logcheck/offset.var.log.syslog"; lines to be +(eg) "%%DBDIR%%/offset.var.log.messages"; lines to be diff --git a/security/logcheck/files/patch-etc_logcheck.logfiles b/security/logcheck/files/patch-etc_logcheck.logfiles index 1f2f8f8709af..6b0e38d74a4c 100644 --- a/security/logcheck/files/patch-etc_logcheck.logfiles +++ b/security/logcheck/files/patch-etc_logcheck.logfiles @@ -1,4 +1,4 @@ ---- etc/logcheck.logfiles.orig 2023-02-10 21:19:27 UTC +--- etc/logcheck.logfiles.orig 2023-03-01 22:30:51 UTC +++ etc/logcheck.logfiles @@ -1,10 +1,10 @@ ## Logs that will be checked by logcheck @@ -8,7 +8,7 @@ +# end in '.logfiles') under %%ETCDIR%%/logcheck.logfiles.d/ # # It is recommended that you put local settings into --# /etc/logcheck.d/local.logfiles instead of editing this file +-# /etc/logcheck/logcheck.logfiles.d/local.logfiles instead of editing this file +# %%ETCDIR%%/logcheck.logfiles.d/local.logfiles instead of editing this file # # Each line should be: diff --git a/security/logcheck/files/patch-src_logcheck b/security/logcheck/files/patch-src_logcheck index cd584e1e9827..933a2cd2bf81 100644 --- a/security/logcheck/files/patch-src_logcheck +++ b/security/logcheck/files/patch-src_logcheck @@ -1,4 +1,4 @@ ---- src/logcheck.orig 2023-02-13 01:15:18 UTC +--- src/logcheck.orig 2023-03-02 08:19:09 UTC +++ src/logcheck @@ -24,16 +24,16 @@ @@ -72,7 +72,25 @@ rulefile="$(basename "$rulefile")" if [ -f "${dir}/${rulefile}" ]; then debug "cleanrules: ${dir}/${rulefile} -> $cleaned/$rulefile" -@@ -616,9 +616,9 @@ fi +@@ -503,7 +503,7 @@ logoutput() { + >> "$TMPDIR/report" || error "Could not write message about first-time check of journal to report" + echo "Only recent entries (from the last 5 hours) will be checked" \ + >> "$TMPDIR/report" || error "Could not write message about first-time check of journal to report" +- echo "If you do not wish to check the systemd journal, please see /etc/logcheck/logcheck.logfiles.d/journal.logfiles" \ ++ echo "If you do not wish to check the systemd journal, please see %%ETCDIR%%/logcheck.logfiles.d/journal.logfiles" \ + >> "$TMPDIR/report" || error "Could not write message about first-time check of journal to report" + offsettime="--since=-5h" + fi +@@ -587,7 +587,7 @@ debug "Sourcing - $CONFFILE" + + # Now source the config file - before things that should not be changed + if [ -r "$CONFFILE" ]; then +- # shellcheck source=/etc/logcheck/logcheck.conf ++ # shellcheck source=%%ETCDIR%%/logcheck.conf + . "$CONFFILE" + elif [ -f "$CONFFILE" ]; then + error "Config file $CONFFILE could not be read" +@@ -618,9 +618,9 @@ fi # HOSTNAME is either 'fully qualified' or 'short' if [ "$FQDN" -eq 1 ]; then @@ -84,7 +102,7 @@ fi # Now check for the other options -@@ -723,8 +723,8 @@ else +@@ -725,8 +725,8 @@ else fi # Create a secure temporary working directory (or exit)