[SCM] beast/master.experimental: Fix bse/bsejanitor.cc too.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Tue Nov 6 09:22:22 UTC 2012
The following commit has been merged in the master.experimental branch:
commit 280b12ad0300eaf560f0f3f283f521c269ebb70c
Author: Alessio Treglia <alessio at debian.org>
Date: Tue Nov 6 09:21:49 2012 +0000
Fix bse/bsejanitor.cc too.
diff --git a/debian/patches/400-format-security.patch b/debian/patches/400-format-security.patch
index 1eab04a..02ebac6 100644
--- a/debian/patches/400-format-security.patch
+++ b/debian/patches/400-format-security.patch
@@ -9,11 +9,12 @@ Bug: https://bugzilla.gnome.org/show_bug.cgi?id=665097
bse/bsecxxvalue.cc | 4 ++--
bse/bsedatapocket.cc | 2 +-
bse/bseitem.cc | 2 +-
+ bse/bsejanitor.cc | 6 +++---
bse/bsemain.cc | 4 ++--
bse/bsestorage.c | 2 +-
bse/bsetrack.c | 2 +-
sfi/sfidl-parser.cc | 2 +-
- 8 files changed, 12 insertions(+), 12 deletions(-)
+ 9 files changed, 15 insertions(+), 15 deletions(-)
--- beast.orig/sfi/sfidl-parser.cc
+++ beast/sfi/sfidl-parser.cc
@@ -127,3 +128,26 @@ Bug: https://bugzilla.gnome.org/show_bug.cgi?id=665097
BseUndoStep *redo_step;
redo_step = bse_undo_step_new (undo_call_proc, unde_free_proc, 3);
redo_step->data[0].v_pointer = proc;
+--- beast.orig/bse/bsejanitor.cc
++++ beast/bse/bsejanitor.cc
+@@ -532,9 +532,9 @@ janitor_idle_clean_jsource (void *data)
+ {
+ self->exit_code = 256; /* exit code used for signals */
+ if (port->exit_signal_sent && port->sigkill_sent)
+- self->exit_reason = g_strdup_printf (_("killed by janitor"));
++ self->exit_reason = g_strdup_printf ("%s", _("killed by janitor"));
+ else if (port->exit_signal_sent && port->sigterm_sent)
+- self->exit_reason = g_strdup_printf (_("connection terminated"));
++ self->exit_reason = g_strdup_printf ("%s", _("connection terminated"));
+ else if (port->exit_signal && port->dumped_core)
+ self->exit_reason = g_strdup_printf (_("%s (core dumped)"), g_strsignal (port->exit_signal));
+ else if (port->exit_signal)
+@@ -560,7 +560,7 @@ janitor_idle_clean_jsource (void *data)
+ {
+ /* not a janitor for a remote process */
+ self->exit_code = -256;
+- self->exit_reason = g_strdup_printf ("unknown intern termination");
++ self->exit_reason = g_strdup_printf ("%s", "unknown intern termination");
+ }
+ sfi_com_port_unref (port);
+ self->port = NULL;
--
beast packaging
More information about the pkg-multimedia-commits
mailing list