git: d14b5cc7f0ce - main - security/logcheck: Update to 1.4.4
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 04 May 2025 01:22:58 UTC
The branch main has been updated by yasu:
URL: https://cgit.FreeBSD.org/ports/commit/?id=d14b5cc7f0cea1f1da88be88ce2377ca4af11008
commit d14b5cc7f0cea1f1da88be88ce2377ca4af11008
Author: Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2025-05-04 00:10:04 +0000
Commit: Yasuhiro Kimura <yasu@FreeBSD.org>
CommitDate: 2025-05-04 01:15:32 +0000
security/logcheck: Update to 1.4.4
Fix DOCS and EXAMPLES options. Previously docs and examples are always
installed whether these options are enabled or not.
ChangeLog: https://salsa.debian.org/debian/logcheck/-/blob/debian/1.4.4/debian/changelog
---
security/logcheck/Makefile | 15 ++++++++------
security/logcheck/distinfo | 6 +++---
.../logcheck/files/patch-debian_logcheck.cron.d | 24 ++++++++++------------
.../patch-rulefiles__linux__ignore.d.server__ssh | 11 ----------
security/logcheck/files/patch-src_logcheck | 22 ++++++++++----------
security/logcheck/pkg-plist | 11 ++++++++--
6 files changed, 43 insertions(+), 46 deletions(-)
diff --git a/security/logcheck/Makefile b/security/logcheck/Makefile
index 8d29dd5b2cf6..c47b931a3c28 100644
--- a/security/logcheck/Makefile
+++ b/security/logcheck/Makefile
@@ -1,6 +1,5 @@
PORTNAME= logcheck
-DISTVERSION= 1.4.3
-PORTREVISION= 2
+DISTVERSION= 1.4.4
CATEGORIES= security
MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -71,10 +70,8 @@ do-build:
do-install:
@${MKDIR} ${STAGEDIR}${DATADIR}/detectrotate \
${STAGEDIR}${DBDIR} \
- ${STAGEDIR}${DOCSDIR} \
${STAGEDIR}${ETCDIR} \
${STAGEDIR}${ETCDIR}/logcheck.logfiles.d \
- ${STAGEDIR}${EXAMPLESDIR} \
${STAGEDIR}${RUNDIR}
${INSTALL_SCRIPT} ${WRKSRC}/src/logcheck-test ${STAGEDIR}${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/src/logcheck ${STAGEDIR}${PREFIX}/sbin
@@ -93,14 +90,20 @@ do-install:
.endfor
${INSTALL_DATA} ${WRKSRC}/src/detectrotate/*.dtr \
${STAGEDIR}${DATADIR}/detectrotate
- ${INSTALL_DATA} ${WRKSRC}/debian/logcheck.cron.d \
- ${STAGEDIR}${EXAMPLESDIR}/crontab.in
.for i in ${MAN1_FILES}
${INSTALL_MAN} ${WRKSRC}/docs/$i ${STAGEDIR}${PREFIX}/share/man/man1
.endfor
.for i in ${MAN8_FILES}
${INSTALL_MAN} ${WRKSRC}/docs/$i ${STAGEDIR}${PREFIX}/share/man/man8
.endfor
+
+do-install-DOCS-on:
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
+do-install-EXAMPLES-on:
+ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+ ${INSTALL_DATA} ${WRKSRC}/debian/logcheck.cron.d \
+ ${STAGEDIR}${EXAMPLESDIR}/crontab.in
+
.include <bsd.port.post.mk>
diff --git a/security/logcheck/distinfo b/security/logcheck/distinfo
index 207cfec31bed..a361a9724258 100644
--- a/security/logcheck/distinfo
+++ b/security/logcheck/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1689704376
-SHA256 (logcheck_1.4.3.tar.xz) = ad83ae80bd780bdae5eefd40ad59a3e97b85ad3a4962aa7c00d98ed3bdffcdd0
-SIZE (logcheck_1.4.3.tar.xz) = 138740
+TIMESTAMP = 1746315311
+SHA256 (logcheck_1.4.4.tar.xz) = d40e1a92707e19581cdc5f1596a56d26396f18b061612e84fb0fbd957bc03864
+SIZE (logcheck_1.4.4.tar.xz) = 143220
diff --git a/security/logcheck/files/patch-debian_logcheck.cron.d b/security/logcheck/files/patch-debian_logcheck.cron.d
index 0f33b88cb62a..ef8ab439bc74 100644
--- a/security/logcheck/files/patch-debian_logcheck.cron.d
+++ b/security/logcheck/files/patch-debian_logcheck.cron.d
@@ -1,16 +1,14 @@
---- debian/logcheck.cron.d.orig 2023-07-18 10:54:00 UTC
+--- debian/logcheck.cron.d.orig 2025-04-28 15:28:43 UTC
+++ debian/logcheck.cron.d
-@@ -1,9 +1,5 @@
--# /etc/cron.d/logcheck: crontab entries for the logcheck package
--
+@@ -1,8 +1,8 @@
+ # /etc/cron.d/logcheck: crontab entries for the logcheck package
+ # These do nothing under systemd because the systemd timer will take precedence
+
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-+# crontab entries for the logcheck package
-+PATH=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/sbin:%%PREFIX%%/bin
++PATH=%%PREFIX%%/sbin:%%PREFIX%%/bin:/sbin:/bin:/usr/sbin:/usr/bin
MAILTO=root
--
--@reboot logcheck if [ -x /usr/sbin/logcheck ]; then nice -n10 /usr/sbin/logcheck -R; fi
--2 * * * * logcheck if [ -x /usr/sbin/logcheck ]; then nice -n10 /usr/sbin/logcheck; fi
--
--# EOF
-+@reboot if [ -x %%PREFIX%%/sbin/logcheck ]; then /usr/bin/lockf -t 0 /tmp/.logcheck nice -n10 %%PREFIX%%/sbin/logcheck -R; fi
-+2 * * * * if [ -x %%PREFIX%%/sbin/logcheck ]; then /usr/bin/lockf -t 0 /tmp/.logcheck nice -n10 %%PREFIX%%/sbin/logcheck; fi
+
+-@reboot logcheck if [ ! -d /run/systemd/system ] && [ -x /usr/sbin/logcheck ]; then nice -n10 /usr/sbin/logcheck -R; fi
+-2 * * * * logcheck if [ ! -d /run/systemd/system ] && [ -x /usr/sbin/logcheck ]; then nice -n10 /usr/sbin/logcheck; fi
++@reboot logcheck if [ ! -d /run/systemd/system ] && [ -x %%PREFIX%%/sbin/logcheck ]; then nice -n10 %%PREFIX%%/sbin/logcheck -R; fi
++2 * * * * logcheck if [ ! -d /run/systemd/system ] && [ -x %%PREFIX%%/sbin/logcheck ]; then nice -n10 %%PREFIX%%/sbin/logcheck; fi
diff --git a/security/logcheck/files/patch-rulefiles__linux__ignore.d.server__ssh b/security/logcheck/files/patch-rulefiles__linux__ignore.d.server__ssh
deleted file mode 100644
index b54cf2add4de..000000000000
--- a/security/logcheck/files/patch-rulefiles__linux__ignore.d.server__ssh
+++ /dev/null
@@ -1,11 +0,0 @@
---- rulefiles/linux/ignore.d.server/ssh.orig 2022-12-22 23:03:11 UTC
-+++ rulefiles/linux/ignore.d.server/ssh
-@@ -14,7 +14,7 @@
- ^(\w{3} [ :[:digit:]]{11}|[0-9T:.+-]{32}) [._[:alnum:]-]+ sshd\[[[:digit:]]+\]: Postponed keyboard-interactive(/pam)? for (invalid user )?[^[:space:]]+ from [^[:space:]]+ port [[:digit:]]{1,5}( (ssh|ssh2)( \[preauth\])?)?$
- ^(\w{3} [ :[:digit:]]{11}|[0-9T:.+-]{32}) [._[:alnum:]-]+ sshd\[[[:digit:]]+\]: Received disconnect from [:.[:xdigit:]]+: [12]: Timeout, server not responding\.$
- ^(\w{3} [ :[:digit:]]{11}|[0-9T:.+-]{32}) [._[:alnum:]-]+ sshd\[[[:digit:]]+\]: Received disconnect from [:.[:xdigit:]]+(: | port [[:digit:]]{1,5}:)11: (disconnected by user|Closed due to user request\.|Bye Bye \[preauth\])$
--^(\w{3} [ :[:digit:]]{11}|[0-9T:.+-]{32}) [._[:alnum:]-]+ sshd\[[[:digit:]]+\]: Received disconnect from [:[:xdigit:].]+: [[:digit:]]+: .{0,256} \[preauth\]$
-+^(\w{3} [ :[:digit:]]{11}|[0-9T:.+-]{32}) [._[:alnum:]-]+ sshd\[[[:digit:]]+\]: Received disconnect from [:[:xdigit:].]+: [[:digit:]]+: .{0,255} \[preauth\]$
- ^(\w{3} [ :[:digit:]]{11}|[0-9T:.+-]{32}) [._[:alnum:]-]+ sshd\[[[:digit:]]+\]: Received disconnect from [:[:xdigit:].]+: [[:digit:]]+: Client disconnect$
- ^(\w{3} [ :[:digit:]]{11}|[0-9T:.+-]{32}) [._[:alnum:]-]+ sshd\[[[:digit:]]+\]: Received disconnect from [:[:xdigit:].]+: [[:digit:]]+: Disconnect requested by Windows SSH Client\.$
- ^(\w{3} [ :[:digit:]]{11}|[0-9T:.+-]{32}) [._[:alnum:]-]+ sshd\[[[:digit:]]+\]: Disconnected from( (invalid|authenticating))?( user [^[:space:]]+)? [:[:xdigit:].]+ port [[:digit:]]{1,5}( \[preauth\])?$
diff --git a/security/logcheck/files/patch-src_logcheck b/security/logcheck/files/patch-src_logcheck
index 933a2cd2bf81..dc1f0636f23b 100644
--- a/security/logcheck/files/patch-src_logcheck
+++ b/security/logcheck/files/patch-src_logcheck
@@ -1,6 +1,6 @@
---- src/logcheck.orig 2023-03-02 08:19:09 UTC
+--- src/logcheck.orig 2025-05-03 23:35:17 UTC
+++ src/logcheck
-@@ -24,16 +24,16 @@
+@@ -24,16 +24,16 @@ if [ "$(id -u)" = 0 ]; then
if [ "$(id -u)" = 0 ]; then
echo "logcheck should not be run as root. Use su to invoke logcheck:"
@@ -22,7 +22,7 @@
echo "fatal: lockfile-progs is a prerequisite for logcheck, but was not found."
exit 1
fi
-@@ -71,13 +71,13 @@ EVENTSSUBJECT="System Events"
+@@ -71,13 +71,13 @@ ADDTAG="no"
ADDTAG="no"
# Default paths
@@ -43,7 +43,7 @@
SYSLOG_SUMMARY="/usr/bin/syslog-summary"
# Defaults for options
-@@ -92,7 +92,7 @@ FQDN=0
+@@ -92,7 +92,7 @@ SYSLOGSUMMARY=0
SORTUNIQ=0
SUPPORT_CRACKING_IGNORE=0
SYSLOGSUMMARY=0
@@ -52,14 +52,14 @@
LOCKFILE="$LOCKDIR/logcheck"
# Allow globs to return zero files
-@@ -183,8 +183,8 @@ ${TMPDIR:+"- Check temporary directory: $TMPDIR"
+@@ -183,8 +183,8 @@ logfiles specified in;
}
- verify that the logcheck user can read all
logfiles specified in;
- /etc/logcheck/logcheck.logfiles
-- /etc/logcheck/logcheck.logfiled.d/*.logfiles
-+ %%ETCDIR%%/logcheck.logfiles
-+ %%ETCDIR%%/logcheck.logfiled.d/*.logfiles
+- /etc/logcheck/logcheck.logfiles.d/*.logfiles
++ %%ETCDIR%%/logcheck/logcheck.logfiles
++ %%ETCDIR%%/logcheck/logcheck.logfiles.d/*.logfiles
- check the system has enough space; (df -h output follows):
$(df -h 2>&1|| :)
- check the settings (environment follows):
@@ -81,7 +81,7 @@
>> "$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"
+@@ -589,7 +589,7 @@ if [ -r "$CONFFILE" ]; then
# Now source the config file - before things that should not be changed
if [ -r "$CONFFILE" ]; then
@@ -90,7 +90,7 @@
. "$CONFFILE"
elif [ -f "$CONFFILE" ]; then
error "Config file $CONFFILE could not be read"
-@@ -618,9 +618,9 @@ fi
+@@ -620,9 +620,9 @@ if [ "$FQDN" -eq 1 ]; then
# HOSTNAME is either 'fully qualified' or 'short'
if [ "$FQDN" -eq 1 ]; then
@@ -102,7 +102,7 @@
fi
# Now check for the other options
-@@ -725,8 +725,8 @@ else
+@@ -727,8 +727,8 @@ fi
fi
# Create a secure temporary working directory (or exit)
diff --git a/security/logcheck/pkg-plist b/security/logcheck/pkg-plist
index 09b74d5f028f..55dc71fbef56 100644
--- a/security/logcheck/pkg-plist
+++ b/security/logcheck/pkg-plist
@@ -14,7 +14,6 @@
%%ETCDIR%%/ignore.d.paranoid/logcheck
%%ETCDIR%%/ignore.d.paranoid/postfix
%%ETCDIR%%/ignore.d.paranoid/ppp
-%%ETCDIR%%/ignore.d.paranoid/pureftp
%%ETCDIR%%/ignore.d.paranoid/qpopper
%%ETCDIR%%/ignore.d.paranoid/squid
%%ETCDIR%%/ignore.d.paranoid/ssh
@@ -44,6 +43,7 @@
%%ETCDIR%%/ignore.d.server/cvs-pserver
%%ETCDIR%%/ignore.d.server/cvsd
%%ETCDIR%%/ignore.d.server/cyrus
+%%ETCDIR%%/ignore.d.server/dbus-daemon
%%ETCDIR%%/ignore.d.server/dcc
%%ETCDIR%%/ignore.d.server/ddclient
%%ETCDIR%%/ignore.d.server/dhclient
@@ -80,6 +80,7 @@
%%ETCDIR%%/ignore.d.server/krb5-kdc
%%ETCDIR%%/ignore.d.server/libpam-krb5
%%ETCDIR%%/ignore.d.server/libpam-mount
+%%ETCDIR%%/ignore.d.server/libpam-systemd
%%ETCDIR%%/ignore.d.server/logcheck
%%ETCDIR%%/ignore.d.server/login
%%ETCDIR%%/ignore.d.server/maradns
@@ -92,6 +93,8 @@
%%ETCDIR%%/ignore.d.server/nntpcache
%%ETCDIR%%/ignore.d.server/nscd
%%ETCDIR%%/ignore.d.server/nslcd
+%%ETCDIR%%/ignore.d.server/opendkim
+%%ETCDIR%%/ignore.d.server/opendmarc
%%ETCDIR%%/ignore.d.server/openvpn
%%ETCDIR%%/ignore.d.server/otrs
%%ETCDIR%%/ignore.d.server/passwd
@@ -106,12 +109,12 @@
%%ETCDIR%%/ignore.d.server/procmail
%%ETCDIR%%/ignore.d.server/proftpd
%%ETCDIR%%/ignore.d.server/pure-ftpd
-%%ETCDIR%%/ignore.d.server/pureftp
%%ETCDIR%%/ignore.d.server/qpopper
%%ETCDIR%%/ignore.d.server/rbldnsd
%%ETCDIR%%/ignore.d.server/rpc_statd
%%ETCDIR%%/ignore.d.server/rsnapshot
%%ETCDIR%%/ignore.d.server/rsync
+%%ETCDIR%%/ignore.d.server/runuser
%%ETCDIR%%/ignore.d.server/sa-exim
%%ETCDIR%%/ignore.d.server/samba
%%ETCDIR%%/ignore.d.server/saned
@@ -135,7 +138,9 @@
%%ETCDIR%%/ignore.d.server/sympa
%%ETCDIR%%/ignore.d.server/syslogd
%%ETCDIR%%/ignore.d.server/systemd
+%%ETCDIR%%/ignore.d.server/systemd-journald
%%ETCDIR%%/ignore.d.server/systemd-logind
+%%ETCDIR%%/ignore.d.server/systemd-networkd
%%ETCDIR%%/ignore.d.server/systemd-timesyncd
%%ETCDIR%%/ignore.d.server/teapop
%%ETCDIR%%/ignore.d.server/telnetd
@@ -149,6 +154,7 @@
%%ETCDIR%%/ignore.d.server/watchdog
%%ETCDIR%%/ignore.d.server/wu-ftpd
%%ETCDIR%%/ignore.d.server/xinetd
+%%ETCDIR%%/ignore.d.workstation/NetworkManager
%%ETCDIR%%/ignore.d.workstation/automount
%%ETCDIR%%/ignore.d.workstation/bind
%%ETCDIR%%/ignore.d.workstation/bluetooth-alsa
@@ -176,6 +182,7 @@
%%ETCDIR%%/ignore.d.workstation/ppp
%%ETCDIR%%/ignore.d.workstation/proftpd
%%ETCDIR%%/ignore.d.workstation/pump
+%%ETCDIR%%/ignore.d.workstation/rtkit-daemon
%%ETCDIR%%/ignore.d.workstation/sendfile
%%ETCDIR%%/ignore.d.workstation/slim
%%ETCDIR%%/ignore.d.workstation/squid