From 7cae8c38588eed63f27497a5a57691220661c1be Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Apr 11 2013 12:03:14 +0000
Subject: pull a few more patches from upstream stable-3.x branch


---

diff --git a/0001-alsa-mixer-Fix-the-analog-output-speaker-always-path.patch b/0001-alsa-mixer-Fix-the-analog-output-speaker-always-path.patch
index eaf78a4..ec3432f 100644
--- a/0001-alsa-mixer-Fix-the-analog-output-speaker-always-path.patch
+++ b/0001-alsa-mixer-Fix-the-analog-output-speaker-always-path.patch
@@ -1,7 +1,7 @@
 From 299e32b767ac60ddbaa747cd03c09b780e364637 Mon Sep 17 00:00:00 2001
 From: David Henningsson <david.henningsson@canonical.com>
 Date: Wed, 19 Dec 2012 11:24:33 +0100
-Subject: [PATCH] alsa-mixer: Fix the analog-output-speaker-always path
+Subject: [PATCH 1/7] alsa-mixer: Fix the analog-output-speaker-always path
 
 A left over "required-any" made this path useless for most people.
 While we're at it, also add "Front Headphone" like for the normal
@@ -37,5 +37,5 @@ index 3ebdc4a..8a2b3df 100644
  [Element CLFE]
  switch = mute
 -- 
-1.8.0.2
+1.8.1.4
 
