From 555ce5f711e9bfba0fc36b7b6e70c57b2ca1a383 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Wed, 4 Nov 2009 20:48:51 +0000
Subject: [PATCH] 0.116.2, fix segfaults due to unclosed threads

---
 ...ection-kit-0.116.1-cleanup-mb-thread.patch | 35 +++++++++++++++++++
 jack-audio-connection-kit.spec                | 11 ++++--
 sources                                       |  2 +-
 3 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 jack-audio-connection-kit-0.116.1-cleanup-mb-thread.patch

diff --git a/jack-audio-connection-kit-0.116.1-cleanup-mb-thread.patch b/jack-audio-connection-kit-0.116.1-cleanup-mb-thread.patch
new file mode 100644
index 0000000..47bcf78
--- /dev/null
+++ b/jack-audio-connection-kit-0.116.1-cleanup-mb-thread.patch
@@ -0,0 +1,35 @@
+--- jack-audio-connection-kit-0.116.1/libjack/client.c.cleanup-mb-thread	2009-11-04 14:48:04.686074485 -0500
++++ jack-audio-connection-kit-0.116.1/libjack/client.c	2009-11-04 14:48:40.198074109 -0500
+@@ -970,6 +970,7 @@ jack_client_open_aux (const char *client
+ 	/* validate parameters */
+ 	if ((options & ~JackOpenOptions)) {
+ 		*status |= (JackFailure|JackInvalidOption);
++		jack_messagebuffer_exit ();
+ 		return NULL;
+ 	}
+ 
+@@ -984,6 +985,7 @@ jack_client_open_aux (const char *client
+ 	*/
+ 	if (jack_get_tmpdir ()) {
+ 		*status |= JackFailure;
++		jack_messagebuffer_exit ();
+ 		return NULL;
+ 	}
+ 
+@@ -994,6 +996,7 @@ jack_client_open_aux (const char *client
+ 
+ 	if (jack_request_client (ClientExternal, client_name, options, status,
+ 				 &va, &res, &req_fd)) {
++		jack_messagebuffer_exit ();
+ 		return NULL;
+ 	}
+ 
+@@ -1088,6 +1091,8 @@ jack_client_open_aux (const char *client
+  	return client;
+ 	
+   fail:
++	jack_messagebuffer_exit ();
++
+ 	if (client->engine) {
+ 		jack_release_shm (&client->engine_shm);
+ 		client->engine = 0;
diff --git a/jack-audio-connection-kit.spec b/jack-audio-connection-kit.spec
index ac6aaee..9228289 100644
--- a/jack-audio-connection-kit.spec
+++ b/jack-audio-connection-kit.spec
@@ -1,7 +1,7 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
-Version: 0.116.1
-Release: 7%{?dist}
+Version: 0.116.2
+Release: 1%{?dist}
 License: GPLv2 and LGPLv2
 Group: System Environment/Daemons
 Source0: http://www.jackaudio.org/downloads/%{name}-%{version}.tar.gz
@@ -9,6 +9,7 @@ Source1: %{name}-README.Fedora
 Source2: %{name}-script.pa
 Source3: %{name}-no_date_footer.html
 Source4: %{name}-limits.conf
+Patch0: jack-audio-connection-kit-0.116.1-cleanup-mb-thread.patch
 URL: http://www.jackaudio.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -64,6 +65,8 @@ Small example clients that use the Jack Audio Connection Kit.
 %prep
 %setup -q
 
+%patch0 -p1 -b .cleanup-mb-thread
+
 # Put custom HTML_FOOTER to avoid timestamp inside
 # (recipe was taken from http://fedoraproject.org/wiki/PackagingDrafts/MultilibTricks)
 cp %{SOURCE3} doc/no_date_footer.html
@@ -170,6 +173,10 @@ exit 0
 %{_bindir}/jack_midisine
 
 %changelog
+* Wed Nov  4 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 0.116.2-8
+- update to 0.116.2
+- make sure we cleanup threads that we open, fixes segfaults (thanks to Ray Strode)
+
 * Tue Oct 27 2009 Dennis Gilmore <dennis@ausil.us> - 0.116.1-7
 - dont build libfreebob support on s390 arches
 
diff --git a/sources b/sources
index b64b72d..e5113ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f2aeb463466084dfdc0ba4360b4998aa  jack-audio-connection-kit-0.116.1.tar.gz
+9c0ae9880e9b6e081f1a238fe6a28bd5  jack-audio-connection-kit-0.116.2.tar.gz