Bug#650658: FTBFS with -Werror=format-security

[Loïc Minier]

Package: jfsutils
Version: 1.1.15-1
Severity: serious
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Uertags: origin-ubuntu precise ubuntu-patch

        Hi

 jfsutils 1.1.15-1 failed to build on Debian armhf and s390x buildds
 (and on Ubuntu armhf buildds) due to -Werror=format-security being
 added recently to CFLAGS.

 Attached debdiff fixes the build here.

   Cheers,
-- 
Loïc Minier

diff -u jfsutils-1.1.15/debian/control jfsutils-1.1.15/debian/control
--- jfsutils-1.1.15/debian/control
+++ jfsutils-1.1.15/debian/control
@@ -2,7 +2,7 @@
 Section: admin
 Priority: optional
 Maintainer: Stefan Hornburg (Racke) <ra...@linuxia.de>
-Build-Depends: cdbs, debhelper (>= 4.1.0), uuid-dev
+Build-Depends: cdbs, debhelper (>= 4.1.0), uuid-dev, quilt
 Standards-Version: 3.8.0
 Homepage: http://jfs.sourceforge.net/
 
diff -u jfsutils-1.1.15/debian/rules jfsutils-1.1.15/debian/rules
--- jfsutils-1.1.15/debian/rules
+++ jfsutils-1.1.15/debian/rules
@@ -20,6 +20,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 ifeq ($(DEB_BUILD_ARCH),alpha)
        LDFLAGS += -Wl,--no-relax
diff -u jfsutils-1.1.15/debian/changelog jfsutils-1.1.15/debian/changelog
--- jfsutils-1.1.15/debian/changelog
+++ jfsutils-1.1.15/debian/changelog
@@ -1,3 +1,10 @@
+jfsutils (1.1.15-1ubuntu1) precise; urgency=low
+
+  * Include patchsys-quilt.mk and add new patch format-security-errors to fix
+    FTBFS with -Werror=format-security.
+
+ -- Loïc Minier <loic.min...@ubuntu.com>  Thu, 01 Dec 2011 17:57:25 +0100
+
 jfsutils (1.1.15-1) unstable; urgency=low
 
   * new upstream release (Closes: #504713)
only in patch2:
unchanged:
--- jfsutils-1.1.15.orig/debian/patches/series
+++ jfsutils-1.1.15/debian/patches/series
@@ -0,0 +1 @@
+format-security-errors.patch
only in patch2:
unchanged:
--- jfsutils-1.1.15.orig/debian/patches/format-security-errors.patch
+++ jfsutils-1.1.15/debian/patches/format-security-errors.patch
@@ -0,0 +1,37 @@
+--- a/fscklog/display.c
++++ b/fscklog/display.c
+@@ -182,7 +182,7 @@ void dump_service_log()
+                               } else {
+                                       /* the record looks ok */
+                                       msg_txt = &log_entry[log_entry_pos];
+-                                      printf(msg_txt);
++                                      printf("%s", msg_txt);
+                                       /*
+                                        * set up for the next record
+                                        */
+--- a/fscklog/fscklog.c
++++ b/fscklog/fscklog.c
+@@ -252,8 +252,8 @@ int v_send_msg(int msg_num, const char *file_name, int 
line_number, ...) {
+ 
+       sprintf(debug_detail, " [%s:%d]\n", basename(file_name), line_number);
+ 
+-      printf(msg_string);
+-      printf(debug_detail);
++      printf("%s", msg_string);
++      printf("%s", debug_detail);
+ 
+       return 0;
+ }
+--- a/logdump/helpers.c
++++ b/logdump/helpers.c
+@@ -95,8 +95,8 @@ int v_fsck_send_msg(int msg_num, const char *file_name, int 
line_number, ...) {
+ 
+       sprintf(debug_detail, " [%s:%d]\n", file_name, line_number);
+ 
+-      printf(msg_string);
+-      printf(debug_detail);
++      printf("%s", msg_string);
++      printf("%s", debug_detail);
+ 
+       return 0;
+ }