gentoo auto-resync : 12:08:2023 - 12:07:45

4 files changed, 205 insertions, 8 deletions

diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 90024603a186..e9b109b8e450 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,10 +1,13 @@
 AUX dnscrypt-proxy-2.1.2-config-full-paths.patch 4237 BLAKE2B 6d0e03cb89cd3b57835d4eab8bdb40e65b5382558ef5b65a00b77da22d821f7622988c799058b7874a91d3c5453bd18aebc1aba2e75cadee3eddd94c90cc8dd1 SHA512 64d7d88417bcb412752fb9ae02e85e45ebe88c97a5e6af6d682a2c2e1f58f27cefed9a7edc3d20241b523ba9a9cbbf3542ce20f02b807e6b7362012c858f882b
+AUX dnscrypt-proxy-2.1.5-config-full-paths.patch 4165 BLAKE2B 9a5fe072e5e53f846ca2ba643e05af3100239b98751b195f3a15d967695012cbed859b987d96c7dfb05aea02c7d3f8e80724c4b3247494092d2574063dcb55a4 SHA512 40ab15f91faf77dabcae9ad28694b7769e8533c9d81d307fd69740264154ffc7a52dde128ba2ed5281172707fc61385f0fbcd7aa7367957c5131a9a683ba209d
 AUX dnscrypt-proxy.confd 162 BLAKE2B 4547fc4a4ec00a809bac7b55bd7a7c8efb54e526179a7e2103fdf716711912987961969619e6b6e6b2e201253e90f828ffa5eb011c0870c112a028c4cfd89ce5 SHA512 25ccbc09df7b51bc0fa4587f7a715429ba11517c64db53086dd09df24470da71b81dbacebe227bd41d1f9576b4560dc58729969eb7b33aa233ec6a6a07d573ab
 AUX dnscrypt-proxy.initd 639 BLAKE2B a3d35908a5716ae8ce92a2eacbda99175578d631449a841608ad93f19ae3841ace7feef27c60c75911ea68bc7bd039b0e057bac7b7ba61762418e5a52ddc608f SHA512 f48ba140968a73160e11e137e6d1b3a03ccec96596a91fd2878a0d40b749d4cccca5d2db30fdfff1f75ce42a7a20ac5f8fdef7f282ba26bd1a875905c6751d2b
 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.1.4.tar.gz 6897787 BLAKE2B 655011c98e335e0f605c093e5b12156afc9be88f0e14882e11cfdca1affa6de29830344e7c3aa7a5013f90a322f824d54e2db4d37a69395d344e90b0160e442b SHA512 4540d11432c4f35244b79f66b8926f8a1025e09010d8d313f0cd0d62e3fafcbd12bd24e9956ddf9cd8c1ec8aae997b031ab08dae4ee220bf31f33227ec6c07ca
+DIST dnscrypt-proxy-2.1.5.tar.gz 4065395 BLAKE2B f8984121776565342c1920832839a9cebe8660eaa5f380baf5db6530a137efefbe270f61f9967426f3bea44110bf66b50524d2b891ec285eef1ad7329b1e305c SHA512 2c9a0e0896483b4453cb3779efd41205be8839e61e17b86701deb91e531676529a82b8859ae0975d121322ec8cc05bdd13a1324b8f56010692e1ac9f36a99d69
 EBUILD dnscrypt-proxy-2.1.4.ebuild 2825 BLAKE2B 73a7e105e9ae6e4a9875cf51fe11fac9533c5ad76a18c60a2eb650de1430ba21754a53ba011bd65c0afd581d1d505b94676c8a8e0193b3f7babd507b7ec79448 SHA512 24724212842a7ffa7dac8c256a495547ab138627a82ddd134c9409a3b934dcac11526aebae55159306eb1dfac25fb59adb5b54ff5f8ddbbfdc1f2292fb6f5a07
