- up to 1.3.14

Changed files:
    logcheck-command_correct.patch -> 1.5
    logcheck.spec -> 1.45

diff --git a/logcheck-command_correct.patch b/logcheck-command_correct.patch
index bbffb078dce5f2f7d2b11f09aa8227c445e04ef7..c893af783874fa3d2c1df95f983ad8a3c48e05ea 100644 (file)
--- a/logcheck-command_correct.patch
+++ b/logcheck-command_correct.patch
@@ -12,31 +12,31 @@
 @@ -205,10 +205,10 @@
  
      if [ -d $dir ]; then 
-         if [ ! -d $cleaned ]; then
--          mkdir $cleaned \
-+          install -d $cleaned \
+         if [ ! -d "$cleaned" ]; then
+-          mkdir "$cleaned" \
++          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
+-      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}"
 @@ -623,7 +623,7 @@
  
  debug "Trying to get lockfile: $LOCKFILE.lock"
- if [ ! -d $LOCKDIR ]; then 
--      mkdir -m 0755 $LOCKDIR
-+      install -d -m 0755 $LOCKDIR
+ if [ ! -d "$LOCKDIR" ]; then
+-      mkdir -m 0755 "$LOCKDIR"
++      install -d -m 0755 "$LOCKDIR"
  fi
- lockfile-create --retry 1 $LOCKFILE > /dev/null 2>&1
+ lockfile-create --retry 1 "$LOCKFILE" > /dev/null 2>&1
  
 @@ -661,7 +661,7 @@
  
  # 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 \
+-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

diff --git a/logcheck.spec b/logcheck.spec
index 4f9d68984796c04172ccd953275d05c847099222..ed08ebb69005ec7e1ec102efa91f041ed43d37e0 100644 (file)
--- 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.1
+Version:       1.3.14
 Release:       1
 License:       GPL
 Group:         Applications/System
 Source0:       http://ftp.debian.org/debian/pool/main/l/logcheck/%{name}_%{version}.tar.gz
-# Source0-md5: 1b000602ef86eebc30a60340484d79d7
+# Source0-md5: cbd32dbdcb877f267636205f33ede790
 Patch0:                %{name}-pld.patch
 Patch1:                %{name}-command_correct.patch
 Source1:       %{name}.cron
@@ -104,7 +104,7 @@ te części plików logów systemowych, które nie zostały jeszcze
 przeczytane.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1
 %patch1 -p1
 
@@ -156,6 +156,7 @@ fi
 %attr(640,root,logcheck) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/header.txt
 %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/%{name}
 %attr(755,root,root) %{_sbindir}/logcheck
+%attr(755,root,root) %{_bindir}/logcheck-test
 %dir %attr(770,root,logcheck) /var/lib/logcheck
 %dir %attr(770,root,logcheck) /var/lock/logcheck