From 24cae3bd0f525a68905a733b12d20a5bacb13f97 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 21 Jan 2020 14:48:12 -0500
Subject: [PATCH] import postfix-3.3.1-12.el8

---
 SOURCES/postfix-3.3.1-ref-search-fix.patch | 13 ++++++++++++
 SPECS/postfix.spec                         | 23 +++++++++++++++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/postfix-3.3.1-ref-search-fix.patch

diff --git a/SOURCES/postfix-3.3.1-ref-search-fix.patch b/SOURCES/postfix-3.3.1-ref-search-fix.patch
new file mode 100644
index 0000000..c7d831e
--- /dev/null
+++ b/SOURCES/postfix-3.3.1-ref-search-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/src/dns/dns_lookup.c b/src/dns/dns_lookup.c
+index 1ea98b3..1bfeb7e 100644
+--- a/src/dns/dns_lookup.c
++++ b/src/dns/dns_lookup.c
+@@ -396,7 +396,7 @@ static int dns_res_search(const char *name, int class, int type,
+     if (keep_notfound)
+ 	/* Prepare for returning a null-padded server reply. */
+ 	memset(answer, 0, anslen);
+-    len = res_query(name, class, type, answer, anslen);
++    len = res_search(name, class, type, answer, anslen);
+     /* Begin API creep workaround. */
+     if (len < 0 && h_errno == 0) {
+ 	SET_H_ERRNO(TRY_AGAIN);
diff --git a/SPECS/postfix.spec b/SPECS/postfix.spec
index bbdd313..8921edc 100644
--- a/SPECS/postfix.spec
+++ b/SPECS/postfix.spec
@@ -48,7 +48,7 @@
 Name: postfix
 Summary: Postfix Mail Transport Agent
 Version: 3.3.1
-Release: 8%{?dist}
+Release: 12%{?dist}
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -56,6 +56,7 @@ License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+)
 Requires(post): systemd
 Requires(post): %{_sbindir}/alternatives
 Requires(post): %{_bindir}/openssl
+Requires(post): %{_bindir}/hostname
 Requires(pre): %{_sbindir}/groupadd
 Requires(pre): %{_sbindir}/useradd
 Requires(preun): %{_sbindir}/alternatives
@@ -93,6 +94,8 @@ Patch5: postfix-3.3.1-posttls-finger-unix-fix.patch
 Patch9: pflogsumm-1.1.5-datecalc.patch
 # rhbz#1384871, sent upstream
 Patch10: pflogsumm-1.1.5-ipv6-warnings-fix.patch
+# rhbz#1723950, included upstream
+Patch11: postfix-3.3.1-ref-search-fix.patch
 
 # Optional patches - set the appropriate environment variables to include
 #                    them when building the package/spec file
@@ -217,6 +220,7 @@ pushd pflogsumm-%{pflogsumm_ver}
 %patch10 -p1 -b .ipv6-warnings-fix
 popd
 %endif
+%patch11 -p1 -b .ref-search-fix
 
 for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do
 	iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
@@ -715,6 +719,23 @@ exit 0
 %endif
 
 %changelog
+* Mon Dec 16 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.3.1-12
+- Fixed DNS resolver to use ref_search instead of ref_query
+  Resolves: rhbz#1723950
+
+* Tue Dec 10 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.3.1-11
+- Added hostname requirement
+  Resolves: rhbz#1666244
+
+* Wed Nov  6 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.3.1-10
+- Release bump and rebuild for relengs to be able to ship postfix-pcre,
+  postfix-cdb, postfix-sqlite
+  Resolves: rhbz#1745321
+
+* Tue Aug  6 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.3.1-9
+- Release bump and rebuild for relengs to be able to ship postfix-ldap
+  Resolves: rhbz#1686721
+
 * Tue Dec  4 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.3.1-8
 - Fixed posttls-finger to work with unix domains
   Resolves: rhbz#1602663