rpms/logwatch/devel logwatch-7.3.6-amavis2.patch, NONE, 1.1 logwatch-7.3.6-openvpn.patch, NONE, 1.1 logwatch.spec, 1.85, 1.86

[Ivana Varekova (varekova)]

Author: varekova

Update of /cvs/pkgs/rpms/logwatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21018

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.6-amavis2.patch logwatch-7.3.6-openvpn.patch 
Log Message:
- Resolves: #427734 - fix amavis script
- Resolves: #429452 - fix openvpn script


logwatch-7.3.6-amavis2.patch:

--- NEW FILE logwatch-7.3.6-amavis2.patch ---
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);

logwatch-7.3.6-openvpn.patch:

--- NEW FILE logwatch-7.3.6-openvpn.patch ---
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) {


Index: logwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- logwatch.spec	8 Jan 2008 11:05:46 -0000	1.85
+++ logwatch.spec	21 Jan 2008 11:55:13 -0000	1.86
@@ -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 @@
 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 @@
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
+%patch30 -p1
+%patch31 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -187,6 +191,12 @@
 %doc License project/CHANGES 
 
 %changelog
+* Mon Jan 21 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-17
+- Resolves: #427734
+  fix amavis script
+- Resolves: #429452
+  fix openvpn script
+
 * Tue Jan  8 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-16
 - Resolves: #427734
   fix amavis script