rpms/logwatch/devel logwatch-7.3.2-automount2.patch, NONE, 1.1 logwatch-7.3.2-named.patch, NONE, 1.1 logwatch-7.3.2-up2date.patch, NONE, 1.1 logwatch-7.3.2-xntpd2.patch, NONE, 1.1 logwatch.spec, 1.60, 1.61
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Feb 12 10:40:59 UTC 2007
Author: varekova
Update of /cvs/dist/rpms/logwatch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22361
Modified Files:
logwatch.spec
Added Files:
logwatch-7.3.2-automount2.patch logwatch-7.3.2-named.patch
logwatch-7.3.2-up2date.patch logwatch-7.3.2-xntpd2.patch
Log Message:
- Resolves: 228258
logwatch warns about dhcdbd subscripton enabled
- add xntpd, up2date and automount services
logwatch-7.3.2-automount2.patch:
automount | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
--- NEW FILE logwatch-7.3.2-automount2.patch ---
--- logwatch-7.3.2/scripts/services/automount.pom 2007-02-09 13:47:00.000000000 +0100
+++ logwatch-7.3.2/scripts/services/automount 2007-02-12 10:20:19.000000000 +0100
@@ -21,8 +21,9 @@
($ThisLine =~ /^>>.*mount: .*$/) or
($ThisLine =~ /lookup_read_master: lookup\(nisplus\): couldn't locat nis\+ table auto.master/) or
($ThisLine =~ /create_(tcp|udp)_client: hostname lookup failed: No such process/) or
- ($ThisLine =~ /lookup_mount: exports lookup failed for .*directory/) or
- ($ThisLine =~ /create_(tc|ud)p_client: hostname lookup failed: Operation not permitted/)
+ ($ThisLine =~ /lookup_mount: exports lookup failed for */) or
+ ($ThisLine =~ /create_(tc|ud)p_client: hostname lookup failed: Operation not permitted/) or
+ ($ThisLine =~ /master_do_mount: failed to startup mount/)
) {
# don't care about these
}
@@ -37,7 +38,9 @@
elsif ($ThisLine =~ /^mount\(nfs\): entry (.*) lookup failure$/) {
$Failed{$1}{'nfsl'}++;
}
- elsif ( $ThisLine =~ /^mount\(generic\): failed to mount .* on (.*)$/) {
+ elsif (( $ThisLine =~ /^mount\(generic\): failed to mount .* on (.*)$/)
+ or ( $ThisLine =~ /^handle_mounts: mount on (.*) failed!/)
+ ) {
$Failed{$1}{'mnt'}++;
}
elsif ( $ThisLine =~ /^failed to mount \/(\w+).*$/) {
logwatch-7.3.2-named.patch:
named | 4 +++-
1 files changed, 3 insertions(+), 1 deletion(-)
--- NEW FILE logwatch-7.3.2-named.patch ---
--- logwatch-7.3.2/scripts/services/named.pom 2006-11-12 22:14:02.000000000 +0100
+++ logwatch-7.3.2/scripts/services/named 2007-02-12 11:23:13.000000000 +0100
@@ -148,7 +148,9 @@
($ThisLine =~ /^ succeeded$/) or
($ThisLine =~ /\*\*\* POKED TIMER \*\*\*/) or
# The message about the end of transfer is the interesting one
- ($ThisLine =~ /: Transfer started./)
+ ($ThisLine =~ /: Transfer started./) or
+ ($ThisLine =~ /D-BUS service (disabled|enabled)./) or
+ ($ThisLine =~ /D-BUS dhcdbd subscription disabled./)
) {
# Don't care about these...
} elsif (
logwatch-7.3.2-up2date.patch:
up2date | 15 +++++++++++++++
1 files changed, 15 insertions(+)
--- NEW FILE logwatch-7.3.2-up2date.patch ---
--- logwatch-7.3.2/scripts/services/up2date.pom 2006-03-29 18:05:51.000000000 +0200
+++ logwatch-7.3.2/scripts/services/up2date 2007-02-12 10:45:45.000000000 +0100
@@ -42,6 +42,15 @@
( $ThisLine =~ /^solving dep for: \[('.*')*\]/) or
( $ThisLine =~ /^Adding [^ ]* to bootloader config/) or
( $ThisLine =~ /^Modifying bootloader config to include the new kernel info/) or
+ ( $ThisLine =~ /rhn_register $/) or
+ ( $ThisLine =~ /rhn_register Registered login info/) or
+ ( $ThisLine =~ /rhn_register Wrote system id to disk/) or
+ ( $ThisLine =~ /rhn_register Sent package list./) or
+ ( $ThisLine =~ /rhn_register updating login info/) or
+ ( $ThisLine =~ /rhn_register Sent hardware profile./) or
+ ( $ThisLine =~ /rhn_register logging into up2date server/) or
+ ( $ThisLine =~ /rhn_register successfully retrieved authentication token from up2date server/) or
+ ( $ThisLine =~ /rhn_register An exception was raised causing login to fail. This is usually correct. Exception information:/) or
( $ThisLine =~ /^Running elilo with the new configuration/) ) {
# We don't care about these
@@ -51,6 +60,8 @@
$PackageAddedToProfile{$ThisLine}++;
} elsif ( $ThisLine =~ s/^Removing packages from package profile: ([^ ]+)/$1/ ) {
$PackageRemovedFromProfile{$ThisLine}++;
+ } elsif ( $ThisLine =~ /rhn_register Registered system./) {
+ $RHNRegistration++;
} else {
# Report any unmatched entries...
push @OtherList,$ThisLine;
@@ -76,6 +87,10 @@
}
}
+if ($RHNRegistration) {
+ print "\nSystem registred to rhn " . $RHNRegistration . " time(s)\n";
+}
+
if ($#OtherList >= 0) {
print "\n**Unmatched Entries**\n";
print @OtherList;
logwatch-7.3.2-xntpd2.patch:
xntpd | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE logwatch-7.3.2-xntpd2.patch ---
--- logwatch-7.3.2/scripts/services/xntpd.pom 2007-02-12 10:58:18.000000000 +0100
+++ logwatch-7.3.2/scripts/services/xntpd 2007-02-12 11:06:49.000000000 +0100
@@ -96,7 +96,8 @@
($ThisLine =~ m/select([^\)]) error: Interrupted system call/) or
($ThisLine =~ m/signal_no_reset: signal \d+ had flags \d+/) or
($ThisLine =~ /Listening on interface \#[0-9]* [^,]*, ([^ ]*) (Enabled|Disabled)/) or
- ($ThisLine =~ /Deleting interface \#[0-9]* [^,]*, [^,]*, interface stats: received=.*, sent=.*, dropped=.*, active_time=.* secs/)
+ ($ThisLine =~ /Deleting interface \#[0-9]* [^,]*, [^,]*, interface stats: received=.*, sent=.*, dropped=.*, active_time=.* secs/) or
+ ($ThisLine =~ /Invalid argument/)
) {
# Ignore these
} elsif ($ThisLine =~ m/ntpd [\d\-\.\w@]+ ... ... .. ..:..:.. /) {
Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- logwatch.spec 9 Feb 2007 12:54:40 -0000 1.60
+++ logwatch.spec 12 Feb 2007 10:40:52 -0000 1.61
@@ -1,7 +1,7 @@
Summary: A log file analysis program
Name: logwatch
Version: 7.3.2
-Release: 8%{?dist}
+Release: 9%{?dist}
License: MIT
Group: Applications/System
URL: http://www.logwatch.org/
@@ -18,6 +18,10 @@
Patch10: logwatch-7.3.2-iptables.patch
Patch11: logwatch-7.3.2-pix.patch
Patch12: logwatch-7.3.2-audit2.patch
+Patch13: logwatch-7.3.2-automount2.patch
+Patch14: logwatch-7.3.2-up2date.patch
+Patch15: logwatch-7.3.2-xntpd2.patch
+Patch16: logwatch-7.3.2-named.patch
Requires: textutils sh-utils grep mailx
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,6 +47,10 @@
%patch10 -p1
%patch11 -p1
%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
# GPL license
rm ./scripts/services/courier
rm ./scripts/services/dpkg
@@ -159,6 +167,11 @@
%doc License project/CHANGES
%changelog
+* Mon Feb 12 2007 Ivana Varekova <varekova at redhat.com> 7.3.2-9
+- Resolves: 228258
+ logwatch warns about dhcdbd subscripton enabled
+- add xntpd, up2date and automount services
+
* Fri Feb 9 2007 Ivana Varekova <varekova at redhat.com> 7.3.2-8
- incorporate the next part of package review comments
- Resolves: 227976
More information about the fedora-cvs-commits
mailing list