From: Wietse Venema <wietse@porcupine.org>
Date: Sun, 14 Jun 2020 05:00:00 +0000 (-0500)
Subject: postfix-3.3.11
X-Git-Tag: v3.3.11^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2588dafe2115d997c2e3012a80b141f702b6a025;p=thirdparty%2Fpostfix.git

postfix-3.3.11
---

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 03eea9868..ecb2e6587 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -23610,3 +23610,9 @@ Apologies for any names omitted.
 	session may cause a false 'lost connection' error for a
 	concurrent TLS session in the same tlsproxy process. File:
 	tlsproxy/tlsproxy.c.
+
+20200530
+
+	Bugfix (introduced: Postfix 3.1): "postfix tls deploy-server-cert"
+	did not handle a missing optional argument. File:
+	conf/postfix-tls-script
diff --git a/postfix/conf/postfix-tls-script b/postfix/conf/postfix-tls-script
index 2c3430a1a..1a364b7fc 100644
--- a/postfix/conf/postfix-tls-script
+++ b/postfix/conf/postfix-tls-script
@@ -777,7 +777,7 @@ get_cache_db_type() {
 deploy_server_cert() {
     certfile=$1; shift
     keyfile=$1; shift
-    deploy=$1; shift
+    case $# in 0) deploy=;; *) deploy=$1; shift;; esac
 
     # Sets key_algo, key_param and cert_param
     check_key "$keyfile" || return 1
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 2695eea76..94bf4b1dc 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	"20200516"
-#define MAIL_VERSION_NUMBER	"3.3.10"
+#define MAIL_RELEASE_DATE	"20200614"
+#define MAIL_VERSION_NUMBER	"3.3.11"
 
 #ifdef SNAPSHOT
 #define MAIL_VERSION_DATE	"-" MAIL_RELEASE_DATE