- Resolves: #427734 fix amavis script

- Resolves: #427761 remove *.orig scripts - Resolves: #230974 add no-oldfiles-log option - remove usage option description - Resolves: #427596 fix mailto setting
2008-01-08 11:05:46 +00:00 · 2008-01-08 11:05:46 +00:00 · 51e7006139
commit 51e7006139
parent a24c00045c
6 changed files with 135 additions and 17 deletions
--- a/logwatch-7.3.4-mailto.patch
+++ b/logwatch-7.3.4-mailto.patch
@ -1,16 +0,0 @@
--- logwatch-7.3.4/scripts/logwatch.pl.pom	2007-04-13 15:43:35.000000000 +0200
-+++ logwatch-7.3.4/scripts/logwatch.pl	2007-04-20 12:14:43.000000000 +0200
-@@ -312,6 +312,13 @@
- 
- CleanVars();
- 
-+#if MAILTO is set in the environment, grab it as we may be being used by
-+#cron or anacron, which do not set command line args.
-+if ($ENV{'MAILTO'})
-+  {
-+    $Config{'mailto'} = $ENV{'MAILTO'};
-+  }
-+
- if ($OldMailTo ne $Config{'mailto'}) {
-    $Config{'print'} = 0;
- } elsif ($OldPrint ne $Config{'print'}) {
--- a/logwatch-7.3.6-amavis.patch
+++ b/logwatch-7.3.6-amavis.patch
@ -0,0 +1,11 @@
+diff -up logwatch-7.3.6/scripts/services/amavis.pom logwatch-7.3.6/scripts/services/amavis
+--- logwatch-7.3.6/scripts/services/amavis.pom	2007-05-16 06:27:17.000000000 +0200
+++ logwatch-7.3.6/scripts/services/amavis	2008-01-08 10:02:00.000000000 +0100
+@@ -524,6 +524,7 @@ while (<>) {
+         or ($p1 =~ /email.txt no longer exists, can't re-use it/)
+         or ($p1 =~ /SPAM\.TAG2/)
+         or ($p1 =~ /BAD-HEADER\.TAG2/)
+        or ($p1 =~ /skip local delivery\([0-9]\): <> -> <(spam|bad-header)-quarantine>*/)
+    );
+ 
+    my ($ip, $from, $to, $key, $hits, $reason, $item, $decoder);
--- a/logwatch-7.3.6-maillog.patch
+++ b/logwatch-7.3.6-maillog.patch
@ -0,0 +1,17 @@
+diff -up logwatch-7.3.6/scripts/logwatch.pl.pom logwatch-7.3.6/scripts/logwatch.pl
+--- logwatch-7.3.6/scripts/logwatch.pl.pom	2008-01-08 11:04:59.000000000 +0100
+++ logwatch-7.3.6/scripts/logwatch.pl	2008-01-08 11:23:09.000000000 +0100
+@@ -359,6 +359,13 @@ if ($ShowVersion) {
+    exit 0;
+ }
+ 
+#if MAILTO is set in the environment, grab it as we may be being used by
+#cron or anacron, which do not set command line args.
+if ($ENV{'MAILTO'})
+{
+    $Config{'mailto'} = $ENV{'MAILTO'};
+}
+
+ if ($tmp_mailto) {
+    $Config{'mailto'} = $tmp_mailto;
+    $Config{'print'} = 0;
--- a/logwatch-7.3.6-oldfiles.patch
+++ b/logwatch-7.3.6-oldfiles.patch
@ -0,0 +1,71 @@
+diff -up logwatch-7.3.6/scripts/logwatch.pl.pom logwatch-7.3.6/scripts/logwatch.pl
+--- logwatch-7.3.6/scripts/logwatch.pl.pom	2008-01-08 10:25:25.000000000 +0100
+++ logwatch-7.3.6/scripts/logwatch.pl	2008-01-08 10:31:24.000000000 +0100
+@@ -113,7 +113,7 @@ sub Usage () {
+       "   [--print] [--mailto <addr>] [--archives] [--range <range>] [--debug <level>]\n" .
+       "   [--save <filename>] [--help] [--version] [--service <name>]\n" .
+       "   [--numeric] [--output <output_type>]\n" .
+-      "   [--splithosts] [--multiemail]\n\n";
+      "   [--splithosts] [--multiemail] [--no-oldfiles-log]\n\n";
+    print "--detail <level>: Report Detail Level - High, Med, Low or any #.\n";
+    print "--logfile <name>: *Name of a logfile definition to report on.\n";
+    print "--logdir <name>: Name of default directory where logs are stored.\n";
+@@ -134,6 +134,8 @@ sub Usage () {
+    print "              not using --splithosts.\n";
+    print "--output <output type>: Report Format - mail, html or unformatted#.\n";
+    print "--encode: Use base64 encoding on output mail.\n";
+   print "--no-oldfiles-log: Suppress the logwatch log, which informs about the\n"; 
+   print "                   old files in logwatch tmpdir.\n"; 
+    print "--version: Displays current version.\n";
+    print "--help: This message.\n";
+    print "* = Switch can be specified multiple times...\n\n";
+@@ -320,6 +322,7 @@ my @TempLogFileList = ();
+ my @TempServiceList = ();
+ my $Help = 0;
+ my $ShowVersion = 0;
+my $NoOldfilesLog = 0;
+ my $tmp_mailto;
+ 
+ GetOptions ( "d|detail=s"   => \$Config{'detail'},
+@@ -340,7 +343,8 @@ GetOptions ( "d|detail=s"   => \$Config{
+              "multiemail"   => \$Config{'multiemail'},
+              "o|output=s"   => \$Config{'output'},
+              "encode"       => \$Config{'encode'},
+-             "html_wrap=s"  => \$Config{'html_wrap'}
+             "html_wrap=s"  => \$Config{'html_wrap'},
+             "no-oldfiles-log" => \$NoOldfilesLog
+            ) or Usage();
+ 
+ $Help and Usage();
+@@ -751,7 +755,7 @@ if ($Config{'debug'} > 7) {
+ opendir(TMPDIR, $Config{'tmpdir'}) or die "$Config{'tmpdir'} $!";
+ my @old_dirs = grep { /^logwatch\.\w{8}$/ && -d "$Config{'tmpdir'}/$_" }
+    readdir(TMPDIR);
+-if (@old_dirs) {
+if ((@old_dirs) && ($NoOldfilesLog==0)) {
+    print "You have old files in your logwatch tmpdir ($Config{'tmpdir'}):\n\t";
+    print join("\n\t", @old_dirs);
+    print "\nThe directories listed above were most likely created by a\n";
+diff -up logwatch-7.3.6/logwatch.8.pom logwatch-7.3.6/logwatch.8
+--- logwatch-7.3.6/logwatch.8.pom	2007-05-19 16:37:42.000000000 +0200
+++ logwatch-7.3.6/logwatch.8	2008-01-08 10:34:32.000000000 +0100
+@@ -25,7 +25,8 @@ logwatch \- system log analyzer and repo
+ .I hostname
+ .B ] [--splithosts] [--multiemail] [--output
+ .I output-type
+-.B ] [--numeric] [--version] [--help|--usage]
+.B ] [--numeric]  [--no-oldfiles-log]
+.B [--version] [--help|--usage]
+ .SH DESCRIPTION
+ .B Logwatch
+ is a customizable, pluggable log-monitoring system.  It will go
+@@ -100,6 +101,9 @@ if HostLimit is set in the logwatch.conf
+ then only logs from this hostname will be processed (where appropriate).
+ .IP "\fB--numeric\fR"
+ Inhibits additional name lookups, displaying IP addresses numerically.
+.IP "\fB--no-oldfiles-log\fR" 
+Suppress the logwatch log, which informs about the 
+old files in logwatch tmpdir. 
+ .IP "\fB--usage\fR"
+ Displays usage information
+ .IP "\fB--help\fR"
--- a/logwatch-7.3.6-usage.patch
+++ b/logwatch-7.3.6-usage.patch
@ -0,0 +1,15 @@
+diff -up logwatch-7.3.6/logwatch.8.pom logwatch-7.3.6/logwatch.8
+--- logwatch-7.3.6/logwatch.8.pom	2008-01-08 10:37:13.000000000 +0100
+++ logwatch-7.3.6/logwatch.8	2008-01-08 10:39:46.000000000 +0100
+@@ -104,10 +104,8 @@ Inhibits additional name lookups, displa
+ .IP "\fB--no-oldfiles-log\fR" 
+ Suppress the logwatch log, which informs about the 
+ old files in logwatch tmpdir. 
+-.IP "\fB--usage\fR"
+-Displays usage information
+ .IP "\fB--help\fR"
+-same as --usage.
+Displays usage information.
+ .SH FILES
+ .IP /usr/share/logwatch/
+ .RS
--- a/logwatch.spec
+++ b/logwatch.spec
@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.6
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@ -29,6 +29,10 @@ Patch22: logwatch-7.3.6-sshd1.patch
 Patch23: logwatch-7.3.6-clamav-milter.patch
 Patch24: logwatch-7.3.6-conf.patch
 Patch25: logwatch-7.3.6-dovecot.patch
+Patch26: logwatch-7.3.6-amavis.patch
+Patch27: logwatch-7.3.6-oldfiles.patch
+Patch28: logwatch-7.3.6-usage.patch
+Patch29: logwatch-7.3.6-maillog.patch

 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
@ -66,6 +70,11 @@ of the package on many systems.
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+rm -f scripts/services/*.orig

 %build

@ -178,6 +187,17 @@ rm -rf %{buildroot}
 %doc License project/CHANGES 

 %changelog
+* Tue Jan  8 2008 Ivana Varekova <varekova@redhat.com> 7.3.6-16
+- Resolves: #427734
+  fix amavis script
+- Resolves: #427761
+  remove *.orig scripts
+- Resolves: #230974
+  add no-oldfiles-log option
+- remove usage option description
+- Resolves: #427596
+  fix mailto setting
+
 * Wed Jan  2 2008 Ivana Varekova <varekova@redhat.com> 7.3.6-15
 - Resolves: #424171
  logwatch doesn't recognize dovecot starting up message ..