From 9eff6a89157ae02de4ffd05b0d223b90865125a5 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Wed, 2 Nov 2022 16:07:17 -0400 Subject: [PATCH] New upstream release 1.5.11 --- .gitignore | 1 + babeltrace-rhbz2126067-use-after-free.patch | 32 --------------------- babeltrace.spec | 16 +++++++---- python39.patch | 19 ------------ sources | 4 +-- 5 files changed, 13 insertions(+), 59 deletions(-) delete mode 100644 babeltrace-rhbz2126067-use-after-free.patch delete mode 100644 python39.patch diff --git a/.gitignore b/.gitignore index a1f75db..b30cddb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /babeltrace-1.*.tar.bz2 /babeltrace-1.5.7.tar.bz2.asc /babeltrace-1.5.8.tar.bz2.asc +/babeltrace-1.5.11.tar.bz2.asc diff --git a/babeltrace-rhbz2126067-use-after-free.patch b/babeltrace-rhbz2126067-use-after-free.patch deleted file mode 100644 index 9835fd7..0000000 --- a/babeltrace-rhbz2126067-use-after-free.patch +++ /dev/null @@ -1,32 +0,0 @@ -*** babeltrace-1.5.8/converter/babeltrace.c.orig 2022-09-15 12:36:49.826369817 -0700 ---- babeltrace-1.5.8/converter/babeltrace.c 2022-09-15 13:48:21.642157222 -0700 -*************** static int parse_options(int argc, char -*** 449,455 **** - do { - ipath = poptGetArg(pc); - if (ipath) -! g_ptr_array_add(opt_input_paths, (gpointer) ipath); - } while (ipath); - if (opt_input_paths->len == 0) { - ret = -EINVAL; ---- 449,455 ---- - do { - ipath = poptGetArg(pc); - if (ipath) -! g_ptr_array_add(opt_input_paths, (gpointer) strdup(ipath)); - } while (ipath); - if (opt_input_paths->len == 0) { - ret = -EINVAL; -*************** end: -*** 880,885 **** ---- 880,889 ---- - free(opt_output_path); - free(opt_debug_info_dir); - free(opt_debug_info_target_prefix); -+ for (i = 0; i < opt_input_paths->len; i++) { -+ char *ipath = g_ptr_array_index(opt_input_paths, i); -+ free(ipath); -+ } - g_ptr_array_free(opt_input_paths, TRUE); - if (partial_error) - exit(EXIT_FAILURE); diff --git a/babeltrace.spec b/babeltrace.spec index 52a58f5..14cde84 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace -Version: 1.5.8 -Release: 13%{?dist} +Version: 1.5.11 +Release: 1%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT and GPLv2 URL: https://www.efficios.com/babeltrace @@ -8,9 +8,7 @@ Source0: https://www.efficios.com/files/%{name}/%{name}-%{version}.tar.bz Source1: https://www.efficios.com/files/%{name}/%{name}-%{version}.tar.bz2.asc # gpg2 --export --export-options export-minimal 7F49314A26E0DE78427680E05F1B2A0789F12B11 > gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg Source2: gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg -Patch0: python39.patch -Patch1: babeltrace-getaddrinfo.patch -Patch2: babeltrace-rhbz2126067-use-after-free.patch +Patch0: babeltrace-getaddrinfo.patch BuildRequires: bison >= 2.4 BuildRequires: flex >= 2.5.35 @@ -18,11 +16,12 @@ BuildRequires: glib2-devel >= 2.22.0 BuildRequires: libuuid-devel BuildRequires: popt-devel >= 1.13 BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: swig >= 2.0 BuildRequires: elfutils-devel >= 0.154 BuildRequires: autoconf automake libtool BuildRequires: gnupg2 -BuildRequires: make +BuildRequires: make Requires: lib%{name}%{?_isa} = %{version}-%{release} @@ -118,6 +117,11 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Wed Nov 02 2022 Michael Jeanson - 1.5.11-1 +- New upstream release +- Drop patches merged upstream +- Add builddep on python3-setuptools for Python 3.12+ + * Fri Sep 16 2022 Keith Seitz - 1.5.8-13 - Add use-after-free patch for popt-1.19 update. (Keith Seitz, RHBZ 2126067) diff --git a/python39.patch b/python39.patch deleted file mode 100644 index 4a24bee..0000000 --- a/python39.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/bindings/python/babeltrace/babeltrace.i.in b/bindings/python/babeltrace/babeltrace.i.in -index a773e9b3..b3bb53a0 100644 ---- a/bindings/python/babeltrace/babeltrace.i.in -+++ b/bindings/python/babeltrace/babeltrace.i.in -@@ -672,8 +672,8 @@ class CTFScope: - _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. --- -2.17.1 - - diff --git a/sources b/sources index 072190d..98e182a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (babeltrace-1.5.8.tar.bz2) = 827749ae8507efd433bb97ef668628837a3ff15b5be5097af5621d46055c6f10401da0be1f9d9f843a96c8c307b33745e04284d166e275e03b7ddb0a7dd57e96 -SHA512 (babeltrace-1.5.8.tar.bz2.asc) = 6e0802a1541029086f2003526a801b43d361d1586893f8d193cc95b3a20e86c0da4141b81c641b4902f7c3c0ecd5e6ab94f3a5a83ae64917c4628feec48931d4 +SHA512 (babeltrace-1.5.11.tar.bz2) = a3158bb9d0306c1cab6ac3d16ba542605ad60b13ecb10fe740a3b95168f0ead87d31483a06d49a15341f7ef6def16765d9a6045f40a60cd8b94070d979c0c3d1 +SHA512 (babeltrace-1.5.11.tar.bz2.asc) = 63b662d53b57f70793e6729c74d9a78a09789f3846589835de87baae423b793b0d7ed7c0e66b118d61e52c5775710b0e7b07b337eb69f6fcc1b382abaf047924