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
This commit is contained in:
DistroBaker 2020-10-27 14:38:35 +01:00 committed by Petr Šabata
parent 424bb6ed43
commit 113df3764e
2 changed files with 27 additions and 1 deletions

View File

@ -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;

View File

@ -1,6 +1,6 @@
Name: babeltrace Name: babeltrace
Version: 1.5.8 Version: 1.5.8
Release: 3%{?dist} Release: 4%{?dist}
Summary: Trace Viewer and Converter, mainly for the Common Trace Format Summary: Trace Viewer and Converter, mainly for the Common Trace Format
License: MIT and GPLv2 License: MIT and GPLv2
URL: https://www.efficios.com/babeltrace 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 # gpg2 --export --export-options export-minimal 7F49314A26E0DE78427680E05F1B2A0789F12B11 > gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg
Source2: gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg Source2: gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg
Patch0: python39.patch Patch0: python39.patch
Patch1: babeltrace-__openat_missing_mode.patch
BuildRequires: bison >= 2.4 BuildRequires: bison >= 2.4
BuildRequires: flex >= 2.5.35 BuildRequires: flex >= 2.5.35
@ -115,6 +116,10 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt
%changelog %changelog
* Mon Oct 26 2020 Keith Seitz <keiths@redhat.com> - 1.5.8-4
- Workaround __openat_missing_mode compiler error.
(Keith Seitz, RH BZ 1890813)
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.8-3 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild