Jan Synacek
parent
8c810e1773
commit
93cc83746c
1
.gitignore
vendored
1
.gitignore
vendored
@ -12,3 +12,4 @@ logwatch-7.3.6.tar.gz
|
||||
/logwatch-svn198.tar.xz
|
||||
/logwatch-svn242.tar.xz
|
||||
/logwatch-svn293.tar.xz
|
||||
/logwatch-7.4.2.tar.gz
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
According to [1], braces in regexps should now be escaped, otherwise a deprecation warning is
|
||||
displayed.
|
||||
|
||||
[1] http://perldoc.perl.org/perldelta.html#A-literal-%22{%22-should-now-be-escaped-in-a-pattern
|
||||
|
||||
Index: trunk/scripts/services/amavis
|
||||
===================================================================
|
||||
--- trunk/scripts/services/amavis (revision 293)
|
||||
+++ trunk/scripts/services/amavis (working copy)
|
||||
@@ -2283,7 +2283,7 @@
|
||||
#XXX elsif (($action, $key, $ip, $from, $to) = ( $p1 =~ /^(?:Virus found - quarantined|(?:(Passed|Blocked) )?INFECTED) \(([^\)]+)\),[A-Z .]*(?: \[($re_IP)\])?(?: \[$re_IP\])* [<(]([^>)]*)[>)] -> [(<]([^(<]+)[(>]/o ))
|
||||
|
||||
# the first IP is the envelope sender.
|
||||
- if ($p1 !~ /^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED \(.*?\)|BAD-HEADER(?:-\d)?|UNCHECKED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?: {[^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]), (?:.*Hits: ([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/) {
|
||||
+ if ($p1 !~ /^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED \(.*?\)|BAD-HEADER(?:-\d)?|UNCHECKED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?: \{[^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]), (?:.*Hits: ([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/) {
|
||||
inc_unmatched('passblock');
|
||||
next;
|
||||
}
|
||||
Index: trunk/scripts/services/postfix
|
||||
===================================================================
|
||||
--- trunk/scripts/services/postfix (revision 293)
|
||||
+++ trunk/scripts/services/postfix (working copy)
|
||||
@@ -1847,7 +1847,7 @@
|
||||
# KeyboardInterrupt
|
||||
$line =~ /^Read line: "/ or
|
||||
$line =~ /^Found the end of entry$/ or
|
||||
- $line =~ /^Config: {/ or
|
||||
+ $line =~ /^Config: \{/ or
|
||||
$line =~ /^spfcheck: pyspf result/ or
|
||||
$line =~ /^Starting$/ or
|
||||
$line =~ /^Normal exit$/ or
|
||||
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';
|
||||
}
|
||||
Index: trunk/scripts/services/http
|
||||
===================================================================
|
||||
--- trunk/scripts/services/http (revision 293)
|
||||
+++ trunk/scripts/services/http (working copy)
|
||||
@@ -310,13 +310,13 @@
|
||||
} 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) {
|
||||
+ } elsif ($logformat =~ /\G%(\{.*?})?./gc) {
|
||||
$parse_string[$parse_index] .= "(.*?)";
|
||||
$parse_field[$parse_index][$parse_subindex++] = "not_used";
|
||||
} elsif ($logformat =~ /\G\|/gc) {
|
||||
@ -1,23 +1,17 @@
|
||||
%global revision 293
|
||||
Summary: A log file analysis program
|
||||
Name: logwatch
|
||||
Version: 7.4.1
|
||||
Release: 6.20150731svn%{revision}%{?dist}
|
||||
Version: 7.4.2
|
||||
Release: 1%{?dist}
|
||||
License: MIT
|
||||
Group: Applications/System
|
||||
URL: http://www.logwatch.org/
|
||||
# The source for this package was pulled from upstream's vcs. Use the
|
||||
# following commands to generate the tarball:
|
||||
# svn export -r 293 https://svn.code.sf.net/p/logwatch/code/ logwatch-svn293
|
||||
# tar --transform "s/trunk/logwatch-svn293/" -cJvf logwatch-svn293.tar.xz -C logwatch-svn293 trunk
|
||||
Source0: logwatch-svn%{revision}.tar.xz
|
||||
Source0: logwatch-%{version}.tar.gz
|
||||
#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
||||
# Needs proper fix. Not applied by the upstream.
|
||||
Patch0: logwatch-vsftpd.patch
|
||||
# Not applied by upstream.
|
||||
Patch1: logwatch-oldfiles.patch
|
||||
Patch2: logwatch-secure-userhelper.patch
|
||||
Patch3: logwatch-escape-braces-in-regexps.patch
|
||||
Requires: textutils sh-utils grep mailx
|
||||
Requires: perl(Date::Manip)
|
||||
Requires: perl(Sys::CPU)
|
||||
@ -32,11 +26,10 @@ that you wish with the detail that you wish. Easy to use - works right out
|
||||
of the package on many systems.
|
||||
|
||||
%prep
|
||||
%setup -q -n logwatch-svn%{revision}
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
rm -f scripts/services/*.orig
|
||||
|
||||
%build
|
||||
@ -136,6 +129,9 @@ echo "# Configuration overrides for specific logfiles/services may be placed her
|
||||
%{_mandir}/man*/*
|
||||
|
||||
%changelog
|
||||
* Mon Feb 29 2016 Jan Synáček <jsynacek@redhat.com> - 7.4.2-1
|
||||
- Update to 7.4.2 (#1312774)
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.1-6.20150731svn293
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user