From 75a67e84b01e45b3a86b38547699ea6938860e12 Mon Sep 17 00:00:00 2001 From: ljf Date: Tue, 26 Jun 2018 01:59:59 +0200 Subject: [PATCH] [fix] Patch dnsmasq to read correctly dns-root-data --- debian/changelog | 6 ++++++ debian/dnsmasq.patch | 12 ++++++++++++ debian/postinst | 3 +++ 3 files changed, 21 insertions(+) create mode 100644 debian/dnsmasq.patch diff --git a/debian/changelog b/debian/changelog index 1c03e339e..f5b0a7eba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +yunohost (2.7.14.3) stable; urgency=low + + * [fix] Patch dnsmasq to read correctly dns-root-data + + -- ljf Tue, 26 Jun 2018 00:49:00 +0000 + yunohost (2.7.14.2) stable; urgency=low * [fix] Indicate YunoHost conflict with a specific version of dns-root-data diff --git a/debian/dnsmasq.patch b/debian/dnsmasq.patch new file mode 100644 index 000000000..dbe5bc125 --- /dev/null +++ b/debian/dnsmasq.patch @@ -0,0 +1,12 @@ +index 46abdc4..49556ad 100644 (file) +--- 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() diff --git a/debian/postinst b/debian/postinst index df7112b9d..d6383eca9 100644 --- a/debian/postinst +++ b/debian/postinst @@ -14,6 +14,9 @@ do_configure() { echo "Regenerating configuration, this might take a while..." yunohost service regen-conf --output-as none + echo "Patch Dnsmasq service" + patch /etc/init.d/dnsmasq dnsmasq.patch + echo "Launching migrations.." yunohost tools migrations migrate --auto