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

[Paride Legovini]

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

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

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

Autopkgtest summary (virt-server: lxd):

postfix PASS

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Paride.

This MP has the same problem with the package version as the Focal one.

I left further comments about the SRU template on the Focal MP. When you address them and fix the version on this MP, it should be good for upload.

Thanks.

review: Needs Fixing

511eb40... by Paride Legovini on 2021-08-13

update-maintainer

[Paride Legovini (paride)]

Thanks Sergio, I fixed the version string and updated the PPA as done for the Focal SRU [1].

[1] https://code.launchpad.net/~paride/ubuntu/+source/postfix/+git/postfix/+merge/407021

[Sergio Durigan Junior (sergiodj)]

Thank you, Paride.

Sponsored:

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

review: Approve

Unmerged commits

511eb40... by Paride Legovini on 2021-08-13

update-maintainer

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

Update d/changelog for 3.5.6-1ubuntu0.1

eb9bfdf... 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 2a161f5..b4ced17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+postfix (3.5.6-1ubuntu0.1) hirsute; urgency=medium
+
+  * d/postfix.postinst: tolerate search domain with a leading dot
+    (LP: #1906970)
+
+ -- Paride Legovini <[e-mail]>  Thu, 12 Aug 2021 14:39:06 +0200
+
 postfix (3.5.6-1) unstable; urgency=medium
 
   [Dominic Raferd]
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
diff --git a/debian/postfix.postinst b/debian/postfix.postinst
index dc28f3c..9ba7eac 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"