On Wednesday, May 17, 2017 05:33:00 AM Niels Thykier wrote:
...
> Scott Kitterman:
> > Package: release.debian.org
> > Severity: normal
> > User: release.debian....@packages.debian.org
> > Usertags: unblock

There is one more issue that came up that in my opinion really must be fixed 
before release.  Diff with unstable for the additional issue attached.

I have added the moreinfo tag to the bug so we don't have to do this twice.  
Once the update is accepted, I'll provide the full debdiff with testing and 
remove the tag.

Thanks,

Scott K
diff -Nru postfix-3.1.4/debian/changelog postfix-3.1.4/debian/changelog
--- postfix-3.1.4/debian/changelog	2017-05-19 10:51:32.000000000 -0400
+++ postfix-3.1.4/debian/changelog	2017-05-21 14:38:07.000000000 -0400
@@ -1,3 +1,10 @@
+postfix (3.1.4-7) unstable; urgency=medium
+
+  * Fix use of smtp binary for lmtp service on new installs and bump version
+    check for postinst fixup.  Closes: #862244
+
+ -- Scott Kitterman <sc...@kitterman.com>  Sun, 21 May 2017 14:37:37 -0400
+
 postfix (3.1.4-6) unstable; urgency=medium
 
   * Revert Clean up left-over /etc/systemd/system/postfix.service.d directory
diff -Nru postfix-3.1.4/debian/patches/40_chroot_by_default.diff postfix-3.1.4/debian/patches/40_chroot_by_default.diff
--- postfix-3.1.4/debian/patches/40_chroot_by_default.diff	2017-05-19 10:50:13.000000000 -0400
+++ postfix-3.1.4/debian/patches/40_chroot_by_default.diff	2017-05-21 14:30:32.000000000 -0400
@@ -74,7 +74,7 @@
 -lmtp      unix  -       -       n       -       -       lmtp
 -anvil     unix  -       -       n       -       1       anvil
 -scache    unix  -       -       n       -       1       scache
-+lmtp      unix  -       -       y       -       -       smtp
++lmtp      unix  -       -       y       -       -       lmtp
 +anvil     unix  -       -       y       -       1       anvil
 +scache    unix  -       -       y       -       1       scache
  #
diff -Nru postfix-3.1.4/debian/postfix.postinst postfix-3.1.4/debian/postfix.postinst
--- postfix-3.1.4/debian/postfix.postinst	2017-05-19 10:50:22.000000000 -0400
+++ postfix-3.1.4/debian/postfix.postinst	2017-05-21 14:32:50.000000000 -0400
@@ -155,9 +155,10 @@
     fi
 
     # After 3.1.3-7 and before 3.1.4-3~ we erroneously changed master.
-    # Change it back.  See Debian bug 850430.
+    # Change it back.  See Debian bug 850430.  Up through 3.1.4-7~ we still
+    # got it wrong on new installs.  See Debian bug 862244.
     if dpkg --compare-versions "$OLDVERSION" ge 3.1.3-7 && \
-	dpkg --compare-versions "$OLDVERSION" lt 3.1.4-3~; then
+	dpkg --compare-versions "$OLDVERSION" lt 3.1.4-7~; then
 	if grep -qE '^lmtp[[:space:]].*smtp$' ${MASTER}; then
 	    [ -n "$echoed" ] || echo "In master.cf:"; echoed=y
 	    echo "  restoring lmtp binary for lmtp service"

Reply via email to