Date: Sunday, March 1, 2020 @ 11:58:13 Author: jelle Revision: 587464
archrelease: copy trunk to community-x86_64 Added: grafana/repos/community-x86_64/PKGBUILD (from rev 587463, grafana/trunk/PKGBUILD) grafana/repos/community-x86_64/golang-xerrors.patch (from rev 587463, grafana/trunk/golang-xerrors.patch) grafana/repos/community-x86_64/grafana.install (from rev 587463, grafana/trunk/grafana.install) grafana/repos/community-x86_64/grafana.service (from rev 587463, grafana/trunk/grafana.service) grafana/repos/community-x86_64/grafana.sysusers (from rev 587463, grafana/trunk/grafana.sysusers) grafana/repos/community-x86_64/grafana.tmpfiles (from rev 587463, grafana/trunk/grafana.tmpfiles) Deleted: grafana/repos/community-x86_64/PKGBUILD grafana/repos/community-x86_64/golang-xerrors.patch grafana/repos/community-x86_64/grafana.install grafana/repos/community-x86_64/grafana.service grafana/repos/community-x86_64/grafana.sysusers grafana/repos/community-x86_64/grafana.tmpfiles ----------------------+ PKGBUILD | 158 ++++++++++++++++++++++++------------------------- golang-xerrors.patch | 52 ++++++++-------- grafana.install | 44 ++++++------- grafana.service | 46 +++++++------- grafana.sysusers | 2 grafana.tmpfiles | 4 - 6 files changed, 153 insertions(+), 153 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-03-01 11:57:30 UTC (rev 587463) +++ PKGBUILD 2020-03-01 11:58:13 UTC (rev 587464) @@ -1,79 +0,0 @@ -# Maintainer: Sébastien "Seblu" Luttringer -# Contributor: Carsten Feuls <archli...@carstenfeuls.de> -# Contributor: Gilles Hamel <hamelg at laposte dot net> - -pkgname=grafana -pkgver=6.6.2 -pkgrel=1 -pkgdesc='Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB' -url='https://grafana.com/' -arch=('x86_64') -license=('Apache') -depends=('glibc' 'freetype2' 'fontconfig' 'gsfonts') -makedepends=('git' 'go-pie' 'npm' 'grunt-cli' 'python' 'nodejs-lts-erbium') -backup=('etc/grafana.ini') -source=("git+https://github.com/grafana/grafana.git?signed#tag=v$pkgver" - 'grafana.service' - 'grafana.sysusers' - 'grafana.tmpfiles' - ) -install=$pkgname.install -sha512sums=('SKIP' - '02a597225ee6ba8da9491a94daa33fe681846e2140e02fbb461ff7d39acd4cf99694dc03fb5f2c5ecfd180b09c44a41fe639b121499b4222b67ada57dc60d850' - '38b46d953837a7afa5a654dfeef163b210d56cad57d937018531d00cd63b5341d6f9cd777299bdc7a994d0cb7df09b8157aad0f166e76ad47564e1ad6d5441d4' - 'c1724bfc7cbd6a406f17acb661efca0f1e57e2c30cc1841f4cb7ccfc420adc40cc61cb1c023d00444827b2c40e9caa4c2fefbfd503419848c74a0b455b2375ab') -validpgpkeys=("D45B6DC53E9057C46487E25CE17E9ABACEFA59EB" "43511C6A68C9A1DE451EF51890AA4FDC4D63CBEA") - -prepare() { - cd $pkgname - # apply patch from the source array (should be a pacman feature) - local filename - for filename in "${source[@]}"; do - if [[ "$filename" =~ \.patch$ ]]; then - echo "Applying patch ${filename##*/}" - patch -p1 -N -i "$srcdir/${filename##*/}" - fi - done - # set arch linux paths - sed -ri 's,^(\s*data\s*=).*,\1 /var/lib/grafana,' conf/defaults.ini - sed -ri 's,^(\s*plugins\s*=).*,\1 /var/lib/grafana/plugins,' conf/defaults.ini - sed -ri 's,^(\s*provisioning\s*=).*,\1 /var/lib/grafana/conf/provisioning,' conf/defaults.ini - sed -ri 's,^(\s*logs\s*=).*,\1 /var/log/grafana,' conf/defaults.ini -} - -build() { - echo 'GOPATH setup' - export GOPATH="$srcdir/gopath" - export PATH+=":$GOPATH/bin" - mkdir -p "$GOPATH/src/github.com/grafana/" - ln -fsrT "$srcdir/grafana/" "$GOPATH/src/github.com/grafana/grafana" - cd "$GOPATH/src/github.com/grafana/grafana" - - echo 'building the backend' - go run build.go setup - go run build.go build - - echo 'building the frontend' - export NPM_CONFIG_PREFIX="$srcdir/npm" - export PATH+=":$NPM_CONFIG_PREFIX/bin" - npm install -g yarn - yarn install --pure-lockfile --no-progress - npm run build release -} - -package() { - install -Dm644 grafana.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/grafana.conf" - install -Dm644 grafana.sysusers "$pkgdir/usr/lib/sysusers.d/grafana.conf" - install -Dm644 grafana.service "$pkgdir/usr/lib/systemd/system/grafana.service" - cd $pkgname - install -Dsm755 bin/linux-amd64/grafana-server "$pkgdir/usr/bin/grafana-server" - install -Dsm755 bin/linux-amd64/grafana-cli "$pkgdir/usr/bin/grafana-cli" - 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/" - for i in vendor public tools; do - cp -r "$i" "$pkgdir/usr/share/grafana/$i" - done -} - -# vim:set ts=2 sw=2 et: Copied: grafana/repos/community-x86_64/PKGBUILD (from rev 587463, grafana/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-03-01 11:58:13 UTC (rev 587464) @@ -0,0 +1,79 @@ +# Maintainer: Sébastien "Seblu" Luttringer +# Contributor: Carsten Feuls <archli...@carstenfeuls.de> +# Contributor: Gilles Hamel <hamelg at laposte dot net> + +pkgname=grafana +pkgver=6.6.2 +pkgrel=2 +pkgdesc='Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB' +url='https://grafana.com/' +arch=('x86_64') +license=('Apache') +depends=('glibc' 'freetype2' 'fontconfig' 'gsfonts') +makedepends=('git' 'go-pie' 'npm' 'grunt-cli' 'python' 'nodejs-lts-erbium') +backup=('etc/grafana.ini') +source=("git+https://github.com/grafana/grafana.git?signed#tag=v$pkgver" + 'grafana.service' + 'grafana.sysusers' + 'grafana.tmpfiles' + ) +install=$pkgname.install +sha512sums=('SKIP' + '02a597225ee6ba8da9491a94daa33fe681846e2140e02fbb461ff7d39acd4cf99694dc03fb5f2c5ecfd180b09c44a41fe639b121499b4222b67ada57dc60d850' + '38b46d953837a7afa5a654dfeef163b210d56cad57d937018531d00cd63b5341d6f9cd777299bdc7a994d0cb7df09b8157aad0f166e76ad47564e1ad6d5441d4' + 'c1724bfc7cbd6a406f17acb661efca0f1e57e2c30cc1841f4cb7ccfc420adc40cc61cb1c023d00444827b2c40e9caa4c2fefbfd503419848c74a0b455b2375ab') +validpgpkeys=("D45B6DC53E9057C46487E25CE17E9ABACEFA59EB" "43511C6A68C9A1DE451EF51890AA4FDC4D63CBEA") + +prepare() { + cd $pkgname + # apply patch from the source array (should be a pacman feature) + local filename + for filename in "${source[@]}"; do + if [[ "$filename" =~ \.patch$ ]]; then + echo "Applying patch ${filename##*/}" + patch -p1 -N -i "$srcdir/${filename##*/}" + fi + done + # set arch linux paths + sed -ri 's,^(\s*data\s*=).*,\1 /var/lib/grafana,' conf/defaults.ini + sed -ri 's,^(\s*plugins\s*=).*,\1 /var/lib/grafana/plugins,' conf/defaults.ini + sed -ri 's,^(\s*provisioning\s*=).*,\1 /var/lib/grafana/conf/provisioning,' conf/defaults.ini + sed -ri 's,^(\s*logs\s*=).*,\1 /var/log/grafana,' conf/defaults.ini +} + +build() { + echo 'GOPATH setup' + export GOPATH="$srcdir/gopath" + export PATH+=":$GOPATH/bin" + mkdir -p "$GOPATH/src/github.com/grafana/" + ln -fsrT "$srcdir/grafana/" "$GOPATH/src/github.com/grafana/grafana" + cd "$GOPATH/src/github.com/grafana/grafana" + + echo 'building the backend' + go run build.go setup + go run build.go build + + echo 'building the frontend' + export NPM_CONFIG_PREFIX="$srcdir/npm" + export PATH+=":$NPM_CONFIG_PREFIX/bin" + npm install -g yarn + yarn install --pure-lockfile --no-progress + npm run build release +} + +package() { + install -Dm644 grafana.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/grafana.conf" + install -Dm644 grafana.sysusers "$pkgdir/usr/lib/sysusers.d/grafana.conf" + install -Dm644 grafana.service "$pkgdir/usr/lib/systemd/system/grafana.service" + cd $pkgname + install -Dsm755 bin/linux-amd64/grafana-server "$pkgdir/usr/bin/grafana-server" + install -Dsm755 bin/linux-amd64/grafana-cli "$pkgdir/usr/bin/grafana-cli" + 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/" + for i in vendor public tools; do + cp -r "$i" "$pkgdir/usr/share/grafana/$i" + done +} + +# vim:set ts=2 sw=2 et: Deleted: golang-xerrors.patch =================================================================== --- golang-xerrors.patch 2020-03-01 11:57:30 UTC (rev 587463) +++ golang-xerrors.patch 2020-03-01 11:58:13 UTC (rev 587464) @@ -1,26 +0,0 @@ -diff --git a/go.mod b/go.mod -index 1c90cfe4fa..3223ff3b27 100644 ---- a/go.mod -+++ b/go.mod -@@ -72,7 +72,7 @@ require ( - golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 - golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914 - golang.org/x/sync v0.0.0-20190423024810-112230192c58 -- golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373 -+ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 - gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect - gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect - gopkg.in/ini.v1 v1.46.0 -diff --git a/go.sum b/go.sum -index 476d52572b..e50d2db15e 100644 ---- a/go.sum -+++ b/go.sum -@@ -302,6 +302,8 @@ golang.org/x/tools v0.0.0-20190802220118-1d1727260058/go.mod h1:jcCCGcm9btYwXyDq - golang.org/x/tools v0.0.0-20190805222050-c5a2fd39b72a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= - golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373 h1:PPwnA7z1Pjf7XYaBP9GL1VAMZmcIWyFz7QCMSIIa3Bg= - golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA= -+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= - google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= - google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= - google.golang.org/appengine v1.6.1 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I= Copied: grafana/repos/community-x86_64/golang-xerrors.patch (from rev 587463, grafana/trunk/golang-xerrors.patch) =================================================================== --- golang-xerrors.patch (rev 0) +++ golang-xerrors.patch 2020-03-01 11:58:13 UTC (rev 587464) @@ -0,0 +1,26 @@ +diff --git a/go.mod b/go.mod +index 1c90cfe4fa..3223ff3b27 100644 +--- a/go.mod ++++ b/go.mod +@@ -72,7 +72,7 @@ require ( + golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 + golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914 + golang.org/x/sync v0.0.0-20190423024810-112230192c58 +- golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373 ++ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 + gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect + gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect + gopkg.in/ini.v1 v1.46.0 +diff --git a/go.sum b/go.sum +index 476d52572b..e50d2db15e 100644 +--- a/go.sum ++++ b/go.sum +@@ -302,6 +302,8 @@ golang.org/x/tools v0.0.0-20190802220118-1d1727260058/go.mod h1:jcCCGcm9btYwXyDq + golang.org/x/tools v0.0.0-20190805222050-c5a2fd39b72a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= + golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373 h1:PPwnA7z1Pjf7XYaBP9GL1VAMZmcIWyFz7QCMSIIa3Bg= + golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= ++golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA= ++golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= + google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= + google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= + google.golang.org/appengine v1.6.1 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I= Deleted: grafana.install =================================================================== --- grafana.install 2020-03-01 11:57:30 UTC (rev 587463) +++ grafana.install 2020-03-01 11:58:13 UTC (rev 587464) @@ -1,22 +0,0 @@ -#/bin/sh - -# arg 1: the new package version -# 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 - 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: Copied: grafana/repos/community-x86_64/grafana.install (from rev 587463, grafana/trunk/grafana.install) =================================================================== --- grafana.install (rev 0) +++ grafana.install 2020-03-01 11:58:13 UTC (rev 587464) @@ -0,0 +1,22 @@ +#/bin/sh + +# arg 1: the new package version +# 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 + 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: Deleted: grafana.service =================================================================== --- grafana.service 2020-03-01 11:57:30 UTC (rev 587463) +++ grafana.service 2020-03-01 11:58:13 UTC (rev 587464) @@ -1,23 +0,0 @@ -[Unit] -Description=Grafana service -After=network.target postgresql.service mariadb.service mysqld.service - -[Service] -User=grafana -Group=grafana -WorkingDirectory=/usr/share/grafana -ExecStart=/usr/bin/grafana-server --config=/etc/grafana.ini -LimitNOFILE=10000 -TimeoutStopSec=20 -SuccessExitStatus=0 2 -NoNewPrivileges=yes -ProtectSystem=full -ProtectHome=true -PrivateTmp=true -PrivateDevices=true -ProtectKernelTunables=true -ProtectKernelModules=true -ProtectControlGroups=true - -[Install] -WantedBy=multi-user.target Copied: grafana/repos/community-x86_64/grafana.service (from rev 587463, grafana/trunk/grafana.service) =================================================================== --- grafana.service (rev 0) +++ grafana.service 2020-03-01 11:58:13 UTC (rev 587464) @@ -0,0 +1,23 @@ +[Unit] +Description=Grafana service +After=network.target postgresql.service mariadb.service mysqld.service + +[Service] +User=grafana +Group=grafana +WorkingDirectory=/usr/share/grafana +ExecStart=/usr/bin/grafana-server --config=/etc/grafana.ini +LimitNOFILE=10000 +TimeoutStopSec=20 +SuccessExitStatus=0 2 +NoNewPrivileges=yes +ProtectSystem=full +ProtectHome=true +PrivateTmp=true +PrivateDevices=true +ProtectKernelTunables=true +ProtectKernelModules=true +ProtectControlGroups=true + +[Install] +WantedBy=multi-user.target Deleted: grafana.sysusers =================================================================== --- grafana.sysusers 2020-03-01 11:57:30 UTC (rev 587463) +++ grafana.sysusers 2020-03-01 11:58:13 UTC (rev 587464) @@ -1 +0,0 @@ -u grafana 207 - /var/lib/grafana Copied: grafana/repos/community-x86_64/grafana.sysusers (from rev 587463, grafana/trunk/grafana.sysusers) =================================================================== --- grafana.sysusers (rev 0) +++ grafana.sysusers 2020-03-01 11:58:13 UTC (rev 587464) @@ -0,0 +1 @@ +u grafana 207 - /var/lib/grafana Deleted: grafana.tmpfiles =================================================================== --- grafana.tmpfiles 2020-03-01 11:57:30 UTC (rev 587463) +++ grafana.tmpfiles 2020-03-01 11:58:13 UTC (rev 587464) @@ -1,2 +0,0 @@ -d /var/lib/grafana 0750 grafana grafana - -d /var/log/grafana 0750 grafana grafana - Copied: grafana/repos/community-x86_64/grafana.tmpfiles (from rev 587463, grafana/trunk/grafana.tmpfiles) =================================================================== --- grafana.tmpfiles (rev 0) +++ grafana.tmpfiles 2020-03-01 11:58:13 UTC (rev 587464) @@ -0,0 +1,2 @@ +d /var/lib/grafana 0750 grafana grafana - +d /var/log/grafana 0750 grafana grafana -