This is an automated email from the git hooks/post-receive script. diwic-guest pushed a commit to branch ubuntu in repository pulseaudio.
commit d51f9f38c09b73f10e8625e53db738a519df0806 Author: David Henningsson <[email protected]> Date: Mon Nov 30 16:45:13 2015 +0100 trust-store: Update translation string --- debian/changelog | 6 ++ debian/patches/0409-Trust-store-patch.patch | 95 +++++++++++----------- .../0417-increase-timeout-check-apparmor.patch | 28 ++++--- 3 files changed, 72 insertions(+), 57 deletions(-) diff --git a/debian/changelog b/debian/changelog index efc4c4a..83f6f19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pulseaudio (1:7.1-1ubuntu3) UNRELEASED; urgency=medium + + * trust-store: Update translation string + + -- David Henningsson <[email protected]> Mon, 30 Nov 2015 16:43:53 +0100 + pulseaudio (1:7.1-1ubuntu2) xenial; urgency=medium * debian/patches/050*.patch: diff --git a/debian/patches/0409-Trust-store-patch.patch b/debian/patches/0409-Trust-store-patch.patch index 273e036..539891d 100644 --- a/debian/patches/0409-Trust-store-patch.patch +++ b/debian/patches/0409-Trust-store-patch.patch @@ -26,9 +26,9 @@ Signed-off-by: David Henningsson <[email protected]> Index: pulseaudio/configure.ac =================================================================== ---- pulseaudio.orig/configure.ac -+++ pulseaudio/configure.ac -@@ -1399,6 +1399,19 @@ AS_IF([test "x$enable_adrian_aec" != "xn +--- pulseaudio.orig/configure.ac 2015-11-30 16:38:21.788316586 +0100 ++++ pulseaudio/configure.ac 2015-11-30 16:38:21.776316368 +0100 +@@ -1399,6 +1399,19 @@ [HAVE_ADRIAN_EC=1]) AM_CONDITIONAL([HAVE_ADRIAN_EC], [test "x$HAVE_ADRIAN_EC" = "x1"]) @@ -48,7 +48,7 @@ Index: pulseaudio/configure.ac ################################### -@@ -1568,6 +1581,7 @@ AS_IF([test "x$HAVE_ADRIAN_EC" = "x1"], +@@ -1568,6 +1581,7 @@ AS_IF([test "x$HAVE_SPEEX" = "x1"], ENABLE_SPEEX=yes, ENABLE_SPEEX=no) AS_IF([test "x$HAVE_SOXR" = "x1"], ENABLE_SOXR=yes, ENABLE_SOXR=no) AS_IF([test "x$HAVE_WEBRTC" = "x1"], ENABLE_WEBRTC=yes, ENABLE_WEBRTC=no) @@ -56,7 +56,7 @@ Index: pulseaudio/configure.ac AS_IF([test "x$HAVE_TDB" = "x1"], ENABLE_TDB=yes, ENABLE_TDB=no) AS_IF([test "x$HAVE_GDBM" = "x1"], ENABLE_GDBM=yes, ENABLE_GDBM=no) AS_IF([test "x$HAVE_SIMPLEDB" = "x1"], ENABLE_SIMPLEDB=yes, ENABLE_SIMPLEDB=no) -@@ -1632,6 +1646,7 @@ echo " +@@ -1632,6 +1646,7 @@ Enable speex (resampler, AEC): ${ENABLE_SPEEX} Enable soxr (resampler): ${ENABLE_SOXR} Enable WebRTC echo canceller: ${ENABLE_WEBRTC} @@ -66,9 +66,9 @@ Index: pulseaudio/configure.ac Database Index: pulseaudio/src/Makefile.am =================================================================== ---- pulseaudio.orig/src/Makefile.am -+++ pulseaudio/src/Makefile.am -@@ -1072,6 +1072,10 @@ if HAVE_WEBRTC +--- pulseaudio.orig/src/Makefile.am 2015-11-30 16:38:21.788316586 +0100 ++++ pulseaudio/src/Makefile.am 2015-11-30 16:38:44.000000000 +0100 +@@ -1072,6 +1072,10 @@ modlibexec_LTLIBRARIES += libwebrtc-util.la endif @@ -79,7 +79,7 @@ Index: pulseaudio/src/Makefile.am if HAVE_ESOUND modlibexec_LTLIBRARIES += \ libprotocol-esound.la -@@ -1196,6 +1200,11 @@ modlibexec_LTLIBRARIES += \ +@@ -1196,6 +1200,11 @@ module-filter-heuristics.la \ module-role-ducking.la @@ -91,7 +91,7 @@ Index: pulseaudio/src/Makefile.am if HAVE_ESOUND modlibexec_LTLIBRARIES += \ module-esound-protocol-tcp.la \ -@@ -1522,6 +1531,7 @@ SYMDEF_FILES = \ +@@ -1522,6 +1531,7 @@ 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 \ -@@ -2114,6 +2124,20 @@ module_echo_cancel_la_CFLAGS += -DHAVE_W +@@ -2114,6 +2124,20 @@ module_echo_cancel_la_LIBADD += libwebrtc-util.la endif @@ -122,9 +122,9 @@ Index: pulseaudio/src/Makefile.am module_rtp_send_la_LDFLAGS = $(MODULE_LDFLAGS) Index: pulseaudio/src/modules/trust-store/module-trust-store.c =================================================================== ---- /dev/null -+++ pulseaudio/src/modules/trust-store/module-trust-store.c -@@ -0,0 +1,225 @@ +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ pulseaudio/src/modules/trust-store/module-trust-store.c 2015-11-30 16:41:04.603244932 +0100 +@@ -0,0 +1,228 @@ +/*** + This file is part of PulseAudio. + @@ -230,7 +230,10 @@ Index: pulseaudio/src/modules/trust-store/module-trust-store.c + struct per_client *pc = data; + + bool result = pa_trust_store_check(pc->userdata->ts, pc->appname, pc->uid, pc->pid, -+ _("%1% wants to record audio.")); ++ /// TRANSLATORS: The app icon and name appears above this string. If the phrase ++ /// can't be translated in this language, translate the whole sentence ++ /// 'This app wants to record audio.' ++ _("wants to record audio.")); + + pa_atomic_store(&pc->result, result ? REQUEST_GRANTED : REQUEST_DENIED); + pa_fdsem_post(pc->userdata->fdsem); @@ -352,8 +355,8 @@ Index: pulseaudio/src/modules/trust-store/module-trust-store.c +} Index: pulseaudio/src/modules/trust-store/truststore.cc =================================================================== ---- /dev/null -+++ pulseaudio/src/modules/trust-store/truststore.cc +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ pulseaudio/src/modules/trust-store/truststore.cc 2015-11-30 16:38:47.000000000 +0100 @@ -0,0 +1,74 @@ +#ifdef HAVE_CONFIG_H +#include <config.h> @@ -431,8 +434,8 @@ Index: pulseaudio/src/modules/trust-store/truststore.cc +} Index: pulseaudio/src/modules/trust-store/truststore.h =================================================================== ---- /dev/null -+++ pulseaudio/src/modules/trust-store/truststore.h +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ pulseaudio/src/modules/trust-store/truststore.h 2015-11-30 16:38:21.780316440 +0100 @@ -0,0 +1,41 @@ +/*** + This file is part of PulseAudio. @@ -477,9 +480,9 @@ Index: pulseaudio/src/modules/trust-store/truststore.h +#endif Index: pulseaudio/src/pulsecore/client.c =================================================================== ---- pulseaudio.orig/src/pulsecore/client.c -+++ pulseaudio/src/pulsecore/client.c -@@ -60,7 +60,7 @@ pa_client *pa_client_new(pa_core *core, +--- pulseaudio.orig/src/pulsecore/client.c 2015-11-30 16:38:21.788316586 +0100 ++++ pulseaudio/src/pulsecore/client.c 2015-11-30 16:38:21.780316440 +0100 +@@ -60,7 +60,7 @@ if (pa_hook_fire(&core->hooks[PA_CORE_HOOK_CLIENT_NEW], data) < 0) return NULL; @@ -488,7 +491,7 @@ Index: pulseaudio/src/pulsecore/client.c c->core = core; c->proplist = pa_proplist_copy(data->proplist); c->driver = pa_xstrdup(pa_path_get_filename(data->driver)); -@@ -69,10 +69,6 @@ pa_client *pa_client_new(pa_core *core, +@@ -69,10 +69,6 @@ c->sink_inputs = pa_idxset_new(NULL, NULL); c->source_outputs = pa_idxset_new(NULL, NULL); @@ -501,9 +504,9 @@ Index: pulseaudio/src/pulsecore/client.c pa_log_info("Created %u \"%s\"", c->index, pa_strnull(pa_proplist_gets(c->proplist, PA_PROP_APPLICATION_NAME))); Index: pulseaudio/src/pulsecore/client.h =================================================================== ---- pulseaudio.orig/src/pulsecore/client.h -+++ pulseaudio/src/pulsecore/client.h -@@ -27,6 +27,7 @@ typedef struct pa_client pa_client; +--- pulseaudio.orig/src/pulsecore/client.h 2015-11-30 16:38:21.788316586 +0100 ++++ pulseaudio/src/pulsecore/client.h 2015-11-30 16:38:21.780316440 +0100 +@@ -27,6 +27,7 @@ #include <pulse/proplist.h> #include <pulsecore/core.h> #include <pulsecore/module.h> @@ -511,7 +514,7 @@ Index: pulseaudio/src/pulsecore/client.h /* Every connection to the server should have a pa_client * attached. That way the user may generate a listing of all connected -@@ -36,6 +37,9 @@ struct pa_client { +@@ -36,6 +37,9 @@ uint32_t index; pa_core *core; @@ -523,9 +526,9 @@ Index: pulseaudio/src/pulsecore/client.h char *driver; Index: pulseaudio/src/pulsecore/creds.h =================================================================== ---- pulseaudio.orig/src/pulsecore/creds.h -+++ pulseaudio/src/pulsecore/creds.h -@@ -41,6 +41,7 @@ typedef struct pa_cmsg_ancil_data pa_cms +--- pulseaudio.orig/src/pulsecore/creds.h 2015-11-30 16:38:21.788316586 +0100 ++++ pulseaudio/src/pulsecore/creds.h 2015-11-30 16:38:21.780316440 +0100 +@@ -41,6 +41,7 @@ struct pa_creds { gid_t gid; uid_t uid; @@ -535,9 +538,9 @@ Index: pulseaudio/src/pulsecore/creds.h /* Struct for handling ancillary data, i e, extra data that can be sent together with a message Index: pulseaudio/src/pulsecore/iochannel.c =================================================================== ---- pulseaudio.orig/src/pulsecore/iochannel.c -+++ pulseaudio/src/pulsecore/iochannel.c -@@ -323,6 +323,7 @@ ssize_t pa_iochannel_write_with_creds(pa +--- pulseaudio.orig/src/pulsecore/iochannel.c 2015-11-30 16:38:21.788316586 +0100 ++++ pulseaudio/src/pulsecore/iochannel.c 2015-11-30 16:38:21.780316440 +0100 +@@ -323,6 +323,7 @@ u = (struct ucred*) CMSG_DATA(&cmsg.hdr); @@ -545,7 +548,7 @@ Index: pulseaudio/src/pulsecore/iochannel.c u->pid = getpid(); if (ucred) { u->uid = ucred->uid; -@@ -437,6 +438,7 @@ ssize_t pa_iochannel_read_with_ancil_dat +@@ -437,6 +438,7 @@ ancil_data->creds.gid = u.gid; ancil_data->creds.uid = u.uid; @@ -555,9 +558,9 @@ Index: pulseaudio/src/pulsecore/iochannel.c else if (cmh->cmsg_type == SCM_RIGHTS) { Index: pulseaudio/src/pulsecore/protocol-native.c =================================================================== ---- pulseaudio.orig/src/pulsecore/protocol-native.c -+++ pulseaudio/src/pulsecore/protocol-native.c -@@ -2814,6 +2814,13 @@ static void command_auth(pa_pdispatch *p +--- pulseaudio.orig/src/pulsecore/protocol-native.c 2015-11-30 16:38:21.788316586 +0100 ++++ pulseaudio/src/pulsecore/protocol-native.c 2015-11-30 16:38:21.784316513 +0100 +@@ -2814,6 +2814,13 @@ do_shm = false; #ifdef HAVE_CREDS @@ -571,7 +574,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 -@@ -5623,6 +5630,7 @@ typedef struct pa_protocol_native_access +@@ -5623,6 +5630,7 @@ } pa_protocol_native_access_data; static void check_access_finish_cb(pa_access_data *data, bool res) { @@ -579,7 +582,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); -@@ -5631,6 +5639,11 @@ static void check_access_finish_cb(pa_ac +@@ -5631,6 +5639,11 @@ goto finish; } @@ -593,9 +596,9 @@ Index: pulseaudio/src/pulsecore/protocol-native.c command_table[d->command](d->pd, d->command, d->tag, d->tc, d->userdata); Index: pulseaudio/src/tests/connect-stress.c =================================================================== ---- pulseaudio.orig/src/tests/connect-stress.c -+++ pulseaudio/src/tests/connect-stress.c -@@ -63,7 +63,7 @@ static const pa_sample_spec sample_spec +--- pulseaudio.orig/src/tests/connect-stress.c 2015-11-30 16:38:21.788316586 +0100 ++++ pulseaudio/src/tests/connect-stress.c 2015-11-30 16:38:21.784316513 +0100 +@@ -63,7 +63,7 @@ static void context_state_callback(pa_context *c, void *userdata); @@ -604,7 +607,7 @@ Index: pulseaudio/src/tests/connect-stress.c int ret; pa_mainloop_api *api; -@@ -201,7 +201,7 @@ START_TEST (connect_stress_test) { +@@ -201,7 +201,7 @@ streams[i] = NULL; for (i = 0; i < NTESTS; i++) { @@ -615,9 +618,9 @@ Index: pulseaudio/src/tests/connect-stress.c usleep(rand() % 500000); Index: pulseaudio/po/POTFILES.in =================================================================== ---- pulseaudio.orig/po/POTFILES.in -+++ pulseaudio/po/POTFILES.in -@@ -23,6 +23,7 @@ src/modules/gconf/module-gconf.c +--- pulseaudio.orig/po/POTFILES.in 2015-11-30 16:38:21.788316586 +0100 ++++ pulseaudio/po/POTFILES.in 2015-11-30 16:38:21.784316513 +0100 +@@ -23,6 +23,7 @@ src/modules/jack/module-jack-sink.c src/modules/jack/module-jack-source.c src/modules/macosx/module-coreaudio-device.c diff --git a/debian/patches/0417-increase-timeout-check-apparmor.patch b/debian/patches/0417-increase-timeout-check-apparmor.patch index ccc53e1..f99a476 100644 --- a/debian/patches/0417-increase-timeout-check-apparmor.patch +++ b/debian/patches/0417-increase-timeout-check-apparmor.patch @@ -1,7 +1,7 @@ Index: pulseaudio/src/modules/trust-store/module-trust-store.c =================================================================== ---- pulseaudio.orig/src/modules/trust-store/module-trust-store.c -+++ pulseaudio/src/modules/trust-store/module-trust-store.c +--- pulseaudio.orig/src/modules/trust-store/module-trust-store.c 2015-11-30 16:41:22.583564451 +0100 ++++ pulseaudio/src/modules/trust-store/module-trust-store.c 2015-11-30 16:43:09.701454805 +0100 @@ -31,6 +31,8 @@ #include <pulsecore/dynarray.h> #include <pulse/mainloop-api.h> @@ -11,7 +11,7 @@ Index: pulseaudio/src/modules/trust-store/module-trust-store.c #include "module-trust-store-symdef.h" PA_MODULE_AUTHOR("David Henningsson"); -@@ -77,9 +79,37 @@ static struct per_client *per_client_new +@@ -77,9 +79,37 @@ } pc = pa_xnew0(struct per_client, 1); @@ -52,28 +52,34 @@ Index: pulseaudio/src/modules/trust-store/module-trust-store.c pc->index = client_index; pc->uid = client->creds.uid; pc->pid = client->creds.pid; -@@ -103,10 +133,25 @@ static void per_client_free_from_hashmap +@@ -103,13 +133,28 @@ static void thread_func(void *data) { struct per_client *pc = data; - bool result = pa_trust_store_check(pc->userdata->ts, pc->appname, pc->uid, pc->pid, -- _("%1% wants to record audio.")); +- /// TRANSLATORS: The app icon and name appears above this string. If the phrase +- /// can't be translated in this language, translate the whole sentence +- /// 'This app wants to record audio.' +- _("wants to record audio.")); + // there are 3 possible values for the app name that we will consider at this point + // * empty string: there was an error when retrieving the value and therefore we will + // automatically deny access -+ // * uncofined: the app is unconfined and therefore we will automatically grant access ++ // * unconfined: the app is unconfined and therefore we will automatically grant access + // * appname: we need the user to decide what to do. + + if (pc->appname == NULL) { + pa_log_info("Client apparmor could not retrieved."); + pa_atomic_store(&pc->result, REQUEST_DENIED); + } else if (pa_streq(pc->appname, "unconfined")) { -+ pa_log_info("Conected client is unconfined."); ++ pa_log_info("Connected client is unconfined."); + pa_atomic_store(&pc->result, REQUEST_GRANTED); + } else { + pa_log_info("User needs to authorize the application.."); + bool result = pa_trust_store_check(pc->userdata->ts, pc->appname, pc->uid, pc->pid, -+ _("%1% wants to record audio.")); ++ /// TRANSLATORS: The app icon and name appears above this string. If the phrase ++ /// can't be translated in this language, translate the whole sentence ++ /// 'This app wants to record audio.' ++ _("wants to record audio.")); + pa_atomic_store(&pc->result, result ? REQUEST_GRANTED : REQUEST_DENIED); + } @@ -83,9 +89,9 @@ Index: pulseaudio/src/modules/trust-store/module-trust-store.c Index: pulseaudio/src/Makefile.am =================================================================== ---- pulseaudio.orig/src/Makefile.am -+++ pulseaudio/src/Makefile.am -@@ -2133,7 +2133,7 @@ libtruststore_util_la_LIBADD = libpulsec +--- pulseaudio.orig/src/Makefile.am 2015-11-30 16:41:22.583564451 +0100 ++++ pulseaudio/src/Makefile.am 2015-11-30 16:41:22.579564380 +0100 +@@ -2133,7 +2133,7 @@ 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 _______________________________________________ pkg-pulseaudio-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-pulseaudio-devel
