gentoo resync : 28.04.2018

8 files changed, 53 insertions, 11 deletions

diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest
index 5072657bfab3..b81b6f25b843 100644
--- a/net-dns/getdns/Manifest
+++ b/net-dns/getdns/Manifest
@@ -1,5 +1,8 @@
-AUX stubby.confd 123 BLAKE2B f948e41ad6acbf19bda137fb26fc284651681b45ec7421160946c86c97089fb411cf3611853dbf9c92dfdde26814eab085cb971b552d5459ebe99828b4e4d278 SHA512 698cd718f3acf4a99399a57a7eb80e93ee50489eb1e31ffd485312b86307ece05775f4bbe9a49b3117f6a96f507e6314d9d47a7c23c828a5b231ab8e770e8bef
-AUX stubby.initd 462 BLAKE2B 0825fe3762256377c5ce6c66e982f67fee0edf9b685b51ae8538af0592966f26388776fe079aed31983a110c09b230b7dabada4949a105c83700c699fdd2c82c SHA512 26932bf845e02117bc41e907e0877b0231a9bde83cdea605f5b7a8ea514aea27a412d110e591ce794bd1574ce871a1d4b02847af4f1e58e249432007b7a769d0
+AUX stubby.confd-r1 546 BLAKE2B 2f81b79b290264701ee75029ee61e006e7f6e2425ebd8090e2f07d4aed4903b88e07576893f653a8704f5181b3fb67f51327e41fef909bc56f5022bf124a4183 SHA512 10793c0ab9081c083dd702b57ffd864aa5a6d76f678eeb704b577188c0a00536f39f2dbb960d8333564b99981a5e2d4414802ffa8506b7cb41fc517680e2b78c
+AUX stubby.initd-r1 636 BLAKE2B 1f8e96c0b844837af8d46f12c80750979be3e763bd7ac08b956f69a8fd4fd9cdf018cc666e1fc47a324ee3960e358489e01b8da6d7d09cae8dffe9cff1b38b90 SHA512 556c35dbcdc157668308e502895519e73fa723074bc8cb1d7cbfd762e0831a584be67a9204744dad17ff4ffaaf9b97b67ed60acfc6ef56e44e240c51d2f783b0
+AUX stubby.logrotate 76 BLAKE2B f68efa844df0a0b97bcfaa117fa74b0c314df18d4aefd9b934f9b9b9f9001a41ebaf148d266272529c594a79eb27c0b99ff9f30d4c519f91128d35b4ea87eb22 SHA512 c4f1de3789debd1d51a47499960b6f688bc594b4beb01062a55c5623a6ceb07d03705e4f411c9a0cc88442af223120b29c46a9dc72c600477d3e598f9c02c805
+AUX stubby.systemd 239 BLAKE2B b638a87ce4edfa3a36b1fe5bb4d91fef8aad40bf4bd4ee6d20d377cb2d868f65046521f3c4aada35827db87b67abfdff0ab203890bdb3f3a427e0a1c58bf7b4b SHA512 3c871cb10356b1291c08190ece8ad480bf6dc9bdfdfb079625a02ade0630e18bebdeaf88f4d1548bbabccf4bfe692c91896994297d2569d05a70e8dfe7d1b4fb
+AUX stubby.tmpfilesd 80 BLAKE2B c9afbd1e4b686b448e43a7ba4106351f9cb76c0ba5fe527463000e75090000c5d02cd78e16cc193061af274d53a696abc950019e6d0ec82fe9609b2ee5b006bc SHA512 c6bb320c02d62ecf8663d806318de8dc4a1cc401579a6a1b7ff5d7af8c9d24b8470d8bdecc2a9359ea40e6b3224f95909cb4decbfb9977e5a3ec8898535981fa
 DIST getdns-1.4.1.tar.gz 1055348 BLAKE2B 3b664e669327f5d866e6b40defb3ee4b62a09be228cac726478dbc6843b64aaf49faa328e1013700daf554c4df1144a8d56cca9d9405057d35b89b8ab7ae1f43 SHA512 b15da1c898d4bb4e5dcd93b47f481696dd456d8a841b02122c46035f3da27ca13b5513e7b6a00e943d1a5f5cec8c5ce1f13729d3ce0c887d8faa31d201864b27
-EBUILD getdns-1.4.1.ebuild 1686 BLAKE2B 2316987f39500375c89cfd921ff15c1a3cc22dd7e5adfc0f390f811f6cecb5802596dec4e3dc4097814f1982fe3d16bb6c2b02e0cefa6ac75392892009909cc5 SHA512 debe904e9ff32f60def169c92f224ace0dbc5a57f1751a78ee3cdc07194c6d81119acae0eb30808190bacbae0fc0819e3c354511cdee4938d6f55594b5b21be3
+EBUILD getdns-1.4.1-r2.ebuild 1902 BLAKE2B f3b7e70a08dffc4a43ff6a6bf9cbc5651541ccff6467021b99ac7fec3970b3a84bd5c53363ec09a4cbe7ca79e5a234f36520a0c88f04bc9de1bade997ec22970 SHA512 c1b5d9b1eace4bf52274b50bef2ccb47c404475e6963f64141306f67d697b79e997d1b1f9a261edd810fdce74828c944ddef8a9cdd66fe93efdabac406fa6602
 MISC metadata.xml 857 BLAKE2B 25a516aa2d67d8ce5961b8a99d71f355fb99f163ccbbeee29c7c505729ba76735b7d6977f5aa8cb60b328943c715a9dbb4652b4e3133009e220c1db0de9cf875 SHA512 33065cbe6ddfa2b0382d55a0441a819f2d4795cd458fe6b53d4da444b9542d49781d7dcf7b11615c46e3157bdc1deab89c765a24ee100c67687fb64cd2099bd1
