gentoo resync : 28.04.2018

13 files changed, 76 insertions, 33 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 0884c6c2b760..d898742a484f 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/dnsimple-dyndns/Manifest b/net-dns/dnsimple-dyndns/Manifest
index 9060186e6d3e..5c769a25dbfb 100644
--- a/net-dns/dnsimple-dyndns/Manifest
+++ b/net-dns/dnsimple-dyndns/Manifest
@@ -1,3 +1,3 @@
 DIST dnsimple-dyndns-0.1.tar.gz 4453 BLAKE2B 8d3a6280ff38d1e45477b3b1800c345cebb5653598a9b7d85bd0e4f14114a1b45097d9eb3997864334d180af842cb61d14a01d7cb33155c800004f20ddaefcad SHA512 1dc7cdb968cd9303b922f0537fb5e63e5f16ed86d53506b47311d11f554f8e8332b989206c4947be75a07d576c98f4766dc9350ffbb30a31fa3581ded8a2b64e
-EBUILD dnsimple-dyndns-0.1.ebuild 704 BLAKE2B 12065c1e392c406f3760f66222c5953f006262f28c5cfecbf4a911c83ec9c8133bf904c5fe28065ea88f07c57bc2041e8ad001263b749d5a61ae9512fcac8b49 SHA512 7363f86ffebce0ad14d5a14dcb9d2ac53d73dc05e8878432806b97cfca2889405ffc245a8b7c7f00dbc6ebae5c8835da6b8d71ec1948191f17bca2c9b114a60d
+EBUILD dnsimple-dyndns-0.1.ebuild 705 BLAKE2B 134e1dd43ef1285bb677cc761ab5bc6d5ea7cc5a69f1806166979b054cb0ba6f2fc7b4a24115cadc827eb2cbfc176ebf427213b0659e1fedd815b554b905d30a SHA512 c2c799b7d742d00881c99de0e32fd03c805c6b09fb9f59a1f6505460246fe370bfb9b35dc326ed17f513f8e5cbdbb17a8eb1adfff0a3d7bdb78cb011fc6986ff
 MISC metadata.xml 635 BLAKE2B 20e82d1b694bcba9bb882ed5d6b29071b271e2f0bcd9627290f0201a2bf697f3a93cbac2303aa0312fe99ea8e4bc947f3741b056cbfd6c5d63f22b0179b56e16 SHA512 9c654d8bc5e478794cab70653be29ea03a4df2b4f515e62974a9cb64d45f6db9b004b477b66d66ec1efbb1e425d85de88d7b1ab690d200d19a3957519e4f4df0
diff --git a/net-dns/dnsimple-dyndns/dnsimple-dyndns-0.1.ebuild b/net-dns/dnsimple-dyndns/dnsimple-dyndns-0.1.ebuild
index ce5bdf611c80..571f8e31b344 100644
--- a/net-dns/dnsimple-dyndns/dnsimple-dyndns-0.1.ebuild
+++ b/net-dns/dnsimple-dyndns/dnsimple-dyndns-0.1.ebuild
@@ -14,7 +14,7 @@ fi
 inherit distutils-r1 ${GIT_ECLASS}
 
 DESCRIPTION="Dynamic DNS implementation, that relies on DNSimple.com"
-HOMEPAGE="https://pypi.org/project/dnsimple-dyndns
+HOMEPAGE="https://pypi.org/project/dnsimple-dyndns/
 	https://github.com/rafaelmartins/dnsimple-dyndns"
 
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
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
 }
 
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index b989e30cf7c6..6ebc06e96f40 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -2,7 +2,7 @@ AUX knot-1.service 337 BLAKE2B a6645b2ab92612f3c6640f4e9601cefe087a519d8a40b222e
 AUX knot.init 861 BLAKE2B 30ffe287f4f83058407ceab00b2113dade3b60b38d76c86f156cc31c33cc4f2ec8cf7f22172823755b71385ca18cc1044605b5479c9de05284f911d500b5dc40 SHA512 e5faa96cbee618e9042bdfd0628f06c4bc4d23c7295521771e16f6eae715835a240799e8425317b03b1ea162966defb5d6b6592139cb1d9d61b47a24961ec9b9
 AUX knot.service 275 BLAKE2B c39b50630a84cb20d33a02ad82c0fc0c994b098766af0cd3e11b4ac6e2f6e6ebc38d6e5b99c358d5e771022fd6ad14fb7e04e95fd77ba677d10950e1fc52e9a9 SHA512 37c4700320a2781aa93ca92bc2634c3e080c87337b7d632d0e2fa23f6e2e8fa1985d1d8e2516fed02b612da4d340472d5f8d0ae37c5b323ac17bbd61ca243a86
 DIST knot-2.5.7.tar.xz 1084656 BLAKE2B c2d583625a19f6a61248b3b42cdf14f5bb2bdbafdb20be6b0813744095a4016a4be2eb5e2dfaff0628238c60153480175a86706db0b88569d76156f86ba33968 SHA512 96e375f556309bb89cea982dda169cef70c23d03c48282110e47a44849c1102cd37d98aa7650781b399f5d932b724b8a935f0b9e55e4920465ae7b74a0d1d55a
