From 47e23762059f97a8f3c7bdb4d25834c33204d2a94c1aa7c0380421e217cc92ff Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 1 Apr 2010 22:07:28 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/libcanberra revision 17.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libcanberra?expand=0&rev=091005e4073e0028a84ec5a3d71ed1b9 --- libcanberra-fix-pulse-crash.patch | 27 +++++++++++++++++++++++++++ libcanberra.changes | 6 ++++++ libcanberra.spec | 5 ++++- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 libcanberra-fix-pulse-crash.patch diff --git a/libcanberra-fix-pulse-crash.patch b/libcanberra-fix-pulse-crash.patch new file mode 100644 index 0000000..1303fcf --- /dev/null +++ b/libcanberra-fix-pulse-crash.patch @@ -0,0 +1,27 @@ +From: Michal Schmidt +Date: Tue, 30 Mar 2010 15:50:04 +0000 (+0200) +Subject: pulse: fix use after free in stream_drain_cb() +X-Git-Url: http://git.0pointer.de/?p=libcanberra.git;a=commitdiff_plain;h=04a2c7cac4ff384880309b950c8201803aa37786 + +pulse: fix use after free in stream_drain_cb() +--- + +diff --git a/src/pulse.c b/src/pulse.c +index fcb6b05..d4225d1 100644 +--- a/src/pulse.c ++++ b/src/pulse.c +@@ -663,12 +663,12 @@ static void stream_drain_cb(pa_stream *s, int success, void *userdata) { + pa_stream_disconnect(s); + out->error = err; + out->finished = TRUE; +- } + + if (out->drain_operation) { + pa_operation_unref(out->drain_operation); + out->drain_operation = NULL; + } ++ } + + pa_threaded_mainloop_signal(p->mainloop, FALSE); + } + diff --git a/libcanberra.changes b/libcanberra.changes index 98e5032..e46fcbf 100644 --- a/libcanberra.changes +++ b/libcanberra.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 1 19:49:35 CEST 2010 - vuntz@opensuse.org + +- Add libcanberra-fix-pulse-crash.patch to fix a crash in + libcanberra that makes many apps crash. Fix bnc#591729. + ------------------------------------------------------------------- Sun Feb 21 16:06:30 CET 2010 - dimstar@opensuse.org diff --git a/libcanberra.spec b/libcanberra.spec index 87d895f..bc84b56 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -19,7 +19,7 @@ Name: libcanberra Version: 0.23 -Release: 1 +Release: 2 License: LGPLv2.0+ Summary: Portable sound event library Url: http://0pointer.de/lennart/projects/libcanberra/ @@ -27,6 +27,8 @@ Group: System/Libraries Source: libcanberra-%{version}.tar.bz2 Source1: libcanberra-gtk-module.sh Source99: baselibs.conf +# PATCH-FIX-UPSTREAM libcanberra-fix-pulse-crash.patch vuntz@opensuse.org -- Taken from upstream, fix a crash +Patch0: libcanberra-fix-pulse-crash.patch BuildRequires: alsa-devel BuildRequires: gconf2-devel BuildRequires: gstreamer-0_10-devel @@ -140,6 +142,7 @@ trigger input feedback event sounds %prep %setup -q +%patch0 -p1 %build %configure --with-pic --disable-static --disable-rpath --enable-pulse --enable-alsa --enable-null --with-builtin=dso