From 916b338baa7045479c99777e5eb2430a271a4cc2 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 20 Aug 2015 16:23:23 +0200 Subject: [PATCH] update to 1.4.5 - add double unlock patch --- .gitignore | 1 + ...ix-double-unlock-in-_get_buffer_size.patch | 29 +++++++++++++++++++ gstreamer1-rtsp-server.spec | 10 +++++-- sources | 2 +- 4 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 0001-rtsp-media-fix-double-unlock-in-_get_buffer_size.patch diff --git a/.gitignore b/.gitignore index 11a6846..b007069 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /gst-rtsp-server-1.4.0.tar.xz +/gst-rtsp-server-1.4.5.tar.xz diff --git a/0001-rtsp-media-fix-double-unlock-in-_get_buffer_size.patch b/0001-rtsp-media-fix-double-unlock-in-_get_buffer_size.patch new file mode 100644 index 0000000..bfacdc6 --- /dev/null +++ b/0001-rtsp-media-fix-double-unlock-in-_get_buffer_size.patch @@ -0,0 +1,29 @@ +From 380be80184103a80435c5462c6a21d36e8683585 Mon Sep 17 00:00:00 2001 +From: Gregor Boirie +Date: Fri, 27 Feb 2015 17:45:42 +0100 +Subject: [PATCH] rtsp-media: fix double unlock in _get_buffer_size() + +Fixes an abort when calling gst_rtsp_media_get_buffer_size() +because of double g_mutex_unlock () usage. + +https://bugzilla.gnome.org/show_bug.cgi?id=745434 +--- + gst/rtsp-server/rtsp-media.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gst/rtsp-server/rtsp-media.c b/gst/rtsp-server/rtsp-media.c +index 6b81e25..a464642 100644 +--- a/gst/rtsp-server/rtsp-media.c ++++ b/gst/rtsp-server/rtsp-media.c +@@ -1083,7 +1083,7 @@ gst_rtsp_media_get_buffer_size (GstRTSPMedia * media) + + priv = media->priv; + +- g_mutex_unlock (&priv->lock); ++ g_mutex_lock (&priv->lock); + res = priv->buffer_size; + g_mutex_unlock (&priv->lock); + +-- +2.4.3 + diff --git a/gstreamer1-rtsp-server.spec b/gstreamer1-rtsp-server.spec index da9c6ee..a309ce8 100644 --- a/gstreamer1-rtsp-server.spec +++ b/gstreamer1-rtsp-server.spec @@ -1,14 +1,15 @@ %global majorminor 1.0 Name: gstreamer1-rtsp-server -Version: 1.4.0 -Release: 5%{?dist} +Version: 1.4.5 +Release: 1%{?dist} Summary: GStreamer RTSP server library Group: Applications/Multimedia License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-rtsp/gst-rtsp-server-%{version}.tar.xz +Patch0: 0001-rtsp-media-fix-double-unlock-in-_get_buffer_size.patch BuildRequires: gstreamer1-devel >= %{version} BuildRequires: gstreamer1-plugins-base-devel >= %{version} @@ -48,6 +49,7 @@ GStreamer-based RTSP server library. %prep %setup -q -n gst-rtsp-server-%{version} +%patch0 -p1 -b .1 autoreconf -fiv @@ -93,6 +95,10 @@ chrpath --delete %{buildroot}%{_libdir}/libgstrtspserver-%{majorminor}.so* %doc %{_datadir}/gtk-doc/html/gst-rtsp-server-%{majorminor} %changelog +* Thu Aug 20 2015 Wim Taymans - 1.4.5-1 +- update to 1.4.5 +- add double unlock patch + * Thu Aug 20 2015 Wim Taymans - 1.4.0-5 - disable checks diff --git a/sources b/sources index c6a227a..9d19ad6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -974af05dbf867cade89b8d3101e3f197 gst-rtsp-server-1.4.0.tar.xz +a9f9b8899ec7ab33663cda7627db40d3 gst-rtsp-server-1.4.5.tar.xz