diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-sound/pulseaudio/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-sound/pulseaudio/files')
10 files changed, 400 insertions, 0 deletions
diff --git a/media-sound/pulseaudio/files/pulseaudio-5.0-crash-udp.patch b/media-sound/pulseaudio/files/pulseaudio-5.0-crash-udp.patch new file mode 100644 index 000000000000..d14da07459ff --- /dev/null +++ b/media-sound/pulseaudio/files/pulseaudio-5.0-crash-udp.patch @@ -0,0 +1,53 @@ +From 26b9d22dd24c17eb118d0205bf7b02b75d435e3c Mon Sep 17 00:00:00 2001 +From: Alexander E. Patrakov <patrakov@gmail.com> +Date: Thu, 05 Jun 2014 16:29:25 +0000 +Subject: 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> +--- +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; +-- +cgit v0.9.0.2-2-gbebe diff --git a/media-sound/pulseaudio/files/pulseaudio-5.0-module-switch.patch b/media-sound/pulseaudio/files/pulseaudio-5.0-module-switch.patch new file mode 100644 index 000000000000..e8ff6e051ae4 --- /dev/null +++ b/media-sound/pulseaudio/files/pulseaudio-5.0-module-switch.patch @@ -0,0 +1,35 @@ +From ef4a41e8b0ef81a53769d853dbc7679b25252327 Mon Sep 17 00:00:00 2001 +From: David Henningsson <david.henningsson@canonical.com> +Date: Fri, 28 Mar 2014 11:59:09 +0100 +Subject: [PATCH 36/38] module-switch-on-port-available: Don't switch profiles + on uninitialized cards + +This could cause the HDMI port to become the default on some systems +where analog output was available. + +BugLink: https://bugs.launchpad.net/ubuntu/+source/pulseaudio/+bug/1256511 +BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=73375 +Signed-off-by: David Henningsson <david.henningsson@canonical.com> +--- + src/modules/module-switch-on-port-available.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/modules/module-switch-on-port-available.c b/src/modules/module-switch-on-port-available.c +index 2c7ad17..c560306 100644 +--- a/src/modules/module-switch-on-port-available.c ++++ b/src/modules/module-switch-on-port-available.c +@@ -173,6 +173,11 @@ static pa_hook_result_t port_available_hook_callback(pa_core *c, pa_device_port + return PA_HOOK_OK; + } + ++ if (pa_idxset_size(card->sinks) == 0 && pa_idxset_size(card->sources) == 0) ++ /* This card is not initialized yet. We'll handle it in ++ sink_new / source_new callbacks later. */ ++ return PA_HOOK_OK; ++ + find_sink_and_source(card, port, &sink, &source); + + is_active_profile = card->active_profile == pa_hashmap_get(port->profiles, card->active_profile->name); +-- +1.9.0 + diff --git a/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-1.patch b/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-1.patch new file mode 100644 index 000000000000..d90399be3653 --- /dev/null +++ b/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-1.patch @@ -0,0 +1,26 @@ +From d03ffdccdb7286021e53876ba5d4adf9a1edd0d0 Mon Sep 17 00:00:00 2001 +From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com> +Date: Sat, 15 Mar 2014 09:37:05 +0200 +Subject: zeroconf-publish: Add locking around pa_mainloop_api_once() + +Commit e1e154c7377779377fa1a36655a10effd693f7b5 added locking around +pa_mainloop_api_once() everywhere except pa__done(). This fixes that +omission. + +diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c +index 0110e1d..35277c2 100644 +--- a/src/modules/module-zeroconf-publish.c ++++ b/src/modules/module-zeroconf-publish.c +@@ -807,7 +807,9 @@ void pa__done(pa_module*m) { + if (!(u = m->userdata)) + return; + ++ pa_threaded_mainloop_lock(u->mainloop); + pa_mainloop_api_once(u->api, client_free, u); ++ pa_threaded_mainloop_unlock(u->mainloop); + pa_asyncmsgq_wait_for(u->thread_mq.outq, AVAHI_MESSAGE_SHUTDOWN_COMPLETE); + + pa_threaded_mainloop_stop(u->mainloop); +-- +cgit v0.10.2 + diff --git a/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-2.patch b/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-2.patch new file mode 100644 index 000000000000..7d4de455941f --- /dev/null +++ b/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-2.patch @@ -0,0 +1,73 @@ +From 37e73e10be9e42544a4cc160ff85ccada2cc9aa9 Mon Sep 17 00:00:00 2001 +From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com> +Date: Sat, 15 Mar 2014 09:37:06 +0200 +Subject: zeroconf-publish: Don't react to messages while shutting down + +This fixes a case where pa__done() is called while +AVAHI_MESSAGE_PUBLISH_ALL is waiting for processing. The +pa_asyncmsgq_wait_for(AVAHI_MESSAGE_SHUTDOWN_COMPLETE) call will +process all pending messages, and processing AVAHI_MESSAGE_PUBLISH_ALL +causes publish_all_services(), and that in turn accesses u->services, +which has been already freed at this point. If we are shutting down, +we shouldn't react to any of the messages that the Avahi thread is +sending to the main thread. + +BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=76184 + +diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c +index 35277c2..db92850 100644 +--- a/src/modules/module-zeroconf-publish.c ++++ b/src/modules/module-zeroconf-publish.c +@@ -141,6 +141,8 @@ struct userdata { + pa_hook_slot *sink_new_slot, *source_new_slot, *sink_unlink_slot, *source_unlink_slot, *sink_changed_slot, *source_changed_slot; + + pa_native_protocol *native; ++ ++ bool shutting_down; + }; + + /* Runs in PA mainloop context */ +@@ -638,6 +640,11 @@ static void unpublish_all_services(struct userdata *u, bool rem) { + static int avahi_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) { + struct userdata *u = (struct userdata *) data; + ++ pa_assert(u); ++ ++ if (u->shutting_down) ++ return 0; ++ + switch (code) { + case AVAHI_MESSAGE_PUBLISH_ALL: + publish_all_services(u); +@@ -647,10 +654,6 @@ static int avahi_process_msg(pa_msgobject *o, int code, void *data, int64_t offs + pa_module_unload(u->core, u->module, true); + break; + +- case AVAHI_MESSAGE_SHUTDOWN_COMPLETE: +- /* pa__done() is waiting for this */ +- break; +- + default: + pa_assert_not_reached(); + } +@@ -797,7 +800,7 @@ static void client_free(pa_mainloop_api *api PA_GCC_UNUSED, void *userdata) { + if (u->avahi_poll) + pa_avahi_poll_free(u->avahi_poll); + +- pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->msg), AVAHI_MESSAGE_SHUTDOWN_COMPLETE, NULL, 0, NULL, NULL); ++ pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->msg), AVAHI_MESSAGE_SHUTDOWN_COMPLETE, u, 0, NULL, NULL); + } + + void pa__done(pa_module*m) { +@@ -807,6 +810,8 @@ void pa__done(pa_module*m) { + if (!(u = m->userdata)) + return; + ++ u->shutting_down = true; ++ + pa_threaded_mainloop_lock(u->mainloop); + pa_mainloop_api_once(u->api, client_free, u); + pa_threaded_mainloop_unlock(u->mainloop); +-- +cgit v0.10.2 + diff --git a/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-3.patch b/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-3.patch new file mode 100644 index 000000000000..6bdd46415cd2 --- /dev/null +++ b/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-3.patch @@ -0,0 +1,77 @@ +From b75a20db10c8605d98324a7782a7da6483ae9f14 Mon Sep 17 00:00:00 2001 +From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com> +Date: Wed, 19 Mar 2014 09:50:39 +0200 +Subject: zeroconf-publish: Don't assume any particular defer event ordering + +Also, initialize userdata with zeros to avoid invalid pointers in +client_free(). + +This fixes a crash when client_free() is called before +create_client(). The whole issue could be avoided by using some other +mechanism than defer events for running the two functions, but I'll +do that change later (I have also other cleanups planned for +zeroconf-publish). + +BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=76184 + +diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c +index db92850..be8806e 100644 +--- a/src/modules/module-zeroconf-publish.c ++++ b/src/modules/module-zeroconf-publish.c +@@ -142,7 +142,8 @@ struct userdata { + + pa_native_protocol *native; + +- bool shutting_down; ++ bool shutting_down; /* Used in the main thread. */ ++ bool client_freed; /* Used in the Avahi thread. */ + }; + + /* Runs in PA mainloop context */ +@@ -707,6 +708,16 @@ static void create_client(pa_mainloop_api *api PA_GCC_UNUSED, void *userdata) { + struct userdata *u = (struct userdata *) userdata; + int error; + ++ /* create_client() and client_free() are called via defer events. If the ++ * two defer events are created very quickly one after another, we can't ++ * assume that the defer event that runs create_client() will be dispatched ++ * before the defer event that runs client_free() (at the time of writing, ++ * pa_mainloop actually always dispatches queued defer events in reverse ++ * creation order). For that reason we must be prepared for the case where ++ * client_free() has already been called. */ ++ if (u->client_freed) ++ return; ++ + pa_thread_mq_install(&u->thread_mq); + + if (!(u->client = avahi_client_new(u->avahi_poll, AVAHI_CLIENT_NO_FAIL, client_callback, u, &error))) { +@@ -733,7 +744,7 @@ int pa__init(pa_module*m) { + goto fail; + } + +- m->userdata = u = pa_xnew(struct userdata, 1); ++ m->userdata = u = pa_xnew0(struct userdata, 1); + u->core = m->core; + u->module = m; + u->native = pa_native_protocol_get(u->core); +@@ -757,8 +768,6 @@ int pa__init(pa_module*m) { + u->source_changed_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_PROPLIST_CHANGED], PA_HOOK_LATE, (pa_hook_cb_t) device_new_or_changed_cb, u); + u->source_unlink_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_UNLINK], PA_HOOK_LATE, (pa_hook_cb_t) device_unlink_cb, u); + +- u->main_entry_group = NULL; +- + un = pa_get_user_name_malloc(); + hn = pa_get_host_name_malloc(); + u->service_name = pa_truncate_utf8(pa_sprintf_malloc("%s@%s", un, hn), AVAHI_LABEL_MAX-1); +@@ -801,6 +810,8 @@ static void client_free(pa_mainloop_api *api PA_GCC_UNUSED, void *userdata) { + pa_avahi_poll_free(u->avahi_poll); + + pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->msg), AVAHI_MESSAGE_SHUTDOWN_COMPLETE, u, 0, NULL, NULL); ++ ++ u->client_freed = true; + } + + void pa__done(pa_module*m) { +-- +cgit v0.10.2 + diff --git a/media-sound/pulseaudio/files/pulseaudio.conf.d b/media-sound/pulseaudio/files/pulseaudio.conf.d new file mode 100644 index 000000000000..348540b3fcf5 --- /dev/null +++ b/media-sound/pulseaudio/files/pulseaudio.conf.d @@ -0,0 +1,7 @@ +# Config file for /etc/init.d/pulseaudio +# $Id$ + +# For more see "pulseaudio -h". + +# Startup options +PA_OPTS="--log-target=syslog --disallow-module-loading=1" diff --git a/media-sound/pulseaudio/files/pulseaudio.init.d-5 b/media-sound/pulseaudio/files/pulseaudio.init.d-5 new file mode 100644 index 000000000000..a6841020774d --- /dev/null +++ b/media-sound/pulseaudio/files/pulseaudio.init.d-5 @@ -0,0 +1,81 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +depend() { + need localmount + use net + + local script="/etc/pulse/system.pa" + + for opt in ${PA_OPTS}; do + case "$opt" in + --file=*) script="${opt#*=}" ;; + -F*) script="${opt#-F}" ;; + esac + done + + config "$script" + + local needs="$(get_options need)" + if [ -n "${needs}" ]; then + need ${needs} + return + fi + + if egrep -q '^[[:space:]]*load-module[[:space:]]+module-console-kit' "$script"; then + needs="${needs} consolekit" + fi + +#ifdef UDEV + if egrep -q '^[[:space:]]*load-module[[:space:]]+module-udev-detect' "$script"; then + needs="${needs} udev" + fi +#endif + +#ifdef AVAHI + if egrep -q '^[[:space:]]*load-module[[:space:]]+module-zeroconf-publish' "$script"; then + needs="${needs} avahi-daemon" + fi +#endif + +#ifdef BLUETOOTH + if egrep -q '^[[:space:]]*load-module[[:space:]]+module-bt-proximity' "$script"; then + needs="${needs} bluetooth" + fi +#endif + +#ifdef ALSA + if egrep -q '^[[:space:]]*load-module[[:space:]]+module-alsa-(sink|source)' "$script" || + egrep -q '^[[:space:]]*load-module[[:space:]]+module-(udev-)?detect' "$script" || + egrep -q '^[[:space:]]*add-autoload-source[[:space:]]+(input|output)[[:space:]]+module-alsa-(sink|source)' "$script"; then + needs="${needs} alsasound" + fi +#endif + + need "${needs}" + save_options need "${needs}" +} + +start() { + if [ -z "${PULSEAUDIO_SHOULD_NOT_GO_SYSTEMWIDE}" ]; then + eerror "Please don't use system wide PulseAudio unless you read the" + eerror "documentation available at http://www.pulseaudio.org/wiki/WhatIsWrongWithSystemMode" + eerror "" + eerror "When you're done, please set the variable PULSEAUDIO_SHOULD_NOT_GO_SYSTEMWIDE in" + eerror "/etc/conf.d/pulseaudio . Please remember that upstream does not support this mode" + eerror "when used for standard desktop configurations." + return 1 + fi + ebegin "Starting pulseaudio" + PA_ALL_OPTS="${PA_OPTS} --fail=1 --daemonize=1 --system" + start-stop-daemon --start --exec /usr/bin/pulseaudio -- ${PA_ALL_OPTS} + eend $? +} + +stop() { + ebegin "Stopping pulseaudio" + start-stop-daemon --stop --quiet --exec /usr/bin/pulseaudio --pidfile /var/run/pulse/pid + eend $? +} diff --git a/media-sound/pulseaudio/files/pulseaudio.service b/media-sound/pulseaudio/files/pulseaudio.service new file mode 100644 index 000000000000..c5f0d5799929 --- /dev/null +++ b/media-sound/pulseaudio/files/pulseaudio.service @@ -0,0 +1,10 @@ +[Unit] +Description=System wide PulseAudio instance +After=syslog.target network.target alsasound.service + +[Service] +Restart=always +ExecStart=/usr/bin/pulseaudio --system --log-target=syslog + +[Install] +WantedBy=multi-user.target diff --git a/media-sound/pulseaudio/files/pulseaudio.tmpfiles b/media-sound/pulseaudio/files/pulseaudio.tmpfiles new file mode 100644 index 000000000000..88374e35574b --- /dev/null +++ b/media-sound/pulseaudio/files/pulseaudio.tmpfiles @@ -0,0 +1 @@ +d /var/run/pulse 0755 pulse audio - diff --git a/media-sound/pulseaudio/files/svolume-fix_param_loading_undefined_beh.patch b/media-sound/pulseaudio/files/svolume-fix_param_loading_undefined_beh.patch new file mode 100644 index 000000000000..4e22f5e95d1c --- /dev/null +++ b/media-sound/pulseaudio/files/svolume-fix_param_loading_undefined_beh.patch @@ -0,0 +1,37 @@ +From: Wim Taymans +Date: Wed, 7 Jan 2015 11:20:01 +0100 +Subject: [PATCH] svolume.orc: avoid parameter loading undefined behaviour + +In some cases, depending on the instruction that performs the load, orc +ignores the size of the parameter when loading it for the first time. +Explicitly load the parameter into a temp to make sure it is loaded +correctly, like we do for the 2ch case. + +See https://bugzilla.gnome.org/show_bug.cgi?id=742271 +--- + src/pulsecore/svolume.orc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/pulsecore/svolume.orc b/src/pulsecore/svolume.orc +index 0edbefb..f869893 100644 +--- a/src/pulsecore/svolume.orc ++++ b/src/pulsecore/svolume.orc +@@ -45,13 +45,15 @@ + + .function pa_volume_s16ne_orc_1ch + .dest 2 samples int16_t +-.param 4 v int32_t ++.param 4 vols int32_t ++.temp 4 v + .temp 2 vh + .temp 4 s + .temp 4 mh + .temp 4 ml + .temp 4 signc + ++loadpl v, vols + convuwl s, samples + x2 cmpgtsw signc, 0, s + x2 andw signc, signc, v +-- +1.9.3 |