diff -Nru postfix-3.1.0/debian/changelog postfix-3.1.0/debian/changelog --- postfix-3.1.0/debian/changelog 2016-04-13 11:46:28.000000000 -0500 +++ postfix-3.1.0/debian/changelog 2017-03-24 17:22:58.000000000 -0500 @@ -1,3 +1,11 @@ +postfix (3.1.0-3ubuntu0.16.04.1) xenial; urgency=medium + + * Cherrypick from debian. + - debian/postfix.postinst: Provide main/master.cf.proto for multi-inst. + Closes LP: #1595096. + + -- Jon Grimm Fri, 24 Mar 2017 17:22:58 -0500 + postfix (3.1.0-3) unstable; urgency=medium * By default, include $myhostname into $mydestinations. diff -Nru postfix-3.1.0/debian/control postfix-3.1.0/debian/control --- postfix-3.1.0/debian/control 2016-04-13 11:22:12.000000000 -0500 +++ postfix-3.1.0/debian/control 2017-03-24 17:22:58.000000000 -0500 @@ -1,7 +1,8 @@ Source: postfix Section: mail Priority: extra -Maintainer: LaMont Jones +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: LaMont Jones Standards-Version: 3.9.1.0 Homepage: http://www.postfix.org Build-Depends: debhelper (>= 7), po-debconf (>= 0.5.0), groff-base, patch, lsb-release, libdb-dev (>=4.6.19), libldap2-dev (>=2.1), libpcre3-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 -Nru postfix-3.1.0/debian/postfix.postinst postfix-3.1.0/debian/postfix.postinst --- postfix-3.1.0/debian/postfix.postinst 2016-04-13 11:22:12.000000000 -0500 +++ postfix-3.1.0/debian/postfix.postinst 2017-03-24 17:22:58.000000000 -0500 @@ -599,6 +599,14 @@ update-inetd --disable smtp /dev/null 2>&1 || true fi +# Make sure we have main/master.cf.proto for multi-inst (#838528) +if [ ! -f /etc/postfix/main.cf.proto ]; then + cp /usr/share/postfix/main.cf.dist /etc/postfix/main.cf.proto +fi +if [ ! -f /etc/postfix/master.cf.proto ]; then + cp /usr/share/postfix/master.cf.dist /etc/postfix/master.cf.proto +fi + if [ "$mailer" != "No configuration" ] || [ -f /etc/postfix/main.cf ]; then if [ -n "$NEWALIASES" ]; then echo "Running newaliases"