Merge remote-tracking branch 'origin/3.6' into 3.7

ffmpeg4/.footprint

@@ -0,0 +1,192 @@
+drwxr-xr-x	root/root	etc/
+drwxr-xr-x	root/root	etc/ld.so.conf.d/
+-rw-r--r--	root/root	etc/ld.so.conf.d/ffmpeg4.conf
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/include/
+drwxr-xr-x	root/root	usr/include/ffmpeg4/
+drwxr-xr-x	root/root	usr/include/ffmpeg4/libavcodec/
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavcodec/ac3_parser.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavcodec/adts_parser.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavcodec/avcodec.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavcodec/avdct.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavcodec/avfft.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavcodec/bsf.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavcodec/codec.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavcodec/codec_desc.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavcodec/codec_id.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavcodec/codec_par.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavcodec/d3d11va.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavcodec/dirac.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavcodec/dv_profile.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavcodec/dxva2.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavcodec/jni.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavcodec/mediacodec.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavcodec/packet.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavcodec/qsv.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavcodec/vaapi.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavcodec/vdpau.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavcodec/version.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavcodec/videotoolbox.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavcodec/vorbis_parser.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavcodec/xvmc.h
+drwxr-xr-x	root/root	usr/include/ffmpeg4/libavdevice/
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavdevice/avdevice.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavdevice/version.h
+drwxr-xr-x	root/root	usr/include/ffmpeg4/libavfilter/
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavfilter/avfilter.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavfilter/buffersink.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavfilter/buffersrc.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavfilter/version.h
+drwxr-xr-x	root/root	usr/include/ffmpeg4/libavformat/
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavformat/avformat.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavformat/avio.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavformat/version.h
+drwxr-xr-x	root/root	usr/include/ffmpeg4/libavresample/
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavresample/avresample.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavresample/version.h
+drwxr-xr-x	root/root	usr/include/ffmpeg4/libavutil/
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/adler32.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/aes.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/aes_ctr.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/attributes.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/audio_fifo.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/avassert.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/avconfig.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/avstring.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/avutil.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/base64.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/blowfish.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/bprint.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/bswap.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/buffer.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/camellia.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/cast5.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/channel_layout.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/common.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/cpu.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/crc.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/des.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/dict.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/display.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/dovi_meta.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/downmix_info.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/encryption_info.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/error.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/eval.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/ffversion.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/fifo.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/file.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/film_grain_params.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/frame.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/hash.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/hdr_dynamic_metadata.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/hmac.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/hwcontext.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/hwcontext_cuda.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/hwcontext_d3d11va.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/hwcontext_drm.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/hwcontext_dxva2.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/hwcontext_mediacodec.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/hwcontext_opencl.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/hwcontext_qsv.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/hwcontext_vaapi.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/hwcontext_vdpau.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/hwcontext_videotoolbox.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/hwcontext_vulkan.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/imgutils.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/intfloat.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/intreadwrite.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/lfg.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/log.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/lzo.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/macros.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/mastering_display_metadata.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/mathematics.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/md5.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/mem.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/motion_vector.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/murmur3.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/opt.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/parseutils.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/pixdesc.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/pixelutils.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/pixfmt.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/random_seed.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/rational.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/rc4.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/replaygain.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/ripemd.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/samplefmt.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/sha.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/sha512.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/spherical.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/stereo3d.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/tea.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/threadmessage.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/time.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/timecode.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/timestamp.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/tree.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/twofish.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/tx.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/version.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/video_enc_params.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libavutil/xtea.h
+drwxr-xr-x	root/root	usr/include/ffmpeg4/libpostproc/
+-rw-r--r--	root/root	usr/include/ffmpeg4/libpostproc/postprocess.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libpostproc/version.h
+drwxr-xr-x	root/root	usr/include/ffmpeg4/libswresample/
+-rw-r--r--	root/root	usr/include/ffmpeg4/libswresample/swresample.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libswresample/version.h
+drwxr-xr-x	root/root	usr/include/ffmpeg4/libswscale/
+-rw-r--r--	root/root	usr/include/ffmpeg4/libswscale/swscale.h
+-rw-r--r--	root/root	usr/include/ffmpeg4/libswscale/version.h
+drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/ffmpeg4/
+-rw-r--r--	root/root	usr/lib/ffmpeg4/libavcodec.a
+lrwxrwxrwx	root/root	usr/lib/ffmpeg4/libavcodec.so -> libavcodec.so.58.134.100
+lrwxrwxrwx	root/root	usr/lib/ffmpeg4/libavcodec.so.58 -> libavcodec.so.58.134.100
+-rwxr-xr-x	root/root	usr/lib/ffmpeg4/libavcodec.so.58.134.100
+-rw-r--r--	root/root	usr/lib/ffmpeg4/libavdevice.a
+lrwxrwxrwx	root/root	usr/lib/ffmpeg4/libavdevice.so -> libavdevice.so.58.13.100
+lrwxrwxrwx	root/root	usr/lib/ffmpeg4/libavdevice.so.58 -> libavdevice.so.58.13.100
+-rwxr-xr-x	root/root	usr/lib/ffmpeg4/libavdevice.so.58.13.100
+-rw-r--r--	root/root	usr/lib/ffmpeg4/libavfilter.a
+lrwxrwxrwx	root/root	usr/lib/ffmpeg4/libavfilter.so -> libavfilter.so.7.110.100
+lrwxrwxrwx	root/root	usr/lib/ffmpeg4/libavfilter.so.7 -> libavfilter.so.7.110.100
+-rwxr-xr-x	root/root	usr/lib/ffmpeg4/libavfilter.so.7.110.100
+-rw-r--r--	root/root	usr/lib/ffmpeg4/libavformat.a
+lrwxrwxrwx	root/root	usr/lib/ffmpeg4/libavformat.so -> libavformat.so.58.76.100
+lrwxrwxrwx	root/root	usr/lib/ffmpeg4/libavformat.so.58 -> libavformat.so.58.76.100
+-rwxr-xr-x	root/root	usr/lib/ffmpeg4/libavformat.so.58.76.100
+-rw-r--r--	root/root	usr/lib/ffmpeg4/libavresample.a
+lrwxrwxrwx	root/root	usr/lib/ffmpeg4/libavresample.so -> libavresample.so.4.0.0
+lrwxrwxrwx	root/root	usr/lib/ffmpeg4/libavresample.so.4 -> libavresample.so.4.0.0
+-rwxr-xr-x	root/root	usr/lib/ffmpeg4/libavresample.so.4.0.0
+-rw-r--r--	root/root	usr/lib/ffmpeg4/libavutil.a
+lrwxrwxrwx	root/root	usr/lib/ffmpeg4/libavutil.so -> libavutil.so.56.70.100
+lrwxrwxrwx	root/root	usr/lib/ffmpeg4/libavutil.so.56 -> libavutil.so.56.70.100
+-rwxr-xr-x	root/root	usr/lib/ffmpeg4/libavutil.so.56.70.100
+-rw-r--r--	root/root	usr/lib/ffmpeg4/libpostproc.a
+lrwxrwxrwx	root/root	usr/lib/ffmpeg4/libpostproc.so -> libpostproc.so.55.9.100
+lrwxrwxrwx	root/root	usr/lib/ffmpeg4/libpostproc.so.55 -> libpostproc.so.55.9.100
+-rwxr-xr-x	root/root	usr/lib/ffmpeg4/libpostproc.so.55.9.100
+-rw-r--r--	root/root	usr/lib/ffmpeg4/libswresample.a
+lrwxrwxrwx	root/root	usr/lib/ffmpeg4/libswresample.so -> libswresample.so.3.9.100
+lrwxrwxrwx	root/root	usr/lib/ffmpeg4/libswresample.so.3 -> libswresample.so.3.9.100
+-rwxr-xr-x	root/root	usr/lib/ffmpeg4/libswresample.so.3.9.100
+-rw-r--r--	root/root	usr/lib/ffmpeg4/libswscale.a
+lrwxrwxrwx	root/root	usr/lib/ffmpeg4/libswscale.so -> libswscale.so.5.9.100
+lrwxrwxrwx	root/root	usr/lib/ffmpeg4/libswscale.so.5 -> libswscale.so.5.9.100
+-rwxr-xr-x	root/root	usr/lib/ffmpeg4/libswscale.so.5.9.100
+drwxr-xr-x	root/root	usr/lib/ffmpeg4/pkgconfig/
+-rw-r--r--	root/root	usr/lib/ffmpeg4/pkgconfig/libavcodec.pc
+-rw-r--r--	root/root	usr/lib/ffmpeg4/pkgconfig/libavdevice.pc
+-rw-r--r--	root/root	usr/lib/ffmpeg4/pkgconfig/libavfilter.pc
+-rw-r--r--	root/root	usr/lib/ffmpeg4/pkgconfig/libavformat.pc
+-rw-r--r--	root/root	usr/lib/ffmpeg4/pkgconfig/libavresample.pc
+-rw-r--r--	root/root	usr/lib/ffmpeg4/pkgconfig/libavutil.pc
+-rw-r--r--	root/root	usr/lib/ffmpeg4/pkgconfig/libpostproc.pc
+-rw-r--r--	root/root	usr/lib/ffmpeg4/pkgconfig/libswresample.pc
+-rw-r--r--	root/root	usr/lib/ffmpeg4/pkgconfig/libswscale.pc
+drwxr-xr-x	root/root	usr/share/

ffmpeg4/.signature

@@ -0,0 +1,6 @@
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF3+ev/aysOS0ulR7LQBUXFNnJOil91jcqYKBWCOvAu+NWB995ZE4iy8dQnjHiZygP+YUZA14dUNORWyUNEJIcpgQ=
+SHA256 (Pkgfile) = ca99857745037f83c18950c610d5113f0b8444b670a4808c6d33b4ef678b1321
+SHA256 (.footprint) = 9922049c01ef695d784d55390bf297d89b95d011c23e736aff2bbe625d9148c4
+SHA256 (ffmpeg-4.4.1.tar.bz2) = 8fc9f20ac5ed95115a9e285647add0eedd5cc1a98a039ada14c132452f98ac42
+SHA256 (CVE-2018-6621.patch) = e3b9aff1fe9aef2d7153d7517f9c349beef27c2859bf1fb01076eeab263a445e

ffmpeg4/CVE-2018-6621.patch

@@ -0,0 +1,11 @@
+--- a/libavcodec/utvideodec.c	2017-12-11 05:35:09.000000000 +0800
++++ b/libavcodec/utvideodec.c	2018-02-06 15:54:54.872000000 +0800
+@@ -561,7 +561,7 @@ static int decode_frame(AVCodecContext *
+             for (j = 0; j < c->slices; j++) {
+                 slice_end   = bytestream2_get_le32u(&gb);
+                 if (slice_end < 0 || slice_end < slice_start ||
+-                    bytestream2_get_bytes_left(&gb) < slice_end) {
++                    bytestream2_get_bytes_left(&gb) < slice_end + 1024LL) {
+                     av_log(avctx, AV_LOG_ERROR, "Incorrect slice size\n");
+                     return AVERROR_INVALIDDATA;
+                 }

ffmpeg4/Pkgfile

@@ -0,0 +1,71 @@
+# Description: Complete solution to record, convert and stream audio and video (version 4).
+# URL: http://ffmpeg.org/
+# Maintainer: Danny Rawlins, crux at romster dot me
+# Depends on: yasm
+# Optional: alsa-lib cuda dav1d fdk-aac nv-codec-headers gnutls gsm jack jack-audio-connection-kit lame libass libsdl2 libtheora libva libvdpau libvorbis libvpx libwebp opus pulseaudio x264 x265
+
+name=ffmpeg4
+version=4.4.1
+release=1
+source=(https://ffmpeg.org/releases/ffmpeg-$version.tar.bz2
+	CVE-2018-6621.patch)
+
+build() {
+	cd ffmpeg-$version
+
+	#https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-6621
+	patch -p1 -i $SRC/CVE-2018-6621.patch
+
+[ -e '/usr/share/pkgconfig/ffnvcodec.pc' ] && PKGMK_FFMPEG+=' --enable-nvdec --enable-nvenc'
+[ -e '/usr/include/AMF/core/VulkanAMF.h' ] && PKGMK_FFMPEG+=' --enable-amf'
+[ -e '/usr/bin/clang' ] && [ -e '/usr/lib/pkgconfig/cuda.pc' ] && PKGMK_FFMPEG+=' --enable-cuda-llvm'
+[ -e '/usr/lib/pkgconfig/libwebp.pc' ] && PKGMK_FFMPEG+=' --enable-libwebp'
+[ -e '/usr/lib/pkgconfig/vdpau.pc' ] && PKGMK_FFMPEG+=' --enable-vdpau'
+[ -e '/usr/lib/pkgconfig/freetype2.pc' ] && PKGMK_FFMPEG+=' --enable-libfreetype'
+[ -e '/usr/lib/pkgconfig/jack.pc' ] && PKGMK_FFMPEG+=' --enable-libjack'
+[ -e '/usr/lib/pkgconfig/x264.pc' ] && PKGMK_FFMPEG+=' --enable-libx264'
+[ -e '/usr/lib/pkgconfig/x265.pc' ] && PKGMK_FFMPEG+=' --enable-libx265'
+[ -e '/usr/lib/pkgconfig/libass.pc' ] && PKGMK_FFMPEG+=' --enable-libass'
+[ -e '/usr/lib/libgsm.so' ] && PKGMK_FFMPEG+=' --enable-libgsm'
+[ -e '/usr/include/lame/lame.h' ] && PKGMK_FFMPEG+=' --enable-libmp3lame'
+[ -e '/usr/lib/pkgconfig/opus.pc' ] && PKGMK_FFMPEG+=' --enable-libopus'
+[ -e '/usr/lib/pkgconfig/vpx.pc' ] && PKGMK_FFMPEG+=' --enable-libvpx'
+[ -e '/usr/lib/pkgconfig/vorbis.pc' ] && PKGMK_FFMPEG+=' --enable-libvorbis'
+[ -e '/usr/lib/pkgconfig/theora.pc' ] && PKGMK_FFMPEG+=' --enable-libtheora'
+[ -e '/usr/lib/pkgconfig/libpulse.pc' ] && PKGMK_FFMPEG+=' --enable-libpulse'
+[ -e '/usr/lib/pkgconfig/fdk-aac.pc' ] && PKGMK_FFMPEG+=' --enable-libfdk-aac --enable-nonfree'
+[ -e '/usr/lib/pkgconfig/dav1d.pc' ] && PKGMK_FFMPEG+=' --enable-libdav1d'
+
+	if [ -e '/usr/lib/pkgconfig/gnutls.pc' ]; then
+		PKGMK_FFMPEG+=' --enable-gnutls'
+	else
+		PKGMK_FFMPEG+=' --enable-openssl --enable-nonfree'
+	fi
+
+	./configure ${PKGMK_FFMPEG} \
+		--prefix=/usr \
+		--incdir='/usr/include/ffmpeg4' \
+		--libdir='/usr/lib/ffmpeg4' \
+		--shlibdir='/usr/lib/ffmpeg4' \
+		--disable-debug \
+		--disable-doc \
+		--enable-gpl \
+		--enable-version3 \
+		--enable-shared \
+		--enable-pic \
+		--enable-avfilter \
+		--enable-postproc \
+		--enable-pthreads \
+		--enable-swresample \
+		--enable-avresample
+
+	make
+	make DESTDIR=$PKG install
+
+	install -d $PKG/etc/ld.so.conf.d
+	echo -e '/usr/lib/\n/usr/lib/ffmpeg4/' > \
+		$PKG/etc/ld.so.conf.d/ffmpeg4.conf
+
+	rm -r $PKG/usr/share/ffmpeg/examples
+	rm -r $PKG/usr/{bin,share/ffmpeg}
+}

firefox/.signature

@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF39Hqy3X2WVuGHvfuo2t+tcE72FWF8J/Md1kpW4/+BG+8gb6uyv6EJLpmQaqfX5seu/b671cih5AEpL5mCCHNkAk=
-SHA256 (Pkgfile) = 2ae46d4db8d8e602222d17cf8cc517decc4af434142fcaa4a7c9bc5c0422134d
+RWSagIOpLGJF31VD4lCm8lml0buic15ZeEnHRc/nv76EH5Dkixp3v0SwwaLO5u+U1bVkcAOiP9hbiP7+6lzkWSkJRgLofO1ETw8=
+SHA256 (Pkgfile) = 32032a728d81eefb8034bdf2cb6638fcac4fc052a775e7bd62c9ef892cad0859
 SHA256 (.footprint) = c8226cc240304363b6289982601426f70c5cd4e82ac62feff3485bee4f48e050
-SHA256 (firefox-97.0.source.tar.xz) = 6c8a7dcb47122d033383fd62a1bcaefff0290a6c23d057898e8ff9c72749df28
+SHA256 (firefox-97.0.1.source.tar.xz) = 3f2c87cf28645130777e875ddc9c67e8994c8d5c859f425f3ddced6fecb78d45
 SHA256 (firefox.desktop) = 8ba3439f3dfc5cab883641969c93d8d15f8f20d7188d9568346b2edad52d6f91
 SHA256 (0001-Use-remoting-name-for-GDK-application-names.patch) = 8de6c0ecc70d2763936be6df4b91a3d2e806765bf510f987d6f2ffa2377c3f01

firefox/Pkgfile

@@ -1,11 +1,11 @@
 # Description: The Mozilla Firefox browser with Alsa support
 # URL: https://www.mozilla.com/firefox/
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: alsa-lib autoconf-2.13 brotli cbindgen dbus-glib libevent libidl libnotify libvpx libwebp libxkbcommon lld nodejs nss unzip wasi-libc++ xorg-libxcomposite xorg-libxcursor xorg-libxinerama xorg-libxt zip
+# Depends on: alsa-lib autoconf-2.13 brotli cbindgen dbus-glib ffmpeg4 libevent libidl libnotify libvpx libwebp libxkbcommon lld nodejs nss unzip wasi-libc++ xorg-libxcomposite xorg-libxcursor xorg-libxinerama xorg-libxt zip
 # Optional: sccache jack
 
 name=firefox
-version=97.0
+version=97.0.1
 release=1
 source=(https://archive.mozilla.org/pub/firefox/releases/$version/source/$name-$version.source.tar.xz
 	firefox.desktop

gpg-tui/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF32qXivrXhiKkelVkLT0IXJxKzBSHyRH2yQCTpTEX+0dEb4Ja4VXEqncuIodzqrSZi9m0JCNsys4V7NMr6kwW9QE=
-SHA256 (Pkgfile) = 4a952685d75f7b6f50c416f6b6d78fa2d052b3a01f3dc5aa849effd97b58be9a
+RWSagIOpLGJF33zBuHwWTRJ7qQoLDompuxQO8acMTbzbrKfbs10ElkABHLGuIFZpM/shXPu+IIFDJnT0mkOplN6JCEU/LwO0Cws=
+SHA256 (Pkgfile) = 24f213f8cbe2ec09e51ad1f0e34c6285af95e813e034fc121fbd469f4ff9d2ac
 SHA256 (.footprint) = 3b2cb5ed9f367ba643ced8da5c86b375dd3b321298bec5af997dbe4886516f53
-SHA256 (gpg-tui-0.8.2.tar.gz) = d49a402e7ba9f308c55d3398b65c9aaf773ca32100aad23c59be1754f8be2108
+SHA256 (gpg-tui-0.8.3.tar.gz) = 64e0159c997b97fc6896ed6fb5e50d65d50e6c08c14817bea7b9be5a70335442

gpg-tui/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on: gpgme libxkbcommon rust
 
 name=gpg-tui
-version=0.8.2
+version=0.8.3
 release=1
 source=(https://github.com/orhun/gpg-tui/archive/v$version/$name-$version.tar.gz)
 

grafana/.footprint

@@ -27,6 +27,8 @@ drwxr-xr-x	root/root	usr/share/grafana/conf/provisioning/plugins/
 -rw-r--r--	root/root	usr/share/grafana/conf/provisioning/plugins/sample.yaml
 -rw-r--r--	root/root	usr/share/grafana/conf/sample.ini
 drwxr-xr-x	root/root	usr/share/grafana/public/
+-rw-r--r--	root/root	usr/share/grafana/public/api-merged.json
+-rw-r--r--	root/root	usr/share/grafana/public/api-spec.json
 drwxr-xr-x	root/root	usr/share/grafana/public/app/
 -rw-r--r--	root/root	usr/share/grafana/public/app/AppWrapper.tsx
 drwxr-xr-x	root/root	usr/share/grafana/public/app/angular/
@@ -113,6 +115,13 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/core/actions/
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/actions/index.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/app_events.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/core/components/
+drwxr-xr-x	root/root	usr/share/grafana/public/app/core/components/AccessControl/
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/AccessControl/AddPermission.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/AccessControl/PermissionList.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/AccessControl/PermissionListItem.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/AccessControl/Permissions.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/AccessControl/index.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/AccessControl/types.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/core/components/Animations/
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/Animations/FadeIn.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/Animations/SlideDown.tsx
@@ -121,13 +130,9 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/core/components/AppNotificatio
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/AppNotifications/AppNotificationList.tsx
 drwxr-xr-x	root/root	usr/share/grafana/public/app/core/components/Branding/
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/Branding/Branding.tsx
-drwxr-xr-x	root/root	usr/share/grafana/public/app/core/components/Card/
--rw-r--r--	root/root	usr/share/grafana/public/app/core/components/Card/Card.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/CardButton.tsx
 drwxr-xr-x	root/root	usr/share/grafana/public/app/core/components/CloseButton/
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/CloseButton/CloseButton.tsx
-drwxr-xr-x	root/root	usr/share/grafana/public/app/core/components/CopyToClipboard/
--rw-r--r--	root/root	usr/share/grafana/public/app/core/components/CopyToClipboard/CopyToClipboard.tsx
 drwxr-xr-x	root/root	usr/share/grafana/public/app/core/components/DynamicImports/
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/DynamicImports/ErrorLoadingChunk.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/DynamicImports/LoadingChunkPlaceHolder.tsx
@@ -148,6 +153,12 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/core/components/ForgottenPassw
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/ForgottenPassword/ForgottenPassword.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/ForgottenPassword/SendResetMailPage.test.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/ForgottenPassword/SendResetMailPage.tsx
+drwxr-xr-x	root/root	usr/share/grafana/public/app/core/components/Layers/
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/Layers/AddLayerButton.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/Layers/LayerDragDropList.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/Layers/LayerName.test.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/Layers/LayerName.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/Layers/types.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/core/components/LocalStorageValueProvider/
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/LocalStorageValueProvider/LocalStorageValueProvider.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/LocalStorageValueProvider/index.tsx
@@ -162,10 +173,12 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/core/components/Login/
 drwxr-xr-x	root/root	usr/share/grafana/public/app/core/components/NavBar/
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/NavBar/NavBar.test.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/NavBar/NavBar.tsx
--rw-r--r--	root/root	usr/share/grafana/public/app/core/components/NavBar/NavBarDropdown.test.tsx
--rw-r--r--	root/root	usr/share/grafana/public/app/core/components/NavBar/NavBarDropdown.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/NavBar/NavBarItem.test.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/NavBar/NavBarItem.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/NavBar/NavBarItemMenu.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/NavBar/NavBarItemMenuItem.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/NavBar/NavBarItemMenuTrigger.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/NavBar/NavBarItemWithoutMenu.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/NavBar/NavBarMenu.test.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/NavBar/NavBarMenu.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/NavBar/NavBarMenuItem.test.tsx
@@ -173,6 +186,9 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/core/components/NavBar/
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/NavBar/NavBarNext.test.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/NavBar/NavBarNext.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/NavBar/NavBarSection.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/NavBar/NavFeatureHighlight.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/NavBar/context.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/NavBar/navBarItem-translations.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/NavBar/utils.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/NavBar/utils.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/NodeGraphSettings.tsx
@@ -213,8 +229,10 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/core/components/RolePicker/
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/RolePicker/RolePicker.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/RolePicker/RolePickerInput.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/RolePicker/RolePickerMenu.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/RolePicker/TeamRolePicker.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/RolePicker/UserRolePicker.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/RolePicker/ValueContainer.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/RolePicker/api.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/core/components/Select/
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/Select/FolderPicker.test.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/Select/FolderPicker.tsx
@@ -306,7 +324,18 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/core/components/TransformersUI
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/TransformersUI/rowsToFields/RowsToFieldsTransformerEditor.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/TransformersUI/rowsToFields/rowsToFields.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/TransformersUI/rowsToFields/rowsToFields.ts
+drwxr-xr-x	root/root	usr/share/grafana/public/app/core/components/TransformersUI/spatial/
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/TransformersUI/spatial/SpatialTransformerEditor.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/TransformersUI/spatial/models.gen.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/TransformersUI/spatial/optionsHelper.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/TransformersUI/spatial/spatialTransformer.test.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/TransformersUI/spatial/spatialTransformer.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/TransformersUI/spatial/utils.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/TransformersUI/utils.ts
+drwxr-xr-x	root/root	usr/share/grafana/public/app/core/components/Upgrade/
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/Upgrade/ProBadge.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/Upgrade/UpgradeBox.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/components/Upgrade/UpgradeModal.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/WithFeatureToggle.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/components/connectWithCleanUp.tsx
 drwxr-xr-x	root/root	usr/share/grafana/public/app/core/components/editors/
@@ -330,6 +359,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/core/hooks/
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/hooks/useQueryParams.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/hooks/useRefMounted.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/jquery_extended.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/localisation.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/lodash_extended.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/logs_model.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/logs_model.ts
@@ -355,6 +385,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/core/reducers/
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/reducers/appNotification.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/reducers/appNotification.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/reducers/index.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/reducers/navBarTree.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/reducers/navModel.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/reducers/navModel.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/reducers/processsAclItems.ts
@@ -417,6 +448,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/core/utils/
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/utils/CancelablePromise.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/utils/ConfigProvider.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/utils/CorsWorker.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/core/utils/accessControl.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/utils/acl.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/utils/applyStateChanges.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/core/utils/arrayMove.ts
@@ -461,6 +493,8 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/admin/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/admin/AdminListOrgsPage.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/admin/AdminOrgsTable.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/admin/AdminSettings.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/admin/CrawlerStartButton.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/admin/CrawlerStatus.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/admin/LicenseChrome.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/admin/OrgRolePicker.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/admin/ServerStats.test.tsx
@@ -499,7 +533,6 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/alerting/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/AlertRuleItem.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/AlertRuleList.test.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/AlertRuleList.tsx
--rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/AlertRuleListIndex.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/AlertTab.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/AlertTabCtrl.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/AlertTabCtrl.ts
@@ -507,7 +540,6 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/alerting/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/EditNotificationChannelPage.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/FeatureTogglePage.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/NewNotificationChannelPage.tsx
--rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/NotificationsIndex.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/NotificationsListPage.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/StateHistory.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/TestRuleResult.test.tsx
@@ -544,6 +576,8 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/alerting/unified/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/AlertGroups.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/AmRoutes.test.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/AmRoutes.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/MuteTimings.test.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/MuteTimings.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/PanelAlertTab.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/PanelAlertTabContent.test.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/PanelAlertTabContent.tsx
@@ -605,8 +639,13 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/alerting/unified/comp
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/amroutes/AmRootRouteRead.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/amroutes/AmRoutesExpandedForm.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/amroutes/AmRoutesExpandedRead.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/amroutes/AmRoutesTable.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/amroutes/AmRoutesTable.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/amroutes/AmSpecificRouting.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/amroutes/MuteTimingForm.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/amroutes/MuteTimingTimeInterval.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/amroutes/MuteTimingTimeRange.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/amroutes/MuteTimingsTable.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/amroutes/formStyles.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/amroutes/gridStyles.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/features/alerting/unified/components/panel-alerts-tab/
@@ -676,6 +715,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/alerting/unified/comp
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/rules/ActionButton.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/rules/ActionIcon.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/rules/AlertInstanceDetails.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/rules/AlertInstanceStateFilter.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/rules/AlertInstancesTable.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/rules/AlertStateTag.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/rules/CloudRules.tsx
@@ -701,6 +741,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/alerting/unified/comp
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/rules/StateHistory.tsx
 drwxr-xr-x	root/root	usr/share/grafana/public/app/features/alerting/unified/components/silences/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/silences/AmAlertStateTag.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/silences/MatchedSilencedRules.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/silences/Matchers.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/silences/MatchersField.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/silences/NoSilencesCTA.tsx
@@ -727,6 +768,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/alerting/unified/hook
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/hooks/useHasRuler.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/hooks/useIsRuleEditable.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/hooks/useManagedAlertStateHistory.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/hooks/useMuteTimingOptions.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/hooks/usePanelCombinedRules.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/hooks/useRuleSourcesWithRuler.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/hooks/useStateHistoryModal.tsx
@@ -739,6 +781,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/alerting/unified/mock
 drwxr-xr-x	root/root	usr/share/grafana/public/app/features/alerting/unified/state/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/state/AlertingQueryRunner.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/state/AlertingQueryRunner.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/state/actions.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/state/actions.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/state/reducers.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/features/alerting/unified/styles/
@@ -746,6 +789,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/alerting/unified/styl
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/styles/table.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/features/alerting/unified/types/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/types/amroutes.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/types/mute-timing-form.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/types/preview.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/types/receiver-form.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/types/rule-form.ts
@@ -762,7 +806,9 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/alerting/unified/util
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/utils/dynamicTable.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/utils/matchers.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/utils/matchers.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/utils/misc.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/utils/misc.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/utils/mute-timings.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/utils/query.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/utils/query.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/utils/receiver-form.test.ts
@@ -816,9 +862,13 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/canvas/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/canvas/element.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/features/canvas/elements/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/canvas/elements/button.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/canvas/elements/droneFront.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/canvas/elements/droneSide.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/canvas/elements/droneTop.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/canvas/elements/icon.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/canvas/elements/notFound.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/canvas/elements/textBox.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/canvas/elements/windTurbine.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/canvas/group.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/canvas/index.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/canvas/registry.ts
@@ -875,6 +925,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/dashboard/components/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dashboard/components/DashboardSettings/LinksSettings.test.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dashboard/components/DashboardSettings/LinksSettings.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dashboard/components/DashboardSettings/ListNewButton.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/dashboard/components/DashboardSettings/PreviewSettings.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dashboard/components/DashboardSettings/TimePickerSettings.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.test.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.tsx
@@ -957,6 +1008,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/dashboard/components/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dashboard/components/SaveDashboard/types.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dashboard/components/SaveDashboard/useDashboardSave.tsx
 drwxr-xr-x	root/root	usr/share/grafana/public/app/features/dashboard/components/ShareModal/
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/dashboard/components/ShareModal/ShareEmbed.test.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dashboard/components/ShareModal/ShareEmbed.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dashboard/components/ShareModal/ShareExport.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dashboard/components/ShareModal/ShareLibraryPanel.tsx
@@ -1011,6 +1063,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/dashboard/dashgrid/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dashboard/dashgrid/DashboardGrid.test.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/dashboard/dashgrid/LazyLoader.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dashboard/dashgrid/PanelChrome.test.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dashboard/dashgrid/PanelChrome.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dashboard/dashgrid/PanelChromeAngular.tsx
@@ -1114,14 +1167,28 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/dimensions/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dimensions/context.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/features/dimensions/editors/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dimensions/editors/ColorDimensionEditor.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/dimensions/editors/FolderPickerTab.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dimensions/editors/IconSelector.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dimensions/editors/NumberInput.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dimensions/editors/ResourceCards.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dimensions/editors/ResourceDimensionEditor.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dimensions/editors/ResourcePicker.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/dimensions/editors/ResourcePickerPopover.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dimensions/editors/ScalarDimensionEditor.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dimensions/editors/ScaleDimensionEditor.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dimensions/editors/TextDimensionEditor.tsx
+drwxr-xr-x	root/root	usr/share/grafana/public/app/features/dimensions/editors/ThresholdsEditor/
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/dimensions/editors/ThresholdsEditor/ThresholdsEditor.test.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/dimensions/editors/ThresholdsEditor/ThresholdsEditor.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/dimensions/editors/ThresholdsEditor/thresholds.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/dimensions/editors/URLPickerTab.tsx
+drwxr-xr-x	root/root	usr/share/grafana/public/app/features/dimensions/editors/ValueMappingsEditor/
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/dimensions/editors/ValueMappingsEditor/ValueMappingEditRow.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/dimensions/editors/ValueMappingsEditor/ValueMappingsEditor.test.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/dimensions/editors/ValueMappingsEditor/ValueMappingsEditor.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/dimensions/editors/ValueMappingsEditor/ValueMappingsEditorModal.test.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/dimensions/editors/ValueMappingsEditor/ValueMappingsEditorModal.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/dimensions/editors/ValueMappingsEditor/mappings.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dimensions/editors/index.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dimensions/index.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dimensions/resource.ts
@@ -1266,10 +1333,30 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/folders/__snapshots__
 drwxr-xr-x	root/root	usr/share/grafana/public/app/features/folders/components/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/folders/components/NewDashboardsFolder.tsx
 drwxr-xr-x	root/root	usr/share/grafana/public/app/features/folders/state/
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/folders/state/actions.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/folders/state/actions.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/folders/state/navModel.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/folders/state/reducers.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/folders/state/reducers.ts
+drwxr-xr-x	root/root	usr/share/grafana/public/app/features/geo/
+drwxr-xr-x	root/root	usr/share/grafana/public/app/features/geo/editor/
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/geo/editor/GazetteerPathEditor.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/geo/editor/locationEditor.ts
+drwxr-xr-x	root/root	usr/share/grafana/public/app/features/geo/format/
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/geo/format/geohash.test.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/geo/format/geohash.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/geo/format/geojson.test.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/geo/format/geojson.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/geo/format/utils.ts
+drwxr-xr-x	root/root	usr/share/grafana/public/app/features/geo/gazetteer/
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/geo/gazetteer/gazetteer.test.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/geo/gazetteer/gazetteer.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/geo/gazetteer/worldmap.test.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/geo/gazetteer/worldmap.ts
+drwxr-xr-x	root/root	usr/share/grafana/public/app/features/geo/utils/
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/geo/utils/frameVectorSource.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/geo/utils/location.test.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/geo/utils/location.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/features/inspector/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/inspector/DetailText.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/inspector/InspectDataOptions.tsx
@@ -1329,6 +1416,8 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/library-panels/utils/
 drwxr-xr-x	root/root	usr/share/grafana/public/app/features/live/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/live/LiveConnectionWarning.tsx
 drwxr-xr-x	root/root	usr/share/grafana/public/app/features/live/centrifuge/
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/live/centrifuge/LiveDataStream.test.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/live/centrifuge/LiveDataStream.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/live/centrifuge/channel.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/live/centrifuge/createCentrifugeServiceWorker.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/live/centrifuge/remoteObservable.ts
@@ -1340,7 +1429,12 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/live/dashboard/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/live/dashboard/DashboardChangedModal.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/live/dashboard/dashboardWatcher.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/live/dashboard/types.ts
+drwxr-xr-x	root/root	usr/share/grafana/public/app/features/live/data/
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/live/data/StreamingDataFrame.test.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/live/data/StreamingDataFrame.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/live/data/utils.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/live/index.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/live/live.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/live/live.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/features/live/pages/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/live/pages/AddNewRule.tsx
@@ -1389,6 +1483,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/org/
 drwxr-xr-x	root/root	usr/share/grafana/public/app/features/org/__snapshots__/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/org/__snapshots__/OrgDetailsPage.test.tsx.snap
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/org/__snapshots__/OrgProfile.test.tsx.snap
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/org/api.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/features/org/state/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/org/state/actions.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/org/state/actions.ts
@@ -1439,6 +1534,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/playlist/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/playlist/PlaylistTable.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/playlist/PlaylistTableRow.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/playlist/PlaylistTableRows.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/playlist/ShareModal.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/playlist/StartModal.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/playlist/api.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/playlist/styles.ts
@@ -1530,6 +1626,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/plugins/components/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/plugins/importPanelPlugin.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/plugins/pluginCacheBuster.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/plugins/pluginPreloader.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/plugins/pluginSettings.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/plugins/pluginSettings.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/plugins/plugin_loader.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/features/plugins/tests/
@@ -1600,6 +1697,8 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/query/state/processin
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/query/state/types.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/query/state/updateQueries.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/query/state/updateQueries.ts
+drwxr-xr-x	root/root	usr/share/grafana/public/app/features/runtime/
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/runtime/init.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/features/sandbox/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/sandbox/BenchmarksPage.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/sandbox/TestStuffPage.tsx
@@ -1613,6 +1712,8 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/search/components/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/search/components/DashboardSearch.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/search/components/ManageDashboards.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/search/components/MoveToFolderModal.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/search/components/SearchCard.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/search/components/SearchCardExpanded.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/search/components/SearchCheckbox.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/search/components/SearchField.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/search/components/SearchItem.test.tsx
@@ -1630,6 +1731,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/search/hooks/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/search/hooks/useManageDashboards.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/search/hooks/useSearch.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/search/hooks/useSearchQuery.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/search/hooks/useShowDashboardPreviews.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/search/index.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/search/loaders.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/features/search/reducers/
@@ -1643,6 +1745,15 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/search/reducers/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/search/types.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/search/utils.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/search/utils.ts
+drwxr-xr-x	root/root	usr/share/grafana/public/app/features/serviceaccounts/
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/serviceaccounts/ServiceAccountPage.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/serviceaccounts/ServiceAccountProfile.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/serviceaccounts/ServiceAccountsListPage.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/serviceaccounts/ServiceAccountsTable.tsx
+drwxr-xr-x	root/root	usr/share/grafana/public/app/features/serviceaccounts/state/
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/serviceaccounts/state/actions.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/serviceaccounts/state/reducers.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/serviceaccounts/state/selectors.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/features/teams/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/teams/CreateTeam.test.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/teams/CreateTeam.tsx
@@ -1656,6 +1767,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/teams/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/teams/TeamMembers.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/teams/TeamPages.test.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/teams/TeamPages.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/teams/TeamPermissions.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/teams/TeamSettings.test.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/teams/TeamSettings.tsx
 drwxr-xr-x	root/root	usr/share/grafana/public/app/features/teams/__mocks__/
@@ -1734,6 +1846,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/variables/constant/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/variables/constant/adapter.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/variables/constant/reducer.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/variables/constant/reducer.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/variables/constants.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/features/variables/custom/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/variables/custom/CustomVariableEditor.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/variables/custom/actions.test.ts
@@ -1754,6 +1867,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/variables/editor/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/variables/editor/VariableEditorContainer.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/variables/editor/VariableEditorEditor.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/variables/editor/VariableEditorList.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/variables/editor/VariableEditorListRow.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/variables/editor/VariableHideSelect.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/variables/editor/VariableSectionHeader.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/variables/editor/VariableSelectField.tsx
@@ -1908,7 +2022,6 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/cloud-monit
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloud-monitoring/components/CloudMonitoringCheatSheet.tsx
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/cloud-monitoring/components/ConfigEditor/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloud-monitoring/components/ConfigEditor/ConfigEditor.tsx
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloud-monitoring/components/ConfigEditor/JWTConfig.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloud-monitoring/components/Fields.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloud-monitoring/components/GroupBy.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloud-monitoring/components/LabelFilter.tsx
@@ -1918,7 +2031,6 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/cloud-monit
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloud-monitoring/components/Preprocessor.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloud-monitoring/components/Project.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloud-monitoring/components/QueryEditor.tsx
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloud-monitoring/components/QueryType.tsx
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/cloud-monitoring/components/SLO/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloud-monitoring/components/SLO/SLO.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloud-monitoring/components/SLO/SLOQueryEditor.tsx
@@ -1966,16 +2078,24 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/README.md
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/CloudWatchDataSource.ts
-drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql/
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql/Monaco.ts
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql/TextModel.ts
-drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql/test-data/
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql/test-data/index.ts
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql/test-data/multiLineFullQuery.ts
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql/test-data/multiLineIncompleteQueryWithoutNamespace.ts
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql/test-data/singleLineEmptyQuery.ts
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql/test-data/singleLineFullQuery.ts
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql/test-data/singleLineTwoQueries.ts
+drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql-test-data/
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql-test-data/index.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql-test-data/multiLineFullQuery.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql-test-data/multiLineIncompleteQueryWithoutNamespace.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql-test-data/singleLineEmptyQuery.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql-test-data/singleLineFullQuery.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql-test-data/singleLineTwoQueries.ts
+drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/metric-math-test-data/
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/metric-math-test-data/afterFunctionQuery.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/metric-math-test-data/index.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/metric-math-test-data/secondArgAfterSearchQuery.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/metric-math-test-data/secondArgQuery.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/metric-math-test-data/singleLineEmptyQuery.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/metric-math-test-data/thirdArgAfterSearchQuery.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/metric-math-test-data/withinStringQuery.ts
+drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/monarch/
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/monarch/Monaco.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/monarch/TextModel.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/__mocks__/sqlUtils.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/annotations_query_ctrl.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/aws_url.ts
@@ -1984,10 +2104,6 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/cloudwatch-sql/SQLGenerator.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/cloudwatch-sql/completion/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/cloudwatch-sql/completion/CompletionItemProvider.ts
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/cloudwatch-sql/completion/LinkedToken.ts
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/cloudwatch-sql/completion/commands.ts
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/cloudwatch-sql/completion/linkedTokenBuilder.test.ts
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/cloudwatch-sql/completion/linkedTokenBuilder.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/cloudwatch-sql/completion/statementPosition.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/cloudwatch-sql/completion/statementPosition.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/cloudwatch-sql/completion/suggestionKind.ts
@@ -1996,7 +2112,6 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/cloudwatch-sql/completion/types.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/cloudwatch-sql/definition.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/cloudwatch-sql/language.ts
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/cloudwatch-sql/register.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/Alias.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/AnnotationQueryEditor.test.tsx
@@ -2020,12 +2135,15 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/MetricStatEditor/index.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor.test.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/MetricsQueryHeader.test.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/MetricsQueryHeader.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/PanelQueryEditor.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/QueryHeader.test.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/QueryHeader.tsx
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/SQLBuilderEditor/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/SQLBuilderEditor/SQLBuilderEditor.test.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/SQLBuilderEditor/SQLBuilderEditor.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/SQLBuilderEditor/SQLBuilderSelectRow.test.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/SQLBuilderEditor/SQLBuilderSelectRow.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/SQLBuilderEditor/SQLFilter.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/SQLBuilderEditor/SQLGroupBy.test.tsx
@@ -2040,19 +2158,6 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/__snapshots__/ConfigEditor.test.tsx.snap
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/__snapshots__/MetricsQueryEditor.test.tsx.snap
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/index.ts
-drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/ui/
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/ui/AccessoryButton.tsx
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/ui/EditorField.tsx
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/ui/EditorFieldGroup.tsx
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/ui/EditorHeader.tsx
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/ui/EditorList.tsx
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/ui/EditorRow.tsx
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/ui/EditorRows.tsx
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/ui/FlexItem.tsx
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/ui/InlineSelect.tsx
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/ui/InputGroup.tsx
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/ui/Space.tsx
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/components/ui/Stack.tsx
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/dashboards/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/dashboards/EBS.json
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/dashboards/Lambda.json
@@ -2070,9 +2175,27 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/language_provider.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/language_provider.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/memoizedDebounce.ts
+drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/metric-math/
+drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/metric-math/completion/
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/metric-math/completion/CompletionItemProvider.test.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/metric-math/completion/CompletionItemProvider.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/metric-math/completion/statementPosition.test.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/metric-math/completion/statementPosition.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/metric-math/completion/suggestionKind.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/metric-math/completion/types.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/metric-math/definition.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/metric-math/language.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/migration.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/migrations.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/module.tsx
+drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/monarch/
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/monarch/CompletionItemProvider.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/monarch/LinkedToken.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/monarch/commands.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/monarch/linkedTokenBuilder.test.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/monarch/linkedTokenBuilder.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/monarch/register.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/monarch/types.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/partials/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/partials/annotations.editor.html
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/cloudwatch/partials/query.parameter.html
@@ -2226,6 +2349,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/grafana-azu
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/instanceSettings.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/query.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/query_ctrl.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/resourcePickerData.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/resourcePickerRows.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/sdk.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/variables.ts
@@ -2308,6 +2432,8 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/grafana-azu
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ResourcePicker/NestedResourceTable.test.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ResourcePicker/NestedResourceTable.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ResourcePicker/NestedRows.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ResourcePicker/ResourcePicker.test.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ResourcePicker/ResourcePicker.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ResourcePicker/index.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ResourcePicker/styles.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ResourcePicker/types.ts
@@ -2582,9 +2708,6 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/loki/config
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/loki/img/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/loki/img/grafana_icon.svg
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/loki/img/loki_icon.svg
-drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/loki/importing/
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/loki/importing/fromGraphite.ts
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/loki/importing/importing.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/loki/language_provider.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/loki/language_provider.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/loki/language_utils.ts
@@ -2597,6 +2720,16 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/loki/partia
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/loki/plugin.json
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/loki/query_utils.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/loki/query_utils.ts
+drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/loki/querybuilder/
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/loki/querybuilder/LokiQueryModeller.test.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/loki/querybuilder/LokiQueryModeller.ts
+drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/loki/querybuilder/components/
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderExplaind.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryEditorSelector.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/loki/querybuilder/components/QueryPreview.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/loki/querybuilder/operations.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/loki/querybuilder/types.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/loki/result_transformer.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/loki/result_transformer.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/loki/syntax.test.ts
@@ -2743,10 +2876,13 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/datasource.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/img/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/img/prometheus_logo.svg
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/language_provider.mock.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/language_provider.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/language_provider.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/language_utils.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/language_utils.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/legend.test.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/legend.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/metric_find_query.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/metric_find_query.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/module.test.ts
@@ -2758,6 +2894,43 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/promql.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/query_hints.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/query_hints.ts
+drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/PromQueryModeller.test.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/PromQueryModeller.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/aggregations.ts
+drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/components/
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/components/LabelParamEditor.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/components/NestedQuery.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/components/NestedQueryList.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.test.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderContext.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderExplained.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryEditorSelector.test.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryEditorSelector.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/components/QueryPreview.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/operations.ts
+drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/shared/
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/shared/LabelFilterItem.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/shared/LabelFilters.test.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/shared/LabelFilters.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/shared/LokiAndPromQueryModellerBase.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationEditor.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationExplainedBox.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationInfoButton.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationList.test.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationList.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationListExplained.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationName.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationParamEditor.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationsEditorRow.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/shared/QueryEditorModeToggle.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/shared/QueryHeaderSwitch.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/shared/operationUtils.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/shared/types.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/testUtils.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/querybuilder/types.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/result_transformer.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/result_transformer.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/types.ts
@@ -2765,6 +2938,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/prometheus/
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/tempo/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/tempo/CheatSheet.tsx
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/tempo/QueryEditor/
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/tempo/QueryEditor/NativeSearch.test.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/tempo/QueryEditor/NativeSearch.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/tempo/QueryEditor/QueryField.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/tempo/QueryEditor/ServiceGraphSection.tsx
@@ -2804,6 +2978,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/testdata/co
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/testdata/components/NodeGraphEditor.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/testdata/components/PredictablePulseEditor.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/testdata/components/RandomWalkEditor.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/testdata/components/RawFrameEditor.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/testdata/components/StreamingClientEditor.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/testdata/components/USAQueryEditor.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/testdata/components/index.ts
@@ -2859,6 +3034,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/alertlist/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/alertlist/AlertList.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/alertlist/AlertListMigration.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/alertlist/AlertListMigrationHandler.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/alertlist/GroupByWithLoading.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/alertlist/README.md
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/alertlist/UnifiedAlertList.tsx
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/alertlist/img/
@@ -2867,11 +3043,14 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/alertlist/img/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/alertlist/plugin.json
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/alertlist/suggestions.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/alertlist/types.ts
+drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/alertlist/unified-alerting/
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/alertlist/unified-alerting/GroupedView.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/alertlist/unified-alerting/UngroupedView.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/alertlist/util.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/annolist/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/annolist/AnnoListPanel.test.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/annolist/AnnoListPanel.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/annolist/AnnotationListItem.tsx
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/annolist/AnnotationListItemTags.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/annolist/README.md
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/annolist/img/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/annolist/img/icn-annolist-panel.svg
@@ -2879,16 +3058,18 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/annolist/img/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/annolist/plugin.json
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/annolist/types.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/barchart/
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/barchart/BarChart.tsx
 -rwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/barchart/BarChartPanel.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/barchart/README.md
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/barchart/TickSpacingEditor.tsx
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/barchart/__snapshots__/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/barchart/__snapshots__/utils.test.ts.snap
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/barchart/bars.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/barchart/config.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/barchart/distribute.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/barchart/img/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/barchart/img/barchart.svg
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/barchart/models.cue
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/barchart/models.gen.ts
 -rwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/barchart/module.tsx
 -rwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/barchart/plugin.json
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/barchart/quadtree.ts
@@ -2926,6 +3107,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/canvas/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/canvas/CanvasPanel.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/canvas/README.md
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/canvas/editor/
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/canvas/editor/APIEditor.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/canvas/editor/LayerElementListEditor.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/canvas/editor/PlacementEditor.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/canvas/editor/elementEditor.tsx
@@ -2948,7 +3130,6 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/dashlist/img/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/dashlist/module.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/dashlist/plugin.json
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/dashlist/styles.ts
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/dashlist/types.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/debug/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/debug/CursorView.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/debug/DebugPanel.tsx
@@ -2977,30 +3158,23 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/gauge/img/
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/geomap/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/GeomapOverlay.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/GeomapPanel.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/GeomapTooltip.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/README.md
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/geomap/components/
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/components/ComplexDataHoverView.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/components/DataHoverRow.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/components/DataHoverRows.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/components/DataHoverTabs.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/components/DataHoverView.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/components/DebugOverlay.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/components/ObservablePropsWrapper.tsx
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/geomap/editor/
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/editor/GazetteerPathEditor.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/editor/GeomapStyleRulesEditor.tsx
-drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/geomap/editor/LayersEditor/
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/editor/LayersEditor/AddLayerButton.tsx
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/editor/LayersEditor/LayerHeader.test.tsx
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/editor/LayersEditor/LayerHeader.tsx
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/editor/LayersEditor/LayerList.tsx
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/editor/LayersEditor/LayersEditor.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/editor/LayersEditor.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/editor/MapViewEditor.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/editor/StyleRuleEditor.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/editor/layerEditor.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/event.ts
-drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/geomap/gazetteer/
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/gazetteer/gazetteer.ts
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/gazetteer/geojson.test.ts
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/gazetteer/geojson.ts
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/gazetteer/worldmap.test.ts
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/gazetteer/worldmap.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/globalStyles.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/geomap/img/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/img/icn-geomap.svg
@@ -3033,11 +3207,8 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/geomap/style/
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/geomap/utils/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/utils/checkFeatureMatchesStyleRule.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/utils/checkFeatureMatchesStyleRule.ts
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/utils/geohash.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/utils/getFeatures.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/utils/getFeatures.ts
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/utils/location.test.ts
--rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/utils/location.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/utils/selection.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/panel/geomap/view.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/panel/gettingstarted/
@@ -3414,6 +3585,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/types/jquery/
 -rw-r--r--	root/root	usr/share/grafana/public/app/types/preferences.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/types/query.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/types/sanitize-url.d.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/types/serviceaccount.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/types/store.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/types/suggestions.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/types/svg.d.ts
@@ -3424,10 +3596,10 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/types/jquery/
 -rw-r--r--	root/root	usr/share/grafana/public/app/types/user.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/types/window.d.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/build/
--rw-r--r--	root/root	usr/share/grafana/public/build/41f151d7bcbd0600c696.ttf
+-rw-r--r--	root/root	usr/share/grafana/public/build/fa56cd4c6b700e0392d0.ttf
 drwxr-xr-x	root/root	usr/share/grafana/public/build/static/
 drwxr-xr-x	root/root	usr/share/grafana/public/build/static/img/
--rw-r--r--	root/root	usr/share/grafana/public/build/static/img/codicon.68664da4.ttf
+-rw-r--r--	root/root	usr/share/grafana/public/build/static/img/codicon.56dba998.ttf
 drwxr-xr-x	root/root	usr/share/grafana/public/dashboards/
 -rw-r--r--	root/root	usr/share/grafana/public/dashboards/default.json
 -rw-r--r--	root/root	usr/share/grafana/public/dashboards/home.json
@@ -3542,6 +3714,8 @@ drwxr-xr-x	root/root	usr/share/grafana/public/img/bg/
 -rw-r--r--	root/root	usr/share/grafana/public/img/grafana_mask_icon.svg
 -rw-r--r--	root/root	usr/share/grafana/public/img/grafana_mask_icon_white.svg
 -rw-r--r--	root/root	usr/share/grafana/public/img/grafana_net_logo.svg
+-rw-r--r--	root/root	usr/share/grafana/public/img/grafana_text_logo-dark.svg
+-rw-r--r--	root/root	usr/share/grafana/public/img/grafana_text_logo-light.svg
 -rw-r--r--	root/root	usr/share/grafana/public/img/grafana_typelogo.svg
 -rw-r--r--	root/root	usr/share/grafana/public/img/grafanaconline.png
 -rw-r--r--	root/root	usr/share/grafana/public/img/graph404.svg
@@ -3570,6 +3744,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/img/icons/custom/
 -rw-r--r--	root/root	usr/share/grafana/public/img/icons/custom/gf-logs.svg
 -rw-r--r--	root/root	usr/share/grafana/public/img/icons/custom/gf-portrait.svg
 drwxr-xr-x	root/root	usr/share/grafana/public/img/icons/iot/
+-rw-r--r--	root/root	usr/share/grafana/public/img/icons/iot/drone.svg
 -rw-r--r--	root/root	usr/share/grafana/public/img/icons/iot/faucet.svg
 -rw-r--r--	root/root	usr/share/grafana/public/img/icons/iot/pump.svg
 drwxr-xr-x	root/root	usr/share/grafana/public/img/icons/marker/
@@ -5046,6 +5221,9 @@ drwxr-xr-x	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/
 drwxr-xr-x	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/elixir/
 -rw-r--r--	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/elixir/elixir.js
 -rw-r--r--	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/elixir/elixir.js.LICENSE.txt
+drwxr-xr-x	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/flow9/
+-rw-r--r--	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/flow9/flow9.js
+-rw-r--r--	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/flow9/flow9.js.LICENSE.txt
 drwxr-xr-x	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/fsharp/
 -rw-r--r--	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/fsharp/fsharp.js
 -rw-r--r--	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/fsharp/fsharp.js.LICENSE.txt
@@ -5124,6 +5302,9 @@ drwxr-xr-x	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/
 drwxr-xr-x	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/php/
 -rw-r--r--	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/php/php.js
 -rw-r--r--	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/php/php.js.LICENSE.txt
+drwxr-xr-x	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/pla/
+-rw-r--r--	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/pla/pla.js
+-rw-r--r--	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/pla/pla.js.LICENSE.txt
 drwxr-xr-x	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/postiats/
 -rw-r--r--	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/postiats/postiats.js
 -rw-r--r--	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/postiats/postiats.js.LICENSE.txt
@@ -5133,6 +5314,9 @@ drwxr-xr-x	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/
 drwxr-xr-x	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/powershell/
 -rw-r--r--	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/powershell/powershell.js
 -rw-r--r--	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/powershell/powershell.js.LICENSE.txt
+drwxr-xr-x	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/protobuf/
+-rw-r--r--	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/protobuf/protobuf.js
+-rw-r--r--	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/protobuf/protobuf.js.LICENSE.txt
 drwxr-xr-x	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/pug/
 -rw-r--r--	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/pug/pug.js
 -rw-r--r--	root/root	usr/share/grafana/public/lib/monaco/min/vs/basic-languages/pug/pug.js.LICENSE.txt
@@ -5279,6 +5463,19 @@ drwxr-xr-x	root/root	usr/share/grafana/public/lib/monaco/min/vs/language/typescr
 -rw-r--r--	root/root	usr/share/grafana/public/lib/monaco/min/vs/language/typescript/tsWorker.js.LICENSE.txt
 -rw-r--r--	root/root	usr/share/grafana/public/lib/monaco/min/vs/loader.js
 -rw-r--r--	root/root	usr/share/grafana/public/lib/monaco/min/vs/loader.js.LICENSE.txt
+drwxr-xr-x	root/root	usr/share/grafana/public/locales/
+drwxr-xr-x	root/root	usr/share/grafana/public/locales/en/
+-rw-r--r--	root/root	usr/share/grafana/public/locales/en/messages.js
+-rw-r--r--	root/root	usr/share/grafana/public/locales/en/messages.po
+drwxr-xr-x	root/root	usr/share/grafana/public/locales/es/
+-rw-r--r--	root/root	usr/share/grafana/public/locales/es/messages.js
+-rw-r--r--	root/root	usr/share/grafana/public/locales/es/messages.po
+drwxr-xr-x	root/root	usr/share/grafana/public/locales/fr/
+-rw-r--r--	root/root	usr/share/grafana/public/locales/fr/messages.js
+-rw-r--r--	root/root	usr/share/grafana/public/locales/fr/messages.po
+drwxr-xr-x	root/root	usr/share/grafana/public/locales/pseudo-LOCALE/
+-rw-r--r--	root/root	usr/share/grafana/public/locales/pseudo-LOCALE/messages.js
+-rw-r--r--	root/root	usr/share/grafana/public/locales/pseudo-LOCALE/messages.po
 drwxr-xr-x	root/root	usr/share/grafana/public/maps/
 -rw-r--r--	root/root	usr/share/grafana/public/maps/countries.geojson
 -rw-r--r--	root/root	usr/share/grafana/public/maps/usa-states.geojson
@@ -5417,6 +5614,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/test/core/utils/
 -rw-r--r--	root/root	usr/share/grafana/public/test/core/utils/silenceConsoleOutput.ts
 -rw-r--r--	root/root	usr/share/grafana/public/test/core/utils/version.test.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/test/helpers/
+-rw-r--r--	root/root	usr/share/grafana/public/test/helpers/TestProvider.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/test/helpers/convertToStoreState.ts
 -rw-r--r--	root/root	usr/share/grafana/public/test/helpers/createFetchResponse.ts
 -rw-r--r--	root/root	usr/share/grafana/public/test/helpers/fieldConfig.ts
@@ -5443,6 +5641,8 @@ drwxr-xr-x	root/root	usr/share/grafana/public/test/mocks/
 -rw-r--r--	root/root	usr/share/grafana/public/test/mocks/common.ts
 -rw-r--r--	root/root	usr/share/grafana/public/test/mocks/dashboard-mock.js
 -rw-r--r--	root/root	usr/share/grafana/public/test/mocks/datasource_srv.ts
+-rw-r--r--	root/root	usr/share/grafana/public/test/mocks/i18nMessages.ts
+-rw-r--r--	root/root	usr/share/grafana/public/test/mocks/linguiMacro.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/test/mocks/monaco.ts
 -rw-r--r--	root/root	usr/share/grafana/public/test/mocks/style.ts
 -rw-r--r--	root/root	usr/share/grafana/public/test/mocks/svg.ts
@@ -5489,3 +5689,4 @@ drwxr-xr-x	root/root	usr/share/grafana/public/views/
 -rw-r--r--	root/root	usr/share/grafana/public/views/error.html
 -rw-r--r--	root/root	usr/share/grafana/public/views/index-template.html
 -rw-r--r--	root/root	usr/share/grafana/public/views/index.html
+-rw-r--r--	root/root	usr/share/grafana/public/views/swagger.html

grafana/.signature

@@ -1,8 +1,8 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3x/1g4+D45FH1HiGZfMGhJY5MQxvo7Rh4OMKbjLyf9wx/1miOZYWTRTx30+5tKU/Ze+jvGkD+CEevfgCGryruAg=
-SHA256 (Pkgfile) = 574064364afbffa805907ee52881c4964adc05e003cc1248a1590f1c6ad5108c
-SHA256 (.footprint) = 046b7b906a1f4c38c0721b882ab80bc7d84188847e3cb2a46effcdc4150e1d69
-SHA256 (grafana-8.4.0.tar.gz) = 3c1d1eee8e243129c70cc49dda9e89fa9d3cc9ad9725d9962ad0592e80c3cfb5
-SHA256 (grafana-8.4.0.linux-amd64.tar.gz) = 9ef5c08906410124398e210121220a9b6dd539b63a06e5cdeb0054e5d88300b6
+RWSagIOpLGJF37uK7R/7xJbGE9eD2gEPcJvsyGiyuhFhX5R+hQLqHT+3ktDOhVMaJ7ot2jAHl7T8dGwKYizjHthKBzrK6iLJEQg=
+SHA256 (Pkgfile) = b215e78c7d74bdd3e72759c58f2580969a0b4bdc9d3a634e9227c132e4f67cc7
+SHA256 (.footprint) = 11f03bb121e03b4435064931f01f70e9e12be9a5f752039656fbb1a93a23d678
+SHA256 (grafana-8.4.1.tar.gz) = 574c5a7f809f8b1f2c3c5c1f902e0aa504f3d260d9a80c6d9a91cee35a3dc9e8
+SHA256 (grafana-8.4.1.linux-amd64.tar.gz) = 453ba9910f4b969a497b27e6806333b4c5b69beb095e426e0c076da5cc9119ed
 SHA256 (grafana.confd) = 302e0281dea67cde2edd1e7d06bd7abf6a8b335595c050ffa874cb1c1bd19036
 SHA256 (grafana.service) = 3b652a54c5f26d19197955854483687d7c761a2299788a182200acd5d1ffbb47

grafana/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on: fontconfig go git npm yarn
 
 name=grafana
-version=8.4.0
+version=8.4.1
 release=1
 source=(https://github.com/grafana/grafana/archive/v$version/$name-$version.tar.gz
   https://dl.grafana.com/oss/release/grafana-$version.linux-amd64.tar.gz

libgit2/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF32urJySfUSAGb3nJvQHBqLG9RZZUB//nYJhvsw9OUPQeEACZP7Jk1tCGpbs+NZMWbEz+uAV6Dv4L0HgcTSRWSQ4=
-SHA256 (Pkgfile) = c5d4ea12bbb5273ea8c756439b266cf8a39acdfda561a7fed3f34f025f947bf5
+RWSagIOpLGJF38KYEebmm5T9KwF9XFP1nA/0FKom02kPnn8vJ57nitNTZV/kIPrFvgBSTZUSySBcM631edHJxHiLdsIP3kNDGQA=
+SHA256 (Pkgfile) = ea2a0b3c1c683c28bdd4ef1f2ab504fae5920fd415ecdedc1efd4becbeaf0095
 SHA256 (.footprint) = 5b7607e7f6d4cb02f2a2f124287e2b6f886978c0c696f0dc9f214703662ad426
-SHA256 (libgit2-1.4.0.tar.gz) = 9051e75964350054d5e3f9339bc4d1fb56ac14949710e3860f98f07a0433fa25
+SHA256 (libgit2-1.4.1.tar.gz) = fccd371a271133e29d002dd207490d22a0c9b06992b874b8edb8366532a94f54

libgit2/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on: http-parser
 
 name=libgit2
-version=1.4.0
+version=1.4.1
 release=1
 source=(https://github.com/$name/$name/archive/v$version/$name-$version.tar.gz)
 

mercurial/.footprint

@@ -345,11 +345,11 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/hgext3rd/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/hgext3rd/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/hgext3rd/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/hgext3rd/__pycache__/__init__.cpython-310.pyc
-drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mercurial-6.0.2-py3.10.egg-info/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial-6.0.2-py3.10.egg-info/PKG-INFO
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial-6.0.2-py3.10.egg-info/SOURCES.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial-6.0.2-py3.10.egg-info/dependency_links.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial-6.0.2-py3.10.egg-info/top_level.txt
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mercurial-6.0.3-py3.10.egg-info/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial-6.0.3-py3.10.egg-info/PKG-INFO
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial-6.0.3-py3.10.egg-info/SOURCES.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial-6.0.3-py3.10.egg-info/dependency_links.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial-6.0.3-py3.10.egg-info/top_level.txt
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mercurial/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/__init__.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/__modulepolicy__.py

mercurial/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3+/J8rnO4G0SySawuMrUEvZkmUyBkgTDIG/WdgGcx2X1A1hoPvXGhOTHT/dRr07Uo+UXRaAD3WRi5zv4TJl9SwQ=
-SHA256 (Pkgfile) = 58f7ecb07d2573ea0e7aceca6c479a4d0b5c9ff9700cfe3c17dca9426180dd3a
-SHA256 (.footprint) = 892d380de8aa2e53c98d30c0685fe0b7577a7731834db4f1f5c767a824f0cbea
-SHA256 (mercurial-6.0.2.tar.gz) = 5fb4c36d3856292ebf584051d59306d96ad8aa32b5537452b1d9c476f95ab11a
+RWSagIOpLGJF34aWGxAeEtfFV4eyXYvBXDWBOrBrxTwXPvd0coXuN6mB0eXHSVP4kAAM1Wu6eXjfR1POnprQ5zasPW/HiqmyOAI=
+SHA256 (Pkgfile) = e85670445c498f640a8870e99e6774b883bce653423979030753cb3c42f7e188
+SHA256 (.footprint) = baa0d0b5558bd483fdb0b10bf0e85b76e7a407223779bf7bfc7146c828d154fb
+SHA256 (mercurial-6.0.3.tar.gz) = 67f13647a46517a2b567cdcb73c98721d75d36a0432debb15022b77f9c138333

mercurial/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on: python3-setuptools
 
 name=mercurial
-version=6.0.2
+version=6.0.3
 release=1
 source=(https://www.mercurial-scm.org/release/mercurial-$version.tar.gz)
 

pipewire/.footprint

@@ -194,8 +194,8 @@ drwxr-xr-x	root/root	usr/lib/alsa-lib/
 -rwxr-xr-x	root/root	usr/lib/alsa-lib/libasound_module_ctl_pipewire.so
 -rwxr-xr-x	root/root	usr/lib/alsa-lib/libasound_module_pcm_pipewire.so
 lrwxrwxrwx	root/root	usr/lib/libpipewire-0.3.so -> libpipewire-0.3.so.0
-lrwxrwxrwx	root/root	usr/lib/libpipewire-0.3.so.0 -> libpipewire-0.3.so.0.346.0
--rwxr-xr-x	root/root	usr/lib/libpipewire-0.3.so.0.346.0
+lrwxrwxrwx	root/root	usr/lib/libpipewire-0.3.so.0 -> libpipewire-0.3.so.0.347.0
+-rwxr-xr-x	root/root	usr/lib/libpipewire-0.3.so.0.347.0
 drwxr-xr-x	root/root	usr/lib/pipewire-0.3/
 -rwxr-xr-x	root/root	usr/lib/pipewire-0.3/libpipewire-module-access.so
 -rwxr-xr-x	root/root	usr/lib/pipewire-0.3/libpipewire-module-adapter.so

pipewire/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3/x1H6ZnhzQ48SjMucPofjpvyl7HxFInqgiVMnF84NPRbiTQInwlXMcgxMxmXuYjQVEqoTPHhraqjHcQ7nZfMwo=
-SHA256 (Pkgfile) = e12e0aa2bcdafa2d759946895f0686368ecab6a46c008267255d97e9ea63b658
-SHA256 (.footprint) = e7dc0987f6e678afaa08f153c1adfb6b381ebb420d6a0cb8cc7c1e97f55a505e
-SHA256 (pipewire-0.3.46.tar.gz) = 3a5496ce19f5600914deaa75522fbd844dad5d4eb7aa28b529e3c97db3884072
+RWSagIOpLGJF31n2MqvuEcKofhDpgxZ6iLjDTYyMpymPDakcQ0iNIxDK9dygjayFrquF13b1pZUY3wd7Im5gRNBEZ5T6YGpvYQQ=
+SHA256 (Pkgfile) = 7505f19a2ee75fa252fda6fb199191e61ee27e2d2ce67e970f89431ed00e7d45
+SHA256 (.footprint) = 9b0636962103382887f706109b178ea3e680bf9e03560e72681eef3efdb11ad4
+SHA256 (pipewire-0.3.47.tar.gz) = 8d70170a91ecba73746c1d83f95d54eee8ca71d0c3521926f05ed830d8b5a84e

pipewire/Pkgfile

@@ -5,7 +5,7 @@
 # Optional: alsa-ucm-conf avahi bluez gst-plugins-base jack libldac pulseaudio rtkit v4l2 vulkan-loader wireplumber
 
 name=pipewire
-version=0.3.46
+version=0.3.47
 release=1
 source=(https://github.com/PipeWire/pipewire/archive/$version/$name-$version.tar.gz)
 

python3-filelock/.footprint

@@ -2,13 +2,13 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/python3.10/
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/
-drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/filelock-3.5.1-py3.10.egg-info/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/filelock-3.5.1-py3.10.egg-info/PKG-INFO
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/filelock-3.5.1-py3.10.egg-info/SOURCES.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/filelock-3.5.1-py3.10.egg-info/dependency_links.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/filelock-3.5.1-py3.10.egg-info/requires.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/filelock-3.5.1-py3.10.egg-info/top_level.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/filelock-3.5.1-py3.10.egg-info/zip-safe
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/filelock-3.6.0-py3.10.egg-info/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/filelock-3.6.0-py3.10.egg-info/PKG-INFO
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/filelock-3.6.0-py3.10.egg-info/SOURCES.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/filelock-3.6.0-py3.10.egg-info/dependency_links.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/filelock-3.6.0-py3.10.egg-info/requires.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/filelock-3.6.0-py3.10.egg-info/top_level.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/filelock-3.6.0-py3.10.egg-info/zip-safe
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/filelock/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/filelock/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/filelock/__pycache__/

python3-filelock/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3+BxmCtXU5A2Ax2JJvdmtQViZjrxe/KJJwQg8GAMrygxaMeLnx38QP+FAxTNJSudnnqrqvfoVM22AjX+0SjeMw8=
-SHA256 (Pkgfile) = b7d82853a4eef45df8508b20851bcc02661becce2170c5a8c946f274c467c9fe
-SHA256 (.footprint) = 207068b978184462bbe478bd61c9157504ee12c1175dfcd5604ccd5c09d16dae
-SHA256 (filelock-3.5.1.tar.gz) = d1eccb164ed020bc84edd9e45bf6cdb177f64749f6b8fe066648832d2e98726d
+RWSagIOpLGJF32gTdmjtMKFJEpBEzdPNkwQUsCXIUmgkXaiXF3vmQTvonn4E6OD7sO0De33oOaT3mS39vhPVkSzdcm0qxs8Tywo=
+SHA256 (Pkgfile) = 7e58997e4d024862f95d95b354e50425ba83546c38a74fa3e80cde2d16d13bc8
+SHA256 (.footprint) = 900aed81b827bb4748c4e212a89aec2859b493decfb3339f1ee8a7f319f2755d
+SHA256 (filelock-3.6.0.tar.gz) = 9cd540a9352e432c7246a48fe4e8712b10acb1df2ad1f30e8c070b82ae1fed85

python3-filelock/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on: python3-setuptools-scm
 
 name=python3-filelock
-version=3.5.1
+version=3.6.0
 release=1
 source=(https://pypi.python.org/packages/source/f/filelock/filelock-$version.tar.gz)