From 3580ecc26fd2e4947be7c50ebe50d7ac7ad3bad6 Mon Sep 17 00:00:00 2001 From: Ivana Varekova Date: Tue, 22 May 2007 11:08:15 +0000 Subject: [PATCH] - update to 7.3.6 --- .cvsignore | 2 +- logwatch-7.3.4-secure.patch | 13 ------------- logwatch-7.3.4-xntpd.patch | 13 ------------- logwatch-7.3.4-xntpd2.patch | 11 ----------- logwatch-7.3.6-secure.patch | 10 ++++++++++ logwatch-7.3.6-xntpd.patch | 12 ++++++++++++ logwatch.spec | 15 +++++++-------- sources | 2 +- 8 files changed, 31 insertions(+), 47 deletions(-) delete mode 100644 logwatch-7.3.4-secure.patch delete mode 100644 logwatch-7.3.4-xntpd.patch delete mode 100644 logwatch-7.3.4-xntpd2.patch create mode 100644 logwatch-7.3.6-secure.patch create mode 100644 logwatch-7.3.6-xntpd.patch diff --git a/.cvsignore b/.cvsignore index 194d309..d76c119 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -logwatch-7.3.4.tar.gz +logwatch-7.3.6.tar.gz diff --git a/logwatch-7.3.4-secure.patch b/logwatch-7.3.4-secure.patch deleted file mode 100644 index 39b3bf8..0000000 --- a/logwatch-7.3.4-secure.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- logwatch-7.3.4/scripts/services/secure.pom 2007-01-29 19:29:14.000000000 +0100 -+++ logwatch-7.3.4/scripts/services/secure 2007-04-02 15:56:22.000000000 +0200 -@@ -204,7 +204,9 @@ - ( $ThisLine =~ /PAM pam_set_item: attempt to set conv\(\) to NULL/) or - ( $ThisLine =~ /PAM pam_get_item: nowhere to place requested item/) or - ( $ThisLine =~ /pam_succeed_if\(.*:.*\): error retrieving information about user [a-zA-Z]*/ ) or -- ( $ThisLine =~ /logfile turned over/) # newsyslog on OpenBSD -+ ( $ThisLine =~ /logfile turned over/) or # newsyslog on OpenBSD -+ ( $ThisLine =~ /Connection closed by/) or -+ ( $ThisLine =~ /sshd.*: Accepted \S+ for \S+ from [\d\.:a-f]+ port \d+/) # ssh script reads this log - ) { - # Ignore these entries - } elsif ($ThisLine =~ /^spop3d/ || $ThisLine =~ /^pop\(\w+\)\[\d+\]:/) { diff --git a/logwatch-7.3.4-xntpd.patch b/logwatch-7.3.4-xntpd.patch deleted file mode 100644 index 0ac958b..0000000 --- a/logwatch-7.3.4-xntpd.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- logwatch-7.3.4/scripts/services/xntpd.pom 2007-02-17 20:36:11.000000000 +0100 -+++ logwatch-7.3.4/scripts/services/xntpd 2007-04-04 10:10:47.000000000 +0200 -@@ -105,7 +105,9 @@ - ($ThisLine =~ m/select([^\)]) error: Interrupted system call/) or - ($ThisLine =~ m/signal_no_reset: signal \d+ had flags \d+/) or - ($ThisLine =~ /Deleting interface \#[0-9] [^,]*, [^,]*, interface stats: received=.*, sent=.*, dropped=.*, active_time=.* secs/) or -- ($ThisLine =~ /Invalid argument/) -+ ($ThisLine =~ /Invalid argument/) or -+ ($ThisLine =~ /Listening on interface #[0-9]* (vmnet[0-9]|eth[0-9]|lo), [0-9a-z:.]+\#[0-9]* Enabled/) or -+ ($ThisLine =~ /Listening on interface #[0-9]* wildcard, [0-9a-z:.]+\#[0-9]* Disabled/) - ) { - # Ignore these - } elsif ($ThisLine =~ m/ntpd [\d\-\.\w@]+ ... ... .. ..:..:.. /) { diff --git a/logwatch-7.3.4-xntpd2.patch b/logwatch-7.3.4-xntpd2.patch deleted file mode 100644 index 409f65e..0000000 --- a/logwatch-7.3.4-xntpd2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- logwatch-7.3.4/scripts/services/xntpd.pom 2007-04-13 15:22:15.000000000 +0200 -+++ logwatch-7.3.4/scripts/services/xntpd 2007-04-13 15:38:30.000000000 +0200 -@@ -106,7 +106,7 @@ - ($ThisLine =~ m/signal_no_reset: signal \d+ had flags \d+/) or - ($ThisLine =~ /Deleting interface \#[0-9] [^,]*, [^,]*, interface stats: received=.*, sent=.*, dropped=.*, active_time=.* secs/) or - ($ThisLine =~ /Invalid argument/) or -- ($ThisLine =~ /Listening on interface #[0-9]* (vmnet[0-9]|eth[0-9]|lo), [0-9a-z:.]+\#[0-9]* Enabled/) or -+ ($ThisLine =~ /Listening on interface #[0-9]* (vmnet[0-9]|eth[0-9]|lo|tun[0-9]), [0-9a-z:.]+\#[a-z0-9]* Enabled/) or - ($ThisLine =~ /Listening on interface #[0-9]* wildcard, [0-9a-z:.]+\#[0-9]* Disabled/) - ) { - # Ignore these diff --git a/logwatch-7.3.6-secure.patch b/logwatch-7.3.6-secure.patch new file mode 100644 index 0000000..9208e24 --- /dev/null +++ b/logwatch-7.3.6-secure.patch @@ -0,0 +1,10 @@ +--- logwatch-7.3.6/scripts/services/secure.pom 2007-04-29 01:56:32.000000000 +0200 ++++ logwatch-7.3.6/scripts/services/secure 2007-05-22 12:38:48.000000000 +0200 +@@ -213,6 +213,7 @@ + ( $ThisLine =~ /pam_succeed_if\(.*:.*\): error retrieving information about user [a-zA-Z]*/ ) or + ( $ThisLine =~ /logfile turned over/) or # newsyslog on OpenBSD + ( $ThisLine =~ /Connection closed by/) ++ ( $ThisLine =~ /sshd.*: Accepted \S+ for \S+ from [\d\.:a-f]+ port \d+/) # ssh script reads this log + ) { + # Ignore these entries + } elsif ($ThisLine =~ /^spop3d/ || $ThisLine =~ /^pop\(\w+\)\[\d+\]:/) { diff --git a/logwatch-7.3.6-xntpd.patch b/logwatch-7.3.6-xntpd.patch new file mode 100644 index 0000000..29a76e6 --- /dev/null +++ b/logwatch-7.3.6-xntpd.patch @@ -0,0 +1,12 @@ +--- logwatch-7.3.6/scripts/services/xntpd.pom 2007-04-16 05:11:11.000000000 +0200 ++++ logwatch-7.3.6/scripts/services/xntpd 2007-05-22 12:44:45.000000000 +0200 +@@ -112,7 +112,8 @@ + ($ThisLine =~ m/signal_no_reset: signal \d+ had flags \d+/) or + ($ThisLine =~ /Deleting interface \#[0-9] [^,]*, [^,]*, interface stats: received=.*, sent=.*, dropped=.*, active_time=.* secs/) or + ($ThisLine =~ /Invalid argument/) or +- ($ThisLine =~ /Listening on interface .* Disabled/) ++ ($ThisLine =~ /Listening on interface .* Disabled/) or ++ ($ThisLine =~ /Listening on interface .* Enabled/) + ) { + # Ignore these + } elsif ($ThisLine =~ m/ntpd [\d\-\.\w@]+ ... ... .. ..:..:.. /) { diff --git a/logwatch.spec b/logwatch.spec index 12d58e9..4982b23 100644 --- a/logwatch.spec +++ b/logwatch.spec @@ -1,7 +1,7 @@ Summary: A log file analysis program Name: logwatch -Version: 7.3.4 -Release: 8%{?dist} +Version: 7.3.6 +Release: 1%{?dist} License: MIT Group: Applications/System URL: http://www.logwatch.org/ @@ -9,11 +9,9 @@ Source: ftp://ftp.kaybee.org/pub/linux/logwatch-%{version}.tar.gz Patch1: logwatch-7.2.1-nosegfault.patch Patch2: logwatch-7.3.1-vsftpd.patch Patch3: logwatch-7.3.4-pam_unix.patch -Patch4: logwatch-7.3.4-secure.patch -Patch5: logwatch-7.3.4-xntpd.patch +Patch4: logwatch-7.3.6-secure.patch +Patch5: logwatch-7.3.6-xntpd.patch Patch6: logwatch-7.3.4-sshd.patch -Patch7: logwatch-7.3.4-xntpd2.patch -Patch8: logwatch-7.3.4-mailto.patch Patch9: logwatch-7.3.4-sshd3.patch Patch10: logwatch-7.3.4-named.patch @@ -35,8 +33,6 @@ of the package on many systems. %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 -%patch8 -p1 %patch9 -p1 %patch10 -p1 @@ -151,6 +147,9 @@ rm -rf %{buildroot} %doc License project/CHANGES %changelog +* Tue May 22 2007 Ivana Varekova 7.3.6-1 +- update to 7.3.6 + * Mon May 7 2007 Ivana Varekova 7.3.4-8 - add named and sshd service patches diff --git a/sources b/sources index 0b9fcc9..c9554da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2e257bf514a5de6bc7a3dd05d677d156 logwatch-7.3.4.tar.gz +937d982006b2a76a83edfcfd2e5a9d7d logwatch-7.3.6.tar.gz