diff --git a/SOURCES/cron.patch b/SOURCES/cron.patch new file mode 100644 index 0000000..e58e572 --- /dev/null +++ b/SOURCES/cron.patch @@ -0,0 +1,14 @@ +diff --git a/scripts/services/cron b/scripts/services/cron +index 869b515..45b857f 100644 +--- a/scripts/services/cron ++++ b/scripts/services/cron +@@ -63,6 +63,9 @@ while (defined($ThisLine = )) { + if ($ThisLine =~ s/^CMD \((.+)\)\s*$/$1/) { + $Runs->{$User}->{$ThisLine}++; + $ExecutedCommand{$PID} = {command=>$ThisLine, user=>$User}; ++ } elsif ($ThisLine =~ /^CMDEND/) { ++ # Ignore - already counted above ++ next; + } elsif ($ThisLine =~ s/^CMD FINISH \((.+)\)\s*$/$1/) { + $Runs->{$User}->{$ThisLine}++; + } elsif ($ThisLine =~ s/^(END|CMD START) \((.+)\)\s*$/$1/) { diff --git a/SOURCES/systemd-deactivated.patch b/SOURCES/systemd-deactivated.patch new file mode 100644 index 0000000..b804afb --- /dev/null +++ b/SOURCES/systemd-deactivated.patch @@ -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 = )) { + # 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 diff --git a/SPECS/logwatch.spec b/SPECS/logwatch.spec index f4d1cdc..4563474 100644 --- a/SPECS/logwatch.spec +++ b/SPECS/logwatch.spec @@ -2,10 +2,12 @@ Summary: A log file analysis program Name: logwatch Version: 7.5.5 -Release: 4%{?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 @@ -31,6 +33,8 @@ of the package on many systems. %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build @@ -125,9 +129,17 @@ echo "# Configuration overrides for specific logfiles/services may be placed her %{_unitdir}/logwatch.timer %changelog -* Wed Mar 15 2023 MSVSphere Packaging Team - 7.5.5-4 +* Fri Apr 14 2023 Pavel Šimovec - 7.5.5-6 +- Add patch to fix systemd messages containing "Deactivated" +- Resolves: rhbz:2160770 + +* Wed Mar 15 2023 MSVSphere Packaging Team - 7.5.5-5 - Rebuilt for MSVSphere 9.1. +* Thu Mar 02 2023 Pavel Šimovec - 7.5.5-5 +- Add patch to remove CMDEND from cron service + Resolves: rhbz#2158271 + * Mon Aug 09 2021 Mohan Boddu - 7.5.5-4 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688