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

[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.)

[Paride Legovini (paride)]

Note: despite this *not* being the first Ubuntu revision, I had to update-maintainer to update the Maintainer field (duh). Without that change `dpkg-source -b` errors out when building the source package, so I wonder how the previous uploads were prepared. In any case I think updating the Maintainer is the right thing to do given that we have Ubuntu changes.

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Paride.

This MP LGTM, but since the other two MPs and the SRU template need adjustments, I'm holding off on this one. Once everything is addressed I will do a batch upload.

Thanks.

[Sergio Durigan Junior (sergiodj)]

Sponsored:

$ dput postfix_3.3.0-1ubuntu0.4_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/postfix/postfix_3.3.0-1ubuntu0.4_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/postfix/postfix_3.3.0-1ubuntu0.4.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading postfix_3.3.0-1ubuntu0.4.dsc: done.
  Uploading postfix_3.3.0-1ubuntu0.4.debian.tar.xz: done.
  Uploading postfix_3.3.0-1ubuntu0.4_source.buildinfo: done.
  Uploading postfix_3.3.0-1ubuntu0.4_source.changes: done.
Successfully uploaded packages.

review: Approve

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

diff --git a/debian/changelog b/debian/changelog
index 790a21f..57c360f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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)
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/postfix.postinst b/debian/postfix.postinst
index 7c04187..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"