Updated to 2.1.2

2 files changed, 43 insertions, 42 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 340350b..76168d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,8 +12,8 @@
 # Artix version requires network to build
 
 pkgname=dnscrypt-proxy
-pkgver=2.1.1
-pkgrel=3
+pkgver=2.1.2
+pkgrel=1
 pkgdesc="A flexible DNS proxy, with support for encrypted DNS protocols"
 arch=('x86_64')
 url="https://github.com/DNSCrypt/dnscrypt-proxy"
@@ -33,17 +33,18 @@ backup=("etc/${pkgname}/${pkgname}.toml"
 source=("git+https://github.com/dnscrypt/${pkgname}#tag=${pkgver}?signed"
         "${pkgname}.sysusers"
         "${pkgname}.tmpfiles"
-        "${pkgname}-${pkgver}-configuration.patch::https://github.com/dvzrv/dnscrypt-proxy/commit/c3b021adcfc564f331ba531c35b4501adfee53d3.patch"
+        "${pkgname}-${pkgver}-configuration.patch::https://github.com/dvzrv/dnscrypt-proxy/commit/4589ad77802b17bf781d6a625afb2e2775e1fb9a.patch"
         'uncensor.patch'
         'blacklist.txt'
         'cloaking-rules.txt'
         'ip-blacklist.txt'
         'whitelist.txt')
+options=(debug)
 b2sums=('SKIP'
         '96acec13d773b80835ed936d8fe585d1843c67a2e70082b9f05e27fd989ace68083d74eec6088a99ca95c19b0f1c52d625197b6ece25c3e8ddac37d7e3d55b5e'
         '58920d0366de701e03e32bca188b2842e94e0d641eee264e21124338a648b5da7901ff8fde69e85a5945ccf931380796108b1234128c1ea8956c757e706d9147'
-        'a46bedfadaad0decf789ed509f384cb70f2c1ad822839d64763fbc4b9a0d52bfc93f9f5ef744cb8c3bf981c7c5929e76917545c691b99c5e3d85c542026a2c79'
-        'a8cbdddf4771f76d8c9508f08cd07a7882c76863d4f0872866bb7abd3f786d4b4b070e7c378ed3067d7a49063bfc82397072f74c98708f5b4167536a80ccfaf9'
+        'ae04abca4e87689014af65fb9c1859289b948e832f49c84521570b10c73732ba654296947b84fe98d4625840fb471b8a9a01c01133f019af973f7aeeada5a0de'
+        '1216f617d5ec3f5f375f961a00d3db8665a1e1e386afddf182c52168b6845989b6d9c093c136a3a55421b95e67f9aadf7033a3e1a4e53e9805b2b86102ec2333'
         'b691146f2746844bdb79f0c67c565bbce23b978dcb613b9d1ca1d8f62efbbf7d02b3cc442ec0de298cc5f6292823442187dd7efc26b73ff1002edbe9c5f2b8a1'
         'c3b2381b1ee3ca77818eec49a564c6f907c178a3ec76f6bbb5bcfa6707b6f6a9f2a7e44be4c8be9db5984de1558bb006efa6e263d48d4d0303abd721e22d63a1'
         'c79c1962c253439052ce8cbdaeeebde4c0f5ff01d93dafef8774a1526ad23c59ab603b14ec1ef56d52f88fd0007c60ad7a54b813b3d0a92b325c00a3d28dcd1f'
diff --git a/uncensor.patch b/uncensor.patch
index bb4824e..61ed1d7 100644
--- a/uncensor.patch
+++ b/uncensor.patch
@@ -31,7 +31,7 @@
  
  
  ######################################################
--#        Pattern-based blocking (blocklists)        #
+-#        Pattern-based blocking (blocklists)         #
 +#            Pattern-based blacklists                #
  ######################################################
  
@@ -49,18 +49,18 @@
  
  [blocked_names]
  
--  ## Path to the file of blocking rules (absolute, or relative to the same directory as the config file)
-+  ## Path to the file of blacklisting rules (absolute, or relative to the same directory as the config file)
+-## Path to the file of blocking rules (absolute, or relative to the same directory as the config file)
++## Path to the file of blacklisting rules (absolute, or relative to the same directory as the config file)
  
--  # blocked_names_file = '/etc/dnscrypt-proxy/blocked-names.txt'
-+  # blocked_names_file = '/etc/dnscrypt-proxy/blacklist.txt'
+-# blocked_names_file = '/etc/dnscrypt-proxy/blocked-names.txt'
++# blocked_names_file = '/etc/dnscrypt-proxy/blacklist.txt'
  
  
--  ## Optional path to a file logging blocked queries
-+  ## Optional path to a file logging blacklisted queries
+-## Optional path to a file logging blocked queries
++## Optional path to a file logging blacklisted queries
  
--  # log_file = '/var/log/dnscrypt-proxy/blocked-names.log'
-+  # log_file = '/var/log/dnscrypt-proxy/blacklisted.log'
+-# log_file = '/var/log/dnscrypt-proxy/blocked-names.log'
++# log_file = '/var/log/dnscrypt-proxy/blacklisted.log'
  
  
    ## Optional log format: tsv or ltsv (default: tsv)
@@ -81,18 +81,18 @@
  
  [blocked_ips]
  
--  ## Path to the file of blocking rules (absolute, or relative to the same directory as the config file)
-+  ## Path to the file of blacklisting rules (absolute, or relative to the same directory as the config file)
+-## Path to the file of blocking rules (absolute, or relative to the same directory as the config file)
++## Path to the file of blacklisting rules (absolute, or relative to the same directory as the config file)
  
--  # blocked_ips_file = '/etc/dnscrypt-proxy/blocked-ips.txt'
-+  # blocked_ips_file = '/etc/dnscrypt-proxy/ip-blacklist.txt'
+-# blocked_ips_file = '/etc/dnscrypt-proxy/blocked-ips.txt'
++# blocked_ips_file = '/etc/dnscrypt-proxy/ip-blacklist.txt'
  
  
--  ## Optional path to a file logging blocked queries
-+  ## Optional path to a file logging blacklisted queries
+-## Optional path to a file logging blocked queries
++## Optional path to a file logging blacklisted queries
  
--  # log_file = '/var/log/dnscrypt-proxy/blocked-ips.log'
-+  # log_file = '/var/log/dnscrypt-proxy/ip-blacklisted.log'
+-# log_file = '/var/log/dnscrypt-proxy/blocked-ips.log'
++# log_file = '/var/log/dnscrypt-proxy/ip-blacklisted.log'
  
  
    ## Optional log format: tsv or ltsv (default: tsv)
@@ -100,7 +100,7 @@
  
  
  ######################################################
--#   Pattern-based allow lists (blocklists bypass)   #
+-#   Pattern-based allow lists (blocklists bypass)    #
 +#            Pattern-based whitelists                #
  ######################################################
  
@@ -114,21 +114,21 @@
  
  [allowed_names]
  
--  ## Path to the file of allow list rules (absolute, or relative to the same directory as the config file)
-+  ## Path to the file of whitelist rules (absolute, or relative to the same directory as the config file)
+-## Path to the file of allow list rules (absolute, or relative to the same directory as the config file)
++## Path to the file of whitelist rules (absolute, or relative to the same directory as the config file)
  
--  # allowed_names_file = '/etc/dnscrypt-proxy/allowed-names.txt'
-+  # allowed_names_file = '/etc/dnscrypt-proxy/whitelist.txt'
+-# allowed_names_file = '/etc/dnscrypt-proxy/allowed-names.txt'
++# allowed_names_file = '/etc/dnscrypt-proxy/whitelist.txt'
  
  
--  ## Optional path to a file logging allowed queries
-+  ## Optional path to a file logging whitelisted queries
+-## Optional path to a file logging allowed queries
++## Optional path to a file logging whitelisted queries
  
--  # log_file = '/var/log/dnscrypt-proxy/allowed-names.log'
-+  # log_file = '/var/log/dnscrypt-proxy/whitelisted.log'
+-# log_file = '/var/log/dnscrypt-proxy/allowed-names.log'
++# log_file = '/var/log/dnscrypt-proxy/whitelisted.log'
  
  
-   ## Optional log format: tsv or ltsv (default: tsv)
+ ## Optional log format: tsv or ltsv (default: tsv)
 @@ -565,25 +565,25 @@
  
  
@@ -138,7 +138,7 @@
  #########################################################
  
 -## Allowed IP lists support the same patterns as IP blocklists
--## If an IP response matches an allow ip entry, the corresponding session
+-## If an IP response matches an allowed entry, the corresponding session
 +## Whitelisted IP lists support the same patterns as IP blacklists
 +## If an IP response matches a whitelisted ip entry, the corresponding session
  ## will bypass IP filters.
@@ -147,20 +147,20 @@
  
  [allowed_ips]
  
--  ## Path to the file of allowed ip rules (absolute, or relative to the same directory as the config file)
-+  ## Path to the file of whitelisted ip rules (absolute, or relative to the same directory as the config file)
+-## Path to the file of allowed ip rules (absolute, or relative to the same directory as the config file)
++## Path to the file of whitelisted ip rules (absolute, or relative to the same directory as the config file)
  
--  # allowed_ips_file = '/etc/dnscrypt-proxy/allowed-ips.txt'
-+  # allowed_ips_file = '/etc/dnscrypt-proxy/ip-whitelist.txt'
+-# allowed_ips_file = '/etc/dnscrypt-proxy/allowed-ips.txt'
++# allowed_ips_file = '/etc/dnscrypt-proxy/ip-whitelist.txt'
  
  
--  ## Optional path to a file logging allowed queries
-+  ## Optional path to a file logging whitelisted queries
+-## Optional path to a file logging allowed queries
++## Optional path to a file logging whitelisted queries
  
--  # log_file = '/var/log/dnscrypt-proxy/allowed-ips.log'
-+  # log_file = '/var/log/dnscrypt-proxy/ip-whitelisted.log'
+-# log_file = '/var/log/dnscrypt-proxy/allowed-ips.log'
++# log_file = '/var/log/dnscrypt-proxy/ip-whitelisted.log'
  
-   ## Optional log format: tsv or ltsv (default: tsv)
+ ## Optional log format: tsv or ltsv (default: tsv)
  
 @@ -599,7 +599,7 @@
  ## Patterns in the name-based blocked_names file can optionally be followed with @schedule_name