Merge ~kstenerud/ubuntu/+source/postfix:cosmic-postfix-mysql-config-1791139 into ubuntu/+source/postfix:ubuntu/cosmic-devel

[Karl Stenerud]

Handle empty alias fields in /etc/postfix/main.cf

PPA: https://launchpad.net/~kstenerud/+archive/ubuntu/cosmic-postfix-mysql-config-1791139

Steps to test (broken path):

# lxc launch ubuntu-daily:cosmic testing
# lxc exec testing bash
# dhclient
# apt update
# apt dist-upgrade -y
# apt install -y postfix postfix-mysql
# sed -i 's/\(alias_.* =\).*/\1/g' /etc/postfix/main.cf
# service postfix reload
# apt install --reinstall postfix-mysql

You'll get the following error:
    Adding mysql map entry to /etc/postfix/dynamicmaps.cf
    /var/lib/dpkg/info/postfix-mysql.postinst: 33: [: =: unexpected operator

Steps to test (fixed path):

# lxc launch ubuntu-daily:cosmic testing
# lxc exec testing bash
# dhclient
# sudo add-apt-repository -y ppa:kstenerud/cosmic-postfix-mysql-config-1791139
# apt update
# apt dist-upgrade -y
# apt install -y postfix postfix-mysql
# sed -i 's/\(alias_.* =\).*/\1/g' /etc/postfix/main.cf
# service postfix reload
# apt install --reinstall postfix-mysql

The reinstall process should complete successfully.

[Andreas Hasenack (ahasenack)]

Please see the other debian/*.postinst scripts, all (most?) of them have the same problem. Short list in https://bugs.launchpad.net/ubuntu/+source/postfix/+bug/1791139/comments/7

review: Needs Fixing

[Andreas Hasenack (ahasenack)]

Thanks for the changes, I'll check again tomorrow morning before you start your day.

[Christian Ehrhardt  (paelzer)]

I see "Thanks for the changes", but I don't see the extended changelog entry like:
 * d/postfix-cdb.postinst, d/postfix-ldap.postinst, d/postfix-lmdb.postinst, d/postfix-mysql.postinst, d/postfix-pcre.postinst, d/postfix-pgsql.postinst, d/postfix.postinst:

If you prefer a rather short entry I think you could get away with a readable but more correct:
 * d/postfix-{cdb,ldap,lmdb,mysql,pcre,pgsql}.postinst, d/postfix.postinst:

And in my personal (might need a second) opinion, even this would be sort of ok indicating that more than one file were changed without flooding the changelog entry:
 * d/postfix*.postinst:

Further since in those cases changing in debian/* (no patch file with dep3 header) we have no nice place to put the Debian bug reference I sometimes add it to the changelog entry.
Would be #908221

And finally I think both bugs will be fixed, so list both LP Bugs (1791139).

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

[Andreas Hasenack (ahasenack)]

The "changes" I meant were the other postinst fixes. I'll give them a run now, but since I cannot upload this package, the formal review and upload should be done by a core dev.

[Andreas Hasenack (ahasenack)]

Suggestion for the testing procedure: there is no need for an intermediary ppa. You can trigger the failure by just reinstalling postfix-mysql, like this, after the first sed:

sudo apt install --reinstall postfix-mysql

root@cosmic-postfix:~# apt install postfix-mysql --reinstall
Reading package lists... Done
Building dependency tree
Reading state information... Done
The following package was automatically installed and is no longer required:
  libfreetype6
Use 'apt autoremove' to remove it.
0 upgraded, 0 newly installed, 1 reinstalled, 0 to remove and 0 not upgraded.
Need to get 21.4 kB of archives.
After this operation, 0 B of additional disk space will be used.
Get:1 http://br.archive.ubuntu.com/ubuntu cosmic/main amd64 postfix-mysql amd64 3.3.0-1ubuntu1 [21.4 kB]
Fetched 21.4 kB in 213503982334601d 7h 0min 15s (0 B/s)
(Reading database ... 28802 files and directories currently installed.)
Preparing to unpack .../postfix-mysql_3.3.0-1ubuntu1_amd64.deb ...
Removing mysql map entry from /etc/postfix/dynamicmaps.cf
Unpacking postfix-mysql (3.3.0-1ubuntu1) over (3.3.0-1ubuntu1) ...
Setting up postfix-mysql (3.3.0-1ubuntu1) ...
Adding mysql map entry to /etc/postfix/dynamicmaps.cf
/var/lib/dpkg/info/postfix-mysql.postinst: 33: [: =: unexpected operator
Processing triggers for man-db (2.8.4-2) ...

[Karl Stenerud (kstenerud)]

OK, I've changed the description to:

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

Since only the alias_database field was breaking.

[Andreas Hasenack (ahasenack)]

I verified the fix for postfix-mysql, but the ppas don't have a newer build which includes the same fix for the other packages that are also affected.

I don't think a DEP8 run is needed here, since the fix is in a postinst script and that is tested just by installing the package, and upgrading it, something you (and I) did manually.

[Andreas Hasenack (ahasenack)]

#908221 is a debian bug, don't prefix it with LP, or else this upload will close a nautilus bug (!) :)

[Karl Stenerud (kstenerud)]

OK, new build uploaded, description and instructions updated.

[Andreas Hasenack (ahasenack)]

+1

review: Approve

[Andreas Hasenack (ahasenack)]

tagged and uploaded

diff --git a/debian/changelog b/debian/changelog
index b5f577c..cd5d73a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+postfix (3.3.0-1ubuntu2) cosmic; urgency=medium
+
+ * d/postfix-{cdb,ldap,lmdb,mysql,pcre,pgsql}.postinst, d/postfix.postinst:
+   Handle empty alias_database field in main.cf (LP: #1791139 Closes: #908221)
+
+ -- Karl Stenerud <[e-mail]>  Wed, 12 Sep 2018 06:06:30 +0000
+
 postfix (3.3.0-1ubuntu1) cosmic; urgency=medium
 
   * debian/patches/fix-postconf-segfault.diff: Fix a postconf segfault
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..7c04187 100644
--- a/debian/postfix.postinst
+++ b/debian/postfix.postinst
@@ -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" ] && \