Fix matching of systemd 'Deactivated' messages

This commit is contained in:
Pavel Šimovec 2023-04-14 17:50:57 +02:00
parent d105a6acb0
commit 6f4ba1f6f8
2 changed files with 20 additions and 1 deletions

View File

@ -2,11 +2,12 @@
Summary: A log file analysis program
Name: logwatch
Version: 7.5.5
Release: 5%{?dist}
Release: 6%{?dist}
License: MIT
URL: https://sourceforge.net/projects/logwatch
Source0: logwatch-%{version}.tar.gz
Patch0: cron.patch
Patch1: systemd-deactivated.patch
#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRequires: perl-generators
Requires: grep
@ -33,6 +34,7 @@ of the package on many systems.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
@ -127,6 +129,10 @@ echo "# Configuration overrides for specific logfiles/services may be placed her
%{_unitdir}/logwatch.timer
%changelog
* Fri Apr 14 2023 Pavel Šimovec <psimovec@redhat.com> - 7.5.5-6
- Add patch to fix systemd messages containing "Deactivated"
- Resolves: rhbz:2160770
* Thu Mar 02 2023 Pavel Šimovec <psimovec@redhat.com> - 7.5.5-5
- Add patch to remove CMDEND from cron service
Resolves: rhbz#2158271

13
systemd-deactivated.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/scripts/services/systemd b/scripts/services/systemd
index f1da2ac..44cc7a9 100644
--- a/scripts/services/systemd
+++ b/scripts/services/systemd
@@ -70,7 +70,7 @@ while (defined(my $ThisLine = <STDIN>)) {
# crond will never restart process when it is restarted
$ThisLine =~ /^crond\.service: Found left-over process \d+ \(.*\) in control group while starting unit\. Ignoring\.$/ or
$ThisLine =~ /^Received SIGINT\./ or
- $ThisLine =~ /^Deactivated / or
+ $ThisLine =~ /: Deactivated / or
$ThisLine =~ /^Detected (architecture|virtualization) / or
$ThisLine =~ /^Found device / or
$ThisLine =~ /Got automount request for \/proc\// or