rpms/logwatch
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix exim script (#492269)

Browse Source
This commit is contained in:
Ivana Varekova 2009-03-31 06:59:51 +00:00
parent 96c4fb0a98
commit bc7f1c4f45
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
logwatch-7.3.6-exim2.patch Normal file
View File

@ -0,0 +1,15 @@
diff -up logwatch-7.3.6/scripts/services/exim.pom logwatch-7.3.6/scripts/services/exim
--- logwatch-7.3.6/scripts/services/exim.pom 2009-03-30 15:49:39.000000000 +0200
+++ logwatch-7.3.6/scripts/services/exim 2009-03-31 08:48:45.000000000 +0200
@@ -240,9 +240,9 @@ while (defined($ThisLine = <STDIN>)) {
$Lookup++;
@LookupH = (@LookupH, $ThisLine);
}
- elsif ( $ThisLine =~ /^\d+\-\d+\-\d+\s\d+\:\d+\:\d+\s\w+\-\w+\-\w+\s/ ) { # inne wiadomosci przesylane przez EXIMA
+ elsif ( $ThisLine =~ /^\d+\-\d+\-\d+\s\d+\:\d+\:\d+\s(\+\d+\s)?\w+\-\w+\-\w+\s/ ) { # inne wiadomosci przesylane przez EXIMA
# Collect Message ID specific notes...
- ($mdate,$mtime,$mid,$mrest) = ($ThisLine =~ /^(\d+\-\d+\-\d+)\s(\d+\:\d+\:\d+)\s(\w+\-\w+\-\w+)(.+)/);
+ ($mdate,$mtime,$tz,$mid,$mrest) = ($ThisLine =~ /^(\d+\-\d+\-\d+)\s(\d+\:\d+\:\d+)\s(\+\d+\s)?(\w+\-\w+\-\w+)(.+)/);
# Count of individual Message Lines, used for sort
$licze++; # Dodaje taki licznik aby potem przy wypisaniu posortowac po nim, bo wypisywal nie po kolei
$mmsg{$mid}{$licze.$mrest} = "$mdate $mtime";

7
logwatch.spec
View File

@ -1,7 +1,7 @@
Summary: A log file analysis program
Name: logwatch
Version: 7.3.6
Release: 41%{?dist}
Release: 42%{?dist}
License: MIT
Group: Applications/System
URL: http://www.logwatch.org/
@ -50,6 +50,7 @@ Patch50: logwatch-7.3.6-named4.patch
Patch51: logwatch-7.3.6-openvpn3.patch
Patch52: logwatch-7.3.6-smartd.patch
Patch53: logwatch-7.3.6-sshd2.patch
Patch54: logwatch-7.3.6-exim2.patch
Requires: textutils sh-utils grep mailx
Requires: perl(Date::Manip)
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -107,6 +108,7 @@ of the package on many systems.
%patch51 -p1
%patch52 -p1
%patch53 -p1
%patch54 -p1
rm -f scripts/services/*.orig
%build
@ -218,6 +220,9 @@ rm -rf %{buildroot}
%doc License project/CHANGES
%changelog
* Tue Mar 31 2009 Ivana Varekova <varekova@redhat.com> 7.3.6-42
- fix exim script (#492269)
* Mon Mar 30 2009 Ivana Varekova <varekova@redhta.com> 7.3.6-41
- fix sshd script (#492738)