From e45367e31cb02e27a1d3ca3b1fbd2215262dd099 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Fri, 21 Jan 2022 00:24:36 +0100
Subject: [PATCH] New version

  Resolves: rhbz#2040977
Suppressed openssl output during SSL certificates generation
  Resolves: rhbz#2041589
---
 postfix.spec | 14 ++++++++++----
 sources      |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/postfix.spec b/postfix.spec
index 8918e3a..b8c560d 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -48,8 +48,8 @@
 
 Name: postfix
 Summary: Postfix Mail Transport Agent
-Version: 3.6.3
-Release: 5%{?dist}
+Version: 3.6.4
+Release: 1%{?dist}
 Epoch: 2
 URL: http://www.postfix.org
 License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+)
@@ -521,7 +521,7 @@ fi
 # Create self-signed SSL certificate
 if [ ! -f %{sslkey} ]; then
   umask 077
-  %{_bindir}/openssl genpkey -algorithm RSA -pkeyopt rsa_keygen_bits:4096 -out %{sslkey}
+  %{_bindir}/openssl genpkey -algorithm RSA -pkeyopt rsa_keygen_bits:4096 -out %{sslkey} 2>/dev/null || echo "openssl genpkey failed"
 fi
 
 if [ ! -f %{sslcert} ]; then
@@ -533,7 +533,7 @@ if [ ! -f %{sslcert} ]; then
   req_cmd="%{_bindir}/openssl req -new -key %{sslkey} -x509 -sha256 -days 365 -set_serial $RANDOM -out %{sslcert} \
     -subj /C=--/ST=SomeState/L=SomeCity/O=SomeOrganization/OU=SomeOrganizationalUnit/CN=${FQDN}/emailAddress=root@${FQDN}"
 # openssl-3.0 and fallback for backward compatibility with openssl < 3.0
-  $req_cmd -noenc -copy_extensions none 2>/dev/null || $req_cmd
+  $req_cmd -noenc -copy_extensions none 2>/dev/null || $req_cmd 2>/dev/null || echo "openssl req failed"
   chmod 644 %{sslcert}
 fi
 
@@ -806,6 +806,12 @@ fi
 %endif
 
 %changelog
+* Thu Jan 20 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.6.4-1
+- New version
+  Resolves: rhbz#2040977
+- Suppressed openssl output during SSL certificates generation
+  Resolves: rhbz#2041589
+
 * Mon Jan 17 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.6.3-5
 - Fixed pflogsumm to allow underscores in the syslog_name
   Resolves: rhbz#1931403
diff --git a/sources b/sources
index 75f7164..a1fa437 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d
-SHA512 (postfix-3.6.3.tar.gz) = 7179aaeeaf27838b867d9a07f9a889d7cd6b7f5053e123caef4dff2820d4df6d5be167effedde6c857b4468966b8449c631e56405e1ac2d589716fb4e3f15e3b
+SHA512 (postfix-3.6.4.tar.gz) = f5813801377a5887d27720cc7f85a6a68f8ca82fc7a9e852b27c8967996b3d64f651cc16e2b021d55316a074b4778e19155bb60c8f0885d4aaf72766cab7c4cd