From 44eb875a5ab2e3b862a6b2bc9fbbb919475d2107 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@thekelleys.org.uk>
Date: Tue, 11 Apr 2017 15:13:09 +0100
Subject: [PATCH] Handle change in format of Debian /usr/share/dns/root.ds.

---
 debian/changelog | 2 ++
 debian/init      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 292c2b8..afe9670 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ dnsmasq (2.77-1) unstable; urgency=low
    * New upstream.
    * Don't register as a resolvconf source when config file
 	includes port=0 to disable DNS.
+   * Handle gratuitous format change in /usr/share/dns/root.ds
+	(closes: #858506) (closes: #860064) 
 	
  -- Simon Kelley <simon@thekelleys.org.uk>  Tue, 11 Apr 2017 14:19:20 +0000
 
diff --git a/debian/init b/debian/init
index 46abdc4..49556ad 100644
--- a/debian/init
+++ b/debian/init
@@ -111,7 +111,7 @@ DNSMASQ_OPTS="$DNSMASQ_OPTS --local-service"
 ROOT_DS="/usr/share/dns/root.ds"
 
 if [ -f $ROOT_DS ]; then
-   DNSMASQ_OPTS="$DNSMASQ_OPTS `sed -e s/". IN DS "/--trust-anchor=.,/ -e s/" "/,/g $ROOT_DS | tr '\n' ' '`" 
+   DNSMASQ_OPTS="$DNSMASQ_OPTS `sed -e s/"^.*DS[\t ]"/--trust-anchor=.,/ -e s/" "/,/g $ROOT_DS | tr '\n' ' '`" 
 fi
 
 start()