From 548e7cff87d4f86e36cf396d405717347ebf83875b1ed5c830901211c7857bba Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 1 Apr 2010 21:07:17 +0000 Subject: [PATCH] Accepting request 36710 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/libcanberra via accept of submit request 36710 revision 2. Request was accepted with message: Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/36710 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libcanberra?expand=0&rev=29 --- libcanberra-0.22.tar.bz2 | 3 --- libcanberra-0.23.tar.bz2 | 3 +++ libcanberra-fix-pulse-crash.patch | 27 +++++++++++++++++++++++++++ libcanberra.changes | 17 +++++++++++++++++ libcanberra.spec | 9 ++++++--- ready | 0 6 files changed, 53 insertions(+), 6 deletions(-) delete mode 100644 libcanberra-0.22.tar.bz2 create mode 100644 libcanberra-0.23.tar.bz2 create mode 100644 libcanberra-fix-pulse-crash.patch delete mode 100644 ready diff --git a/libcanberra-0.22.tar.bz2 b/libcanberra-0.22.tar.bz2 deleted file mode 100644 index 583a6e4..0000000 --- a/libcanberra-0.22.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6382fac6c97806b30c29d501a7894acffe979c9a0890ccf1350b63922b96c352 -size 362077 diff --git a/libcanberra-0.23.tar.bz2 b/libcanberra-0.23.tar.bz2 new file mode 100644 index 0000000..994b187 --- /dev/null +++ b/libcanberra-0.23.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf36e440a5691e2c227bd622f79e634840287ad3bd3312158afa7e54a17fba32 +size 359554 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 abf8537..e46fcbf 100644 --- a/libcanberra.changes +++ b/libcanberra.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +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 + +- Update to version 0.23: + + Fix fd leak in libcanberra + + vorbis: support the recently defined 6.1 and 7.1 modes + + gstreamer: add missing unistd.h inclusion + + pulse: pass selected device to server when playing + + vala: update vapi file for new defintions + + pulse: fix minor race with sound cancellation + ------------------------------------------------------------------- Tue Jan 5 16:29:48 CET 2010 - jengelh@medozas.de diff --git a/libcanberra.spec b/libcanberra.spec index a426f13..0b43fd6 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,5 +1,5 @@ # -# spec file for package libcanberra (Version 0.22) +# spec file for package libcanberra (Version 0.23) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,8 +18,8 @@ Name: libcanberra -Version: 0.22 -Release: 2 +Version: 0.23 +Release: 1 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 diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000