pulseaudio: Update to 6.0; add dependency on eudev.

* gnu/packages/pulseaudio.scm (pulseaudio)[source]: Update to 6.0.
  [arguments]: Pass --with-udev-rules-dir.
  [inputs]: Add eudev.
This commit is contained in:
Ludovic Courtès 2015-03-14 16:29:56 +01:00
parent 060e365a73
commit 5a74d239bf
3 changed files with 9 additions and 64 deletions

View File

@ -481,7 +481,6 @@ dist_patch_DATA = \
gnu/packages/patches/plotutils-libpng-jmpbuf.patch \ gnu/packages/patches/plotutils-libpng-jmpbuf.patch \
gnu/packages/patches/polkit-drop-test.patch \ gnu/packages/patches/polkit-drop-test.patch \
gnu/packages/patches/procps-make-3.82.patch \ gnu/packages/patches/procps-make-3.82.patch \
gnu/packages/patches/pulseaudio-CVE-2014-3970.patch \
gnu/packages/patches/pulseaudio-fix-mult-test.patch \ gnu/packages/patches/pulseaudio-fix-mult-test.patch \
gnu/packages/patches/pybugz-encode-error.patch \ gnu/packages/patches/pybugz-encode-error.patch \
gnu/packages/patches/pybugz-stty.patch \ gnu/packages/patches/pybugz-stty.patch \

View File

@ -1,57 +0,0 @@
From 26b9d22dd24c17eb118d0205bf7b02b75d435e3c Mon Sep 17 00:00:00 2001
From: "Alexander E. Patrakov" <patrakov@gmail.com>
Date: Thu, 5 Jun 2014 22:29:25 +0600
Subject: [PATCH] rtp-recv: fix crash on empty UDP packets (CVE-2014-3970)
On FIONREAD returning 0 bytes, we cannot return success, as the caller
(rtpoll_work_cb in module-rtp-recv.c) would then try to
pa_memblock_unref(chunk.memblock) and, because memblock is NULL, trigger
an assertion.
Also we have to read out the possible empty packet from the socket, so
that the kernel doesn't tell us again and again about it.
Signed-off-by: Alexander E. Patrakov <patrakov@gmail.com>
---
src/modules/rtp/rtp.c | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/modules/rtp/rtp.c b/src/modules/rtp/rtp.c
index 570737e..7b75e0e 100644
--- a/src/modules/rtp/rtp.c
+++ b/src/modules/rtp/rtp.c
@@ -182,8 +182,29 @@ int pa_rtp_recv(pa_rtp_context *c, pa_memchunk *chunk, pa_mempool *pool, struct
goto fail;
}
- if (size <= 0)
- return 0;
+ if (size <= 0) {
+ /* size can be 0 due to any of the following reasons:
+ *
+ * 1. Somebody sent us a perfectly valid zero-length UDP packet.
+ * 2. Somebody sent us a UDP packet with a bad CRC.
+ *
+ * It is unknown whether size can actually be less than zero.
+ *
+ * In the first case, the packet has to be read out, otherwise the
+ * kernel will tell us again and again about it, thus preventing
+ * reception of any further packets. So let's just read it out
+ * now and discard it later, when comparing the number of bytes
+ * received (0) with the number of bytes wanted (1, see below).
+ *
+ * In the second case, recvmsg() will fail, thus allowing us to
+ * return the error.
+ *
+ * Just to avoid passing zero-sized memchunks and NULL pointers to
+ * recvmsg(), let's force allocation of at least one byte by setting
+ * size to 1.
+ */
+ size = 1;
+ }
if (c->memchunk.length < (unsigned) size) {
size_t l;
--
2.0.0

View File

@ -112,7 +112,7 @@ rates. ")
(define pulseaudio (define pulseaudio
(package (package
(name "pulseaudio") (name "pulseaudio")
(version "5.0") (version "6.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -120,7 +120,7 @@ rates. ")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0fgrr8v7yfh0byhzdv4c87v9lkj8g7gpjm8r9xrbvpa92a5kmhcr")) "1xpnfxa0d8pgf6b4qdgnkcvrvdxbbbjd5ync19h0f5hbp3h401mm"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Disable console-kit support by default since it's deprecated ;; Disable console-kit support by default since it's deprecated
@ -128,12 +128,14 @@ rates. ")
'(substitute* "src/daemon/default.pa.in" '(substitute* "src/daemon/default.pa.in"
(("load-module module-console-kit" all) (("load-module module-console-kit" all)
(string-append "#" all "\n")))) (string-append "#" all "\n"))))
(patches (list (search-patch "pulseaudio-fix-mult-test.patch") (patches (list (search-patch "pulseaudio-fix-mult-test.patch")))))
(search-patch "pulseaudio-CVE-2014-3970.patch")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags '("--localstatedir=/var" ;"--sysconfdir=/etc" `(#:configure-flags (list "--localstatedir=/var" ;"--sysconfdir=/etc"
"--disable-oss-output") "--disable-oss-output"
(string-append "--with-udev-rules-dir="
(assoc-ref %outputs "out")
"/lib/udev/rules.d"))
#:phases (alist-cons-before #:phases (alist-cons-before
'check 'pre-check 'check 'pre-check
(lambda _ (lambda _
@ -160,6 +162,7 @@ rates. ")
("libltdl" ,libltdl) ("libltdl" ,libltdl)
("fftwf" ,fftwf) ("fftwf" ,fftwf)
("avahi" ,avahi) ("avahi" ,avahi)
("eudev" ,eudev) ;for the detection of hardware audio devices
("check" ,check))) ("check" ,check)))
(propagated-inputs (propagated-inputs
;; 'libpulse*.la' contain `-lgdbm' and `-lcap', so propagate them. ;; 'libpulse*.la' contain `-lgdbm' and `-lcap', so propagate them.