From 7922b58e010e13227cdafd17db4dbd43f5618a3f Mon Sep 17 00:00:00 2001
From: Wietse Venema <wietse@porcupine.org>
Date: Wed, 24 Feb 2021 00:00:00 -0500
Subject: [PATCH] postfix-3.6-20210224

---
 postfix/HISTORY                        | 6 ++++++
 postfix/README_FILES/POSTSCREEN_README | 3 +++
 postfix/html/POSTSCREEN_README.html    | 6 ++++--
 postfix/proto/POSTSCREEN_README.html   | 6 ++++--
 postfix/src/global/mail_params.h       | 2 +-
 postfix/src/global/mail_version.h      | 2 +-
 6 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 0b5e5ab07..40dc0a201 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -25442,3 +25442,9 @@ Apologies for any names omitted.
 	between respectful and deprecated logging formats. Files:
 	mantools/postlink, proto/postconf.proto, global/mail_params.[hc],
 	postscreen/postscreen.c, proto/COMPATIBILITY_README.
+
+20210224
+
+	Typo: the "respectful_logging" parameter had a typo and a
+	"postscreen_" prefix that should have been deleted. File:
+	global/mail_params.h
diff --git a/postfix/README_FILES/POSTSCREEN_README b/postfix/README_FILES/POSTSCREEN_README
index 592dc3bea..d4399043b 100644
--- a/postfix/README_FILES/POSTSCREEN_README
+++ b/postfix/README_FILES/POSTSCREEN_README
@@ -870,3 +870,6 @@ POP, IMAP, NNTP, and FTP over TLS.
 postscreen(8) was officially released as part of the Postfix 2.8 stable release
 in January 2011.
 
+Noel Jones helped with the Postfix 3.6 transition towards respectful
+documentation.
+
diff --git a/postfix/html/POSTSCREEN_README.html b/postfix/html/POSTSCREEN_README.html
index 017ef6ec8..a21b80186 100644
--- a/postfix/html/POSTSCREEN_README.html
+++ b/postfix/html/POSTSCREEN_README.html
@@ -18,7 +18,7 @@
 <h2> <a name="intro">Introduction</a> </h2>
 
 <p> This document describes features that are available in Postfix
-3.6 and later. See <a href="proto/POSTSCREEN_3_5_README.html">
+3.6 and later. See <a href="POSTSCREEN_3_5_README.html">
 POSTSCREEN_3_5_README.html</a> for Postfix versions 2.8 - 3.5. </p>
 
 <p> The Postfix <a href="postscreen.8.html">postscreen(8)</a> daemon provides additional protection
@@ -1200,6 +1200,8 @@ POP, IMAP, NNTP, and FTP over TLS. </p>
 <p> <a href="postscreen.8.html">postscreen(8)</a> was officially released as part of the Postfix
 2.8 stable release in January 2011.</p>
 
-</body>
+<p> Noel Jones helped with the Postfix 3.6 transition towards respectful
+documentation. </p>
 
+</body>
 </html>
diff --git a/postfix/proto/POSTSCREEN_README.html b/postfix/proto/POSTSCREEN_README.html
index 308643f19..4e82aaf86 100644
--- a/postfix/proto/POSTSCREEN_README.html
+++ b/postfix/proto/POSTSCREEN_README.html
@@ -18,7 +18,7 @@
 <h2> <a name="intro">Introduction</a> </h2>
 
 <p> This document describes features that are available in Postfix
-3.6 and later. See <a href="proto/POSTSCREEN_3_5_README.html">
+3.6 and later. See <a href="POSTSCREEN_3_5_README.html">
 POSTSCREEN_3_5_README.html</a> for Postfix versions 2.8 - 3.5. </p>
 
 <p> The Postfix postscreen(8) daemon provides additional protection
@@ -1200,6 +1200,8 @@ POP, IMAP, NNTP, and FTP over TLS. </p>
 <p> postscreen(8) was officially released as part of the Postfix
 2.8 stable release in January 2011.</p>
 
-</body>
+<p> Noel Jones helped with the Postfix 3.6 transition towards respectful
+documentation. </p>
 
+</body>
 </html>
diff --git a/postfix/src/global/mail_params.h b/postfix/src/global/mail_params.h
index 9c2ff6092..921720d23 100644
--- a/postfix/src/global/mail_params.h
+++ b/postfix/src/global/mail_params.h
@@ -3856,7 +3856,7 @@ extern char *var_psc_uproxy_proto;
 #define DEF_PSC_UPROXY_TMOUT	"5s"
 extern int var_psc_uproxy_tmout;
 
-#define VAR_RESPECTFUL_LOGGING "postscreen_respecful_logging"
+#define VAR_RESPECTFUL_LOGGING "respectful_logging"
 #define DEF_RESPECTFUL_LOGGING \
 	"${{$compatibility_level} <level {3.6} ?" " {no} : {yes}}"
 extern bool var_respectful_logging;
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 881231255..6c1111b33 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE	"20210221"
+#define MAIL_RELEASE_DATE	"20210224"
 #define MAIL_VERSION_NUMBER	"3.6"
 
 #ifdef SNAPSHOT