diff -Nru babeltrace-1.5.8/bindings/python/babeltrace/babeltrace.i.in babeltrace-1.5.11/bindings/python/babeltrace/babeltrace.i.in --- babeltrace-1.5.8/bindings/python/babeltrace/babeltrace.i.in 2020-02-05 19:45:47.000000000 +0000 +++ babeltrace-1.5.11/bindings/python/babeltrace/babeltrace.i.in 2022-11-02 15:09:19.000000000 +0000 @@ -672,8 +672,11 @@ _scopes = [CTFScope.EVENT_FIELDS, CTFScope.EVENT_CONTEXT, CTFScope.STREAM_EVENT_CONTEXT, CTFScope.STREAM_EVENT_HEADER, CTFScope.STREAM_PACKET_CONTEXT, CTFScope.TRACE_PACKET_HEADER] -import collections -class Event(collections.Mapping): +try: + import collections.abc as collections_abc +except ImportError: + import collections as collections_abc # Fallback for Python 3.2 +class Event(collections_abc.Mapping): """ This class represents an event from the trace. It is obtained using the TraceCollection generator functions. diff -Nru babeltrace-1.5.8/bindings/python/setup.py.in babeltrace-1.5.11/bindings/python/setup.py.in --- babeltrace-1.5.8/bindings/python/setup.py.in 2020-02-05 19:45:47.000000000 +0000 +++ babeltrace-1.5.11/bindings/python/setup.py.in 2022-11-02 15:09:19.000000000 +0000 @@ -22,7 +22,10 @@ import sys -from distutils.core import setup, Extension +if sys.version_info < (3, 12): + from distutils.core import setup, Extension +else: + from setuptools import setup, Extension PY_PATH_WARN_MSG = """ -------------------------------------WARNING------------------------------------ diff -Nru babeltrace-1.5.8/ChangeLog babeltrace-1.5.11/ChangeLog --- babeltrace-1.5.8/ChangeLog 2020-02-05 19:45:47.000000000 +0000 +++ babeltrace-1.5.11/ChangeLog 2022-11-02 15:09:19.000000000 +0000 @@ -1,3 +1,17 @@ +2022-11-02 babeltrace 1.5.11 (Broadcast Traffic Professionals Day) + * Fix: distutils removed in python 3.12 + * Fix: use-after-free with popt 1.19 + * configure.ac: Basic fixes for autoconf 2.70 + * Add gerrit config for stable-1.5 + +2022-11-01 babeltrace 1.5.10 (National Calzone Day) + +2022-11-01 babeltrace 1.5.9 (National Calzone Day) + * port: disable debug-info by default on FreeBSD + * port: add missing includes for FreeBSD compat + * bindings: try importing collections.abc first for forward compatibility + * man: fix typo in babeltrace.1 + 2020-02-05 babeltrace 1.5.8 (National Chocolate Fondue Day) * Fix: lttng-live format: do not error out on empty streams hang up * Fix: lttng-live: ctf_live_packet_seek stream hang up handling diff -Nru babeltrace-1.5.8/configure babeltrace-1.5.11/configure --- babeltrace-1.5.8/configure 2020-02-05 19:45:56.000000000 +0000 +++ babeltrace-1.5.11/configure 2022-11-02 15:09:28.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.8. +# Generated by GNU Autoconf 2.69 for babeltrace 1.5.11. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='babeltrace' PACKAGE_TARNAME='babeltrace' -PACKAGE_VERSION='1.5.8' -PACKAGE_STRING='babeltrace 1.5.8' +PACKAGE_VERSION='1.5.11' +PACKAGE_STRING='babeltrace 1.5.11' 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.8 to adapt to many kinds of systems. +\`configure' configures babeltrace 1.5.11 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.8:";; + short | recursive ) echo "Configuration of babeltrace 1.5.11:";; 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.8 +babeltrace configure 1.5.11 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.8, which was +It was created by babeltrace $as_me 1.5.11, 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.8' + VERSION='1.5.11' cat >>confdefs.h <<_ACEOF @@ -5736,6 +5736,7 @@ fi +# AC_PROG_CC_STDC was merged in AC_PROG_CC in autoconf 2.70 case $ac_cv_prog_cc_stdc in #( no) : ac_cv_prog_cc_c99=no; ac_cv_prog_cc_c89=no ;; #( @@ -13720,6 +13721,8 @@ done test -n "$YACC" || YACC="yacc" +# Prior to autoconf 2.70, AC_PROG_FLEX did not take an argument. This is not a +# problem since the argument is silently ignored by older versions. for ac_prog in flex lex do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -16472,6 +16475,10 @@ DEFAULT_ENABLE_DEBUG_INFO=no ;; #( + freebsd*) : + + DEFAULT_ENABLE_DEBUG_INFO=no + ;; #( mingw*) : MINGW32=yes @@ -18594,7 +18601,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.8, which was +This file was extended by babeltrace $as_me 1.5.11, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18665,7 +18672,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.8 +babeltrace config.status 1.5.11 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru babeltrace-1.5.8/configure.ac babeltrace-1.5.11/configure.ac --- babeltrace-1.5.8/configure.ac 2020-02-05 19:45:47.000000000 +0000 +++ babeltrace-1.5.11/configure.ac 2022-11-02 15:09:19.000000000 +0000 @@ -1,5 +1,5 @@ AC_PREREQ([2.50]) -AC_INIT([babeltrace],[1.5.8],[jeremie.galarneau@efficios.com],[],[https://diamon.org/babeltrace]) +AC_INIT([babeltrace],[1.5.11],[jeremie.galarneau@efficios.com],[],[https://diamon.org/babeltrace]) AC_SUBST([BABELTRACE_LIBRARY_VERSION], [1:0:0]) AC_CONFIG_HEADERS([config.h]) @@ -21,13 +21,16 @@ AC_USE_SYSTEM_EXTENSIONS AC_SYS_LARGEFILE AC_PROG_CC -AC_PROG_CC_STDC +# AC_PROG_CC_STDC was merged in AC_PROG_CC in autoconf 2.70 +m4_version_prereq([2.70], [], [AC_PROG_CC_STDC]) # Checks for programs. AC_PROG_MAKE_SET LT_INIT AC_PROG_YACC -AC_PROG_LEX +# Prior to autoconf 2.70, AC_PROG_FLEX did not take an argument. This is not a +# problem since the argument is silently ignored by older versions. +AC_PROG_LEX([noyywrap]) AC_PROG_MKDIR_P AC_PROG_LN_S @@ -134,6 +137,10 @@ [ DEFAULT_ENABLE_DEBUG_INFO=no ], + [freebsd*], + [ + DEFAULT_ENABLE_DEBUG_INFO=no + ], [mingw*], [ MINGW32=yes @@ -232,7 +239,7 @@ swig_version=2.0.0 AC_ARG_ENABLE([python-bindings], - [AC_HELP_STRING([--enable-python-bindings], + [AS_HELP_STRING([--enable-python-bindings], [generate Python bindings])], [enable_python=yes], [enable_python=no]) @@ -272,8 +279,8 @@ # Do _not_ indent the help string below (appears in the configure --help # output). AC_ARG_ENABLE([debug-info], -[AC_HELP_STRING([--enable-debug-info], [enable the debug info feature (default on Linux)])] -[AC_HELP_STRING([--disable-debug-info], [disable the debug info feature (default on OS X and Solaris)])], +[AS_HELP_STRING([--enable-debug-info], [enable the debug info feature (default on Linux)])] +[AS_HELP_STRING([--disable-debug-info], [disable the debug info feature (default on OS X and Solaris)])], [AS_IF([test "x$enableval" = xyes], [_enable_debug_info=yes], [_enable_debug_info=no])], []) AM_CONDITIONAL([ENABLE_DEBUG_INFO], [test "x$_enable_debug_info" = xyes]) diff -Nru babeltrace-1.5.8/converter/babeltrace.c babeltrace-1.5.11/converter/babeltrace.c --- babeltrace-1.5.8/converter/babeltrace.c 2020-02-05 19:45:47.000000000 +0000 +++ babeltrace-1.5.11/converter/babeltrace.c 2022-11-02 15:09:19.000000000 +0000 @@ -448,8 +448,17 @@ do { ipath = poptGetArg(pc); - if (ipath) - g_ptr_array_add(opt_input_paths, (gpointer) ipath); + if (ipath) { + gpointer ipath_copy = strdup(ipath); + + if (!ipath_copy) { + perror("Failed to copy input path"); + ret = -1; + goto end; + } + + g_ptr_array_add(opt_input_paths, ipath_copy); + } } while (ipath); if (opt_input_paths->len == 0) { ret = -EINVAL; @@ -726,6 +735,12 @@ bt_ctf_metadata_hook(); } +static +void free_ptr_array_element(gpointer ptr, gpointer user_data __attribute__((unused))) +{ + free(ptr); +} + int main(int argc, char **argv) { int ret, partial_error = 0, open_success = 0; @@ -880,6 +895,7 @@ free(opt_output_path); free(opt_debug_info_dir); free(opt_debug_info_target_prefix); + g_ptr_array_foreach(opt_input_paths, free_ptr_array_element, NULL); g_ptr_array_free(opt_input_paths, TRUE); if (partial_error) exit(EXIT_FAILURE); diff -Nru babeltrace-1.5.8/debian/babeltrace.docs babeltrace-1.5.11/debian/babeltrace.docs --- babeltrace-1.5.8/debian/babeltrace.docs 2020-02-06 20:45:27.000000000 +0000 +++ babeltrace-1.5.11/debian/babeltrace.docs 2022-11-02 15:33:45.000000000 +0000 @@ -1,5 +1,5 @@ README -std-ext-lib.txt -doc/API.txt doc/development.txt -doc/lttng-live.txt +usr/share/doc/babeltrace/std-ext-lib.txt +usr/share/doc/babeltrace/API.txt +usr/share/doc/babeltrace/lttng-live.txt diff -Nru babeltrace-1.5.8/debian/changelog babeltrace-1.5.11/debian/changelog --- babeltrace-1.5.8/debian/changelog 2022-11-02 10:12:46.000000000 +0000 +++ babeltrace-1.5.11/debian/changelog 2022-11-02 15:48:32.000000000 +0000 @@ -1,14 +1,18 @@ -babeltrace (1.5.8-2build2) lunar; urgency=medium +babeltrace (1.5.11-1) unstable; urgency=medium - * No-change rebuild with Python 3.11 as supported + * [84c2292] New upstream version 1.5.11 + * [6344803] Drop patches merged upstream - -- Graham Inggs Wed, 02 Nov 2022 10:12:46 +0000 + -- Michael Jeanson Wed, 02 Nov 2022 11:48:32 -0400 -babeltrace (1.5.8-2build1) jammy; urgency=medium +babeltrace (1.5.8-3) unstable; urgency=medium - * No-change rebuild with Python 3.10 only. + * [d06a2f0] Update Salsa CI configuration + * [8d0c59c] Fix popt use after free (Closes: #1022419) + * [577d3d3] Migrate to debhelper 13 + * [b689c6f] d/control: Drop X-Python3-Version - -- Matthias Klose Thu, 17 Mar 2022 15:06:15 +0100 + -- Michael Jeanson Sun, 30 Oct 2022 14:56:36 -0400 babeltrace (1.5.8-2) unstable; urgency=medium diff -Nru babeltrace-1.5.8/debian/control babeltrace-1.5.11/debian/control --- babeltrace-1.5.8/debian/control 2022-01-22 16:13:38.000000000 +0000 +++ babeltrace-1.5.11/debian/control 2022-11-02 15:33:45.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Jon Bernard Uploaders: Michael Jeanson -Build-Depends: debhelper-compat (= 12), +Build-Depends: debhelper-compat (= 13), dh-python, libdw-dev (>= 0.154), libelf-dev (>= 0.154), @@ -17,7 +17,6 @@ Vcs-Browser: https://salsa.debian.org/debian/babeltrace Homepage: https://www.efficios.com/babeltrace Rules-Requires-Root: no -X-Python3-Version: >= 3.3 Package: babeltrace Section: utils diff -Nru babeltrace-1.5.8/debian/not-installed babeltrace-1.5.11/debian/not-installed --- babeltrace-1.5.8/debian/not-installed 1970-01-01 00:00:00.000000000 +0000 +++ babeltrace-1.5.11/debian/not-installed 2022-11-02 15:33:45.000000000 +0000 @@ -0,0 +1,6 @@ +usr/lib/${DEB_HOST_MULTIARCH}/*.la +usr/lib/python3/dist-packages/*.egg-info +usr/share/doc/babeltrace/ChangeLog +usr/share/doc/babeltrace/gpl-2.0.txt +usr/share/doc/babeltrace/LICENSE +usr/share/doc/babeltrace/mit-license.txt diff -Nru babeltrace-1.5.8/debian/patches/0001-Fix-Hurd-compat-for-PATH_MAX.patch babeltrace-1.5.11/debian/patches/0001-Fix-Hurd-compat-for-PATH_MAX.patch --- babeltrace-1.5.8/debian/patches/0001-Fix-Hurd-compat-for-PATH_MAX.patch 2020-02-06 20:45:27.000000000 +0000 +++ babeltrace-1.5.11/debian/patches/0001-Fix-Hurd-compat-for-PATH_MAX.patch 2022-11-02 15:35:17.000000000 +0000 @@ -13,7 +13,7 @@ --- a/include/babeltrace/compat/limits.h +++ b/include/babeltrace/compat/limits.h -@@ -43,4 +43,9 @@ +@@ -45,4 +45,9 @@ #endif /* __linux__, __FreeBSD__, _POSIX_HOST_NAME_MAX */ diff -Nru babeltrace-1.5.8/debian/patches/python-3.10-support.patch babeltrace-1.5.11/debian/patches/python-3.10-support.patch --- babeltrace-1.5.8/debian/patches/python-3.10-support.patch 2022-01-22 15:51:54.000000000 +0000 +++ babeltrace-1.5.11/debian/patches/python-3.10-support.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -Th Mapping abstract class was moved to collections.abc in python 3.3 and the -compat remove in 3.10. - ---- a/bindings/python/babeltrace/babeltrace.i.in -+++ b/bindings/python/babeltrace/babeltrace.i.in -@@ -672,8 +672,8 @@ - _scopes = [CTFScope.EVENT_FIELDS, CTFScope.EVENT_CONTEXT, CTFScope.STREAM_EVENT_CONTEXT, - CTFScope.STREAM_EVENT_HEADER, CTFScope.STREAM_PACKET_CONTEXT, CTFScope.TRACE_PACKET_HEADER] - --import collections --class Event(collections.Mapping): -+import collections.abc -+class Event(collections.abc.Mapping): - """ - This class represents an event from the trace. - It is obtained using the TraceCollection generator functions. diff -Nru babeltrace-1.5.8/debian/patches/series babeltrace-1.5.11/debian/patches/series --- babeltrace-1.5.8/debian/patches/series 2022-01-22 15:49:48.000000000 +0000 +++ babeltrace-1.5.11/debian/patches/series 2022-11-02 15:35:17.000000000 +0000 @@ -1,2 +1 @@ -python-3.10-support.patch 0001-Fix-Hurd-compat-for-PATH_MAX.patch diff -Nru babeltrace-1.5.8/debian/salsa-ci.yml babeltrace-1.5.11/debian/salsa-ci.yml --- babeltrace-1.5.8/debian/salsa-ci.yml 2020-02-06 21:12:40.000000000 +0000 +++ babeltrace-1.5.11/debian/salsa-ci.yml 2022-11-02 15:33:45.000000000 +0000 @@ -1,22 +1,4 @@ -include: https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - -variables: - RELEASE: 'unstable' - -build: - extends: .build-package - -reprotest: - extends: .test-reprotest - -lintian: - extends: .test-lintian - -autopkgtest: - extends: .test-autopkgtest - -blhc: - extends: .test-blhc - -piuparts: - extends: .test-piuparts +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff -Nru babeltrace-1.5.8/debian/source/lintian-overrides babeltrace-1.5.11/debian/source/lintian-overrides --- babeltrace-1.5.8/debian/source/lintian-overrides 2022-01-22 16:13:38.000000000 +0000 +++ babeltrace-1.5.11/debian/source/lintian-overrides 2022-11-02 15:33:45.000000000 +0000 @@ -1,14 +1,16 @@ # Test suite artifacts -babeltrace source: source-contains-prebuilt-binary tests/debug-info-data/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug -babeltrace source: source-contains-prebuilt-binary tests/debug-info-data/libhello_build_id_so -babeltrace source: source-contains-prebuilt-binary tests/debug-info-data/libhello_debug_link_so -babeltrace source: source-contains-prebuilt-binary tests/debug-info-data/libhello_debug_link_so.debug -babeltrace source: source-contains-prebuilt-binary tests/debug-info-data/libhello_elf_so -babeltrace source: source-contains-prebuilt-binary tests/debug-info-data/libhello_so +babeltrace source: source-contains-prebuilt-binary [tests/debug-info-data/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug] +babeltrace source: source-contains-prebuilt-binary [tests/debug-info-data/libhello_build_id_so] +babeltrace source: source-contains-prebuilt-binary [tests/debug-info-data/libhello_debug_link_so.debug] +babeltrace source: source-contains-prebuilt-binary [tests/debug-info-data/libhello_debug_link_so] +babeltrace source: source-contains-prebuilt-binary [tests/debug-info-data/libhello_elf_so] +babeltrace source: source-contains-prebuilt-binary [tests/debug-info-data/libhello_so] +babeltrace source: binary-with-bad-dynamic-table [tests/debug-info-data/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug] +babeltrace source: binary-with-bad-dynamic-table [tests/debug-info-data/libhello_debug_link_so.debug] # Source for pre-build artifacts is located in tests/debug-info-data/libhello.c -babeltrace source: source-is-missing tests/debug-info-data/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug -babeltrace source: source-is-missing tests/debug-info-data/libhello_build_id_so -babeltrace source: source-is-missing tests/debug-info-data/libhello_debug_link_so -babeltrace source: source-is-missing tests/debug-info-data/libhello_debug_link_so.debug -babeltrace source: source-is-missing tests/debug-info-data/libhello_elf_so -babeltrace source: source-is-missing tests/debug-info-data/libhello_so +babeltrace source: source-is-missing [tests/debug-info-data/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug] +babeltrace source: source-is-missing [tests/debug-info-data/libhello_build_id_so] +babeltrace source: source-is-missing [tests/debug-info-data/libhello_debug_link_so.debug] +babeltrace source: source-is-missing [tests/debug-info-data/libhello_debug_link_so] +babeltrace source: source-is-missing [tests/debug-info-data/libhello_elf_so] +babeltrace source: source-is-missing [tests/debug-info-data/libhello_so] diff -Nru babeltrace-1.5.8/doc/babeltrace.1 babeltrace-1.5.11/doc/babeltrace.1 --- babeltrace-1.5.8/doc/babeltrace.1 2020-02-05 19:45:47.000000000 +0000 +++ babeltrace-1.5.11/doc/babeltrace.1 2022-11-02 15:09:19.000000000 +0000 @@ -17,7 +17,7 @@ into a human-readable text output ordered by time. .PP -This program follow the usual GNU command line syntax with long options +This program follows the usual GNU command line syntax with long options starting with two dashes. Below is a summary of the available options. .PP diff -Nru babeltrace-1.5.8/include/babeltrace/compat/limits.h babeltrace-1.5.11/include/babeltrace/compat/limits.h --- babeltrace-1.5.8/include/babeltrace/compat/limits.h 2020-02-05 19:45:47.000000000 +0000 +++ babeltrace-1.5.11/include/babeltrace/compat/limits.h 2022-11-02 15:09:19.000000000 +0000 @@ -31,6 +31,8 @@ #elif defined(__FreeBSD__) +#include + #define BABELTRACE_HOST_NAME_MAX MAXHOSTNAMELEN #elif defined(_POSIX_HOST_NAME_MAX) diff -Nru babeltrace-1.5.8/include/babeltrace/endian.h babeltrace-1.5.11/include/babeltrace/endian.h --- babeltrace-1.5.8/include/babeltrace/endian.h 2020-02-05 19:45:47.000000000 +0000 +++ babeltrace-1.5.11/include/babeltrace/endian.h 2022-11-02 15:09:19.000000000 +0000 @@ -28,7 +28,7 @@ */ #ifdef __FreeBSD__ -#include +#include #elif defined(__sun__) #include