From ab801c664daa3c9a67cdf4f79690c570949a1e1a Mon Sep 17 00:00:00 2001 From: Alexandre Dulaunoy Date: Sun, 17 Jun 2018 10:42:43 +0200 Subject: [PATCH] add: Debian patches applied --- debian/patches/60_fix-gcc-warnings.patch | 67 +++++++++++++++++++++++ debian/patches/70_fix-total-message.patch | 17 ++++++ 2 files changed, 84 insertions(+) create mode 100644 debian/patches/60_fix-gcc-warnings.patch create mode 100644 debian/patches/70_fix-total-message.patch diff --git a/debian/patches/60_fix-gcc-warnings.patch b/debian/patches/60_fix-gcc-warnings.patch new file mode 100644 index 0000000..0cc4534 --- /dev/null +++ b/debian/patches/60_fix-gcc-warnings.patch @@ -0,0 +1,67 @@ +Description: fix some GCC warnings. +Author: Joao Eriberto Mota Filho +Last-Update: 2015-02-10 +Index: dcfldd-1.3.4.1/copy.c +=================================================================== +--- dcfldd-1.3.4.1.orig/copy.c ++++ dcfldd-1.3.4.1/copy.c +@@ -223,7 +223,8 @@ int dd_copy(void) + + if (probe == PROBE_NONE || probed_size == 0) + fprintf(stderr, "\r%llu blocks (%lluMb) written.", +- w_full, total_mb); ++ /* [FIX] copy.c:226:25: warning: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument {3,4} has type ‘uintmax_t’ [-Wformat=] */ ++ (long long unsigned int) w_full, (long long unsigned int) total_mb); + else { + time_t curr_time = time(NULL); + int seconds = (int)difftime(curr_time, start_time); +@@ -237,7 +238,8 @@ int dd_copy(void) + + time_left(secstr, sizeof secstr, seconds_remaining); + fprintf(stderr, "\r[%d%% of %lluMb] %llu blocks (%lluMb) written. %s", +- prcnt, probed_mb, w_full, total_mb, secstr); ++ /* [FIX] copy.c:240:25: warning: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument {4,5,6} has type ‘off_t’ [-Wformat=] */ ++ prcnt, (long long unsigned int) probed_mb, (long long unsigned int) w_full, (long long unsigned int) total_mb, secstr); + } + } + +Index: dcfldd-1.3.4.1/verify.c +=================================================================== +--- dcfldd-1.3.4.1.orig/verify.c ++++ dcfldd-1.3.4.1/verify.c +@@ -192,7 +192,8 @@ int dd_verify(void) + + if (probe == PROBE_NONE || probed_size == 0) + fprintf(stderr, "\r%llu blocks (%lluMb) written.", +- w_full, total_mb); ++ /* [FIX] verify.c:195:25: warning: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument {3,4} has type ‘uintmax_t’ [-Wformat=] */ ++ (long long unsigned int) w_full, (long long unsigned int) total_mb); + else { + time_t curr_time = time(NULL); + int seconds = (int)difftime(curr_time, start_time); +@@ -207,7 +208,8 @@ int dd_verify(void) + time_left(secstr, sizeof secstr, seconds_remaining); + fprintf(stderr, + "\r[%d%% of %lluMb] %llu blocks (%lluMb) written. %s", +- prcnt, probed_mb, w_full, total_mb, secstr); ++ /* [FIX] verify.c:210:25: warning: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument {4,5,6} has type ‘off_t’ [-Wformat=] */ ++ prcnt, (long long unsigned int) probed_mb, (long long unsigned int) w_full, (long long unsigned int) total_mb, secstr); + } + } + +Index: dcfldd-1.3.4.1/split.c +=================================================================== +--- dcfldd-1.3.4.1.orig/split.c ++++ dcfldd-1.3.4.1/split.c +@@ -102,7 +102,10 @@ static void open_split(split_t *split) + char *ext, *fname; + + ext = getext(split->format, splitnum); +- asprintf(&fname, "%s.%s", split->name, ext); ++ /* [FIX] split.c:105:5: warning: ignoring return value of ‘asprintf’, declared with attribute warn_unused_result [-Wunused-result] */ ++ if( asprintf(&fname, "%s.%s", split->name, ext) == -1) { ++ return; ++ } + free(ext); + + fd = open(fname, O_WRONLY | O_CREAT, perms); diff --git a/debian/patches/70_fix-total-message.patch b/debian/patches/70_fix-total-message.patch new file mode 100644 index 0000000..f612128 --- /dev/null +++ b/debian/patches/70_fix-total-message.patch @@ -0,0 +1,17 @@ +Description: add a newline to generate a space between + the summary message and hashes. +Author: Joao Eriberto Mota Filho +Last-Update: 2017-04-25 +Index: dcfldd-1.3.4.1/dcfldd.h +=================================================================== +--- dcfldd-1.3.4.1.orig/dcfldd.h ++++ dcfldd-1.3.4.1/dcfldd.h +@@ -86,7 +86,7 @@ while (0) + #endif /* DEFAULT_HASHWINDOW_FORMAT */ + + #ifndef DEFAULT_TOTALHASH_FORMAT +-#define DEFAULT_TOTALHASH_FORMAT "Total (#algorithm#): #hash#" ++#define DEFAULT_TOTALHASH_FORMAT "\nTotal (#algorithm#): #hash#" + #endif /* DEFAULT_TOTALHASH_FORMAT */ + + #ifndef DEFAULT_HASHCONV