community/dnscrypt-proxy: upgrade to 2.0.42

2 files changed, 52 insertions, 28 deletions

diff --git a/community/dnscrypt-proxy/APKBUILD b/community/dnscrypt-proxy/APKBUILD
index cb2f97cee2..6438546e5b 100644
--- a/community/dnscrypt-proxy/APKBUILD
+++ b/community/dnscrypt-proxy/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Ian Bashford <ianbashford@gmail.com>
 # Maintainer: Ian Bashford <ianbashford@gmail.com>
 pkgname=dnscrypt-proxy
-pkgver=2.0.41
+pkgver=2.0.42
 pkgrel=0
 pkgdesc="Tool for securing communications between a client and a DNS resolver"
 url="https://dnscrypt.info"
@@ -52,8 +52,8 @@ setup() {
 	install -m755 -D "$srcdir"/$pkgname.setup "$subpkgdir"/usr/sbin/setup-dnscrypt
 }
 
-sha512sums="26be163daa03633f2d76f1121fb1987e0155613bd84cbb2aad2ba0eedbd35ec0b393d1c1a0aaba47968b3a08bd0273ad929a164695ce35d2ebe05ce3b5f5dfd1  dnscrypt-proxy-2.0.41.tar.gz
+sha512sums="093b07ee8eb44c1264e6ea4b60ad32e0221b1b02c1d61f142b1fbf37dc5181533cc3c5d6e7468d0f7488611de4620947684269da9f08f21da0aa501ba70be711  dnscrypt-proxy-2.0.42.tar.gz
 e0a72d39d47dc24b889d08beedbd9fdf21615f42fbab79980debdfd2c3feaa83dc3f776351f7dd13533cc85905ce4e01812e4ff8a80a9ccc0b21e9db7d6cb232  dnscrypt-proxy.initd
 c001ae39da1b2db71764cab568f9ed18e4de0cea3d1a4e7bd6dd01a5668b81a888ea9eef99de6beac08857ad7f8eb1a32d730e946ac3563e4dcfa27147e35052  dnscrypt-proxy.confd
 66dd43d84117a0151ae41f34d82b716760382a5a491424bf6418228ffd21f0dfbc88e34cc5074e11f97f006335d97b85367bb9ab1d96747a48e893c022ad52d0  dnscrypt-proxy.setup
-e09e4a8a67db94a98790ac3025cf12c28a4c765d14d03e04f493b94d38adec8d67d717e7ab80e783147a302b97ec9131e4c475e6c983561ef7cad0d10107de0a  config-full-paths.patch"
+cdcfd90e33b8efca6b967f485af529cbd1a6866cdbf83c2dbf7c8056accc115af23722101136a6dfa42c179c2343d1f1c0f34d06f8bec56fc2e2ed0b4d8efc85  config-full-paths.patch"
diff --git a/community/dnscrypt-proxy/config-full-paths.patch b/community/dnscrypt-proxy/config-full-paths.patch
index b5c0d773bb..6f8e3c3431 100644
--- a/community/dnscrypt-proxy/config-full-paths.patch
+++ b/community/dnscrypt-proxy/config-full-paths.patch
@@ -27,10 +27,12 @@ index 0000000..6f4282a
 +## Servers from the "public-resolvers" source (see down below) can
 +## be viewed here: https://dnscrypt.info/public-servers
 +##
-+## If this line is commented, all registered servers matching the require_* filters
-+## will be used.
++## The proxy will automatically pick working servers from this list.
++## Note that the require_* filters do NOT apply when using this setting.
++##
++## By default, this list is empty and all registered servers matching the
++## require_* filters will be used instead.
 +##
-+## The proxy will automatically pick the fastest, working servers from the list.
 +## Remove the leading # first to enable this; lines starting with # are ignored.
 +
 +# server_names = ['scaleway-fr', 'google', 'yandex', 'cloudflare']
@@ -198,12 +200,12 @@ index 0000000..6f4282a
 +## They will never be used if lists have already been cached, and if stamps
 +## don't include host names without IP addresses.
 +## They will not be used if the configured system DNS works.
-+## Resolver supporting DNSSEC are recommended.
++## Resolvers supporting DNSSEC are recommended.
 +##
 +## People in China may need to use 114.114.114.114:53 here.
 +## Other popular options include 8.8.8.8 and 1.1.1.1.
 +##
-+## If more than one resolver are specified, they will be tried in sequence.
++## If more than one resolver is specified, they will be tried in sequence.
 +
 +fallback_resolvers = ['9.9.9.9:53', '8.8.8.8:53']
 +
@@ -245,8 +247,10 @@ index 0000000..6f4282a
 +## These strings will be added as TXT records to queries.
 +## Do not use, except on servers explicitly asking for extra data
 +## to be present.
++## encrypted-dns-server can be configured to use this for access control
++## in the [access_control] section
 +
-+# query_meta = ["key1:value1", "key2:value2", "key3:value3"]
++# query_meta = ["key1:value1", "key2:value2", "token:MySecretToken"]
 +
 +
 +## Automatic log files rotation
@@ -269,7 +273,7 @@ index 0000000..6f4282a
 +## Note: if you are using dnsmasq, disable the `dnssec` option in dnsmasq if you
 +## configure dnscrypt-proxy to do any kind of filtering (including the filters
 +## below and blacklists).
-+## But you can still choose resolvers that do DNSSEC validation.
++## You can still choose resolvers that do DNSSEC validation.
 +
 +
 +## Immediately respond to IPv6-related queries with an empty response
@@ -301,9 +305,7 @@ index 0000000..6f4282a
 +#        Route queries for specific domains to a dedicated set of servers        #
 +##################################################################################
 +