diff --git a/net-dns/getdns/files/stubby.confd b/net-dns/getdns/files/stubby.confd
deleted file mode 100644
index b862ea4a40d7..000000000000
--- a/net-dns/getdns/files/stubby.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-# /etc/conf.d/stubby: config file for /etc/init.d/stubby
-
-# See stubby -h for possible options to put here.
-STUBBY_OPTS=""
diff --git a/net-dns/getdns/files/stubby.confd-r1 b/net-dns/getdns/files/stubby.confd-r1
new file mode 100644
index 000000000000..9c8d83f07f79
--- /dev/null
+++ b/net-dns/getdns/files/stubby.confd-r1
@@ -0,0 +1,16 @@
+# /etc/conf.d/stubby: config file for /etc/init.d/stubby
+
+# Enter here Stubby YAML configuration file to use.
+STUBBY_CONFIG_FILE="/etc/stubby/stubby.yml"
+
+# Set here Stubby log level to use.
+# Following log levels are available:
+#	0: EMERG  - System is unusable
+#	1: ALERT  - Action must be taken immediately
+#	2: CRIT   - Critical conditions
+#	3: ERROR  - Error conditions
+#	4: WARN   - Warning conditions
+#	5: NOTICE - Normal, but significant, condition
+#	6: INFO   - Informational message
+#	7: DEBUG  - Debug-level message
+STUBBY_LOGLEVEL="5"
diff --git a/net-dns/getdns/files/stubby.initd b/net-dns/getdns/files/stubby.initd-r1
index 170db9be07fe..e6b799919e28 100755
--- a/net-dns/getdns/files/stubby.initd
+++ b/net-dns/getdns/files/stubby.initd-r1
@@ -2,8 +2,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
 
+stubby_opts="-C ${STUBBY_CONFIG_FILE:-/etc/stubby/stubby.yml} -v ${STUBBY_LOGLEVEL:-5}"
 command="capsh"
-command_args="--inh=cap_net_bind_service --user=stubby -- -c '/usr/bin/stubby -g ${STUBBY_OPTS}'"
+command_args="--inh=cap_net_bind_service --user=stubby -- -c '/usr/bin/stubby -g ${stubby_opts} >>/var/log/stubby.log 2>&1'"
 pidfile="/var/run/stubby/stubby.pid"
 name="DNS Privacy Daemon"
 
@@ -18,4 +19,5 @@ depend()
 start_pre()
 {
 	checkpath -d -m 1755 -o stubby:stubby /var/run/stubby
+	checkpath -f -m 0644 -o stubby:stubby /var/log/stubby.log
 }
diff --git a/net-dns/getdns/files/stubby.logrotate b/net-dns/getdns/files/stubby.logrotate
new file mode 100644
index 000000000000..48058782594c
--- /dev/null
+++ b/net-dns/getdns/files/stubby.logrotate
@@ -0,0 +1,7 @@
+/var/log/stubby.log {
+	rotate 4
+	compress
+	size 200k
+	noolddir
+	missingok
+}
diff --git a/net-dns/getdns/files/stubby.systemd b/net-dns/getdns/files/stubby.systemd
new file mode 100644
index 000000000000..b85b8e90b036
--- /dev/null
+++ b/net-dns/getdns/files/stubby.systemd
@@ -0,0 +1,12 @@
+[Unit]
+Description=stubby DNS resolver
+
+[Service]
+WorkingDirectory=/run/stubby
+ExecStart=/usr/bin/stubby
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+User=stubby
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-dns/getdns/files/stubby.tmpfilesd b/net-dns/getdns/files/stubby.tmpfilesd
new file mode 100644
index 000000000000..bf70492743ad
--- /dev/null
+++ b/net-dns/getdns/files/stubby.tmpfilesd
@@ -0,0 +1,2 @@
+# tmpfiles.d (5) for use with stubby.service
+d /run/stubby 0750 root stubby - -
diff --git a/net-dns/getdns/getdns-1.4.1.ebuild b/net-dns/getdns/getdns-1.4.1-r2.ebuild
index 699abdbc82fa..bff5d734d08e 100644
--- a/net-dns/getdns/getdns-1.4.1.ebuild
+++ b/net-dns/getdns/getdns-1.4.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit user fcaps
+inherit user fcaps systemd
 
 DESCRIPTION="Modern asynchronous DNS API"
 HOMEPAGE="https://getdnsapi.net/"
@@ -50,8 +50,12 @@ src_configure() {
 src_install() {
 	default
 	if use stubby; then
-		newinitd "${FILESDIR}"/stubby.initd stubby
-		newconfd "${FILESDIR}"/stubby.confd stubby
+		newinitd "${FILESDIR}"/stubby.initd-r1 stubby
+		newconfd "${FILESDIR}"/stubby.confd-r1 stubby
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/stubby.logrotate stubby
+		systemd_newunit "${FILESDIR}"/stubby.systemd stubby.service
+		systemd_newtmpfilesd "${FILESDIR}"/stubby.tmpfilesd stubby.conf
 	fi
 }