The below patch fixes the issue. ion.ocp.ohiou.edu doesn't appear to be up right now, though, and I'm having a hard time finding out if there's somewhere upstream I can send this patch as well.
--- debian/changelog | 7 +++++ debian/patches/0004-ftbfs-with-gcc-6.patch | 50 ++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 58 insertions(+) create mode 100644 debian/patches/0004-ftbfs-with-gcc-6.patch diff --git a/debian/changelog b/debian/changelog index 05c671e..dcc9140 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ion (3.2.1+dfsg-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix misleading indentation in dtnperf_client.c (closes: #811582) + + -- Mike Gerow <ge...@mgerow.com> Thu, 07 Jul 2016 16:39:04 +0200 + ion (3.2.1+dfsg-1) unstable; urgency=medium * New upstream release. diff --git a/debian/patches/0004-ftbfs-with-gcc-6.patch b/debian/patches/0004-ftbfs-with-gcc-6.patch new file mode 100644 index 0000000..02124d6 --- /dev/null +++ b/debian/patches/0004-ftbfs-with-gcc-6.patch @@ -0,0 +1,50 @@ +--- a/contrib/dtnperf/dtnperf/src/dtnperf_modes/dtnperf_client.c ++++ b/contrib/dtnperf/dtnperf/src/dtnperf_modes/dtnperf_client.c +@@ -670,22 +670,22 @@ + if(perf_opt->create_log) + print_final_report(log_file); + +- // fill the stop bundle +- prepare_stop_bundle(&bundle_stop, mon_eid, conn_opt->expiration, conn_opt->priority, sent_bundles); +- al_bp_bundle_set_source(&bundle_stop, local_eid); +- +- // send stop bundle to monitor +- if (debug) +- printf("sending the stop bundle to the monitor..."); +- if ((error = al_bp_bundle_send(handle, regid, &bundle_stop)) != 0) +- { +- fprintf(stderr, "[DTNperf fatal error] in sending stop bundle: %d (%s)\n", error, al_bp_strerror(error)); +- if (create_log) +- fprintf(log_file, "[DTNperf fatal error] in sending stop bundle: %d (%s)\n", error, al_bp_strerror(error)); +- client_clean_exit(1); +- } +- if (debug) +- printf("done.\n"); ++ // fill the stop bundle ++ prepare_stop_bundle(&bundle_stop, mon_eid, conn_opt->expiration, conn_opt->priority, sent_bundles); ++ al_bp_bundle_set_source(&bundle_stop, local_eid); ++ ++ // send stop bundle to monitor ++ if (debug) ++ printf("sending the stop bundle to the monitor..."); ++ if ((error = al_bp_bundle_send(handle, regid, &bundle_stop)) != 0) ++ { ++ fprintf(stderr, "[DTNperf fatal error] in sending stop bundle: %d (%s)\n", error, al_bp_strerror(error)); ++ if (create_log) ++ fprintf(log_file, "[DTNperf fatal error] in sending stop bundle: %d (%s)\n", error, al_bp_strerror(error)); ++ client_clean_exit(1); ++ } ++ if (debug) ++ printf("done.\n"); + + // waiting monitor stops + if (dedicated_monitor) +@@ -718,7 +718,7 @@ + fprintf(stderr, "[DTNperf fatal error] unregisted endpoint: %s\n", strerror(errno)); + if (create_log) + fprintf(log_file, "[DTNperf fatal error] unregisted endpoint: %s\n", strerror(errno)); +- client_clean_exit(1); ++ client_clean_exit(1); + } + else + { diff --git a/debian/patches/series b/debian/patches/series index d27cf45..cd8bdcb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 0001-replace-gmake-with-make.patch 0002-fix-dtnperf-undefined-symbols.patch 0003-ftbfs-with-clang.patch +0004-ftbfs-with-gcc-6.patch -- 2.8.1 -- Mike Gerow ge...@mgerow.com
signature.asc
Description: PGP signature