aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2020-10-25 12:44:50 +0000
committerDaniel Golle <daniel@makrotopia.org>2020-10-25 13:01:35 +0000
commit70c17268a8b740448791bb6840f3eb79a64939c0 (patch)
tree36b2738c67a53e8972c445a0da2d25878faf4bc2 /package/network/services
parent2d34355e16b442fcf51e93786401716dae3c4ea2 (diff)
downloadupstream-70c17268a8b740448791bb6840f3eb79a64939c0.tar.gz
upstream-70c17268a8b740448791bb6840f3eb79a64939c0.tar.bz2
upstream-70c17268a8b740448791bb6840f3eb79a64939c0.zip
dnsmasq: adapt to non-root ntpd
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'package/network/services')
-rw-r--r--package/network/services/dnsmasq/Makefile3
-rw-r--r--package/network/services/dnsmasq/files/dnsmasqsec_hotplug_acl.json8
2 files changed, 10 insertions, 1 deletions
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" ]
+ }
+ }
+}