[packages/logwatch] - up to 7.4.3

arekm arekm at pld-linux.org
Mon Apr 23 18:44:48 CEST 2018 

commit 8b83d41da5061c4163cc11f58127773cb5a92c13
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Apr 23 18:44:41 2018 +0200

    - up to 7.4.3

 logwatch-archives.patch                 | 11 ++---
 logwatch-escape-braces-in-regexps.patch | 74 ---------------------------------
 logwatch.spec                           |  8 ++--
 3 files changed, 9 insertions(+), 84 deletions(-)
---
diff --git a/logwatch.spec b/logwatch.spec
index bb44c63..0d7ac12 100644
--- a/logwatch.spec
+++ b/logwatch.spec
@@ -2,12 +2,12 @@
 Summary:	Analyzes system logs
 Summary(pl.UTF-8):	Logwatch - analizator logów systemowych
 Name:		logwatch
-Version:	7.4.1
-Release:	2
+Version:	7.4.3
+Release:	1
 License:	MIT
 Group:		Applications/System
 Source0:	http://downloads.sourceforge.net/logwatch/%{name}-%{version}.tar.gz
-# Source0-md5:	a0c3d8721f877bdcd4a9089eb1b4691b
+# Source0-md5:	22bd22841caa45f12c605abc3e0c2b09
 # https://po2.uni-stuttgart.de/~rusjako/logwatch/default.html
 Source1:	https://po2.uni-stuttgart.de/~rusjako/logwatch/%{name}-syslog-ng.tar.gz
 # Source1-md5:	2f834407b85080e8e6556d6182d245aa
@@ -18,7 +18,6 @@ Source5:	%{name}.tmpwatch
 Patch0:		%{name}-log_conf.patch
 Patch1:		%{name}-archives.patch
 Patch2:		%{name}-exim.patch
-Patch3:		%{name}-escape-braces-in-regexps.patch
 URL:		http://www.logwatch.org/
 BuildRequires:	rpm-perlprov
 Requires:	crondaemon
@@ -48,7 +47,6 @@ użyciu i może pracować na większości systemów.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
diff --git a/logwatch-archives.patch b/logwatch-archives.patch
index 245dfa7..1dfa2ab 100644
--- a/logwatch-archives.patch
+++ b/logwatch-archives.patch
@@ -59,16 +59,17 @@
  Archive = apache2/*access.log.*.gz
 --- logwatch-7.3.6/conf/logfiles/maillog.conf	2006-03-21 03:47:28.000000000 +0200
 +++ logwatch-7.3.6-archives/conf/logfiles/maillog.conf	2008-10-06 09:26:40.765136887 +0300
-@@ -22,7 +22,8 @@
- #If you use a "-" in naming add that as well -mgt
- Archive = maillog.*
+@@ -25,8 +25,8 @@ Archive = maillog.*
+ Archive = maillog-*
  Archive = syslog.*
+ Archive = syslog-*
 -Archive = archiv/maillog.*
+-Archive = archiv/maillog-*
 +Archive = archive/maillog.*
 +Archive = archive/maillog-*
  Archive = mail.log.*.gz
- 
- 
+ Archive = mail.log-*.gz
+ Archive = mail-*
 --- logwatch-7.3.6/conf/logfiles/messages.conf	2006-03-21 03:47:28.000000000 +0200
 +++ logwatch-7.3.6-archives/conf/logfiles/messages.conf	2008-10-06 09:26:45.961437136 +0300
 @@ -17,9 +17,9 @@
diff --git a/logwatch-escape-braces-in-regexps.patch b/logwatch-escape-braces-in-regexps.patch
deleted file mode 100644
index 3498140..0000000
--- a/logwatch-escape-braces-in-regexps.patch
+++ /dev/null
@@ -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) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/logwatch.git/commitdiff/8b83d41da5061c4163cc11f58127773cb5a92c13

More information about the pld-cvs-commit mailing list