gentoo resync : 01.10.2021

3 files changed, 110 insertions, 3 deletions

diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 61e966ec514c..6583618a7030 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -7,7 +7,9 @@ AUX dnscrypt-proxy.service 1198 BLAKE2B a457e57e2b91e6725fa3a515a2754fc7f39fc334
 AUX dnscrypt-proxy.socket 517 BLAKE2B 959f3c38af826607a297b04c7c3284bb97588c8a8ea88e4502bb464eb791a88f7940f2131701ef071187910302b7c564aee928f1862eb15640c448179a54f066 SHA512 1f3776e37a9583771997f270983bc9430adf089631a94e52cd5f9dba07228584ecc149f37cf51f08b2c7f877d3e9aa430f98cf8d996d0f4cf3545c2c9ac0537d
 DIST dnscrypt-proxy-2.0.45.tar.gz 2721610 BLAKE2B cddeafec2a2fa8179b722a1b4fe8527bcb3991f5d9e04e31667ea8c38deda5b8c9a3c3a3c16e4e2f5d1bfdb5f8d540c6d61273c34df27f4a78215736b240846f SHA512 becfe3c2d4567725e6b7e973647163e32dd2eaae361087bb05c90b6ddc3b0db0891c2725f6b5c255b8965990832bad53bd6ef137be54a342f46594f3633fe47a
 DIST dnscrypt-proxy-2.1.0.tar.gz 6248378 BLAKE2B 6b0db8eae8bd380634a86ee2026fb6a3f64d0874a77633f9b8ef46bd37601ebf8d9163516b5ccc371d5354023d5c5c542384718aa885dd1f99809a7b98df5de2 SHA512 201a2741f4703872901fa9c045323444d2939d662316e0026f7aa33c7136e45a564225106884ed80522be5247e128c70ced176c83333ddaacc66dc0f87c74029
+DIST dnscrypt-proxy-2.1.1.tar.gz 6114345 BLAKE2B 9d68d94d1fc142d53ed74840080feca56d7abf606b8df9b2ebea7a69b75f13cdc93be53418e6101d30d31d6f4130b3794c1029a5972e129a4c06feeff7dd81e7 SHA512 1118d79aad8d3e3629616c203194a5346f00fcfe88783ebddc6f167d22a82006f26022e728c57905aa82997b87b77f0841f7c1b60e0f8e5335f9df142b759c21
 EBUILD dnscrypt-proxy-2.0.45.ebuild 2832 BLAKE2B 1f4f1532670c887f22fd04cbaef47abcafc658d29a66ee2e662d030e1c9fad54c558d7ee4546af940fc72b7e4d7b0f22d7d71466899264726fdc8fca5a641d2f SHA512 ec71d789ef81d3dd5b90fa5b8dc436242525c6d95b2ebd12e6ae1a653da69a5bc403f19753566c992c205a94214caccf2ba8c6fc41b8e1a5e0d422f4d512b4db
 EBUILD dnscrypt-proxy-2.1.0.ebuild 2833 BLAKE2B 736cc68e0f8d7d98aa4d3a98dbcd64a56138b91921e8a899f5c3bf7622840ddfd2b5e9350c63576e337f54a4b5386385eb87058fa1cdfea3dcee652819acec1e SHA512 35bac5465c345aa6558d3882d73c053b08b920286ed86ac9417a927ad5cdaad130c32c5d12a74d19243f6bf7d344725631ce918e0ade59feac3812d6aa62af05
