Bug#734510: shush: [PATCH] Resolve FTBFS because of format string errors (and add missing #include)

[Daniel T Chen]

Package: shush
Version: 1.2.3-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

In Ubuntu 14.04, the attached patch was applied to achieve the following:

  * Fix format string errors, resolving FTBFS.
  * Add missing preprocessor directive, resolving implicit
    function declaration.


Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.11.0-15-generic (SMP w/4 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 shush-1.2.3/debian/patches/01_fix_string_format.diff shush-1.2.3/debian/patches/01_fix_string_format.diff
--- shush-1.2.3/debian/patches/01_fix_string_format.diff	1969-12-31 19:00:00.000000000 -0500
+++ shush-1.2.3/debian/patches/01_fix_string_format.diff	2014-01-07 13:23:11.000000000 -0500
@@ -0,0 +1,22 @@
+Index: shush-1.2.3/src/analyzer.c
+===================================================================
+--- shush-1.2.3.orig/src/analyzer.c	2008-03-08 18:25:46.000000000 -0500
++++ shush-1.2.3/src/analyzer.c	2014-01-07 13:23:08.700034641 -0500
+@@ -654,7 +654,7 @@
+ 	    else
+ 		tag = (format == CF_FORMAT_RICH) ? "</Bold>" : "</b>";
+ 
+-	    if (fprintf(mail, tag) != strlen(tag))
++	    if (fprintf(mail, "%s", tag) != strlen(tag))
+ 	      {
+ 		error("fprintf() failed: %s", ERRSTR);
+ 		return -1;
+@@ -675,7 +675,7 @@
+ 	    else
+ 		abort();
+ 
+-	    if (fprintf(mail, esc) != strlen(esc))
++	    if (fprintf(mail, "%s", esc) != strlen(esc))
+ 	      {
+ 		error("fprintf() failed: %s", ERRSTR);
+ 		return -1;
diff -Nru shush-1.2.3/debian/patches/02_fix_implicit_declaration_strftime.diff shush-1.2.3/debian/patches/02_fix_implicit_declaration_strftime.diff
--- shush-1.2.3/debian/patches/02_fix_implicit_declaration_strftime.diff	1969-12-31 19:00:00.000000000 -0500
+++ shush-1.2.3/debian/patches/02_fix_implicit_declaration_strftime.diff	2014-01-07 13:38:40.000000000 -0500
@@ -0,0 +1,12 @@
+Index: shush-1.2.3/src/check.c
+===================================================================
+--- shush-1.2.3.orig/src/check.c	2008-03-08 18:25:46.000000000 -0500
++++ shush-1.2.3/src/check.c	2014-01-07 13:38:36.991356799 -0500
+@@ -9,6 +9,7 @@
+ 
+ #include <ctype.h>
+ #include <fcntl.h>
++#include <time.h>
+ #if defined(HAVE_PATHS_H)
+ # include <paths.h>
+ #else
diff -Nru shush-1.2.3/debian/patches/series shush-1.2.3/debian/patches/series
--- shush-1.2.3/debian/patches/series	2013-12-29 19:24:18.000000000 -0500
+++ shush-1.2.3/debian/patches/series	2014-01-07 13:38:10.000000000 -0500
@@ -1 +1,3 @@
 00_fix_shush.1.diff
+01_fix_string_format.diff
+02_fix_implicit_declaration_strftime.diff