[arch-commits] Commit in dns-over-https/trunk (PKGBUILD)

[Morten Linderud]

    Date: Saturday, May 9, 2020 @ 14:33:16
  Author: foxboron
Revision: 625968

upgpkg: dns-over-https 2.2.1-3

Removed go get usage and updated to current guidelines

Modified:
  dns-over-https/trunk/PKGBUILD

----------+
 PKGBUILD |   30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-09 14:31:09 UTC (rev 625967)
+++ PKGBUILD	2020-05-09 14:33:16 UTC (rev 625968)
@@ -1,10 +1,11 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Morten Linderud <foxboron at archlinux.org>
 # Contributor: Sherlock Holo <sherlockya(at)gmail.com>
 # Contributor: Ariel AxionL <i [at] axionl [dot] me>
 
 pkgname=dns-over-https
 pkgver=2.2.1
-pkgrel=2
+pkgrel=3
 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')
@@ -12,23 +13,30 @@
 backup=('etc/dns-over-https/doh-client.conf'
         'etc/dns-over-https/doh-server.conf')
 provides=('dns-over-https-client' 'dns-over-https-server')
-makedepends=('go-pie' 'golang-golang-x-crypto' 'golang-golang-x-net' 'golang-golang-x-sys' 'git')
+makedepends=('go' 'git')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/m13253/dns-over-https/archive/v$pkgver.tar.gz")
 sha256sums=('49cf259a4756950d1653126b2609d2c713782aab8194915c4be11bf0017ba4f0')
 
-build() {
-  mkdir -p "$srcdir"/go/src
-  export GOPATH="$srcdir/go:/usr/share/gocode"
-
-  cd "$srcdir"/$pkgname-$pkgver
+prepare(){
+  cd "$pkgname-$pkgver"
   sed -i 's/\/local//g' systemd/doh-{client,server}.service
+}
 
-  go get github.com/BurntSushi/toml github.com/gorilla/handlers github.com/miekg/dns
-  
-  go build -gcflags "all=-trimpath=$PWD" -asmflags "all=-trimpath=$PWD" -ldflags "-w -s -extldflags $LDFLAGS" -v -o client ./doh-client
-  go build -gcflags "all=-trimpath=$PWD" -asmflags "all=-trimpath=$PWD" -ldflags "-w -s -extldflags $LDFLAGS" -v -o server ./doh-server
+build() {
+  cd "$pkgname-$pkgver"
+  export GOFLAGS="-buildmode=pie -trimpath"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  go build -v -o client ./doh-client
+  go build -v -o server ./doh-server
 }
 
+check(){
+  cd "$pkgname-$pkgver"
+  go test -v ./...
+}
+
 package() {
   cd $pkgname-$pkgver
   install -Dm755 client "$pkgdir"/usr/bin/doh-client