Bug#949704: buster-pu: package opensmtpd/6.0.3p1-5

[Ryan Kavanagh]

Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian....@packages.debian.org
Usertags: pu

The proposed change fixes bug #948824, which rendered the package
uninstallable when `hostname --fqdn` exited with a non-zero exit code.
I've tested it locally and the bug reporter has also confirmed that the
patch fixes the bug. The bug was fixed by opensmtpd 6.6.1p1-5 (already
in unstable).

A debdiff is attached. Please let me know if I'm free to upload.

Thanks,
Ryan

-- System Information:
Debian Release: bullseye/sid
  APT prefers unstable-debug
  APT policy: (500, 'unstable-debug'), (500, 'unstable'), (1, 
'experimental-debug'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.4.0-2-amd64 (SMP w/4 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, 
TAINT_UNSIGNED_MODULE
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8) (ignored: LC_ALL 
set to en_CA.UTF-8), LANGUAGE=en_CA.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set 
to en_CA.UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

-- 
|)|/  Ryan Kavanagh      | GPG: 4E46 9519 ED67 7734 268F
|\|\  https://rak.ac     |      BD95 8F7B F8FC 4A11 C97A

diff --git a/debian/changelog b/debian/changelog
index f40f3ef2..45834712 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+opensmtpd (6.0.3p1-5+deb10u2) buster; urgency=medium
+
+  * Handle non-zero exit code from hostname during config phase
+    (Closes: #948824)
+
+ -- Ryan Kavanagh <r...@debian.org>  Thu, 23 Jan 2020 16:36:09 -0500
+
 opensmtpd (6.0.3p1-5+deb10u1) buster; urgency=medium
 
   * Warn users of change of smtpd.conf syntax (Closes: #944268)
diff --git a/debian/config b/debian/config
index 96401633..455d9483 100644
--- a/debian/config
+++ b/debian/config
@@ -28,12 +28,10 @@ else
     else
         # Otherwise, default to our FQDN
         # /etc/mailname and opensmtpd/mailname are both empty
-        # Default to the FQDN
-        MAILNAME=`hostname --fqdn 2> /dev/null`
-        # Something when wrong; resort to localdomain
-        if [ $? -ne 0 ]; then
-            MAILNAME="localdomain"
-        fi
+        # Default to the FQDN. hostname will exit with a non-zero
+        # exit code if something goes wrong, in which case we resort
+        # to the value localdomain.
+        MAILNAME=`hostname --fqdn 2> /dev/null || echo "localdomain"`
         # Update our DB with this default for when we prompt the user
         db_set opensmtpd/mailname "${MAILNAME}"
     fi

signature.asc
Description: PGP signature