Update to v1.4.2

1 files changed, 45 insertions, 34 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7a265d0250ca..333022b5aa01 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,58 @@
-# Maintainer: Sherlock-Holo <sherlockya@gmail.com>
-
+# Maintainer: Sherlock Holo <sherlockya(at)gmail.com>
 pkgname=dns-over-https
-#_pkgname=dns-over-https
-pkgver=1.3.6
+_pkgver=1.4.2
+pkgver=v$_pkgver
+_pkgname=$pkgname
 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')
+arch=('i686' 'x86_64' 'armv7h')
 license=('MIT')
-depends=('glibc')
+depends=()
 makedepends=('go' 'git')
-source=("https://github.com/m13253/dns-over-https/archive/v$pkgver.tar.gz")
-backup=('etc/dns-over-https/doh-client.conf'
-        'etc/dns-over-https/doh-server.conf')
-sha256sums=('62921d0bb1813f5fa5bec9fb69f81f7a84ac6e2f96fc2d9d2800799e5355d94e')
-
-prepare(){
-        #mkdir -p $srcdir/gopath
-        #export GOPATH=$srcdir/gopath
-        cd $srcdir/$pkgname-$pkgver
-        sed -i 's/\/usr\/local/${pkgdir}\/usr/g' Makefile
-        sed -i 's/\/local//g' systemd/doh-client.service
-        sed -i 's/\/local//g' systemd/doh-server.service
-}
+source=("https://github.com/m13253/dns-over-https/archive/$pkgver.tar.gz")
+backup=(
+'etc/dns-over-https/doh-client.conf'
+'etc/dns-over-https/doh-server.conf'
+)
+sha256sums=('c3181a8cd20710f09cc6b6749da7f6c05fd1eb063a4c8d740b42e50dbddc045d')
 
-build(){
-        cd $srcdir/$pkgname-$pkgver
-        make
-}
+build() {
+    mv $srcdir/$pkgname-$_pkgver $srcdir/$_pkgname
+
+    rm -rf "$srcdir/go/src"
+
+    mkdir -p "$srcdir/go/src"
+
+    export GOPATH="$srcdir/go"
+
+    mv "$srcdir/$_pkgname" "$srcdir/go/src/"
+
+    cd "$srcdir/go/src/$_pkgname/"
+
+    echo ":: Building binary"
+
+    cd "$srcdir/go/src/$_pkgname/doh-client"
+    go get -v \
+            -gcflags "-trimpath $GOPATH/src"
 
-package(){
-        cd $srcdir/$pkgname-$pkgver
-        install -Dm755 doh-client/doh-client $pkgdir/usr/bin/doh-client
-        install -Dm755 doh-server/doh-server $pkgdir/usr/bin/doh-server
+    cd "$srcdir/go/src/$_pkgname/doh-server"
+    go get -v \
+            -gcflags "-trimpath $GOPATH/src"
+    }
 
-        install -Dm644 doh-client/doh-client.conf $pkgdir/etc/dns-over-https/doh-client.conf
-        install -Dm644 doh-server/doh-server.conf $pkgdir/etc/dns-over-https/doh-server.conf
+package() {
+    find "$srcdir/go/bin/" -type f -executable | while read filename; do
+        install -DT "$filename" "$pkgdir/usr/bin/$(basename $filename)"
+    done
 
-        install -Dm644 systemd/doh-client.service $pkgdir/usr/lib/systemd/system/doh-client.service
-        install -Dm644 systemd/doh-server.service $pkgdir/usr/lib/systemd/system/doh-server.service
+    cd $srcdir/go/src/$_pkgname
+    install -Dm644 doh-client/doh-client.conf $pkgdir/etc/dns-over-https/doh-client.conf
+    install -Dm644 doh-server/doh-server.conf $pkgdir/etc/dns-over-https/doh-server.conf
 
-        install -Dm755 NetworkManager/dispatcher.d/doh-client $pkgdir/etc/NetworkManager/dispatcher.d/doh-client
-        install -Dm755 NetworkManager/dispatcher.d/doh-server $pkgdir/etc/NetworkManager/dispatcher.d/doh-server
+    install -Dm644 systemd/doh-client.service $pkgdir/usr/lib/systemd/system/doh-client.service
+    install -Dm644 systemd/doh-server.service $pkgdir/usr/lib/systemd/system/doh-server.service
 
-        install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+    install -Dm755 NetworkManager/dispatcher.d/doh-client $pkgdir/etc/NetworkManager/dispatcher.d/doh-client
+    install -Dm755 NetworkManager/dispatcher.d/doh-server $pkgdir/etc/NetworkManager/dispatcher.d/doh-server
 }