gentoo resync : 08.01.2021

4 files changed, 218 insertions, 7 deletions

diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 10dcbc5ca9b0..96aff66e9f31 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,10 +1,13 @@
 AUX config-full-paths-r11.patch 3971 BLAKE2B f0d819a673bf50516331f305f46c90c89bc0a527f00b47db109ce567fa91121ea012ee820804a66bc5e70a53ba113a5eb2e394551beddf65200e0f2fe6b5fd6d SHA512 8fa35ff68c8b9cbc760bfd8e3f72b0e7ab4818b9d01f94ccfc91fc677281352641b219281632750b2c44ec1848d8a32b40e5e08d47ac94e0e4e87f1b23cdde1c
+AUX dnscrypt-proxy-2.0.45-config-full-paths.patch 4260 BLAKE2B 04eca789643722cef51198228ae7a35d75dc66bc1f882ccb5919330789105272bfd1d61e31ae2276fb6d94b05777096138f23026262c26436ae4ab2f2376e2ec SHA512 9e4991cecfd11b07d3a83fbe5c885a89e917ae92e335d261c96ed0b086bf04d051ff5179037999b91cd773e7d9f58f5f04aea85958e496c314694da37ff151ca
 AUX dnscrypt-proxy.confd 162 BLAKE2B 4547fc4a4ec00a809bac7b55bd7a7c8efb54e526179a7e2103fdf716711912987961969619e6b6e6b2e201253e90f828ffa5eb011c0870c112a028c4cfd89ce5 SHA512 25ccbc09df7b51bc0fa4587f7a715429ba11517c64db53086dd09df24470da71b81dbacebe227bd41d1f9576b4560dc58729969eb7b33aa233ec6a6a07d573ab
 AUX dnscrypt-proxy.initd 667 BLAKE2B fba1075bd738fc86b50f37bc25e3ef7f54416d5d85cf3e6d088be0707164007b1ff9c01ac2b0a583724f726cde41a96cd77c8beab11082dbc7b5c03a05c8cf95 SHA512 89677b8718c1a45a6d8b1a0501dc5c4ff8c02793181ac84316fe5488807726bc66b40849c2f91da817862997628b3456926f5efc6ede9c25bf3f5e6533fb88ee
 AUX dnscrypt-proxy.logrotate 105 BLAKE2B 892cc2acb621bb2c653f4545ac1c58777cc048b9a2f954eac7d92fdf6109b529884d20e4bc14af6aa6cde4d6e0dcac33347216de33e915f5d1ba850fda361602 SHA512 ef5f9886d7c49334e642fa6b0abd748fcff05e171493998559539f7f48f0241607d4923c7b30ed81b2bae1037ae28e49072170000a5b4cbeb6fb77e9dc3a6546
 AUX dnscrypt-proxy.service 1198 BLAKE2B a457e57e2b91e6725fa3a515a2754fc7f39fc3349602861eae8c8747e8cd811440df48f9029da514cd43a4d32a5f001ad6385354c754d0ea36c4a227a5c1f980 SHA512 11769c47ecd44169dd3aab26574a710c07e74f465417081b283f3f2f8b7f64ef77a24359555bc6b94144d38481661bac6087a7f79190bfb67c593e700b2202e5
 AUX dnscrypt-proxy.socket 517 BLAKE2B 959f3c38af826607a297b04c7c3284bb97588c8a8ea88e4502bb464eb791a88f7940f2131701ef071187910302b7c564aee928f1862eb15640c448179a54f066 SHA512 1f3776e37a9583771997f270983bc9430adf089631a94e52cd5f9dba07228584ecc149f37cf51f08b2c7f877d3e9aa430f98cf8d996d0f4cf3545c2c9ac0537d
 DIST dnscrypt-proxy-2.0.44.tar.gz 2279842 BLAKE2B 90f156914dd29ab5baa2eb02ed2992583999a6688d09a532f8c7c1ec6d285bd39893f66726da928f295056fd66cd756f4332f1ed21284ffa3d357ce355a08625 SHA512 009e2b669c1d6f6cd6b41f5e04d08735587f420dacdea8d422a3c12a62614c1ce1963deebca3af1f956070abd9ff5df9182cb27e31fa0fac8a95478739445801
