Re: [PATCH] fix perl 5.22 warnings
Willi Mann <[email protected]> Tue, 5 Jan 2016 20:37:11 +0100
| Newsgroups | gmane.comp.log.logwatch.devel |
|---|---|
| Message-ID | <[email protected]> |
Hi, I just wanted to point out that 2 patches for fixing perl 5.22 problems that were posted to the list are still not applied: secure.patch from Jan Synacek escape-braces-in-regexps-http.patch from Mark Grimes (Attached both) Additionally, there is another script that perl 5.22 complains on (I did perl -c on all scripts within logwatch): scripts/services/citadel \C is deprecated in regex; marked by <-- HERE in m/^\C <-- HERE ontext: \[[ \d]+\]SRV\[(?:citadel-(?:TCP|UDS)|CitNetworker|rssclient|POP1aggr|POP3|POP3S|DICT_TCP|IMAP|IMAPS|LMTP|SMTP_Send|SMTP-MSA)\] Session ended/ at /tmp/scripts/services/citadel line 281. Bye Willi Am 2015-07-31 um 13:15 schrieb Jan Synacek: > > Cheers, > > > > ------------------------------------------------------------------------------ > > > > _______________________________________________ > Logwatch-devel mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/logwatch-devel > ------------------------------------------------------------------------------ _______________________________________________ Logwatch-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/logwatch-devel
secure.patch
(text/x-patch, 1.7 KB)
Index: trunk/scripts/services/secure
===================================================================
--- trunk/scripts/services/secure (revision 293)
+++ trunk/scripts/services/secure (working copy)
@@ -506,7 +506,7 @@
$DeniedAccess{"$User,$Reason"}++;
} elsif ($ThisLine =~ /^request-key: Cannot find command to construct key/) {
$RequestKeyFailures++;
- } elsif (my ($type,$from,$response,$client,$service,$e) = ($ThisLine =~ /krb5kdc\[[0-9]*\]: (AS_REQ|TGS_REQ) \([0-9]+ etypes {[ 0-9]+}\) ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+): (ISSUE|UNKNOWN_SERVER): authtime [0-9]+, (?:etypes {rep=[0-9]+ tkt=[0-9]+ ses=[0-9]+},)? ([^ ]+) for ([^ ,]+)(?:, )?(.*)$/)) {
+ } elsif (my ($type,$from,$response,$client,$service,$e) = ($ThisLine =~ /krb5kdc\[[0-9]*\]: (AS_REQ|TGS_REQ) \([0-9]+ etypes \{[ 0-9]+}\) ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+): (ISSUE|UNKNOWN_SERVER): authtime [0-9]+, (?:etypes \{rep=[0-9]+ tkt=[0-9]+ ses=[0-9]+},)? ([^ ]+) for ([^ ,]+)(?:, )?(.*)$/)) {
if($service=~/^krbtgt\/([^@]+)@\1/) {
$service='Login';
}
@@ -515,7 +515,7 @@
$e='';
}
$KerbList{$response}{$type}{$from}{$service}{$client}{$e}++;
- } elsif (my ($type,$from,$response,$client,$service,$e) = ($ThisLine =~ /krb5kdc\[[0-9]*\]: (AS_REQ|TGS_REQ) \([0-9]+ etypes {[ 0-9]+}\) ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+): (NEEDED_PREAUTH|PREAUTH_FAILED|CLIENT_NOT_FOUND): ([^ ]+) for ([^ ,]+)(?:, )?(.*)$/)) {
+ } elsif (my ($type,$from,$response,$client,$service,$e) = ($ThisLine =~ /krb5kdc\[[0-9]*\]: (AS_REQ|TGS_REQ) \([0-9]+ etypes \{[ 0-9]+}\) ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+): (NEEDED_PREAUTH|PREAUTH_FAILED|CLIENT_NOT_FOUND): ([^ ]+) for ([^ ,]+)(?:, )?(.*)$/)) {
if($service=~/^krbtgt\/([^@]+)@\1/) {
$service='Login';
}
escape-braces-in-regexps-http.patch
(text/x-patch, 899 B)
diff -aur logwatch-7.4.1/scripts/services/http logwatch-7.4.1.new/scripts/services/http
--- logwatch-7.4.1/scripts/services/http 2014-09-23 07:52:51.000000000 -0400
+++ logwatch-7.4.1.new/scripts/services/http 2015-08-21 11:10:10.873688824 -0400
@@ -310,10 +310,10 @@
} elsif ($logformat =~ /\G%O/gc) {
$parse_field[$parse_index][$parse_subindex++] = "bytes_out";
$parse_string[$parse_index] .= "(-|\\d*)";
- } elsif ($logformat =~ /\G%{Referer}i/gci) {
+ } elsif ($logformat =~ /\G%\{Referer}i/gci) {
$parse_string[$parse_index] .= "(.*)";
$parse_field[$parse_index][$parse_subindex++] = "referrer";
- } elsif ($logformat =~ /\G%{User-Agent}i/gci) {
+ } elsif ($logformat =~ /\G%\{User-Agent}i/gci) {
$parse_string[$parse_index] .= "(.*)";
$parse_field[$parse_index][$parse_subindex++] = "agent";
} elsif ($logformat =~ /\G%({.*?})?./gc) {
signature.asc
(application/pgp-signature, 819 B)
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIbBAEBCAAGBQJWjBtyAAoJEIy+IZx0V22BxZ4P93eeydiN0x16qTJqBNjpAyVb jxu/MdIW2f0UP7VtHmqdgTGIXUh9DwWQ/1gHN0LVd6M5In41EZUBpnvvYDNAcWgR r019pZwaF8IGW1+ROnOhsdQJ+HGuAcuDkEbbWGTBPEDuXLe+sgVprm3xti2L2mE8 hi1eZ5v5Q5srSF3Sx2BnlYx5FudMb5EkJ4qnAD9nQzGjyB/9hVQ7fo0PxFtD0SNt a82z8kStp6SdtTLbcL8zDBSftpNnauryEVpGbjHG/qDuOw8VqQVI0IQcOkBv3iIn 5CrLvhC8NnGSv/h164fg/TKMFLa2e6baQFe84JH050JT0vYT3/unr1RuGFijbMjT EEOGlhKkL84OEe/B3KtiCQaFvi90gQqdk9+Pdn6uciw+5ga9iPYK9WwcYfKrpl1z QDhRIp/3qLyvwOvwfap4YCHFTP5fOf/o4UG40hEfRCETXOl9esTgUmeOp8raCe/s WcdBAWIoprY/ORBBdxaCGagLk1DhJwqE9anh4iZStboe5i9QPbyteKZmro4vEkRE CDnKQAQl6i7qlPYu5ZeQv5za9FvYNPbPZVTYbUduMOkE4j8PPCVf9xWIFLeAbY+e wo7DnlrcweYaHYZNelPJzJ7SOpk+wBBqtlhJKW9H7IFNT2Ob3yhiSsTEGhA+cpzs Dn3K90BU+gNciH5N04c= =+v5F -----END PGP SIGNATURE-----