From caa5adf2965ab3d09f229592a6c1b7cb841cceb7 Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Wed, 24 Sep 2014 09:09:42 +0200 Subject: [PATCH] Remove unused patches --- logwatch-dovecot-timestamps.patch | 16 ---- logwatch-http-error.patch | 17 ---- logwatch-mdadm.patch | 152 ------------------------------ 3 files changed, 185 deletions(-) delete mode 100644 logwatch-dovecot-timestamps.patch delete mode 100644 logwatch-http-error.patch delete mode 100644 logwatch-mdadm.patch diff --git a/logwatch-dovecot-timestamps.patch b/logwatch-dovecot-timestamps.patch deleted file mode 100644 index e730a60..0000000 --- a/logwatch-dovecot-timestamps.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix timestamp misparsing (caused by commit in svn r.125). - -Author: Jan Synacek -RH-Bugzilla: #886193 - ---- logwatch-svn127/scripts/services/dovecot.orig 2013-01-11 11:15:10.000000000 +0100 -+++ logwatch-svn127/scripts/services/dovecot 2013-01-14 10:17:54.347703271 +0100 -@@ -135,7 +135,7 @@ my $dovecottag = qr/dovecot:(?:\s*\[[^]] - while (defined($ThisLine = )) { - # remove timestamp. We can't use *RemoveHeaders because we need the - # service name -- $ThisLine =~ s/^\w{3} .\d \d\d:\d\d:\d\d //; -+ $ThisLine =~ s/^\w{3} .\d \d\d:\d\d:\d\d (?:[^\s:]* |)//; - if ( ($ThisLine =~ /(?:ssl-build-param|ssl-params): SSL parameters regeneration completed/) or - ($ThisLine =~ /ssl-params: Generating SSL parameters/) or - ($ThisLine =~ /auth-worker/) or diff --git a/logwatch-http-error.patch b/logwatch-http-error.patch deleted file mode 100644 index 25b9b8e..0000000 --- a/logwatch-http-error.patch +++ /dev/null @@ -1,17 +0,0 @@ -Don't use ApplyhttpDate in http-error. The error_log uses a different timestamp -format than the access_log. - -Author: Jan Synacek -Reported-by: Orion Poplawski -RH-Bugzilla: #881111 - ---- logwatch-svn110/conf/logfiles/http-error.conf 2012-12-04 08:25:17.116989626 +0100 -+++ logwatch-svn110/conf/logfiles/http-error.conf.orig 2012-12-04 08:24:10.000000000 +0100 -@@ -34,7 +34,4 @@ - *ExpandRepeats - - --# Keep only the lines in the proper date range... --*ApplyhttpDate -- - # vi: shiftwidth=3 tabstop=3 et diff --git a/logwatch-mdadm.patch b/logwatch-mdadm.patch deleted file mode 100644 index 91d9eec..0000000 --- a/logwatch-mdadm.patch +++ /dev/null @@ -1,152 +0,0 @@ -Author: Orion Poplawski - -Index: scripts/services/mdadm -=================================================================== ---- scripts/services/mdadm (revision 130) -+++ scripts/services/mdadm (working copy) -@@ -26,80 +26,88 @@ - - my $Detail = $ENV{'LOGWATCH_DETAIL_LEVEL'} || 0; - --# TODO: remove awk dependency --my $devices = `mdadm --examine --scan 2>/dev/null| awk '{print \$2}'`; -+my @devices = (); -+# Sometimes mdadm --examine --scan reports device with different names than -+# what is in use. Use /etc/mdadm.conf instead if it exists. -+if ( -f "/etc/mdadm.conf" ) { -+ open(MDADM,"< /etc/mdadm.conf"); -+} else { -+ open(MDADM,"mdadm --examine --scan 2>/dev/null|"); -+} -+while () { -+ if (/^ARRAY/) { -+ push(@devices,(split())[1]); -+ } -+} -+close(MDADM); - --chomp($devices); -+foreach my $dev (@devices) { -+ my %mdhash; - --if ($devices ne '') { -- foreach my $dev (split(/\n/,$devices)) { -- my $md = `mdadm --misc --detail $dev | grep -v $dev`; -- chomp($md); -+ open(MDADM,"mdadm --misc --detail $dev |"); -+ while () { -+ $mdhash{'level'} = $1 if ($_ =~ /Raid Level ?: ?(.*)$/); -+ $mdhash{'active'} = $1 if ($_ =~ /Active Devices ?: ?(.*)$/); -+ $mdhash{'working'} = $1 if ($_ =~ /Working Devices ?: ?(.*)$/); -+ $mdhash{'failed'} = $1 if ($_ =~ /Failed Devices ?: ?(.*)$/); -+ $mdhash{'spare'} = $1 if ($_ =~ /Spare Devices ?: ?(.*)$/); -+ $mdhash{'state'} = $1 if ($_ =~ /State ?: ?(.*)$/); -+ $mdhash{'rebuild'} = $1 if ($_ =~ /Rebuild Status ?: ?(.*)$/); -+ push(@{$mdhash{'good devices'}},$1) if ($_ =~ /sync .*(\/dev\/[\w\d\-\_]*)/); -+ push(@{$mdhash{'middle devices'}},$1) if ($_ =~ /rebuilding .*(\/dev\/[\w\d\-\_]*)/); -+ push(@{$mdhash{'bad devices'}},$1) if ($_ =~ /faulty .*(\/dev\/[\w\d\-\_]*)/); -+ } -+ close(MDADM); - -- my %mdhash; -- foreach (split(/\n/,$md)) { -- $mdhash{'level'} = $1 if ($_ =~ /Raid Level ?: ?(.*)$/); -- $mdhash{'active'} = $1 if ($_ =~ /Active Devices ?: ?(.*)$/); -- $mdhash{'working'} = $1 if ($_ =~ /Working Devices ?: ?(.*)$/); -- $mdhash{'failed'} = $1 if ($_ =~ /Failed Devices ?: ?(.*)$/); -- $mdhash{'spare'} = $1 if ($_ =~ /Spare Devices ?: ?(.*)$/); -- $mdhash{'state'} = $1 if ($_ =~ /State ?: ?(.*)$/); -- $mdhash{'rebuild'} = $1 if ($_ =~ /Rebuild Status ?: ?(.*)$/); -- push(@{$mdhash{'good devices'}},$1) if ($_ =~ /sync .*(\/dev\/[\w\d\-\_]*)/); -- push(@{$mdhash{'middle devices'}},$1) if ($_ =~ /rebuilding .*(\/dev\/[\w\d\-\_]*)/); -- push(@{$mdhash{'bad devices'}},$1) if ($_ =~ /faulty .*(\/dev\/[\w\d\-\_]*)/); -- } -- -- if ($Detail <= 4) { -- if (lc($mdhash{'state'}) =~ /clean|active/) { -- print "$dev : $mdhash{'state'}\n"; -- } else { -- print "$dev : $mdhash{'state'}\n"; -- if (@{$mdhash{'middle devices'}}) { -- if (defined($mdhash{'rebuild'}) and ($mdhash{'rebuild'} ne '')) { -- print "\tRebuilding status: $mdhash{'rebuild'}\n"; -- } -- print "\tRebuilding @{$mdhash{'middle devices'}}\n"; -+ if ($Detail <= 4) { -+ if (lc($mdhash{'state'}) =~ /clean|active/) { -+ print "$dev : $mdhash{'state'}\n" if $Detail; -+ } else { -+ print "$dev : $mdhash{'state'}\n"; -+ if (defined($mdhash{'middle devices'})) { -+ if (defined($mdhash{'rebuild'}) and ($mdhash{'rebuild'} ne '')) { -+ print "\tRebuilding status: $mdhash{'rebuild'}\n"; - } -- if (@{$mdhash{'bad devices'}}) { -- print "\tFailed @{$mdhash{'bad devices'}}\n"; -- } -+ print "\tRebuilding @{$mdhash{'middle devices'}}\n"; - } -+ if (defined($mdhash{'bad devices'})) { -+ print "\tFailed @{$mdhash{'bad devices'}}\n"; -+ } - } -- elsif($Detail <= 9) { -- if (lc($mdhash{'state'}) =~ /clean|active/) { -- print "$dev : $mdhash{'state'} - @{$mdhash{'good devices'}}\n"; -- } else { -- print "$dev : $mdhash{'state'}\n"; -- if (@{$mdhash{'middle devices'}}) { -- if (defined($mdhash{'rebuild'}) and ($mdhash{'rebuild'} ne '')) { -- print "\tRebuilding status: $mdhash{'rebuild'}\n"; -- } -- print "\t Rebuilding : @{$mdhash{'middle devices'}}\n"; -- } -- if (@{$mdhash{'bad devices'}}) { -- print "\t Failed : @{$mdhash{'bad devices'}}\n"; -- } -- print "\t Good : @{$mdhash{'good devices'}}\n"; -- } -+ } -+ elsif($Detail <= 9) { -+ if (lc($mdhash{'state'}) =~ /clean|active/) { -+ print "$dev : $mdhash{'state'} - @{$mdhash{'good devices'}}\n"; - } else { - print "$dev : $mdhash{'state'}\n"; -- print "\t Raid Level : $mdhash{'level'}\n"; -- print "\tGood Devices : @{$mdhash{'good devices'}}\n"; -- if (defined ($mdhash{'middle devices'}) and @{$mdhash{'middle devices'}}) { -+ if (@{$mdhash{'middle devices'}}) { - if (defined($mdhash{'rebuild'}) and ($mdhash{'rebuild'} ne '')) { - print "\tRebuilding status: $mdhash{'rebuild'}\n"; - } - print "\t Rebuilding : @{$mdhash{'middle devices'}}\n"; - } -- if (defined($mdhash{'bad devices'}) and @{$mdhash{'bad devices'}}) { -+ if (@{$mdhash{'bad devices'}}) { - print "\t Failed : @{$mdhash{'bad devices'}}\n"; - } -- if ($mdhash{'spare'} ne 0) { -- print "\t Spares : $mdhash{'spare'}\n"; -+ print "\t Good : @{$mdhash{'good devices'}}\n"; -+ } -+ } else { -+ print "$dev : $mdhash{'state'}\n"; -+ print "\t Raid Level : $mdhash{'level'}\n"; -+ print "\tGood Devices : @{$mdhash{'good devices'}}\n"; -+ if (defined ($mdhash{'middle devices'}) and @{$mdhash{'middle devices'}}) { -+ if (defined($mdhash{'rebuild'}) and ($mdhash{'rebuild'} ne '')) { -+ print "\tRebuilding status: $mdhash{'rebuild'}\n"; - } -- print "\n"; -+ print "\t Rebuilding : @{$mdhash{'middle devices'}}\n"; - } -+ if (defined($mdhash{'bad devices'}) and @{$mdhash{'bad devices'}}) { -+ print "\t Failed : @{$mdhash{'bad devices'}}\n"; -+ } -+ if ($mdhash{'spare'} ne 0) { -+ print "\t Spares : $mdhash{'spare'}\n"; -+ } -+ print "\n"; - } - } -