Codebase list logwatch / d122efc
Rebase debian patches Willi Mann 5 years ago
8 changed file(s) with 12 addition(s) and 133 deletion(s). Raw diff Collapse all Expand all
+3
-3
debian/patches/0001-00-debspecific-disable-su-reporting-in-secure.diff.patch less more
66 1 file changed, 3 insertions(+), 3 deletions(-)
77
88 diff --git a/scripts/services/secure b/scripts/services/secure
9 index 31f7ba6..f3bd408 100755
9 index d220afc..6357cb9 100755
1010 --- a/scripts/services/secure
1111 +++ b/scripts/services/secure
12 @@ -471,11 +471,11 @@ while (defined($ThisLine = <STDIN>)) {
12 @@ -491,11 +491,11 @@ while (defined($ThisLine = <STDIN>)) {
1313 } elsif ($ThisLine =~ /^pam_pwdfile\[\d+\]: password too short or NULL/) {
1414 $pwd_file_too_short++;
1515 } elsif ( ($User,$Su) = ($ThisLine =~ /^su: ([^ ]+) to ([^ ]+) on \/dev\/ttyp([0-9a-z]+)/) ) {
2323 + #$Su_User{$User}{$Su}++; # -|-
2424 } elsif ($ThisLine =~ /^userhelper\[\d+\]: running '([^']+)' with ([^']+) privileges on behalf of '([^']+)'/) {
2525 $Executed_app{"$1,$2,$3"}++;
26 } elsif ( ($User) = $ThisLine =~ /change user `([^']+)' password/) {
26 } elsif ( ($User) = $ThisLine =~ /change user [`']([^']+)' password/) {
+8
-18
debian/patches/0002-02-bug536472-treat-compressed-logfiles-always-as-arc.patch less more
22 Subject: 02-bug536472-treat-compressed-logfiles-always-as-archive.diff
33
44 ---
5 scripts/logwatch.pl | 11 ++++++++++-
6 1 file changed, 10 insertions(+), 1 deletion(-)
5 scripts/logwatch.pl | 1 -
6 1 file changed, 1 deletion(-)
77
88 diff --git a/scripts/logwatch.pl b/scripts/logwatch.pl
9 index 0167755..969e46b 100755
9 index c088690..ce660ea 100755
1010 --- a/scripts/logwatch.pl
1111 +++ b/scripts/logwatch.pl
12 @@ -726,7 +726,16 @@ foreach $LogFile (@LogFileList) {
13 }
14
15 @FileList = $TempDir . $LogFile . "-archive";
16 - push @FileList, @{$LogFileData{$LogFile}{'logfiles'}};
17 + #quick and dirty fix for debian bug #536472:
18 + #move logfiles ending with *.gz or *.bz2 to archive list,
19 + #so they are unpacked before being processed
20 + foreach my $lf (@{$LogFileData{$LogFile}{'logfiles'}}) {
21 + if($lf =~ /\.gz$|\.bz2$/) {
22 + push @{$LogFileData{$LogFile}{'archives'}}, $lf;
23 + } else {
24 + push @FileList, $lf;
25 + }
26 + }
12 @@ -744,7 +744,6 @@ foreach $LogFile (@LogFileList) {
13 push @FileList, $lf;
14 }
15 }
16 -
2717 my $DestFile = $TempDir . $LogFile . "-archive";
2818 my $Archive;
2919 foreach $Archive (@{$LogFileData{$LogFile}{'archives'}}) {
+1
-1
debian/patches/0005-postfix-Support-also-openspf.net-in-pattern-not-only.patch less more
66 1 file changed, 1 insertion(+), 1 deletion(-)
77
88 diff --git a/scripts/services/postfix b/scripts/services/postfix
9 index f2e3273..9514b39 100755
9 index 86e9faa..f30346d 100755
1010 --- a/scripts/services/postfix
1111 +++ b/scripts/services/postfix
1212 @@ -1961,7 +1961,7 @@ sub postfix_policy_spf($) {
+0
-28
debian/patches/0006-s-s-amavis-Fix-perl-warning-redundant-argument-in-sp.patch less more
0 From: Willi Mann <willi@debian.org>
1 Date: Thu, 28 Jul 2016 16:48:35 +0200
2 Subject: s/s/amavis: Fix perl warning "redundant argument in sprintf"
3
4 Bug-Debian: https://bugs.debian.org/819572
5 ---
6 scripts/services/amavis | 8 ++++++--
7 1 file changed, 6 insertions(+), 2 deletions(-)
8
9 diff --git a/scripts/services/amavis b/scripts/services/amavis
10 index 560454f..ac5e8f4 100755
11 --- a/scripts/services/amavis
12 +++ b/scripts/services/amavis
13 @@ -1334,8 +1334,12 @@ sub print_summary_report (\@) {
14 $$divisor == $Totals{$keyname} ? 100.00 : $Totals{$keyname} * 100 / $$divisor;
15 }
16 else {
17 - push @{$lines[$cur_level]},
18 - sprintf "$fmt %-23s $extra\n", $total, $desc, commify ($Totals{$keyname});
19 + my $out = sprintf "$fmt %-23s", $total, $desc;
20 + if ($extra) {
21 + $out .= sprintf " $extra", commify ($Totals{$keyname});
22 + }
23 + $out .= "\n";
24 + push @{$lines[$cur_level]}, $out;
25 }
26 }
27 }
+0
-23
debian/patches/0007-dovecot-Ignore-Debug-output.patch less more
0 From: Graham Cobb <g+debian@cobb.uk.net>
1 Date: Wed, 2 Nov 2016 19:24:41 +0100
2 Subject: dovecot: Ignore Debug output
3
4 Bug: https://bugs.debian.org/840956
5 ---
6 scripts/services/dovecot | 3 ++-
7 1 file changed, 2 insertions(+), 1 deletion(-)
8
9 diff --git a/scripts/services/dovecot b/scripts/services/dovecot
10 index 3f600e7..fe8a1fe 100755
11 --- a/scripts/services/dovecot
12 +++ b/scripts/services/dovecot
13 @@ -179,7 +179,8 @@ while (defined(my $ThisLine = <STDIN>)) {
14 ($ThisLine =~ /IMAP.* failed with mbox file/) or
15 ($ThisLine =~ /discarded duplicate forward to/) or
16 ($ThisLine =~ /discarding vacation response/) or
17 - ($ThisLine =~ /discarded vacation reply to/)
18 + ($ThisLine =~ /discarded vacation reply to/) or
19 + ($ThisLine =~ /Debug:/)
20 )
21 {
22 # We don't care about these
+0
-30
debian/patches/0008-postfix-Fix-unaligned-output.patch less more
0 From: Willi Mann <willi@debian.org>
1 Date: Mon, 12 Dec 2016 20:42:23 +0100
2 Subject: postfix: Fix unaligned output
3
4 ---
5 scripts/services/postfix | 4 ++--
6 1 file changed, 2 insertions(+), 2 deletions(-)
7
8 diff --git a/scripts/services/postfix b/scripts/services/postfix
9 index 9514b39..b93f016 100755
10 --- a/scripts/services/postfix
11 +++ b/scripts/services/postfix
12 @@ -1360,7 +1360,7 @@ sub print_summary_report (\@) {
13 my ($numfmt, $desc, $divisor) = ($sref->{FMT}, $sref->{TITLE}, $sref->{DIVISOR});
14
15 my $fmt = '%8';
16 - my $extra = ' %25s';
17 + my $extra = ' %11s';
18 my $total = $Totals{$keyname};
19
20 # Z format provides unitized or unaltered totals, as appropriate
21 @@ -1383,7 +1383,7 @@ sub print_summary_report (\@) {
22 }
23 else {
24 push @{$lines[$cur_level]},
25 - sprintf "$fmt %-23s $extra\n", $total, $desc, commify ($Totals{$keyname});
26 + sprintf "$fmt %-37s $extra\n", $total, $desc, commify ($Totals{$keyname});
27 }
28 }
29 }
+0
-26
debian/patches/0009-Revert-Changed-encoding-to-UTF-8-as-suggested-by-G-r.patch less more
0 From: Willi Mann <willi@wm1.at>
1 Date: Sat, 21 Jan 2017 17:02:39 +0100
2 Subject: =?utf-8?q?Revert_=22Changed_encoding_to_UTF-8=2C_as_suggested_by_?=
3 =?utf-8?q?G=C3=B6ran_Uddeborg=2E=22?=
4
5 This reverts commit f9db5949c58321175bda66310156f43ae607109f.
6 ---
7 scripts/logwatch.pl | 4 ++--
8 1 file changed, 2 insertions(+), 2 deletions(-)
9
10 diff --git a/scripts/logwatch.pl b/scripts/logwatch.pl
11 index 969e46b..f28db21 100755
12 --- a/scripts/logwatch.pl
13 +++ b/scripts/logwatch.pl
14 @@ -1171,9 +1171,9 @@ sub initprint {
15 }
16 #Config{output} html
17 if ( $Config{'format'} eq "html" ) {
18 - $out_mime .= "Content-Type: text/html; charset=\"UTF-8\"\n\n";
19 + $out_mime .= "Content-Type: text/html; charset=\"iso-8859-1\"\n\n";
20 } else {
21 - $out_mime .= "Content-Type: text/plain; charset=\"UTF-8\"\n\n";
22 + $out_mime .= "Content-Type: text/plain; charset=\"iso-8859-1\"\n\n";
23 }
24
25 if ($Config{'hostformat'} eq "split") { #8.0 check hostlimit also? or ne none?
+0
-4
debian/patches/series less more
22 0003-logfiles-vsftpd.conf-Use-custom-pattern-for-applystd.patch
33 0004-Revert-upstream-change-on-fail2ban-service-config.patch
44 0005-postfix-Support-also-openspf.net-in-pattern-not-only.patch
5 0006-s-s-amavis-Fix-perl-warning-redundant-argument-in-sp.patch
6 0007-dovecot-Ignore-Debug-output.patch
7 0008-postfix-Fix-unaligned-output.patch
8 0009-Revert-Changed-encoding-to-UTF-8-as-suggested-by-G-r.patch