Package: logcheck
Version: 1.3.20
Severity: normal
Tags: patch
Dear Maintainer,
Now that syslog-summary package has disappeared from unstable and
testing, remove support of it in logcheck.
-- System Information:
Debian Release: bullseye/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 5.10.0-2-amd64 (SMP w/4 CPU threads)
Locale: LANG=ja_JP.UTF-8, LC_CTYPE=ja_JP.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages logcheck depends on:
ii adduser 3.118
ii cron [cron-daemon] 3.0pl1-136
ii lockfile-progs 0.1.18
ii logtail 1.3.20
ii mime-construct 1.11+nmu3
ii postfix [mail-transport-agent] 3.5.6-1
ii rsyslog [system-log-daemon] 8.2012.0-1
Versions of packages logcheck recommends:
ii logcheck-database 1.3.20
Versions of packages logcheck suggests:
pn syslog-summary <none>
-- Configuration Files:
/etc/logcheck/logcheck.conf [Errno 13] Permission denied:
'/etc/logcheck/logcheck.conf'
/etc/logcheck/logcheck.logfiles [Errno 13] Permission denied:
'/etc/logcheck/logcheck.logfiles'
-- no debconf information
>From 2be0f96215198ceca66cf3819c310936c0a30ea9 Mon Sep 17 00:00:00 2001
From: Yasuhiro Kimura <y...@utahime.org>
Date: Fri, 29 Jan 2021 19:08:21 +0900
Subject: [PATCH] Remove support of syslog-summary package.
Now that syslog-summary package has disappeared from unstable and
testing, remove support of it in logcheck.
---
debian/control | 1 -
docs/logcheck.sgml | 7 -------
etc/logcheck.conf | 6 ------
src/logcheck | 23 +++++------------------
4 files changed, 5 insertions(+), 32 deletions(-)
diff --git a/debian/control b/debian/control
index ea1a970..3dffbbd 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Package: logcheck
Architecture: all
Depends: adduser, default-mta | mail-transport-agent, cron | cron-daemon,
rsyslog | system-log-daemon, mime-construct, logtail (>= 1.2.59),
lockfile-progs, ${misc:Depends}
Recommends: logcheck-database (>= ${source:Version})
-Suggests: syslog-summary
Description: mails anomalies in the system logfiles to the administrator
Logcheck helps spot problems and security violations in your logfiles
automatically and will send the results to you in e-mail.
diff --git a/docs/logcheck.sgml b/docs/logcheck.sgml
index 9871fc0..e347dac 100644
--- a/docs/logcheck.sgml
+++ b/docs/logcheck.sgml
@@ -218,13 +218,6 @@ manpage.1: manpage.sgml
<para>Do not remove the TMPDIR.</para>
</listitem>
</varlistentry>
- <varlistentry>
- <term><option>-u</option>
- </term>
- <listitem>
- <para>Enable syslog-summary.</para>
- </listitem>
- </varlistentry>
<varlistentry>
<term><option>-v</option>
</term>
diff --git a/etc/logcheck.conf b/etc/logcheck.conf
index c49ca05..5a0207a 100644
--- a/etc/logcheck.conf
+++ b/etc/logcheck.conf
@@ -55,12 +55,6 @@ FQDN=1
#RULEDIR="/etc/logcheck"
-# Controls if syslog-summary is run over each section.
-# Alternatively, set to "1" to enable extra summary.
-# HINT: syslog-summary needs to be installed.
-
-#SYSLOGSUMMARY=0
-
# Controls Subject: lines on logcheck reports:
#ATTACKSUBJECT="Security Alerts"
diff --git a/src/logcheck b/src/logcheck
index 091b40e..b998fa7 100755
--- a/src/logcheck
+++ b/src/logcheck
@@ -47,7 +47,7 @@ SECURITY=0
ATTACK=0
# Set the getopts string
-GETOPTS="c:dhH:l:L:D:m:opr:RsS:tTuvw"
+GETOPTS="c:dhH:l:L:D:m:opr:RsS:tTvw"
# Get the details for the email message
DATE="$(date +'%Y-%m-%d %H:%M %z')"
@@ -77,7 +77,6 @@ LOGFILES_LIST_D="/etc/logcheck/logcheck.logfiles.d"
LOGFILE_FALLBACK="/var/log/syslog"
LOGTAIL="/usr/sbin/logtail2"
CAT="/bin/cat"
-SYSLOG_SUMMARY="/usr/bin/syslog-summary"
# Set the options defaults
INTRO=1
@@ -90,7 +89,6 @@ REBOOT=0
FQDN=0
SORTUNIQ=0
SUPPORT_CRACKING_IGNORE=0
-SYSLOGSUMMARY=0
LOCKDIR=/run/lock/logcheck
LOCKFILE="$LOCKDIR/logcheck"
@@ -246,19 +244,9 @@ report() {
if [ -s "$TMPDIR/checked" ]; then
printheader "$*" >> "$TMPDIR/report" \
|| error "Could not append to report."
- if [ "$SYSLOGSUMMARY" -eq 1 ] && [ -x "$SYSLOG_SUMMARY" ]; then
- debug "report: running syslog-summary - $*"
- $SYSLOG_SUMMARY "$TMPDIR/checked" | \
- egrep -v "^Summarizing " | cat >> "$TMPDIR/report" \
- || error "Could not append to report."
- else
- if [ "$SYSLOGSUMMARY" -eq 1 ] && [ ! -x "$SYSLOG_SUMMARY" ]; then
- debug "report : WARNING : can't exec $SYSLOG_SUMMARY. Running
without summary"
- fi
- debug "report: cat'ing - $*"
- cat "$TMPDIR/checked" >> "$TMPDIR/report" \
- || error "Could not append to report."
- fi
+ debug "report: cat'ing - $*"
+ cat "$TMPDIR/checked" >> "$TMPDIR/report" \
+ || error "Could not append to report."
echo >> "$TMPDIR/report" \
|| error "Could not append to report."
return 0
@@ -450,7 +438,7 @@ usage() {
debug "usage: Printing usage and exiting"
cat<<EOF
usage: logcheck [-c CFG] [-d] [-h] [-H HOST] [-l LOG] [-L CFG] [-D DIR] [-m
MAIL] [-o]
- [-r DIR] [-s|-p|-w] [-R] [-S DIR] [-t] [-T] [-u]
+ [-r DIR] [-s|-p|-w] [-R] [-S DIR] [-t] [-T]
-c CFG = override default configuration file
-d = debug mode
-h = print this usage information and exit
@@ -467,7 +455,6 @@ usage: logcheck [-c CFG] [-d] [-h] [-H HOST] [-l LOG] [-L
CFG] [-D DIR] [-m MAIL
-S DIR = override default state directory
-t = testing mode, don't update the logfile offsets
-T = do not remove the TMPDIR
- -u = enable syslog-summary
-v = print version
-w = use the "workstation" runlevel
EOF
--
2.30.0