-+## Example map entries (one entry per line):
-+## example.com 9.9.9.9
-+## example.net 9.9.9.9,8.8.8.8,1.1.1.1
++## See `/usr/share/dnscrypt-proxy/example-forwarding-rules.txt` file for an example
 +
 +# forwarding_rules = '/etc/dnscrypt-proxy/forwarding-rules.txt'
 +
@@ -317,9 +319,7 @@ index 0000000..6f4282a
 +## In addition to acting as a HOSTS file, it can also return the IP address
 +## of a different name. It will also do CNAME flattening.
 +##
-+## Example map entries (one entry per line)
-+## example.com     10.1.1.1
-+## www.google.com  forcesafesearch.google.com
++## See `/usr/share/dnscrypt-proxy/example-cloaking-rules.txt` file for an example
 +
 +# cloaking_rules = '/etc/dnscrypt-proxy/cloaking-rules.txt'
 +
@@ -403,7 +403,7 @@ index 0000000..6f4282a
 +[query_log]
 +
 +  ## Path to the query log file (absolute, or relative to the same directory as the config file)
-+  ## Non non-Windows systems, can be /dev/stdout to log to the standard output (and set log_files_max_size to 0)
++  ## On non-Windows systems, can be /dev/stdout to log to the standard output (also set log_files_max_size to 0)
 +
 +  # file = '/var/log/dnscrypt-proxy/query.log'
 +
@@ -541,8 +541,7 @@ index 0000000..6f4282a
 +##
 +## For example, the following rule in a blacklist file:
 +## *.youtube.* @time-to-sleep
-+## would block access to YouTube only during the days, and period of the days
-+## define by the 'time-to-sleep' schedule.
++## would block access to YouTube during the times defined by the 'time-to-sleep' schedule.
 +##
 +## {after='21:00', before= '7:00'} matches 0:00-7:00 and 21:00-0:00
 +## {after= '9:00', before='18:00'} matches 9:00-18:00
@@ -583,7 +582,7 @@ index 0000000..6f4282a
 +## must include the prefixes.
 +##
 +## If the `urls` property is missing, cache files and valid signatures
-+## must be already present; This doesn't prevent these cache files from
++## must already be present. This doesn't prevent these cache files from
 +## expiring after `refresh_delay` hours.
 +
 +[sources]
@@ -623,7 +622,6 @@ index 0000000..6f4282a
 +
 +
 +
-+
 +#########################################
 +#        Servers with known bugs        #
 +#########################################
@@ -632,12 +630,31 @@ index 0000000..6f4282a
 +
 +# Cisco servers currently cannot handle queries larger than 1472 bytes, and don't
 +# truncate reponses larger than questions as expected by the DNSCrypt protocol.
-+# This prevents large responses from being received, and breaks relaying.
-+# A workaround for the first issue will be applied to servers in list below.
-+# Do not change that list until the bugs are fixed server-side.
++# This prevents large responses from being received over UDP and over relays.
++#
++# The `dnsdist` server software drops client queries larger than 1500 bytes.
++# They are aware of it and are working on a fix.
++#
++# The list below enables workarounds to make non-relayed usage more reliable
++# until the servers are fixed.
++
++fragments_blocked = ['cisco', 'cisco-ipv6', 'cisco-familyshield', 'cisco-familyshield-ipv6', 'quad9-dnscrypt-ip4-filter-alt', 'quad9-dnscrypt-ip4-filter-pri', 'quad9-dnscrypt-ip4-nofilter-alt', 'quad9-dnscrypt-ip4-nofilter-pri', 'quad9-dnscrypt-ip6-filter-alt', 'quad9-dnscrypt-ip6-filter-pri', 'quad9-dnscrypt-ip6-nofilter-alt', 'quad9-dnscrypt-ip6-nofilter-pri', 'cleanbrowsing-adult', 'cleanbrowsing-family-ipv6', 'cleanbrowsing-family', 'cleanbrowsing-security']
++
++
++
++
++################################
++#   TLS Client Authentication  #
++################################
++
++# This is only useful if you are operating your own, private DoH server(s).
++# (for DNSCrypt, see the `query_meta` feature instead)
 +
-+broken_query_padding = ['cisco', 'cisco-ipv6', 'cisco-familyshield']
++[tls_client_auth]
 +
++# creds = [
++#    { server_name='myserver', client_cert='client.crt', client_key='client.key' }
++# ]
 +
 +
 +
@@ -661,13 +678,13 @@ index 0000000..6f4282a
 +##
 +## !!! THESE ARE JUST EXAMPLES !!!
 +##
-+## Review the list of available relays from the "relays.md` file, and, for each
++## Review the list of available relays from the "relays.md" file, and, for each
 +## server you want to use, define the relays you want connections to go through.
 +##
-+## Carefully choose relays and servers so that the are run by different entities.
++## Carefully choose relays and servers so that they are run by different entities.
 +##
 +## "server_name" can also be set to "*" to define a default route, but this is not
-+## recommended. if you do so, keep "server_names" short and distinct from relays.
++## recommended. If you do so, keep "server_names" short and distinct from relays.
 +
 +# routes = [
 +#    { server_name='example-server-1', via=['anon-example-1', 'anon-example-2'] },
@@ -675,6 +692,13 @@ index 0000000..6f4282a
 +# ]
 +
 +
++# skip resolvers incompatible with anonymization instead of using them directly
++
++skip_incompatible = false
++
++
++
++
 +## Optional, local, static list of additional servers
 +## Mostly useful for testing your own servers.
 +