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

- Resolves: #427734 - fix amavis script

Browse Source 
- Resolves: #429452 - fix openvpn script
This commit is contained in:
Ivana Varekova 2008-01-21 11:55:13 +00:00
parent 51e7006139
commit 3a6b5b28f6
3 changed files with 71 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
logwatch-7.3.6-amavis2.patch Normal file
View File

@ -0,0 +1,16 @@
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 2008-01-21 10:10:45.000000000 +0100
+++ logwatch-7.3.6/scripts/services/amavis 2008-01-21 10:58:15.000000000 +0100
@@ -524,7 +524,11 @@ 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>*/)
+ or ($p1 =~ /skip local delivery\([0-9]\): <> -> <(spam|bad-header|banned|virus)-quarantine>*/)
+ or ($p1 =~ /config files read: .*amavisd.conf/)
+ or ($p1 =~ /mangling by .* \([0-9]\) done, new size: [0-9]*, orig [0-9]* bytes/)
+ or ($p1 =~ /mangling by: [0-9], <.*>/)
+ or ($p1 =~ /mangling YES: [0-9] \(orig: [0-9]\), discl_allowed=.*, <.*> -> <.*>/)
);
my ($ip, $from, $to, $key, $hits, $reason, $item, $decoder);

44
logwatch-7.3.6-openvpn.patch Normal file
View File

@ -0,0 +1,44 @@
diff -up logwatch-7.3.6/scripts/services/openvpn.pom logwatch-7.3.6/scripts/services/openvpn
--- logwatch-7.3.6/scripts/services/openvpn.pom 2006-11-12 22:11:21.000000000 +0100
+++ logwatch-7.3.6/scripts/services/openvpn 2008-01-21 11:59:28.000000000 +0100
@@ -51,6 +51,7 @@ while (defined($ThisLine = <STDIN>)) {
($ThisLine =~ /^MULTI: multi_create_instance called/) or
($ThisLine =~ /^MULTI: primary virtual IP for/) or
($ThisLine =~ /^MULTI: TCP INIT maxclients=\d+ maxevents=\d+/) or
+ ($ThisLine =~ /^MULTI: bad source address from client .*, packet dropped/) or
($ThisLine =~ /^Need IPv6 code in mroute_extract_addr_from_packet/) or
($ThisLine =~ /^NOTE: UID\/GID downgrade will be delayed because of --client, --pull, or --up-delay/) or
($ThisLine =~ /^OPTIONS IMPORT/) or
@@ -69,6 +70,9 @@ while (defined($ThisLine = <STDIN>)) {
($ThisLine =~ /^TLS: Initial packet from/) or
($ThisLine =~ /^TLS: soft reset/) or
($ThisLine =~ /^TLS: tls_process: killed expiring key$/) or
+ ($ThisLine =~ /^TLS: move_session: dest=.* src=.* reinit_src=[0-9]*/) or
+ ($ThisLine =~ /^TLS: tls_multi_process: untrusted session promoted to trusted/) or
+ ($ThisLine =~ /^TLS: new session incoming connection from .*/) or
($ThisLine =~ /^TUN\/TAP device \w+ opened/) or
($ThisLine =~ /^UDPv4 link /) or
($ThisLine =~ /^UID set to/) or
@@ -102,6 +106,8 @@ while (defined($ThisLine = <STDIN>)) {
$ConnErrors{$error}{"$proto $host:$port"}++;
} elsif (($proto, $error) = ($ThisLine =~ /^read (\w+)_SERVER \[\]: (.*)/)) {
$ConnErrors{$error}{"$proto"}++;
+ } elsif (($name) = ($ThisLine =~ /MULTI: new connection by client '(.*)' will cause previous active sessions by this client to be dropped. Remember to use the --duplicate-cn option if you want multiple clients using the same certificate or username to concurrently connect./)) {
+ $ConnectCauseDrop{$name}++;
} else {
# Report any unmatched entries...
# remove PID from named messages
@@ -186,6 +192,13 @@ if (keys %VersionInfo) {
}
}
+if (keys %ConnectCauseDrop) {
+ print "\n Previous active sessions of the same client dropped upon new connection:\n";
+ foreach $name (sort keys %ConnectCauseDrop) {
+ print " client $name: $ConnectCauseDrop{$name} Time(s)\n"
+ }
+}
+
if (keys %OtherList) {
print "\n**Unmatched Entries**\n";
foreach $line (sort {$a cmp $b} keys %OtherList) {

12
logwatch.spec
View File

@ -1,7 +1,7 @@
Summary: A log file analysis program
Name: logwatch
Version: 7.3.6
Release: 16%{?dist}
Release: 17%{?dist}
License: MIT
Group: Applications/System
URL: http://www.logwatch.org/
@ -33,6 +33,8 @@ 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
Patch30: logwatch-7.3.6-amavis2.patch
Patch31: logwatch-7.3.6-openvpn.patch
Requires: textutils sh-utils grep mailx
Requires: perl(Date::Manip)
@ -74,6 +76,8 @@ of the package on many systems.
%patch27 -p1
%patch28 -p1
%patch29 -p1
%patch30 -p1
%patch31 -p1
rm -f scripts/services/*.orig
%build
@ -187,6 +191,12 @@ rm -rf %{buildroot}
%doc License project/CHANGES
%changelog
* Mon Jan 21 2008 Ivana Varekova <varekova@redhat.com> 7.3.6-17
- Resolves: #427734
fix amavis script
- Resolves: #429452
fix openvpn script
* Tue Jan 8 2008 Ivana Varekova <varekova@redhat.com> 7.3.6-16
- Resolves: #427734
fix amavis script