[packages/logcheck] - up to 1.3.20

[baggins]

commit e5b59dba26acfb7ff510ea671f217ce31e900bb9
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Jan 30 17:31:12 2021 +0100

    - up to 1.3.20

 logcheck-command_correct.patch |  8 ++------
 logcheck.spec                  | 11 +++++++----
 2 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/logcheck.spec b/logcheck.spec
index 9bf52d4..859fe8a 100644
--- a/logcheck.spec
+++ b/logcheck.spec
@@ -1,12 +1,12 @@
 Summary:	Mails anomalies in the system logfiles to the administrator
 Summary(pl.UTF-8):	Wysyłanie anomalii w logach systemowych pocztą do administratora
 Name:		logcheck
-Version:	1.3.15
+Version:	1.3.20
 Release:	1
 License:	GPL
 Group:		Applications/System
-Source0:	http://ftp.debian.org/debian/pool/main/l/logcheck/%{name}_%{version}.tar.gz
-# Source0-md5:	e3f002fddcdc01856c811872f4082a11
+Source0:	http://ftp.debian.org/debian/pool/main/l/logcheck/%{name}_%{version}.tar.xz
+# Source0-md5:	1c6e9a97f9cc485353c25147cb99fb25
 Patch0:		%{name}-pld.patch
 Patch1:		%{name}-command_correct.patch
 Source1:	%{name}.cron
@@ -104,10 +104,13 @@ te części plików logów systemowych, które nie zostały jeszcze
 przeczytane.
 
 %prep
-%setup -q
+%setup -q -n %{name}
 %patch0 -p1
 %patch1 -p1
 
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+bash(\s|$),#!/bin/bash\1,' \
+      src/logcheck
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/cron.d,%{_sbindir},%{_bindir}}
diff --git a/logcheck-command_correct.patch b/logcheck-command_correct.patch
index c893af7..a487cb2 100644
--- a/logcheck-command_correct.patch
+++ b/logcheck-command_correct.patch
@@ -9,7 +9,7 @@
  CAT="/bin/cat"
  SYSLOG_SUMMARY="/usr/bin/syslog-summary"
  
-@@ -205,10 +205,10 @@
+@@ -205,7 +205,7 @@
  
      if [ -d $dir ]; then 
          if [ ! -d "$cleaned" ]; then
@@ -17,11 +17,7 @@
 +	    install -d "$cleaned" \
  	        || error "Could not make dir $cleaned for cleaned rulefiles."
  	fi
--	for rulefile in $(run-parts --list "$dir"); do
-+	for rulefile in $(run-parts -u "$dir"); do
- 	    rulefile="$(basename "$rulefile")"
- 	    if [ -f "${dir}/${rulefile}" ]; then
- 		debug "cleanrules: ${dir}/${rulefile}"
+ 	# run-parts doesn't include files which are not readable. Use this
 @@ -623,7 +623,7 @@
  
  debug "Trying to get lockfile: $LOCKFILE.lock"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/logcheck.git/commitdiff/e5b59dba26acfb7ff510ea671f217ce31e900bb9