From 49c655dd598b8d7e3f7e85b28ef9808393ee7d2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Mon, 16 Mar 2020 19:35:00 +0100
Subject: [PATCH] New version   Resolves: rhbz#1813740

---
 postfix-3.4.4-res-macros-fix.patch            | 21 -------------------
 ...config.patch => postfix-3.5.0-config.patch |  4 ++--
 postfix.spec                                  | 10 +++++----
 3 files changed, 8 insertions(+), 27 deletions(-)
 delete mode 100644 postfix-3.4.4-res-macros-fix.patch
 rename postfix-3.4.0-config.patch => postfix-3.5.0-config.patch (97%)

diff --git a/postfix-3.4.4-res-macros-fix.patch b/postfix-3.4.4-res-macros-fix.patch
deleted file mode 100644
index 1034c85..0000000
--- a/postfix-3.4.4-res-macros-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/dns/dns_str_resflags.c b/src/dns/dns_str_resflags.c
-index 5f2cce5..df32345 100644
---- a/src/dns/dns_str_resflags.c
-+++ b/src/dns/dns_str_resflags.c
-@@ -60,10 +60,16 @@ static const LONG_NAME_MASK resflag_table[] = {
-     "RES_DEFNAMES", RES_DEFNAMES,
-     "RES_STAYOPEN", RES_STAYOPEN,
-     "RES_DNSRCH", RES_DNSRCH,
-+#ifdef RES_INSECURE1
-     "RES_INSECURE1", RES_INSECURE1,
-+#endif
-+#ifdef RES_INSECURE2
-     "RES_INSECURE2", RES_INSECURE2,
-+#endif
-     "RES_NOALIASES", RES_NOALIASES,
-+#ifdef RES_USE_INET6
-     "RES_USE_INET6", RES_USE_INET6,
-+#endif
- #ifdef RES_ROTATE
-     "RES_ROTATE", RES_ROTATE,
- #endif
diff --git a/postfix-3.4.0-config.patch b/postfix-3.5.0-config.patch
similarity index 97%
rename from postfix-3.4.0-config.patch
rename to postfix-3.5.0-config.patch
index eff0f57..da42263 100644
--- a/postfix-3.4.0-config.patch
+++ b/postfix-3.5.0-config.patch
@@ -130,8 +130,8 @@ index c0f2508..05c5d07 100644
  # Also specify in main.cf: cyrus_destination_recipient_limit=1
  #
  #cyrus     unix  -       n       n       -       -       pipe
--#  user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
-+#  user=cyrus argv=/usr/lib/cyrus-imapd/deliver -e -r ${sender} -m ${extension} ${user}
+-#  flags=DRX user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
++#  flags=DRX user=cyrus argv=/usr/lib/cyrus-imapd/deliver -e -r ${sender} -m ${extension} ${user}
  #
  # ====================================================================
  #
diff --git a/postfix.spec b/postfix.spec
index 4097212..59b84ed 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -47,7 +47,7 @@
 
 Name: postfix
 Summary: Postfix Mail Transport Agent
-Version: 3.4.10
+Version: 3.5.0
 Release: 1%{?dist}
 Epoch: 2
 URL: http://www.postfix.org
@@ -85,7 +85,7 @@ Source101: postfix-pam.conf
 
 # Patches
 
-Patch1: postfix-3.4.0-config.patch
+Patch1: postfix-3.5.0-config.patch
 Patch2: postfix-3.4.0-files.patch
 Patch3: postfix-3.3.3-alternatives.patch
 Patch4: postfix-3.4.0-large-fs.patch
@@ -93,7 +93,6 @@ Patch9: pflogsumm-1.1.5-datecalc.patch
 # rhbz#1384871, sent upstream
 Patch10: pflogsumm-1.1.5-ipv6-warnings-fix.patch
 Patch11: postfix-3.4.4-chroot-example-fix.patch
-Patch12: postfix-3.4.4-res-macros-fix.patch
 
 # Optional patches - set the appropriate environment variables to include
 #                    them when building the package/spec file
@@ -229,7 +228,6 @@ pushd pflogsumm-%{pflogsumm_ver}
 popd
 %endif
 %patch11 -p1 -b .chroot-example-fix
-%patch12 -p1 -b .res-macros-fix
 
 for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do
 	iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
@@ -757,6 +755,10 @@ fi
 %endif
 
 %changelog
+* Mon Mar 16 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.0-1
+- New version
+  Resolves: rhbz#1813740
+
 * Thu Mar 12 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.4.10-1
 - New version
   Resolves: rhbz#1812987