Version in base suite: 6.0.3p1-5

Base version: opensmtpd_6.0.3p1-5
Target version: opensmtpd_6.0.3p1-5+deb10u1
Base file: /srv/ftp-master.debian.org/ftp/pool/main/o/opensmtpd/opensmtpd_6.0.3p1-5.dsc
Target file: /srv/ftp-master.debian.org/policy/pool/main/o/opensmtpd/opensmtpd_6.0.3p1-5+deb10u1.dsc

 NEWS      |   25 +++++++++++++++++++++++++
 changelog |    7 +++++++
 control   |    2 +-
 gbp.conf  |    2 +-
 postinst  |    7 +++++++
 postrm    |   12 ++++++++++++
 6 files changed, 53 insertions(+), 2 deletions(-)

diff -Nru opensmtpd-6.0.3p1/debian/NEWS opensmtpd-6.0.3p1/debian/NEWS
--- opensmtpd-6.0.3p1/debian/NEWS	2018-01-16 15:16:54.000000000 +0000
+++ opensmtpd-6.0.3p1/debian/NEWS	2019-12-21 22:41:55.000000000 +0000
@@ -1,3 +1,28 @@
+opensmtpd (6.0.3p1-5+deb10u1) buster; urgency=medium
+
+    There have been changes to the smtpd.conf file format[0] which may
+    require manual editing of your /etc/smtpd.conf file. Full details
+    may be found in the man page smtpd.conf(5). Quoting from the
+    "OpenBSD Upgrade Guide: 6.1 to 6.2" [0]:
+
+        The "secure" keyword is not valid anymore in "listen" directives
+        in smtpd.conf(5). Users are advised to replace existing
+        "listen secure" directives with two separate "tls" and "smtps"
+        listeners, i.e., a line like
+
+           listen on $iface secure pki $pki
+
+        has to be replaced with
+
+            listen on $iface tls pki $pki
+            listen on $iface smtps pki $pki
+
+        Relaying syntax is not affected by this change.
+
+    [0] https://www.openbsd.org/faq/upgrade62.html
+
+ -- Ryan Kavanagh <rak@debian.org>  Tue, 03 Dec 2019 12:11:02 -0500
+
 opensmtpd (5.4.1p1-1) unstable; urgency=medium
 
     There have been minor changes to the smtpd.conf file format[0] which
diff -Nru opensmtpd-6.0.3p1/debian/changelog opensmtpd-6.0.3p1/debian/changelog
--- opensmtpd-6.0.3p1/debian/changelog	2019-02-06 15:16:39.000000000 +0000
+++ opensmtpd-6.0.3p1/debian/changelog	2019-12-21 22:41:55.000000000 +0000
@@ -1,3 +1,10 @@
+opensmtpd (6.0.3p1-5+deb10u1) buster; urgency=medium
+
+  * Warn users of change of smtpd.conf syntax (Closes: #944268)
+  * Install smtpctl setgid opensmtpq (Closes: #945910)
+
+ -- Ryan Kavanagh <rak@debian.org>  Sat, 21 Dec 2019 17:41:55 -0500
+
 opensmtpd (6.0.3p1-5) unstable; urgency=medium
 
   [ Ondřej Nový ]
diff -Nru opensmtpd-6.0.3p1/debian/control opensmtpd-6.0.3p1/debian/control
--- opensmtpd-6.0.3p1/debian/control	2019-02-05 22:11:54.000000000 +0000
+++ opensmtpd-6.0.3p1/debian/control	2019-12-21 22:41:55.000000000 +0000
@@ -14,7 +14,7 @@
  , zlib1g-dev
 Standards-Version: 4.3.0
 Homepage: https://www.opensmtpd.org/
-Vcs-Git: https://salsa.debian.org/debian/opensmtpd.git -b debian/sid
+Vcs-Git: https://salsa.debian.org/debian/opensmtpd.git -b debian/buster
 Vcs-Browser: https://salsa.debian.org/debian/opensmtpd
 
 Package: opensmtpd
diff -Nru opensmtpd-6.0.3p1/debian/gbp.conf opensmtpd-6.0.3p1/debian/gbp.conf
--- opensmtpd-6.0.3p1/debian/gbp.conf	2018-01-16 15:16:54.000000000 +0000
+++ opensmtpd-6.0.3p1/debian/gbp.conf	2019-12-21 22:41:55.000000000 +0000
@@ -1,5 +1,5 @@
 [DEFAULT]
 upstream-branch = upstream
-debian-branch = debian/sid
+debian-branch = debian/buster
 pristine-tar = True
 sign-tags = True
diff -Nru opensmtpd-6.0.3p1/debian/postinst opensmtpd-6.0.3p1/debian/postinst
--- opensmtpd-6.0.3p1/debian/postinst	2019-02-06 14:39:50.000000000 +0000
+++ opensmtpd-6.0.3p1/debian/postinst	2019-12-21 22:41:55.000000000 +0000
@@ -175,6 +175,13 @@
                     --no-create-home --disabled-password \
                     --gecos "OpenSMTD queue user" \
                     --ingroup opensmtpq opensmtpq
+        # smtpctl needs to be setgid opensmtpq per
+        # https://github.com/OpenSMTPD/OpenSMTPD/commit/8bdce604
+        if ! dpkg-statoverride --list --quiet "/usr/sbin/smtpctl" >/dev/null;
+        then
+            dpkg-statoverride --quiet --update \
+                --add root opensmtpq 2755 "/usr/sbin/smtpctl"
+        fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure|reconfigure)
diff -Nru opensmtpd-6.0.3p1/debian/postrm opensmtpd-6.0.3p1/debian/postrm
--- opensmtpd-6.0.3p1/debian/postrm	2018-01-16 15:16:54.000000000 +0000
+++ opensmtpd-6.0.3p1/debian/postrm	2019-12-21 22:41:55.000000000 +0000
@@ -5,6 +5,18 @@
 case "$1" in
     purge)
 	rm -rf /var/spool/smtpd
+        # Remove the statoverride before the opensmtpq group.
+        # Otherwise, if users attempt to install the package after
+        # a purge, dpkg will abort with:
+        # > dpkg: unrecoverable fatal error, aborting:
+        # >  unknown system group 'opensmtpq' in statoverride file; the system
+        # > group got removed before the override, which is most probably a
+        # > packaging bug, to recover you can remove the override manually with
+        # > dpkg-statoverride
+        if dpkg-statoverride --list --quiet "/usr/sbin/smtpctl" >/dev/null;
+        then
+            dpkg-statoverride --quiet --remove "/usr/sbin/smtpctl"
+        fi
         for name in opensmtpd opensmtpq; do
             # By debian Policy §6.5, we may only rely on essential packages and
             # must fail gracefully if they are unavailable.