gnu: gst-plugins-good: Update to 1.19.2.
* gnu/packages/gstreamer.scm (gst-plugins-good): Update to 1.19.2. Remove trailing #t. [patches]: Remove. [meson]: Use meson-0.55. * gnu/packages/patches/gst-plugins-good-CVE-2021-3497.patch: Delete file. * gnu/packages/patches/gst-plugins-good-CVE-2021-3498.patch: Likewise. * gnu/packages/patches/gst-plugins-good-fix-test.patch: Likewise. * gnu/local.mk: De-register them.
This commit is contained in:
Maxim Cournoyer
parent
8f22b547ef
commit
a9e83d7c7e
5 changed files with 5 additions and 301 deletions
|
|
@ -1218,9 +1218,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/gspell-dash-test.patch \
|
||||
%D%/packages/patches/gst-libav-64channels-stack-corruption.patch \
|
||||
%D%/packages/patches/gst-plugins-bad-fix-overflow.patch \
|
||||
%D%/packages/patches/gst-plugins-good-fix-test.patch \
|
||||
%D%/packages/patches/gst-plugins-good-CVE-2021-3497.patch \
|
||||
%D%/packages/patches/gst-plugins-good-CVE-2021-3498.patch \
|
||||
%D%/packages/patches/gst-plugins-ugly-fix-out-of-bound-reads.patch \
|
||||
%D%/packages/patches/guile-1.8-cpp-4.5.patch \
|
||||
%D%/packages/patches/guile-2.2-skip-oom-test.patch \
|
||||
|
|
|
|||
|
|
@ -612,7 +612,7 @@ for the GStreamer multimedia library.")
|
|||
(define-public gst-plugins-good
|
||||
(package
|
||||
(name "gst-plugins-good")
|
||||
(version "1.18.4")
|
||||
(version "1.19.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -620,14 +620,12 @@ for the GStreamer multimedia library.")
|
|||
(string-append
|
||||
"https://gstreamer.freedesktop.org/src/" name "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(patches (search-patches "gst-plugins-good-fix-test.patch"
|
||||
"gst-plugins-good-CVE-2021-3497.patch"
|
||||
"gst-plugins-good-CVE-2021-3498.patch"))
|
||||
(sha256
|
||||
(base32 "1c1rpq709cy8maaykyn1n0kckj9c6fl3mhvixkk6xmdwkcx0xrdn"))))
|
||||
(base32 "0bjfipap6wc3w28hgf817hc6jvjbblkjil42a356vg242412xsab"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
|
||||
`(#:meson ,meson-0.55
|
||||
#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
,@%common-gstreamer-phases
|
||||
|
|
@ -641,8 +639,7 @@ for the GStreamer multimedia library.")
|
|||
;; Tests look for $XDG_RUNTIME_DIR.
|
||||
(setenv "XDG_RUNTIME_DIR" (getcwd))
|
||||
;; For missing '/etc/machine-id'.
|
||||
(setenv "DBUS_FATAL_WARNINGS" "0")
|
||||
#t)))))
|
||||
(setenv "DBUS_FATAL_WARNINGS" "0"))))))
|
||||
(native-inputs
|
||||
`(("gettext" ,gettext-minimal)
|
||||
("glib:bin" ,glib "bin")
|
||||
|
|
|
|||
|
|
@ -1,174 +0,0 @@
|
|||
Fix CVE-2021-3497:
|
||||
|
||||
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3497
|
||||
https://gstreamer.freedesktop.org/security/sa-2021-0002.html
|
||||
|
||||
Patch copied from upstream source repository:
|
||||
|
||||
https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/commit/9181191511f9c0be6a89c98b311f49d66bd46dc3?merge_request_iid=903
|
||||
|
||||
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
|
||||
index 467815986c8c3d86fd8906a0d539b34f67d6693e..0e47ee7b5e25ac3331f30439710ae755235f2a22 100644
|
||||
--- a/gst/matroska/matroska-demux.c
|
||||
+++ b/gst/matroska/matroska-demux.c
|
||||
@@ -3851,6 +3851,12 @@ gst_matroska_demux_add_wvpk_header (GstElement * element,
|
||||
guint32 block_samples, tmp;
|
||||
gsize size = gst_buffer_get_size (*buf);
|
||||
|
||||
+ if (size < 4) {
|
||||
+ GST_ERROR_OBJECT (element, "Too small wavpack buffer");
|
||||
+ gst_buffer_unmap (*buf, &map);
|
||||
+ return GST_FLOW_ERROR;
|
||||
+ }
|
||||
+
|
||||
gst_buffer_extract (*buf, 0, &tmp, sizeof (guint32));
|
||||
block_samples = GUINT32_FROM_LE (tmp);
|
||||
/* we need to reconstruct the header of the wavpack block */
|
||||
@@ -3858,10 +3864,10 @@ gst_matroska_demux_add_wvpk_header (GstElement * element,
|
||||
/* -20 because ck_size is the size of the wavpack block -8
|
||||
* and lace_size is the size of the wavpack block + 12
|
||||
* (the three guint32 of the header that already are in the buffer) */
|
||||
- wvh.ck_size = size + sizeof (Wavpack4Header) - 20;
|
||||
+ wvh.ck_size = size + WAVPACK4_HEADER_SIZE - 20;
|
||||
|
||||
/* block_samples, flags and crc are already in the buffer */
|
||||
- newbuf = gst_buffer_new_allocate (NULL, sizeof (Wavpack4Header) - 12, NULL);
|
||||
+ newbuf = gst_buffer_new_allocate (NULL, WAVPACK4_HEADER_SIZE - 12, NULL);
|
||||
|
||||
gst_buffer_map (newbuf, &outmap, GST_MAP_WRITE);
|
||||
data = outmap.data;
|
||||
@@ -3886,9 +3892,11 @@ gst_matroska_demux_add_wvpk_header (GstElement * element,
|
||||
audiocontext->wvpk_block_index += block_samples;
|
||||
} else {
|
||||
guint8 *outdata = NULL;
|
||||
- guint outpos = 0;
|
||||
- gsize buf_size, size, out_size = 0;
|
||||
+ gsize buf_size, size;
|
||||
guint32 block_samples, flags, crc, blocksize;
|
||||
+ GstAdapter *adapter;
|
||||
+
|
||||
+ adapter = gst_adapter_new ();
|
||||
|
||||
gst_buffer_map (*buf, &map, GST_MAP_READ);
|
||||
buf_data = map.data;
|
||||
@@ -3897,6 +3905,7 @@ gst_matroska_demux_add_wvpk_header (GstElement * element,
|
||||
if (buf_size < 4) {
|
||||
GST_ERROR_OBJECT (element, "Too small wavpack buffer");
|
||||
gst_buffer_unmap (*buf, &map);
|
||||
+ g_object_unref (adapter);
|
||||
return GST_FLOW_ERROR;
|
||||
}
|
||||
|
||||
@@ -3918,59 +3927,57 @@ gst_matroska_demux_add_wvpk_header (GstElement * element,
|
||||
data += 4;
|
||||
size -= 4;
|
||||
|
||||
- if (blocksize == 0 || size < blocksize)
|
||||
- break;
|
||||
-
|
||||
- g_assert ((newbuf == NULL) == (outdata == NULL));
|
||||
+ if (blocksize == 0 || size < blocksize) {
|
||||
+ GST_ERROR_OBJECT (element, "Too small wavpack buffer");
|
||||
+ gst_buffer_unmap (*buf, &map);
|
||||
+ g_object_unref (adapter);
|
||||
+ return GST_FLOW_ERROR;
|
||||
+ }
|
||||
|
||||
- if (newbuf == NULL) {
|
||||
- out_size = sizeof (Wavpack4Header) + blocksize;
|
||||
- newbuf = gst_buffer_new_allocate (NULL, out_size, NULL);
|
||||
+ g_assert (newbuf == NULL);
|
||||
|
||||
- gst_buffer_copy_into (newbuf, *buf,
|
||||
- GST_BUFFER_COPY_TIMESTAMPS | GST_BUFFER_COPY_FLAGS, 0, -1);
|
||||
+ newbuf =
|
||||
+ gst_buffer_new_allocate (NULL, WAVPACK4_HEADER_SIZE + blocksize,
|
||||
+ NULL);
|
||||
+ gst_buffer_map (newbuf, &outmap, GST_MAP_WRITE);
|
||||
+ outdata = outmap.data;
|
||||
+
|
||||
+ outdata[0] = 'w';
|
||||
+ outdata[1] = 'v';
|
||||
+ outdata[2] = 'p';
|
||||
+ outdata[3] = 'k';
|
||||
+ outdata += 4;
|
||||
+
|
||||
+ GST_WRITE_UINT32_LE (outdata, blocksize + WAVPACK4_HEADER_SIZE - 8);
|
||||
+ GST_WRITE_UINT16_LE (outdata + 4, wvh.version);
|
||||
+ GST_WRITE_UINT8 (outdata + 6, wvh.track_no);
|
||||
+ GST_WRITE_UINT8 (outdata + 7, wvh.index_no);
|
||||
+ GST_WRITE_UINT32_LE (outdata + 8, wvh.total_samples);
|
||||
+ GST_WRITE_UINT32_LE (outdata + 12, wvh.block_index);
|
||||
+ GST_WRITE_UINT32_LE (outdata + 16, block_samples);
|
||||
+ GST_WRITE_UINT32_LE (outdata + 20, flags);
|
||||
+ GST_WRITE_UINT32_LE (outdata + 24, crc);
|
||||
+ outdata += 28;
|
||||
+
|
||||
+ memcpy (outdata, data, blocksize);
|
||||
|
||||
- outpos = 0;
|
||||
- gst_buffer_map (newbuf, &outmap, GST_MAP_WRITE);
|
||||
- outdata = outmap.data;
|
||||
- } else {
|
||||
- gst_buffer_unmap (newbuf, &outmap);
|
||||
- out_size += sizeof (Wavpack4Header) + blocksize;
|
||||
- gst_buffer_set_size (newbuf, out_size);
|
||||
- gst_buffer_map (newbuf, &outmap, GST_MAP_WRITE);
|
||||
- outdata = outmap.data;
|
||||
- }
|
||||
+ gst_buffer_unmap (newbuf, &outmap);
|
||||
+ gst_adapter_push (adapter, newbuf);
|
||||
+ newbuf = NULL;
|
||||
|
||||
- outdata[outpos] = 'w';
|
||||
- outdata[outpos + 1] = 'v';
|
||||
- outdata[outpos + 2] = 'p';
|
||||
- outdata[outpos + 3] = 'k';
|
||||
- outpos += 4;
|
||||
-
|
||||
- GST_WRITE_UINT32_LE (outdata + outpos,
|
||||
- blocksize + sizeof (Wavpack4Header) - 8);
|
||||
- GST_WRITE_UINT16_LE (outdata + outpos + 4, wvh.version);
|
||||
- GST_WRITE_UINT8 (outdata + outpos + 6, wvh.track_no);
|
||||
- GST_WRITE_UINT8 (outdata + outpos + 7, wvh.index_no);
|
||||
- GST_WRITE_UINT32_LE (outdata + outpos + 8, wvh.total_samples);
|
||||
- GST_WRITE_UINT32_LE (outdata + outpos + 12, wvh.block_index);
|
||||
- GST_WRITE_UINT32_LE (outdata + outpos + 16, block_samples);
|
||||
- GST_WRITE_UINT32_LE (outdata + outpos + 20, flags);
|
||||
- GST_WRITE_UINT32_LE (outdata + outpos + 24, crc);
|
||||
- outpos += 28;
|
||||
-
|
||||
- memmove (outdata + outpos, data, blocksize);
|
||||
- outpos += blocksize;
|
||||
data += blocksize;
|
||||
size -= blocksize;
|
||||
}
|
||||
gst_buffer_unmap (*buf, &map);
|
||||
- gst_buffer_unref (*buf);
|
||||
|
||||
- if (newbuf)
|
||||
- gst_buffer_unmap (newbuf, &outmap);
|
||||
+ newbuf = gst_adapter_take_buffer (adapter, gst_adapter_available (adapter));
|
||||
+ g_object_unref (adapter);
|
||||
|
||||
+ gst_buffer_copy_into (newbuf, *buf,
|
||||
+ GST_BUFFER_COPY_TIMESTAMPS | GST_BUFFER_COPY_FLAGS, 0, -1);
|
||||
+ gst_buffer_unref (*buf);
|
||||
*buf = newbuf;
|
||||
+
|
||||
audiocontext->wvpk_block_index += block_samples;
|
||||
}
|
||||
|
||||
diff --git a/gst/matroska/matroska-ids.h b/gst/matroska/matroska-ids.h
|
||||
index 429213f778063ba0063944ab64ad60373bbce5ee..8d4a685a910ec13100a3c3d156b2412d28ec0522 100644
|
||||
--- a/gst/matroska/matroska-ids.h
|
||||
+++ b/gst/matroska/matroska-ids.h
|
||||
@@ -688,6 +688,8 @@ typedef struct _Wavpack4Header {
|
||||
guint32 crc; /* crc for actual decoded data */
|
||||
} Wavpack4Header;
|
||||
|
||||
+#define WAVPACK4_HEADER_SIZE (32)
|
||||
+
|
||||
typedef enum {
|
||||
GST_MATROSKA_TRACK_ENCODING_SCOPE_FRAME = (1<<0),
|
||||
GST_MATROSKA_TRACK_ENCODING_SCOPE_CODEC_DATA = (1<<1),
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
Fix CVE-2021-3498:
|
||||
|
||||
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3498
|
||||
https://gstreamer.freedesktop.org/security/sa-2021-0003.html
|
||||
|
||||
Patch copied from upstream source repository:
|
||||
|
||||
https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/commit/02174790726dd20a5c73ce2002189bf240ad4fe0?merge_request_iid=903
|
||||
|
||||
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
|
||||
index 4d0234743b8cf243b4521e56ef9027ba23b1b5d0..467815986c8c3d86fd8906a0d539b34f67d6693e 100644
|
||||
--- a/gst/matroska/matroska-demux.c
|
||||
+++ b/gst/matroska/matroska-demux.c
|
||||
@@ -692,6 +692,8 @@ gst_matroska_demux_parse_stream (GstMatroskaDemux * demux, GstEbmlRead * ebml,
|
||||
|
||||
DEBUG_ELEMENT_START (demux, ebml, "TrackEntry");
|
||||
|
||||
+ *dest_context = NULL;
|
||||
+
|
||||
/* start with the master */
|
||||
if ((ret = gst_ebml_read_master (ebml, &id)) != GST_FLOW_OK) {
|
||||
DEBUG_ELEMENT_STOP (demux, ebml, "TrackEntry", ret);
|
||||
|
|
@ -1,94 +0,0 @@
|
|||
Fix a broken test:
|
||||
|
||||
https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues/803
|
||||
|
||||
Patches copied from upstream source repository:
|
||||
|
||||
https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/commit/2ce5909f3a0b0da3abb7b794215d6b8b72a3b7fa
|
||||
https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/commit/f5310ce346180a717f091f2f09bcbb3ddfb15436
|
||||
|
||||
From 2ce5909f3a0b0da3abb7b794215d6b8b72a3b7fa Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
|
||||
Date: Thu, 12 Nov 2020 23:38:21 +0000
|
||||
Subject: [PATCH 1/2] tests: qtdemux: fix crash on 32-bit architectures
|
||||
|
||||
Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues/803
|
||||
|
||||
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/815>
|
||||
---
|
||||
tests/check/elements/qtdemux.c | 14 ++++++++------
|
||||
1 file changed, 8 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/tests/check/elements/qtdemux.c b/tests/check/elements/qtdemux.c
|
||||
index 5271c6576..0c748278b 100644
|
||||
--- a/tests/check/elements/qtdemux.c
|
||||
+++ b/tests/check/elements/qtdemux.c
|
||||
@@ -797,9 +797,10 @@ GST_START_TEST (test_qtdemux_pad_names)
|
||||
"protection-system", G_TYPE_STRING,
|
||||
"9a04f079-9840-4286-ab92-e65be0885f95", NULL);
|
||||
caps =
|
||||
- gst_caps_new_simple ("video/quicktime", "variant", G_TYPE_STRING,
|
||||
- "mss-fragmented", "timesacle", G_TYPE_UINT64, 10000000, "media-caps",
|
||||
- GST_TYPE_CAPS, mediacaps, NULL);
|
||||
+ gst_caps_new_simple ("video/quicktime",
|
||||
+ "variant", G_TYPE_STRING, "mss-fragmented",
|
||||
+ "timesacle", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000),
|
||||
+ "media-caps", GST_TYPE_CAPS, mediacaps, NULL);
|
||||
|
||||
/* Send segment event* */
|
||||
event = gst_event_new_caps (caps);
|
||||
@@ -852,9 +853,10 @@ GST_START_TEST (test_qtdemux_pad_names)
|
||||
"protection-system", G_TYPE_STRING,
|
||||
"9a04f079-9840-4286-ab92-e65be0885f95", NULL);
|
||||
caps =
|
||||
- gst_caps_new_simple ("video/quicktime", "variant", G_TYPE_STRING,
|
||||
- "mss-fragmented", "timesacle", G_TYPE_UINT64, 10000000, "media-caps",
|
||||
- GST_TYPE_CAPS, mediacaps, NULL);
|
||||
+ gst_caps_new_simple ("video/quicktime",
|
||||
+ "variant", G_TYPE_STRING, "mss-fragmented",
|
||||
+ "timesacle", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000),
|
||||
+ "media-caps", GST_TYPE_CAPS, mediacaps, NULL);
|
||||
|
||||
/* Send segment event* */
|
||||
event = gst_event_new_caps (caps);
|
||||
--
|
||||
2.30.0
|
||||
|
||||
|
||||
From f5310ce346180a717f091f2f09bcbb3ddfb15436 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
|
||||
Date: Thu, 12 Nov 2020 23:39:21 +0000
|
||||
Subject: [PATCH 2/2] tests: qtdemux: fix typo in caps field
|
||||
|
||||
timesacle -> timescale
|
||||
|
||||
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/815>
|
||||
---
|
||||
tests/check/elements/qtdemux.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tests/check/elements/qtdemux.c b/tests/check/elements/qtdemux.c
|
||||
index 0c748278b..4a14c45c0 100644
|
||||
--- a/tests/check/elements/qtdemux.c
|
||||
+++ b/tests/check/elements/qtdemux.c
|
||||
@@ -799,7 +799,7 @@ GST_START_TEST (test_qtdemux_pad_names)
|
||||
caps =
|
||||
gst_caps_new_simple ("video/quicktime",
|
||||
"variant", G_TYPE_STRING, "mss-fragmented",
|
||||
- "timesacle", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000),
|
||||
+ "timescale", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000),
|
||||
"media-caps", GST_TYPE_CAPS, mediacaps, NULL);
|
||||
|
||||
/* Send segment event* */
|
||||
@@ -855,7 +855,7 @@ GST_START_TEST (test_qtdemux_pad_names)
|
||||
caps =
|
||||
gst_caps_new_simple ("video/quicktime",
|
||||
"variant", G_TYPE_STRING, "mss-fragmented",
|
||||
- "timesacle", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000),
|
||||
+ "timescale", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000),
|
||||
"media-caps", GST_TYPE_CAPS, mediacaps, NULL);
|
||||
|
||||
/* Send segment event* */
|
||||
--
|
||||
2.30.0
|
||||
|
||||
Reference in a new issue