From d588b6405764c4ed02212176c89743559b504662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 3 May 2019 13:29:33 +0200 Subject: [PATCH] Fixed FTBFS with new glibc due to dropped RES_INSECURE1/2 macros --- postfix-3.4.4-res-insecure-fix.patch | 17 +++++++++++++++++ postfix.spec | 7 ++++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 postfix-3.4.4-res-insecure-fix.patch diff --git a/postfix-3.4.4-res-insecure-fix.patch b/postfix-3.4.4-res-insecure-fix.patch new file mode 100644 index 0000000..84c87ae --- /dev/null +++ b/postfix-3.4.4-res-insecure-fix.patch @@ -0,0 +1,17 @@ +diff --git a/src/dns/dns_str_resflags.c b/src/dns/dns_str_resflags.c +index 5f2cce5..8b50a39 100644 +--- a/src/dns/dns_str_resflags.c ++++ b/src/dns/dns_str_resflags.c +@@ -60,8 +60,12 @@ 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, + "RES_USE_INET6", RES_USE_INET6, + #ifdef RES_ROTATE diff --git a/postfix.spec b/postfix.spec index 5275a28..0400deb 100644 --- a/postfix.spec +++ b/postfix.spec @@ -48,7 +48,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.4.4 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -93,6 +93,7 @@ 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-insecure-fix.patch # Optional patches - set the appropriate environment variables to include # them when building the package/spec file @@ -228,6 +229,7 @@ pushd pflogsumm-%{pflogsumm_ver} popd %endif %patch11 -p1 -b .chroot-example-fix +%patch12 -p1 -b .res-insecure-fix for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do iconv -f iso8859-1 -t utf8 -o ${f}{_,} && @@ -755,6 +757,9 @@ fi %endif %changelog +* Fri May 3 2019 Jaroslav Škarvada - 2:3.4.4-4 +- Fixed FTBFS with new glibc due to dropped RES_INSECURE1/2 macros + * Fri May 3 2019 Jaroslav Škarvada - 2:3.4.4-3 - Added findutils as explicit requirement Resolves: rhbz#1629057