From: Quentin Retornaz <gentoo@retornaz.com>
Date: Wed, 20 Jun 2018 15:00:34 +0000 (+0200)
Subject: net-dns/getdns: fix upstream systemd unit to match ebuild configuration #656988
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=cecd6be7b3c948d81dd4c97cfba092acfbd0a366;p=gentoo.git

net-dns/getdns: fix upstream systemd unit to match ebuild configuration #656988

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
---

diff --git a/net-dns/getdns/files/getdns-1.4.2-stubby.service.patch b/net-dns/getdns/files/getdns-1.4.2-stubby.service.patch
new file mode 100644
index 000000000000..2bb7546fcfa5
--- /dev/null
+++ b/net-dns/getdns/files/getdns-1.4.2-stubby.service.patch
@@ -0,0 +1,16 @@
+diff -ur a/stubby/systemd/stubby.service b/stubby/systemd/stubby.service
+--- a/stubby/systemd/stubby.service	2018-05-11 13:25:22.000000000 +0200
++++ b/stubby/systemd/stubby.service	2018-06-20 15:40:23.650164668 +0200
+@@ -3,9 +3,11 @@
+ 
+ [Service]
+ User=stubby
+-DynamicUser=yes
++DynamicUser=no
+ CacheDirectory=stubby
+ WorkingDirectory=/var/cache/stubby
++ExecStartPre=/bin/mkdir -p /var/cache/stubby
++ExecStartPre=/bin/chown stubby:stubby /var/cache/stubby
+ ExecStart=/usr/bin/stubby
+ AmbientCapabilities=CAP_NET_BIND_SERVICE
+ CapabilityBoundingSet=CAP_NET_BIND_SERVICE
diff --git a/net-dns/getdns/getdns-1.4.2.ebuild b/net-dns/getdns/getdns-1.4.2-r1.ebuild
similarity index 96%
rename from net-dns/getdns/getdns-1.4.2.ebuild
rename to net-dns/getdns/getdns-1.4.2-r1.ebuild
index de86ca0dce7a..28d7a6c9c3c9 100644
--- a/net-dns/getdns/getdns-1.4.2.ebuild
+++ b/net-dns/getdns/getdns-1.4.2-r1.ebuild
@@ -30,6 +30,8 @@ RDEPEND="
 	stubby? ( sys-libs/libcap:= )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-1.4.2-stubby.service.patch" )
+
 src_configure() {
 	econf \
 		--runstatedir=/var/run \