[SCM] flac/master: Fix "format not a string literal and no format arguments [-Werror=format-security]" errors (Closes: #643377).

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b0931683cfe88d197e488e1690bd7fc0d4165dcc
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Wed Oct 5 14:26:21 2011 +0200

    Fix "format not a string literal and no format arguments [-Werror=format-security]" errors (Closes: #643377).

diff --git a/debian/patches/15_format-not-a-string-literal-and-no-format-arguments.patch b/debian/patches/15_format-not-a-string-literal-and-no-format-arguments.patch
new file mode 100644
index 0000000..38a4b01
--- /dev/null
+++ b/debian/patches/15_format-not-a-string-literal-and-no-format-arguments.patch
@@ -0,0 +1,59 @@
+Author: Fabian Greffrath <fabian+debian at greffrath.com>
+Description: Fixes "format not a string literal and no format arguments
+ [-Werror=format-security]" errors
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643377
+
+--- flac.orig/src/test_grabbag/cuesheet/main.c
++++ flac/src/test_grabbag/cuesheet/main.c
+@@ -115,12 +115,12 @@ int main(int argc, char *argv[])
+ 	const char *usage = "usage: test_cuesheet cuesheet_file lead_out_offset [ cdda ]\n";
+ 
+ 	if(argc > 1 && 0 == strcmp(argv[1], "-h")) {
+-		printf(usage);
++		printf("%s", usage);
+ 		return 0;
+ 	}
+ 
+ 	if(argc < 3 || argc > 4) {
+-		fprintf(stderr, usage);
++		fprintf(stderr, "%s", usage);
+ 		return 255;
+ 	}
+ 
+@@ -129,7 +129,7 @@ int main(int argc, char *argv[])
+ 		if(0 == strcmp(argv[3], "cdda"))
+ 			is_cdda = true;
+ 		else {
+-			fprintf(stderr, usage);
++			fprintf(stderr, "%s", usage);
+ 			return 255;
+ 		}
+ 	}
+--- flac.orig/src/test_grabbag/picture/main.c
++++ flac/src/test_grabbag/picture/main.c
+@@ -211,12 +211,12 @@ int main(int argc, char *argv[])
+ 	const char *usage = "usage: test_pictures path_prefix\n";
+ 
+ 	if(argc > 1 && 0 == strcmp(argv[1], "-h")) {
+-		printf(usage);
++		printf("%s", usage);
+ 		return 0;
+ 	}
+ 
+ 	if(argc != 2) {
+-		fprintf(stderr, usage);
++		fprintf(stderr, "%s", usage);
+ 		return 255;
+ 	}
+ 
+--- flac.orig/src/test_seeking/main.c
++++ flac/src/test_seeking/main.c
+@@ -429,7 +429,7 @@ int main(int argc, char *argv[])
+ 	static const char * const usage = "usage: test_seeking file.flac [#seeks] [#samples-in-file.flac] [file.raw]\n";
+ 
+ 	if (argc < 2 || argc > 5) {
+-		fprintf(stderr, usage);
++		fprintf(stderr, "%s", usage);
+ 		return 1;
+ 	}
+ 

-- 
flac packaging