Merge pull request #501 from YunoHost/fix-patch-dnsmasq

[fix] Patch dnsmasq to read correctly dns-root-data

debian/changelog

@@ -1,3 +1,9 @@
+yunohost (2.7.14.3) stable; urgency=low
+
+  * [fix] Patch dnsmasq to read correctly dns-root-data
+
+ -- ljf <ljf+yunohost@grimaud.me>  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

debian/control

@@ -40,7 +40,6 @@ Conflicts: iptables-persistent
  , yunohost-config-dovecot, yunohost-config-slapd
  , yunohost-config-nginx, yunohost-config-amavis
  , yunohost-config-mysql, yunohost-predepends
- , dns-root-data (>= 2017072601~deb8u2)
 Replaces: moulinette-yunohost, yunohost-config
  , yunohost-config-others, yunohost-config-postfix
  , yunohost-config-dovecot, yunohost-config-slapd

debian/postinst

@@ -14,6 +14,25 @@ do_configure() {
       echo "Regenerating configuration, this might take a while..."
       yunohost service regen-conf --output-as none
 
+      echo "Patch Dnsmasq service"
+      DNSMASQ_PATCH=$(cat << 'EOF'
+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()
+EOF
+)
+
+      patch -N /etc/init.d/dnsmasq <<< "$DNSMASQ_PATCH" | true
+
       echo "Launching migrations.."
       yunohost tools migrations migrate --auto