+DIST dnscrypt-proxy-2.0.45.tar.gz 2721610 BLAKE2B cddeafec2a2fa8179b722a1b4fe8527bcb3991f5d9e04e31667ea8c38deda5b8c9a3c3a3c16e4e2f5d1bfdb5f8d540c6d61273c34df27f4a78215736b240846f SHA512 becfe3c2d4567725e6b7e973647163e32dd2eaae361087bb05c90b6ddc3b0db0891c2725f6b5c255b8965990832bad53bd6ef137be54a342f46594f3633fe47a
 EBUILD dnscrypt-proxy-2.0.44.ebuild 2842 BLAKE2B df98833edc111d3b2ee8304eddbf5ca002ee4f787ad09985f0b8e1f5edb5d2b27ef2f457aaa481198a8c42267e700892a7a910552a4ee7b333726a217768d755 SHA512 db0f3e0abb5cfbc76493c57ec29d6833c360f1a9a929ababc9a95e25c48ccd2a7ded9874177e14d1f078729d58ee23136122034644e6cbebc1485ff5df93b4f9
-EBUILD dnscrypt-proxy-9999.ebuild 2838 BLAKE2B e163d4d89bd9d66036ea6f454439a55f6b9bbf1fd859b0410c508880c063243a1b2e24f129ab94b06c79a0395d6bfa5705bd0e59169e66c15b6177f36652c3a4 SHA512 8e12277cf798a6aba9dd55ac8f35a9218a13b2ca4b06cf91e3255e6b09ef5be14209559f64574fb4454af455d152227ec7ce981bf4c3cad8fe1d045c99105af5
+EBUILD dnscrypt-proxy-2.0.45.ebuild 2861 BLAKE2B 330be9e73c0f3f1e252c4622d23ad5aa3b3d443033bdcedf2904834d89866035dd83171de451c8cb30617702ccb349bb6403b44c13b9dd919bf5c8b048fd687f SHA512 6271c007f6611b87afb9be9b57a89b817b32c2ff4e46788284a6c629f03306fc3fb59391b33780ceda8a0b068747b3f23eb8892f3f4b70b69a92c8ef323e3090
+EBUILD dnscrypt-proxy-9999.ebuild 2861 BLAKE2B 330be9e73c0f3f1e252c4622d23ad5aa3b3d443033bdcedf2904834d89866035dd83171de451c8cb30617702ccb349bb6403b44c13b9dd919bf5c8b048fd687f SHA512 6271c007f6611b87afb9be9b57a89b817b32c2ff4e46788284a6c629f03306fc3fb59391b33780ceda8a0b068747b3f23eb8892f3f4b70b69a92c8ef323e3090
 MISC metadata.xml 618 BLAKE2B 5289dcd30374f9bedf43f71df91f80ca017c12474e22bcab3f5cd763e80e65174503c7d02bc4313ed927b0cc28dd8531526ce1435f56a929e45ed9c87f5f634a SHA512 78edb67c2f21c0b00eeff5d70298b187b7a0ac41845c10e2524da0d3b3e5127958f62796d53ec79e1d4565d46d7dd8b94e42753451c75f81687bacd0be5d00d5
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.45.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.45.ebuild
new file mode 100644
index 000000000000..43359636f250
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.45.ebuild
@@ -0,0 +1,106 @@
+# 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.0.45-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
+	go-module_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 4f7ddaa4a1b8..43359636f250 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://${EGO_PN}.git"
 else
 	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
@@ -23,7 +23,6 @@ SLOT="0"
 IUSE="pie"
 
 BDEPEND=">=dev-lang/go-1.13"
-
 RDEPEND="
 	acct-group/dnscrypt-proxy
 	acct-user/dnscrypt-proxy
@@ -31,7 +30,9 @@ RDEPEND="
 
 FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
 
