[Pkg-mpd-commits] [pkg-mpd] 08/10: Add patches from upstream: mpd.socket, mms_deadlock

[Florian Schlichting]

This is an automated email from the git hooks/post-receive script.

fsfs pushed a commit to branch master
in repository pkg-mpd.

commit 207b1b89ad81f3d7963782798465e640bee17af9
Author: Florian Schlichting <fsfs at debian.org>
Date:   Sun Oct 12 23:04:56 2014 +0200

    Add patches from upstream: mpd.socket, mms_deadlock
---
 debian/patches/add_mpd_socket.patch | 15 +++++++++++++++
 debian/patches/mms_deadlock.patch   | 15 +++++++++++++++
 debian/patches/series               |  3 +++
 debian/patches/typo.patch           | 14 ++++++++++++++
 4 files changed, 47 insertions(+)

diff --git a/debian/patches/add_mpd_socket.patch b/debian/patches/add_mpd_socket.patch
new file mode 100644
index 0000000..48984dc
--- /dev/null
+++ b/debian/patches/add_mpd_socket.patch
@@ -0,0 +1,15 @@
+Description: Add mpd.socket file missing from tarball
+Origin: upstream git
+
+--- /dev/null
++++ b/systemd/mpd.socket
+@@ -0,0 +1,9 @@
++[Socket]
++ListenStream=/run/mpd/socket
++ListenStream=6600
++Backlog=5
++KeepAlive=true
++PassCredentials=true
++
++[Install]
++WantedBy=sockets.target
diff --git a/debian/patches/mms_deadlock.patch b/debian/patches/mms_deadlock.patch
new file mode 100644
index 0000000..9572f6a
--- /dev/null
+++ b/debian/patches/mms_deadlock.patch
@@ -0,0 +1,15 @@
+Description: mms: fix deadlock bug
+Author: Max Kellermann <max at duempel.org>
+Origin: upstream git
+
+--- a/src/input/ThreadInputStream.cxx
++++ b/src/input/ThreadInputStream.cxx
+@@ -88,7 +88,7 @@
+ 			Unlock();
+ 
+ 			Error error;
+-			size_t nbytes = Read(w.data, w.size, error);
++			size_t nbytes = ThreadRead(w.data, w.size, error);
+ 
+ 			Lock();
+ 			cond.broadcast();
diff --git a/debian/patches/series b/debian/patches/series
index 5a8d510..1af33b0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,4 @@
 systemd_honor_MPDCONF.patch
+add_mpd_socket.patch
+typo.patch
+mms_deadlock.patch
diff --git a/debian/patches/typo.patch b/debian/patches/typo.patch
new file mode 100644
index 0000000..db70666
--- /dev/null
+++ b/debian/patches/typo.patch
@@ -0,0 +1,14 @@
+Description: Fix a doc typo
+Author: Florian Schlichting <fsfs at debian.org>
+
+--- a/doc/user.xml
++++ b/doc/user.xml
+@@ -16,7 +16,7 @@
+       <application>MPD</application> (Music Player Daemon) is, as the
+       name suggests, a server software allowing you to remotely play
+       your music, handle playlists, deliver music (HTTP streams with
+-      various sub-protocols) and organizze playlists.
++      various sub-protocols) and organize playlists.
+     </para>
+ 
+     <para>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mpd/pkg-mpd.git