diff options
author | Cristian Iorga <cristian.iorga@intel.com> | 2015-02-17 17:10:18 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-23 08:08:14 +0000 |
commit | 3c2f5fd0c7894b3c0da494ffdd87bd13bf33c3e7 (patch) | |
tree | 97cdb13fa328c77382306c66240adab43e482d62 /meta/recipes-multimedia/pulseaudio/pulseaudio | |
parent | 172606338757d0b788e3382bf413102647307e1d (diff) | |
download | poky-3c2f5fd0c7894b3c0da494ffdd87bd13bf33c3e7.tar.gz |
pulseaudio: upgrade to 6.0
Changes:
- BlueZ 5 native HSP (headset) support;
- BlueZ 5 HFP (hands-free) profile support via oFono;
- systemd socket activation support;
- Better support for multichannel and 2.1 profiles;
- Remap optimisations;
- Many minor improvements, bug fixes, and i18n updates.
- Switched to ${BP} variable.
- Patch 0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch
removed, no longer necessary.
- Patch CVE-2014-3970.patch included upstrem, removed.
- Slightly changed copyright notice, only a clarification.
libsamplerate based resamplers are now deprecated,
because they offer no particular advantage over speex.
Dependency to libsamplerate0 dropped.
[ RB: disable systemd until systemd.bbclass can handle user units ]
(From OE-Core rev: c4de42aadd4c8a4a8f16c25e7dcdefef79daf030)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio/pulseaudio')
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch | 30 | ||||
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio/CVE-2014-3970.patch | 52 |
2 files changed, 0 insertions, 82 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch deleted file mode 100644 index 467cd2cbd0..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From 002b16f0f2176b4c685e210e335bf69c02563ede Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sat, 22 Feb 2014 18:03:10 +0100 | ||
4 | Subject: [PATCH] configure.ac: Check only for libsystemd not libsystemd-login | ||
5 | |||
6 | * they were merged into libsystemd in systemd-209 | ||
7 | |||
8 | Upstream-Status: Pending (it would need to be conditional on systemd version for upstream to accept this) | ||
9 | |||
10 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
11 | --- | ||
12 | configure.ac | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/configure.ac b/configure.ac | ||
16 | index 388fae2..fff7a83 100644 | ||
17 | --- a/configure.ac | ||
18 | +++ b/configure.ac | ||
19 | @@ -1160,7 +1160,7 @@ AC_ARG_ENABLE([systemd], | ||
20 | AS_HELP_STRING([--disable-systemd],[Disable optional systemd support])) | ||
21 | |||
22 | AS_IF([test "x$enable_systemd" != "xno"], | ||
23 | - [PKG_CHECK_MODULES(SYSTEMD, [ libsystemd-login ], HAVE_SYSTEMD=1, HAVE_SYSTEMD=0)], | ||
24 | + [PKG_CHECK_MODULES(SYSTEMD, [ libsystemd ], HAVE_SYSTEMD=1, HAVE_SYSTEMD=0)], | ||
25 | HAVE_SYSTEMD=0) | ||
26 | |||
27 | AS_IF([test "x$enable_systemd" = "xyes" && test "x$HAVE_SYSTEMD" = "x0"], | ||
28 | -- | ||
29 | 1.8.5.3 | ||
30 | |||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/CVE-2014-3970.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/CVE-2014-3970.patch deleted file mode 100644 index d5f33dc42e..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio/CVE-2014-3970.patch +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | commit 26b9d22dd24c17eb118d0205bf7b02b75d435e3c upstream | ||
4 | |||
5 | rtp-recv: fix crash on empty UDP packets (CVE-2014-3970) | ||
6 | |||
7 | On FIONREAD returning 0 bytes, we cannot return success, as the caller | ||
8 | (rtpoll_work_cb in module-rtp-recv.c) would then try to | ||
9 | pa_memblock_unref(chunk.memblock) and, because memblock is NULL, trigger | ||
10 | an assertion. | ||
11 | |||
12 | Also we have to read out the possible empty packet from the socket, so | ||
13 | that the kernel doesn't tell us again and again about it. | ||
14 | |||
15 | Signed-off-by: Alexander E. Patrakov <patrakov@gmail.com> | ||
16 | |||
17 | diff --git a/src/modules/rtp/rtp.c b/src/modules/rtp/rtp.c | ||
18 | index 9195493..c45981e 100644 | ||
19 | --- a/src/modules/rtp/rtp.c | ||
20 | +++ b/src/modules/rtp/rtp.c | ||
21 | @@ -182,8 +182,29 @@ int pa_rtp_recv(pa_rtp_context *c, pa_memchunk *chunk, pa_mempool *pool, struct | ||
22 | goto fail; | ||
23 | } | ||
24 | |||
25 | - if (size <= 0) | ||
26 | - return 0; | ||
27 | + if (size <= 0) { | ||
28 | + /* size can be 0 due to any of the following reasons: | ||
29 | + * | ||
30 | + * 1. Somebody sent us a perfectly valid zero-length UDP packet. | ||
31 | + * 2. Somebody sent us a UDP packet with a bad CRC. | ||
32 | + * | ||
33 | + * It is unknown whether size can actually be less than zero. | ||
34 | + * | ||
35 | + * In the first case, the packet has to be read out, otherwise the | ||
36 | + * kernel will tell us again and again about it, thus preventing | ||
37 | + * reception of any further packets. So let's just read it out | ||
38 | + * now and discard it later, when comparing the number of bytes | ||
39 | + * received (0) with the number of bytes wanted (1, see below). | ||
40 | + * | ||
41 | + * In the second case, recvmsg() will fail, thus allowing us to | ||
42 | + * return the error. | ||
43 | + * | ||
44 | + * Just to avoid passing zero-sized memchunks and NULL pointers to | ||
45 | + * recvmsg(), let's force allocation of at least one byte by setting | ||
46 | + * size to 1. | ||
47 | + */ | ||
48 | + size = 1; | ||
49 | + } | ||
50 | |||
51 | if (c->memchunk.length < (unsigned) size) { | ||
52 | size_t l; | ||