Merge ~lucaskanashiro/ubuntu/+source/postfix:xenial-lp-1881196 into ubuntu/+source/postfix:ubuntu/xenial-devel

[Lucas Kanashiro]

Fix LP #1881196 in Xenial. This is a backport of a simple upstream patch.

Here is a PPA with the proposed package:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/xenial-postfix/+packages

And the autopkgtest output:

autopkgtest [19:07:21]: @@@@@@@@@@@@@@@@@@@@ summary
postfix PASS

[Christian Ehrhardt  (paelzer)]

Fix is reasonable, small and seems correct.
CL entries LGTM

The one thing I have to call out is that the SRU Description still talks about the full minor release backport. Which is correct for focal, but wrong for Bionic/Xenial where you only backport one change.

Therefore you get my +1 (generally a good fix), but under the condition to add a secondary SRU template in the bug that is for B/X releases describing that situation.

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

Thanks for the review Christian, I already fixed the bug description. It was already uploaded:

$ git push pkg upload/3.1.0-3ubuntu0.4
Enumerating objects: 16, done.
Counting objects: 100% (16/16), done.
Delta compression using up to 8 threads
Compressing objects: 100% (11/11), done.
Writing objects: 100% (11/11), 1.67 KiB | 426.00 KiB/s, done.
Total 11 (delta 7), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/postfix
 * [new tag] upload/3.1.0-3ubuntu0.4 -> upload/3.1.0-3ubuntu0.4

$ dput ubuntu ../postfix_3.1.0-3ubuntu0.4_source.changes
Checking signature on .changes
gpg: ../postfix_3.1.0-3ubuntu0.4_source.changes: Valid signature from F823A2729883C97C
Checking signature on .dsc
gpg: ../postfix_3.1.0-3ubuntu0.4.dsc: Valid signature from F823A2729883C97C
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading postfix_3.1.0-3ubuntu0.4.dsc: done.
  Uploading postfix_3.1.0-3ubuntu0.4.debian.tar.xz: done.
  Uploading postfix_3.1.0-3ubuntu0.4_source.changes: done.
Successfully uploaded packages.

[Lucas Kanashiro (lucaskanashiro)]

Landed in xenial-updates.

diff --git a/debian/changelog b/debian/changelog
index 1327eb9..a1b901b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+postfix (3.1.0-3ubuntu0.4) xenial; urgency=medium
+
+  * d/p/fix_tls_deploy-server-cert.patch: handle missing opt arg (LP: #1881196)
+
+ -- Lucas Kanashiro <[e-mail]>  Fri, 10 Jul 2020 18:14:41 -0300
+
 postfix (3.1.0-3ubuntu0.3) xenial; urgency=medium
 
   * Only run post 3.0 master.cf fixup if upgrading from version before
diff --git a/debian/patches/fix_tls_deploy-server-cert.patch b/debian/patches/fix_tls_deploy-server-cert.patch
new file mode 100644
index 0000000..ad73a2a
--- /dev/null
+++ b/debian/patches/fix_tls_deploy-server-cert.patch
@@ -0,0 +1,19 @@
+Description: Fix "postfix tls deploy-server-cert"
+ It did not handle a missing optional argument.
+Author: Viktor Dukhovni
+Origin: upstream, https://github.com/vdukhovni/postfix/commit/119d6abed969b1b30c62722ae31c854b5682beae#diff-1843f98f5710e97bd063d5807334442a
+Ubuntu-Bug: LP#1881196
+Reviewed-By: Lucas Kanashiro <[e-mail]>
+Last-Updated: 2020-07-10
+
+--- a/conf/postfix-tls-script
++++ b/conf/postfix-tls-script
+@@ -777,7 +777,7 @@
+ 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/debian/patches/series b/debian/patches/series
index 41cce68..5fe6538 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@
 40_chroot_by_default.diff
 41_rmail.diff
 50_LANG.diff
+fix_tls_deploy-server-cert.patch