From 70c17268a8b740448791bb6840f3eb79a64939c0 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 25 Oct 2020 12:44:50 +0000 Subject: [PATCH] dnsmasq: adapt to non-root ntpd Signed-off-by: Daniel Golle --- package/network/services/dnsmasq/Makefile | 3 ++- .../services/dnsmasq/files/dnsmasqsec_hotplug_acl.json | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 package/network/services/dnsmasq/files/dnsmasqsec_hotplug_acl.json 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" ] + } + } +} -- 2.30.2