Updated to 2.0.22 | Added severals custom default lists

5 files changed, 66 insertions, 10 deletions

diff --git a/PKGBUILD b/PKGBUILD
index beb0e35..5bfd1f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,12 +5,13 @@
 # Contributor (Arch): peace4all <markspost at rocketmail dot com>
 
 # # I maintain this because:
-# I don't like the sysuser name
+# Arch version has a sysuser name I do not like
+# Arch version has less than preferred default lists
 # Arch version has 1.x migration notice
 
 pkgname=dnscrypt-proxy
 pkgver=2.0.22
-pkgrel=1
+pkgrel=2
 pkgdesc="DNS proxy, supporting encrypted DNS protocols such as DNSCrypt v2 and DNS-over-HTTP"
 arch=('x86_64')
 url="https://dnscrypt.info"
@@ -27,11 +28,19 @@ backup=("etc/${pkgname}/${pkgname}.toml"
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/jedisct1/${pkgname}/archive/${pkgver}.tar.gz"
         'sysusers.d'
         'tmpfiles.d'
-        'configuration.diff')
+        'configuration.diff'
+        'blacklist.txt'
+        'cloaking-rules.txt'
+        'ip-blacklist.txt'
+        'whitelist.txt')
 sha512sums=('ea2641e79739e75e8a7e6bc24a788488537ffa823e18a3585f95ca1ae90bef9890c65eaf7feb80cc5ad09165cef9513d4025e96367ca87fc59333534f8856102'
             'e302ea9b5556ba6e0342ebecbf6b55b68a8ad4e472f1790751074232fd5a478e643d2d94f7e12675b551b0849c83ad21b29cc3ea746d89fcdce1e9d5c59da1b2'
             '1b89196341ae21f39efc46d2adc3d3458292d00f12cc4dc8d7e55b5e70856e6f8ed5f13ace76ae9b958b6eee5700f1df9cc07d828744349fa4ae0f41b382ef97'
-            '6144f3d33f3d85c9a4e5573f88e92f1b9d7118fd654072eeac6c3f76085086d4b2464e1d3579d8501153f453bc5125859d148fc3b3486d26368d1f51911aeb33')
+            '6144f3d33f3d85c9a4e5573f88e92f1b9d7118fd654072eeac6c3f76085086d4b2464e1d3579d8501153f453bc5125859d148fc3b3486d26368d1f51911aeb33'
+            '8e09f315f35bf8d0b0cd26c33226f995a894577aab840172779a9d8bd19b4bf0c12e360d89ada2e462520883045f365c8f57481118a3295561a07816e86d8262'
+            'fa12d8f93d2e2d52732104d2c88610c849fcde54f6dde38a24b7f539a1af10919aed0a1dcc2736be7b4ed2ee141ca3da0cc9998f2ccac48649269d13d6ccfffa'
+            '4ef94b24ba77918065366e62dffd7fed8116fac863bd697133fdac8d7538d2d71aa2417ebc9ed49e9835267e82fae4e6fc164cb93cdb1647c36b91ecf61216d3'
+            '7a723fc87d8aaa62ee7bb467e1cf3d75e5ad248fb574881b47f4f5555d56535a657f104dc51679ca9a3cbd7fc59bc92e9cf93b548c45e458c40f070d2825822a')
 
 prepare() {
   cd "$pkgname-$pkgver"
@@ -58,15 +67,15 @@ package() {
   # configuration
   install -vDm 644 "${pkgname}/example-${pkgname}.toml" \
     "${pkgdir}/etc/${pkgname}/${pkgname}.toml"
-  install -vDm 644 "${pkgname}/example-blacklist.txt" \
+  install -vDm 644 "${srcdir}/blacklist.txt" \
     "${pkgdir}/etc/${pkgname}/blacklist.txt"
-  install -vDm 644 "${pkgname}/example-cloaking-rules.txt" \
+  install -vDm 644 "${srcdir}/cloaking-rules.txt" \
     "${pkgdir}/etc/${pkgname}/cloaking-rules.txt"
   install -vDm 644 "${pkgname}/example-forwarding-rules.txt" \
     "${pkgdir}/etc/${pkgname}/forwarding-rules.txt"
-  install -vDm 644 "${pkgname}/ip-blacklist.txt" \
+  install -vDm 644 "${srcdir}/ip-blacklist.txt" \
     "${pkgdir}/etc/${pkgname}/ip-blacklist.txt"
-  install -vDm 644 "${pkgname}/example-whitelist.txt" \
+  install -vDm 644 "${srcdir}/whitelist.txt" \
     "${pkgdir}/etc/${pkgname}/whitelist.txt"
   # license
   install -vDm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
@@ -75,7 +84,7 @@ package() {
     -t "${pkgdir}/usr/share/doc/${pkgname}"
 
   # sysusers.d
-  install -vDm 644 "$srcdir/sysusers.d" "$pkgdir/usr/lib/sysusers.d/${pkgname}.conf"
+  install -vDm 644 "${srcdir}/sysusers.d" "$pkgdir/usr/lib/sysusers.d/${pkgname}.conf"
   # tmpfiles.d
-  install -vDm 644 "$srcdir/tmpfiles.d" "$pkgdir/usr/lib/tmpfiles.d/${pkgname}.conf"
+  install -vDm 644 "${srcdir}/tmpfiles.d" "$pkgdir/usr/lib/tmpfiles.d/${pkgname}.conf"
 }
diff --git a/blacklist.txt b/blacklist.txt
new file mode 100644
index 0000000..216dc12
--- /dev/null
+++ b/blacklist.txt
@@ -0,0 +1,16 @@
+# Valid TLDs that should not resolve
+example
+invalid
+local
+localhost
+onion
+test
+
+# Invalid TLDs that should not resolve
+home
+html
+i2p
+lan
+localdomain
+workgroup
+www
diff --git a/cloaking-rules.txt b/cloaking-rules.txt
new file mode 100644
index 0000000..5d67c11
--- /dev/null
+++ b/cloaking-rules.txt
@@ -0,0 +1,12 @@
+################################
+#        Cloaking rules        #
+################################
+
+# This has to be enabled with the `cloaking_rules` parameter in the main
+# configuration file
+
+localhost                127.0.0.1
+ip6-localhost            ::1
+ip6-loopback             ::1
+ip6-allnodes             ff02::1
+ip6-allrouters           ff02::2
diff --git a/ip-blacklist.txt b/ip-blacklist.txt
new file mode 100644
index 0000000..d690dc0
--- /dev/null
+++ b/ip-blacklist.txt
@@ -0,0 +1 @@
+0.0.0.0
diff --git a/whitelist.txt b/whitelist.txt
new file mode 100644
index 0000000..c94174b
--- /dev/null
+++ b/whitelist.txt
@@ -0,0 +1,18 @@
+
+###########################
+#        Whitelist        #
+###########################
+
+## Rules for name-based query whitelisting, one per line
+##
+## Example of valid patterns:
+##
+## ads.*         | matches anything with an "ads." prefix
+## *.example.com | matches example.com and all names within that zone such as www.example.com
+## example.com   | identical to the above
+## =example.com  | whitelists example.com but not *.example.com
+## *sex*         | matches any name containing that substring
+## ads[0-9]*     | matches "ads" followed by one or more digits
+## ads*.example* | *, ? and [] can be used anywhere, but prefixes/suffixes are faster
+
+=localhost