Merge ~paride/ubuntu/+source/postfix:lp1906970-bionic into ubuntu/+source/postfix:ubuntu/bionic

[Paride Legovini]

Bionic SRU for LP: #1906970, same as https://code.launchpad.net/~paride/ubuntu/+source/postfix/+git/postfix/+merge/406805 but done against Bionic.

Test PPA: https://launchpad.net/~paride/+archive/ubuntu/postfix-lp1906970

Test case: see [Test Plan] in the SRU bug description.

Autopkgtest results (virt-server: qemu):

postfix PASS

(I tried with autopkgtest-virt-lxd but it FTBFS because postfix fails to recognize the newer kernel I'm running locally. Worked fine with qemu. I wonder if autopkgtest-virt-lxd could support LXD VMs.)

Unmerged commits

dbc32cf... by Paride Legovini on 2021-08-12

update-maintainer

6785ca4... by Paride Legovini on 2021-08-12

Update d/changelog for 3.3.0-1ubuntu0.4

a29ad4d... by Paride Legovini on 2021-08-06

d/postfix.postinst: tolerate search domain with a leading dot

Search domain with a leading dot cause postfix.postinst to fail because
it constructs a 'myhostname' with a duplicate dot (see #991950).

The glibc resolver tolerates such domains and strips the leading dot
from the search domain [1]. This change makes postfix.postinst do the
same.

This same fix has been proposed for inclusion in Debian [2].

[1] https://sourceware.org/git/?p=glibc.git;a=blob;f=resolv/res_query.c;h=ebbe5a6a4ed86abe3fccd4a134bfcf6f613c9bbb;hb=HEAD#l411
[2] https://salsa.debian.org/postfix-team/postfix-dev/-/merge_requests/12

Closes: #991950, LP: #1906970

213fbe0... by Lucas Kanashiro on 2020-07-10

3.3.0-1ubuntu0.3 (patches unapplied)

Imported using git-ubuntu import.

840ee0c... by Andreas Hasenack on 2018-10-11

changelog

907986b... by Karl Stenerud on 2018-09-12

 * d/postfix-{cdb,ldap,lmdb,mysql,pcre,pgsql}.postinst, d/postfix.postinst:
   Handle empty alias_database field in main.cf (LP: #1791139 Closes: #908221)

d1fa295... by Karl Stenerud on 2018-08-16

3.3.0-1ubuntu0.1 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/debian/changelog b/debian/changelog
index 6d9e675..57c360f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,32 @@
+postfix (3.3.0-1ubuntu0.4) bionic; urgency=medium
+
+  * d/postfix.postinst: tolerate search domain with a leading dot
+    (LP: #1906970)
+
+ -- Paride Legovini <[e-mail]>  Thu, 12 Aug 2021 14:43:19 +0200
+
+postfix (3.3.0-1ubuntu0.3) bionic; urgency=medium
+
+  * d/p/fix_tls_deploy-server-cert.patch: handle missing opt arg (LP: #1881196)
+
+ -- Lucas Kanashiro <[e-mail]>  Fri, 10 Jul 2020 17:08:22 -0300
+
+postfix (3.3.0-1ubuntu0.2) bionic; urgency=medium
+
+  [ Karl Stenerud ]
+  * d/postfix-{cdb,ldap,lmdb,mysql,pcre,pgsql}.postinst, d/postfix.postinst:
+    Handle empty alias_database field in main.cf (LP: #1791139 Closes: #908221)
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 11 Oct 2018 17:15:25 -0300
+
+postfix (3.3.0-1ubuntu0.1) bionic; urgency=medium
+
+  * debian/patches/fix-postconf-segfault.diff: Fix a postconf segfault
+    when map file cannot be read.  Thanks to Viktor Dukhovni <postfix-
+    [e-mail]>. (LP: #1753470)
+
+ -- Karl Stenerud <[e-mail]>  Thu, 16 Aug 2018 11:33:00 -0700
+
 postfix (3.3.0-1) unstable; urgency=medium
 
   [Wietse Venema]
diff --git a/debian/control b/debian/control
index 7828b9b..69343ed 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]>
 Standards-Version: 4.1.3
 Homepage: http://www.postfix.org
 Build-Depends: debhelper (>= 9.20160709), po-debconf (>= 0.5.0), groff-base, patch, lsb-release, libdb-dev (>=4.6.19), libldap2-dev (>=2.1), liblmdb-dev, libpcre3-dev, default-libmysqlclient-dev | libmysqlclient-dev, libssl-dev (>=0.9.7), libsasl2-dev, libpq-dev, libcdb-dev, dpkg-dev (>= 1.16.1~), libsqlite3-dev, html2text, libicu-dev
diff --git a/debian/patches/fix-postconf-segfault.diff b/debian/patches/fix-postconf-segfault.diff
new file mode 100644
index 0000000..20fc5bc
--- /dev/null
+++ b/debian/patches/fix-postconf-segfault.diff
@@ -0,0 +1,26 @@
+Description: Fix a postconf segfault when map file cannot be read
+Author: Viktor Dukhovni <[e-mail]>
+Applied-Upstream: https://archive.mgm51.com/mirrors/postfix-source/official/postfix-3.3.1.tar.gz
+Origin: https://marc.info/?l=postfix-users&m=152578771531514&w=2
+Bug-Debian: https://bugs.debian.org/898271
+Bug-Ubuntu: https://launchpad.net/bugs/1753470
+Last-Update: 2018-08-20
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/postconf/postconf_dbms.c
++++ b/src/postconf/postconf_dbms.c
+@@ -174,10 +174,10 @@
+ 	 */
+ 	dict = dict_ht_open(dict_spec, O_CREAT | O_RDWR, 0);
+ 	dict_register(dict_spec, dict);
+-	if ((fp = vstream_fopen(cf_file, O_RDONLY, 0)) == 0
+-	    && errno != EACCES) {
+-	    msg_warn("open \"%s\" configuration \"%s\": %m",
+-		     dp->db_type, cf_file);
++	if ((fp = vstream_fopen(cf_file, O_RDONLY, 0)) == 0) {
++        if (errno != EACCES)
++	        msg_warn("open \"%s\" configuration \"%s\": %m",
++		             dp->db_type, cf_file);
+ 	    myfree(dict_spec);
+ 	    return;
+ 	}
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 c2e4727..1fb6ad6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,5 @@
 50_LANG.diff
 70_postfix-check.diff
 tls_version.diff
+fix-postconf-segfault.diff
+fix_tls_deploy-server-cert.patch
diff --git a/debian/postfix-cdb.postinst b/debian/postfix-cdb.postinst
index 2f37e39..674c0bd 100644
--- a/debian/postfix-cdb.postinst
+++ b/debian/postfix-cdb.postinst
@@ -30,8 +30,7 @@ set -e
 case "$1" in
     configure)
 	addmap cdb mkmap_cdb_open
-       if [ $(postconf |grep alias_database | awk '{print $3}'|awk -F \: \
-           '{print $1}') = 'cdb' ]; then
+       if [ "$(postconf -h alias_database | cut -f1 -d:)" = "cdb" ]; then
            runnewaliases
        fi
     ;;
diff --git a/debian/postfix-ldap.postinst b/debian/postfix-ldap.postinst
index 7c23dd9..7248187 100644
--- a/debian/postfix-ldap.postinst
+++ b/debian/postfix-ldap.postinst
@@ -30,8 +30,7 @@ set -e
 case "$1" in
     configure)
 	addmap ldap
-       if [ $(postconf |grep alias_database | awk '{print $3}'|awk -F \: \
-           '{print $1}') = 'ldap' ]; then
+       if [ "$(postconf -h alias_database | cut -f1 -d:)" = "ldap" ]; then
            runnewaliases
        fi
     ;;
diff --git a/debian/postfix-lmdb.postinst b/debian/postfix-lmdb.postinst
index 5cab441..d7f3a96 100644
--- a/debian/postfix-lmdb.postinst
+++ b/debian/postfix-lmdb.postinst
@@ -31,8 +31,7 @@ set -e
 case "$1" in
     configure)
        addmap lmdb mkmap_lmdb_open
-       if [ $(postconf |grep alias_database | awk '{print $3}'|awk -F \: \
-           '{print $1}') = 'lmdb' ]; then
+       if [ "$(postconf -h alias_database | cut -f1 -d:)" = "lmdb" ]; then
            runnewaliases
        fi
     ;;
diff --git a/debian/postfix-mysql.postinst b/debian/postfix-mysql.postinst
index 3b66fe7..d247c5d 100644
--- a/debian/postfix-mysql.postinst
+++ b/debian/postfix-mysql.postinst
@@ -30,8 +30,7 @@ set -e
 case "$1" in
     configure)
 	addmap mysql
-       if [ $(postconf |grep alias_database | awk '{print $3}'|awk -F \: \
-           '{print $1}') = 'mysql' ]; then
+       if [ "$(postconf -h alias_database | cut -f1 -d:)" = "mysql" ]; then
            runnewaliases
        fi
     ;;
diff --git a/debian/postfix-pcre.postinst b/debian/postfix-pcre.postinst
index fd58c2e..43b4f12 100644
--- a/debian/postfix-pcre.postinst
+++ b/debian/postfix-pcre.postinst
@@ -30,8 +30,7 @@ set -e
 case "$1" in
     configure)
 	addmap pcre
-       if [ $(postconf |grep alias_database | awk '{print $3}'|awk -F \: \
-           '{print $1}') = 'pcre' ]; then
+       if [ "$(postconf -h alias_database | cut -f1 -d:)" = "pcre" ]; then
            runnewaliases
        fi
     ;;
diff --git a/debian/postfix-pgsql.postinst b/debian/postfix-pgsql.postinst
index cae480e..dd9ea14 100644
--- a/debian/postfix-pgsql.postinst
+++ b/debian/postfix-pgsql.postinst
@@ -30,8 +30,7 @@ set -e
 case "$1" in
     configure)
 	addmap pgsql
-       if [ $(postconf |grep alias_database | awk '{print $3}'|awk -F \: \
-           '{print $1}') = 'pgsql' ]; then
+       if [ "$(postconf -h alias_database | cut -f1 -d:)" = "pgsql" ]; then
            runnewaliases
        fi
     ;;
diff --git a/debian/postfix.postinst b/debian/postfix.postinst
index b42a983..7261f9e 100644
--- a/debian/postfix.postinst
+++ b/debian/postfix.postinst
@@ -49,7 +49,7 @@ myfqdn() {
 	if [ $myhostname = ${myhostname%.*} ]; then
 	    if [ -f /etc/resolv.conf ]; then
 		# The resolver uses the last one found, and ignores the rest
-		mydom=$(sed -n 's/^search[[:space:]]*\([^[:space:]]*\).*/\1/p;s/^domain[[:space:]]*\([^[:space:]]*\).*/\1/p' /etc/resolv.conf | tail -1)
+		mydom=$(sed -n 's/^search[[:space:]]*\.*\([^[:space:]]*\).*/\1/p;s/^domain[[:space:]]*\.*\([^[:space:]]*\).*/\1/p' /etc/resolv.conf | tail -1)
 		myhostname="$myhostname${mydom:+.$mydom}"
 	    else
 		myhostname="$myhostname.UNKNOWN"
@@ -614,8 +614,7 @@ if [ ! -f /etc/postfix/master.cf.proto ]; then
 fi
 
 if [ "$mailer" != "No configuration" ] || [ -f /etc/postfix/main.cf ]; then
-    aliastype=$(postconf |grep alias_database | awk '{print $3}' | \
-        awk -F \: '{print $1}')
+    aliastype=$(postconf -h alias_database | cut -f1 -d:)
     if ( [ "$aliastype" != "ldap" ] && [ "$aliastype" != "lmdb" ] && \
         [ "$aliastype" != "cdb" ] && [ "$aliastype" != "pcre" ] && \
         [ "$aliastype" != "mysql" ] && [ "$aliastype" != "pgsql" ] && \