Date: Wednesday, September 6, 2017 @ 00:48:55 Author: seblu Revision: 255912
upgpkg: grafana 4.4.3-1 - fix FS#54510 - fix FS#55071 - fix FS#55516 Modified: grafana/trunk/PKGBUILD grafana/trunk/grafana.install grafana/trunk/grafana.sysusers grafana/trunk/grafana.tmpfiles ------------------+ PKGBUILD | 14 +++++++------- grafana.install | 15 ++++++++++++--- grafana.sysusers | 2 +- grafana.tmpfiles | 4 ++-- 4 files changed, 22 insertions(+), 13 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-09-05 23:56:37 UTC (rev 255911) +++ PKGBUILD 2017-09-06 00:48:55 UTC (rev 255912) @@ -4,14 +4,14 @@ # Contributor: Gilles Hamel <hamelg at laposte dot net> pkgname=grafana -pkgver=4.3.2 +pkgver=4.4.3 pkgrel=1 pkgdesc='Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB' url='http://grafana.org' -arch=('x86_64' 'i686') +arch=('x86_64') license=('Apache') depends=('glibc' 'freetype2' 'fontconfig') -makedepends=('git' 'go' 'npm' 'grunt-cli') +makedepends=('git' 'go' 'npm' 'grunt-cli' 'python2') backup=("etc/grafana.ini") source=("git+https://github.com/grafana/grafana.git#tag=v$pkgver"; "grafana.service" @@ -21,8 +21,8 @@ install=$pkgname.install md5sums=('SKIP' '2f1d73689923ecee92a102a65b91003a' - '49688ed04bb3fac45fd48d0ac99e52d5' - 'a23177c9e555a7d8ede65c86cf21add2') + 'e991d8cdf91c1e25652cdbc51fc726c5' + 'b9b576d1959fc063b3399892e201488c') prepare() { cd $pkgname @@ -53,7 +53,7 @@ export PATH+=":$NPM_CONFIG_PREFIX/bin" npm install -g yarn yarn install --pure-lockfile --no-progress - npm run build + npm run build release } package() { @@ -63,7 +63,7 @@ cd $pkgname install -Dsm755 bin/grafana-server "$pkgdir/usr/bin/grafana-server" install -Dsm755 bin/grafana-cli "$pkgdir/usr/bin/grafana-cli" - install -Dm644 conf/sample.ini "$pkgdir/etc/$pkgname.ini" + install -Dm640 -o207 -g207 conf/sample.ini "$pkgdir/etc/$pkgname.ini" install -Dm644 conf/defaults.ini "$pkgdir/usr/share/$pkgname/conf/defaults.ini" install -dm755 "$pkgdir/usr/share/grafana/" cp -r vendor "$pkgdir/usr/share/grafana/" Modified: grafana.install =================================================================== --- grafana.install 2017-09-05 23:56:37 UTC (rev 255911) +++ grafana.install 2017-09-06 00:48:55 UTC (rev 255912) @@ -4,10 +4,19 @@ # arg 2: the old package version post_upgrade() { if (( "$(vercmp $2 2.6.0-3)" < 0 )); then - echo '==> Configuration moved to /etc/grafana.ini' - fi + echo '==> Configuration moved to /etc/grafana.ini' + fi + if (( "$(vercmp $2 4.4.3-1)" < 0 )); then + echo '==> Grafana now uses static UID/GID 207' + echo '==> Trying to update your previous UID/GID' + if ! { usermod -u 207 grafana && groupmod -g 207 grafana && + chown -R 207:207 /var/{lib,log}/grafana; }; then + echo '==> Automatic GID/UID change failed. Do it manually!' + echo '==> usermod -g 207 grafana && groupmod -u 207 grafana && chown -R 207:207 /var/l{ib,og}/grafana' + fi + echo '==> Check the ownership of your files!' + fi return 0 } - # vim:set ts=2 sw=2 et: Modified: grafana.sysusers =================================================================== --- grafana.sysusers 2017-09-05 23:56:37 UTC (rev 255911) +++ grafana.sysusers 2017-09-06 00:48:55 UTC (rev 255912) @@ -1 +1 @@ -u grafana - - /var/lib/grafana +u grafana 207 - /var/lib/grafana Modified: grafana.tmpfiles =================================================================== --- grafana.tmpfiles 2017-09-05 23:56:37 UTC (rev 255911) +++ grafana.tmpfiles 2017-09-06 00:48:55 UTC (rev 255912) @@ -1,3 +1,3 @@ -d /var/lib/grafana 0755 grafana grafana - -d /var/log/grafana 0755 grafana grafana - +d /var/lib/grafana 0750 grafana grafana - +d /var/log/grafana 0750 grafana grafana - L /var/lib/grafana/log - - - - ../../log/grafana
