On Sun, 21 May 2017 15:08:54 -0400 Scott Kitterman <deb...@kitterman.com>
wrote:
> 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.
3.1.4-7 is now in unstable. New testing to unstable diff attached. I think
it's good to go now.
Revised unblock is:
unblock postfix/3.1.4-7
Thanks,
Scott K
diff -Nru postfix-3.1.4/debian/changelog postfix-3.1.4/debian/changelog
--- postfix-3.1.4/debian/changelog 2017-01-25 10:03:04.000000000 -0500
+++ postfix-3.1.4/debian/changelog 2017-05-21 14:38:07.000000000 -0400
@@ -1,3 +1,29 @@
+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
+ since it turned out to be problematic
+
+ -- Scott Kitterman <sc...@kitterman.com> Fri, 19 May 2017 10:51:02 -0400
+
+postfix (3.1.4-5) unstable; urgency=medium
+
+ * Add postfix-cdb Breaks: postfix << 3.1.3-7~ so that the incorrect addmap
+ function will not be used when postfix-cdb is configured. Closes: #861593
+ * Make sure to call delmap on upgrade as well as remove and purge so
+ dpkg-reconfigure will fix broken upgrades. Closes: #859805
+ * Drop ineffective service override generated in postinst and use correct
+ service file dependencies in postfix@.service instead. Closes: #854475
+ * Clean up left-over /etc/systemd/system/postfix.service.d directory
+
+ -- Scott Kitterman <sc...@kitterman.com> Mon, 15 May 2017 16:03:17 -0400
+
postfix (3.1.4-4) unstable; urgency=medium
[Scott Kitterman]
diff -Nru postfix-3.1.4/debian/control postfix-3.1.4/debian/control
--- postfix-3.1.4/debian/control 2017-01-06 13:04:11.000000000 -0500
+++ postfix-3.1.4/debian/control 2017-05-15 20:38:45.000000000 -0400
@@ -46,6 +46,7 @@
Package: postfix-cdb
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, postfix (= ${binary:Version})
+Breaks: postfix (<< 3.1.3-7~)
Description: CDB map support for Postfix
${Description}
.
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 2016-12-28 10:43:57.000000000 -0500
+++ 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-cdb.prerm postfix-3.1.4/debian/postfix-cdb.prerm
--- postfix-3.1.4/debian/postfix-cdb.prerm 2016-12-06 17:04:03.000000000 -0500
+++ postfix-3.1.4/debian/postfix-cdb.prerm 2017-05-15 20:39:27.000000000 -0400
@@ -18,11 +18,11 @@
. /usr/share/postfix/postinst.functions
case "$1" in
- remove|purge)
+ remove|purge|upgrade)
delmap cdb
# install-info --quiet --remove /usr/info/#PACKAGE#.info.gz
;;
- upgrade|deconfigure|failed-upgrade)
+ deconfigure|failed-upgrade)
;;
*)
echo "prerm called with unknown argument \`$1'" >&2
diff -Nru postfix-3.1.4/debian/postfix-ldap.prerm postfix-3.1.4/debian/postfix-ldap.prerm
--- postfix-3.1.4/debian/postfix-ldap.prerm 2016-12-06 16:59:58.000000000 -0500
+++ postfix-3.1.4/debian/postfix-ldap.prerm 2017-05-15 20:39:27.000000000 -0400
@@ -18,11 +18,11 @@
. /usr/share/postfix/postinst.functions
case "$1" in
- remove|purge)
+ remove|purge|upgrade)
delmap ldap
# install-info --quiet --remove /usr/info/#PACKAGE#.info.gz
;;
- upgrade|deconfigure|failed-upgrade)
+ deconfigure|failed-upgrade)
;;
*)
echo "prerm called with unknown argument \`$1'" >&2
diff -Nru postfix-3.1.4/debian/postfix-lmdb.prerm postfix-3.1.4/debian/postfix-lmdb.prerm
--- postfix-3.1.4/debian/postfix-lmdb.prerm 2016-12-06 16:56:01.000000000 -0500
+++ postfix-3.1.4/debian/postfix-lmdb.prerm 2017-05-15 20:39:27.000000000 -0400
@@ -18,11 +18,11 @@
. /usr/share/postfix/postinst.functions
case "$1" in
- remove|purge)
+ remove|purge|upgrade)
delmap lmdb
# install-info --quiet --remove /usr/info/#PACKAGE#.info.gz
;;
- upgrade|deconfigure|failed-upgrade)
+ deconfigure|failed-upgrade)
;;
*)
echo "prerm called with unknown argument \`$1'" >&2
diff -Nru postfix-3.1.4/debian/postfix-mysql.prerm postfix-3.1.4/debian/postfix-mysql.prerm
--- postfix-3.1.4/debian/postfix-mysql.prerm 2016-12-06 17:00:26.000000000 -0500
+++ postfix-3.1.4/debian/postfix-mysql.prerm 2017-05-15 20:39:27.000000000 -0400
@@ -18,11 +18,11 @@
. /usr/share/postfix/postinst.functions
case "$1" in
- remove|purge)
+ remove|purge|upgrade)
delmap mysql
# install-info --quiet --remove /usr/info/#PACKAGE#.info.gz
;;
- upgrade|deconfigure|failed-upgrade)
+ deconfigure|failed-upgrade)
;;
*)
echo "prerm called with unknown argument \`$1'" >&2
diff -Nru postfix-3.1.4/debian/postfix-pcre.prerm postfix-3.1.4/debian/postfix-pcre.prerm
--- postfix-3.1.4/debian/postfix-pcre.prerm 2016-12-06 17:00:56.000000000 -0500
+++ postfix-3.1.4/debian/postfix-pcre.prerm 2017-05-15 20:39:27.000000000 -0400
@@ -18,11 +18,11 @@
. /usr/share/postfix/postinst.functions
case "$1" in
- remove|purge)
+ remove|purge|upgrade)
delmap pcre
# install-info --quiet --remove /usr/info/#PACKAGE#.info.gz
;;
- upgrade|deconfigure|failed-upgrade)
+ deconfigure|failed-upgrade)
;;
*)
echo "prerm called with unknown argument \`$1'" >&2
diff -Nru postfix-3.1.4/debian/postfix-pgsql.prerm postfix-3.1.4/debian/postfix-pgsql.prerm
--- postfix-3.1.4/debian/postfix-pgsql.prerm 2016-12-06 17:01:24.000000000 -0500
+++ postfix-3.1.4/debian/postfix-pgsql.prerm 2017-05-15 20:39:27.000000000 -0400
@@ -18,11 +18,11 @@
. /usr/share/postfix/postinst.functions
case "$1" in
- remove|purge)
+ remove|purge|upgrade)
delmap pgsql
# install-info --quiet --remove /usr/info/#PACKAGE#.info.gz
;;
- upgrade|deconfigure|failed-upgrade)
+ deconfigure|failed-upgrade)
;;
*)
echo "prerm called with unknown argument \`$1'" >&2
diff -Nru postfix-3.1.4/debian/postfix.postinst postfix-3.1.4/debian/postfix.postinst
--- postfix-3.1.4/debian/postfix.postinst 2017-01-20 23:32:04.000000000 -0500
+++ 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"
@@ -182,17 +183,6 @@
fi
}
-add_service_override() {
- NAME=postfix
- # Generate service override file
- SERVICE=$(mktemp $NAME.service.XXXXXXXXXX)
- echo "[Unit]" >> $SERVICE
- echo "After=network-online.target" >> $SERVICE
- echo "After=systemd-resolved.service" >> $SERVICE
- mkdir -p /etc/systemd/system/$NAME.service.d
- install -m 644 $SERVICE /etc/systemd/system/$NAME.service.d/override.conf
- rm -f $SERVICE
-}
umask 022
# postinst processing
@@ -647,18 +637,6 @@
fi
fi
- # If we are not Local only and using systemd, then make sure we wait until
- # the network is actually there and we have DNS: #844277 and LP #1649453
- # for starters. If using systemd without systemd-resolved, you're on your
- # own.
- if [ -f /lib/systemd/systemd-resolved ] && \
- [ ! -f /etc/systemd/system/postfix.service.d/override.conf ] ; then
- if [ "$mailer" != "No configuration" ] && [ "$mailer" != "Local only" ]; then
- echo "Adding systemd overrides to ensure network and name services available."
- add_service_override
- fi
- fi
-
[ -x /usr/sbin/invoke-rc.d ] && \
INIT="invoke-rc.d postfix" || \
INIT="/etc/init.d/postfix"
diff -Nru postfix-3.1.4/debian/postfix.prerm postfix-3.1.4/debian/postfix.prerm
--- postfix-3.1.4/debian/postfix.prerm 2016-10-30 08:17:46.000000000 -0400
+++ postfix-3.1.4/debian/postfix.prerm 2017-05-15 20:40:50.000000000 -0400
@@ -3,6 +3,8 @@
# Debian Postfix prerm
# LaMont Jones <lam...@debian.org>
+. /usr/share/postfix/postinst.functions
+
case "$1" in
upgrade)
new=$2 # get new version
@@ -19,6 +21,8 @@
mv ${MASTER}.$$ ${MASTER}
fi
fi
+ delmap sqlite #remove after stretch
+ delmap tcp # remove after stretch
;;
deconfigure)
diff -Nru postfix-3.1.4/debian/postfix.service postfix-3.1.4/debian/postfix.service
--- postfix-3.1.4/debian/postfix.service 2016-10-30 08:17:46.000000000 -0400
+++ postfix-3.1.4/debian/postfix.service 2017-05-15 20:39:52.000000000 -0400
@@ -1,6 +1,5 @@
[Unit]
Description=Postfix Mail Transport Agent
-After=network.target
Conflicts=sendmail.service exim4.service
ConditionPathExists=/etc/postfix/main.cf
diff -Nru postfix-3.1.4/debian/postfix@.service postfix-3.1.4/debian/postfix@.service
--- postfix-3.1.4/debian/postfix@.service 2016-10-30 08:17:46.000000000 -0400
+++ postfix-3.1.4/debian/postfix@.service 2017-05-15 20:39:52.000000000 -0400
@@ -2,7 +2,10 @@
Description=Postfix Mail Transport Agent (instance %i)
Documentation=man:postfix(1)
PartOf=postfix.service
+Before=postfix.service
ReloadPropagatedFrom=postfix.service
+After=network-online.target nss-lookup.target
+Wants=network-online.target
[Service]
Type=forking
diff -Nru postfix-3.1.4/debian/postfix-sqlite.prerm postfix-3.1.4/debian/postfix-sqlite.prerm
--- postfix-3.1.4/debian/postfix-sqlite.prerm 2017-01-06 13:04:11.000000000 -0500
+++ postfix-3.1.4/debian/postfix-sqlite.prerm 2017-05-15 20:39:27.000000000 -0400
@@ -23,7 +23,7 @@
fi
case "$1" in
- remove|upgrade|deconfigure)
+ remove|purge|upgrade|deconfigure)
[ n = "$HAVE_FUNC" ] || delmap sqlite
;;
failed-upgrade)
