crux-commits
Threads by month
- ----- 2025 -----
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
February 2022
- 1 participants
- 1097 discussions
commit 7e7d756d738e7e1e2cb2ae335c3a2ad8b465d807
Author: Juergen Daubert <jue(a)jue.li>
Date: Sat Feb 19 11:24:26 2022 +0100
[notify] expat: update to 2.4.5
several security fixes, see
https://github.com/libexpat/libexpat/blob/R_2_4_5/expat/Changes
diff --git a/expat/.footprint b/expat/.footprint
index f9dea74e..774b3e56 100644
--- a/expat/.footprint
+++ b/expat/.footprint
@@ -8,9 +8,9 @@ drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libexpat.a
-rwxr-xr-x root/root usr/lib/libexpat.la
-lrwxrwxrwx root/root usr/lib/libexpat.so -> libexpat.so.1.8.4
-lrwxrwxrwx root/root usr/lib/libexpat.so.1 -> libexpat.so.1.8.4
--rwxr-xr-x root/root usr/lib/libexpat.so.1.8.4
+lrwxrwxrwx root/root usr/lib/libexpat.so -> libexpat.so.1.8.5
+lrwxrwxrwx root/root usr/lib/libexpat.so.1 -> libexpat.so.1.8.5
+-rwxr-xr-x root/root usr/lib/libexpat.so.1.8.5
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/expat.pc
drwxr-xr-x root/root usr/share/
diff --git a/expat/.signature b/expat/.signature
index d821fd14..87150861 100644
--- a/expat/.signature
+++ b/expat/.signature
@@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqlqxxT8rRecqsHheqaHmqEPNeXIgrKnOnD2hYUmNW/mZKyQVssuZesyZmSK4Uhumad/QHiks0GAM4kqkErVxhAM=
-SHA256 (Pkgfile) = 5321bae9aefb346d9d43d56d068813856e0b99f48eb7f0d3e12509c84000a718
-SHA256 (.footprint) = 131cf668112560f73fef9e65c4ba421d8208d822110545144d0ec8b7c9822448
-SHA256 (expat-2.4.4.tar.xz) = b5d25d6e373351c2ed19b562b4732d01d2589ac8c8e9e7962d8df1207cc311b8
+RWRJc1FUaeVeqj6Jzd/o5+093Vgd1Bd73d+rbm6Z0Nx08j9yF05JW/CZkW5jxvptdCeTfol7AKGmI8JRSGz/k3/8BYL1evqIhwU=
+SHA256 (Pkgfile) = 2c5397b1f6993e0fe690f6c464665d934396d11edf52569588ebe7f450015ed9
+SHA256 (.footprint) = db7aa5dc323ee5eb3418e392a3ec7f0ea426d1c9dfeb96343b6e1c35a36919ee
+SHA256 (expat-2.4.5.tar.xz) = f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579
diff --git a/expat/Pkgfile b/expat/Pkgfile
index d5cc5cd2..05b116a6 100644
--- a/expat/Pkgfile
+++ b/expat/Pkgfile
@@ -3,7 +3,7 @@
# Maintainer: CRUX System Team, core-ports at crux dot nu
name=expat
-version=2.4.4
+version=2.4.5
release=1
source=(http://download.sourceforge.net/$name/$name-$version.tar.xz)
1
0
![](https://secure.gravatar.com/avatar/df8330968b6df8cd1c1942c5fb4b720c.jpg?s=120&d=mm&r=g)
ports/opt (3.6): [notify] ffmpeg: 4.4.1 -> 5.0 version 5.x, if you need support for older ffmpeg there is contrib/ffmpeg4 that can be installed alongside opt/ffmpeg
by crux@crux.nu 19 Feb '22
by crux@crux.nu 19 Feb '22
19 Feb '22
commit 70ff4cff1c38d542fd3ed705847e3311b0f9bba3
Author: Danny Rawlins <contact(a)romster.me>
Date: Sat Feb 19 19:48:31 2022 +1100
[notify] ffmpeg: 4.4.1 -> 5.0 version 5.x, if you need support for older ffmpeg there is contrib/ffmpeg4 that can be installed alongside opt/ffmpeg
diff --git a/ffmpeg/.footprint b/ffmpeg/.footprint
index 2de828023..3f3ea3139 100644
--- a/ffmpeg/.footprint
+++ b/ffmpeg/.footprint
@@ -15,6 +15,7 @@ drwxr-xr-x root/root usr/include/libavcodec/
-rw-r--r-- root/root usr/include/libavcodec/codec_id.h
-rw-r--r-- root/root usr/include/libavcodec/codec_par.h
-rw-r--r-- root/root usr/include/libavcodec/d3d11va.h
+-rw-r--r-- root/root usr/include/libavcodec/defs.h
-rw-r--r-- root/root usr/include/libavcodec/dirac.h
-rw-r--r-- root/root usr/include/libavcodec/dv_profile.h
-rw-r--r-- root/root usr/include/libavcodec/dxva2.h
@@ -22,7 +23,6 @@ drwxr-xr-x root/root usr/include/libavcodec/
-rw-r--r-- root/root usr/include/libavcodec/mediacodec.h
-rw-r--r-- root/root usr/include/libavcodec/packet.h
-rw-r--r-- root/root usr/include/libavcodec/qsv.h
--rw-r--r-- root/root usr/include/libavcodec/vaapi.h
-rw-r--r-- root/root usr/include/libavcodec/vdpau.h
-rw-r--r-- root/root usr/include/libavcodec/version.h
-rw-r--r-- root/root usr/include/libavcodec/videotoolbox.h
@@ -40,9 +40,6 @@ drwxr-xr-x root/root usr/include/libavformat/
-rw-r--r-- root/root usr/include/libavformat/avformat.h
-rw-r--r-- root/root usr/include/libavformat/avio.h
-rw-r--r-- root/root usr/include/libavformat/version.h
-drwxr-xr-x root/root usr/include/libavresample/
--rw-r--r-- root/root usr/include/libavresample/avresample.h
--rw-r--r-- root/root usr/include/libavresample/version.h
drwxr-xr-x root/root usr/include/libavutil/
-rw-r--r-- root/root usr/include/libavutil/adler32.h
-rw-r--r-- root/root usr/include/libavutil/aes.h
@@ -65,6 +62,7 @@ drwxr-xr-x root/root usr/include/libavutil/
-rw-r--r-- root/root usr/include/libavutil/cpu.h
-rw-r--r-- root/root usr/include/libavutil/crc.h
-rw-r--r-- root/root usr/include/libavutil/des.h
+-rw-r--r-- root/root usr/include/libavutil/detection_bbox.h
-rw-r--r-- root/root usr/include/libavutil/dict.h
-rw-r--r-- root/root usr/include/libavutil/display.h
-rw-r--r-- root/root usr/include/libavutil/dovi_meta.h
@@ -142,47 +140,42 @@ drwxr-xr-x root/root usr/include/libswscale/
-rw-r--r-- root/root usr/include/libswscale/version.h
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libavcodec.a
-lrwxrwxrwx root/root usr/lib/libavcodec.so -> libavcodec.so.58.134.100
-lrwxrwxrwx root/root usr/lib/libavcodec.so.58 -> libavcodec.so.58.134.100
--rwxr-xr-x root/root usr/lib/libavcodec.so.58.134.100
+lrwxrwxrwx root/root usr/lib/libavcodec.so -> libavcodec.so.59.18.100
+lrwxrwxrwx root/root usr/lib/libavcodec.so.59 -> libavcodec.so.59.18.100
+-rwxr-xr-x root/root usr/lib/libavcodec.so.59.18.100
-rw-r--r-- root/root usr/lib/libavdevice.a
-lrwxrwxrwx root/root usr/lib/libavdevice.so -> libavdevice.so.58.13.100
-lrwxrwxrwx root/root usr/lib/libavdevice.so.58 -> libavdevice.so.58.13.100
--rwxr-xr-x root/root usr/lib/libavdevice.so.58.13.100
+lrwxrwxrwx root/root usr/lib/libavdevice.so -> libavdevice.so.59.4.100
+lrwxrwxrwx root/root usr/lib/libavdevice.so.59 -> libavdevice.so.59.4.100
+-rwxr-xr-x root/root usr/lib/libavdevice.so.59.4.100
-rw-r--r-- root/root usr/lib/libavfilter.a
-lrwxrwxrwx root/root usr/lib/libavfilter.so -> libavfilter.so.7.110.100
-lrwxrwxrwx root/root usr/lib/libavfilter.so.7 -> libavfilter.so.7.110.100
--rwxr-xr-x root/root usr/lib/libavfilter.so.7.110.100
+lrwxrwxrwx root/root usr/lib/libavfilter.so -> libavfilter.so.8.24.100
+lrwxrwxrwx root/root usr/lib/libavfilter.so.8 -> libavfilter.so.8.24.100
+-rwxr-xr-x root/root usr/lib/libavfilter.so.8.24.100
-rw-r--r-- root/root usr/lib/libavformat.a
-lrwxrwxrwx root/root usr/lib/libavformat.so -> libavformat.so.58.76.100
-lrwxrwxrwx root/root usr/lib/libavformat.so.58 -> libavformat.so.58.76.100
--rwxr-xr-x root/root usr/lib/libavformat.so.58.76.100
--rw-r--r-- root/root usr/lib/libavresample.a
-lrwxrwxrwx root/root usr/lib/libavresample.so -> libavresample.so.4.0.0
-lrwxrwxrwx root/root usr/lib/libavresample.so.4 -> libavresample.so.4.0.0
--rwxr-xr-x root/root usr/lib/libavresample.so.4.0.0
+lrwxrwxrwx root/root usr/lib/libavformat.so -> libavformat.so.59.16.100
+lrwxrwxrwx root/root usr/lib/libavformat.so.59 -> libavformat.so.59.16.100
+-rwxr-xr-x root/root usr/lib/libavformat.so.59.16.100
-rw-r--r-- root/root usr/lib/libavutil.a
-lrwxrwxrwx root/root usr/lib/libavutil.so -> libavutil.so.56.70.100
-lrwxrwxrwx root/root usr/lib/libavutil.so.56 -> libavutil.so.56.70.100
--rwxr-xr-x root/root usr/lib/libavutil.so.56.70.100
+lrwxrwxrwx root/root usr/lib/libavutil.so -> libavutil.so.57.17.100
+lrwxrwxrwx root/root usr/lib/libavutil.so.57 -> libavutil.so.57.17.100
+-rwxr-xr-x root/root usr/lib/libavutil.so.57.17.100
-rw-r--r-- root/root usr/lib/libpostproc.a
-lrwxrwxrwx root/root usr/lib/libpostproc.so -> libpostproc.so.55.9.100
-lrwxrwxrwx root/root usr/lib/libpostproc.so.55 -> libpostproc.so.55.9.100
--rwxr-xr-x root/root usr/lib/libpostproc.so.55.9.100
+lrwxrwxrwx root/root usr/lib/libpostproc.so -> libpostproc.so.56.3.100
+lrwxrwxrwx root/root usr/lib/libpostproc.so.56 -> libpostproc.so.56.3.100
+-rwxr-xr-x root/root usr/lib/libpostproc.so.56.3.100
-rw-r--r-- root/root usr/lib/libswresample.a
-lrwxrwxrwx root/root usr/lib/libswresample.so -> libswresample.so.3.9.100
-lrwxrwxrwx root/root usr/lib/libswresample.so.3 -> libswresample.so.3.9.100
--rwxr-xr-x root/root usr/lib/libswresample.so.3.9.100
+lrwxrwxrwx root/root usr/lib/libswresample.so -> libswresample.so.4.3.100
+lrwxrwxrwx root/root usr/lib/libswresample.so.4 -> libswresample.so.4.3.100
+-rwxr-xr-x root/root usr/lib/libswresample.so.4.3.100
-rw-r--r-- root/root usr/lib/libswscale.a
-lrwxrwxrwx root/root usr/lib/libswscale.so -> libswscale.so.5.9.100
-lrwxrwxrwx root/root usr/lib/libswscale.so.5 -> libswscale.so.5.9.100
--rwxr-xr-x root/root usr/lib/libswscale.so.5.9.100
+lrwxrwxrwx root/root usr/lib/libswscale.so -> libswscale.so.6.4.100
+lrwxrwxrwx root/root usr/lib/libswscale.so.6 -> libswscale.so.6.4.100
+-rwxr-xr-x root/root usr/lib/libswscale.so.6.4.100
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libavcodec.pc
-rw-r--r-- root/root usr/lib/pkgconfig/libavdevice.pc
-rw-r--r-- root/root usr/lib/pkgconfig/libavfilter.pc
-rw-r--r-- root/root usr/lib/pkgconfig/libavformat.pc
--rw-r--r-- root/root usr/lib/pkgconfig/libavresample.pc
-rw-r--r-- root/root usr/lib/pkgconfig/libavutil.pc
-rw-r--r-- root/root usr/lib/pkgconfig/libpostproc.pc
-rw-r--r-- root/root usr/lib/pkgconfig/libswresample.pc
diff --git a/ffmpeg/.signature b/ffmpeg/.signature
index d349dc43d..f8d7cd217 100644
--- a/ffmpeg/.signature
+++ b/ffmpeg/.signature
@@ -1,7 +1,8 @@
untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/X3jrAnWOI4FJawtpcAMwXK6NXB+yRNK93e/hYuZ0ZOcaJcqDEK/NJU7vxENbN7attAp7OAQHLlaJaxbgRJycws=
-SHA256 (Pkgfile) = aaabe961df2932961483370f07b27f2524eb0035892129b15039456319576934
-SHA256 (.footprint) = 1738e69565d5f2a7df346ad944b1476269c9d635e3a8368d55575d77477fea7d
-SHA256 (ffmpeg-4.4.1.tar.bz2) = 8fc9f20ac5ed95115a9e285647add0eedd5cc1a98a039ada14c132452f98ac42
+RWSE3ohX2g5d/V/vxDpqQUuzY89HCog47GFqkuVvDlLIy5qATJR8R3TTv0NrVulrsuueqcfRDzDJOxE8XiaGrSDAv+Knp3Vp9gs=
+SHA256 (Pkgfile) = 0784ecece44a5384f45714036d17554e87d5e38f73cf4a9ab3d33c4c744a4777
+SHA256 (.footprint) = 06e32249d28bb0ac16dc915a77d20353bed90a70a05410213cebba459fbddd23
+SHA256 (ffmpeg-5.0.tar.bz2) = c0130b8db2c763430fd1c6905288d61bc44ee0548ad5fcd2dfd650b88432bed9
SHA256 (ffmpeg-x264-10bit.sh) = dde9627c41800235fbcfe0f74d2181be96239a82cd2d0d277715dddb57eb9cb3
-SHA256 (CVE-2018-6621.patch) = e3b9aff1fe9aef2d7153d7517f9c349beef27c2859bf1fb01076eeab263a445e
+SHA256 (vmaf-model-path.patch) = 8dff51f84a5f7460f8893f0514812f5d2bd668c3276ef7ab7713c99b71d7bd8d
+SHA256 (add-av_stream_get_first_dts-for-chromium.patch) = 91973c465f01446a999f278f0c2a3763304994dba1ac35de0e4c72f12f39409e
diff --git a/ffmpeg/CVE-2018-6621.patch b/ffmpeg/CVE-2018-6621.patch
deleted file mode 100644
index 8c9e4dd0e..000000000
--- a/ffmpeg/CVE-2018-6621.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;
- }
diff --git a/ffmpeg/Pkgfile b/ffmpeg/Pkgfile
index 955a76a6e..69a0d421c 100644
--- a/ffmpeg/Pkgfile
+++ b/ffmpeg/Pkgfile
@@ -5,21 +5,27 @@
# 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=ffmpeg
-version=4.4.1
+version=5.0
release=1
source=(https://ffmpeg.org/releases/$name-$version.tar.bz2
ffmpeg-x264-10bit.sh
- CVE-2018-6621.patch)
+ vmaf-model-path.patch
+ add-av_stream_get_first_dts-for-chromium.patch)
build() {
cd $name-$version
- #https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-6621
- patch -p1 -i $SRC/CVE-2018-6621.patch
+ patch -p1 -i $SRC/vmaf-model-path.patch
+
+ # https://crbug.com/1251779
+ patch -p1 -i $SRC/add-av_stream_get_first_dts-for-chromium.patch
+
+[[ -e '/usr/bin/clang' && -e '/usr/lib/pkgconfig/cuda.pc' && -e '/usr/share/pkgconfig/ffnvcodec.pc' ]] && \
+ PKGMK_FFMPEG+=' --enable-cuda-llvm --enable-nonfree --enable-cuda-nvcc --enable-libnpp' && \
+ PKGMK_FFMPEG+=' --extra-cflags=-I/opt/cuda/include --extra-ldflags=-L/opt/cuda/lib64' && PATH="$PATH:/opt/cuda/bin"
[ -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'
@@ -55,8 +61,7 @@ build() {
--enable-avfilter \
--enable-postproc \
--enable-pthreads \
- --enable-swresample \
- --enable-avresample
+ --enable-swresample
make
make DESTDIR=$PKG install install-man
diff --git a/ffmpeg/add-av_stream_get_first_dts-for-chromium.patch b/ffmpeg/add-av_stream_get_first_dts-for-chromium.patch
new file mode 100644
index 000000000..fb5589800
--- /dev/null
+++ b/ffmpeg/add-av_stream_get_first_dts-for-chromium.patch
@@ -0,0 +1,44 @@
+From 95aab0fd83619408995720ce53d7a74790580220 Mon Sep 17 00:00:00 2001
+From: "liberato(a)chromium.org" <liberato(a)chromium.org>
+Date: Wed, 7 Jul 2021 19:01:22 -0700
+Subject: [PATCH] Add av_stream_get_first_dts for Chromium
+
+[foutrelis: adjust for new FFStream struct replacing AVStreamInternal]
+---
+ libavformat/avformat.h | 4 ++++
+ libavformat/utils.c | 7 +++++++
+ 2 files changed, 11 insertions(+)
+
+diff --git a/libavformat/avformat.h b/libavformat/avformat.h
+index cd7b0d941c..b4a6dce885 100644
+--- a/libavformat/avformat.h
++++ b/libavformat/avformat.h
+@@ -1010,6 +1010,10 @@ struct AVCodecParserContext *av_stream_get_parser(const AVStream *s);
+ */
+ int64_t av_stream_get_end_pts(const AVStream *st);
+
++// Chromium: We use the internal field first_dts vvv
++int64_t av_stream_get_first_dts(const AVStream *st);
++// Chromium: We use the internal field first_dts ^^^
++
+ #define AV_PROGRAM_RUNNING 1
+
+ /**
+diff --git a/libavformat/utils.c b/libavformat/utils.c
+index de7580c32d..0ef0fe530e 100644
+--- a/libavformat/utils.c
++++ b/libavformat/utils.c
+@@ -121,6 +121,13 @@ int64_t av_stream_get_end_pts(const AVStream *st)
+ return AV_NOPTS_VALUE;
+ }
+
++// Chromium: We use the internal field first_dts vvv
++int64_t av_stream_get_first_dts(const AVStream *st)
++{
++ return cffstream(st)->first_dts;
++}
++// Chromium: We use the internal field first_dts ^^^
++
+ struct AVCodecParserContext *av_stream_get_parser(const AVStream *st)
+ {
+ return st->internal->parser;
diff --git a/ffmpeg/vmaf-model-path.patch b/ffmpeg/vmaf-model-path.patch
new file mode 100644
index 000000000..abd65cdf7
--- /dev/null
+++ b/ffmpeg/vmaf-model-path.patch
@@ -0,0 +1,13 @@
+diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c
+index 249e50c720..9b791e19b1 100644
+--- a/libavfilter/vf_libvmaf.c
++++ b/libavfilter/vf_libvmaf.c
+@@ -72,7 +72,7 @@ typedef struct LIBVMAFContext {
+ #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
+
+ static const AVOption libvmaf_options[] = {
+- {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/local/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS},
++ {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS},
+ {"log_path", "Set the file path to be used to store logs.", OFFSET(log_path), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
+ {"log_fmt", "Set the format of the log (xml or json).", OFFSET(log_fmt), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
+ {"enable_transform", "Enables transform for computing vmaf.", OFFSET(enable_transform), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS},
1
0
![](https://secure.gravatar.com/avatar/df8330968b6df8cd1c1942c5fb4b720c.jpg?s=120&d=mm&r=g)
ports/contrib (3.6): [notice] ffmpeg4: initial import of version 4 of ffmpeg, as is needed by a few packages, including firefox
by crux@crux.nu 19 Feb '22
by crux@crux.nu 19 Feb '22
19 Feb '22
commit 173baf9d74926f0770400f7127e867d30f3b39a2
Author: Danny Rawlins <contact(a)romster.me>
Date: Sat Feb 19 18:12:10 2022 +1100
[notice] ffmpeg4: initial import of version 4 of ffmpeg, as is needed by a few packages, including firefox
diff --git a/ffmpeg4/.footprint b/ffmpeg4/.footprint
new file mode 100644
index 000000000..8bfeb1085
--- /dev/null
+++ b/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/
diff --git a/ffmpeg4/.signature b/ffmpeg4/.signature
new file mode 100644
index 000000000..7bd315458
--- /dev/null
+++ b/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
diff --git a/ffmpeg4/CVE-2018-6621.patch b/ffmpeg4/CVE-2018-6621.patch
new file mode 100644
index 000000000..8c9e4dd0e
--- /dev/null
+++ b/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;
+ }
diff --git a/ffmpeg4/Pkgfile b/ffmpeg4/Pkgfile
new file mode 100644
index 000000000..c4eac9bba
--- /dev/null
+++ b/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}
+}
1
0
commit 1d5c15058bbbbe07ba6905c90adb31be2e8f6fc8
Author: Danny Rawlins <contact(a)romster.me>
Date: Sat Feb 19 18:06:08 2022 +1100
firefox: 97.0 -> 97.0.1
diff --git a/firefox/.signature b/firefox/.signature
index 5273fb717..41f9d71c9 100644
--- a/firefox/.signature
+++ b/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
diff --git a/firefox/Pkgfile b/firefox/Pkgfile
index 444af88dd..62b955385 100644
--- a/firefox/Pkgfile
+++ b/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/$n…
firefox.desktop
1
0
commit 843586f5ecd9261746d316cee7e582880e3024a8
Author: Tim Biermann <tbier(a)posteo.de>
Date: Fri Feb 18 18:35:20 2022 +0100
grafana: 8.4.0 -> 8.4.1
diff --git a/grafana/.footprint b/grafana/.footprint
index 09d7de27b..97f36201f 100644
--- a/grafana/.footprint
+++ b/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
diff --git a/grafana/.signature b/grafana/.signature
index 9ee00ad31..16657b86d 100644
--- a/grafana/.signature
+++ b/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
diff --git a/grafana/Pkgfile b/grafana/Pkgfile
index dc2f23a7a..07b750002 100644
--- a/grafana/Pkgfile
+++ b/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…
https://dl.grafana.com/oss/release/grafana-$version.linux-amd64.tar.gz
1
0
commit 4c1f3c48d2d962ce73a98779f893de75774b9840
Author: Tim Biermann <tbier(a)posteo.de>
Date: Fri Feb 18 18:22:16 2022 +0100
libgit2: 1.4.0 -> 1.4.1
diff --git a/libgit2/.signature b/libgit2/.signature
index afce97112..8a4aa5790 100644
--- a/libgit2/.signature
+++ b/libgit2/.signature
@@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3wuB/BlDdF6A0HtwBEM7YbIEOzGkwMSKA0JQStznkkFYMt20ZxS1eIqeyvkTloWTCh7j2N2ExkUj9w9kIxZxJgo=
-SHA256 (Pkgfile) = 05a5ef5724bd862b6039732e5b46beca37bc279ec25e27982f682b204c83dcab
+RWSagIOpLGJF31qsofvRsxutema3gs/W25wTxHoXyyZ4cApjjnq/KCx0ZyGSTIXDQ4/myXTvL26p2bL2vpW8Agov2mX5IHNxiwk=
+SHA256 (Pkgfile) = 92930996b2c22468ee04f97fb0c6a974eb8481c1fefea06945957ed1c13cfe94
SHA256 (.footprint) = 5b7607e7f6d4cb02f2a2f124287e2b6f886978c0c696f0dc9f214703662ad426
-SHA256 (libgit2-1.4.0.tar.gz) = 9051e75964350054d5e3f9339bc4d1fb56ac14949710e3860f98f07a0433fa25
+SHA256 (libgit2-1.4.1.tar.gz) = fccd371a271133e29d002dd207490d22a0c9b06992b874b8edb8366532a94f54
diff --git a/libgit2/Pkgfile b/libgit2/Pkgfile
index 12740d978..47ba10d23 100644
--- a/libgit2/Pkgfile
+++ b/libgit2/Pkgfile
@@ -4,7 +4,7 @@
# Depends on: cmake 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…
1
0
commit 897c8903e28fd7e3d605d855503c1660b3a83107
Author: Matt Housh <jaeger(a)crux.ninja>
Date: Fri Feb 18 12:16:22 2022 -0600
rsyslog: updated to version 8.2202.0
diff --git a/rsyslog/.signature b/rsyslog/.signature
index cc2e2def4..5546716b5 100644
--- a/rsyslog/.signature
+++ b/rsyslog/.signature
@@ -1,7 +1,7 @@
untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/ev9L5NzlNAZFKwV8gxJTzhgkFt9U91ddQzNQRc2v6bRyu+tG4fSTD25JuUK5uSaYJ+cuRwpfDUJa93YXRLWZQY=
-SHA256 (Pkgfile) = f85b824d3ca85b259c02a36be3dd741ff1a9b2c7aade1686470b6cad6d33da84
+RWSE3ohX2g5d/aXM4MiWYyLhNPn6ecT9NxBM9sOOiayVYGRB4Uln27sIrS2hy/2j1tzvATHq+EYUAIY8mfV/Cz/D3EDjNySQVA8=
+SHA256 (Pkgfile) = dd512e8d135ff52f12f13aaeb40c8e9524d1dac41c31797baecfaac432a1ec1f
SHA256 (.footprint) = 2c2ccf7d49397243b0e18693bdeffa6442a1afc9050cadd41e348c09a7cc5cde
-SHA256 (rsyslog-8.2112.0.tar.gz) = 6a2a973861e9266db37bd2b7b9f672b6b970bfcd743a397b8eee6b0dc4852c41
+SHA256 (rsyslog-8.2202.0.tar.gz) = e41308a5a171939b3cbc246e9d4bd30be44e801521e04cd95d051fa3867d6738
SHA256 (rsyslog.conf) = 4d671bb3b183e7acbacb9d7b92447cfe1e446ed85b44eff76a8d1c70fe5f08c2
SHA256 (rsyslogd.rc) = d28d8c3fc8076b10156f9b60c7e4af5909c312beddcd67c62f8b6153594065c0
diff --git a/rsyslog/Pkgfile b/rsyslog/Pkgfile
index 4133947a2..73902615a 100644
--- a/rsyslog/Pkgfile
+++ b/rsyslog/Pkgfile
@@ -4,7 +4,7 @@
# Depends on: libestr json-c libgcrypt liblogging libfastjson
name=rsyslog
-version=8.2112.0
+version=8.2202.0
release=1
source=(http://www.rsyslog.com/files/download/$name/$name-$version.tar.gz \
$name.conf rsyslogd.rc)
1
0
commit 19613d5f01d62e346013562d196be7f4bb971136
Author: Matt Housh <jaeger(a)crux.ninja>
Date: Fri Feb 18 12:13:26 2022 -0600
thunderbird-bin: updated to version 91.6.1
diff --git a/thunderbird-bin/.signature b/thunderbird-bin/.signature
index 517d36800..0c690dd35 100644
--- a/thunderbird-bin/.signature
+++ b/thunderbird-bin/.signature
@@ -1,7 +1,7 @@
untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/QpGrywHZ0hlNK3eL6zdF0iFjIehy1W45y8Jr5dt0kZ9hz9Zg7Aw2wJTYmsyZVQuu/BDgNhWphru3jFlZ9hytQo=
-SHA256 (Pkgfile) = 805c51a9688f90844d8f76334ba52da0179e063ec18729393f0a34c8f0afcebd
+RWSE3ohX2g5d/axO/n4fA1gJwqy2wqAlz7U4jJemR/Mi2MQCZbW1ytzeM0LhOfYePzFgMFKHE21ZuLwGNqt/eqRBlgK/i7NdXQI=
+SHA256 (Pkgfile) = 164fdec01d4cb9b475a82289bee9765db574689ebed6c2778b6457417a064866
SHA256 (.footprint) = 7722649c6ba7bec7a358a7efa92c44bb62ad777030882d22cbb5455b27ac4b99
-SHA256 (thunderbird-91.6.0.tar.bz2) = d3860a48ac7064cf30f075a4a8ac7503125489eb8ecedb4a122165bbbb14bb35
+SHA256 (thunderbird-91.6.1.tar.bz2) = 08e963292b4e63be2dad7a24eb125bca484107b05856dcebf98ceddaf47f1e87
SHA256 (policies.json) = cf856011307f7831d74cdacb4e80b6dceaa49882b8dcba008d527a78764903f4
SHA256 (thunderbird.desktop) = 8e3777e4d0c02418f0ea82240325c9f9b58cf60859b0b180217585e4ab288aba
diff --git a/thunderbird-bin/Pkgfile b/thunderbird-bin/Pkgfile
index ea6a849d5..68c328a2f 100644
--- a/thunderbird-bin/Pkgfile
+++ b/thunderbird-bin/Pkgfile
@@ -4,7 +4,7 @@
# Depends on: gtk3 dbus-glib
name=thunderbird-bin
-version=91.6.0
+version=91.6.1
release=1
source=(https://ftp.mozilla.org/pub/thunderbird/releases/$version/linux-x86…
policies.json thunderbird.desktop)
1
0
commit 390d6771f84dc419815fe6a8c142f7fc21031505
Author: Matt Housh <jaeger(a)crux.ninja>
Date: Fri Feb 18 12:01:49 2022 -0600
dracut: updated to version 056
diff --git a/dracut/.footprint b/dracut/.footprint
index 26548aa8d..0b12e3165 100644
--- a/dracut/.footprint
+++ b/dracut/.footprint
@@ -53,6 +53,8 @@ drwxrwxr-x root/root usr/lib/dracut/modules.d/01systemd-hostnamed/
-rw-rw-r-- root/root usr/lib/dracut/modules.d/01systemd-hostnamed/systemd-hostname-dracut.conf
drwxrwxr-x root/root usr/lib/dracut/modules.d/01systemd-initrd/
-rwxrwxr-x root/root usr/lib/dracut/modules.d/01systemd-initrd/module-setup.sh
+drwxrwxr-x root/root usr/lib/dracut/modules.d/01systemd-integritysetup/
+-rwxrwxr-x root/root usr/lib/dracut/modules.d/01systemd-integritysetup/module-setup.sh
drwxrwxr-x root/root usr/lib/dracut/modules.d/01systemd-journald/
-rw-rw-r-- root/root usr/lib/dracut/modules.d/01systemd-journald/initrd.conf
-rwxrwxr-x root/root usr/lib/dracut/modules.d/01systemd-journald/module-setup.sh
@@ -75,6 +77,7 @@ drwxrwxr-x root/root usr/lib/dracut/modules.d/01systemd-sysext/
-rwxrwxr-x root/root usr/lib/dracut/modules.d/01systemd-sysext/module-setup.sh
drwxrwxr-x root/root usr/lib/dracut/modules.d/01systemd-sysusers/
-rwxrwxr-x root/root usr/lib/dracut/modules.d/01systemd-sysusers/module-setup.sh
+-rw-rw-r-- root/root usr/lib/dracut/modules.d/01systemd-sysusers/sysusers-dracut.conf
drwxrwxr-x root/root usr/lib/dracut/modules.d/01systemd-timedated/
-rwxrwxr-x root/root usr/lib/dracut/modules.d/01systemd-timedated/module-setup.sh
drwxrwxr-x root/root usr/lib/dracut/modules.d/01systemd-timesyncd/
@@ -278,6 +281,14 @@ drwxrwxr-x root/root usr/lib/dracut/modules.d/91crypt-gpg/
drwxrwxr-x root/root usr/lib/dracut/modules.d/91crypt-loop/
-rwxrwxr-x root/root usr/lib/dracut/modules.d/91crypt-loop/crypt-loop-lib.sh
-rwxrwxr-x root/root usr/lib/dracut/modules.d/91crypt-loop/module-setup.sh
+drwxrwxr-x root/root usr/lib/dracut/modules.d/91fido2/
+-rwxrwxr-x root/root usr/lib/dracut/modules.d/91fido2/module-setup.sh
+drwxrwxr-x root/root usr/lib/dracut/modules.d/91pcsc/
+-rwxrwxr-x root/root usr/lib/dracut/modules.d/91pcsc/module-setup.sh
+-rw-rw-r-- root/root usr/lib/dracut/modules.d/91pcsc/pcscd.service
+-rw-rw-r-- root/root usr/lib/dracut/modules.d/91pcsc/pcscd.socket
+drwxrwxr-x root/root usr/lib/dracut/modules.d/91pkcs11/
+-rwxrwxr-x root/root usr/lib/dracut/modules.d/91pkcs11/module-setup.sh
drwxrwxr-x root/root usr/lib/dracut/modules.d/91tpm2-tss/
-rwxrwxr-x root/root usr/lib/dracut/modules.d/91tpm2-tss/module-setup.sh
drwxrwxr-x root/root usr/lib/dracut/modules.d/91zipl/
@@ -421,8 +432,9 @@ drwxrwxr-x root/root usr/lib/dracut/modules.d/98dracut-systemd/
-rw-r--r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-udev.service.8
-rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-udev.service.8.asc
-rwxrwxr-x root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-udev.sh
+-rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-shutdown-onfailure.service
-rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-shutdown.service
--rw-r--r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-shutdown.service.8
+-rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-shutdown.service.8
-rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-shutdown.service.8.asc
-rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-tmpfiles.conf
-rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/emergency.service
diff --git a/dracut/.signature b/dracut/.signature
index 72371edec..9365f8f22 100644
--- a/dracut/.signature
+++ b/dracut/.signature
@@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/efnaq1TLyP6kgcl0YBmI+fA999qtTpComgxPZXxJt9SjMaWrHnbPzHRVOCsF8ePMdRMQFYBINJQ5iNmu2zJBgQ=
-SHA256 (Pkgfile) = 34245d4ce6866d7d225919b936fad6866150826dc1e9718c802cb9139fd4694a
-SHA256 (.footprint) = c46876d38983f981e3d6697b189515c391c99e68187c34bda666e0fd0bf0fa13
-SHA256 (dracut-055.tar.xz) = 4baa08206cceeb124dbf1075a0daf774b5a8f144ce2e01d82a144af3020fd65b
+RWSE3ohX2g5d/VV99qza/wxEPhFp0cG0e2iI+FNDs0FERjb4XYzBQnABWGXS8kDR1UH+M2iC9iY6EUlfHzWoHmK/+FAiJfChCQs=
+SHA256 (Pkgfile) = 77be2aa0021f0e4beb4edb4109721cc66ccffe2fce5a96044f92a21a23013e11
+SHA256 (.footprint) = 0756a23de118d0b625066916287bea99fda3f47c8b4942dda52364b4ac8275f4
+SHA256 (dracut-056.tar.xz) = e025bbdce9d1209640fb3f5f674f059c7e1f441537ba421703fe56055502421d
diff --git a/dracut/Pkgfile b/dracut/Pkgfile
index 613983161..0d0d70048 100644
--- a/dracut/Pkgfile
+++ b/dracut/Pkgfile
@@ -3,7 +3,7 @@
# Maintainer: Matt Housh, jaeger at crux dot ninja
name=dracut
-version=055
+version=056
release=1
source=(https://mirrors.edge.kernel.org/pub/linux/utils/boot/$name/$name-$v…
1
0
commit ac1ce6413a91b1244b70e0ed43116e2c0a13af31
Merge: eb3c0f748 301e92e53
Author: Juergen Daubert <jue(a)jue.li>
Date: Fri Feb 18 15:51:41 2022 +0100
Merge branch '3.6' into 3.7
1
0