[arch-commits] Commit in pulseaudio/trunk (PKGBUILD crash.patch)

Jan Steffens heftig at archlinux.org
Wed Jan 11 07:34:53 UTC 2017


    Date: Wednesday, January 11, 2017 @ 07:34:52
  Author: heftig
Revision: 285657

9.99.1-2: Remove json-c dep; add patch for FS#52484

Added:
  pulseaudio/trunk/crash.patch
Modified:
  pulseaudio/trunk/PKGBUILD

-------------+
 PKGBUILD    |   13 ++++++++-----
 crash.patch |   29 +++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-11 07:16:24 UTC (rev 285656)
+++ PKGBUILD	2017-01-11 07:34:52 UTC (rev 285657)
@@ -8,20 +8,22 @@
 pkgname=(pulseaudio libpulse pulseaudio-{gconf,zeroconf,lirc,jack,bluetooth,equalizer})
 pkgdesc="A featureful, general-purpose sound server"
 pkgver=9.99.1
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 url="http://www.freedesktop.org/wiki/Software/PulseAudio"
 license=(GPL)
 makedepends=(libasyncns libcap attr libxtst libsm libsndfile libtool rtkit libsoxr
              speexdsp tdb systemd dbus avahi bluez bluez-libs gconf intltool jack2-dbus sbc
-             lirc openssl fftw orc json-c gtk3 webrtc-audio-processing
+             lirc openssl fftw orc gtk3 webrtc-audio-processing
              check autoconf-archive git)
 options=(!emptydirs)
 _commit=72256f9302b5530b56b8abb7c3fe4b1426c1cb8e  # tags/v9.99.1^0
 source=("git+https://anongit.freedesktop.org/git/pulseaudio/pulseaudio#commit=$_commit"
-        padsp-lib32.patch)
+        padsp-lib32.patch
+        crash.patch)
 sha256sums=('SKIP'
-            '7832fc59df76538ff10aedd297c03cb7ff117235da8bfad26082994bb5b84332')
+            '7832fc59df76538ff10aedd297c03cb7ff117235da8bfad26082994bb5b84332'
+            'f3b519a4f46d1293df03053e67b1c6b7c278902a41ec2553717af4cbfa5524bc')
 
 pkgver() {
   cd pulseaudio
@@ -30,6 +32,7 @@
 
 prepare() {
   cd pulseaudio
+  patch -Np1 -i ../crash.patch
   NOCONFIGURE=1 ./bootstrap.sh
 }
 
@@ -155,7 +158,7 @@
 
 package_libpulse() {
   pkgdesc="$pkgdesc (client library)"
-  depends=(dbus libasyncns libcap libxtst libsm libsndfile json-c systemd)
+  depends=(dbus libasyncns libcap libxtst libsm libsndfile systemd)
   license=(LGPL)
   backup=(etc/pulse/client.conf)
 

Added: crash.patch
===================================================================
--- crash.patch	                        (rev 0)
+++ crash.patch	2017-01-11 07:34:52 UTC (rev 285657)
@@ -0,0 +1,29 @@
+From: Tanu Kaskinen <tanuk at iki.fi>
+Subject: [PATCH] zeroconf-publish: fix unitialized DBusError
+Date: Wed, 11 Jan 2017 08:34:27 +0200
+Message-Id: <20170111063427.9588-1-tanuk at iki.fi>
+X-Mailer: git-send-email 2.11.0
+
+The uninitialized error struct might be the cause for the crash
+reported here: https://bugs.archlinux.org/task/52484
+
+---
+ src/modules/module-zeroconf-publish.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c
+index e9710292a..4cbfd1eab 100644
+--- a/src/modules/module-zeroconf-publish.c
++++ b/src/modules/module-zeroconf-publish.c
+@@ -679,6 +679,8 @@ static char *get_icon_name(pa_module*m) {
+     DBusConnection *conn = NULL;
+     DBusMessageIter sub;
+ 
++    dbus_error_init(&error);
++
+     if (!(bus = pa_dbus_bus_get(m->core, DBUS_BUS_SYSTEM, &error))) {
+         pa_log("Failed to get system bus connection: %s", error.message);
+         goto out;
+-- 
+2.11.0
+



More information about the arch-commits mailing list