From 113df3764e205661e9dc23def3b54b972e753063 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Tue, 27 Oct 2020 14:38:35 +0100 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/babeltrace.git#e68e952d97dcc6f10f4675202e924b70d3dafe46 --- babeltrace-__openat_missing_mode.patch | 21 +++++++++++++++++++++ babeltrace.spec | 7 ++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 babeltrace-__openat_missing_mode.patch diff --git a/babeltrace-__openat_missing_mode.patch b/babeltrace-__openat_missing_mode.patch new file mode 100644 index 0000000..9542d55 --- /dev/null +++ b/babeltrace-__openat_missing_mode.patch @@ -0,0 +1,21 @@ +--- babeltrace-1.5.8/formats/ctf/ctf.c.orig 2020-10-23 11:45:34.351789250 -0700 ++++ babeltrace-1.5.8/formats/ctf/ctf.c 2020-10-23 12:16:24.236460342 -0700 +@@ -2191,7 +2191,7 @@ + struct stat statbuf; + char *index_name; + +- fd = openat(td->dirfd, path, flags); ++ fd = openat(td->dirfd, path, flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); + if (fd < 0) { + perror("File stream openat()"); + ret = fd; +@@ -2265,7 +2265,8 @@ + goto error_index; + } + } else { +- ret = openat(td->dirfd, index_name, flags); ++ ret = openat(td->dirfd, index_name, flags, ++ S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); + if (ret < 0) { + perror("Index file openat()"); + ret = -1; diff --git a/babeltrace.spec b/babeltrace.spec index 30c27fd..b4ac740 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT and GPLv2 URL: https://www.efficios.com/babeltrace @@ -9,6 +9,7 @@ Source1: https://www.efficios.com/files/%{name}/%{name}-%{version}.tar.bz # gpg2 --export --export-options export-minimal 7F49314A26E0DE78427680E05F1B2A0789F12B11 > gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg Source2: gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg Patch0: python39.patch +Patch1: babeltrace-__openat_missing_mode.patch BuildRequires: bison >= 2.4 BuildRequires: flex >= 2.5.35 @@ -115,6 +116,10 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Mon Oct 26 2020 Keith Seitz - 1.5.8-4 +- Workaround __openat_missing_mode compiler error. + (Keith Seitz, RH BZ 1890813) + * Mon Jul 27 2020 Fedora Release Engineering - 1.5.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild