gentoo resync : 02.03.2018

2 files changed, 90 insertions, 0 deletions

diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 5fb3af60ed7e..972eb0bd024c 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -9,6 +9,8 @@ AUX dnscrypt-proxy.service-r2 581 BLAKE2B 1d873041005135b5ca01aa2b24f373056a4281
 AUX dnscrypt-proxy.socket-r1 152 BLAKE2B e4eb7875f749646f77675b39c7c74f57d5674d825329891b0f128e190ac3625d28f81df8004975828080c6eb9665a8c0825826b5ccf305694c03c2e196da3dd7 SHA512 920014c202344726e645f3bfa5def0f194c215cc0ce6e45750e82cee3434399497b9ad3fb5268afb1823689ced0fa8d177d6411b3153661b97fbd55984752a87
 DIST dnscrypt-proxy-1.9.5.tar.bz2 1290573 BLAKE2B 8f16fdb58012e00a8b58d36364377c3bc25158b9484a8df2bd6bc98d1c9cbf5ac758997e31f95ecaeb9da2f6b7272316c5a4a1c069a39549fbc1c1b136857da0 SHA512 84c0f7587521b3a198292cf20dd71cb592ccf8a9e003abbc62c5ca112f6c5ed27c49b1642cf91f403d52b4147e25f24af540b65cecfcf93814338329097df836
 DIST dnscrypt-proxy-2.0.0.tar.gz 725490 BLAKE2B d4c116f81d304b9b3a883ba6b414e2fef810f50ecea9a9175246d02f2755c3e11c9940fed0dfc221e419820e001abc74e4bf4478abb2222b548461ad09f3f57d SHA512 c87420c09fc45496901b0c21ae972283f05c508b07249450de504ba5e287128c2c5e0f772b181ddb2f6478cb6d66e72617e3b0679f47f3b15dde80c92d2ef7ba
+DIST dnscrypt-proxy-2.0.4.tar.gz 727969 BLAKE2B 80f29fbc150f8731dce0ab0af8f4282264b19fade73846f972bd0e762bfe4ebd1a0f014fb6fad860623377c833c099f1d50d8ab7ccd8cecb7e210a422d96ea99 SHA512 ba8f419c85b3ccd0bdd930404c3781f1cadf58dcacb30bf35c3be0933887a6dc910496424cb3847ef2630b8205794cef03d980ac82605faca38c6bfd58b213be
 EBUILD dnscrypt-proxy-1.9.5-r1.ebuild 1817 BLAKE2B bb0c48cadf271b942beeaee69c49dbb2582c41f86176b84c6e929ad5dd5b55deacfa03d15143b2180d05ab03913a93702315712afc73bbbea53b152e43ab30f8 SHA512 87a35841daf4da9b666bae888f9b73fa7205f9e7054afe5bdc47d1112525e2eb1237416fa7702c38bc63ce0878fc61d752f6851af1cc07a0f9b5a3591b8f0704
 EBUILD dnscrypt-proxy-2.0.0.ebuild 2443 BLAKE2B feac451a5a8d24cb959a2d354b5cf2176cb34bc8c4ceaf89b060aa693a541fc281f81873018fad3b87fd5a321fdaa5b59d4874ce5b338482fad05d6b925b5cb9 SHA512 9a3d7f347be49204bd2893be27a7ceb558a469b8dd941543a4891b1e70bdbf268fa504cac2e74fa17e61c092b0c1f13a40ee292a5f4c4132d2cec9dcf39baeda
+EBUILD dnscrypt-proxy-2.0.4.ebuild 2443 BLAKE2B feac451a5a8d24cb959a2d354b5cf2176cb34bc8c4ceaf89b060aa693a541fc281f81873018fad3b87fd5a321fdaa5b59d4874ce5b338482fad05d6b925b5cb9 SHA512 9a3d7f347be49204bd2893be27a7ceb558a469b8dd941543a4891b1e70bdbf268fa504cac2e74fa17e61c092b0c1f13a40ee292a5f4c4132d2cec9dcf39baeda
 MISC metadata.xml 967 BLAKE2B f423ce552f42f2f3cdcbe71a711104c34eb90b7cf75b6d60b324b1ce239cc34d13845971b9808b9ad19e3bd76c89d1bb3b2a5c3d53d33afafff7fa7009a01427 SHA512 7c2bab8a27a9bc8d8401867a2ec6e84928cf7520422604282e88db4dcba4003d675a457ce0225f67f7385baede7953b2d531b2ab68d7e6b016f1e7c5e0e5fdfd
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.4.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.4.ebuild
new file mode 100644
index 000000000000..5e497f135323
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/jedisct1/${PN}"
+
+inherit fcaps golang-build systemd user
+
+DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
+HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+PATCHES=( "${FILESDIR}"/config-full-paths-r2.patch )
+
+pkg_setup() {
+	enewgroup dnscrypt
+	enewuser dnscrypt -1 -1 /var/empty dnscrypt
+}
+
+src_compile() {
+	# Create directory structure suitable for building
+	mkdir -p "src/${EGO_PN%/*}" || die
+	mv "${PN}" "src/${EGO_PN}" || die
+	mv "vendor" "src/" || die
+	golang-build_src_compile
+}
+
+src_install() {
+	dobin dnscrypt-proxy
+
+	insinto /etc/dnscrypt-proxy
+	newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
+	doins "src/${EGO_PN}"/example-{blacklist.txt,cloaking-rules.txt,forwarding-rules.txt}
+
+	insinto "/usr/share/dnscrypt-proxy"
+	doins -r "utils/generate-domains-blacklists/."
+
+	newinitd "${FILESDIR}"/dnscrypt-proxy.initd-r2 dnscrypt-proxy
+	newconfd "${FILESDIR}"/dnscrypt-proxy.confd-r2 dnscrypt-proxy
+	systemd_newunit "${FILESDIR}"/${PN}.service-r2 dnscrypt-proxy.service
+	systemd_dounit systemd/dnscrypt-proxy.socket
+
+	keepdir /var/log/dnscrypt-proxy
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if ! use filecaps; then
+		ewarn "'filecaps' USE flag is disabled"
+		ewarn "${PN} will fail to listen on port 53 if started via OpenRC"
+		ewarn "please either change port to > 1024, configure to run ${PN} as root"
+		ewarn "or re-enable 'filecaps'"
+		ewarn
+	fi
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if [[ ${v} == 1.* ]] ; then
+			elog "Version 2.x.x is a complete rewrite of ${PN}"
+			elog "please clean up old config/log files"
+			elog
+		fi
+	done
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "To use systemd socket activation with ${PN} you must"
+		elog "set listen_addresses setting to \"[]\" in the config file"
+		elog "Edit ${PN}.socket if you need to change port and address"
+		elog
+	fi
+
+	elog "After starting the service you will need to update your"
+	elog "/etc/resolv.conf and replace your current set of resolvers"
+	elog "with:"
+	elog
+	elog "nameserver 127.0.0.1"
+	elog
+	elog "Also see https://github.com/jedisct1/${PN}/wiki"
+}