[SCM] beast/master.experimental: Fix 400-format-security.patch.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Fri Feb 1 16:46:54 UTC 2013
The following commit has been merged in the master.experimental branch:
commit 3cb9408fffaf4d014e5cc1d3bdfa2122a26ed4b6
Author: Alessio Treglia <alessio at debian.org>
Date: Fri Feb 1 16:45:15 2013 +0000
Fix 400-format-security.patch.
diff --git a/debian/patches/400-format-security.patch b/debian/patches/400-format-security.patch
index 86dfd15..3b5ae33 100644
--- a/debian/patches/400-format-security.patch
+++ b/debian/patches/400-format-security.patch
@@ -13,8 +13,10 @@ Forwarded: Tim Janik <tim.janik at googlemail.com>
bse/bseitem.cc | 2 +-
bse/bsejanitor.cc | 6 +++---
bse/bsemain.cc | 4 ++--
+ bse/bseserver.cc | 38 +++++++++++++++++++-------------------
+ configure.in | 4 +++-
sfi/sfidl-parser.cc | 2 +-
- 6 files changed, 12 insertions(+), 12 deletions(-)
+ 8 files changed, 34 insertions(+), 32 deletions(-)
--- beast.orig/sfi/sfidl-parser.cc
+++ beast/sfi/sfidl-parser.cc
@@ -118,3 +120,94 @@ Forwarded: Tim Janik <tim.janik at googlemail.com>
}
sfi_com_port_unref (port);
self->port = NULL;
+--- beast.orig/bse/bseserver.cc
++++ beast/bse/bseserver.cc
+@@ -395,9 +395,9 @@ bse_server_require_pcm_input (BseServer
+ server->pcm_input_checked = TRUE;
+ if (!BSE_DEVICE_READABLE (server->pcm_device))
+ sfi_msg_display (SFI_MSG_WARNING,
+- SFI_MSG_TITLE (_("Recording Audio Input")),
+- SFI_MSG_TEXT1 (_("Failed to start recording from audio device.")),
+- SFI_MSG_TEXT2 (_("An audio project is in use which processes an audio input signal, but the audio device "
++ SFI_MSG_TITLE ("%s", _("Recording Audio Input")),
++ SFI_MSG_TEXT1 ("%s", _("Failed to start recording from audio device.")),
++ SFI_MSG_TEXT2 ("%s", _("An audio project is in use which processes an audio input signal, but the audio device "
+ "has not been opened in recording mode. "
+ "An audio signal of silence will be used instead of a recorded signal, "
+ "so playback operation may produce results not actually intended "
+@@ -406,7 +406,7 @@ bse_server_require_pcm_input (BseServer
+ BSE_DEVICE (server->pcm_device)->open_device_name,
+ BSE_DEVICE_GET_CLASS (server->pcm_device)->driver_name,
+ BSE_DEVICE (server->pcm_device)->open_device_args),
+- SFI_MSG_CHECK (_("Show messages about audio input problems")));
++ SFI_MSG_CHECK ("%s", _("Show messages about audio input problems")));
+ }
+ }
+ typedef struct {
+@@ -444,12 +444,12 @@ server_open_pcm_device (BseServer *serve
+ pcm_request_callback, &pr, error ? NULL : &error);
+ if (!server->pcm_device)
+ sfi_msg_display (SFI_MSG_ERROR,
+- SFI_MSG_TITLE (_("No Audio")),
+- SFI_MSG_TEXT1 (_("No available audio device was found.")),
+- SFI_MSG_TEXT2 (_("No available audio device could be found and opened successfully. "
+- "Sorry, no fallback selection can be made for audio devices, giving up.")),
++ SFI_MSG_TITLE ("%s", _("No Audio")),
++ SFI_MSG_TEXT1 ("%s", _("No available audio device was found.")),
++ SFI_MSG_TEXT2 ("%s", _("No available audio device could be found and opened successfully. "
++ "Sorry, no fallback selection can be made for audio devices, giving up.")),
+ SFI_MSG_TEXT3 (_("Failed to open PCM devices: %s"), bse_error_blurb (error)),
+- SFI_MSG_CHECK (_("Show messages about PCM device selections problems")));
++ SFI_MSG_CHECK ("%s", _("Show messages about PCM device selections problems")));
+ server->pcm_input_checked = FALSE;
+ return server->pcm_device ? BSE_ERROR_NONE : error;
+ }
+@@ -466,12 +466,12 @@ server_open_midi_device (BseServer *serv
+ sfi_ring_free (ring);
+ if (server->midi_device)
+ sfi_msg_display (SFI_MSG_WARNING,
+- SFI_MSG_TITLE (_("No MIDI")),
+- SFI_MSG_TEXT1 (_("MIDI input or oputput is not available.")),
+- SFI_MSG_TEXT2 (_("No available MIDI device could be found and opened successfully. "
+- "Reverting to null device, no MIDI events will be received or sent.")),
++ SFI_MSG_TITLE ("%s", _("No MIDI")),
++ SFI_MSG_TEXT1 ("%s", _("MIDI input or oputput is not available.")),
++ SFI_MSG_TEXT2 ("%s", _("No available MIDI device could be found and opened successfully. "
++ "Reverting to null device, no MIDI events will be received or sent.")),
+ SFI_MSG_TEXT3 (_("Failed to open MIDI devices: %s"), bse_error_blurb (error)),
+- SFI_MSG_CHECK (_("Show messages about MIDI device selections problems")));
++ SFI_MSG_CHECK ("%s", _("Show messages about MIDI device selections problems")));
+ }
+ return server->midi_device ? BSE_ERROR_NONE : error;
+ }
+@@ -521,12 +521,12 @@ bse_server_open_devices (BseServer *self
+ if (error)
+ {
+ sfi_msg_display (SFI_MSG_ERROR,
+- SFI_MSG_TITLE (_("Start Disk Recording")),
+- SFI_MSG_TEXT1 (_("Failed to start recording to disk.")),
+- SFI_MSG_TEXT2 (_("An error occoured while opening the recording file, selecting a different "
+- "file might fix this situation.")),
++ SFI_MSG_TITLE ("%s", _("Start Disk Recording")),
++ SFI_MSG_TEXT1 ("%s", _("Failed to start recording to disk.")),
++ SFI_MSG_TEXT2 ("%s", _("An error occoured while opening the recording file, selecting a different "
++ "file might fix this situation.")),
+ SFI_MSG_TEXT3 (_("Failed to open file \"%s\" for output: %s"), self->wave_file, bse_error_blurb (error)),
+- SFI_MSG_CHECK (_("Show recording file errors")));
++ SFI_MSG_CHECK ("%s", _("Show recording file errors")));
+ g_object_unref (self->pcm_writer);
+ self->pcm_writer = NULL;
+ }
+--- beast.orig/configure.in
++++ beast/configure.in
+@@ -126,7 +126,9 @@ AC_C_CONST
+ AC_C_INLINE
+ AC_HEADER_STDC
+
+-# == C++11 ==
++# == Compiler Flags ==
++MC_EVAR_ADD(CFLAGS, -Werror=format-security, -Werror=format-security)
++MC_EVAR_ADD(CXXFLAGS, -Werror=format-security, -Werror=format-security)
+ MC_EVAR_ADD(CXXFLAGS, -std=gnu++0x, -std=gnu++0x -pthread)
+
+ # Checks for programs
--
beast packaging
More information about the pkg-multimedia-commits
mailing list