fix sendmail logwatch script to allow 6-digit PIDs

This commit is contained in:
Pavel Šimovec 2023-06-28 20:29:57 +02:00
parent 898e7e419d
commit c7d6e2277d
2 changed files with 19 additions and 1 deletions

View File

@ -1,7 +1,7 @@
Summary: A log file analysis program
Name: logwatch
Version: 7.4.3
Release: 20%{?dist}
Release: 21%{?dist}
License: MIT
Group: Applications/System
URL: http://www.logwatch.org/
@ -33,6 +33,7 @@ Patch14: ras-correctable-errors.patch
Patch15: deduplicate-sudo.patch
Patch16: polkit-startup-messages.patch
Patch17: sshd-sort-by-count.patch
Patch18: sendmail-6-digit-pid.patch
BuildRequires: perl-generators
Requires: grep mailx
@ -68,6 +69,7 @@ of the package on many systems.
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
rm -f scripts/services/*.orig
%build
@ -167,6 +169,10 @@ echo "# Configuration overrides for specific logfiles/services may be placed her
%{_mandir}/man*/*
%changelog
* Wed Jun 28 2023 Pavel Šimovec <psimovec@redhat.com> - 7.4.3-21
- fix sendmail logwatch script to allow 6-digit PIDs
- Resolves: rhbz#2046459
* Wed Jun 28 2023 Pavel Šimovec <psimovec@redhat.com> - 7.4.3-20
- sshd sort failed logins and illegal users by count, not IP address
- Resolves: rhbz#2044101

View File

@ -0,0 +1,12 @@
--- a/scripts/services/sendmail
+++ b/scripts/services/sendmail
@@ -388,7 +388,7 @@
}
# QueueID formats: in 8.11 it was \w{7}\d{5}, in 8.12+ it is \w{8}\d{6}
-my $QueueIDFormat = "(?:\\w{7,9}\\d{5}|NOQUEUE)";
+my $QueueIDFormat = "(?:\\w{7,9}\\d{5,6}|NOQUEUE)";
# ENOENT refers to "no such file or directory"
my $ENOENT = Errno::ENOENT();