-PATCHES=( "${FILESDIR}"/config-full-paths-r11.patch )
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.45-config-full-paths.patch"
+)
 
 src_compile() {
 	pushd "${PN}" >/dev/null || die
@@ -51,13 +52,13 @@ src_install() {
 
 	insinto /etc/dnscrypt-proxy
 	newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml
-	doins example-{blacklist.txt,whitelist.txt}
+	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-blacklists/."
+	doins -r "utils/generate-domains-blocklist/."
 
 	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
 	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.0.45-config-full-paths.patch b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.0.45-config-full-paths.patch
new file mode 100644
index 000000000000..a871990deb9f
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.0.45-config-full-paths.patch
@@ -0,0 +1,101 @@
+--- a/dnscrypt-proxy/example-dnscrypt-proxy.toml
++++ b/dnscrypt-proxy/example-dnscrypt-proxy.toml
+@@ -157,7 +157,7 @@ keepalive = 30
+ ## This file is different from other log files, and will not be
+ ## automatically rotated by the application.
+ 
+-# log_file = 'dnscrypt-proxy.log'
++# log_file = '/var/log/dnscrypt-proxy/dnscrypt-proxy.log'
+ 
+ 
+ ## When using a log file, only keep logs from the most recent launch.
+@@ -438,7 +438,7 @@ cache_neg_max_ttl = 600
+   ## Path to the query log file (absolute, or relative to the same directory as the config file)
+   ## Can be set to /dev/stdout in order to log to the standard output.
+ 
+-  # file = 'query.log'
++  # file = '/var/log/dnscrypt-proxy/query.log'
+ 
+ 
+   ## Query log format (currently supported: tsv and ltsv)
+@@ -464,7 +464,7 @@ cache_neg_max_ttl = 600
+ 
+   ## Path to the query log file (absolute, or relative to the same directory as the config file)
+ 
+-  # file = 'nx.log'
++  # file = '/var/log/dnscrypt-proxy/nx.log'
+ 
+ 
+   ## Query log format (currently supported: tsv and ltsv)
+@@ -499,7 +499,7 @@ cache_neg_max_ttl = 600
+ 
+   ## Optional path to a file logging blocked queries
+ 
+-  # log_file = 'blocked-names.log'
++  # log_file = '/var/log/dnscrypt-proxy/blocked.log'
+ 
+ 
+   ## Optional log format: tsv or ltsv (default: tsv)
+@@ -527,7 +527,7 @@ cache_neg_max_ttl = 600
+ 
+   ## Optional path to a file logging blocked queries
+ 
+-  # log_file = 'blocked-ips.log'
++  # log_file = '/var/log/dnscrypt-proxy/ip-blocked.log'
+ 
+ 
+   ## Optional log format: tsv or ltsv (default: tsv)
+@@ -555,7 +555,7 @@ cache_neg_max_ttl = 600
+ 
+   ## Optional path to a file logging allowed queries
+ 
+-  # log_file = 'allowed-names.log'
++  # log_file = '/var/log/dnscrypt-proxy/allowed-names.log'
+ 
+ 
+   ## Optional log format: tsv or ltsv (default: tsv)
+@@ -583,7 +583,7 @@ cache_neg_max_ttl = 600
+ 
+   ## Optional path to a file logging allowed queries
+ 
+-  # log_file = 'allowed-ips.log'
++  # log_file = '/var/log/dnscrypt-proxy/allowed-ips.log'
+ 
+   ## Optional log format: tsv or ltsv (default: tsv)
+ 
+@@ -654,7 +654,7 @@ cache_neg_max_ttl = 600
+ 
+   [sources.'public-resolvers']
+   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/public-resolvers.md', 'https://download.dnscrypt.net/resolvers-list/v3/public-resolvers.md']
+-  cache_file = 'public-resolvers.md'
++  cache_file = '/var/cache/dnscrypt-proxy/public-resolvers.md'
+   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+   refresh_delay = 72
+   prefix = ''
+@@ -663,7 +663,7 @@ cache_neg_max_ttl = 600
+ 
+   [sources.'relays']
+   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/relays.md', 'https://download.dnscrypt.info/resolvers-list/v3/relays.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/relays.md', 'https://download.dnscrypt.net/resolvers-list/v3/relays.md']
+-  cache_file = 'relays.md'
++  cache_file = '/var/cache/dnscrypt-proxy/relays.md'
+   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+   refresh_delay = 72
+   prefix = ''
+@@ -673,7 +673,7 @@ cache_neg_max_ttl = 600
+   # [sources.quad9-resolvers]
+   # urls = ['https://www.quad9.net/quad9-resolvers.md']
+   # minisign_key = 'RWQBphd2+f6eiAqBsvDZEBXBGHQBJfeG6G+wJPPKxCZMoEQYpmoysKUN'
+-  # cache_file = 'quad9-resolvers.md'
++  # cache_file = '/var/cache/dnscrypt-proxy/quad9-resolvers.md'
+   # prefix = 'quad9-'
+ 
+   ## Another example source, with resolvers censoring some websites not appropriate for children
+@@ -681,7 +681,7 @@ cache_neg_max_ttl = 600
+ 
+   #  [sources.'parental-control']
+   #  urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/parental-control.md', 'https://download.dnscrypt.info/resolvers-list/v3/parental-control.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/parental-control.md', 'https://download.dnscrypt.net/resolvers-list/v3/parental-control.md']
+-  #  cache_file = 'parental-control.md'
++  #  cache_file = '/var/cache/dnscrypt-proxy/parental-control.md'
+   #  minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+ 
+