diff --git a/srcpkgs/dnsmasq/files/dbus.conf b/srcpkgs/dnsmasq/files/dbus.conf new file mode 100644 index 00000000000..03c4eaf8143 --- /dev/null +++ b/srcpkgs/dnsmasq/files/dbus.conf @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + diff --git a/srcpkgs/dnsmasq/patches/dbus.patch b/srcpkgs/dnsmasq/patches/dbus.patch deleted file mode 100644 index e4b1d607091..00000000000 --- a/srcpkgs/dnsmasq/patches/dbus.patch +++ /dev/null @@ -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"> - -- -+ - - - diff --git a/srcpkgs/dnsmasq/template b/srcpkgs/dnsmasq/template index 121a58f92c8..946e9792655 100644 --- a/srcpkgs/dnsmasq/template +++ b/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 }