Compare commits
No commits in common. "c9s" and "c8" have entirely different histories.
@ -1,2 +1 @@
|
|||||||
574dd85d98146974518212792c4ae9abb57f3084 babeltrace-1.5.8.tar.bz2
|
7c9f7d67ec1d260cb1c5b7448e2173b1c8ce07d7 SOURCES/babeltrace-1.5.4.tar.bz2
|
||||||
0cc3469c331c5b931829c97f6c725e70df53ebbd babeltrace-1.5.8.tar.bz2.asc
|
|
||||||
|
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,3 +1 @@
|
|||||||
/babeltrace-1.*.tar.bz2
|
SOURCES/babeltrace-1.5.4.tar.bz2
|
||||||
/babeltrace-1.5.7.tar.bz2.asc
|
|
||||||
/babeltrace-1.5.8.tar.bz2.asc
|
|
||||||
|
@ -1,15 +1,11 @@
|
|||||||
Name: babeltrace
|
Name: babeltrace
|
||||||
Version: 1.5.8
|
Version: 1.5.4
|
||||||
Release: 10%{?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
|
||||||
Source0: https://www.efficios.com/files/%{name}/%{name}-%{version}.tar.bz2
|
Source0: https://www.efficios.com/files/%{name}/%{name}-%{version}.tar.bz2
|
||||||
Source1: https://www.efficios.com/files/%{name}/%{name}-%{version}.tar.bz2.asc
|
Group: Development/Tools
|
||||||
# gpg2 --export --export-options export-minimal 7F49314A26E0DE78427680E05F1B2A0789F12B11 > gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg
|
|
||||||
Source2: gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg
|
|
||||||
Patch0: python39.patch
|
|
||||||
Patch1: babeltrace-getaddrinfo.patch
|
|
||||||
|
|
||||||
BuildRequires: bison >= 2.4
|
BuildRequires: bison >= 2.4
|
||||||
BuildRequires: flex >= 2.5.35
|
BuildRequires: flex >= 2.5.35
|
||||||
@ -20,9 +16,8 @@ BuildRequires: python3-devel
|
|||||||
BuildRequires: swig >= 2.0
|
BuildRequires: swig >= 2.0
|
||||||
BuildRequires: elfutils-devel >= 0.154
|
BuildRequires: elfutils-devel >= 0.154
|
||||||
BuildRequires: autoconf automake libtool
|
BuildRequires: autoconf automake libtool
|
||||||
BuildRequires: gnupg2
|
# For check
|
||||||
BuildRequires: make
|
BuildRequires: perl-Test-Harness
|
||||||
|
|
||||||
Requires: lib%{name}%{?_isa} = %{version}-%{release}
|
Requires: lib%{name}%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -36,6 +31,7 @@ Format (CTF). See http://www.efficios.com/ctf.
|
|||||||
|
|
||||||
%package -n lib%{name}
|
%package -n lib%{name}
|
||||||
Summary: Common Trace Format Babel Tower
|
Summary: Common Trace Format Babel Tower
|
||||||
|
Group: Development/Libraries
|
||||||
|
|
||||||
%description -n lib%{name}
|
%description -n lib%{name}
|
||||||
This project provides trace read and write libraries, as well as a trace
|
This project provides trace read and write libraries, as well as a trace
|
||||||
@ -45,6 +41,7 @@ to/from another trace format.
|
|||||||
|
|
||||||
%package -n lib%{name}-devel
|
%package -n lib%{name}-devel
|
||||||
Summary: Common Trace Format Babel Tower
|
Summary: Common Trace Format Babel Tower
|
||||||
|
Group: Development/Libraries
|
||||||
Requires: lib%{name}%{?_isa} = %{version}-%{release} glib2-devel
|
Requires: lib%{name}%{?_isa} = %{version}-%{release} glib2-devel
|
||||||
|
|
||||||
%description -n lib%{name}-devel
|
%description -n lib%{name}-devel
|
||||||
@ -55,6 +52,7 @@ to/from another trace format.
|
|||||||
|
|
||||||
%package -n python3-%{name}
|
%package -n python3-%{name}
|
||||||
Summary: Common Trace Format Babel Tower
|
Summary: Common Trace Format Babel Tower
|
||||||
|
Group: Development/Libraries
|
||||||
Requires: lib%{name}%{?_isa} = %{version}-%{release}
|
Requires: lib%{name}%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
%description -n python3-%{name}
|
%description -n python3-%{name}
|
||||||
@ -64,8 +62,7 @@ to/from another trace format.
|
|||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
|
%setup -q
|
||||||
%autosetup -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# Reinitialize libtool with the fedora version to remove Rpath
|
# Reinitialize libtool with the fedora version to remove Rpath
|
||||||
@ -90,7 +87,8 @@ rm -f %{buildroot}/%{_pkgdocdir}/gpl-2.0.txt
|
|||||||
rm -f %{buildroot}/%{_pkgdocdir}/mit-license.txt
|
rm -f %{buildroot}/%{_pkgdocdir}/mit-license.txt
|
||||||
rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt
|
rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt
|
||||||
|
|
||||||
%ldconfig_scriptlets -n lib%{name}
|
%post -n lib%{name} -p /sbin/ldconfig
|
||||||
|
%postun -n lib%{name} -p /sbin/ldconfig
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc ChangeLog
|
%doc ChangeLog
|
||||||
@ -117,75 +115,11 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Mar 16 2022 Bruno Larsen <blarsen@redhat.com> - 1.5.8-10
|
* Wed Mar 2 2022 Bruno Larsen <blarsen@redhat.com> - 1.5.4-4
|
||||||
- Use getaddrinfo instead of gethostbyname.
|
- Bump NVR for subpackage release.
|
||||||
(Keith Seitz)
|
|
||||||
|
|
||||||
* Tue Mar 15 2022 Bruno Larsen <blarsen@redhat.com> - 1.6.8-9
|
* Wed Jul 1 2020 Keith Seitz <keiths@redhat.com> - 1.5.4-3
|
||||||
- Bumped NVR to release subpackage
|
- Bump NVR for BaseOS move.
|
||||||
Related: rhbz#2058409
|
|
||||||
|
|
||||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.5.8-8
|
|
||||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
|
||||||
Related: rhbz#1991688
|
|
||||||
|
|
||||||
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.5.8-7
|
|
||||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
|
||||||
|
|
||||||
* 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
|
* Fri Feb 16 2018 2018 Lumír Balhar <lbalhar@redhat.com> - 1.5.4-2
|
||||||
- Fix directory ownership in python3 subpackage
|
- Fix directory ownership in python3 subpackage
|
@ -1,106 +0,0 @@
|
|||||||
*** 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;
|
|
19
gating.yaml
19
gating.yaml
@ -1,19 +0,0 @@
|
|||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- fedora-*
|
|
||||||
decision_context: bodhi_update_push_stable
|
|
||||||
subject_type: koji_build
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
|
|
||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- rhel-8
|
|
||||||
decision_context: osci_compose_gate
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
|
|
||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- rhel-9
|
|
||||||
decision_context: osci_compose_gate
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
|
|
Binary file not shown.
@ -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
|
|
||||||
|
|
||||||
|
|
2
sources
2
sources
@ -1,2 +0,0 @@
|
|||||||
SHA512 (babeltrace-1.5.8.tar.bz2) = 827749ae8507efd433bb97ef668628837a3ff15b5be5097af5621d46055c6f10401da0be1f9d9f843a96c8c307b33745e04284d166e275e03b7ddb0a7dd57e96
|
|
||||||
SHA512 (babeltrace-1.5.8.tar.bz2.asc) = 6e0802a1541029086f2003526a801b43d361d1586893f8d193cc95b3a20e86c0da4141b81c641b4902f7c3c0ecd5e6ab94f3a5a83ae64917c4628feec48931d4
|
|
Loading…
Reference in New Issue
Block a user