diff options
| author | Marcin Krol | 2024-04-01 15:58:18 (GMT) |
|---|---|---|
| committer | Marcin Krol | 2024-04-01 15:58:18 (GMT) |
| commit | 72eb62e97415e9617f9340d630101bd295c6eb46 (patch) | |
| tree | d8a95724a4d54a3a7625399bb9210774dd2becee | |
| parent | e5b59dba26acfb7ff510ea671f217ce31e900bb9 (diff) | |
| download | logcheck-master.zip logcheck-master.tar.gz | |
| -rw-r--r-- | logcheck-command_correct.patch | 21 | ||||
| -rw-r--r-- | logcheck-pld.patch | 5 |
2 files changed, 14 insertions, 12 deletions
diff --git a/logcheck-command_correct.patch b/logcheck-command_correct.patch index a487cb2..406a3d4 100644 --- a/logcheck-command_correct.patch +++ b/logcheck-command_correct.patch @@ -1,24 +1,25 @@ ---- logcheck-1.2.47.orig/src/logcheck 2006-07-06 10:16:42.000000000 +0000 -+++ logcheck-1.2.47/src/logcheck 2006-10-08 22:30:26.000000000 +0000 -@@ -73,7 +73,7 @@ - STATEDIR="/var/lib/logcheck" +diff -urNp -x '*.orig' logcheck.org/src/logcheck logcheck/src/logcheck +--- logcheck.org/src/logcheck 2019-03-01 22:42:31.000000000 +0100 ++++ logcheck/src/logcheck 2024-04-01 17:57:58.482699080 +0200 +@@ -75,7 +75,7 @@ STATEDIR="/var/lib/logcheck" LOGFILES_LIST="/etc/logcheck/logcheck.logfiles" + LOGFILES_LIST_D="/etc/logcheck/logcheck.logfiles.d" LOGFILE_FALLBACK="/var/log/syslog" -LOGTAIL="/usr/sbin/logtail2" +LOGTAIL="/usr/bin/logtail2" CAT="/bin/cat" SYSLOG_SUMMARY="/usr/bin/syslog-summary" -@@ -205,7 +205,7 @@ +@@ -214,7 +214,7 @@ cleanrules() { - if [ -d $dir ]; then + if [ -d "$dir" ]; then if [ ! -d "$cleaned" ]; then - mkdir "$cleaned" \ + install -d "$cleaned" \ || error "Could not make dir $cleaned for cleaned rulefiles." fi # run-parts doesn't include files which are not readable. Use this -@@ -623,7 +623,7 @@ +@@ -633,7 +633,7 @@ trap 'cleanup' 0 debug "Trying to get lockfile: $LOCKFILE.lock" if [ ! -d "$LOCKDIR" ]; then @@ -27,12 +28,12 @@ fi lockfile-create --retry 1 "$LOCKFILE" > /dev/null 2>&1 -@@ -661,7 +661,7 @@ +@@ -676,7 +676,7 @@ fi # Get the list of log files from config file # Handle log rotation correctly, idea taken from Wiktor Niesiobedzki. -mkdir "$TMPDIR/logoutput" \ +install -d "$TMPDIR/logoutput" \ || error "Could not mkdir for log files" - if [ ! $LOGFILE ] && [ -r $LOGFILES_LIST ]; then - for file in $(egrep --text -v "(^#|^[[:space:]]*$)" $LOGFILES_LIST); do + LOGFILES=$(ls -1d "$LOGFILES_LIST" "$LOGFILES_LIST_D"/*.logfiles 2>/dev/null) + if [ ! "$LOGFILE" ] && [ -n "$LOGFILES" ]; then diff --git a/logcheck-pld.patch b/logcheck-pld.patch index 39d1059..f7b29bb 100644 --- a/logcheck-pld.patch +++ b/logcheck-pld.patch @@ -1,5 +1,6 @@ ---- logcheck-1.2.46/etc/logcheck.logfiles~ 2004-04-19 21:22:03.000000000 +0300 -+++ logcheck-1.2.46/etc/logcheck.logfiles 2006-07-19 00:33:46.063944582 +0300 +diff -urNp -x '*.orig' logcheck.org/etc/logcheck.logfiles logcheck/etc/logcheck.logfiles +--- logcheck.org/etc/logcheck.logfiles 2015-12-10 19:14:10.000000000 +0100 ++++ logcheck/etc/logcheck.logfiles 2024-04-01 17:57:58.254695929 +0200 @@ -1,4 +1,4 @@ # these files will be checked by logcheck # This has been tuned towards a default syslog install |