[packages/logwatch] Up to 7.14

arekm arekm at pld-linux.org
Fri May 8 17:46:40 CEST 2026 

commit 8b69da409117be577b2e4b4916ebe5e40e09ce97
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Fri May 8 17:46:12 2026 +0200

    Up to 7.14

 logwatch-archives.patch | 96 ++++++++++++++++++++++++++-----------------------
 logwatch-log_conf.patch |  6 ++--
 logwatch-vsftpd.patch   | 62 --------------------------------
 logwatch.spec           | 37 +++++++++----------
 4 files changed, 71 insertions(+), 130 deletions(-)
---
diff --git a/logwatch.spec b/logwatch.spec
index ed092b5..927adb5 100644
--- a/logwatch.spec
+++ b/logwatch.spec
@@ -1,23 +1,19 @@
 Summary:	Analyzes system logs
 Summary(pl.UTF-8):	Logwatch - analizator logów systemowych
 Name:		logwatch
-Version:	7.5.3
+Version:	7.14
 Release:	1
 License:	MIT
 Group:		Applications/System
-Source0:	http://downloads.sourceforge.net/logwatch/%{name}-%{version}.tar.gz
-# Source0-md5:	8bcf3edc5a4687c8aad1b9c01e2be54b
-# https://po2.uni-stuttgart.de/~rusjako/logwatch/default.html
-Source1:	https://po2.uni-stuttgart.de/~rusjako/logwatch/%{name}-syslog-ng.tar.gz
-# Source1-md5:	2f834407b85080e8e6556d6182d245aa
-Source2:	%{name}.sysconfig
-Source3:	%{name}-cron.sh
-Source4:	%{name}.cron
-Source5:	%{name}.tmpwatch
+Source0:	https://downloads.sourceforge.net/logwatch/%{name}-%{version}.tar.gz
+# Source0-md5:	c7f6bb649d36be0b00ef710ea889f4b5
+Source1:	%{name}.sysconfig
+Source2:	%{name}-cron.sh
+Source3:	%{name}.cron
+Source4:	%{name}.tmpwatch
 Patch0:		%{name}-log_conf.patch
 Patch1:		%{name}-archives.patch
-Patch2:		%{name}-vsftpd.patch
-Patch3:		%{name}-exim.patch
+Patch2:		%{name}-exim.patch
 URL:		https://sourceforge.net/projects/logwatch
 BuildRequires:	rpm-perlprov
 Requires:	crondaemon
@@ -43,11 +39,10 @@ pocztą elektroniczną do administratora systemu. Logwatch jest łatwy w
 użyciu i może pracować na większości systemów.
 
 %prep
-%setup -q -a1
+%setup -q
 %patch -P0 -p1
 %patch -P1 -p1
 %patch -P2 -p1
-%patch -P3 -p1
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -55,7 +50,7 @@ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_logwatchconf}/{conf,scripts},/etc/{cron.d,sysconfig,tmpwatch}} \
-	$RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man{5,8},%{_logwatchdir}/{lib,default.conf},/var/cache/logwatch}
+	$RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man{1,5,8},%{_logwatchdir}/{lib,default.conf},/var/cache/logwatch}
 
 cp -p conf/logwatch.conf $RPM_BUILD_ROOT%{_logwatchconf}/conf
 cp -p conf/logwatch.conf $RPM_BUILD_ROOT%{_logwatchdir}/default.conf
@@ -72,21 +67,21 @@ cp -a conf/services $RPM_BUILD_ROOT%{_logwatchdir}/default.conf
 cp -a conf/logfiles $RPM_BUILD_ROOT%{_logwatchconf}/conf
 cp -a conf/logfiles $RPM_BUILD_ROOT%{_logwatchdir}/default.conf
 cp -a scripts $RPM_BUILD_ROOT%{_logwatchdir}
-cp -p logwatch-syslog-ng/syslog-ng.conf $RPM_BUILD_ROOT%{_logwatchconf}/conf/services
-cp -p logwatch-syslog-ng/syslog-ng $RPM_BUILD_ROOT%{_logwatchdir}/scripts/services
 
 mv $RPM_BUILD_ROOT%{_logwatchdir}/scripts/logwatch.pl $RPM_BUILD_ROOT%{_sbindir}/logwatch
 
 ln -sf %{_sbindir}/logwatch $RPM_BUILD_ROOT%{_logwatchdir}/scripts/logwatch.pl
 
