[Pkg-logwatch-general] r35 - in trunk: debian patches
Willi Mann
willi-guest at costa.debian.org
Sat Mar 25 13:37:47 UTC 2006
Author: willi-guest
Date: 2006-03-25 13:37:46 +0000 (Sat, 25 Mar 2006)
New Revision: 35
Removed:
trunk/patches/service-courier.diff
trunk/patches/service-secure.diff
trunk/patches/z-0-new-su-to-ignore-in-secure.diff
trunk/patches/z-352333-imapd.diff
trunk/patches/z-355528-secure.diff
trunk/patches/z-bug-348974.diff
Modified:
trunk/debian/changelog
trunk/patches/APPLIED_NEXT_UPSTREAM
Log:
Prepare release of 7.3
- remove unneeded patches
- update changelog
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-03-25 13:32:25 UTC (rev 34)
+++ trunk/debian/changelog 2006-03-25 13:37:46 UTC (rev 35)
@@ -1,5 +1,6 @@
-logwatch (7.2.1-2test0) unstable; urgency=low
+logwatch (7.3-0test1) unstable; urgency=low
+ * New upstream release
* Add another unmatched entry for imapd - thanks again to Richard Burton
for the report. closes: #356815
* Add some unmatched lines for smartd.
Modified: trunk/patches/APPLIED_NEXT_UPSTREAM
===================================================================
--- trunk/patches/APPLIED_NEXT_UPSTREAM 2006-03-25 13:32:25 UTC (rev 34)
+++ trunk/patches/APPLIED_NEXT_UPSTREAM 2006-03-25 13:37:46 UTC (rev 35)
@@ -1,6 +1 @@
-service-secure.diff
-z-0-new-su-to-ignore-in-secure.diff
-z-bug-348974.diff
-service-courier.diff
-z-352333-imapd.diff
-z-355528-secure.diff
+
Deleted: trunk/patches/service-courier.diff
===================================================================
--- trunk/patches/service-courier.diff 2006-03-25 13:32:25 UTC (rev 34)
+++ trunk/patches/service-courier.diff 2006-03-25 13:37:46 UTC (rev 35)
@@ -1,43 +0,0 @@
---- logwatch-7.2.1.b/scripts/services/courier 2005-04-20 19:57:27.000000000 +0200
-+++ logwatch-7.2.1/scripts/services/courier 2006-02-11 17:05:35.000000000 +0100
-@@ -114,7 +114,7 @@
- my @IPar = @{$IPar} if defined $IPar;
- my $IP = shift(@IPar);
-
-- foreach my $key1 (keys %{$hash})
-+ foreach my $key1 (sort keys %{$hash})
- {
- my ( $rout, $nmb, $rsize);
- if ($depth > 1) {
-@@ -162,7 +162,7 @@
- my ( $out, $nmb, $size ) = ("", 0,0);
- my ( $lout, $lnmb, $lsize);
-
-- foreach my $key1 (keys %{$hash})
-+ foreach my $key1 (sort keys %{$hash})
- {
- ($lout, $lnmb, $lsize) = maketbl1($hash->{$key1}, defined $sizehash ? $sizehash->{$key1} : undef, $IP, $tablecolumns, undef, "-");
- if ($onerectitle) {
-@@ -193,11 +193,9 @@
- sub max
- {
- my $ret = shift;
-- my $i = 1;
- foreach my $val (@_)
- {
- $ret = $val if $val > $ret;
-- $i++;
- }
- return $ret;
- }
-@@ -261,8 +259,9 @@
- $out .= "\n";
-
- #tablebody
-- while (my ($key1, $nmb) = each %{$hash})
-+ foreach my $key1 (sort keys %{$hash})
- {
-+ my $nmb = $hash->{$key1};
- #col1
- #whitespace
- if ($IP) {
Deleted: trunk/patches/service-secure.diff
===================================================================
--- trunk/patches/service-secure.diff 2006-03-25 13:32:25 UTC (rev 34)
+++ trunk/patches/service-secure.diff 2006-03-25 13:37:46 UTC (rev 35)
@@ -1,46 +0,0 @@
---- logwatch-7.0.orig/scripts/services/secure
-+++ logwatch-7.0/scripts/services/secure
-@@ -98,6 +98,13 @@
- my $temp = $ThisLine;
- $temp =~ s/^([^[:]+).*/$1/;
- if ($Ignore =~ /\b\Q$temp\E\b/i) { next; }
-+
-+ #current sarge
-+ if ($ThisLine =~ /^[^ :]*:( [0-9:\[\]\.]+|) \(pam_(unix|securetty)\)/i ) {next; }
-+
-+ #Woody - specific, thanks to Michael Stovenour
-+ if ($ThisLine =~ /^PAM_unix[\[\]0-9]*:/i ) { next; }
-+
- if (
- ( $ThisLine =~ /pam_succeed_if: requirement "uid < 100" (was|not) met by user /) or
- ( $ThisLine =~ /pam_rhosts_auth\[\d+\]: allowed to [^ ]+ as \w+/) or
-@@ -106,6 +113,7 @@
- ( $ThisLine =~ /^\/usr\/bin\/sudo:/) or
- ( $ThisLine =~ /^halt:/) or
- ( $ThisLine =~ /^pam_xauth\[\d+\]: call_xauth: child returned \d/) or
-+ ( $ThisLine =~ /^su\[\d+\]: pam_authenticate: Authentication failure/) or
- ( $ThisLine =~ /^passwd\[\d+\]:/) or
- ( $ThisLine =~ /^reboot:/) or
- ( $ThisLine =~ /^sudo:/) or
-@@ -118,6 +126,11 @@
- ( $ThisLine =~ /^sshd\(\w+\)\[\d+\]: check pass; user unknown/) or
- ( $ThisLine =~ /^sshd\(\w+\)\[\d+\]: session /) or
- ( $ThisLine =~ /^ipop3d\[\d+\]:/) or
-+ ( $ThisLine =~ /^su\[\d+\]: [+-] .+/) or
-+ ( $ThisLine =~ /^pam_limits\[\d+\]/ ) or
-+ ( $ThisLine =~ /^kcheckpass(\[\d+\]|):/ ) or # done in pam_unix
-+ ( $ThisLine =~ /^cyrus\/lmtpd\[\d+\]: [^ ]+ server step [12]/ ) or
-+ ( $ThisLine =~ /^cyrus\/imapd\[\d+\]: [^ ]+ server step [12]/ ) or
- ( $ThisLine =~ /pam_timestamp: updated timestamp file/) or
- ( $ThisLine =~ /pam_timestamp: timestamp file `([^ ]+)' is only \d+ seconds old, allowing access to ([^ ]+) for user ([^ ]+)/) or
- ( $ThisLine =~ /pam_timestamp: timestamp file `([^ ]+)' has unacceptable age \(\d+ seconds\), disallowing access to ([^ ]+) for user ([^ ]+)/)
-@@ -220,7 +233,7 @@
- } elsif ( ($Service,$Err) = ($ThisLine =~ /^(su): (FAILED SU \(to \w+\) \w+ on [^ ]+)/ ) ) {
- #SuSe su failed
- $Error{$Service}{$Err}++;
-- } elsif ( $ThisLine =~ /^login: ROOT LOGIN ON tty[0-9]+/) {
-+ } elsif ( $ThisLine =~ /^login\[\d+\]: ROOT LOGIN\s+on\s+`tty[0-9]+/) {
- $RootLoginTTY++
- } elsif ( (undef,$User) = ($ThisLine =~ /^login: LOGIN ON (tty|pts\/)[0-9]+ BY ([^ ]+)/ )) {
- $UserLogin{$User}++;
-
Deleted: trunk/patches/z-0-new-su-to-ignore-in-secure.diff
===================================================================
--- trunk/patches/z-0-new-su-to-ignore-in-secure.diff 2006-03-25 13:32:25 UTC (rev 34)
+++ trunk/patches/z-0-new-su-to-ignore-in-secure.diff 2006-03-25 13:37:46 UTC (rev 35)
@@ -1,11 +0,0 @@
-diff -ur logwatch-7.2.1.b/scripts/services/secure logwatch-7.2.1/scripts/services/secure
---- logwatch-7.2.1.b/scripts/services/secure 2006-01-25 10:55:56.000000000 +0100
-+++ logwatch-7.2.1/scripts/services/secure 2006-01-25 10:56:49.000000000 +0100
-@@ -139,6 +139,7 @@
- ( $ThisLine =~ /^sshd\(\w+\)\[\d+\]: session /) or
- ( $ThisLine =~ /^ipop3d\[\d+\]:/) or
- ( $ThisLine =~ /^su\[\d+\]: [+-] .+/) or
-+ ( $ThisLine =~ /^su\[\d+\]: Successful su for \S+ by \S+/) or
- ( $ThisLine =~ /^pam_limits\[\d+\]/ ) or
- ( $ThisLine =~ /^kcheckpass(\[\d+\]|):/ ) or # done in pam_unix
- ( $ThisLine =~ /^cyrus\/lmtpd\[\d+\]: [^ ]+ server step [12]/ ) or
Deleted: trunk/patches/z-352333-imapd.diff
===================================================================
--- trunk/patches/z-352333-imapd.diff 2006-03-25 13:32:25 UTC (rev 34)
+++ trunk/patches/z-352333-imapd.diff 2006-03-25 13:37:46 UTC (rev 35)
@@ -1,12 +0,0 @@
---- logwatch-7.2.1.b/scripts/services/imapd 2005-10-19 07:28:40.000000000 +0200
-+++ logwatch-7.2.1/scripts/services/imapd 2006-02-13 22:31:16.000000000 +0100
-@@ -37,7 +37,8 @@
- while (defined($ThisLine = <STDIN>)) {
- if (
- ($ThisLine =~ /^Initializing */) or
-- ($ThisLine =~ /^spgetpwnam: can't find user: */)
-+ ($ThisLine =~ /^spgetpwnam: can't find user: */) or
-+ ($ThisLine =~ /^couriertls: read: Connection reset by peer/ )
- ) {
- # Don't care about these...
- } elsif ( ($User, $Host) = ( $ThisLine =~ /^Login user=(.*?) host=(.*\[.*\])$/ ) ) {
Deleted: trunk/patches/z-355528-secure.diff
===================================================================
--- trunk/patches/z-355528-secure.diff 2006-03-25 13:32:25 UTC (rev 34)
+++ trunk/patches/z-355528-secure.diff 2006-03-25 13:37:46 UTC (rev 35)
@@ -1,57 +0,0 @@
---- logwatch-7.2.1.b/scripts/services/secure 2006-02-13 23:06:12.000000000 +0100
-+++ logwatch-7.2.1.secure/scripts/services/secure 2006-03-09 21:48:27.000000000 +0100
-@@ -254,7 +254,7 @@
- $DeletedUsers .= " $ThisLine\n";
- } elsif ( $ThisLine =~ s/^(?:useradd|adduser)\[\d+\]: new user: name=(.+), (?:uid|UID)=(\d+).*$/$1 ($2)/ ) {
- $NewUsers .= " $ThisLine\n";
-- } elsif ( $ThisLine =~ s/^userdel\[\d+\]: remove group `(.+)'/$1/ ) {
-+ } elsif ( $ThisLine =~ s/^userdel\[\d+\]: remove(?:d)? group `(\S+)'( owned by \S+)?/$1/ ) {
- $DeletedGroups .= " $ThisLine\n";
- } elsif ( $ThisLine =~ s/^groupdel\[\d+\]: remove group `(.+)'/$1/ ) {
- $DeletedGroups .= " $ThisLine\n";
-@@ -264,6 +264,8 @@
- $AddToGroup{$Group}{$User}++;
- } elsif ( $ThisLine =~ s/^groupadd\[\d+\]: new group: name=(.+), (?:gid|GID)=(\d+).*$/$1 ($2)/ ) {
- $NewGroups .= " $ThisLine\n";
-+ } elsif ( $ThisLine =~ s/^gpasswd\[\d+\]: set members of // ) {
-+ $SetGroupMembers .= " $ThisLine\n";
- } elsif ( $ThisLine =~ /^userdel\[\d+\]: delete `(.*)' from (shadow |)group `(.*)'\s*$/ ) {
- push @RemoveFromGroup, " user $1 from group $3\n";
- # This is an inetd lookup... $1 is the service (i.e. ftp), $2 is the response
-@@ -285,6 +287,8 @@
- }
- } elsif ( ($User) = ($ThisLine =~ /^chage\[\d+\]: changed password expiry for ([^ ]+)/)) {
- $PasswordExpiry{$User}++;
-+ } elsif ( ($User) = ($ThisLine =~ /^chfn\[\d+\]: changed user `([^ ]+)' information/)) {
-+ $UserInfChange{$User}++;
- } elsif ( (undef) = ($ThisLine =~ /^pam_console\[\d+\]: console file lock already in place ([^ ]+)/ )) {
- $ConsoleLock++;
- } elsif ( ($Message) = ($ThisLine =~ /^pam_xauth\[\d+\]: call_xauth: (.+)/)) {
-@@ -373,8 +377,12 @@
- }
- }
-
-+if ($SetGroupMembers) {
-+ print "Set Members of Group:\n$SetGroupMembers\n";
-+}
-+
- if (@RemoveFromGroup) {
-- print "\nRemoved From Group:\n at RemoveFromGroup\n";
-+ print "\nRemoved From Group:\n".join('', at RemoveFromGroup)."\n";
- }
-
- if (keys %HomeChange) {
-@@ -538,6 +546,13 @@
- }
- }
-
-+if (keys %UserInfChange) {
-+ print "\nChanged user information:\n";
-+ foreach $User (sort {$a cmp $b} keys %UserInfChange) {
-+ print " $User : $UserInfChange{$User} Time(s)\n";
-+ }
-+}
-+
- if (keys %XauthMessage) {
- print "\nReported by call_xauth:\n";
- foreach $Message (sort {$a cmp $b} keys %XauthMessage) {
Deleted: trunk/patches/z-bug-348974.diff
===================================================================
--- trunk/patches/z-bug-348974.diff 2006-03-25 13:32:25 UTC (rev 34)
+++ trunk/patches/z-bug-348974.diff 2006-03-25 13:37:46 UTC (rev 35)
@@ -1,12 +0,0 @@
-diff -ur logwatch-7.2.1.b/scripts/services/syslogd logwatch-7.2.1/scripts/services/syslogd
---- logwatch-7.2.1.b/scripts/services/syslogd 2006-01-04 22:18:03.000000000 +0100
-+++ logwatch-7.2.1/scripts/services/syslogd 2006-01-21 14:01:16.000000000 +0100
-@@ -21,7 +21,7 @@
- elsif ($ThisLine =~ /^syslogd .* restart\.$/) {
- $Starts++;
- }
-- elsif ($ThisLine =~ /^restart\.?$/) {
-+ elsif ($ThisLine =~ /^restart( \(remote reception\))?\.?$/) {
- $Starts++;
- }
- elsif ($ThisLine =~ /^Cannot glue message parts together$/) {
More information about the Pkg-logwatch-general
mailing list