-EBUILD dnscrypt-proxy-9999.ebuild 2837 BLAKE2B ada23235d56488fdb8339b0ee00cc19f309f7dc15687baadf9e677c28d38c3498062a1c3cec607739228471f7ffc6ce293d495c989a99fdac3d9d9ae75bd3145 SHA512 7a8ecb736fd88a4fdafc58f3dcf5f32e4c1e8b91cb29029f5258ebb61b15ae222836d2a277820f8326c0639daed8aae5250fb562a695ab46b67d480f858926ea
+EBUILD dnscrypt-proxy-2.1.1.ebuild 2837 BLAKE2B 22085dcfbe06de07c55afd2bc405f5e7bf5325f941175db34331c42c75d589c0db9b8ee1bc8930e16c7667f9afcbc3c3f8d6eea912653d349ac4bedf5f68b991 SHA512 9c924e578eb2870ace30ad932ae050df222af11988b8dd518e49d7321d79d884252a8847909b84f12244a76869a28c83403a7a8d7030fe4ccb8f3ea3df35512b
+EBUILD dnscrypt-proxy-9999.ebuild 2837 BLAKE2B 22085dcfbe06de07c55afd2bc405f5e7bf5325f941175db34331c42c75d589c0db9b8ee1bc8930e16c7667f9afcbc3c3f8d6eea912653d349ac4bedf5f68b991 SHA512 9c924e578eb2870ace30ad932ae050df222af11988b8dd518e49d7321d79d884252a8847909b84f12244a76869a28c83403a7a8d7030fe4ccb8f3ea3df35512b
 MISC metadata.xml 619 BLAKE2B b8c10931edf8899ef018fc5f9605d3aad94ec2a48cce361ff04f2048d4e8cfd8de1ebff181fb968822e498d85178e3ed412726d3321f06a240eafbfc55b85b3b SHA512 268ab4c1a07bc15039c382586a575cecce6797bc452b635d7ebbd1806f789b8c154eb75164f58e8d9c87f0add8f99000c9dc75959328ad24f0f2c63bf6bd2f1d
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.1.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.1.ebuild
new file mode 100644
index 000000000000..3e4c51ce549e
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/DNSCrypt/${PN}"
+
+inherit fcaps go-module systemd
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+else
+	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
+HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy"
+
+LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="+pie"
+
+BDEPEND=">=dev-lang/go-1.13"
+RDEPEND="
+	acct-group/dnscrypt-proxy
+	acct-user/dnscrypt-proxy
+"
+
+FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.0-config-full-paths.patch"
+)
+
+src_compile() {
+	pushd "${PN}" >/dev/null || die
+	go build -v -x -mod=readonly -mod=vendor -buildmode="$(usex pie pie default)" || die
+	popd >/dev/null || die
+}
+
+src_test() {
+	cd "${PN}" || die
+	go test -mod=vendor -buildmode="$(usex pie pie default)" || die "Failed to run tests"
+}
+
+src_install() {
+	pushd "${PN}" >/dev/null || die
+
+	dobin dnscrypt-proxy
+
+	insinto /etc/dnscrypt-proxy
+	newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml
+	doins example-{allowed,blocked}-{ips.txt,names.txt}
+	doins example-{cloaking-rules.txt,forwarding-rules.txt}
+
+	popd >/dev/null || die
+
+	insinto /usr/share/dnscrypt-proxy
+	doins -r "utils/generate-domains-blocklist/."
+
+	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
+	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
+
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/dnscrypt-proxy.logrotate 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"
+		ewarn "please do one the following:"
+		ewarn "1) re-enable 'filecaps'"
+		ewarn "2) change port to > 1024"
+		ewarn "3) configure to run ${PN} as root (not recommended)"
+		ewarn
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "Using systemd socket activation may cause issues with speed"
+		elog "latency and reliability of ${PN} and is discouraged by upstream"
+		elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
+		elog "It is disabled by default for new installations"
+		elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
+		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/DNSCrypt/${PN}/wiki"
+}
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
index ef2293465894..3e4c51ce549e 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy"
 
 LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
 SLOT="0"
-IUSE="pie"
+IUSE="+pie"
 
 BDEPEND=">=dev-lang/go-1.13"
 RDEPEND="
@@ -31,7 +31,7 @@ RDEPEND="
 FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.0.45-config-full-paths.patch"
+	"${FILESDIR}/${PN}-2.1.0-config-full-paths.patch"
 )
 
 src_compile() {