diff -Nru librdkafka-0.8.6/debian/changelog librdkafka-0.8.6/debian/changelog --- librdkafka-0.8.6/debian/changelog 2015-07-19 06:41:21.000000000 +0800 +++ librdkafka-0.8.6/debian/changelog 2015-12-21 21:22:57.000000000 +0800 @@ -1,3 +1,12 @@ +librdkafka (0.8.6-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Use size_t instead of int for hexdump to fix FTBFS (Closes: 799993): + assuming signed overflow does not occur when + assuming that (X + c) >= X is always true + + -- YunQiang Su Mon, 21 Dec 2015 21:20:59 +0800 + librdkafka (0.8.6-1) unstable; urgency=medium * New upstream release. diff -Nru librdkafka-0.8.6/debian/patches/0002_hexdump_use_size_t_instead_of_int.diff librdkafka-0.8.6/debian/patches/0002_hexdump_use_size_t_instead_of_int.diff --- librdkafka-0.8.6/debian/patches/0002_hexdump_use_size_t_instead_of_int.diff 1970-01-01 08:00:00.000000000 +0800 +++ librdkafka-0.8.6/debian/patches/0002_hexdump_use_size_t_instead_of_int.diff 2015-12-21 21:18:40.000000000 +0800 @@ -0,0 +1,72 @@ +Index: b/examples/rdkafka_example.c +=================================================================== +--- a/examples/rdkafka_example.c ++++ b/examples/rdkafka_example.c +@@ -63,26 +63,26 @@ static void stop (int sig) { + + static void hexdump (FILE *fp, const char *name, const void *ptr, size_t len) { + const char *p = (const char *)ptr; +- int of = 0; ++ size_t of = 0; + + + if (name) +- fprintf(fp, "%s hexdump (%zd bytes):\n", name, len); ++ fprintf(fp, "%s hexdump (%zu bytes):\n", name, len); + + for (of = 0 ; of < len ; of += 16) { + char hexen[16*3+1]; + char charen[16+1]; +- int hof = 0; ++ size_t hof = 0; + +- int cof = 0; +- int i; ++ size_t cof = 0; ++ size_t i; + + for (i = of ; i < of + 16 && i < len ; i++) { + hof += sprintf(hexen+hof, "%02x ", p[i] & 0xff); + cof += sprintf(charen+cof, "%c", + isprint((int)p[i]) ? p[i] : '.'); + } +- fprintf(fp, "%08x: %-48s %-16s\n", ++ fprintf(fp, "%08zu: %-48s %-16s\n", + of, hexen, charen); + } + } +Index: b/src/rdlog.c +=================================================================== +--- a/src/rdlog.c ++++ b/src/rdlog.c +@@ -38,7 +38,7 @@ + + void rd_hexdump (FILE *fp, const char *name, const void *ptr, size_t len) { + const char *p = (const char *)ptr; +- int of = 0; ++ size_t of = 0; + + + if (name) +@@ -47,17 +47,17 @@ void rd_hexdump (FILE *fp, const char *n + for (of = 0 ; of < len ; of += 16) { + char hexen[16*3+1]; + char charen[16+1]; +- int hof = 0; ++ size_t hof = 0; + +- int cof = 0; +- int i; ++ size_t cof = 0; ++ size_t i; + + for (i = of ; i < of + 16 && i < len ; i++) { + hof += sprintf(hexen+hof, "%02x ", p[i] & 0xff); + cof += sprintf(charen+cof, "%c", + isprint((int)p[i]) ? p[i] : '.'); + } +- fprintf(fp, "%08x: %-48s %-16s\n", ++ fprintf(fp, "%08zu: %-48s %-16s\n", + of, hexen, charen); + } + } diff -Nru librdkafka-0.8.6/debian/patches/series librdkafka-0.8.6/debian/patches/series --- librdkafka-0.8.6/debian/patches/series 2015-07-19 06:41:21.000000000 +0800 +++ librdkafka-0.8.6/debian/patches/series 2015-12-21 21:41:51.000000000 +0800 @@ -1 +1,2 @@ 0001-mklove-update-add-disable-silent-rules.patch +0002_hexdump_use_size_t_instead_of_int.diff