Package: directfb
Version: 1.2.10.0-4
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu precise ubuntu-patch
With -Werror=format-security directfb fails to build, this patch should fix
this for the version in unstable.
*** /tmp/tmpRwwIBg
In Ubuntu, the attached patch was applied to achieve the following:
* Add patch to fix format string errors
- add debian/patches/100_fix_format_string_errors.patch
- update debian/patches/series
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers oneiric-updates
APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500,
'oneiric-proposed'), (500, 'oneiric'), (100, 'oneiric-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-12-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru directfb-1.2.10.0/debian/patches/100_fix_format_string_errors.patch directfb-1.2.10.0/debian/patches/100_fix_format_string_errors.patch
--- directfb-1.2.10.0/debian/patches/100_fix_format_string_errors.patch 1969-12-31 18:00:00.000000000 -0600
+++ directfb-1.2.10.0/debian/patches/100_fix_format_string_errors.patch 2011-10-18 01:39:42.000000000 -0500
@@ -0,0 +1,44 @@
+Description: Fix format string errors
+Author: Micah Gersten <[email protected]>
+
+---
+ src/idirectfb.c | 8 ++++----
+ tools/directfb-csource.c | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+Index: directfb-1.2.10.0/src/idirectfb.c
+===================================================================
+--- directfb-1.2.10.0.orig/src/idirectfb.c
++++ directfb-1.2.10.0/src/idirectfb.c
+@@ -310,14 +310,14 @@
+ ret_desc->drawing_flags = device_info.caps.drawing;
+ ret_desc->video_memory = dfb_gfxcard_memory_length();
+
+- snprintf( ret_desc->name, DFB_GRAPHICS_DEVICE_DESC_NAME_LENGTH, device_info.name );
+- snprintf( ret_desc->vendor, DFB_GRAPHICS_DEVICE_DESC_NAME_LENGTH, device_info.vendor );
++ snprintf( ret_desc->name, DFB_GRAPHICS_DEVICE_DESC_NAME_LENGTH, "%s", device_info.name );
++ snprintf( ret_desc->vendor, DFB_GRAPHICS_DEVICE_DESC_NAME_LENGTH, "%s", device_info.vendor );
+
+ ret_desc->driver.major = driver_info.version.major;
+ ret_desc->driver.minor = driver_info.version.minor;
+
+- snprintf( ret_desc->driver.name, DFB_GRAPHICS_DRIVER_INFO_NAME_LENGTH, driver_info.name );
+- snprintf( ret_desc->driver.vendor, DFB_GRAPHICS_DRIVER_INFO_VENDOR_LENGTH, driver_info.vendor );
++ snprintf( ret_desc->driver.name, DFB_GRAPHICS_DRIVER_INFO_NAME_LENGTH, "%s", driver_info.name );
++ snprintf( ret_desc->driver.vendor, DFB_GRAPHICS_DRIVER_INFO_VENDOR_LENGTH, "%s", driver_info.vendor );
+
+ return DFB_OK;
+ }
+Index: directfb-1.2.10.0/tools/directfb-csource.c
+===================================================================
+--- directfb-1.2.10.0.orig/tools/directfb-csource.c
++++ directfb-1.2.10.0/tools/directfb-csource.c
+@@ -789,7 +789,7 @@
+ if (len < 0) {
+ int l = fprintf (fp, " { \"%s\", ", v);
+
+- fprintf (fp, blanks - len + l);
++ fprintf (fp, "%s", blanks - len + l);
+ fprintf (fp, "{ x : %4d, y : %4d, w : %4d, h : %4d } }",
+ rect->x, rect->y, rect->w, rect->h);
+ }
diff -Nru directfb-1.2.10.0/debian/patches/series directfb-1.2.10.0/debian/patches/series
--- directfb-1.2.10.0/debian/patches/series 2010-07-09 07:11:03.000000000 -0500
+++ directfb-1.2.10.0/debian/patches/series 2011-10-18 01:33:11.000000000 -0500
@@ -5,3 +5,4 @@
90_linux_config.h.patch
93_fix_unicode_key_handling.patch
95_missing_includes.patch
+100_fix_format_string_errors.patch
