Updated to 2.0.41

1 files changed, 12 insertions, 10 deletions

diff --git a/PKGBUILD b/PKGBUILD
index af4d406..ddb4d76 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,14 +10,14 @@
 # Artix version has 1.x migration notice
 
 pkgname=dnscrypt-proxy
-pkgver=2.0.39
+pkgver=2.0.41
 pkgrel=1
 pkgdesc="DNS proxy, supporting encrypted DNS protocols such as DNSCrypt v2 and DNS-over-HTTPS"
 arch=('x86_64')
-url="https://dnscrypt.info"
+url="https://github.com/DNSCrypt/dnscrypt-proxy"
 license=('custom:ISC')
 depends=('glibc')
-makedepends=('go-pie')
+makedepends=('git' 'go-pie')
 optdepends=('python-urllib3: for generate-domains-blacklist')
 backup=("etc/${pkgname}/${pkgname}.toml"
         "etc/${pkgname}/blacklist.txt"
@@ -26,26 +26,28 @@ backup=("etc/${pkgname}/${pkgname}.toml"
         "etc/${pkgname}/ip-blacklist.txt"
         "etc/${pkgname}/whitelist.txt"
 )
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/jedisct1/${pkgname}/archive/${pkgver}.tar.gz"
+source=("git+https://github.com/jedisct1/${pkgname}#tag=${pkgver}?signed"
         "${pkgname}.sysusers"
         "${pkgname}.tmpfiles"
-        'configuration.diff'
+        "${pkgname}-configuration.patch::https://github.com/dvzrv/dnscrypt-proxy/commit/8d0fb58eaf5b2e315c9a243e34596104d4f2bff4.patch"
         'blacklist.txt'
         'cloaking-rules.txt'
         'ip-blacklist.txt'
         'whitelist.txt')
-b2sums=('59be804a9c9641dd43e6b49e95c58c7d20dfdc940f2279a47a9ced707d1bbe64b1864c65feab2cada6c12945567ffd93478bd0a8129d40ea65c0fef50e5e90e4'
+b2sums=('SKIP'
         '96acec13d773b80835ed936d8fe585d1843c67a2e70082b9f05e27fd989ace68083d74eec6088a99ca95c19b0f1c52d625197b6ece25c3e8ddac37d7e3d55b5e'
         '58920d0366de701e03e32bca188b2842e94e0d641eee264e21124338a648b5da7901ff8fde69e85a5945ccf931380796108b1234128c1ea8956c757e706d9147'
-        'c2f59408c728733687e4bf464cb48abb18991e902c87f98a2119a0ccc68182cc4a32695740d8841343f1672bd17d0fc68730ebe12473f58041b49c0eb92a4d51'
+        '2b733c6726abb40673f2c501b719e6792f99d6980e2020a407feff956bfa2252a19542c86de9ddd972cad9c66e76190103fa4ade329b196699bcf4e24b4685b5'
         'b691146f2746844bdb79f0c67c565bbce23b978dcb613b9d1ca1d8f62efbbf7d02b3cc442ec0de298cc5f6292823442187dd7efc26b73ff1002edbe9c5f2b8a1'
         'c3b2381b1ee3ca77818eec49a564c6f907c178a3ec76f6bbb5bcfa6707b6f6a9f2a7e44be4c8be9db5984de1558bb006efa6e263d48d4d0303abd721e22d63a1'
         'c79c1962c253439052ce8cbdaeeebde4c0f5ff01d93dafef8774a1526ad23c59ab603b14ec1ef56d52f88fd0007c60ad7a54b813b3d0a92b325c00a3d28dcd1f'
         'f51984895e1aea7622d9bceb18dfbf88eeba4b215270afc00981526a0a54fc172097ba3333b389b033c8b5c93167f25d0734b3d9bd39efd442432ad5ea47d7e8')
+validpgpkeys=('54A2B8892CC3D6A597B92B6C210627AABA709FE1') # Frank Denis (Jedi/Sector One) <pgp@pureftpd.org
 
 prepare() {
+  mv -v "${pkgname}" "${pkgname}-${pkgver}"
   cd "$pkgname-$pkgver"
-  patch -Np1 -i ../configuration.diff
+  patch -Np1 -i "../${pkgname}-configuration.patch"
   # create empty ip-blacklist.txt
   touch "${pkgname}/ip-blacklist.txt"
   # symlink upstream's vendor to src
@@ -57,12 +59,12 @@ build() {
   cd "$pkgname-$pkgver"
   # set GOPATH
   export GOPATH=$(pwd)
-  cd "${pkgname}"
+  cd "$pkgname-$pkgver/${pkgname}"
   go build -ldflags="-linkmode external -extldflags ${LDFLAGS} -s -w"
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd "$pkgname-$pkgver"
   # executable
   install -vDm 755 "${pkgname}/${pkgname}" -t "${pkgdir}/usr/bin/"
   # configuration