[Pkg-pulseaudio-devel] [SCM] pulseaudio packaging branch, master, updated. debian/0.9.7-3-19-g2a6c8e1

[neurocyte-guest at users.alioth.debian.org]

The branch, master has been updated
       via  2a6c8e16774b0b70c79dd77c5daf4d6d2c61b755 (commit)
      from  57fcc445c0e1ef45eccdc67c911826675935c911 (commit)


- Shortlog ------------------------------------------------------------
2a6c8e1 Add patch to fix protocol errors in module-tunnel

Summary of changes:
 debian/changelog                                   |    2 +
 ...-module-tunnel-to-use-protocol-version-11.patch |   25 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 28 insertions(+), 0 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 2a6c8e16774b0b70c79dd77c5daf4d6d2c61b755
Author: CJ van den Berg <cj at vdbonline.com>
Date:   Wed Nov 28 22:29:13 2007 +0100

    Add patch to fix protocol errors in module-tunnel

diff --git a/debian/changelog b/debian/changelog
index c0ebf8f..54efb3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ pulseaudio (0.9.8-1) UNRELEASED; urgency=low
     + Added, from Ubuntu.
   * debian/p..s/0003-fix-uploading-of-samples-into-PA.-Problem-discovered.patch:
     + Added, svn commit r2074 from upstream.
+  * debian/patches/0004-Force-module-tunnel-to-use-protocol-version-11.patch:
+    + Added, fixes protocol errors in module-tunnel.
 
   [Daniel T Chen]
   * debian/control: Add lsb-base (>= 3) to pulseaudio's dependencies.
diff --git a/debian/patches/0004-Force-module-tunnel-to-use-protocol-version-11.patch b/debian/patches/0004-Force-module-tunnel-to-use-protocol-version-11.patch
new file mode 100644
index 0000000..f0b54af
--- /dev/null
+++ b/debian/patches/0004-Force-module-tunnel-to-use-protocol-version-11.patch
@@ -0,0 +1,25 @@
+From d91b6d26e698ad63761faf722850ad0cec52d4e4 Mon Sep 17 00:00:00 2001
+From: CJ van den Berg <cj at vdbonline.com>
+Date: Wed, 28 Nov 2007 22:26:14 +0100
+Subject: [PATCH] Force module-tunnel to use protocol version 11
+
+PulseAudio 0.9.8 uses protocol version 12, but module-tunnel does not
+support the new opcodes in version 12 yet. This should prevent
+module-tunnel reporting "protocol error" and unloading.
+---
+ src/modules/module-tunnel.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
+index 43a10ce..5ff0416 100644
+--- a/src/modules/module-tunnel.c
++++ b/src/modules/module-tunnel.c
+@@ -1145,7 +1145,7 @@ static void on_connection(pa_socket_client *sc, pa_iochannel *io, void *userdata
+     t = pa_tagstruct_new(NULL, 0);
+     pa_tagstruct_putu32(t, PA_COMMAND_AUTH);
+     pa_tagstruct_putu32(t, tag = u->ctag++);
+-    pa_tagstruct_putu32(t, PA_PROTOCOL_VERSION);
++    pa_tagstruct_putu32(t, 11);
+     pa_tagstruct_put_arbitrary(t, u->auth_cookie, sizeof(u->auth_cookie));
+ 
+ #ifdef HAVE_CREDS
diff --git a/debian/patches/series b/debian/patches/series
index 511aa72..da63a00 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch
 0002-Double-esound-maximum-sample-size.patch
 0003-fix-uploading-of-samples-into-PA.-Problem-discovered.patch
+0004-Force-module-tunnel-to-use-protocol-version-11.patch

-- 
pulseaudio packaging