gentoo auto-resync : 21:01:2025 - 06:42:16

4 files changed, 53 insertions, 44 deletions

diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index f62280047b12..5e3f2b14f271 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,13 +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-2.1.7-config-full-paths.patch 4624 BLAKE2B cc98d423e5b99bb5426da1c384e84a438ecd1a9ffea809737d96794ed84ce14582d0540ea37b76ea8ceef2441520b978ac8e6636f40560b9706cb43c080ab79e SHA512 5cd603c4ff8564e804df6c0acdbe8554c6149c6d087fd7a27f8d69e0e8789c333f0230fe54f1c7fe50c18a0609d7f6cf9907c75a5ea10e9c535306515c2cbc58
 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
+DIST dnscrypt-proxy-2.1.7.tar.gz 4195998 BLAKE2B 2b8e979a178301eb560d7f3be33755401a9fd1808dcd5919c9513a7f2f5513c4d12606af0b38dc6cabdf4f243d69df8a61f2af30071634251309721144521b1d SHA512 53b100d5238186ae99add2a8aff4069e6491f9d687e63cc3e5648630626c86ff4f9d246789ae40490030b20584a3c82e1abce8a8ca685f18111a2bcfa0519c09
 EBUILD dnscrypt-proxy-2.1.5.ebuild 2750 BLAKE2B 72bf04dac40c677017a5fa6abac7e2e9055fad876d315ab0710aee5dc39017506a9f052ca77a3c83943a945b522449e32a428f1d4fc1ec02887c4af9aa850bec SHA512 a8f898baad7bd7f2b418fa451b7239252e50bdb01c467547c910c21df473bede2811385537fbe688ea0b8d9a23ee7071b678009502c7e458c94a79da4e4cfdf9
-EBUILD dnscrypt-proxy-9999.ebuild 2755 BLAKE2B 952430974726608b5c3b603ea8f5790dc39583ab6d0d770b757a9a14351a646863c2d5c76cdf22d66e0a321fbda7ce9092e10d92a66bf76bc61db69f5e44686e SHA512 715fa0f491c92e0ff803fc595842f91a0da874c07336d3b85a873731589a8d720ecadaa49ee78a7c72b95a4f7bf2bc8489913ec2be759769fa7d594a8dbc9e1b
+EBUILD dnscrypt-proxy-2.1.7.ebuild 2755 BLAKE2B ffe8a29315f4d175fb31d745aec6b0c848ddd0781aa857782a22d3398dd2958378162669c441c394e828e9222f861acd19312dd2504bedeea3d140c352fa8407 SHA512 97317e8dd67144967bcf9a28e06199cca561592d9006e39838b60236c9dadac5abb31175de1c795029d9dae0d0bbe1d83ded6fd2ea0daa4e25a77bdd95a8f247
+EBUILD dnscrypt-proxy-9999.ebuild 2755 BLAKE2B ffe8a29315f4d175fb31d745aec6b0c848ddd0781aa857782a22d3398dd2958378162669c441c394e828e9222f861acd19312dd2504bedeea3d140c352fa8407 SHA512 97317e8dd67144967bcf9a28e06199cca561592d9006e39838b60236c9dadac5abb31175de1c795029d9dae0d0bbe1d83ded6fd2ea0daa4e25a77bdd95a8f247
 MISC metadata.xml 619 BLAKE2B b8c10931edf8899ef018fc5f9605d3aad94ec2a48cce361ff04f2048d4e8cfd8de1ebff181fb968822e498d85178e3ed412726d3321f06a240eafbfc55b85b3b SHA512 268ab4c1a07bc15039c382586a575cecce6797bc452b635d7ebbd1806f789b8c154eb75164f58e8d9c87f0add8f99000c9dc75959328ad24f0f2c63bf6bd2f1d
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.4.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.7.ebuild
index 76ec52a2adbe..91fc991e7cb3 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.4.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.7.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 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
@@ -13,12 +13,11 @@ if [[ ${PV} == 9999 ]]; then
 	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"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 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.7-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/dnscrypt-proxy-9999.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
index 74779702e9ac..91fc991e7cb3 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-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,7 +27,7 @@ RDEPEND="
 FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.5-config-full-paths.patch
