From 067356474d28cddf53931210daf02d1b54b076de Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 29 Mar 2022 15:35:42 -0400
Subject: [PATCH] import postfix-3.5.8-4.el8

---
 ...summ-1.1.5-syslog-name-underscore-fix.patch | 18 ++++++++++++++++++
 SOURCES/postfix.service                        |  1 +
 SPECS/postfix.spec                             | 18 ++++++++++++++++--
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 SOURCES/pflogsumm-1.1.5-syslog-name-underscore-fix.patch

diff --git a/SOURCES/pflogsumm-1.1.5-syslog-name-underscore-fix.patch b/SOURCES/pflogsumm-1.1.5-syslog-name-underscore-fix.patch
new file mode 100644
index 0000000..9279bcc
--- /dev/null
+++ b/SOURCES/pflogsumm-1.1.5-syslog-name-underscore-fix.patch
@@ -0,0 +1,18 @@
+diff --git a/pflogsumm-1.1.5/pflogsumm.pl b/pflogsumm-1.1.5/pflogsumm.pl
+index eb527d0..7e26206 100755
+--- a/pflogsumm-1.1.5/pflogsumm.pl
++++ b/pflogsumm-1.1.5/pflogsumm.pl
+@@ -503,7 +503,12 @@ $usageMsg =
+ # Accept either "_"s or "-"s in --switches
+ foreach (@ARGV) {
+     last if($_ eq "--");
+-    tr/_/-/ if(/^--\w/);
++    if (/^--\w/)
++    {
++        my @argspl = split("=", $_, 2);
++        $argspl[0] =~ tr/_/-/;
++        $_ = join("=", @argspl);
++    }
+ }
+ 
+ # Some pre-inits for convenience
diff --git a/SOURCES/postfix.service b/SOURCES/postfix.service
index e2b43a6..7a798fb 100644
--- a/SOURCES/postfix.service
+++ b/SOURCES/postfix.service
@@ -11,6 +11,7 @@ PrivateTmp=true
 CapabilityBoundingSet=~ CAP_NET_ADMIN CAP_SYS_ADMIN CAP_SYS_BOOT CAP_SYS_MODULE
 ProtectSystem=true
 PrivateDevices=true
+ExecStartPre=-/usr/sbin/restorecon -R /var/spool/postfix/pid/master.pid
 ExecStartPre=-/usr/libexec/postfix/aliasesdb
 ExecStartPre=-/usr/libexec/postfix/chroot-update
 ExecStart=/usr/sbin/postfix start
diff --git a/SPECS/postfix.spec b/SPECS/postfix.spec
index 36af153..daea6aa 100644
--- a/SPECS/postfix.spec
+++ b/SPECS/postfix.spec
@@ -49,7 +49,7 @@
 Name: postfix
 Summary: Postfix Mail Transport Agent
 Version: 3.5.8
-Release: 2%{?dist}
+Release: 4%{?dist}
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -64,7 +64,10 @@ Requires(preun): %{_sbindir}/alternatives
 Requires(preun): systemd
 Requires(postun): systemd
 # Required by /usr/libexec/postfix/postfix-script
-Requires: diffutils, findutils
+Requires: diffutils
+Requires: findutils
+# for restorecon
+Requires: policycoreutils
 Provides: MTA smtpd smtpdaemon server(smtp)
 
 Source0: ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz
@@ -98,6 +101,8 @@ Patch10: pflogsumm-1.1.5-ipv6-warnings-fix.patch
 Patch11: postfix-3.4.4-chroot-example-fix.patch
 Patch12: postfix-3.5.8-back-compat-3.3.1.patch
 Patch13: postfix-3.5.8-whitespace-name-fix.patch
+# rhbz#1931403, sent upstream
+Patch14: pflogsumm-1.1.5-syslog-name-underscore-fix.patch
 
 # Optional patches - set the appropriate environment variables to include
 #                    them when building the package/spec file
@@ -238,6 +243,7 @@ popd
 %patch12 -p1 -b .back-compat-3.3.1
 # rhbz#1977732, sent upstream
 %patch13 -p1 -b .whitespace-name-fix
+%patch14 -p1 -b .pflogsumm-1.1.5-syslog-name-underscore-fix
 
 for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do
 	iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
@@ -751,6 +757,14 @@ exit 0
 %endif
 
 %changelog
+* Thu Feb 17 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.8-4
+- Added SELinux workound for systemd service to work after 'postfix start'
+  Resolves: rhbz#2028015
+
+* Mon Jan 17 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.8-3
+- Fixed pflogsumm to allow underscores in the syslog_name
+  Resolves: rhbz#1931403
+
 * Thu Aug  5 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.8-2
 - Fixed cleanup crash when processing messages with whitespace only fullname
   Resolves: rhbz#1977732