Update to 2.0.0

2 files changed, 21 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 42cf1c2d734e..7148219c29f7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Fri Dec  7 02:25:52 UTC 2018
 pkgbase = dns-over-https
 	pkgdesc = Client and server software to query DNS over HTTPS, using Google DNS-over-HTTPS protocol
-	pkgver = 1.4.2
-	pkgrel = 5
+	pkgver = 2.0.0
+	pkgrel = 1
 	url = https://github.com/m13253/dns-over-https
 	arch = x86_64
 	arch = i686
@@ -11,9 +9,8 @@ pkgbase = dns-over-https
 	license = MIT
 	makedepends = go
 	makedepends = git
-	depends = bash
-	source = https://github.com/m13253/dns-over-https/archive/v1.4.2.tar.gz
-	sha256sums = c3181a8cd20710f09cc6b6749da7f6c05fd1eb063a4c8d740b42e50dbddc045d
+	source = https://github.com/m13253/dns-over-https/archive/v2.0.0.tar.gz
+	sha256sums = f8b8b33e9e2e31c73554785cc5ce825d0a69ecd80182ceff0766e4974c7c5290
 
 pkgname = dns-over-https-client
 	provides = dns-over-https-client
diff --git a/PKGBUILD b/PKGBUILD
index a62a4a9c408f..085860468c2a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,40 +3,37 @@
 
 pkgbase='dns-over-https'
 pkgname=('dns-over-https-client' 'dns-over-https-server')
-pkgver=1.4.2
-pkgrel=5
+pkgver=2.0.0
+pkgrel=1
 pkgdesc="Client and server software to query DNS over HTTPS, using Google DNS-over-HTTPS protocol"
 url="https://github.com/m13253/dns-over-https"
 arch=('x86_64' 'i686' 'armv7h')
 license=('MIT')
-depends=('bash')
 makedepends=('go' 'git')
 
 source=("$url/archive/v$pkgver.tar.gz")
 
-sha256sums=('c3181a8cd20710f09cc6b6749da7f6c05fd1eb063a4c8d740b42e50dbddc045d')
-
-prepare() {
-    export GOPATH="${srcdir}/build"
-    export BUILDPATH="${srcdir}/build/src/github.com/m13253"
-
-    install -dm755 ${BUILDPATH}
-    cp ${pkgbase}-${pkgver} ${BUILDPATH}/${pkgbase} -r
-}
+sha256sums=('f8b8b33e9e2e31c73554785cc5ce825d0a69ecd80182ceff0766e4974c7c5290')
 
 build() {
-    export GOPATH="${srcdir}/build"
-    export BUILDPATH="${srcdir}/build/src/github.com/m13253"
+    mkdir -p ${srcdir}/go/src
+    export GOPATH="${srcdir}/go"
 
     cd ${srcdir}/${pkgbase}-${pkgver}
     sed -i 's/\/local//g' systemd/doh-client.service
     sed -i 's/\/local//g' systemd/doh-server.service
 
-    cd ${BUILDPATH}/${pkgbase}/doh-client
-    go get -v -gcflags "-trimpath $GOPATH/src"
+    go mod download
+    
+    # build client
+    go build -gcflags "all=-trimpath=${PWD}" -asmflags "all=-trimpath=${PWD}" -ldflags "-w -s -extldflags ${LDFLAGS}" -v -o client ./doh-client
+    
+    # build server
+    go build -gcflags "all=-trimpath=${PWD}" -asmflags "all=-trimpath=${PWD}" -ldflags "-w -s -extldflags ${LDFLAGS}" -v -o server ./doh-server
 
-    cd ${BUILDPATH}/${pkgbase}/doh-server
-    go get -v -gcflags "-trimpath $GOPATH/src"
+    # clean build cache
+    chmod 777 -R $GOPATH/pkg/mod
+    rm -rf $GOPATH/pkg/mod
 }
 
 package_dns-over-https-client() {
@@ -46,7 +43,7 @@ package_dns-over-https-client() {
     provides=('dns-over-https-client')
 
     # Install binary
-    install -Dm755 ${srcdir}/build/bin/doh-client ${pkgdir}/usr/bin/doh-client
+    install -Dm755 ${srcdir}/${pkgbase}-${pkgver}/client ${pkgdir}/usr/bin/doh-client
 
     # Install others
     cd ${srcdir}/${pkgbase}-${pkgver}
@@ -65,7 +62,7 @@ package_dns-over-https-server() {
     replaces=('dns-over-https')
 
     # Install binary
-    install -Dm755 ${srcdir}/build/bin/doh-server ${pkgdir}/usr/bin/doh-server
+    install -Dm755 ${srcdir}/${pkgbase}-${pkgver}/server ${pkgdir}/usr/bin/doh-server
 
     # Install others
     cd ${srcdir}/${pkgbase}-${pkgver}