git: f17b760c1184 - main - security/logcheck: Update to 1.4.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 02 Mar 2023 09:09:09 UTC
The branch main has been updated by yasu:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f17b760c1184575885bb643f040f5e4242529635
commit f17b760c1184575885bb643f040f5e4242529635
Author: Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2023-03-02 08:32:04 +0000
Commit: Yasuhiro Kimura <yasu@FreeBSD.org>
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)