From 97c2657bc1304c8b45dc01c2817646f84d9ded7f Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 01 2022 11:29:14 +0000
Subject: import postfix-3.5.9-18.el9


---

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-3.5.9-coverity-fix.patch b/SOURCES/postfix-3.5.9-coverity-fix.patch
new file mode 100644
index 0000000..4f94baa
--- /dev/null
+++ b/SOURCES/postfix-3.5.9-coverity-fix.patch
@@ -0,0 +1,17 @@
+diff --git a/src/util/dict_inline.c b/src/util/dict_inline.c
+index a416d7c..72339b2 100644
+--- a/src/util/dict_inline.c
++++ b/src/util/dict_inline.c
+@@ -113,9 +113,9 @@ DICT   *dict_inline_open(const char *name, int open_flags, int dict_flags)
+     dict = dict_open3(DICT_TYPE_HT, name, open_flags, dict_flags);
+     dict_type_override(dict, DICT_TYPE_INLINE);
+     while ((nameval = mystrtokq(&cp, CHARS_COMMA_SP, CHARS_BRACE)) != 0) {
+-	if ((nameval[0] != CHARS_BRACE[0]
+-	     || (err = free_me = extpar(&nameval, CHARS_BRACE, EXTPAR_FLAG_STRIP)) == 0)
+-	    && (err = split_qnameval(nameval, &vname, &value)) != 0)
++	if (nameval[0] == CHARS_BRACE[0])
++	    err = free_me = extpar(&nameval, CHARS_BRACE, EXTPAR_FLAG_STRIP);
++	if (err != 0 || (err = split_qnameval(nameval, &vname, &value)) != 0)
+ 	    break;
+ 
+ 	if ((dict->flags & DICT_FLAG_SRC_RHS_IS_FILE) != 0) {
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 37ad5fb..bc29217 100644
--- a/SPECS/postfix.spec
+++ b/SPECS/postfix.spec
@@ -49,7 +49,7 @@
 Name: postfix
 Summary: Postfix Mail Transport Agent
 Version: 3.5.9
-Release: 15%{?dist}
+Release: 18%{?dist}
 Epoch: 2
 URL: http://www.postfix.org
 License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+)
@@ -62,7 +62,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
@@ -100,6 +103,9 @@ Patch11: postfix-3.4.4-chroot-example-fix.patch
 Patch12: postfix-3.5.9-glibc-234-build-fix.patch
 # rhbz#1978901, sent upstream
 Patch13: postfix-3.5.9-whitespace-name-fix.patch
+Patch14: pflogsumm-1.1.5-syslog-name-underscore-fix.patch
+# rhbz#1938847, backported from upstream
+Patch15: postfix-3.5.9-coverity-fix.patch
 
 # Optional patches - set the appropriate environment variables to include
 #                    them when building the package/spec file
@@ -252,6 +258,8 @@ popd
 %patch11 -p1 -b .chroot-example-fix
 %patch12 -p1 -b .glibc-234-build-fix
 %patch13 -p1 -b .whitespace-name-fix
+%patch14 -p1 -b .pflogsumm-1.1.5-syslog-name-underscore-fix
+%patch15 -p1 -b .coverity-fix
 
 for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do
 	iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
@@ -795,6 +803,18 @@ fi
 %endif
 
 %changelog
+* Tue Feb 22 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.9-18
+- Added SELinux workound for systemd service to work after 'postfix start'
+  Resolves: rhbz#2055915
+
+* Tue Feb 15 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.9-17
+- Fixed problem in the dict_inline found by coverity
+  Resolves: rhbz#1938847
+
+* Fri Jan 28 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.9-16
+- Fixed pflogsumm to allow underscores in the syslog_name
+  Resolves: rhbz#2043059
+
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2:3.5.9-15
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688