diff --git a/SOURCES/logwatch-dovecot.patch b/SOURCES/logwatch-dovecot.patch new file mode 100644 index 0000000..93c7e96 --- /dev/null +++ b/SOURCES/logwatch-dovecot.patch @@ -0,0 +1,13 @@ +diff --git a/scripts/services/dovecot b/scripts/services/dovecot +index 95fc6e9..c9fccbc 100755 +--- a/scripts/services/dovecot ++++ b/scripts/services/dovecot +@@ -186,7 +186,7 @@ while (defined($ThisLine = )) { + $Deliver{$User}{$Mailbox}++; + + # For Sieve-based delivery +- } elsif ( ($User, $Mailbox) = ( $ThisLine =~ /^$dovecottag (?:lda|deliver)\((.*)\): sieve: msgid=.*: stored mail into mailbox '(.*)'/ ) ) { ++ } elsif ( ($User, $Mailbox) = ( $ThisLine =~ /^$dovecottag (?:lda|deliver)\((.*)\)(?:<[^>]+><[^>]+>)?: sieve: msgid=.*: stored mail into mailbox '(.*)'/ ) ) { + $Deliver{$User}{$Mailbox}++; + + # LMTP-based delivery diff --git a/SPECS/logwatch.spec b/SPECS/logwatch.spec index 84ecbf6..db2c422 100644 --- a/SPECS/logwatch.spec +++ b/SPECS/logwatch.spec @@ -1,7 +1,7 @@ Summary: A log file analysis program Name: logwatch Version: 7.4.3 -Release: 9%{?dist} +Release: 11%{?dist} License: MIT Group: Applications/System URL: http://www.logwatch.org/ @@ -21,6 +21,10 @@ Patch5: logwatch-journal.patch # https://sourceforge.net/p/logwatch/git/ci/ed6eb62f40cb97f71f3df4d982682de68cdf1037/ Patch6: logwatch-journald-source.patch Patch7: logwatch-sshd-2.patch +# https://sourceforge.net/p/logwatch/git/ci/b325c68f83ef6c3e3ec9f35c8fdeff5b43fd8559/ +# cherry-pick hunk at @@ -224,7 +224,7 @@ +Patch8: logwatch-dovecot.patch + BuildRequires: perl-generators Requires: grep mailx Requires: perl(Date::Manip) @@ -45,6 +49,7 @@ of the package on many systems. %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 rm -f scripts/services/*.orig %build @@ -144,6 +149,12 @@ echo "# Configuration overrides for specific logfiles/services may be placed her %{_mandir}/man*/* %changelog +* Fri May 07 2021 Vincent Mihalkovic - 7.4.3-11 +- add gating.yaml file + +* Thu May 06 2021 Vincent Mihalkovic - 7.4.3-10 +- fix dovecot statements (#1952629) + * Fri Feb 09 2018 Igor Gnatenko - 7.4.3-9 - Escape macros in %%changelog