update to 0.18

1 files changed, 19 insertions, 12 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0a5b0798cbe9..d78fc72463e7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=blocky
-pkgver=0.17
+pkgver=0.18
 pkgrel=1
 pkgdesc="Fast and lightweight DNS proxy as ad-blocker"
 arch=('x86_64' 'armv6h' 'armv7h' 'aarch64')
@@ -12,42 +12,49 @@ depends=('glibc')
 makedepends=('go')
 backup=('etc/blocky.yml')
 install=blocky.install
+options=('!lto')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
         'blocky.service'
         'blocky.sysusers'
         'blocky.yml')
-sha256sums=('e4b11fa6b50f43d3d9d39adb18608a1e74c60c2f6239793abcfcef3f31851bb4'
+sha256sums=('24e0947544a2fa1a9bc95944fc1b6ac96fbdecd98838771bb8020766276234c9'
             '21a56bc11ad08186b0f6d3394106500c8e662662fe9af5bed56d788fc3c91ebb'
             '8ef3cfa71ee8d2ad427dc5d83df7967a6b3e6e1dfafaec8cb4520e7269c2471b'
             'b2240a9a3a0d732920c481b3d6c80c8d78d7f8153129c8cdf33851c9b16e6e39')
 
+prepare() {
+    cd "$pkgname-$pkgver"
+    mkdir -p build
+    go mod download
+}
+
 build() {
     export CGO_CPPFLAGS="${CPPFLAGS}"
     export CGO_CFLAGS="${CFLAGS}"
     export CGO_CXXFLAGS="${CXXFLAGS}"
     export CGO_LDFLAGS="${LDFLAGS}"
-    export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
+    export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
 
     cd "$pkgname-$pkgver"
     ## make build overrides our GOFLAGS
     local _BUILDTIME="$(date '+%Y%m%d-%H%M%S')"
-    go build -o bin/blocky -ldflags "-linkmode=external \
-        -X github.com/0xERR0R/blocky/util.Version=$pkgver \
-        -X github.com/0xERR0R/blocky/util.BuildTime=$_BUILDTIME"
+    local _govar="${url#https://}/util"
+    go build -o build \
+        -ldflags "-linkmode=external -extldflags ${LDFLAGS} -X $_govar.Version=$pkgver -X $_govar.BuildTime=$_BUILDTIME"
 }
 
 check() {
     cd "$pkgname-$pkgver"
-    make test
+    go test ./...
 }
 
 package() {
-    install -Dm 644 blocky.sysusers "$pkgdir/usr/lib/sysusers.d/blocky.conf"
-    install -Dm 644 blocky.service -t "$pkgdir/usr/lib/systemd/system/"
-    install -Dm 644 blocky.yml -t "$pkgdir/etc/"
+    install -Dm644 blocky.sysusers "$pkgdir/usr/lib/sysusers.d/blocky.conf"
+    install -Dm644 blocky.service -t "$pkgdir/usr/lib/systemd/system/"
+    install -Dm644 blocky.yml -t "$pkgdir/etc/"
     cd "$pkgname-$pkgver"
-    install -D "bin/$pkgname" -t "$pkgdir/usr/bin/"
-    install -Dm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
+    install -D build/blocky -t "$pkgdir/usr/bin/"
+    install -Dm644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
 }
 
 # vim:set ts=4 sw=4 et: