From 4202065c301a2b8c8035b20131fa8e6241f8f23c Mon Sep 17 00:00:00 2001 From: Keith Seitz Date: Mon, 16 Nov 2020 10:56:28 -0800 Subject: [PATCH] Remove workaround for 1890813 now that binutils is fixed. --- babeltrace-__openat_missing_mode.patch | 21 --------------------- babeltrace.spec | 6 ++++-- 2 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 babeltrace-__openat_missing_mode.patch diff --git a/babeltrace-__openat_missing_mode.patch b/babeltrace-__openat_missing_mode.patch deleted file mode 100644 index 9542d55..0000000 --- a/babeltrace-__openat_missing_mode.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- 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 b4ac740..3600b73 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT and GPLv2 URL: https://www.efficios.com/babeltrace @@ -9,7 +9,6 @@ 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 @@ -116,6 +115,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Mon Nov 16 2020 Keith Seitz - 1.5.8-5 +- Remove workaround for 1890813 now that binutils is fixed. + * Mon Oct 26 2020 Keith Seitz - 1.5.8-4 - Workaround __openat_missing_mode compiler error. (Keith Seitz, RH BZ 1890813)