commit:     5f03449abc4b0a2d16cfc0b9f3a5ddeddf0fe479
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 20 23:45:40 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 20 23:47:36 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f03449a

net-dns/dnscrypt-proxy: add 2.1.7

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-dns/dnscrypt-proxy/Manifest                    |   1 +
 ...oxy-9999.ebuild => dnscrypt-proxy-2.1.7.ebuild} |   4 +-
 net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild  |   4 +-
 .../dnscrypt-proxy-2.1.7-config-full-paths.patch   | 101 +++++++++++++++++++++
 4 files changed, 106 insertions(+), 4 deletions(-)

diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 33e4926cadf2..47c87a4e44c3 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1 +1,2 @@
 DIST dnscrypt-proxy-2.1.5.tar.gz 4065395 BLAKE2B 
f8984121776565342c1920832839a9cebe8660eaa5f380baf5db6530a137efefbe270f61f9967426f3bea44110bf66b50524d2b891ec285eef1ad7329b1e305c
 SHA512 
2c9a0e0896483b4453cb3779efd41205be8839e61e17b86701deb91e531676529a82b8859ae0975d121322ec8cc05bdd13a1324b8f56010692e1ac9f36a99d69
+DIST dnscrypt-proxy-2.1.7.tar.gz 4195998 BLAKE2B 
2b8e979a178301eb560d7f3be33755401a9fd1808dcd5919c9513a7f2f5513c4d12606af0b38dc6cabdf4f243d69df8a61f2af30071634251309721144521b1d
 SHA512 
53b100d5238186ae99add2a8aff4069e6491f9d687e63cc3e5648630626c86ff4f9d246789ae40490030b20584a3c82e1abce8a8ca685f18111a2bcfa0519c09

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild 
b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.7.ebuild
similarity index 96%
copy from net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
copy to net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.7.ebuild
index 74779702e9ac..91fc991e7cb3 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.7.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/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.7-config-full-paths.patch 
b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.7-config-full-paths.patch
new file mode 100644
index 000000000000..d668149783f1
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.7-config-full-paths.patch
@@ -0,0 +1,101 @@
+--- a/dnscrypt-proxy/example-dnscrypt-proxy.toml
++++ b/dnscrypt-proxy/example-dnscrypt-proxy.toml
+@@ -379,7 +379,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'
+ 
+ 
+ 
+@@ -395,7 +395,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
+ 
+@@ -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 = 
'@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/example-captive-portals.txt'
+ 
+ 
+ 
+@@ -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 = '@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/localhost.pem'
++# cert_key_file = '@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/localhost.pem'
+ 
+ 
+ 
+@@ -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']
+-    cache_file = 'public-resolvers.md'
++    cache_file = 
'@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/public-resolvers.md'
+     minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+     refresh_delay = 73
+     prefix = ''
+@@ -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']
+-    cache_file = 'relays.md'
++    cache_file = '@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/relays.md'
+     minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+     refresh_delay = 73
+     prefix = ''
+@@ -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']
+-  #   cache_file = 'odoh-servers.md'
++  #   cache_file = 
'@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/odoh-servers.md'
+   #   minisign_key = 
'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+   #   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']
+-  #   cache_file = 'odoh-relays.md'
++  #   cache_file = 
'@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/odoh-relays.md'
+   #   minisign_key = 
'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+   #   refresh_delay = 73
+   #   prefix = ''
+@@ -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 = 
'@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/quad9-resolvers.md'
+   #   prefix = 'quad9-'
+ 
+   ### Another example source, with resolvers censoring some websites not 
appropriate for children
+@@ -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']
+-  #   cache_file = '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-"
+ 

Reply via email to