From b8e9753a22cb0114295c2dfc06cda1b12c539a53 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Thu, 21 Nov 2019 22:48:48 -0800 Subject: Rebuild with fixed default paths --- PKGBUILD | 4 ++-- configuration.diff | 48 +++++++++++++++++++++++++++++++++--------------- 2 files changed, 35 insertions(+), 17 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 040a09f..aea7c49 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -11,7 +11,7 @@ pkgname=dnscrypt-proxy pkgver=2.0.33 -pkgrel=1 +pkgrel=2 pkgdesc="DNS proxy, supporting encrypted DNS protocols such as DNSCrypt v2 and DNS-over-HTTPS" arch=('x86_64') url="https://dnscrypt.info" @@ -37,7 +37,7 @@ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/jedisct1/${pkgname}/arc sha512sums=('5c6eb655aa70457889253cbf630e7e37011a461a7f181f0a667694d53146ad9dee88bbbf80c7db3187bba0054af2a63b7b5be1a229800b2566a9758e9d047429' 'e302ea9b5556ba6e0342ebecbf6b55b68a8ad4e472f1790751074232fd5a478e643d2d94f7e12675b551b0849c83ad21b29cc3ea746d89fcdce1e9d5c59da1b2' '1b89196341ae21f39efc46d2adc3d3458292d00f12cc4dc8d7e55b5e70856e6f8ed5f13ace76ae9b958b6eee5700f1df9cc07d828744349fa4ae0f41b382ef97' - '6144f3d33f3d85c9a4e5573f88e92f1b9d7118fd654072eeac6c3f76085086d4b2464e1d3579d8501153f453bc5125859d148fc3b3486d26368d1f51911aeb33' + '456a81906c9713f7b9bdc6e152d3688899da6f760758fce91a9c625da3d7286bf0fd1d54419a57aa5ec1d9d50e1d2db32b6d5f36c2f265e227dc7e8eef65cfdd' '8e09f315f35bf8d0b0cd26c33226f995a894577aab840172779a9d8bd19b4bf0c12e360d89ada2e462520883045f365c8f57481118a3295561a07816e86d8262' 'fa12d8f93d2e2d52732104d2c88610c849fcde54f6dde38a24b7f539a1af10919aed0a1dcc2736be7b4ed2ee141ca3da0cc9998f2ccac48649269d13d6ccfffa' '4ef94b24ba77918065366e62dffd7fed8116fac863bd697133fdac8d7538d2d71aa2417ebc9ed49e9835267e82fae4e6fc164cb93cdb1647c36b91ecf61216d3' diff --git a/configuration.diff b/configuration.diff index a1b991f..c43de74 100644 --- a/configuration.diff +++ b/configuration.diff @@ -1,7 +1,7 @@ -diff -ruN dnscrypt-proxy-2.0.9-a/dnscrypt-proxy/example-dnscrypt-proxy.toml dnscrypt-proxy-2.0.9-b/dnscrypt-proxy/example-dnscrypt-proxy.toml ---- dnscrypt-proxy-2.0.9-a/dnscrypt-proxy/example-dnscrypt-proxy.toml 2018-04-11 14:05:16.000000000 +0200 -+++ dnscrypt-proxy-2.0.9-b/dnscrypt-proxy/example-dnscrypt-proxy.toml 2018-04-11 23:09:53.874362036 +0200 -@@ -96,12 +96,12 @@ +diff -ruN a/dnscrypt-proxy/example-dnscrypt-proxy.toml b/dnscrypt-proxy/example-dnscrypt-proxy.toml +--- a/dnscrypt-proxy/example-dnscrypt-proxy.toml 2019-11-18 13:00:34.000000000 +0100 ++++ b/dnscrypt-proxy/example-dnscrypt-proxy.toml 2019-11-19 22:11:15.890730311 +0100 +@@ -138,12 +138,12 @@ ## log file for the application @@ -16,7 +16,7 @@ diff -ruN dnscrypt-proxy-2.0.9-a/dnscrypt-proxy/example-dnscrypt-proxy.toml dnsc ## Delay, in minutes, after which certificates are reloaded -@@ -194,7 +194,7 @@ +@@ -280,7 +280,7 @@ ## example.com 9.9.9.9 ## example.net 9.9.9.9,8.8.8.8,1.1.1.1 @@ -25,25 +25,25 @@ diff -ruN dnscrypt-proxy-2.0.9-a/dnscrypt-proxy/example-dnscrypt-proxy.toml dnsc -@@ -210,7 +210,7 @@ +@@ -296,7 +296,7 @@ ## example.com 10.1.1.1 ## www.google.com forcesafesearch.google.com -# cloaking_rules = 'cloaking-rules.txt' +# cloaking_rules = '/etc/dnscrypt-proxy/cloaking-rules.txt' + ## TTL used when serving entries in cloaking-rules.txt - -@@ -254,7 +254,7 @@ - +@@ -349,7 +349,7 @@ ## Path to the query log file (absolute, or relative to the same directory as the executable file) + ## Can be /dev/stdout to log to the standard output (and 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) -@@ -280,7 +280,7 @@ +@@ -375,7 +375,7 @@ ## Path to the query log file (absolute, or relative to the same directory as the executable file) @@ -52,7 +52,7 @@ diff -ruN dnscrypt-proxy-2.0.9-a/dnscrypt-proxy/example-dnscrypt-proxy.toml dnsc ## Query log format (currently supported: tsv and ltsv) -@@ -310,12 +310,12 @@ +@@ -405,12 +405,12 @@ ## Path to the file of blocking rules (absolute, or relative to the same directory as the executable file) @@ -67,7 +67,7 @@ diff -ruN dnscrypt-proxy-2.0.9-a/dnscrypt-proxy/example-dnscrypt-proxy.toml dnsc ## Optional log format: tsv or ltsv (default: tsv) -@@ -338,12 +338,12 @@ +@@ -433,12 +433,12 @@ ## Path to the file of blocking rules (absolute, or relative to the same directory as the executable file) @@ -82,7 +82,7 @@ diff -ruN dnscrypt-proxy-2.0.9-a/dnscrypt-proxy/example-dnscrypt-proxy.toml dnsc ## Optional log format: tsv or ltsv (default: tsv) -@@ -366,12 +366,12 @@ +@@ -461,12 +461,12 @@ ## Path to the file of whitelisting rules (absolute, or relative to the same directory as the executable file) @@ -97,16 +97,34 @@ diff -ruN dnscrypt-proxy-2.0.9-a/dnscrypt-proxy/example-dnscrypt-proxy.toml dnsc ## Optional log format: tsv or ltsv (default: tsv) -@@ -441,7 +441,7 @@ +@@ -536,7 +536,7 @@ [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 = '' + +@@ -544,7 +544,7 @@ + + [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/relays.md' minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' refresh_delay = 72 prefix = '' -@@ -451,7 +451,7 @@ +@@ -554,7 +554,7 @@ + # [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 +@@ -562,7 +562,7 @@ # [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'] -- cgit v1.2.1