From: Wietse Venema <wietse@porcupine.org>
Date: Sat, 18 Apr 2020 05:00:00 +0000 (-0500)
Subject: postfix-3.5.1
X-Git-Tag: v3.5.1^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67ace23c3631d2581a2a248292a1ddb903f6c340;p=thirdparty%2Fpostfix.git

postfix-3.5.1
---

diff --git a/postfix/HISTORY b/postfix/HISTORY
index f41ef305f..3ba46cf5c 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -24663,7 +24663,7 @@ Apologies for any names omitted.
 
 	Usability: the Postfix SMTP server now logs a warning when
 	a configuration requests access control by client certificate,
-	but "smtpd_tls_ask_clientcert = no".  Files: proto/postconf.proto,
+	but "smtpd_tls_ask_ccert = no". Files: proto/postconf.proto,
 	smtpd/smtpd_check.c.
 
 20200316
@@ -24671,3 +24671,12 @@ Apologies for any names omitted.
 	Removed the issuer_cn and subject_cn matches from
 	check_ccert_access. Files: smtpd/smtpd_check.c,
 	proto/postconf.proto.
+
+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 f70bd1444..bffe77d5e 100644
--- a/postfix/Makefile.in
+++ b/postfix/Makefile.in
@@ -1,7 +1,7 @@
 # To test with valgrind:
 # make -i tests VALGRIND="valgrind --tool=memcheck --log-file=/some/where.%p" 
 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 173775308..11c928134 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*()
@@ -458,10 +461,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);
 
     /*
      * Can't append domains: we need the right SOA TTL.
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index c52097e07..3896ea80f 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	"20200316"
-#define MAIL_VERSION_NUMBER	"3.5.0"
+#define MAIL_RELEASE_DATE	"20200418"
+#define MAIL_VERSION_NUMBER	"3.5.1"
 
 #ifdef SNAPSHOT
 #define MAIL_VERSION_DATE	"-" MAIL_RELEASE_DATE