From 29d9167c907029223bab7854d200ecf404a4dd0a Mon Sep 17 00:00:00 2001
From: Fijxu <fijxu@zzls.xyz>
Date: Sun, 17 Dec 2023 19:19:49 -0300
Subject: [PATCH] Update PKGBUILD and dnsproxy.yaml

---
 PKGBUILD      |  6 +++---
 dnsproxy.yaml | 37 +++++++++++++++++++++++++------------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 609713f..bbda467 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Fijxu <fijxu <at> zzls <dot> xyz>
 pkgname=dnsproxy-git
-pkgver=0.48.3.r787.c060c2a
+pkgver=v0.60.1.r1.g638288e
 pkgrel=1
 pkgdesc="Simple DNS proxy with DoH, DoT, DoQ and DNSCrypt support (git version)"
 arch=('any')
@@ -15,13 +15,13 @@ source=("dnsproxy-git::git+https://github.com/AdguardTeam/dnsproxy.git"
         "dnsproxy.yaml"
         "dnsproxy.service")
 sha256sums=("SKIP"
-        "9d8a7088bb101114397dd299c19d690f0356a6787844c2b4ca7358612dd1b594"
+        "35804d7b72453889bce6cf3bc03a499481f0c2f85fb2b02e272a1b5c061b0823"
         "565eea9808589ecafa81f2229ac1f85b39028e26d488a9a7c0b51afc43d7f42b")
 _conf=etc/dnsproxy/dnsproxy.yaml    
 
 pkgver() {
     cd "$srcdir/$pkgname"
-    printf "0.48.3.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+		git describe --long --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
diff --git a/dnsproxy.yaml b/dnsproxy.yaml
index fa4b15e..1a60c9e 100644
--- a/dnsproxy.yaml
+++ b/dnsproxy.yaml
@@ -2,18 +2,31 @@
 # config file
 
 ---
+
 ## Required
-# upstream:  # At least one upstream is required
-# - 1.1.1.1:53
+# A list of DNS servers that you want to use
+# An upstream to be used (can be specified multiple times). 
+# You can also specify path to a file with the list of servers
+upstream:
+  # - udp://45.90.28.88 # NextDNS DNS
+  # - udp://76.76.2.0   # ControlD DNS
+
+# Fallback resolvers to use when regular ones are unavailable,
+# can be specified multiple times. You can also specify path
+# to a file with the list of servers
+fallback:
+  # - udp://127.0.0.1   # Replace this with any DNS you want to use
 
-## Recommended
 tls-min-version: 1.2
-http3: true  # dnsproxy automatically picks the fastest HTTP(S) protocol
-refuse-any: true
-
-## Optional
-# listen-addrs:  # Defaults to 0.0.0.0 which is prone to conflict
-# - 127.0.0.56
-# cache: true  # Caching is disabled by default
-# verbose: true  # Increase verbosity for debugging
-
+http3: true
+refuse-any: false
+listen-addrs:
+  - 127.0.0.1
+listen-ports: 
+  - 53
+# Cache Enabled.
+cache: true
+cache-optimistic: false
+verbose: false
+# If specified, parallel queries to all configured upstream servers are enabled
+all-servers: true