From: Daniel Golle <daniel@makrotopia.org>
Date: Sun, 25 Oct 2020 12:44:50 +0000 (+0000)
Subject: dnsmasq: adapt to non-root ntpd
X-Git-Tag: v21.02.0-rc1~1294
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=70c17268a8b740448791bb6840f3eb79a64939c0;p=openwrt%2Fopenwrt.git

dnsmasq: adapt to non-root ntpd

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile
index fe68378f48..57f6f0cef9 100644
--- a/package/network/services/dnsmasq/Makefile
+++ b/package/network/services/dnsmasq/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=dnsmasq
 PKG_UPSTREAM_VERSION:=2.82
 PKG_VERSION:=$(subst test,~~test,$(subst rc,~rc,$(PKG_UPSTREAM_VERSION)))
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).tar.xz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
@@ -180,6 +180,7 @@ define Package/dnsmasq/install
 	$(INSTALL_BIN) ./files/dhcp-script.sh $(1)/usr/lib/dnsmasq/dhcp-script.sh
 	$(INSTALL_DIR) $(1)/usr/share/acl.d
 	$(INSTALL_DATA) ./files/dnsmasq_acl.json $(1)/usr/share/acl.d/
+	$(INSTALL_DATA) ./files/dnsmasqsec_hotplug_acl.json $(1)/usr/share/acl.d/
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) ./files/50-dnsmasq-migrate-resolv-conf-auto.sh $(1)/etc/uci-defaults
 endef
diff --git a/package/network/services/dnsmasq/files/dnsmasqsec_hotplug_acl.json b/package/network/services/dnsmasq/files/dnsmasqsec_hotplug_acl.json
new file mode 100644
index 0000000000..a5eac3943d
--- /dev/null
+++ b/package/network/services/dnsmasq/files/dnsmasqsec_hotplug_acl.json
@@ -0,0 +1,8 @@
+{
+	"user": "ntpd",
+	"access": {
+		"service": {
+			"methods": [ "signal" ]
+		}
+	}
+}