--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package jackd2
The recent upload fixes #682792 that prevents users from stopping the
jackd audio system. We believe this contributes to the overall user
experience and hence like to have it in wheezy.
Patch was taken from Ubuntu.
TIA
unblock jackd2/1.9.8~dfsg.4+20120529git007cdc37-5
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.6.8 (SMP w/8 CPU cores; PREEMPT)
Locale: LANG=C, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_US.UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru jackd2-1.9.8~dfsg.4+20120529git007cdc37/debian/changelog jackd2-1.9.8~dfsg.4+20120529git007cdc37/debian/changelog
--- jackd2-1.9.8~dfsg.4+20120529git007cdc37/debian/changelog 2012-09-28 20:26:15.000000000 +0200
+++ jackd2-1.9.8~dfsg.4+20120529git007cdc37/debian/changelog 2012-11-27 21:40:51.000000000 +0100
@@ -1,3 +1,9 @@
+jackd2 (1.9.8~dfsg.4+20120529git007cdc37-5) unstable; urgency=low
+
+ * Add patch to fix hanging jackdbus (Closes: #682792)
+
+ -- Adrian Knoth <adi@drcomp.erfurt.thur.de> Tue, 27 Nov 2012 21:40:49 +0100
+
jackd2 (1.9.8~dfsg.4+20120529git007cdc37-4.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru jackd2-1.9.8~dfsg.4+20120529git007cdc37/debian/patches/jackdbus-hang.patch jackd2-1.9.8~dfsg.4+20120529git007cdc37/debian/patches/jackdbus-hang.patch
--- jackd2-1.9.8~dfsg.4+20120529git007cdc37/debian/patches/jackdbus-hang.patch 1970-01-01 01:00:00.000000000 +0100
+++ jackd2-1.9.8~dfsg.4+20120529git007cdc37/debian/patches/jackdbus-hang.patch 2012-11-27 21:37:45.000000000 +0100
@@ -0,0 +1,101 @@
+From: Kaj Ailomaa <kaj.ailomaa@mousike.me>
+Bugs-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=682792
+Bugs-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/jackd2/+bug/956438
+Origin: upstream, https://github.com/jackaudio/jack2/commit/aa02feeacfa533a07f04e916334637b57eaac5a2 https://github.com/jackaudio/jack2/commit/700489b429b0edb7046b169278e3e6751e3e59fc
+Applied-Upstream: 1.9.9
+Forwarded: not-needed
+Description: Fix hanging qjackctl when stopping jackdbus
+--- a/common/JackLibAPI.cpp
++++ b/common/JackLibAPI.cpp
+@@ -177,7 +177,7 @@
+ va_end(ap);
+ JackGlobals::fOpenMutex->Unlock();
+ return res;
+- } catch(std::bad_alloc& e) {
++ } catch (std::bad_alloc& e) {
+ jack_error("Memory allocation error...");
+ return NULL;
+ } catch (...) {
+--- a/common/JackLockedEngine.h
++++ b/common/JackLockedEngine.h
+@@ -41,7 +41,7 @@
+ */
+
+ #define CATCH_EXCEPTION_RETURN \
+- } catch(std::bad_alloc& e) { \
++ } catch (std::bad_alloc& e) { \
+ jack_error("Memory allocation error..."); \
+ return -1; \
+ } catch (...) { \
+@@ -50,10 +50,10 @@
+ } \
+
+ #define CATCH_CLOSE_EXCEPTION_RETURN \
+- } catch(std::bad_alloc& e) { \
++ } catch (std::bad_alloc& e) { \
+ jack_error("Memory allocation error..."); \
+ return -1; \
+- } catch(JackTemporaryException& e) { \
++ } catch (JackTemporaryException& e) { \
+ jack_error("JackTemporaryException : now quits..."); \
+ JackTools::KillServer(); \
+ return 0; \
+@@ -63,7 +63,7 @@
+ }
+
+ #define CATCH_EXCEPTION \
+- } catch(std::bad_alloc& e) { \
++ } catch (std::bad_alloc& e) { \
+ jack_error("Memory allocation error..."); \
+ } catch (...) { \
+ jack_error("Unknown error..."); \
+@@ -327,8 +327,8 @@
+
+ void NotifyQuit()
+ {
++ // No lock needed
+ TRY_CALL
+- JackLock lock(&fEngine);
+ return fEngine.NotifyQuit();
+ CATCH_EXCEPTION
+ }
+--- a/common/JackServerAPI.cpp
++++ b/common/JackServerAPI.cpp
+@@ -162,7 +162,7 @@
+ va_end(ap);
+ JackGlobals::fOpenMutex->Unlock();
+ return res;
+- } catch(std::bad_alloc& e) {
++ } catch (std::bad_alloc& e) {
+ jack_error("Memory allocation error...");
+ return NULL;
+ } catch (...) {
+--- a/common/JackServer.cpp
++++ b/common/JackServer.cpp
+@@ -134,7 +134,6 @@
+ int JackServer::Close()
+ {
+ jack_log("JackServer::Close");
+- fEngine->NotifyQuit();
+ fChannel.Close();
+ fAudioDriver->Detach();
+ fAudioDriver->Close();
+@@ -190,6 +189,7 @@
+ int JackServer::Stop()
+ {
+ jack_log("JackServer::Stop");
++ fEngine->NotifyQuit();
+ fChannel.Stop();
+
+ fEngine->ShutDown();
+--- a/posix/JackSocketServerChannel.cpp
++++ b/posix/JackSocketServerChannel.cpp
+@@ -97,7 +97,7 @@
+
+ void JackSocketServerChannel::Stop()
+ {
+- fThread.Kill();
++ fThread.Stop();
+ }
+
+ void JackSocketServerChannel::ClientCreate()
diff -Nru jackd2-1.9.8~dfsg.4+20120529git007cdc37/debian/patches/series jackd2-1.9.8~dfsg.4+20120529git007cdc37/debian/patches/series
--- jackd2-1.9.8~dfsg.4+20120529git007cdc37/debian/patches/series 2012-08-11 12:11:56.000000000 +0200
+++ jackd2-1.9.8~dfsg.4+20120529git007cdc37/debian/patches/series 2012-11-27 21:23:53.000000000 +0100
@@ -1,2 +1,3 @@
no-selfconnect.patch
jack_control.patch
+jackdbus-hang.patch
--- End Message ---