diff -u eggdrop-1.6.19/debian/changelog eggdrop-1.6.19/debian/changelog --- eggdrop-1.6.19/debian/changelog +++ eggdrop-1.6.19/debian/changelog @@ -1,3 +1,9 @@ +eggdrop (1.6.19-1.2ubuntu3) precise; urgency=low + + * Add gcc-format-string-warnings.patch. Fixes FTBFS. + + -- Daniel T Chen Thu, 26 Jan 2012 22:17:51 -0500 + eggdrop (1.6.19-1.2ubuntu2) oneiric; urgency=low * No change rebuild for libssl1.0.0 transition. only in patch2: unchanged: --- eggdrop-1.6.19.orig/debian/patches/gcc-format-string-warnings.patch +++ eggdrop-1.6.19/debian/patches/gcc-format-string-warnings.patch @@ -0,0 +1,47 @@ +diff -Nur -x '*.orig' -x '*~' eggdrop-1.6.19/src/main.c eggdrop-1.6.19.new/src/main.c +--- eggdrop-1.6.19/src/main.c 2012-01-26 22:24:54.000000000 -0500 ++++ eggdrop-1.6.19.new/src/main.c 2012-01-26 22:24:55.000000000 -0500 +@@ -498,7 +498,7 @@ + break; /* this should never be reached */ + case 'h': + printf("\n%s\n\n", version); +- printf(EGG_USAGE); ++ printf("%s", EGG_USAGE); + printf("\n"); + bg_send_quit(BG_ABORT); + exit(0); +@@ -819,7 +819,7 @@ + putlog(LOG_ALL, "*", "--- Loading %s (%s)", ver, s); + chanprog(); + if (!encrypt_pass) { +- printf(MOD_NOCRYPT); ++ printf("%s", MOD_NOCRYPT); + bg_send_quit(BG_ABORT); + exit(1); + } +diff -Nur -x '*.orig' -x '*~' eggdrop-1.6.19/src/misc.c eggdrop-1.6.19.new/src/misc.c +--- eggdrop-1.6.19/src/misc.c 2008-02-16 16:41:04.000000000 -0500 ++++ eggdrop-1.6.19.new/src/misc.c 2012-01-26 22:24:55.000000000 -0500 +@@ -577,8 +577,8 @@ + * then reset repeats. We want the current time here, + * so put that in the file first. + */ +- fprintf(logs[i].f, stamp); +- fprintf(logs[i].f, MISC_LOGREPEAT, logs[i].repeats); ++ fprintf(logs[i].f, "%s", stamp); ++ fprintf(logs[i].f, "%s%s", MISC_LOGREPEAT, logs[i].repeats); + logs[i].repeats = 0; + /* No need to reset logs[i].szlast here + * because we update it later on... +diff -Nur -x '*.orig' -x '*~' eggdrop-1.6.19/src/mod/transfer.mod/transfer.c eggdrop-1.6.19.new/src/mod/transfer.mod/transfer.c +--- eggdrop-1.6.19/src/mod/transfer.mod/transfer.c 2008-02-16 16:41:11.000000000 -0500 ++++ eggdrop-1.6.19.new/src/mod/transfer.mod/transfer.c 2012-01-26 22:25:39.000000000 -0500 +@@ -777,7 +777,7 @@ + + static void display_dcc_fork_send(int idx, char *buf) + { +- sprintf(buf, TRANSFER_CONN_SEND); ++ sprintf(buf, "%s", TRANSFER_CONN_SEND); + } + + static int expmem_dcc_xfer(void *x)