From 61fc086628d4731dee6504a0a3430bc49c2e6d55 Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Jun 17 2020 20:34:40 +0000 Subject: Fix typo Signed-off-by: Robert-André Mauchin --- diff --git a/_dnscrypt-proxy-2.0.44-custom_config.patch b/_dnscrypt-proxy-2.0.44-custom_config.patch deleted file mode 100644 index c3a951c..0000000 --- a/_dnscrypt-proxy-2.0.44-custom_config.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff -up dnscrypt-proxy-2.0.44/dnscrypt-proxy/example-dnscrypt-proxy.toml.orig dnscrypt-proxy-2.0.44/dnscrypt-proxy/example-dnscrypt-proxy.toml ---- dnscrypt-proxy-2.0.44/dnscrypt-proxy/example-dnscrypt-proxy.toml.orig 2020-06-11 17:10:33.000000000 +0200 -+++ dnscrypt-proxy-2.0.44/dnscrypt-proxy/example-dnscrypt-proxy.toml 2020-06-17 22:01:28.300972741 +0200 -@@ -36,7 +36,7 @@ - ## Example with both IPv4 and IPv6: - ## listen_addresses = ['127.0.0.1:53', '[::1]:53'] - --listen_addresses = ['127.0.0.1:53'] -+listen_addresses = [] - - - ## Maximum number of simultaneous client connections to accept -@@ -146,7 +146,7 @@ keepalive = 30 - ## This file is different from other log files, and will not be - ## automatically rotated by the application. - --# log_file = 'dnscrypt-proxy.log' -+# log_file = '/var/log/dnscrypt-proxy/dnscrypt-proxy.log' - - - ## When using a log file, only keep logs from the most recent launch. -@@ -156,7 +156,7 @@ keepalive = 30 - - ## Use the system logger (syslog on Unix, Event Log on Windows) - --# use_syslog = true -+use_syslog = true - - - ## Delay, in minutes, after which certificates are reloaded -@@ -310,7 +310,7 @@ reject_ttl = 600 - - ## See the `example-forwarding-rules.txt` file for an example - --# forwarding_rules = 'forwarding-rules.txt' -+# forwarding_rules = '/etc/dnscrypt-proxy/forwarding-rules.txt' - - - -@@ -324,7 +324,7 @@ reject_ttl = 600 - ## - ## See the `example-cloaking-rules.txt` file for an example - --# cloaking_rules = 'cloaking-rules.txt' -+# cloaking_rules = '/etc/dnscrypt-proxy/cloaking-rules.txt' - - ## TTL used when serving entries in cloaking-rules.txt - -@@ -408,7 +408,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) -@@ -434,7 +434,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) -@@ -464,12 +464,12 @@ cache_neg_max_ttl = 600 - - ## Path to the file of blocking rules (absolute, or relative to the same directory as the config file) - -- # blacklist_file = 'blacklist.txt' -+ # blacklist_file = '/etc/dnscrypt-proxy/blacklist.txt' - - - ## 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) -@@ -492,12 +492,12 @@ cache_neg_max_ttl = 600 - - ## Path to the file of blocking rules (absolute, or relative to the same directory as the config file) - -- # blacklist_file = 'ip-blacklist.txt' -+ # blacklist_file = '/etc/dnscrypt-proxy/ip-blacklist.txt' - - - ## 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) -@@ -520,12 +520,12 @@ cache_neg_max_ttl = 600 - - ## Path to the file of whitelisting rules (absolute, or relative to the same directory as the config file) - -- # whitelist_file = 'whitelist.txt' -+ # whitelist_file = '/etc/dnscrypt-proxy/whitelist.txt' - - - ## 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) -@@ -594,7 +594,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 = '' - -@@ -620,7 +620,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' - - diff --git a/dnscrypt-proxy-2.0.44-custom_config.patch b/dnscrypt-proxy-2.0.44-custom_config.patch new file mode 100644 index 0000000..c3a951c --- /dev/null +++ b/dnscrypt-proxy-2.0.44-custom_config.patch @@ -0,0 +1,129 @@ +diff -up dnscrypt-proxy-2.0.44/dnscrypt-proxy/example-dnscrypt-proxy.toml.orig dnscrypt-proxy-2.0.44/dnscrypt-proxy/example-dnscrypt-proxy.toml +--- dnscrypt-proxy-2.0.44/dnscrypt-proxy/example-dnscrypt-proxy.toml.orig 2020-06-11 17:10:33.000000000 +0200 ++++ dnscrypt-proxy-2.0.44/dnscrypt-proxy/example-dnscrypt-proxy.toml 2020-06-17 22:01:28.300972741 +0200 +@@ -36,7 +36,7 @@ + ## Example with both IPv4 and IPv6: + ## listen_addresses = ['127.0.0.1:53', '[::1]:53'] + +-listen_addresses = ['127.0.0.1:53'] ++listen_addresses = [] + + + ## Maximum number of simultaneous client connections to accept +@@ -146,7 +146,7 @@ keepalive = 30 + ## This file is different from other log files, and will not be + ## automatically rotated by the application. + +-# log_file = 'dnscrypt-proxy.log' ++# log_file = '/var/log/dnscrypt-proxy/dnscrypt-proxy.log' + + + ## When using a log file, only keep logs from the most recent launch. +@@ -156,7 +156,7 @@ keepalive = 30 + + ## Use the system logger (syslog on Unix, Event Log on Windows) + +-# use_syslog = true ++use_syslog = true + + + ## Delay, in minutes, after which certificates are reloaded +@@ -310,7 +310,7 @@ reject_ttl = 600 + + ## See the `example-forwarding-rules.txt` file for an example + +-# forwarding_rules = 'forwarding-rules.txt' ++# forwarding_rules = '/etc/dnscrypt-proxy/forwarding-rules.txt' + + + +@@ -324,7 +324,7 @@ reject_ttl = 600 + ## + ## See the `example-cloaking-rules.txt` file for an example + +-# cloaking_rules = 'cloaking-rules.txt' ++# cloaking_rules = '/etc/dnscrypt-proxy/cloaking-rules.txt' + + ## TTL used when serving entries in cloaking-rules.txt + +@@ -408,7 +408,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) +@@ -434,7 +434,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) +@@ -464,12 +464,12 @@ cache_neg_max_ttl = 600 + + ## Path to the file of blocking rules (absolute, or relative to the same directory as the config file) + +- # blacklist_file = 'blacklist.txt' ++ # blacklist_file = '/etc/dnscrypt-proxy/blacklist.txt' + + + ## 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) +@@ -492,12 +492,12 @@ cache_neg_max_ttl = 600 + + ## Path to the file of blocking rules (absolute, or relative to the same directory as the config file) + +- # blacklist_file = 'ip-blacklist.txt' ++ # blacklist_file = '/etc/dnscrypt-proxy/ip-blacklist.txt' + + + ## 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) +@@ -520,12 +520,12 @@ cache_neg_max_ttl = 600 + + ## Path to the file of whitelisting rules (absolute, or relative to the same directory as the config file) + +- # whitelist_file = 'whitelist.txt' ++ # whitelist_file = '/etc/dnscrypt-proxy/whitelist.txt' + + + ## 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) +@@ -594,7 +594,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 = '' + +@@ -620,7 +620,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' + + diff --git a/dnscrypt-proxy.spec b/dnscrypt-proxy.spec index 5cbf41d..ba2641b 100644 --- a/dnscrypt-proxy.spec +++ b/dnscrypt-proxy.spec @@ -44,7 +44,7 @@ Features: - Can force outgoing connections to use TCP; useful with tunnels such as Tor.} Name: dnscrypt-proxy -Release: 2%{?dist} +Release: 1%{?dist} Summary: Flexible DNS proxy, with support for encrypted DNS protocols License: ISC