-install -p %{SOURCE3} $RPM_BUILD_ROOT%{_sbindir}/logwatch-cron
-cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
-cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/cron.d/logwatch
-cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/tmpwatch/%{name}.conf
+install -p %{SOURCE2} $RPM_BUILD_ROOT%{_sbindir}/logwatch-cron
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/cron.d/logwatch
+cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/tmpwatch/%{name}.conf
 cp -p logwatch.8 $RPM_BUILD_ROOT%{_mandir}/man8
 cp -p logwatch.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5
 cp -p override.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5
 cp -p ignore.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5
+cp -p amavis-logwatch.1 $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p postfix-logwatch.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/logwatch-archives.patch b/logwatch-archives.patch
index 1dfa2ab..aedc1c5 100644
--- a/logwatch-archives.patch
+++ b/logwatch-archives.patch
@@ -1,6 +1,7 @@
---- a/conf/logfiles/clam-update.conf~	2010-04-30 23:36:27.000000000 +0200
-+++ b/conf/logfiles/clam-update.conf	2011-06-16 00:50:42.113853681 +0200
-@@ -51,12 +51,12 @@
+diff -ru logwatch-7.14/conf/logfiles/clam-update.conf logwatch-7.14/conf/logfiles/clam-update.conf
+--- logwatch-7.14/conf/logfiles/clam-update.conf	2025-12-24 02:41:00.000000000 +0100
++++ logwatch-7.14/conf/logfiles/clam-update.conf	2026-05-08 17:39:56.873020250 +0200
+@@ -51,13 +51,13 @@
  Archive = clam-update.*
  Archive = freshclam.log.*
  Archive = clamav/freshclam.log.*
@@ -16,9 +17,11 @@
 +Archive = archive/clam-update-*
 +Archive = archive/freshclam.log-*
  
- # vi: shiftwidth=3 tabstop=3 et
---- logwatch-7.3.6/conf/logfiles/cron.conf	2005-02-24 19:05:18.000000000 +0200
-+++ logwatch-7.3.6-archives/conf/logfiles/cron.conf	2008-10-06 09:26:33.184698880 +0300
+ # Enable (remove '#' comment character) when using syslog-format logging,
+ # either with standard or high-precision timestamping.
+diff -ru logwatch-7.14/conf/logfiles/cron.conf logwatch-7.14/conf/logfiles/cron.conf
+--- logwatch-7.14/conf/logfiles/cron.conf	2020-01-04 06:39:32.000000000 +0100
++++ logwatch-7.14/conf/logfiles/cron.conf	2026-05-08 17:39:51.057520673 +0200
 @@ -18,9 +18,9 @@
  # If the archives are searched, here is one or more line
  # (optionally containing wildcards) that tell where they are...
@@ -29,23 +32,29 @@
 -Archive = archiv/cron-*
 +Archive = archive/cron-*
  
- *RemoveService = anacron
+ *RemoveService = anacron,atd
  
---- logwatch-7.3.6/conf/logfiles/exim.conf	2006-03-21 03:47:28.000000000 +0200
-+++ logwatch-7.3.6-archives/conf/logfiles/exim.conf	2008-10-06 09:26:20.831985126 +0300
-@@ -17,7 +17,8 @@
+diff -ru logwatch-7.14/conf/logfiles/exim.conf logwatch-7.14/conf/logfiles/exim.conf
+--- logwatch-7.14/conf/logfiles/exim.conf	2016-09-02 13:37:20.000000000 +0200
++++ logwatch-7.14/conf/logfiles/exim.conf	2026-05-08 17:39:51.057402436 +0200
+@@ -17,11 +17,11 @@
  LogFile = exim/mainlog
  LogFile = exim4/mainlog
  Archive = exim/main.log.*
 -Archive = archiv/exim/main.log.*
 +Archive = archive/exim/main.log.*
