Merge ~lucaskanashiro/ubuntu/+source/postfix:lp1872288 into ubuntu/+source/postfix:ubuntu/devel

[Lucas Kanashiro]

There is a typo in the debian/configure-instance.sh script which causes an issue when copying certificates. It was reported by an user, and the Debian maintainer pointed to the right fix here:

https://bugs.launchpad.net/ubuntu/+source/postfix/+bug/1872288

I simply cherry-picked this patch mentioned in the bug report:

https://salsa.debian.org/postfix-team/postfix-dev/-/commit/b8e0b846e34eeaaa2315ead2304824b21b01fe7a

Here is a PPA with the proposed package:

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

And autopkgtest is still happy with those changes:

autopkgtest [15:06:27]: @@@@@@@@@@@@@@@@@@@@ summary
postfix PASS

[Scott Kitterman (kitterman)]

FWIW, looks right to me.

[Bryce Harrington (bryce)]

LGTM as well, +1.

The typos are obviously incorrect, from a cursory code review. `shellcheck configure-instance.sh` also notices the errors. shellcheck shows several lint warnings but no other actual errors.

review: Approve

[Bryce Harrington (bryce)]

Upload sponsored:

stirling:~/ubuntu/Postfix/review-mp382443/postfix-gu$ gpg --verify ${changes_file}
gpg: Signature made Thu 16 Apr 2020 12:00:34 PM PDT
gpg: using RSA key A661100B3DAC1D4F2CAD8A54E603B2578FB8F0FB
gpg: Good signature from "Bryce Harrington <email address hidden>" [ultimate]
gpg: aka "Bryce Harrington <email address hidden>" [ultimate]
gpg: aka "Bryce Harrington <email address hidden>" [ultimate]
stirling:~/ubuntu/Postfix/review-mp382443/postfix-gu$ git ubuntu tag --upload
stirling:~/ubuntu/Postfix/review-mp382443/postfix-gu$ git push pkg upload/3.4.10-1ubuntu1
Enumerating objects: 18, done.
Counting objects: 100% (18/18), done.
Delta compression using up to 12 threads
Compressing objects: 100% (13/13), done.
Writing objects: 100% (13/13), 1.63 KiB | 277.00 KiB/s, done.
Total 13 (delta 9), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/postfix
 * [new tag] upload/3.4.10-1ubuntu1 -> upload/3.4.10-1ubuntu1
stirling:~/ubuntu/Postfix/review-mp382443/postfix-gu$ dput ubuntu ${changes_file}
Checking signature on .changes
gpg: ../postfix_3.4.10-1ubuntu1_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: ../postfix_3.4.10-1ubuntu1.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading postfix_3.4.10-1ubuntu1.dsc: done.
  Uploading postfix_3.4.10-1ubuntu1.debian.tar.xz: done.
  Uploading postfix_3.4.10-1ubuntu1_source.buildinfo: done.
  Uploading postfix_3.4.10-1ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 2685f3d..86e71a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+postfix (3.4.10-1ubuntu1) focal; urgency=medium
+
+  * d/configure-instance.sh: fix typo in tls_CApath copying (LP: #1872288)
+
+ -- Lucas Kanashiro <[e-mail]>  Thu, 16 Apr 2020 14:48:33 -0300
+
 postfix (3.4.10-1) unstable; urgency=medium
 
   [Scott Kitterman]
diff --git a/debian/configure-instance.sh b/debian/configure-instance.sh
index a327c84..feb20d6 100644
--- a/debian/configure-instance.sh
+++ b/debian/configure-instance.sh
@@ -45,7 +45,7 @@ if [ -n "$NEED_CHROOT" ] && [ -n "$SYNC_CHROOT" ]; then
 	cd "$queue_dir"
 
 	# copy the smtp CA path if specified
-	ca_path=$($POSTCONF -hx smtp_tls_CApath)
+	sca_path=$($POSTCONF -hx smtp_tls_CApath)
 	case "$sca_path" in
 	    '') :;; # no sca_path
 	    $queue_dir/*) :;;  # skip stuff already in chroot
@@ -77,7 +77,7 @@ if [ -n "$NEED_CHROOT" ] && [ -n "$SYNC_CHROOT" ]; then
 	esac
 
 	# copy the smtpd CA path if specified
-	ca_path=$($POSTCONF -hx smtpd_tls_CApath)
+	dca_path=$($POSTCONF -hx smtpd_tls_CApath)
 	case "$dca_path" in
 	    '') :;; # no dca_path
 	    $queue_dir/*) :;;  # skip stuff already in chroot
diff --git a/debian/control b/debian/control
index 5e9a483..3288242 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: postfix
 Section: mail
 Priority: optional
-Maintainer: LaMont Jones <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: LaMont Jones <[e-mail]>
 Uploaders: Scott Kitterman <[e-mail]>
 Standards-Version: 4.5.0
 Homepage: http://www.postfix.org