Merge ~paelzer/ubuntu/+source/avahi:lp-1752411-bionic into ubuntu/+source/avahi:ubuntu/bionic-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Related PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3388
Bileto: https://bileto.ubuntu.com/#/ticket/3388
Bug: https://bugs.launchpad.net/ubuntu/+source/openconnect/+bug/1752411

More a mitigation than a fix, but agreed on the bug and helping for affected cases.

[Andreas Hasenack (ahasenack)]

+1

review: Approve

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/avahi
 * [new tag] upload/0.7-3.1ubuntu1.1 -> upload/0.7-3.1ubuntu1.1

[Christian Ehrhardt  (paelzer)]

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading avahi_0.7-3.1ubuntu1.1.dsc: done.
  Uploading avahi_0.7-3.1ubuntu1.1.debian.tar.xz: done.
  Uploading avahi_0.7-3.1ubuntu1.1_source.buildinfo: done.
  Uploading avahi_0.7-3.1ubuntu1.1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/avahi-daemon-check-dns.sh b/debian/avahi-daemon-check-dns.sh
index 7f92e9d..bd99d38 100755
--- a/debian/avahi-daemon-check-dns.sh
+++ b/debian/avahi-daemon-check-dns.sh
@@ -73,7 +73,8 @@ dns_has_local() {
     fi
   fi
 
-  OUT=`LC_ALL=C host -t soa local. 2>&1`
+  # Use timeout when calling host as workaround for LP: #1752411
+  OUT=`LC_ALL=C timeout 5 host -t soa local. 2>&1`
   if [ $? -eq 0 ] ; then
     if echo "$OUT" | egrep -vq 'has no|not found'; then
       return 0
diff --git a/debian/changelog b/debian/changelog
index d3e26e5..bd07b2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+avahi (0.7-3.1ubuntu1.1) bionic; urgency=medium
+
+  [ Trent Lloyd ]
+  * debian/avahi-daemon-check-dns.sh: On some hardware, the 'host'
+    command gets stuck and does not timeout as it should leaving this script
+    and boot-up hanging indefinitely. Launch host with 'timeout' to kill it
+    after 5 seconds in these cases as a workaround. (LP: #1752411)
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 28 Aug 2018 11:37:21 +0200
+
 avahi (0.7-3.1ubuntu1) bionic; urgency=medium
 
   * Merge from Debian unstable. Remaining changes: