From c7d6e2277d8387d136ae522ac3081d5c7594de57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20=C5=A0imovec?= <psimovec@redhat.com>
Date: Wed, 28 Jun 2023 20:29:57 +0200
Subject: [PATCH] fix sendmail logwatch script to allow 6-digit PIDs

---
 logwatch.spec              |  8 +++++++-
 sendmail-6-digit-pid.patch | 12 ++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 sendmail-6-digit-pid.patch

diff --git a/logwatch.spec b/logwatch.spec
index 64058b9..f8eb932 100644
--- a/logwatch.spec
+++ b/logwatch.spec
@@ -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
diff --git a/sendmail-6-digit-pid.patch b/sendmail-6-digit-pid.patch
new file mode 100644
index 0000000..74590c8
--- /dev/null
+++ b/sendmail-6-digit-pid.patch
@@ -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();
+