diff --git a/0002-man-Update-log-target-documentation.patch b/0002-man-Update-log-target-documentation.patch
new file mode 100644
index 0000000..6d3bf90
--- /dev/null
+++ b/0002-man-Update-log-target-documentation.patch
@@ -0,0 +1,62 @@
+From e5155b4f505dbc39c54944e369237202f0b42bf6 Mon Sep 17 00:00:00 2001
+From: Tanu Kaskinen <tanuk@iki.fi>
+Date: Mon, 17 Dec 2012 07:46:04 +0200
+Subject: [PATCH 2/7] man: Update log-target documentation.
+
+---
+ man/pulse-daemon.conf.5.xml.in | 15 +++++++++------
+ man/pulseaudio.1.xml.in        |  7 +++++--
+ 2 files changed, 14 insertions(+), 8 deletions(-)
+
+diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
+index c270d2b..744e94e 100644
+--- a/man/pulse-daemon.conf.5.xml.in
++++ b/man/pulse-daemon.conf.5.xml.in
+@@ -297,12 +297,15 @@ USA.
+ 
+     <option>
+       <p><opt>log-target=</opt> The default log target. Use either
+-      <opt>stderr</opt>, <opt>syslog</opt> or <opt>auto</opt>. The
+-      latter is equivalent to <opt>sylog</opt> in case
+-      <opt>daemonize</opt> is enabled, otherwise to
+-      <opt>stderr</opt>. Defaults to <opt>auto</opt>. The
+-      <opt>--log-target</opt> command line option takes
+-      precedence.</p>
++      <opt>stderr</opt>, <opt>syslog</opt>, <opt>auto</opt>,
++      <opt>file:PATH</opt> or <opt>newfile:PATH</opt>. <opt>auto</opt> is
++      equivalent to <opt>sylog</opt> in case <opt>daemonize</opt> is enabled,
++      otherwise to <opt>stderr</opt>. If set to <opt>file:PATH</opt>, logging
++      is directed to the file indicated by PATH. <opt>newfile:PATH</opt> is
++      otherwise the same as <opt>file:PATH</opt>, but existing files are never
++      overwritten. If the specified file already exists, a suffix is added to
++      the file name to avoid overwriting. Defaults to <opt>auto</opt>. The
++      <opt>--log-target</opt> command line option takes precedence.</p>
+     </option>
+ 
+     <option>
+diff --git a/man/pulseaudio.1.xml.in b/man/pulseaudio.1.xml.in
+index c556bda..12f05e8 100644
+--- a/man/pulseaudio.1.xml.in
++++ b/man/pulseaudio.1.xml.in
+@@ -217,13 +217,16 @@ USA.
+     </option>
+ 
+     <option>
+-      <p><opt>--log-target</opt><arg>={auto,syslog,stderr,file:PATH}</arg></p>
++      <p><opt>--log-target</opt><arg>={auto,syslog,stderr,file:PATH,newfile:PATH}</arg></p>
+ 
+       <optdesc><p>Specify the log target. If set to <arg>auto</arg>
+       (which is the default), then logging is directed to syslog when
+       <opt>--daemonize</opt> is passed, otherwise to
+       STDERR. If set to <arg>file:PATH</arg>, logging is directed to
+-      the file indicated by PATH.</p></optdesc>
++      the file indicated by PATH. <arg>newfile:PATH</arg> is otherwise
++      the same as file:PATH, but existing files are never overwritten.
++      If the specified file already exists, a suffix is added to the
++      file name to avoid overwriting.</p></optdesc>
+     </option>
+ 
+     <option>
+-- 
+1.8.1.4
+
diff --git a/0003-build-Don-t-enable-BlueZ-if-libbluetooth-is-not-foun.patch b/0003-build-Don-t-enable-BlueZ-if-libbluetooth-is-not-foun.patch
new file mode 100644
index 0000000..baf6df1
--- /dev/null
+++ b/0003-build-Don-t-enable-BlueZ-if-libbluetooth-is-not-foun.patch
@@ -0,0 +1,30 @@
+From 3ffa0bc62afd8dbfa1d1cd5cef2177a96c461343 Mon Sep 17 00:00:00 2001
+From: Tanu Kaskinen <tanuk@iki.fi>
+Date: Sat, 22 Sep 2012 18:16:24 +0300
+Subject: [PATCH 3/7] build: Don't enable BlueZ if libbluetooth is not found.
+
+Previously, if libsbc was available but libbluetooth was not, BlueZ
+would get incorrectly enabled.
+---
+ configure.ac | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3199d85..d11af11 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1007,8 +1007,9 @@ AS_IF([test "x$enable_bluez" != "xno"],
+     [PKG_CHECK_MODULES(BLUEZ, [ bluez >= 4.99 ], HAVE_BLUEZ=1, HAVE_BLUEZ=0)],
+     HAVE_BLUEZ=0)
+ AS_IF([test "x$enable_bluez" != "xno"],
+-    [PKG_CHECK_MODULES(SBC, [ sbc >= 1.0 ], HAVE_BLUEZ=1, HAVE_BLUEZ=0)],
+-    HAVE_BLUEZ=0)
++    [PKG_CHECK_MODULES(SBC, [ sbc >= 1.0 ], HAVE_SBC=1, HAVE_SBC=0)],
++    HAVE_SBC=0)
++AS_IF([test "x$HAVE_SBC" != "x1"], HAVE_BLUEZ=0)
+ AS_IF([test "x$HAVE_DBUS" != "x1"], HAVE_BLUEZ=0)
+ 
+ AS_IF([test "x$enable_bluez" = "xyes" && test "x$HAVE_BLUEZ" = "x0"],
+-- 
+1.8.1.4
+
diff --git a/0004-Call-change_cb-only-when-there-s-an-actual-change.patch b/0004-Call-change_cb-only-when-there-s-an-actual-change.patch
new file mode 100644
index 0000000..20e6c27
--- /dev/null
+++ b/0004-Call-change_cb-only-when-there-s-an-actual-change.patch
@@ -0,0 +1,57 @@
+From e02e290d7cccd0cfbc89bacf5c0be7934ee58ece Mon Sep 17 00:00:00 2001
+From: Tanu Kaskinen <tanuk@iki.fi>
+Date: Wed, 16 Jan 2013 03:36:03 +0200
+Subject: [PATCH 4/7] Call change_cb() only when there's an actual change.
+
+Calling change_cb() whenever anything happens in the ownership of the
+bus name caused trouble in PulseAudio in this scenario:
+
+1. PulseAudio is using a device and owns the corresponding service
+   name.
+2. Another application requests device release.
+3. PulseAudio releases the device.
+4. Change in the bus name ownership: PulseAudio gives up the
+   ownership, and nobody owns the name.
+5. reserve-monitor notices that, and notifies PulseAudio.
+6. Since reserve-monitor reports the device as "not busy", PulseAudio
+   decides to reserve the bus name immediately back to itself and
+   opens the device again.
+
+The other application will forcibly take the bus name to itself, as
+it should according to the protocol, but the other application may
+have trouble opening the device if it tries to do that before
+PulseAudio has had time to react to the NameLost signal.
+
+This can be solved by not calling change_cb() if there are no changes
+in the device busy status. In this scenario the device is considered
+"not busy" while PulseAudio is owning the bus name, so PulseAudio gets
+no notification when the ownership changes from PulseAudio to nobody.
+---
+ src/modules/reserve-monitor.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/modules/reserve-monitor.c b/src/modules/reserve-monitor.c
+index ab453e6..4097a6f 100644
+--- a/src/modules/reserve-monitor.c
++++ b/src/modules/reserve-monitor.c
+@@ -85,6 +85,8 @@ static DBusHandlerResult filter_handler(
+ 			goto invalid;
+ 
+ 		if (strcmp(name, m->service_name) == 0) {
++			unsigned old_busy = m->busy;
++
+ 			m->busy = !!(new && *new);
+ 
+ 			/* If we ourselves own the device, then don't consider this 'busy' */
+@@ -96,7 +98,7 @@ static DBusHandlerResult filter_handler(
+ 						m->busy = FALSE;
+ 			}
+ 
+-			if (m->change_cb) {
++			if (m->busy != old_busy && m->change_cb) {
+ 				m->ref++;
+ 				m->change_cb(m);
+ 				rm_release(m);
+-- 
+1.8.1.4
+
diff --git a/0005-Initialize-monitor-s-busy-status-to-false-if-we-own-.patch b/0005-Initialize-monitor-s-busy-status-to-false-if-we-own-.patch
new file mode 100644
index 0000000..a7fa6c5
--- /dev/null
+++ b/0005-Initialize-monitor-s-busy-status-to-false-if-we-own-.patch
@@ -0,0 +1,150 @@
+From b1691402bebfafba9c8055814493f55553f177c1 Mon Sep 17 00:00:00 2001
+From: Tanu Kaskinen <tanuk@iki.fi>
+Date: Wed, 16 Jan 2013 03:36:04 +0200
+Subject: [PATCH 5/7] Initialize monitor's busy status to false if we own the
+ device.
+
+Bug found by David Henningsson.
+---
+ src/modules/reserve-monitor.c | 96 +++++++++++++++++++++++++++++++++++--------
+ 1 file changed, 80 insertions(+), 16 deletions(-)
+
+diff --git a/src/modules/reserve-monitor.c b/src/modules/reserve-monitor.c
+index 4097a6f..4aa4a2b 100644
+--- a/src/modules/reserve-monitor.c
++++ b/src/modules/reserve-monitor.c
+@@ -59,6 +59,23 @@ struct rm_monitor {
+ 	"member='NameOwnerChanged',"		\
+ 	"arg0='%s'"
+ 
++static unsigned get_busy(
++	DBusConnection *c,
++	const char *name_owner) {
++
++	const char *un;
++
++	if (!name_owner || !*name_owner)
++		return FALSE;
++
++	/* If we ourselves own the device, then don't consider this 'busy' */
++	if ((un = dbus_bus_get_unique_name(c)))
++		if (strcmp(name_owner, un) == 0)
++			return FALSE;
++
++	return TRUE;
++}
++
+ static DBusHandlerResult filter_handler(
+ 	DBusConnection *c,
+ 	DBusMessage *s,
+@@ -87,16 +104,7 @@ static DBusHandlerResult filter_handler(
+ 		if (strcmp(name, m->service_name) == 0) {
+ 			unsigned old_busy = m->busy;
+ 
+-			m->busy = !!(new && *new);
+-
+-			/* If we ourselves own the device, then don't consider this 'busy' */
+-			if (m->busy) {
+-				const char *un;
+-
+-				if ((un = dbus_bus_get_unique_name(c)))
+-					if (strcmp(new, un) == 0)
+-						m->busy = FALSE;
+-			}
++			m->busy = get_busy(c, new);
+ 
+ 			if (m->busy != old_busy && m->change_cb) {
+ 				m->ref++;
+@@ -112,14 +120,71 @@ invalid:
+ 	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ }
+ 
++static int get_name_owner(
++	DBusConnection *connection,
++	const char *name,
++	char **name_owner,
++	DBusError *error) {
++
++	DBusMessage *msg, *reply;
++	int r;
++
++	*name_owner = NULL;
++
++	if (!(msg = dbus_message_new_method_call(DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, "GetNameOwner"))) {
++		r = -ENOMEM;
++		goto fail;
++	}
++
++	if (!dbus_message_append_args(msg, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID)) {
++		r = -ENOMEM;
++		goto fail;
++	}
++
++	reply = dbus_connection_send_with_reply_and_block(connection, msg, DBUS_TIMEOUT_USE_DEFAULT, error);
++	dbus_message_unref(msg);
++	msg = NULL;
++
++	if (reply) {
++		if (!dbus_message_get_args(reply, error, DBUS_TYPE_STRING, name_owner, DBUS_TYPE_INVALID)) {
++			dbus_message_unref(reply);
++			r = -EIO;
++			goto fail;
++		}
++
++		*name_owner = strdup(*name_owner);
++		dbus_message_unref(reply);
++
++		if (!*name_owner) {
++			r = -ENOMEM;
++			goto fail;
++		}
++
++	} else if (dbus_error_has_name(error, "org.freedesktop.DBus.Error.NameHasNoOwner"))
++		dbus_error_free(error);
++	else {
++		r = -EIO;
++		goto fail;
++	}
++
++	return 0;
++
++fail:
++	if (msg)
++		dbus_message_unref(msg);
++
++	return r;
++}
++
+ int rm_watch(
+ 	rm_monitor **_m,
+ 	DBusConnection *connection,
+-	const char*device_name,
++	const char *device_name,
+ 	rm_change_cb_t change_cb,
+ 	DBusError *error)  {
+ 
+ 	rm_monitor *m = NULL;
++	char *name_owner;
+ 	int r;
+ 	DBusError _error;
+ 
+@@ -178,12 +243,11 @@ int rm_watch(
+ 
+ 	m->matching = 1;
+ 
+-	m->busy = dbus_bus_name_has_owner(m->connection, m->service_name, error);
+-
+-	if (dbus_error_is_set(error)) {
+-		r = -EIO;
++	if ((r = get_name_owner(m->connection, m->service_name, &name_owner, error)) < 0)
+ 		goto fail;
+-	}
++
++	m->busy = get_busy(m->connection, name_owner);
++	free(name_owner);
+ 
+ 	*_m = m;
+ 	return 0;
+-- 
+1.8.1.4
+
diff --git a/0006-reserve-Move-get_name_owner-to-the-public-rd_device-.patch b/0006-reserve-Move-get_name_owner-to-the-public-rd_device-.patch
new file mode 100644
index 0000000..9ac4b7a
--- /dev/null
+++ b/0006-reserve-Move-get_name_owner-to-the-public-rd_device-.patch
@@ -0,0 +1,189 @@
+From 88a7b31ca7d1ec38b68e7bfd99e2e53afe96cfcf Mon Sep 17 00:00:00 2001
+From: Mikel Astiz <mikel.astiz@bmw-carit.de>
+Date: Wed, 30 Jan 2013 09:30:30 +0100
+Subject: [PATCH 6/7] reserve: Move get_name_owner() to the public rd_device
+ API
+
+The function is interesting for both rd_device and rd_monitor so make
+it part of the rd_device public API to avoid duplicated code.
+
+The decision to move the function to reserve.c is motivated by the fact
+that other projects (i.e. jack) use reserve.c only. Therefore, adding a
+reserve->reserve-monitor dependency should be avoided.
+---
+ src/modules/reserve-monitor.c | 59 ++-----------------------------------------
+ src/modules/reserve.c         | 56 ++++++++++++++++++++++++++++++++++++++++
+ src/modules/reserve.h         |  9 +++++++
+ 3 files changed, 67 insertions(+), 57 deletions(-)
+
+diff --git a/src/modules/reserve-monitor.c b/src/modules/reserve-monitor.c
+index 4aa4a2b..70de870 100644
+--- a/src/modules/reserve-monitor.c
++++ b/src/modules/reserve-monitor.c
+@@ -32,6 +32,7 @@
+ #include <assert.h>
+ 
+ #include "reserve-monitor.h"
++#include "reserve.h"
+ 
+ struct rm_monitor {
+ 	int ref;
+@@ -120,62 +121,6 @@ invalid:
+ 	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ }
+ 
+-static int get_name_owner(
+-	DBusConnection *connection,
+-	const char *name,
+-	char **name_owner,
+-	DBusError *error) {
+-
+-	DBusMessage *msg, *reply;
+-	int r;
+-
+-	*name_owner = NULL;
+-
+-	if (!(msg = dbus_message_new_method_call(DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, "GetNameOwner"))) {
+-		r = -ENOMEM;
+-		goto fail;
+-	}
+-
+-	if (!dbus_message_append_args(msg, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID)) {
+-		r = -ENOMEM;
+-		goto fail;
+-	}
+-
+-	reply = dbus_connection_send_with_reply_and_block(connection, msg, DBUS_TIMEOUT_USE_DEFAULT, error);
+-	dbus_message_unref(msg);
+-	msg = NULL;
+-
+-	if (reply) {
+-		if (!dbus_message_get_args(reply, error, DBUS_TYPE_STRING, name_owner, DBUS_TYPE_INVALID)) {
+-			dbus_message_unref(reply);
+-			r = -EIO;
+-			goto fail;
+-		}
+-
+-		*name_owner = strdup(*name_owner);
+-		dbus_message_unref(reply);
+-
+-		if (!*name_owner) {
+-			r = -ENOMEM;
+-			goto fail;
+-		}
+-
+-	} else if (dbus_error_has_name(error, "org.freedesktop.DBus.Error.NameHasNoOwner"))
+-		dbus_error_free(error);
+-	else {
+-		r = -EIO;
+-		goto fail;
+-	}
+-
+-	return 0;
+-
+-fail:
+-	if (msg)
+-		dbus_message_unref(msg);
+-
+-	return r;
+-}
+-
+ int rm_watch(
+ 	rm_monitor **_m,
+ 	DBusConnection *connection,
+@@ -243,7 +188,7 @@ int rm_watch(
+ 
+ 	m->matching = 1;
+ 
+-	if ((r = get_name_owner(m->connection, m->service_name, &name_owner, error)) < 0)
++	if ((r = rd_dbus_get_name_owner(m->connection, m->service_name, &name_owner, error)) < 0)
+ 		goto fail;
+ 
+ 	m->busy = get_busy(m->connection, name_owner);
+diff --git a/src/modules/reserve.c b/src/modules/reserve.c
+index b4c168c..bbb6773 100644
+--- a/src/modules/reserve.c
++++ b/src/modules/reserve.c
+@@ -606,3 +606,59 @@ void* rd_get_userdata(rd_device *d) {
+ 
+ 	return d->userdata;
+ }
++
++int rd_dbus_get_name_owner(
++	DBusConnection *connection,
++	const char *name,
++	char **name_owner,
++	DBusError *error) {
++
++	DBusMessage *msg, *reply;
++	int r;
++
++	*name_owner = NULL;
++
++	if (!(msg = dbus_message_new_method_call(DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, "GetNameOwner"))) {
++		r = -ENOMEM;
++		goto fail;
++	}
++
++	if (!dbus_message_append_args(msg, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID)) {
++		r = -ENOMEM;
++		goto fail;
++	}
++
++	reply = dbus_connection_send_with_reply_and_block(connection, msg, DBUS_TIMEOUT_USE_DEFAULT, error);
++	dbus_message_unref(msg);
++	msg = NULL;
++
++	if (reply) {
++		if (!dbus_message_get_args(reply, error, DBUS_TYPE_STRING, name_owner, DBUS_TYPE_INVALID)) {
++			dbus_message_unref(reply);
++			r = -EIO;
++			goto fail;
++		}
++
++		*name_owner = strdup(*name_owner);
++		dbus_message_unref(reply);
++
++		if (!*name_owner) {
++			r = -ENOMEM;
++			goto fail;
++		}
++
++	} else if (dbus_error_has_name(error, "org.freedesktop.DBus.Error.NameHasNoOwner"))
++		dbus_error_free(error);
++	else {
++		r = -EIO;
++		goto fail;
++	}
++
++	return 0;
++
++fail:
++	if (msg)
++		dbus_message_unref(msg);
++
++	return r;
++}
+diff --git a/src/modules/reserve.h b/src/modules/reserve.h
+index bc50870..6527bd7 100644
+--- a/src/modules/reserve.h
++++ b/src/modules/reserve.h
+@@ -72,6 +72,15 @@ void rd_set_userdata(rd_device *d, void *userdata);
+  * userdata was set. */
+ void* rd_get_userdata(rd_device *d);
+ 
++/* Helper function to get the unique connection name owning a given
++ * name. Returns 0 on success, a negative errno style return value on
++ * error. */
++int rd_dbus_get_name_owner(
++	DBusConnection *connection,
++	const char *name,
++	char **name_owner,
++	DBusError *error);
++
+ #ifdef __cplusplus
+ }
+ #endif
+-- 
+1.8.1.4
+
diff --git a/0007-reserve-Fix-leaking-NameLost-signals-after-release-a.patch b/0007-reserve-Fix-leaking-NameLost-signals-after-release-a.patch
new file mode 100644
index 0000000..9abc064
--- /dev/null
+++ b/0007-reserve-Fix-leaking-NameLost-signals-after-release-a.patch
@@ -0,0 +1,72 @@
+From 1db09d30138c54de64f8e197eb6d60b8a04d31c8 Mon Sep 17 00:00:00 2001
+From: Mikel Astiz <mikel.astiz@bmw-carit.de>
+Date: Wed, 30 Jan 2013 09:30:31 +0100
+Subject: [PATCH 7/7] reserve: Fix leaking NameLost signals after
+ release+acquire
+
+The use of the pseudo-blocking D-Bus calls leads to the problem that
+NameLost signals are received after the reply to ReleaseName().
+
+The problem with this is that a later acquisition of the same audio
+device can potentially receive the NameLost signal corresponding to
+the previous instance, due to the fact that the signal hasn't been
+popped from the D-Bus message queue.
+
+The simplest approach to solve this problem is to poll the actual name
+owner from the D-Bus daemon, in order to make sure that we did really
+lose the name.
+
+The proposal uses a blocking call to GetNameOwner to avoid incosistent
+states in the internal APIs: it would otherwise be possible to have a
+"busy" device before the reservation has been lost, in the unlikely
+case if some other process acquires the name before we got the
+confirmation that the NameLost was actually true.
+---
+ src/modules/reserve.c | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/src/modules/reserve.c b/src/modules/reserve.c
+index bbb6773..f78805e 100644
+--- a/src/modules/reserve.c
++++ b/src/modules/reserve.c
+@@ -293,6 +293,7 @@ static DBusHandlerResult filter_handler(
+ 
+ 	rd_device *d;
+ 	DBusError error;
++	char *name_owner = NULL;
+ 
+ 	dbus_error_init(&error);
+ 
+@@ -310,6 +311,21 @@ static DBusHandlerResult filter_handler(
+ 			goto invalid;
+ 
+ 		if (strcmp(name, d->service_name) == 0 && d->owning) {
++			/* Verify the actual owner of the name to avoid leaked NameLost
++			 * signals from previous reservations. The D-Bus daemon will send
++			 * all messages asynchronously in the correct order, but we could
++			 * potentially process them too late due to the pseudo-blocking
++			 * call mechanism used during both acquisition and release. This
++			 * can happen if we release the device and immediately after
++			 * reacquire it before NameLost is processed. */
++			if (!d->gave_up) {
++				const char *un;
++
++				if ((un = dbus_bus_get_unique_name(c)) && rd_dbus_get_name_owner(c, d->service_name, &name_owner, &error) == 0)
++					if (strcmp(name_owner, un) == 0)
++						goto invalid; /* Name still owned by us */
++			}
++
+ 			d->owning = 0;
+ 
+ 			if (!d->gave_up)  {
+@@ -326,6 +342,7 @@ static DBusHandlerResult filter_handler(
+ 	}
+ 
+ invalid:
++	free(name_owner);
+ 	dbus_error_free(&error);
+ 
+ 	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+-- 
+1.8.1.4
+
diff --git a/pulseaudio.spec b/pulseaudio.spec
index aa33fb3..3d41a70 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -8,7 +8,7 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
 Version:        %{pa_major}%{?pa_minor:.%{pa_minor}}
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        LGPLv2+
 URL:            http://www.freedesktop.org/wiki/Software/PulseAudio
 Source0:        http://freedesktop.org/software/pulseaudio/releases/pulseaudio-%{version}.tar.xz
@@ -16,6 +16,12 @@ Source1:        default.pa-for-gdm
 
 ## upstream patches
 Patch101: 0001-alsa-mixer-Fix-the-analog-output-speaker-always-path.patch
+Patch102: 0002-man-Update-log-target-documentation.patch
+Patch103: 0003-build-Don-t-enable-BlueZ-if-libbluetooth-is-not-foun.patch
+Patch104: 0004-Call-change_cb-only-when-there-s-an-actual-change.patch
+Patch105: 0005-Initialize-monitor-s-busy-status-to-false-if-we-own-.patch
+Patch106: 0006-reserve-Move-get_name_owner-to-the-public-rd_device-.patch
+Patch107: 0007-reserve-Fix-leaking-NameLost-signals-after-release-a.patch
 
 BuildRequires:  m4
 BuildRequires:  libtool-ltdl-devel
@@ -190,6 +196,12 @@ This package contains GDM integration hooks for the PulseAudio sound server.
 %setup -q -T -b0
 
 %patch101 -p1 -b .0001
+%patch102 -p1 -b .0002
+%patch103 -p1 -b .0003
+%patch104 -p1 -b .0004
+%patch105 -p1 -b .0005
+%patch106 -p1 -b .0006
+%patch107 -p1 -b .0007
 
 ## kill rpaths
 %if "%{_libdir}" != "/usr/lib"
@@ -464,6 +476,9 @@ exit 0
 %attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
 
 %changelog
+* Thu Apr 11 2013 Rex Dieter <rdieter@fedoraproject.org> 3.0-7
+- pull a few more patches from upstream stable-3.x branch
+
 * Fri Feb 08 2013 Rex Dieter <rdieter@fedoraproject.org> 3.0-6
 - default.pa: fix for renamed modules (#908117)