diff -Nru babeltrace-1.5.5/bindings/python/Makefile.in babeltrace-1.5.6/bindings/python/Makefile.in --- babeltrace-1.5.5/bindings/python/Makefile.in 2018-03-26 19:34:20.000000000 +0000 +++ babeltrace-1.5.6/bindings/python/Makefile.in 2018-07-03 19:41:58.000000000 +0000 @@ -620,9 +620,9 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." +@USE_PYTHON_FALSE@uninstall-local: @USE_PYTHON_FALSE@clean-local: @USE_PYTHON_FALSE@install-exec-local: -@USE_PYTHON_FALSE@uninstall-local: clean: clean-recursive clean-am: clean-generic clean-libtool clean-local mostlyclean-am diff -Nru babeltrace-1.5.5/ChangeLog babeltrace-1.5.6/ChangeLog --- babeltrace-1.5.5/ChangeLog 2018-03-26 19:34:10.000000000 +0000 +++ babeltrace-1.5.6/ChangeLog 2018-07-03 19:41:31.000000000 +0000 @@ -1,3 +1,9 @@ +2018-07-03 babeltrace 1.5.6 (National Fried Clam Day) + * Fix: remove left-over debug logging statement + * Use trace->trace_id in check to remove trace from bt_ctx + * Fix: missing initializer braces warning + * Fix: zero out URL parsing array before use and ensure proper error reporting + 2018-03-26 babeltrace 1.5.5 (Purple Day) * Propagate error from packet_seek in case of truncated packet * Fix: report truncated files while reading diff -Nru babeltrace-1.5.5/configure babeltrace-1.5.6/configure --- babeltrace-1.5.5/configure 2018-03-26 19:34:18.000000000 +0000 +++ babeltrace-1.5.6/configure 2018-07-03 19:41:54.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for babeltrace 1.5.5. +# Generated by GNU Autoconf 2.69 for babeltrace 1.5.6. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='babeltrace' PACKAGE_TARNAME='babeltrace' -PACKAGE_VERSION='1.5.5' -PACKAGE_STRING='babeltrace 1.5.5' +PACKAGE_VERSION='1.5.6' +PACKAGE_STRING='babeltrace 1.5.6' PACKAGE_BUGREPORT='jeremie.galarneau@efficios.com' PACKAGE_URL='https://diamon.org/babeltrace' @@ -1410,7 +1410,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures babeltrace 1.5.5 to adapt to many kinds of systems. +\`configure' configures babeltrace 1.5.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1482,7 +1482,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of babeltrace 1.5.5:";; + short | recursive ) echo "Configuration of babeltrace 1.5.6:";; esac cat <<\_ACEOF @@ -1625,7 +1625,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -babeltrace configure 1.5.5 +babeltrace configure 1.5.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2048,7 +2048,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by babeltrace $as_me 1.5.5, which was +It was created by babeltrace $as_me 1.5.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3035,7 +3035,7 @@ # Define the identity of the package. PACKAGE='babeltrace' - VERSION='1.5.5' + VERSION='1.5.6' cat >>confdefs.h <<_ACEOF @@ -18592,7 +18592,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by babeltrace $as_me 1.5.5, which was +This file was extended by babeltrace $as_me 1.5.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18663,7 +18663,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -babeltrace config.status 1.5.5 +babeltrace config.status 1.5.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru babeltrace-1.5.5/configure.ac babeltrace-1.5.6/configure.ac --- babeltrace-1.5.5/configure.ac 2018-03-26 19:34:10.000000000 +0000 +++ babeltrace-1.5.6/configure.ac 2018-07-03 19:41:31.000000000 +0000 @@ -1,5 +1,5 @@ AC_PREREQ([2.50]) -AC_INIT([babeltrace],[1.5.5],[jeremie.galarneau@efficios.com],[],[https://diamon.org/babeltrace]) +AC_INIT([babeltrace],[1.5.6],[jeremie.galarneau@efficios.com],[],[https://diamon.org/babeltrace]) AC_SUBST([BABELTRACE_LIBRARY_VERSION], [1:0:0]) AC_CONFIG_HEADERS([config.h]) diff -Nru babeltrace-1.5.5/debian/changelog babeltrace-1.5.6/debian/changelog --- babeltrace-1.5.5/debian/changelog 2018-06-28 06:52:56.000000000 +0000 +++ babeltrace-1.5.6/debian/changelog 2018-07-03 22:02:13.000000000 +0000 @@ -1,8 +1,10 @@ -babeltrace (1.5.5-1build1) cosmic; urgency=medium +babeltrace (1.5.6-1) unstable; urgency=medium - * No-change rebuild to build for python3.7. + * [6ebf331] New upstream version 1.5.6 + * [824703a] Bump standard to 4.1.4, no changes necessary + * [20d7f24] Use salsa canonical uri in VCS-Browser - -- Matthias Klose Thu, 28 Jun 2018 06:52:56 +0000 + -- Michael Jeanson Tue, 03 Jul 2018 18:02:13 -0400 babeltrace (1.5.5-1) unstable; urgency=medium diff -Nru babeltrace-1.5.5/debian/control babeltrace-1.5.6/debian/control --- babeltrace-1.5.5/debian/control 2018-03-26 21:23:20.000000000 +0000 +++ babeltrace-1.5.6/debian/control 2018-07-03 22:01:13.000000000 +0000 @@ -7,9 +7,9 @@ libpopt-dev, dh-autoreconf, python3-all-dev, swig (>= 2.0), libdw-dev (>= 0.154), libelf-dev (>= 0.154) X-Python3-Version: >= 3.0 -Standards-Version: 4.1.3 +Standards-Version: 4.1.4 Vcs-Git: https://salsa.debian.org/debian/babeltrace.git -Vcs-Browser: https://salsa.debian.org/debian/babeltrace.git +Vcs-Browser: https://salsa.debian.org/debian/babeltrace Homepage: https://www.efficios.com/babeltrace Package: babeltrace diff -Nru babeltrace-1.5.5/formats/lttng-live/lttng-live-comm.c babeltrace-1.5.6/formats/lttng-live/lttng-live-comm.c --- babeltrace-1.5.5/formats/lttng-live/lttng-live-comm.c 2018-03-26 19:34:10.000000000 +0000 +++ babeltrace-1.5.6/formats/lttng-live/lttng-live-comm.c 2018-07-03 19:41:31.000000000 +0000 @@ -390,6 +390,7 @@ if (!trace) { trace = g_new0(struct lttng_live_ctf_trace, 1); trace->ctf_trace_id = ctf_trace_id; + trace->trace_id = -1; printf_verbose("Create trace ctf_trace_id %" PRIu64 "\n", ctf_trace_id); BT_INIT_LIST_HEAD(&trace->stream_list); g_hash_table_insert(stream->session->ctf_traces, @@ -1466,7 +1467,7 @@ lvstream->in_trace = 0; bt_list_del(&lvstream->trace_stream_node); } - if (trace->in_use) { + if (trace->in_use && trace->trace_id >= 0) { ret = bt_context_remove_trace(bt_ctx, trace->trace_id); if (ret < 0) fprintf(stderr, "[error] removing trace from context\n"); @@ -1666,7 +1667,6 @@ */ if (g_hash_table_size(ctx->session->ctf_traces) != nr_traces) { printf_verbose("New trace(s) added during add_one_trace()\n"); - printf_verbose("JORAJ: GREP HERE\n"); goto retry; } } diff -Nru babeltrace-1.5.5/formats/lttng-live/lttng-live.h babeltrace-1.5.6/formats/lttng-live/lttng-live.h --- babeltrace-1.5.5/formats/lttng-live/lttng-live.h 2018-03-26 19:34:10.000000000 +0000 +++ babeltrace-1.5.6/formats/lttng-live/lttng-live.h 2018-07-03 19:41:31.000000000 +0000 @@ -88,6 +88,7 @@ struct bt_list_head stream_list; FILE *metadata_fp; struct bt_trace_handle *handle; + /* Set to -1 when not initialized. */ int trace_id; int in_use; }; diff -Nru babeltrace-1.5.5/formats/lttng-live/lttng-live-plugin.c babeltrace-1.5.6/formats/lttng-live/lttng-live-plugin.c --- babeltrace-1.5.5/formats/lttng-live/lttng-live-plugin.c 2018-03-26 19:34:10.000000000 +0000 +++ babeltrace-1.5.6/formats/lttng-live/lttng-live-plugin.c 2018-07-03 19:41:31.000000000 +0000 @@ -103,7 +103,7 @@ static int parse_url(const char *path, struct lttng_live_ctx *ctx) { - char remain[3][MAXNAMLEN]; + char remain[3][MAXNAMLEN] = { { 0 } }; int ret = -1, proto, proto_offset = 0; size_t path_len = strlen(path); /* not accounting \0 */ @@ -185,6 +185,7 @@ if (ret != 2) { fprintf(stderr, "[error] Format : " "net:///host//\n"); + ret = -1; goto end; }