-+Archive = archive/exim/main.log-*
  Archive = exim/mainlog.*
  Archive = exim4/mainlog.*
+ Archive = exim/main.log-*
+-Archive = archiv/exim/main.log-*
++Archive = archive/exim/main.log-*
+ Archive = exim/mainlog-*
+ Archive = exim4/mainlog-*
  
---- logwatch-7.3.6/conf/logfiles/http.conf	2007-04-16 00:56:53.000000000 +0300
-+++ logwatch-7.3.6-archives/conf/logfiles/http.conf	2008-10-06 09:23:41.714791213 +0300
-@@ -16,7 +16,10 @@
+diff -ru logwatch-7.14/conf/logfiles/http.conf logwatch-7.14/conf/logfiles/http.conf
+--- logwatch-7.14/conf/logfiles/http.conf	2016-09-02 13:37:21.000000000 +0200
++++ logwatch-7.14/conf/logfiles/http.conf	2026-05-08 17:39:56.873216793 +0200
+@@ -18,13 +18,16 @@
  # If the archives are searched, here is one or more line
  # (optionally containing wildcards) that tell where they are...
  #If you use a "-" in naming add that as well -mgt
@@ -57,9 +66,17 @@
  Archive = httpd/*access_log.*
  Archive = apache/*access.log.*.gz
  Archive = apache2/*access.log.*.gz
---- logwatch-7.3.6/conf/logfiles/maillog.conf	2006-03-21 03:47:28.000000000 +0200
-+++ logwatch-7.3.6-archives/conf/logfiles/maillog.conf	2008-10-06 09:26:40.765136887 +0300
-@@ -25,8 +25,8 @@ Archive = maillog.*
+ Archive = apache2/*access_log.*.gz
+ Archive = apache-ssl/*access.log.*.gz
+-Archive = archiv/httpd/*access_log-*
++Archive = archive/httpd/*access_log-*
+ Archive = httpd/*access_log-*
+ Archive = apache/*access.log-*.gz
+ Archive = apache2/*access.log-*.gz
+diff -ru logwatch-7.14/conf/logfiles/maillog.conf logwatch-7.14/conf/logfiles/maillog.conf
+--- logwatch-7.14/conf/logfiles/maillog.conf	2025-10-19 10:55:44.000000000 +0200
++++ logwatch-7.14/conf/logfiles/maillog.conf	2026-05-08 17:39:51.057463252 +0200
+@@ -25,8 +25,8 @@
  Archive = maillog-*
  Archive = syslog.*
  Archive = syslog-*
@@ -67,32 +84,20 @@
 -Archive = archiv/maillog-*
 +Archive = archive/maillog.*
 +Archive = archive/maillog-*
+ Archive = mail.log.1
  Archive = mail.log.*.gz
  Archive = mail.log-*.gz
- Archive = mail-*
---- logwatch-7.3.6/conf/logfiles/messages.conf	2006-03-21 03:47:28.000000000 +0200
-+++ logwatch-7.3.6-archives/conf/logfiles/messages.conf	2008-10-06 09:26:45.961437136 +0300
-@@ -17,9 +17,9 @@
- # (optionally containing wildcards) that tell where they are...
- #If you use a "-" in naming add that as well -mgt
- Archive = messages.*
--Archive = archiv/messages.*
-+Archive = archive/messages.*
- Archive = messages-*
--Archive = archiv/messages-*
-+Archive = archive/messages-*
- 
- # Expand the repeats (actually just removes them now)
- *ExpandRepeats
---- logwatch-7.3.6/conf/logfiles/secure.conf	2006-03-21 03:47:28.000000000 +0200
-+++ logwatch-7.3.6-archives/conf/logfiles/secure.conf	2008-10-06 09:25:28.088937578 +0300
-@@ -20,11 +20,11 @@
+diff -ru logwatch-7.14/conf/logfiles/secure.conf logwatch-7.14/conf/logfiles/secure.conf
+--- logwatch-7.14/conf/logfiles/secure.conf	2025-10-19 10:55:44.000000000 +0200
++++ logwatch-7.14/conf/logfiles/secure.conf	2026-05-08 17:39:51.057329877 +0200
+@@ -20,12 +20,12 @@
  # (optionally containing wildcards) that tell where they are...
  #If you use a "-" in naming add that as well -mgt
  Archive = secure.*
 -Archive = archiv/secure.*
 +Archive = archive/secure.*
  Archive = authlog.*
+ Archive = auth.log.1
  Archive = auth.log.*.gz
  Archive = secure-*
 -Archive = archiv/secure-*
@@ -100,8 +105,9 @@
  Archive = authlog-*
  Archive = auth.log-*.gz
  
---- logwatch-7.3.6/conf/logfiles/sonicwall.conf	2006-03-21 03:47:28.000000000 +0200
-+++ logwatch-7.3.6-archives/conf/logfiles/sonicwall.conf	2008-10-06 09:26:26.876334376 +0300
+diff -ru logwatch-7.14/conf/logfiles/sonicwall.conf logwatch-7.14/conf/logfiles/sonicwall.conf
+--- logwatch-7.14/conf/logfiles/sonicwall.conf	2016-09-02 13:37:21.000000000 +0200
++++ logwatch-7.14/conf/logfiles/sonicwall.conf	2026-05-08 17:39:56.873109021 +0200
 @@ -19,9 +19,9 @@
  # (optionally containing wildcards) that tell where they are...
  #If you use a "-" in naming add that as well -mgt
@@ -113,9 +119,10 @@
 +Archive = archive/sonicwall.log-*
  
  # Keep only the lines in the proper date range...
- *OnlyHost
---- logwatch-7.3.6/conf/logfiles/vsftpd.conf	2006-03-21 03:47:28.000000000 +0200
-+++ logwatch-7.3.6-archives/conf/logfiles/vsftpd.conf	2008-10-06 09:26:08.739286395 +0300
+ *ApplyStdDate
+diff -ru logwatch-7.14/conf/logfiles/vsftpd.conf logwatch-7.14/conf/logfiles/vsftpd.conf
+--- logwatch-7.14/conf/logfiles/vsftpd.conf	2016-09-02 13:37:21.000000000 +0200
++++ logwatch-7.14/conf/logfiles/vsftpd.conf	2026-05-08 17:39:51.057233854 +0200
 @@ -18,9 +18,9 @@
  # (optionally containing wildcards) that tell where they are...
  #If you use a "-" in naming add that as well -mgt
@@ -126,17 +133,18 @@
 -Archive = archiv/vsftpd.log-*
 +Archive = archive/vsftpd.log-*
  
- *ApplyStdDate = 
+ *ApplyStdDate =
  # vi: shiftwidth=3 tabstop=3 et
---- logwatch-7.3.6/conf/logfiles/xferlog.conf	2006-03-21 03:47:28.000000000 +0200
-+++ logwatch-7.3.6-archives/conf/logfiles/xferlog.conf	2008-10-06 09:25:34.761323115 +0300
+diff -ru logwatch-7.14/conf/logfiles/xferlog.conf logwatch-7.14/conf/logfiles/xferlog.conf
+--- logwatch-7.14/conf/logfiles/xferlog.conf	2025-10-19 10:55:44.000000000 +0200
++++ logwatch-7.14/conf/logfiles/xferlog.conf	2026-05-08 17:39:51.057645733 +0200
 @@ -17,8 +17,8 @@
  # (optionally containing wildcards) that tell where they are...
  #If you use a "-" in naming add that as well -mgt
  Archive = xferlog.*
 -Archive = archiv/xferlog.*
 +Archive = archive/xferlog.*
- Archive = xferlog-* 
+ Archive = xferlog-*
 -Archive = archiv/xferlog-*
 +Archive = archive/xferlog-*
  
diff --git a/logwatch-log_conf.patch b/logwatch-log_conf.patch
index 0cdda13..cfea67d 100644
--- a/logwatch-log_conf.patch
+++ b/logwatch-log_conf.patch
@@ -1,5 +1,5 @@
---- ./conf/services/pureftpd.conf.org	Mon Nov  3 15:25:20 2003
-+++ ./conf/services/pureftpd.conf	Fri Nov  7 10:41:44 2003
+--- a/./conf/services/pureftpd.conf
++++ b/./conf/services/pureftpd.conf
 @@ -15,7 +15,7 @@
  Title = "pureftp"
  
@@ -9,7 +9,7 @@
  
  *OnlyService = pure-ftpd
  *RemoveHeaders =
-@@ -30,5 +30,5 @@
+@@ -30,6 +30,6 @@
  
  # How many connections did we get?
  # This only shows where it came from and how many per ip / host.
diff --git a/logwatch-vsftpd.patch b/logwatch-vsftpd.patch
deleted file mode 100644
index 86557d6..0000000
--- a/logwatch-vsftpd.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Correctly apply time filter when parsing vsftpd log messages.
-
-Author: Ivana Varekova <varekova at redhat.com>
-RH-Bugzilla: #217226
-
---- logwatch-7.3.1/scripts/logwatch.pl.pom	2006-09-16 06:04:14.000000000 +0200
-+++ logwatch-7.3.1/scripts/logwatch.pl	2006-11-29 13:16:22.000000000 +0100
-@@ -917,11 +917,16 @@
-    my $FilterText = " ";
-    foreach (sort keys %{$LogFileData{$LogFile}}) {
-       my $cmd = $_;
-+      
-       if ($cmd =~ s/^\d+-\*//) {
-          if (-f "$ConfigDir/scripts/shared/$cmd") {
-             $FilterText .= ("| $PerlVersion $ConfigDir/scripts/shared/$cmd '$LogFileData{$LogFile}{$_}'" );
-          } elsif (-f "$BaseDir/scripts/shared/$cmd") {
--            $FilterText .= ("| $PerlVersion $BaseDir/scripts/shared/$cmd '$LogFileData{$LogFile}{$_}'" );
-+             if ($LogFile =~ /^vsftpd$/ ) {
-+                 $FilterText .= ("| $PerlVersion $BaseDir/scripts/shared/applyvsftpddate '$LogFileData{$LogFile}{$_}'" );
-+	     } else {
-+                 $FilterText .= ("| $PerlVersion $BaseDir/scripts/shared/$cmd '$LogFileData{$LogFile}{$_}'" );      
-+             }
-          } else {
- 	     die "Cannot find shared script $cmd\n";
-          }
---- logwatch-7.3.1/scripts/shared/applyvsftpddate.pom	2006-11-29 13:13:28.000000000 +0100
-+++ logwatch-7.3.1/scripts/shared/applyvsftpddate	2006-11-29 13:10:26.000000000 +0100
-@@ -0,0 +1,34 @@
-+##########################################################################
-+# $Id: applystddate,v 1.18 2005/10/22 00:19:56 bjorn Exp $
-+##########################################################################
-+
-+########################################################
-+# This was written and is maintained by:
-+#    Kirk Bauer <kirk at kaybee.org>
-+#
-+# Please send all comments, suggestions, bug reports,
-+#    etc, to logwatch-devel at logwatch.org
-+########################################################
-+
-+use Logwatch ':dates';
-+
-+my $Debug = $ENV{'LOGWATCH_DEBUG'} || 0;
-+
-+$SearchDate = TimeFilter('%b %e %H:%M:%S 20%y');
-+
-+# The date might be "Dec 09", but it needs to be "Dec  9"...
-+#$SearchDate =~ s/ 0/  /;
-+# The format of  Fri Nov 29 20:59:09 2005 
-+
-+if ( $Debug > 5 ) {
-+   print STDERR "DEBUG: Inside ApplyStdDate...\n";
-+   print STDERR "DEBUG: Looking For: " . $SearchDate . "\n";
-+}
-+
-+while (defined($ThisLine = <STDIN>)) {
-+   if ($ThisLine =~ m/(Mon|Tue|Wed|Thu|Fri|Sat|Sun) $SearchDate/o) {
-+      print "$ThisLine";
-+   }
-+}
-+
-+# vi: shiftwidth=3 syntax=perl tabstop=3 et
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/logwatch.git/commitdiff/8b69da409117be577b2e4b4916ebe5e40e09ce97

More information about the pld-cvs-commit mailing list