tags 643448 + pending thanks Dear maintainer,
I've prepared an NMU for nvramtool (versioned as 0.0+r3669-2.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key ID: 0x8649AA06 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe `- NP: Dido: Morning
diff -u nvramtool-0.0+r3669/debian/changelog nvramtool-0.0+r3669/debian/changelog
--- nvramtool-0.0+r3669/debian/changelog
+++ nvramtool-0.0+r3669/debian/changelog
@@ -1,3 +1,13 @@
+nvramtool (0.0+r3669-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix "FTBFS: hexdump.c:94:7: error: format not a string literal and
+ no format arguments [-Werror=format-security]": add patch
+ 20_fix_format-security.patch from peter green.
+ (Closes: #643448)
+
+ -- gregor herrmann <gre...@debian.org> Sun, 20 Nov 2011 14:00:26 +0100
+
nvramtool (0.0+r3669-2.1) unstable; urgency=low
* NMU, added armhf to the arch list. (Closes: #604666)
only in patch2:
unchanged:
--- nvramtool-0.0+r3669.orig/debian/patches/20_fix_format-security.patch
+++ nvramtool-0.0+r3669/debian/patches/20_fix_format-security.patch
@@ -0,0 +1,60 @@
+diff -Nur -x '*.orig' -x '*~' nvramtool-0.0+r3669/hexdump.c nvramtool-0.0+r3669.new/hexdump.c
+--- nvramtool-0.0+r3669/hexdump.c 2008-09-27 10:08:28.000000000 +0000
++++ nvramtool-0.0+r3669.new/hexdump.c 2011-11-10 01:39:12.000000000 +0000
+@@ -91,9 +91,9 @@
+ bytes_left >= format->bytes_per_line;
+ bytes_left -= format->bytes_per_line)
+ { /* print start address for current line */
+- fprintf(outfile, format->indent);
++ fprintf(outfile, "%s",format->indent);
+ addrprint(outfile, addrprint_start + index, format->addrprint_width);
+- fprintf(outfile, format->sep1);
++ fprintf(outfile, "%s",format->sep1);
+
+ /* display the bytes in hex */
+ for (i = 0; ; )
+@@ -102,11 +102,11 @@
+ if (++i >= format->bytes_per_line)
+ break;
+
+- fprintf(outfile, format->sep2);
++ fprintf(outfile,"%s", format->sep2);
+ }
+
+ index -= format->bytes_per_line;
+- fprintf(outfile, format->sep3);
++ fprintf(outfile,"%s", format->sep3);
+
+ /* display the bytes as characters */
+ for (i = 0; i < format->bytes_per_line; i++)
+@@ -120,14 +120,14 @@
+ return;
+
+ /* print start address for last line */
+- fprintf(outfile, format->indent);
++ fprintf(outfile,"%s", format->indent);
+ addrprint(outfile, addrprint_start + index, format->addrprint_width);
+- fprintf(outfile, format->sep1);
++ fprintf(outfile, "%s",format->sep1);
+
+ /* display bytes for last line in hex */
+ for (i = 0; i < bytes_left; i++)
+ { hexprint(outfile, p[index++]);
+- fprintf(outfile, format->sep2);
++ fprintf(outfile, "%s",format->sep2);
+ }
+
+ index -= bytes_left;
+@@ -139,10 +139,10 @@
+ if (++i >= format->bytes_per_line)
+ break;
+
+- fprintf(outfile, format->sep2);
++ fprintf(outfile,"%s", format->sep2);
+ }
+
+- fprintf(outfile, format->sep3);
++ fprintf(outfile, "%s",format->sep3);
+
+ /* display bytes for last line as characters */
+ for (i = 0; i < bytes_left; i++)
signature.asc
Description: Digital signature
