prometheus: 2.34.0 -> 2.35.0; new dependencies: typescript, yamllint, yarn

5 files changed, 24 insertions, 26 deletions

diff --git a/prometheus/.footprint b/prometheus/.footprint
index 73bcd645f..78bb5154a 100644
--- a/prometheus/.footprint
+++ b/prometheus/.footprint
@@ -39,9 +39,9 @@ drwxr-xr-x	root/root	usr/share/prometheus/web/ui/static/react/static/css/
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/css/main.faad45b4.css
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/css/main.faad45b4.css.map
 drwxr-xr-x	root/root	usr/share/prometheus/web/ui/static/react/static/js/
--rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/js/main.8ea0e5d3.js
--rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/js/main.8ea0e5d3.js.LICENSE.txt
--rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/js/main.8ea0e5d3.js.map
+-rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/js/main.b0a7c7cf.js
+-rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/js/main.b0a7c7cf.js.LICENSE.txt
+-rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/js/main.b0a7c7cf.js.map
 drwxr-xr-x	root/root	usr/share/prometheus/web/ui/static/react/static/media/
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/media/codicon.b3726f0165bf67ac6849.ttf
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/media/index.cd351d7c31d0d3fccf96.cjs
diff --git a/prometheus/.signature b/prometheus/.signature
index 5b7e417c6..f9be44530 100644
--- a/prometheus/.signature
+++ b/prometheus/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3+Cd50Sxn1N8qCgTbFgtDKzAHdlDjIymPT3XPbuSTxdQkdlLTtFANZ0eiyYNvLvTVqy+gJvV2Qnoypf0KF9ipwA=
-SHA256 (Pkgfile) = 0a18145a196a65252d43c8839ee8fe5871f5e7ae18043489b2e71961e35c2b1e
-SHA256 (.footprint) = 69ef59367bba7b0a3d5908a96ee521f3c1c3262ed14ce7f991f1fafd8d81818a
-SHA256 (prometheus-2.34.0.tar.gz) = 76bb5afff1a9be179b99afe624fae73d5c23a27976f2bcb2dc663d1942e87e22
+RWSagIOpLGJF39TpMnOmr/AA2eOK8PRavM2PXKeYB63Ix8HRF10d179D96hT8LkvAHla5QKRHG/72A+xN5KtydqbVL9y+o/MAQs=
+SHA256 (Pkgfile) = d1117b1b90676991603f800fb73b6416b48dfae8935e03434a641ffa5d8bed94
+SHA256 (.footprint) = 3d085d00c3c68e2468530455b916dc6b2ae87bd2919ae329695916c781df8b7d
+SHA256 (prometheus-2.35.0.tar.gz) = 5264a7b59f5b9e28d3c47bf694a1062e6d3745c3797d28585c2b44eb9d72da1f
 SHA256 (prometheus.conf) = b3a7924e380f4f78fa6016bde9c7ca55778a46a440ffd00f4cf8c0d1327fc9ec
 SHA256 (prometheus.service) = c212b4a1f6a0e2f376254272304b29eb56cd7ba18f3819c0bbf3a3cf8e4a37f0
diff --git a/prometheus/Pkgfile b/prometheus/Pkgfile
index abea37485..465d269f4 100644
--- a/prometheus/Pkgfile
+++ b/prometheus/Pkgfile
@@ -1,18 +1,16 @@
 # Description: an open-source systems monitoring and alerting toolkit
 # URL: https://prometheus.io
 # Maintainer: Tim Biermann, tbier at posteo dot de
-# Depends on: go npm
+# Depends on: go npm typescript yamllint yarn
 
 name=prometheus
-version=2.34.0
+version=2.35.0
 release=1
 source=(https://github.com/prometheus/prometheus/archive/v$version/$name-$version.tar.gz
   prometheus.conf prometheus.service)
 
 build() {
   # setup build env {{{
-  export LC_ALL=C
-
   ## Node Setup
   #export NODE_ENV=production
   #[ ! -d $PKGMK_SOURCE_DIR/npm_cache ] && mkdir $PKGMK_SOURCE_DIR/npm_cache
@@ -21,16 +19,15 @@ build() {
   export PATH+=":$NPM_CONFIG_PREFIX/bin"
 
   ## Go Setup
-  export GOPATH="$SRC/gopath"
-  export PATH+=":$GOPATH/bin"
-  mkdir -p "$GOPATH/src/github.com/grafana/"
-  ln -fsrT "$SRC/grafana-$version/" "$GOPATH/src/github.com/grafana/grafana"
   export CGO_LDFLAGS="${LDFLAGS}"
   export CGO_CPPFLAGS="${CPPFLAGS}"
   export CGO_CFLAGS="${CFLAGS}"
   export CGO_CXXFLAGS="${CXXFLAGS}"
   export GOFLAGS="-buildmode=pie -trimpath -modcacherw"
 
+  mkdir "$PKGMK_SOURCE_DIR/gopath" || true
+  export GOPATH="$PKGMK_SOURCE_DIR/gopath"
+
   GOLDFLAGS="-X github.com/prometheus/common/version.Version=$version
     -X github.com/prometheus/common/version.Revision=CRUX
     -X github.com/prometheus/common/version.Branch=master
@@ -45,27 +42,28 @@ build() {
   # }}}
   cd $name-$version
 
-  cd web/ui
-  npm install
-  npm run build
-  npm run build:module
-  npm run lint
+  pushd web/ui
   GOOS= GOARCH= go generate -x -v
-  cd ../..
+  popd
+  make ui-install
+  make assets
 
-  gofmt -w ./web/ui
-  go mod vendor
   go build \
     -trimpath \
-    -mod=vendor \
+    -buildmode=pie \
+    -mod=readonly \
+    -modcacherw \
     -ldflags "$GOLDFLAGS" \
-    -tags netgo,builtinassets \
     ./cmd/prometheus
+
   go build \
     -trimpath \
-    -mod=vendor \
+    -buildmode=pie \
+    -mod=readonly \
+    -modcacherw \
     -ldflags "$GOLDFLAGS" \
     ./cmd/promtool
+
   # install
   install -Dm755 -t $PKG/usr/bin prometheus promtool
 
diff --git a/prometheus/data/queries.active b/prometheus/data/queries.active
deleted file mode 100644
index 8bfef0eab..000000000
--- a/prometheus/data/queries.active
+++ /dev/null
diff --git a/prometheus/data/wal/00000000 b/prometheus/data/wal/00000000
deleted file mode 100644
index 545f9e4b3..000000000
--- a/prometheus/data/wal/00000000
+++ /dev/null