[SCM] beast/master.experimental: Improve debian/patches/400-format-security.patch, some more patches are needed.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master.experimental branch:
commit 02145c0f0b743bc3abbc1e03cb8e37f3c09df6eb
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Nov 6 01:03:08 2012 +0000

    Improve debian/patches/400-format-security.patch, some more patches are needed.

diff --git a/debian/patches/400-format-security.patch b/debian/patches/400-format-security.patch
index 58cd3f0..1eab04a 100644
--- a/debian/patches/400-format-security.patch
+++ b/debian/patches/400-format-security.patch
@@ -5,10 +5,15 @@ Last-Update: 2011-11-29
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=647040
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=665097
 ---
- bse/bsecxxvalue.cc  |    4 ++--
- bse/bsemain.cc      |    4 ++--
- sfi/sfidl-parser.cc |    2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
+ bse/bseconstant.cc   |    6 +++---
+ bse/bsecxxvalue.cc   |    4 ++--
+ bse/bsedatapocket.cc |    2 +-
+ bse/bseitem.cc       |    2 +-
+ bse/bsemain.cc       |    4 ++--
+ bse/bsestorage.c     |    2 +-
+ bse/bsetrack.c       |    2 +-
+ sfi/sfidl-parser.cc  |    2 +-
+ 8 files changed, 12 insertions(+), 12 deletions(-)
 
 --- beast.orig/sfi/sfidl-parser.cc
 +++ beast/sfi/sfidl-parser.cc
@@ -49,3 +54,76 @@ Bug: https://bugzilla.gnome.org/show_bug.cgi?id=665097
    else
      throw WrongTypeGValue (G_STRLOC);
  }
+--- beast.orig/bse/bseconstant.cc
++++ beast/bse/bseconstant.cc
+@@ -105,7 +105,7 @@ bse_constant_class_init (BseConstantClas
+       gchar *ident, *label, *blurb, *group = g_strdup_printf (_("Constant Output %u"), i);
+       
+       ident = g_strdup_printf ("value_%u", i);
+-      label = g_strdup_printf (_("Value [float]"));
++      label = g_strdup_printf ("%s", _("Value [float]"));
+       bse_object_class_add_param (object_class, group, PARAM_VALUE + (i - 1) * 3,
+ 				  sfi_pspec_real (ident, label, _("Constant signal value"),
+ 						  1.0, -1.0, 1.0, 0.01,
+@@ -113,7 +113,7 @@ bse_constant_class_init (BseConstantClas
+       g_free (ident);
+       g_free (label);
+       ident = g_strdup_printf ("frequency_%u", i);
+-      label = g_strdup_printf (_("Frequency"));
++      label = g_strdup_printf ("%s", _("Frequency"));
+       bse_object_class_add_param (object_class, group, PARAM_FREQ + (i - 1) * 3,
+ 				  sfi_pspec_log_scale (ident, label, _("Constant signal value interpreted as frequency value in Hertz"),
+ 						       BSE_MAX_FREQUENCY,
+@@ -124,7 +124,7 @@ bse_constant_class_init (BseConstantClas
+       g_free (ident);
+       g_free (label);
+       ident = g_strdup_printf ("note_%u", i);
+-      label = g_strdup_printf (_("Note"));
++      label = g_strdup_printf ("%s", _("Note"));
+       bse_object_class_add_param (object_class, group, PARAM_NOTE + (i - 1) * 3,
+ 				  sfi_pspec_note (ident, label, _("Constant signal value as note, converted to Hertz according to the current musical tuning"),
+ 						  SFI_KAMMER_NOTE, SFI_MIN_NOTE, SFI_MAX_NOTE,
+--- beast.orig/bse/bsedatapocket.cc
++++ beast/bse/bsedatapocket.cc
+@@ -552,7 +552,7 @@ object_entry_resolved (void           *d
+   BseDataPocket *pocket = BSE_DATA_POCKET (from_item);
+   
+   if (error)
+-    bse_storage_warn (storage, error);
++    bse_storage_warn (storage, "%s", error);
+   else if (oentry->id)
+     {
+       BseDataPocketValue value;
+--- beast.orig/bse/bsestorage.c
++++ beast/bse/bsestorage.c
+@@ -601,7 +601,7 @@ item_link_resolved (gpointer     data,
+                     const gchar *error)
+ {
+   if (error)
+-    bse_storage_warn (self, error);
++    bse_storage_warn (self, "%s", error);
+   else
+     {
+       GParamSpec *pspec = data;
+--- beast.orig/bse/bsetrack.c
++++ beast/bse/bsetrack.c
+@@ -939,7 +939,7 @@ part_link_resolved (gpointer        data
+   BseTrack *self = BSE_TRACK (from_item);
+ 
+   if (error)
+-    bse_storage_warn (storage, error);
++    bse_storage_warn (storage, "%s", error);
+   else if (!BSE_IS_PART (to_item))
+     bse_storage_warn (storage, "skipping invalid part reference: %s", bse_object_debug_name (to_item));
+   else if (to_item->parent != from_item->parent)
+--- beast.orig/bse/bseitem.cc
++++ beast/bse/bseitem.cc
+@@ -885,7 +885,7 @@ undo_call_proc (BseUndoStep  *ustep,
+     {
+       const char *packed_item_pointer = g_value_get_string (ivalues + 0);
+       BseItem *item = (BseItem*) bse_undo_pointer_unpack (packed_item_pointer, ustack);
+-      BseUndoStack *redo_stack = (BseUndoStack*) bse_item_undo_open (item, BSE_PROCEDURE_NAME (proc));
++      BseUndoStack *redo_stack = (BseUndoStack*) bse_item_undo_open (item, "%s", BSE_PROCEDURE_NAME (proc));
+       BseUndoStep *redo_step;
+       redo_step = bse_undo_step_new (undo_call_proc, unde_free_proc, 3);
+       redo_step->data[0].v_pointer = proc;

-- 
beast packaging