-DIST knot-2.6.5.tar.xz 1118084 BLAKE2B 941d90803e51c5af003fcdaaaa22ffede326492cf60836efc09a06e18740743cc9f806e4750934f6959ced88616f46fc5dbc6667099d53eb4a21fae524497c9c SHA512 ed0d1d30e6d8d802e669aac12c4fd0cec8e315eb0e2c05b722f49ada434c82b8caebf12568881e5fbba2f61a5027c44fbde42b543c9086ff2e9614caf42a6d12
+DIST knot-2.6.6.tar.xz 1120340 BLAKE2B 374d9b78f2ef2143d1221fced29184a52ee3773abd7cb08b6b48910f6ffc0f7c4f07c00d17d28344c93d71a709363bdf855d20587f87da622153c44d08d85fd8 SHA512 bd7a36decc74041f12971045cd69b8cc9e7ecce68f8d2b4cddc9b5f23ee96e8ed290d98fe9e6c441d6727ad4395bea615cbd9ec19cc641abce19ef8da6371972
 EBUILD knot-2.5.7.ebuild 1913 BLAKE2B df4f8dba2d9cf3b2a2905eee881bd57ec81d3086682c1791ea3c1a3a14df72997346873ff1f4bbaa08a70584123c260d27e4e436e76cf04840e379a58e3a143a SHA512 62e40fe7b3ddd94544cb1435f448ee3e9ed0175a1b68211ee0328c34163a52127d35fec146168a1846c4da44cca3098fe562828b8c62fef7238bfed3713596ed
-EBUILD knot-2.6.5.ebuild 1921 BLAKE2B bff2c62b91d762b3d06916e9d5a4569f09f6bdc0c0738afef5e5c0a6a7adcfd4c69a44066a0f3293aa76c2d1ef309151a63e8bdfd20e7f5e1542228a528a72a3 SHA512 5815ee23ff53f3a82dca8e113a667ff80371a6d8e57282d238a0b884bf3e5738d78bb633bc4f44b3aac513bbd3500c1f2f091f7a4f2829a6466c5800423b948f
+EBUILD knot-2.6.6.ebuild 1861 BLAKE2B 6aba8244d1e9af4a2da5e2d7ecd0cc2af6ddfdda408d4c57b210ad21478cc0b95f3e7b3dbba08e78d55a54769e90b99010f7230c392c4ffa19f01235150e667b SHA512 fc87b9e3a3561e7cb5b06ea59d38d9ef2dcdeab01fcbaddb0f89861e173ebbb9bfde6ab2c81e4bf2523cc1682f3386f1095a42ee6d010daa6a5dae5773c08c8a
 MISC metadata.xml 1539 BLAKE2B c07704f4bbf249b7953403a33c71d7565ef2219b019dbccdc15d9d459ff57f0aa200ed5ae9ab74b07e352d8dcd12f62f5d7bb392b064dbeedad3257ced653675 SHA512 8b39c687fb8b9fb4bf25e0baa8c851ffb4980c0028bf0f64a3c642146139429e292c6ca3fbd01b7bb311ecbbe7bf1df128885b53971b836f541fe97bedf6f056
diff --git a/net-dns/knot/knot-2.6.5.ebuild b/net-dns/knot/knot-2.6.6.ebuild
index 63edc2b56df8..2c624d4be58a 100644
--- a/net-dns/knot/knot-2.6.5.ebuild
+++ b/net-dns/knot/knot-2.6.6.ebuild
@@ -27,21 +27,21 @@ KNOT_MODULES=(
 IUSE="doc caps +fastparser idn libidn2 systemd +utils ${KNOT_MODULES[@]}"
 
 RDEPEND="
-	>=dev-db/lmdb-0.9.15
+	dev-db/lmdb
 	dev-libs/libedit
-	>=dev-libs/userspace-rcu-0.5.4
+	dev-libs/userspace-rcu
 	dev-python/lmdb
-	>=net-libs/gnutls-3.3:=
-	caps? ( >=sys-libs/libcap-ng-0.6.4 )
+	net-libs/gnutls
+	caps? ( sys-libs/libcap-ng )
 	dnstap? (
 		dev-libs/fstrm
 		dev-libs/protobuf-c
 	)
 	idn? (
 		!libidn2? ( net-dns/libidn )
-		libidn2? ( >=net-dns/libidn2-2.0.0 )
+		libidn2? ( net-dns/libidn2 )
 	)
-	systemd? ( >=sys-apps/systemd-229 )
+	systemd? ( sys-apps/systemd )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -52,21 +52,22 @@ S="${WORKDIR}/${P/_/-}"
 
 src_configure() {
 	local u
-	local my_conf=()
+	local my_conf=(
+		--with-storage="${EPREFIX}/var/lib/${PN}"
+		--with-rundir="${EPREFIX}/var/run/${PN}"
+		$(use_enable fastparser)
+		$(use_enable dnstap)
+		$(use_enable doc documentation)
+		$(use_enable utils utilities)
+		--enable-systemd=$(usex systemd)
+		$(use_with idn libidn)
+	)
+
 	for u in "${KNOT_MODULES[@]#+}"; do
-		my_conf+=("$(use_with $u module-$u)")
+		my_conf+=("$(use_with ${u} module-${u})")
 	done
 
-	econf \
-		--with-storage="${EPREFIX}/var/lib/${PN}" \
-		--with-rundir="${EPREFIX}/var/run/${PN}" \
-		$(use_enable fastparser) \
-		$(use_enable dnstap) \
-		$(use_enable doc documentation) \
-		$(use_enable utils utilities) \
-		--enable-systemd=$(usex systemd) \
-		$(use_with idn libidn) \
-		"${my_conf[@]}"
+	econf "${my_conf[@]}"
 }
 
 src_compile() {