rpms/logwatch/devel logwatch-7.1-samba.patch, NONE, 1.1 logwatch-7.1-sshd.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 logwatch.spec, 1.26, 1.27 sources, 1.11, 1.12 logwatch-6.1.2-audit2.patch, 1.1, NONE logwatch-7.0-dir.patch, 1.1, NONE logwatch-7.0-secure.patch, 1.1, NONE logwatch-7.0-smartd.patch, 1.1, NONE logwatch-7.0-zz-disk_space.patch, 1.2, NONE logwatch-7.0-zz-disk_space2.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Nov 23 14:30:48 UTC 2005
Author: varekova
Update of /cvs/dist/rpms/logwatch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24532
Modified Files:
.cvsignore logwatch.spec sources
Added Files:
logwatch-7.1-samba.patch logwatch-7.1-sshd.patch
Removed Files:
logwatch-6.1.2-audit2.patch logwatch-7.0-dir.patch
logwatch-7.0-secure.patch logwatch-7.0-smartd.patch
logwatch-7.0-zz-disk_space.patch
logwatch-7.0-zz-disk_space2.patch
Log Message:
update to 7.1
added sshd and samba patches
logwatch-7.1-samba.patch:
samba | 12 ++++++++++++
1 files changed, 12 insertions(+)
--- NEW FILE logwatch-7.1-samba.patch ---
--- logwatch-7.1/scripts/services/samba.pom 2005-02-24 18:08:05.000000000 +0100
+++ logwatch-7.1/scripts/services/samba 2005-11-16 11:36:34.959384256 +0100
@@ -47,6 +47,7 @@
$DbOpenFail = 0;
$DbCorrupt = 0;
$GetDomainMasterStatusFail = 0;
+%SIDnotvalid;
if ( $Debug >= 5 ) {
print STDERR "\n\nDEBUG: Inside Samba Filter \n\n";
@@ -192,6 +193,8 @@
$LockDbError{$Error}++;
} elsif ( ($Error) = ($ThisLine =~ /locking_init\([0-9]+\) ERROR: (Failed to initialise locking database)$/)) {
$LockDbError{$Error}++;
+ } elsif ( ($SID,$dsid) = ($ThisLine =~ /User administrator has Primary Group SID ([^ ]+), which conflicts with the domain sid ([^ ]+). Failing operation.$/)) {
+ $SIDnotvalid{"$SID,$dsid"}++;
} elsif ( ($Location,$Reason) = ($ThisLine =~ /tdb_log\([0-9]+\) tdb\(([^ ]+)\): tdb_reopen: (open failed \([^ ]+\))/)) {
$LockDbError{"$Location - $Reason"}++;
} else {
@@ -442,6 +445,15 @@
}
}
+if (keys %SIDnotvalid) {
+ print ("\n SID is not valid for the domain\n");
+ foreach $SIDLog (keys %SIDnotvalid) {
+ ($SID,$dsid) = split(",",$SIDLog);
+ print "User administrator Primary Group SID ($SID) conflicts with the domain sid ($dsid): $SIDnotvalid{$SIDLog} Time(s) \n";
+ }
+}
+
+
if (keys %OtherList) {
print "\n**Unmatched Entries**\n";
foreach $Line (sort {$a cmp $b} keys %OtherList) {
logwatch-7.1-sshd.patch:
sshd | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE logwatch-7.1-sshd.patch ---
--- logwatch-7.1/scripts/services/sshd.pom 2005-10-19 07:48:39.000000000 +0200
+++ logwatch-7.1/scripts/services/sshd 2005-11-15 15:30:21.000000000 +0100
@@ -150,7 +150,7 @@
}
chomp($ThisLine);
if (
- ($ThisLine =~ /^pam_succeed_if: requirement "uid < 100" not met by user /) or
+ ($ThisLine =~ /^pam_succeed_if: requirement "uid < 100" (not|was) met by user /) or
($ThisLine =~ m/^(log: )?$/ ) or
($ThisLine =~ m/^(log: )?\^\[\[60G/ ) or
($ThisLine =~ m/^(log: )? succeeded$/ ) or
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/logwatch/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 13 Oct 2005 14:25:46 -0000 1.11
+++ .cvsignore 23 Nov 2005 14:30:46 -0000 1.12
@@ -1 +1 @@
-logwatch-7.0.tar.gz
+logwatch-7.1.tar.gz
Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- logwatch.spec 2 Nov 2005 12:29:08 -0000 1.26
+++ logwatch.spec 23 Nov 2005 14:30:46 -0000 1.27
@@ -1,19 +1,15 @@
Summary: A log file analysis program.
Name: logwatch
-Version: 7.0
-Release: 2
+Version: 7.1
+Release: 1
License: MIT
Group: Applications/System
URL: http://www.logwatch.org/
Source: ftp://ftp.kaybee.org/pub/linux/logwatch-%{version}.tar.gz
Patch1: logwatch-4.3.2-nounicode.patch
Patch2: logwatch-7.0-nosegfault.patch
-Patch12: logwatch-6.1.2-audit2.patch
-Patch13: logwatch-7.0-smartd.patch
-Patch14: logwatch-7.0-zz-disk_space.patch
-Patch15: logwatch-7.0-secure.patch
-Patch16: logwatch-7.0-dir.patch
-Patch17: logwatch-7.0-zz-disk_space2.patch
+Patch3: logwatch-7.1-sshd.patch
+Patch4: logwatch-7.1-samba.patch
Requires: textutils sh-utils grep mailx
BuildRoot: %{_tmppath}/logwatch-build
@@ -31,12 +27,8 @@
%setup -q
%patch1 -p1
%patch2 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
+%patch3 -p1
+%patch4 -p1
%install
@@ -100,7 +92,7 @@
%files
%defattr(-,root,root)
-%doc README HOWTO-Make-Filter HOWTO-Customize-Configuration
+%doc README HOWTO-Customize-LogWatch
%dir %{_var}/cache/logwatch
%dir %{_sysconfdir}/logwatch
%dir %{_sysconfdir}/logwatch/conf
@@ -138,6 +130,10 @@
%doc License project/CHANGES project/TODO
%changelog
+* Wed Nov 23 2005 Ivana Varekova <varekova at redhat.com> 7.1-1
+- update to 7.1
+- added sshd and samba patches
+
* Wed Nov 2 2005 Ivana Varekova <varekova at redhat.com> 7.0-2
- fix zz-disk_space problem (bug 172230)
used michal at harddata.com patch
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/logwatch/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 13 Oct 2005 14:25:46 -0000 1.11
+++ sources 23 Nov 2005 14:30:46 -0000 1.12
@@ -1 +1 @@
-58fc1ea61df69e0e0839e70a289f5b3e logwatch-7.0.tar.gz
+6abe774abb10f45472c387f5e646a251 logwatch-7.1.tar.gz
--- logwatch-6.1.2-audit2.patch DELETED ---
--- logwatch-7.0-dir.patch DELETED ---
--- logwatch-7.0-secure.patch DELETED ---
--- logwatch-7.0-smartd.patch DELETED ---
--- logwatch-7.0-zz-disk_space.patch DELETED ---
--- logwatch-7.0-zz-disk_space2.patch DELETED ---
More information about the fedora-cvs-commits
mailing list