commit: d0ebe903cba4a9c901bf7f582a332ba443297c84 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Sat Feb 20 09:47:33 2021 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Sat Feb 20 10:12:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0ebe903
media-libs/gst-rtsp-server: remove old Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> media-libs/gst-rtsp-server/Manifest | 1 - .../files/1.16.2-CVE-2020-6095.patch | 39 ----------- .../files/1.16.2-glib-deprecation-fix.patch | 59 ----------------- .../gst-rtsp-server/files/1.16.2-leak-fix.patch | 25 -------- .../gst-rtsp-server/gst-rtsp-server-1.16.2.ebuild | 75 ---------------------- 5 files changed, 199 deletions(-) diff --git a/media-libs/gst-rtsp-server/Manifest b/media-libs/gst-rtsp-server/Manifest index ef2a5f0c360..b6ba4de9a8a 100644 --- a/media-libs/gst-rtsp-server/Manifest +++ b/media-libs/gst-rtsp-server/Manifest @@ -1,2 +1 @@ -DIST gst-rtsp-server-1.16.2.tar.xz 693368 BLAKE2B 612b59bc3a08167a81790c8d5164efebb8756ce3d3c9c278a0363bd640929b14d2fb1c26454a513dbaa9e093a702e7553950b6210ef57a6e9188a059c81650d3 SHA512 e18d87ae309594ffd7917b1804e595b83d5002518608f0ee03b9e68ab9bdf771ec2f691e50408618a6d1a39495c123e8288b3179e6cdaef65a38ef404544e0eb DIST gst-rtsp-server-1.16.3.tar.xz 699472 BLAKE2B 8937ce9d0550b11657496dec5a79c00f74de4da9deb9236693a25f4e266a779c8d4f439b127c2af87c874327e10f01f6a1d74fc1cd1bd0eca20093341568cb82 SHA512 f9ca08cfef92b74a63279a5480cfc1b18557f3062aadc765dd4d3de57d62b9ddf3ca98a4680dcd0f050812128c5c03592cdbf9d8329b85a6c2f3a39209c07701 diff --git a/media-libs/gst-rtsp-server/files/1.16.2-CVE-2020-6095.patch b/media-libs/gst-rtsp-server/files/1.16.2-CVE-2020-6095.patch deleted file mode 100644 index 87b2e54973b..00000000000 --- a/media-libs/gst-rtsp-server/files/1.16.2-CVE-2020-6095.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ccc8d0c4388056acc801fd855e065eb2b0ca6578 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <[email protected]> -Date: Mon, 23 Mar 2020 16:06:43 +0200 -Subject: [PATCH 3/3] rtsp-auth: Fix NULL pointer dereference when handling an - invalid basic Authorization header - -When using the basic authentication scheme, we wouldn't validate that -the authorization field of the credentials is not NULL and pass it on -to g_hash_table_lookup(). g_str_hash() however is not NULL-safe and will -dereference the NULL pointer and crash. -A specially crafted (read: invalid) RTSP header can cause this to -happen. - -As a solution, check for the authorization to be not NULL before -continuing processing it and if it is simply fail authentication. - -This fixes CVE-2020-6095 and TALOS-2020-1018. - -Discovered by Peter Wang of Cisco ASIG. ---- - gst/rtsp-server/rtsp-auth.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gst/rtsp-server/rtsp-auth.c b/gst/rtsp-server/rtsp-auth.c -index f14286f..c15fa18 100644 ---- a/gst/rtsp-server/rtsp-auth.c -+++ b/gst/rtsp-server/rtsp-auth.c -@@ -871,7 +871,7 @@ default_authenticate (GstRTSPAuth * auth, GstRTSPContext * ctx) - - GST_DEBUG_OBJECT (auth, "check Basic auth"); - g_mutex_lock (&priv->lock); -- if ((token = -+ if ((*credential)->authorization && (token = - g_hash_table_lookup (priv->basic, - (*credential)->authorization))) { - GST_DEBUG_OBJECT (auth, "setting token %p", token); --- -2.20.1 - diff --git a/media-libs/gst-rtsp-server/files/1.16.2-glib-deprecation-fix.patch b/media-libs/gst-rtsp-server/files/1.16.2-glib-deprecation-fix.patch deleted file mode 100644 index 679c5c5207c..00000000000 --- a/media-libs/gst-rtsp-server/files/1.16.2-glib-deprecation-fix.patch +++ /dev/null @@ -1,59 +0,0 @@ -From df227481504574ecc6028400d17870913a16a047 Mon Sep 17 00:00:00 2001 -From: Jordan Petridis <[email protected]> -Date: Thu, 23 Jan 2020 16:41:26 +0200 -Subject: [PATCH 2/3] rtsp-latency-bin: replace G_TYPE_INSTANCE_GET_PRIVATE as - it's been deprecated - -from glib -``` -Deprecated: 2.58: Use %G_ADD_PRIVATE and the generated - `your_type_get_instance_private()` function instead -``` ---- - gst/rtsp-server/rtsp-latency-bin.c | 9 +++------ - 1 file changed, 3 insertions(+), 6 deletions(-) - -diff --git a/gst/rtsp-server/rtsp-latency-bin.c b/gst/rtsp-server/rtsp-latency-bin.c -index cf7cdf1..c297ab6 100644 ---- a/gst/rtsp-server/rtsp-latency-bin.c -+++ b/gst/rtsp-server/rtsp-latency-bin.c -@@ -23,9 +23,6 @@ - #include <gst/gst.h> - #include "rtsp-latency-bin.h" - --#define GST_RTSP_LATENCY_BIN_GET_PRIVATE(obj) \ -- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_RTSP_LATENCY_BIN_TYPE, GstRTSPLatencyBinPrivate)) -- - struct _GstRTSPLatencyBinPrivate - { - GstPad *sinkpad; -@@ -106,7 +103,7 @@ gst_rtsp_latency_bin_get_property (GObject * object, guint propid, - { - GstRTSPLatencyBin *latency_bin = GST_RTSP_LATENCY_BIN (object); - GstRTSPLatencyBinPrivate *priv = -- GST_RTSP_LATENCY_BIN_GET_PRIVATE (latency_bin); -+ gst_rtsp_latency_bin_get_instance_private (latency_bin); - - switch (propid) { - case PROP_ELEMENT: -@@ -140,7 +137,7 @@ gst_rtsp_latency_bin_add_element (GstRTSPLatencyBin * latency_bin, - GstElement * element) - { - GstRTSPLatencyBinPrivate *priv = -- GST_RTSP_LATENCY_BIN_GET_PRIVATE (latency_bin); -+ gst_rtsp_latency_bin_get_instance_private (latency_bin); - GstPad *pad; - GstPadTemplate *templ; - -@@ -250,7 +247,7 @@ static gboolean - gst_rtsp_latency_bin_recalculate_latency (GstRTSPLatencyBin * latency_bin) - { - GstRTSPLatencyBinPrivate *priv = -- GST_RTSP_LATENCY_BIN_GET_PRIVATE (latency_bin); -+ gst_rtsp_latency_bin_get_instance_private (latency_bin); - GstEvent *latency; - GstQuery *query; - GstClockTime min_latency; --- -2.20.1 - diff --git a/media-libs/gst-rtsp-server/files/1.16.2-leak-fix.patch b/media-libs/gst-rtsp-server/files/1.16.2-leak-fix.patch deleted file mode 100644 index 2707c3ebdc0..00000000000 --- a/media-libs/gst-rtsp-server/files/1.16.2-leak-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9dfdcb71e84e53e25388a6e0b485a70c45ea0dec Mon Sep 17 00:00:00 2001 -From: Nicola Murino <[email protected]> -Date: Thu, 12 Dec 2019 17:56:18 +0100 -Subject: [PATCH 1/3] rtsp-auth: fix default token leak - ---- - gst/rtsp-server/rtsp-auth.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gst/rtsp-server/rtsp-auth.c b/gst/rtsp-server/rtsp-auth.c -index f676b80..f14286f 100644 ---- a/gst/rtsp-server/rtsp-auth.c -+++ b/gst/rtsp-server/rtsp-auth.c -@@ -214,6 +214,8 @@ gst_rtsp_auth_finalize (GObject * obj) - g_hash_table_unref (priv->basic); - g_hash_table_unref (priv->digest); - g_hash_table_unref (priv->nonces); -+ if (priv->default_token) -+ gst_rtsp_token_unref (priv->default_token); - g_mutex_clear (&priv->lock); - g_free (priv->realm); - --- -2.20.1 - diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.16.2.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.16.2.ebuild deleted file mode 100644 index c4f50223188..00000000000 --- a/media-libs/gst-rtsp-server/gst-rtsp-server-1.16.2.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit gstreamer - -DESCRIPTION="A GStreamer based RTSP server" -HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-rtsp-server.html"; - -LICENSE="LGPL-2+" -KEYWORDS="amd64 x86" -IUSE="examples +introspection static-libs" - -# gst-plugins-base for many used elements and API -# gst-plugins-good for rtprtxsend and rtpbin elements, maybe more -# gst-plugins-srtp for srtpenc and srtpdec elements -RDEPEND=" - >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}] - >=media-libs/gstreamer-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}] - >=media-libs/gst-plugins-base-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}] - >=media-libs/gst-plugins-good-${PV}:${SLOT}[${MULTILIB_USEDEP}] - >=media-plugins/gst-plugins-srtp-${PV}:${SLOT}[${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.12 -" - -# Due to gstreamer src_configure -QA_CONFIGURE_OPTIONS="--enable-nls" - -PATCHES=( - "${FILESDIR}"/${PV}-leak-fix.patch - "${FILESDIR}"/${PV}-glib-deprecation-fix.patch - "${FILESDIR}"/${PV}-CVE-2020-6095.patch -) - -multilib_src_configure() { - # debug: only adds -g to CFLAGS - # docbook: nothing behind that switch - # libcgroup is automagic and only used in examples - gstreamer_multilib_src_configure \ - --disable-debug \ - --disable-valgrind \ - --disable-examples \ - --disable-docbook \ - --disable-gtk-doc \ - $(multilib_native_use_enable introspection) \ - $(use_enable static-libs static) \ - --disable-tests \ - LIBCGROUP_LIBS= \ - LIBCGROUP_FLAGS= - - # work-around gtk-doc out-of-source brokedness - if multilib_is_native_abi ; then - ln -s "${S}"/docs/libs/${d}/html docs/libs/${d}/html || die - fi -} - -multilib_src_install() { - emake install DESTDIR="${D}" - # Handle broken upstream modifications to defaults of gtk-doc - emake install -C docs/libs DESTDIR="${D}" -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name '*.la' -delete || die - - if use examples ; then - insinto /usr/share/doc/${PF}/examples - doins "${S}"/examples/*.c - fi -}
