import UBI babeltrace-1.5.11-9.el10

This commit is contained in:
eabdullin 2025-05-14 15:48:00 +00:00
parent e69a3d0cb5
commit bf9a7ad4e8
6 changed files with 248 additions and 18 deletions

View File

@ -1 +0,0 @@
7c9f7d67ec1d260cb1c5b7448e2173b1c8ce07d7 SOURCES/babeltrace-1.5.4.tar.bz2

3
.gitignore vendored
View File

@ -1 +1,2 @@
SOURCES/babeltrace-1.5.4.tar.bz2
babeltrace-1.5.11.tar.bz2
gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEf0kxSibg3nhCdoDgXxsqB4nxKxEFAmNiiKYACgkQXxsqB4nx
KxG3/w//ezwnlYk6dIudpWWBue7FpPCnGFeMi0ShhCgApoOaJGpsUn5+nyWfTM6W
ZNuu2b6T7eMQbpXGeEp3KyLSLR3nSYSnqWfgFNdP+fZjK7hPigwCQHatzPDCbkGe
vNBYRIgh3H64w6j/31kRw+3BFLY7jcdRlsbfEjgjNZ+rUFtaSyaRd3kdEm68Ls+p
9kihW25n+m8yzF5nz+eq03RPfPeUdBY96y/G0Bkb1PWclo5a8gN9+8+qC2mGvXMY
WS9xDHwHuS/3tS73UCmza2teE0QFnAHxLO6oqVGKBNduetjkjsfFOcRnINaz0iRN
PqNXeZMsZawJ/eNVKURJZO4br135Tz7w458YNRgekzAuDLvabNUCIhuncb6zaKmr
FTbxgMF13IOTJWLekdTW2K2b0PODTWi3mqKaKx7uumJwuK0rrYbJZN884UnYiL+/
olSBtoteMsIL47/p/YJ0DzGDezB5e2KtEu8hOSinx4qV6ZBrKmANh/cIalzYKUoO
2dXRpeJDuFGgPKKdNfH7IHAoa0POQdL/BPS8/CyaKQO3Iuv16FZ4+9rlyL/MXALt
SEJk9OpwNMgB8WKyqfCVBrjCfxxyNBQhOGmKFfrOVzMgnYKEkDp1PDLYiohqmEEx
kunDYgOKyq3xN0hCMy0SAIMBr7AJLnRMJlyhpk2i5cy0dQF5edY=
=duqd
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,106 @@
*** babeltrace-1.5.8.orig/configure.ac 2021-04-22 09:56:01.645909350 -0700
--- babeltrace-1.5.8/configure.ac 2021-04-22 10:41:30.537328243 -0700
*************** AC_CHECK_FUNCS([ \
*** 102,108 ****
dirfd \
dup2 \
ftruncate \
! gethostbyname \
gethostname \
gettimeofday \
localtime_r \
--- 102,108 ----
dirfd \
dup2 \
ftruncate \
! getaddrinfo \
gethostname \
gettimeofday \
localtime_r \
*** babeltrace-1.5.8.orig/formats/lttng-live/lttng-live-comm.c 2021-04-22 09:56:01.662909278 -0700
--- babeltrace-1.5.8/formats/lttng-live/lttng-live-comm.c 2021-04-22 11:01:13.166302197 -0700
*************** ssize_t lttng_live_send(int fd, const vo
*** 111,149 ****
int lttng_live_connect_viewer(struct lttng_live_ctx *ctx)
{
- struct hostent *host;
- struct sockaddr_in server_addr;
int ret;
if (lttng_live_should_quit()) {
ret = -1;
goto end;
}
! host = gethostbyname(ctx->relay_hostname);
! if (!host) {
! fprintf(stderr, "[error] Cannot lookup hostname %s\n",
! ctx->relay_hostname);
goto error;
}
! if ((ctx->control_sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) {
perror("Socket");
goto error;
}
! server_addr.sin_family = AF_INET;
! server_addr.sin_port = htons(ctx->port);
! server_addr.sin_addr = *((struct in_addr *) host->h_addr);
! memset(&(server_addr.sin_zero), 0, 8);
!
! if (connect(ctx->control_sock, (struct sockaddr *) &server_addr,
! sizeof(struct sockaddr)) == -1) {
perror("Connect");
goto error;
}
ret = 0;
end:
return ret;
--- 111,153 ----
int lttng_live_connect_viewer(struct lttng_live_ctx *ctx)
{
int ret;
+ struct addrinfo hints, *res;
+ char port[16];
if (lttng_live_should_quit()) {
ret = -1;
goto end;
}
! memset(&hints, 0, sizeof(hints));
! hints.ai_family = AF_INET;
! hints.ai_socktype = SOCK_STREAM;
! sprintf(port, "%d", ctx->port);
!
! ret = getaddrinfo(ctx->relay_hostname, port, &hints, &res);
! if (ret != 0) {
! fprintf(stderr, "[error] getaddrinfo: %s\n",
! gai_strerror(ret));
goto error;
}
! ctx->control_sock = socket(res->ai_family, res->ai_socktype,
! res->ai_protocol);
! if (ctx->control_sock == -1) {
perror("Socket");
+ freeaddrinfo(res);
goto error;
}
! if (connect(ctx->control_sock, res->ai_addr, res->ai_addrlen) == -1) {
perror("Connect");
+ freeaddrinfo(res);
goto error;
}
ret = 0;
+ freeaddrinfo(res);
end:
return ret;

View File

@ -1,11 +1,14 @@
Name: babeltrace
Version: 1.5.4
Release: 4%{?dist}
Version: 1.5.11
Release: 9%{?dist}
Summary: Trace Viewer and Converter, mainly for the Common Trace Format
License: MIT and GPLv2
License: MIT AND GPL-3.0-or-later WITH Bison-exception-2.2 AND LGPL-2.1-only AND BSD-4-Clause-UC
URL: https://www.efficios.com/babeltrace
Source0: https://www.efficios.com/files/%{name}/%{name}-%{version}.tar.bz2
Group: Development/Tools
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: babeltrace-getaddrinfo.patch
BuildRequires: bison >= 2.4
BuildRequires: flex >= 2.5.35
@ -13,11 +16,13 @@ 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
# For check
BuildRequires: perl-Test-Harness
BuildRequires: gnupg2
BuildRequires: make
Requires: lib%{name}%{?_isa} = %{version}-%{release}
%description
@ -31,7 +36,6 @@ Format (CTF). See http://www.efficios.com/ctf.
%package -n lib%{name}
Summary: Common Trace Format Babel Tower
Group: Development/Libraries
%description -n lib%{name}
This project provides trace read and write libraries, as well as a trace
@ -41,7 +45,6 @@ to/from another trace format.
%package -n lib%{name}-devel
Summary: Common Trace Format Babel Tower
Group: Development/Libraries
Requires: lib%{name}%{?_isa} = %{version}-%{release} glib2-devel
%description -n lib%{name}-devel
@ -52,7 +55,6 @@ to/from another trace format.
%package -n python3-%{name}
Summary: Common Trace Format Babel Tower
Group: Development/Libraries
Requires: lib%{name}%{?_isa} = %{version}-%{release}
%description -n python3-%{name}
@ -62,7 +64,8 @@ to/from another trace format.
%prep
%setup -q
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
%autosetup -p1
%build
# Reinitialize libtool with the fedora version to remove Rpath
@ -87,8 +90,7 @@ rm -f %{buildroot}/%{_pkgdocdir}/gpl-2.0.txt
rm -f %{buildroot}/%{_pkgdocdir}/mit-license.txt
rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt
%post -n lib%{name} -p /sbin/ldconfig
%postun -n lib%{name} -p /sbin/ldconfig
%ldconfig_scriptlets -n lib%{name}
%files
%doc ChangeLog
@ -115,11 +117,115 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt
%changelog
* Wed Mar 2 2022 Bruno Larsen <blarsen@redhat.com> - 1.5.4-4
- Bump NVR for subpackage release.
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.5.11-9
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Wed Jul 1 2020 Keith Seitz <keiths@redhat.com> - 1.5.4-3
- Bump NVR for BaseOS move.
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.5.11-8
- Bump release for June 2024 mass rebuild
* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.11-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.11-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.11-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 1.5.11-4
- Rebuilt for Python 3.12
* Mon May 30 2023 Keith Seitz <keiths@redhat.com>
- Update license expression.
* Mon May 08 2023 Michael Jeanson <mjeanson@efficios.com> - 1.5.11-3
- migrated to SPDX license
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Nov 02 2022 Michael Jeanson <mjeanson@efficios.com> - 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)
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.8-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.5.8-11
- Rebuilt for Python 3.11
* Wed Mar 16 2022 Keith Seitz <keiths@redhat.com> - 1.5.8-10
- Use getaddrinfo instead of gethostbyname.
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.8-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.8-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.5.8-7
- Rebuilt for Python 3.10
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.8-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Nov 16 2020 Keith Seitz <keiths@redhat.com> - 1.5.8-5
- Remove workaround for 1890813 now that binutils is fixed.
* 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
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1.5.8-2
- Rebuilt for Python 3.9
* Wed Feb 12 2020 Michael Jeanson <mjeanson@efficios.com> - 1.5.8-1
- New upstream release
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.7-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jan 16 2020 Michael Jeanson <mjeanson@efficios.com> - 1.5.7-5
- Add Python 3.9 patch
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.5.7-4
- Rebuilt for Python 3.8.0rc1 (#1748018)
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1.5.7-3
- Rebuilt for Python 3.8
* Wed Jul 24 2019 Michael Jeanson <mjeanson@efficios.com> - 1.5.7-2
- Add GPG source file verification
* Wed Jul 24 2019 Michael Jeanson <mjeanson@efficios.com> - 1.5.7-1
- New upstream release
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Jul 24 2018 Michael Jeanson <mjeanson@efficios.com> - 1.5.6-1
- New upstream release
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.5.5-2
- Rebuilt for Python 3.7
* Tue Mar 27 2018 Michael Jeanson <mjeanson@efficios.com> - 1.5.5-1
- New upstream release
* Fri Feb 16 2018 2018 Lumír Balhar <lbalhar@redhat.com> - 1.5.4-2
- Fix directory ownership in python3 subpackage

2
sources Normal file
View File

@ -0,0 +1,2 @@
SHA512 (babeltrace-1.5.11.tar.bz2) = a3158bb9d0306c1cab6ac3d16ba542605ad60b13ecb10fe740a3b95168f0ead87d31483a06d49a15341f7ef6def16765d9a6045f40a60cd8b94070d979c0c3d1
SHA512 (gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg) = 665d483b8462f0fc624d4402a3e94e90019eb83a6877e9ecf48e8a33c737df575ba4bd456a20e4bdbd67adcdcc47aa64dd7303ebd45d255a8bfe6ad951cb799f