commit: f5e0993e70b089c58916e9b3c79902bbc22196fd
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 25 20:41:01 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Mar 25 20:49:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5e0993e
net-dns/dnscrypt-proxy: update config patch
Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
.../dnscrypt-proxy/dnscrypt-proxy-2.0.41.ebuild | 1 +
.../files/config-full-paths-r11.patch | 106 ++++++++++++++-------
2 files changed, 70 insertions(+), 37 deletions(-)
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.41.ebuild
b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.41.ebuild
index e5403d4594b..b5bda3db325 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.41.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.41.ebuild
@@ -30,6 +30,7 @@ RDEPEND="
"
FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+
PATCHES=( "${FILESDIR}"/config-full-paths-r11.patch )
src_compile() {
diff --git a/net-dns/dnscrypt-proxy/files/config-full-paths-r11.patch
b/net-dns/dnscrypt-proxy/files/config-full-paths-r11.patch
index 15247d42880..b7489fa2985 100644
--- a/net-dns/dnscrypt-proxy/files/config-full-paths-r11.patch
+++ b/net-dns/dnscrypt-proxy/files/config-full-paths-r11.patch
@@ -1,74 +1,106 @@
---- dnscrypt-proxy-2.0.41/dnscrypt-proxy/example-dnscrypt-proxy.toml
-+++ dnscrypt-proxy-2.0.41/dnscrypt-proxy/dnscrypt-proxy.toml
-@@ -142,7 +142,7 @@
-
+From c6a126931297b8256c06ea5c85229a721768f15e Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakov...@gentoo.org>
+Date: Wed, 25 Mar 2020 13:38:31 -0700
+Subject: [PATCH] config paths
+
+---
+ dnscrypt-proxy/example-dnscrypt-proxy.toml | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/dnscrypt-proxy/example-dnscrypt-proxy.toml
b/dnscrypt-proxy/example-dnscrypt-proxy.toml
+index 778de5c..5eaffb1 100644
+--- a/dnscrypt-proxy/example-dnscrypt-proxy.toml
++++ b/dnscrypt-proxy/example-dnscrypt-proxy.toml
+@@ -142,7 +142,7 @@ keepalive = 30
+
## log file for the application
-
+
-# log_file = 'dnscrypt-proxy.log'
+# log_file = '/var/log/dnscrypt-proxy/dnscrypt-proxy.log'
-
-
+
+
## Use the system logger (syslog on Unix, Event Log on Windows)
-@@ -399,7 +399,7 @@
+@@ -399,7 +399,7 @@ cache_neg_max_ttl = 600
## Path to the query log file (absolute, or relative to the same directory
as the config file)
## On non-Windows systems, can be /dev/stdout to log to the standard output
(also set log_files_max_size to 0)
-
+
- # file = 'query.log'
+ # file = '/var/log/dnscrypt-proxy/query.log'
-
-
+
+
## Query log format (currently supported: tsv and ltsv)
-@@ -425,7 +425,7 @@
-
+@@ -425,7 +425,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)
-@@ -460,7 +460,7 @@
-
+@@ -460,7 +460,7 @@ cache_neg_max_ttl = 600
+
## Optional path to a file logging blocked queries
-
+
- # log_file = 'blocked.log'
+ # log_file = '/var/log/dnscrypt-proxy/blocked.log'
-
-
+
+
## Optional log format: tsv or ltsv (default: tsv)
-@@ -488,7 +488,7 @@
-
+@@ -488,7 +488,7 @@ cache_neg_max_ttl = 600
+
## Optional path to a file logging blocked queries
-
+
- # log_file = 'ip-blocked.log'
+ # log_file = '/var/log/dnscrypt-proxy/ip-blocked.log'
-
-
+
+
## Optional log format: tsv or ltsv (default: tsv)
-@@ -516,7 +516,7 @@
-
+@@ -516,7 +516,7 @@ cache_neg_max_ttl = 600
+
## Optional path to a file logging whitelisted queries
-
+
- # log_file = 'whitelisted.log'
+ # log_file = '/var/log/dnscrypt-proxy/whitelisted.log'
-
-
+
+
## Optional log format: tsv or ltsv (default: tsv)
-@@ -585,7 +585,7 @@
-
+@@ -585,7 +585,7 @@ cache_neg_max_ttl = 600
+
[sources.'public-resolvers']
urls =
['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/public-resolvers.md',
'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md']
- cache_file = 'public-resolvers.md'
+ cache_file = '/var/cache/dnscrypt-proxy/public-resolvers.md'
minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
prefix = ''
-
-@@ -593,7 +593,7 @@
-
+
+@@ -593,7 +593,7 @@ cache_neg_max_ttl = 600
+
[sources.'relays']
urls =
['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/relays.md',
'https://download.dnscrypt.info/resolvers-list/v2/relays.md']
- cache_file = 'relays.md'
-+ cache_file = '/var/cache/dnscrypt-proxy/parental-control.md'
++ cache_file = '/var/cache/dnscrypt-proxy/relays.md'
minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
refresh_delay = 72
prefix = ''
+@@ -603,7 +603,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
+@@ -611,7 +611,7 @@ cache_neg_max_ttl = 600
+
+ # [sources.'parental-control']
+ # urls =
['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/parental-control.md',
'https://download.dnscrypt.info/resolvers-list/v2/parental-control.md']
+- # cache_file = 'parental-control.md'
++ # cache_file = '/var/cache/dnscrypt-proxy/parental-control.md'
+ # minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+
+
+--
+2.26.0
+
