[SCM] beast/master: Add patch to prevent FTBFS with GCC's hardening flags enabled (Closes: #647040).

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Tue Nov 29 01:56:49 UTC 2011


The following commit has been merged in the master branch:
commit b16a8bc826f4af330d276ac467a5df8ee2e5ea74
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Nov 29 02:56:06 2011 +0100

    Add patch to prevent FTBFS with GCC's hardening flags enabled (Closes: #647040).

diff --git a/debian/patches/400-format-security.patch b/debian/patches/400-format-security.patch
new file mode 100644
index 0000000..195b281
--- /dev/null
+++ b/debian/patches/400-format-security.patch
@@ -0,0 +1,34 @@
+Description: fix warnings generated with -Wformat-security
+Author: Ilya Barygin <randomaction at ubuntu.com>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=647040
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=665097
+---
+ bse/bsemain.cc      |    4 ++--
+ sfi/sfidl-parser.cc |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- beast.orig/sfi/sfidl-parser.cc
++++ beast/sfi/sfidl-parser.cc
+@@ -238,7 +238,7 @@ Type Parser::typeOf (const String& type)
+   if (isSequence (type))      return SEQUENCE;
+   if (isRecord (type))	      return RECORD;
+   if (isClass (type))	      return OBJECT;
+-  g_error (("invalid type: " + type).c_str());
++  g_error ("%s", ("invalid type: " + type).c_str());
+   return VOID;
+ }
+ 
+--- beast.orig/bse/bsemain.cc
++++ beast/bse/bsemain.cc
+@@ -267,9 +267,9 @@ bse_init_core (void)
+   /* dump device list */
+   if (bse_main_args->dump_driver_list)
+     {
+-      g_printerr (_("\nAvailable PCM drivers:\n"));
++      g_printerr ("%s", _("\nAvailable PCM drivers:\n"));
+       bse_device_dump_list (BSE_TYPE_PCM_DEVICE, "  ", TRUE, NULL, NULL);
+-      g_printerr (_("\nAvailable MIDI drivers:\n"));
++      g_printerr ("%s", _("\nAvailable MIDI drivers:\n"));
+       bse_device_dump_list (BSE_TYPE_MIDI_DEVICE, "  ", TRUE, NULL, NULL);
+     }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index f13ef38..66d6663 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 203_gcc45.patch
 210_volatile.diff
 300-desktop_file.patch
+400-format-security.patch

-- 
beast packaging



More information about the pkg-multimedia-commits mailing list