-EBUILD dnscrypt-proxy-9999.ebuild 2830 BLAKE2B 66fec012aecdbcedd365ec2fb2c19c1a557c9596fab5273edd7b95734bd86717fafb00f38cd7858183281584c1f10ccd63e468a5df69cbfd39bd8ca102e259c7 SHA512 691a6bee407a905ef438b288459fcdc32cdef8f6401b28d926bf20db9cad353988354491372852fe629e08e964bf4a52fb8d031306cfec39cf28aff3eeab4907
+EBUILD dnscrypt-proxy-2.1.5.ebuild 2755 BLAKE2B 952430974726608b5c3b603ea8f5790dc39583ab6d0d770b757a9a14351a646863c2d5c76cdf22d66e0a321fbda7ce9092e10d92a66bf76bc61db69f5e44686e SHA512 715fa0f491c92e0ff803fc595842f91a0da874c07336d3b85a873731589a8d720ecadaa49ee78a7c72b95a4f7bf2bc8489913ec2be759769fa7d594a8dbc9e1b
+EBUILD dnscrypt-proxy-9999.ebuild 2755 BLAKE2B 952430974726608b5c3b603ea8f5790dc39583ab6d0d770b757a9a14351a646863c2d5c76cdf22d66e0a321fbda7ce9092e10d92a66bf76bc61db69f5e44686e SHA512 715fa0f491c92e0ff803fc595842f91a0da874c07336d3b85a873731589a8d720ecadaa49ee78a7c72b95a4f7bf2bc8489913ec2be759769fa7d594a8dbc9e1b
 MISC metadata.xml 619 BLAKE2B b8c10931edf8899ef018fc5f9605d3aad94ec2a48cce361ff04f2048d4e8cfd8de1ebff181fb968822e498d85178e3ed412726d3321f06a240eafbfc55b85b3b SHA512 268ab4c1a07bc15039c382586a575cecce6797bc452b635d7ebbd1806f789b8c154eb75164f58e8d9c87f0add8f99000c9dc75959328ad24f0f2c63bf6bd2f1d
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.5.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.5.ebuild
new file mode 100644
index 000000000000..74779702e9ac
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.5.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps go-module prefix systemd
+
+DESCRIPTION="Flexible DNS proxy, with support for encrypted DNS protocols"
+HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/DNSCrypt/dnscrypt-proxy.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/DNSCrypt/dnscrypt-proxy/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
+SLOT="0"
+
+RDEPEND="
+	acct-group/dnscrypt-proxy
+	acct-user/dnscrypt-proxy
+"
+
+FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.5-config-full-paths.patch
+)
+
+src_compile() {
+	pushd "${PN}" >/dev/null || die
+	ego build -v -x -mod=readonly -mod=vendor
+	popd >/dev/null || die
+}
+
+src_test() {
+	cd "${PN}" || die
+	ego test -mod=vendor
+}
+
+src_install() {
+	pushd "${PN}" >/dev/null || die
+
+	dobin dnscrypt-proxy
+
+	eprefixify example-dnscrypt-proxy.toml
+	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 "${EROOT}/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 f80bcb78727b..74779702e9ac 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit fcaps go-module systemd
+inherit fcaps go-module prefix systemd
 
-DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
+DESCRIPTION="Flexible DNS proxy, with support for encrypted DNS protocols"
 HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy"
 
 if [[ ${PV} == 9999 ]]; then
@@ -18,7 +18,6 @@ fi
 
 LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
 SLOT="0"
-IUSE="+pie"
 
 RDEPEND="
 	acct-group/dnscrypt-proxy
@@ -28,18 +27,18 @@ RDEPEND="
 FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.2-config-full-paths.patch
+	"${FILESDIR}"/${PN}-2.1.5-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
+	ego build -v -x -mod=readonly -mod=vendor
 	popd >/dev/null || die
 }
 
 src_test() {
 	cd "${PN}" || die
-	go test -mod=vendor -buildmode="$(usex pie pie default)" || die "Failed to run tests"
+	ego test -mod=vendor
 }
 
 src_install() {
@@ -47,6 +46,7 @@ src_install() {
 
 	dobin dnscrypt-proxy
 
+	eprefixify example-dnscrypt-proxy.toml
 	insinto /etc/dnscrypt-proxy
 	newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml
 	doins example-{allowed,blocked}-{ips.txt,names.txt}
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.5-config-full-paths.patch b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.5-config-full-paths.patch
new file mode 100644
index 000000000000..31c927484d90
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.5-config-full-paths.patch
@@ -0,0 +1,92 @@
+--- a/dnscrypt-proxy/example-dnscrypt-proxy.toml
++++ b/dnscrypt-proxy/example-dnscrypt-proxy.toml
+@@ -372,7 +372,7 @@ reject_ttl = 10
+ 
+ ## See the `example-forwarding-rules.txt` file for an example
+ 
+-# forwarding_rules = 'forwarding-rules.txt'
++# forwarding_rules = '@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/forwarding-rules.txt'
+ 
+ 
+ 
+@@ -388,7 +388,7 @@ reject_ttl = 10
+ ##
+ ## See the `example-cloaking-rules.txt` file for an example
+ 
+-# cloaking_rules = 'cloaking-rules.txt'
++# cloaking_rules = '@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/cloaking-rules.txt'
+ 
+ ## TTL used when serving entries in cloaking-rules.txt
+ 
+@@ -442,7 +442,7 @@ cache_neg_max_ttl = 600
+ ## check for connectivity and captive portals, along with hard-coded
+ ## IP addresses to return.
+ 
+-# map_file = 'example-captive-portals.txt'
++# map_file = '@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/example-captive-portals.txt'
+ 
+ 
+ 
+@@ -474,8 +474,8 @@ cache_neg_max_ttl = 600
+ ## openssl req -x509 -nodes -newkey rsa:2048 -days 5000 -sha256 -keyout localhost.pem -out localhost.pem
+ ## See the documentation (wiki) for more information.
+ 
+-# cert_file = 'localhost.pem'
+-# cert_key_file = 'localhost.pem'
++# cert_file = '@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/localhost.pem'
++# cert_key_file = '@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/localhost.pem'
+ 
+ 
+ 
+@@ -706,7 +706,7 @@ format = 'tsv'
+ 
+   [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']
+-    cache_file = 'public-resolvers.md'
++    cache_file = '@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/public-resolvers.md'
+     minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+     refresh_delay = 72
+     prefix = ''
+@@ -715,7 +715,7 @@ format = 'tsv'
+ 
+   [sources.relays]
+     urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/relays.md', 'https://download.dnscrypt.info/resolvers-list/v3/relays.md']
+-    cache_file = 'relays.md'
++    cache_file = '@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/relays.md'
+     minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+     refresh_delay = 72
+     prefix = ''
+@@ -724,13 +724,13 @@ format = 'tsv'
+ 
+   # [sources.odoh-servers]
+   #   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/odoh-servers.md', 'https://download.dnscrypt.info/resolvers-list/v3/odoh-servers.md']
+-  #   cache_file = 'odoh-servers.md'
++  #   cache_file = '@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/odoh-servers.md'
+   #   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+   #   refresh_delay = 24
+   #   prefix = ''
+   # [sources.odoh-relays]
+   #   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/odoh-relays.md', 'https://download.dnscrypt.info/resolvers-list/v3/odoh-relays.md']
+-  #   cache_file = 'odoh-relays.md'
++  #   cache_file = '@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/odoh-relays.md'
+   #   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+   #   refresh_delay = 24
+   #   prefix = ''
+@@ -740,7 +740,7 @@ format = 'tsv'
+   # [sources.quad9-resolvers]
+   #   urls = ['https://www.quad9.net/quad9-resolvers.md']
+   #   minisign_key = 'RWQBphd2+f6eiAqBsvDZEBXBGHQBJfeG6G+wJPPKxCZMoEQYpmoysKUN'
+-  #   cache_file = 'quad9-resolvers.md'
++  #   cache_file = '@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/quad9-resolvers.md'
+   #   prefix = 'quad9-'
+ 
+   ### Another example source, with resolvers censoring some websites not appropriate for children
+@@ -748,7 +748,7 @@ format = 'tsv'
+ 
+   # [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']
+-  #   cache_file = 'parental-control.md'
++  #   cache_file = '@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/parental-control.md'
+   #   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+ 
+