[pulseaudio] 07/12: Refresh patches anew
Luke Yelavich
themuso-guest at moszumanska.debian.org
Sun Nov 1 23:18:51 UTC 2015
This is an automated email from the git hooks/post-receive script.
themuso-guest pushed a commit to branch ubuntu
in repository pulseaudio.
commit 434b3aab5ef2bd5bf4f61d11df864a886ce952aa
Author: Luke Yelavich <themuso at ubuntu.com>
Date: Thu Sep 24 14:45:36 2015 +1000
Refresh patches anew
---
debian/patches/0207-Enable-pulseaudio-droid.patch | 4 +-
.../0408-protocol-native-add-access-checks.patch | 60 +++++++++++-----------
debian/patches/0409-Trust-store-patch.patch | 10 ++--
.../0417-increase-timeout-check-apparmor.patch | 2 +-
4 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/debian/patches/0207-Enable-pulseaudio-droid.patch b/debian/patches/0207-Enable-pulseaudio-droid.patch
index 867b25e..585b9a1 100644
--- a/debian/patches/0207-Enable-pulseaudio-droid.patch
+++ b/debian/patches/0207-Enable-pulseaudio-droid.patch
@@ -61,7 +61,7 @@ Index: pulseaudio/src/Makefile.am
dist_alsaprofilesets_DATA = \
modules/alsa/mixer/profile-sets/default.conf \
modules/alsa/mixer/profile-sets/force-speaker.conf \
-@@ -1537,6 +1547,13 @@ SYMDEF_FILES = \
+@@ -1538,6 +1548,13 @@ SYMDEF_FILES = \
module-filter-apply-symdef.h \
module-filter-heuristics-symdef.h
@@ -75,7 +75,7 @@ Index: pulseaudio/src/Makefile.am
if HAVE_ESOUND
SYMDEF_FILES += \
module-esound-protocol-tcp-symdef.h \
-@@ -1846,6 +1863,44 @@ libalsa_util_la_LIBADD += $(DBUS_LIBS)
+@@ -1847,6 +1864,44 @@ libalsa_util_la_LIBADD += $(DBUS_LIBS)
libalsa_util_la_CFLAGS += $(DBUS_CFLAGS)
endif
diff --git a/debian/patches/0408-protocol-native-add-access-checks.patch b/debian/patches/0408-protocol-native-add-access-checks.patch
index 131e456..04caade 100644
--- a/debian/patches/0408-protocol-native-add-access-checks.patch
+++ b/debian/patches/0408-protocol-native-add-access-checks.patch
@@ -82,7 +82,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
ret = pa_core_exit(c->protocol->core, false, 0);
CHECK_VALIDITY(c->pstream, ret >= 0, tag, PA_ERR_ACCESS);
-@@ -2936,6 +2959,7 @@ static void command_stat(pa_pdispatch *p
+@@ -2938,6 +2961,7 @@ static void command_stat(pa_pdispatch *p
}
CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS);
@@ -90,7 +90,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
stat = pa_mempool_get_stat(c->protocol->core->mempool);
-@@ -3062,6 +3086,8 @@ static void command_create_upload_stream
+@@ -3064,6 +3088,8 @@ static void command_create_upload_stream
CHECK_VALIDITY(c->pstream, (length % pa_frame_size(&ss)) == 0 && length > 0, tag, PA_ERR_INVALID);
CHECK_VALIDITY(c->pstream, length <= PA_SCACHE_ENTRY_SIZE_MAX, tag, PA_ERR_TOOLARGE);
@@ -99,7 +99,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
p = pa_proplist_new();
if ((c->version >= 13 && pa_tagstruct_get_proplist(t, p) < 0) ||
-@@ -3160,6 +3186,8 @@ static void command_play_sample(pa_pdisp
+@@ -3162,6 +3188,8 @@ static void command_play_sample(pa_pdisp
CHECK_VALIDITY(c->pstream, sink, tag, PA_ERR_NOENTITY);
@@ -108,7 +108,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
p = pa_proplist_new();
if ((c->version >= 13 && pa_tagstruct_get_proplist(t, p) < 0) ||
-@@ -3203,6 +3231,8 @@ static void command_remove_sample(pa_pdi
+@@ -3205,6 +3233,8 @@ static void command_remove_sample(pa_pdi
CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS);
CHECK_VALIDITY(c->pstream, name && pa_namereg_is_valid_name(name), tag, PA_ERR_INVALID);
@@ -117,7 +117,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
if (pa_scache_remove_item(c->protocol->core, name) < 0) {
pa_pstream_send_error(c->pstream, tag, PA_ERR_NOENTITY);
return;
-@@ -3651,6 +3681,8 @@ static void command_get_info(pa_pdispatc
+@@ -3653,6 +3683,8 @@ static void command_get_info(pa_pdispatc
return;
}
@@ -126,7 +126,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
reply = reply_new(tag);
if (sink)
sink_fill_tagstruct(c, reply, sink);
-@@ -3711,6 +3743,8 @@ static void command_get_info_list(pa_pdi
+@@ -3713,6 +3745,8 @@ static void command_get_info_list(pa_pdi
if (i) {
PA_IDXSET_FOREACH(p, i, idx) {
@@ -135,7 +135,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
if (command == PA_COMMAND_GET_SINK_INFO_LIST)
sink_fill_tagstruct(c, reply, p);
else if (command == PA_COMMAND_GET_SOURCE_INFO_LIST)
-@@ -3733,6 +3767,11 @@ static void command_get_info_list(pa_pdi
+@@ -3735,6 +3769,11 @@ static void command_get_info_list(pa_pdi
}
pa_pstream_send_tagstruct(c->pstream, reply);
@@ -147,7 +147,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
}
static void command_get_server_info(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
-@@ -3753,6 +3792,15 @@ static void command_get_server_info(pa_p
+@@ -3755,6 +3794,15 @@ static void command_get_server_info(pa_p
CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS);
@@ -163,7 +163,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
reply = reply_new(tag);
pa_tagstruct_puts(reply, PACKAGE_NAME);
pa_tagstruct_puts(reply, PACKAGE_VERSION);
-@@ -3768,9 +3816,7 @@ static void command_get_server_info(pa_p
+@@ -3770,9 +3818,7 @@ static void command_get_server_info(pa_p
fixup_sample_spec(c, &fixed_ss, &c->protocol->core->default_sample_spec);
pa_tagstruct_put_sample_spec(reply, &fixed_ss);
@@ -173,7 +173,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
pa_tagstruct_puts(reply, def_source ? def_source->name : NULL);
pa_tagstruct_putu32(reply, c->protocol->core->cookie);
-@@ -3889,6 +3935,8 @@ static void command_set_volume(
+@@ -3891,6 +3937,8 @@ static void command_set_volume(
client_name = pa_strnull(pa_proplist_gets(c->client->proplist, PA_PROP_APPLICATION_PROCESS_BINARY));
@@ -182,7 +182,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
if (sink) {
CHECK_VALIDITY(c->pstream, volume.channels == 1 || pa_cvolume_compatible(&volume, &sink->sample_spec), tag, PA_ERR_INVALID);
-@@ -3984,6 +4032,8 @@ static void command_set_mute(
+@@ -3986,6 +4034,8 @@ static void command_set_mute(
CHECK_VALIDITY(c->pstream, si || so || sink || source, tag, PA_ERR_NOENTITY);
@@ -191,7 +191,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
client_name = pa_strnull(pa_proplist_gets(c->client->proplist, PA_PROP_APPLICATION_PROCESS_BINARY));
if (sink) {
-@@ -4447,6 +4497,7 @@ static void command_set_default_sink_or_
+@@ -4449,6 +4499,7 @@ static void command_set_default_sink_or_
source = pa_namereg_get(c->protocol->core, s, PA_NAMEREG_SOURCE);
CHECK_VALIDITY(c->pstream, source, tag, PA_ERR_NOENTITY);
@@ -199,7 +199,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
pa_namereg_set_default_source(c->protocol->core, source);
} else {
-@@ -4455,6 +4506,7 @@ static void command_set_default_sink_or_
+@@ -4457,6 +4508,7 @@ static void command_set_default_sink_or_
sink = pa_namereg_get(c->protocol->core, s, PA_NAMEREG_SINK);
CHECK_VALIDITY(c->pstream, sink, tag, PA_ERR_NOENTITY);
@@ -207,7 +207,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
pa_namereg_set_default_sink(c->protocol->core, sink);
}
-@@ -4522,6 +4574,7 @@ static void command_kill(pa_pdispatch *p
+@@ -4524,6 +4576,7 @@ static void command_kill(pa_pdispatch *p
client = pa_idxset_get_by_index(c->protocol->core->clients, idx);
CHECK_VALIDITY(c->pstream, client, tag, PA_ERR_NOENTITY);
@@ -215,7 +215,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
pa_native_connection_ref(c);
pa_client_kill(client);
-@@ -4531,6 +4584,7 @@ static void command_kill(pa_pdispatch *p
+@@ -4533,6 +4586,7 @@ static void command_kill(pa_pdispatch *p
s = pa_idxset_get_by_index(c->protocol->core->sink_inputs, idx);
CHECK_VALIDITY(c->pstream, s, tag, PA_ERR_NOENTITY);
@@ -223,7 +223,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
pa_native_connection_ref(c);
pa_sink_input_kill(s);
-@@ -4541,6 +4595,7 @@ static void command_kill(pa_pdispatch *p
+@@ -4543,6 +4597,7 @@ static void command_kill(pa_pdispatch *p
s = pa_idxset_get_by_index(c->protocol->core->source_outputs, idx);
CHECK_VALIDITY(c->pstream, s, tag, PA_ERR_NOENTITY);
@@ -231,7 +231,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
pa_native_connection_ref(c);
pa_source_output_kill(s);
-@@ -4570,6 +4625,8 @@ static void command_load_module(pa_pdisp
+@@ -4572,6 +4627,8 @@ static void command_load_module(pa_pdisp
CHECK_VALIDITY(c->pstream, name && *name && pa_utf8_valid(name) && !strchr(name, '/'), tag, PA_ERR_INVALID);
CHECK_VALIDITY(c->pstream, !argument || pa_utf8_valid(argument), tag, PA_ERR_INVALID);
@@ -240,7 +240,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
if (!(m = pa_module_load(c->protocol->core, name, argument))) {
pa_pstream_send_error(c->pstream, tag, PA_ERR_MODINITFAILED);
return;
-@@ -4598,6 +4655,8 @@ static void command_unload_module(pa_pdi
+@@ -4600,6 +4657,8 @@ static void command_unload_module(pa_pdi
m = pa_idxset_get_by_index(c->protocol->core->modules, idx);
CHECK_VALIDITY(c->pstream, m, tag, PA_ERR_NOENTITY);
@@ -249,7 +249,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
pa_module_unload_request(m, false);
pa_pstream_send_simple_ack(c->pstream, tag);
}
-@@ -4636,6 +4695,7 @@ static void command_move_stream(pa_pdisp
+@@ -4638,6 +4697,7 @@ static void command_move_stream(pa_pdisp
sink = pa_namereg_get(c->protocol->core, name_device, PA_NAMEREG_SINK);
CHECK_VALIDITY(c->pstream, si && sink, tag, PA_ERR_NOENTITY);
@@ -257,7 +257,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
if (pa_sink_input_move_to(si, sink, true) < 0) {
pa_pstream_send_error(c->pstream, tag, PA_ERR_INVALID);
-@@ -4655,6 +4715,7 @@ static void command_move_stream(pa_pdisp
+@@ -4657,6 +4717,7 @@ static void command_move_stream(pa_pdisp
source = pa_namereg_get(c->protocol->core, name_device, PA_NAMEREG_SOURCE);
CHECK_VALIDITY(c->pstream, so && source, tag, PA_ERR_NOENTITY);
@@ -265,7 +265,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
if (pa_source_output_move_to(so, source, true) < 0) {
pa_pstream_send_error(c->pstream, tag, PA_ERR_INVALID);
-@@ -4690,6 +4751,8 @@ static void command_suspend(pa_pdispatch
+@@ -4692,6 +4753,8 @@ static void command_suspend(pa_pdispatch
if (idx == PA_INVALID_INDEX && name && !*name) {
@@ -274,7 +274,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
pa_log_debug("%s all sinks", b ? "Suspending" : "Resuming");
if (pa_sink_suspend_all(c->protocol->core, b, PA_SUSPEND_USER) < 0) {
-@@ -4706,6 +4769,8 @@ static void command_suspend(pa_pdispatch
+@@ -4708,6 +4771,8 @@ static void command_suspend(pa_pdispatch
CHECK_VALIDITY(c->pstream, sink, tag, PA_ERR_NOENTITY);
@@ -283,7 +283,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
pa_log_debug("%s of sink %s requested by client %" PRIu32 ".",
b ? "Suspending" : "Resuming", sink->name, c->client->index);
-@@ -4720,6 +4785,8 @@ static void command_suspend(pa_pdispatch
+@@ -4722,6 +4787,8 @@ static void command_suspend(pa_pdispatch
if (idx == PA_INVALID_INDEX && name && !*name) {
@@ -292,7 +292,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
pa_log_debug("%s all sources", b ? "Suspending" : "Resuming");
if (pa_source_suspend_all(c->protocol->core, b, PA_SUSPEND_USER) < 0) {
-@@ -4737,6 +4804,8 @@ static void command_suspend(pa_pdispatch
+@@ -4739,6 +4806,8 @@ static void command_suspend(pa_pdispatch
CHECK_VALIDITY(c->pstream, source, tag, PA_ERR_NOENTITY);
@@ -301,7 +301,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
pa_log_debug("%s of source %s requested by client %" PRIu32 ".",
b ? "Suspending" : "Resuming", source->name, c->client->index);
-@@ -4780,6 +4849,8 @@ static void command_extension(pa_pdispat
+@@ -4782,6 +4851,8 @@ static void command_extension(pa_pdispat
CHECK_VALIDITY(c->pstream, m, tag, PA_ERR_NOEXTENSION);
CHECK_VALIDITY(c->pstream, m->load_once || idx != PA_INVALID_INDEX, tag, PA_ERR_INVALID);
@@ -310,7 +310,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
cb = (pa_native_protocol_ext_cb_t) (unsigned long) pa_hashmap_get(c->protocol->extensions, m);
CHECK_VALIDITY(c->pstream, cb, tag, PA_ERR_NOEXTENSION);
-@@ -4822,6 +4893,8 @@ static void command_set_card_profile(pa_
+@@ -4824,6 +4895,8 @@ static void command_set_card_profile(pa_
CHECK_VALIDITY(c->pstream, profile, tag, PA_ERR_NOENTITY);
@@ -319,7 +319,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
if ((ret = pa_card_set_profile(card, profile, true)) < 0) {
pa_pstream_send_error(c->pstream, tag, -ret);
return;
-@@ -4862,6 +4935,8 @@ static void command_set_sink_or_source_p
+@@ -4864,6 +4937,8 @@ static void command_set_sink_or_source_p
CHECK_VALIDITY(c->pstream, sink, tag, PA_ERR_NOENTITY);
@@ -328,7 +328,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
if ((ret = pa_sink_set_port(sink, port, true)) < 0) {
pa_pstream_send_error(c->pstream, tag, -ret);
return;
-@@ -4878,6 +4953,8 @@ static void command_set_sink_or_source_p
+@@ -4880,6 +4955,8 @@ static void command_set_sink_or_source_p
CHECK_VALIDITY(c->pstream, source, tag, PA_ERR_NOENTITY);
@@ -337,7 +337,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
if ((ret = pa_source_set_port(source, port, true)) < 0) {
pa_pstream_send_error(c->pstream, tag, -ret);
return;
-@@ -4922,6 +4999,8 @@ static void command_set_port_latency_off
+@@ -4924,6 +5001,8 @@ static void command_set_port_latency_off
port = pa_hashmap_get(card->ports, port_name);
CHECK_VALIDITY(c->pstream, port, tag, PA_ERR_NOENTITY);
@@ -346,7 +346,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
pa_device_port_set_latency_offset(port, offset);
pa_pstream_send_simple_ack(c->pstream, tag);
-@@ -5462,3 +5541,136 @@ pa_client* pa_native_connection_get_clie
+@@ -5464,3 +5543,136 @@ pa_client* pa_native_connection_get_clie
return c->client;
}
diff --git a/debian/patches/0409-Trust-store-patch.patch b/debian/patches/0409-Trust-store-patch.patch
index fb93e74..273e036 100644
--- a/debian/patches/0409-Trust-store-patch.patch
+++ b/debian/patches/0409-Trust-store-patch.patch
@@ -91,7 +91,7 @@ Index: pulseaudio/src/Makefile.am
if HAVE_ESOUND
modlibexec_LTLIBRARIES += \
module-esound-protocol-tcp.la \
-@@ -1521,6 +1530,7 @@ SYMDEF_FILES = \
+@@ -1522,6 +1531,7 @@ SYMDEF_FILES = \
module-intended-roles-symdef.h \
module-suspend-on-idle-symdef.h \
module-echo-cancel-symdef.h \
@@ -99,7 +99,7 @@ Index: pulseaudio/src/Makefile.am
module-hal-detect-symdef.h \
module-udev-detect-symdef.h \
module-systemd-login-symdef.h \
-@@ -2113,6 +2123,20 @@ module_echo_cancel_la_CFLAGS += -DHAVE_W
+@@ -2114,6 +2124,20 @@ module_echo_cancel_la_CFLAGS += -DHAVE_W
module_echo_cancel_la_LIBADD += libwebrtc-util.la
endif
@@ -557,7 +557,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
===================================================================
--- pulseaudio.orig/src/pulsecore/protocol-native.c
+++ pulseaudio/src/pulsecore/protocol-native.c
-@@ -2812,6 +2812,13 @@ static void command_auth(pa_pdispatch *p
+@@ -2814,6 +2814,13 @@ static void command_auth(pa_pdispatch *p
do_shm = false;
#ifdef HAVE_CREDS
@@ -571,7 +571,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
if (do_shm) {
/* Only enable SHM if both sides are owned by the same
* user. This is a security measure because otherwise data
-@@ -5621,6 +5628,7 @@ typedef struct pa_protocol_native_access
+@@ -5623,6 +5630,7 @@ typedef struct pa_protocol_native_access
} pa_protocol_native_access_data;
static void check_access_finish_cb(pa_access_data *data, bool res) {
@@ -579,7 +579,7 @@ Index: pulseaudio/src/pulsecore/protocol-native.c
pa_protocol_native_access_data *d = (pa_protocol_native_access_data *) data;
pa_native_connection *c = PA_NATIVE_CONNECTION(d->userdata);
-@@ -5629,6 +5637,11 @@ static void check_access_finish_cb(pa_ac
+@@ -5631,6 +5639,11 @@ static void check_access_finish_cb(pa_ac
goto finish;
}
diff --git a/debian/patches/0417-increase-timeout-check-apparmor.patch b/debian/patches/0417-increase-timeout-check-apparmor.patch
index 59ca09e..ccc53e1 100644
--- a/debian/patches/0417-increase-timeout-check-apparmor.patch
+++ b/debian/patches/0417-increase-timeout-check-apparmor.patch
@@ -85,7 +85,7 @@ Index: pulseaudio/src/Makefile.am
===================================================================
--- pulseaudio.orig/src/Makefile.am
+++ pulseaudio/src/Makefile.am
-@@ -2132,7 +2132,7 @@ libtruststore_util_la_LIBADD = libpulsec
+@@ -2133,7 +2133,7 @@ libtruststore_util_la_LIBADD = libpulsec
libtruststore_util_la_LDFLAGS = -avoid-version
module_trust_store_la_SOURCES = modules/trust-store/module-trust-store.c
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git
More information about the pkg-pulseaudio-devel
mailing list