[arch-commits] Commit in grafana/trunk (PKGBUILD)

[Levente Polyak]

    Date: Wednesday, June 3, 2020 @ 16:13:11
  Author: anthraxx
Revision: 638261

upgpkg: grafana 7.0.2-1: security release and go hardening

Modified:
  grafana/trunk/PKGBUILD

----------+
 PKGBUILD |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-03 15:24:29 UTC (rev 638260)
+++ PKGBUILD	2020-06-03 16:13:11 UTC (rev 638261)
@@ -3,7 +3,7 @@
 # Contributor: Gilles Hamel <hamelg at laposte dot net>
 
 pkgname=grafana
-pkgver=7.0.1
+pkgver=7.0.2
 pkgrel=1
 pkgdesc='Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB'
 url='https://grafana.com/'
@@ -10,9 +10,9 @@
 arch=('x86_64')
 license=('Apache')
 depends=('glibc' 'freetype2' 'fontconfig' 'gsfonts')
-makedepends=('git' 'go-pie' 'npm' 'grunt-cli' 'python' 'nodejs-lts-erbium')
+makedepends=('git' 'go' 'npm' 'grunt-cli' 'python' 'nodejs-lts-erbium')
 backup=('etc/grafana.ini')
-source=("git+https://github.com/grafana/grafana.git#tag=v$pkgver"
+source=("git+https://github.com/grafana/grafana.git#tag=v$pkgver?signed"
         'grafana.service'
         'grafana.sysusers'
         'grafana.tmpfiles'
@@ -56,6 +56,11 @@
   cd "$GOPATH/src/github.com/grafana/grafana"
 
   echo 'building the backend'
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
   go run build.go setup
   go run build.go build