+	"${FILESDIR}"/${PN}-2.1.7-config-full-paths.patch
 )
 
 src_compile() {
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.2-config-full-paths.patch b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.7-config-full-paths.patch
index c5d7ed53f5f5..d668149783f1 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.2-config-full-paths.patch
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.7-config-full-paths.patch
@@ -1,92 +1,101 @@
 --- a/dnscrypt-proxy/example-dnscrypt-proxy.toml
 +++ b/dnscrypt-proxy/example-dnscrypt-proxy.toml
-@@ -348,7 +348,7 @@ reject_ttl = 10
+@@ -379,7 +379,7 @@ reject_ttl = 10
  
  ## See the `example-forwarding-rules.txt` file for an example
  
 -# forwarding_rules = 'forwarding-rules.txt'
-+# forwarding_rules = '/etc/dnscrypt-proxy/forwarding-rules.txt'
++# forwarding_rules = '@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/forwarding-rules.txt'
  
  
  
-@@ -364,7 +364,7 @@ reject_ttl = 10
+@@ -395,7 +395,7 @@ reject_ttl = 10
  ##
  ## See the `example-cloaking-rules.txt` file for an example
  
 -# cloaking_rules = 'cloaking-rules.txt'
-+# cloaking_rules = '/etc/dnscrypt-proxy/cloaking-rules.txt'
++# cloaking_rules = '@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/cloaking-rules.txt'
  
  ## TTL used when serving entries in cloaking-rules.txt
  
-@@ -418,7 +418,7 @@ cache_neg_max_ttl = 600
+@@ -449,7 +449,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 = '/etc/dnscrypt-proxy/example-captive-portals.txt'
++# map_file = '@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/example-captive-portals.txt'
  
  
  
-@@ -448,8 +448,8 @@ cache_neg_max_ttl = 600
- ## Certificate file and key - Note that the certificate has to be trusted.
+@@ -481,8 +481,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 = '/etc/dnscrypt-proxy/localhost.pem'
-+# cert_key_file = '/etc/dnscrypt-proxy/localhost.pem'
++# cert_file = '@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/localhost.pem'
++# cert_key_file = '@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/localhost.pem'
  
  
  
-@@ -680,7 +680,7 @@ format = 'tsv'
+@@ -713,7 +713,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', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/public-resolvers.md']
+     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 = '/var/cache/dnscrypt-proxy/public-resolvers.md'
++    cache_file = '@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/public-resolvers.md'
      minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
-     refresh_delay = 72
+     refresh_delay = 73
      prefix = ''
-@@ -689,7 +689,7 @@ format = 'tsv'
+@@ -722,7 +722,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', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/relays.md']
+     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 = '/var/cache/dnscrypt-proxy/relays.md'
++    cache_file = '@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/relays.md'
      minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
-     refresh_delay = 72
+     refresh_delay = 73
      prefix = ''
-@@ -698,13 +698,13 @@ format = 'tsv'
+@@ -731,13 +731,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', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/odoh-servers.md']
+   #   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 = '/var/cache/dnscrypt-proxy/odoh-servers.md'
++  #   cache_file = '@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/odoh-servers.md'
    #   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
-   #   refresh_delay = 24
+   #   refresh_delay = 73
    #   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', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/odoh-relays.md']
+   #   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 = '/var/cache/dnscrypt-proxy/odoh-relays.md'
++  #   cache_file = '@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/odoh-relays.md'
    #   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
-   #   refresh_delay = 24
+   #   refresh_delay = 73
    #   prefix = ''
-@@ -714,7 +714,7 @@ format = 'tsv'
+@@ -747,7 +747,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 = '/var/cache/dnscrypt-proxy/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
-@@ -722,7 +722,7 @@ format = 'tsv'
+@@ -755,7 +755,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', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/parental-control.md']
+   #   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 = '/var/cache/dnscrypt-proxy/parental-control.md'
++  #   cache_file = '@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/parental-control.md'
    #   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
  
+   ### dnscry.pt servers - See https://www.dnscry.pt
+@@ -763,7 +763,7 @@ format = 'tsv'
+   #  [sources.dnscry-pt-resolvers]
+   #    urls = ["https://www.dnscry.pt/resolvers.md"]
+   #    minisign_key = "RWQM31Nwkqh01x88SvrBL8djp1NH56Rb4mKLHz16K7qsXgEomnDv6ziQ"
+-  #    cache_file = "dnscry.pt-resolvers.md"
++  #    cache_file = "@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/dnscry.pt-resolvers.md"
+   #    refresh_delay = 73
+   #    prefix = "dnscry.pt-"