From 89e8f838d5656d02fe018032c2b54833fcf1581b Mon Sep 17 00:00:00 2001 From: Wietse Venema Date: Sat, 18 Apr 2020 00:00:00 -0500 Subject: [PATCH] postfix-3.4.11 --- postfix/HISTORY | 9 +++++++++ postfix/Makefile.in | 2 +- postfix/makedefs | 2 +- postfix/src/dns/dns.h | 4 ++++ postfix/src/dns/dns_lookup.c | 7 +++++-- postfix/src/dns/dns_str_resflags.c | 6 ++++++ postfix/src/global/mail_version.h | 4 ++-- 7 files changed, 28 insertions(+), 6 deletions(-) diff --git a/postfix/HISTORY b/postfix/HISTORY index 1ebf42abd..73db7c34a 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -24346,3 +24346,12 @@ Apologies for any names omitted. multi-Milter configuration during MAIL FROM. Milter client state was not properly reset after one of the Milters failed. Reported by WeiYu Wu. + +20200416 + + Workaround for broken builds after an incompatible change + in GCC 10. Files: makedefs, Makefile.in. + + Workaround for broken DANE support after an incompatible + change in GLIBC 2.31. This avoids the need for new options + in /etc/resolv.conf. Files: dns/dns.h, dns/dns_lookup.c. diff --git a/postfix/Makefile.in b/postfix/Makefile.in index fa12b0443..aaab94da1 100644 --- a/postfix/Makefile.in +++ b/postfix/Makefile.in @@ -1,5 +1,5 @@ SHELL = /bin/sh -WARN = -Wmissing-prototypes -Wformat -Wno-comment +WARN = -Wmissing-prototypes -Wformat -Wno-comment -fcommon OPTS = 'WARN=$(WARN)' DIRS = src/util src/global src/dns src/tls src/xsasl src/master src/milter \ src/postfix src/fsstone src/smtpstone \ diff --git a/postfix/makedefs b/postfix/makedefs index 93731c2af..aea15d6f3 100644 --- a/postfix/makedefs +++ b/postfix/makedefs @@ -1136,7 +1136,7 @@ esac : ${CC=gcc} ${OPT='-O'} ${DEBUG='-g'} ${AWK=awk} \ ${WARN='-Wall -Wno-comment -Wformat -Wimplicit -Wmissing-prototypes \ -Wparentheses -Wstrict-prototypes -Wswitch -Wuninitialized \ - -Wunused -Wno-missing-braces'} + -Wunused -Wno-missing-braces -fcommon'} # Extract map type names from -DHAS_XXX compiler options. We avoid # problems with tr(1) range syntax by using enumerations instead, diff --git a/postfix/src/dns/dns.h b/postfix/src/dns/dns.h index f758e44ad..b8c4c4aa5 100644 --- a/postfix/src/dns/dns.h +++ b/postfix/src/dns/dns.h @@ -59,6 +59,7 @@ */ #ifdef NO_DNSSEC #undef RES_USE_DNSSEC +#undef RES_TRUSTAD #endif /* @@ -69,6 +70,9 @@ #endif #ifndef RES_USE_EDNS0 #define RES_USE_EDNS0 0 +#endif +#ifndef RES_TRUSTAD +#define RES_TRUSTAD 0 #endif /*- diff --git a/postfix/src/dns/dns_lookup.c b/postfix/src/dns/dns_lookup.c index 1bfeb7ee6..2ae64836a 100644 --- a/postfix/src/dns/dns_lookup.c +++ b/postfix/src/dns/dns_lookup.c @@ -116,6 +116,9 @@ /* Request DNSSEC validation. This flag is silently ignored /* when the system stub resolver API, resolver(3), does not /* implement DNSSEC. +/* Automatically turns on the RES_TRUSTAD flag on systems that +/* support this flag (this behavior will be more configurable +/* in a later release). /* .RE /* .IP lflags /* Flags that control the operation of the dns_lookup*() @@ -453,10 +456,10 @@ static int dns_query(const char *name, int type, unsigned flags, /* * Set extra options that aren't exposed to the application. */ -#define XTRA_FLAGS (RES_USE_EDNS0) +#define XTRA_FLAGS (RES_USE_EDNS0 | RES_TRUSTAD) if (flags & RES_USE_DNSSEC) - flags |= RES_USE_EDNS0; + flags |= (RES_USE_EDNS0 | RES_TRUSTAD); /* * Save and restore resolver options that we overwrite, to avoid diff --git a/postfix/src/dns/dns_str_resflags.c b/postfix/src/dns/dns_str_resflags.c index 5f2cce5e0..df32345ad 100644 --- a/postfix/src/dns/dns_str_resflags.c +++ b/postfix/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/src/global/mail_version.h b/postfix/src/global/mail_version.h index 41647d364..189383786 100644 --- a/postfix/src/global/mail_version.h +++ b/postfix/src/global/mail_version.h @@ -20,8 +20,8 @@ * Patches change both the patchlevel and the release date. Snapshots have no * patchlevel; they change the release date only. */ -#define MAIL_RELEASE_DATE "20200312" -#define MAIL_VERSION_NUMBER "3.4.10" +#define MAIL_RELEASE_DATE "20200418" +#define MAIL_VERSION_NUMBER "3.4.11" #ifdef SNAPSHOT #define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE -- 2.47.3