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

This commit is contained in:
ljf 2018-06-26 01:59:59 +02:00
parent aa4f096436
commit 75a67e84b0
3 changed files with 21 additions and 0 deletions

6
debian/changelog vendored
View file

@ -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

12
debian/dnsmasq.patch vendored Normal file
View file

@ -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()

3
debian/postinst vendored
View file

@ -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