dnsmasq: fix dbus.conf

Uses the upstream debian config as a basis, but copies it to prevent
changes to debian from breaking void.

srcpkgs/dnsmasq/files/dbus.conf

@@ -0,0 +1,18 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+	<policy user="root">
+		<allow own="uk.org.thekelleys.dnsmasq"/>
+		<allow send_destination="uk.org.thekelleys.dnsmasq"/>
+	</policy>
+        <policy user="dnsmasq">
+                <allow own="uk.org.thekelleys.dnsmasq"/>
+                <allow send_destination="uk.org.thekelleys.dnsmasq"/>
+        </policy>
+	<policy context="default">
+                <deny own="uk.org.thekelleys.dnsmasq"/>
+                <deny send_destination="uk.org.thekelleys.dnsmasq"/>
+        </policy>
+</busconfig>
+

srcpkgs/dnsmasq/patches/dbus.patch

@@ -1,11 +0,0 @@
---- dbus/dnsmasq.conf.orig	2019-11-15 12:36:44.303440024 +0100
-+++ dbus/dnsmasq.conf	2019-11-15 12:36:56.357452970 +0100
-@@ -2,7 +2,7 @@
-  "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
-  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
- <busconfig>
--	<policy user="root">
-+	<policy user="dnsmasq">
- 		<allow own="uk.org.thekelleys.dnsmasq"/>
- 		<allow send_destination="uk.org.thekelleys.dnsmasq"/>
- 	</policy>

srcpkgs/dnsmasq/template

@@ -1,7 +1,7 @@
 # Template file for 'dnsmasq'
 pkgname=dnsmasq
 version=2.80
-revision=5
+revision=6
 conf_files="/etc/dnsmasq.conf"
 hostmakedepends="pkg-config"
 makedepends="dbus-devel libcap-devel libidn2-devel $(vopt_if dnssec nettle-devel)"
@@ -30,5 +30,5 @@ do_install() {
 
 	vsv dnsmasq
 	vconf dnsmasq.conf.example dnsmasq.conf
-	vinstall dbus/dnsmasq.conf 644 etc/dbus-1/system.d
+	vinstall ${FILESDIR}/dbus.conf 644 etc/dbus-1/system.d
 }