6 changed files with 226 additions and 17 deletions
--- a/.babeltrace.metadata
+++ b/.babeltrace.metadata
@ -1 +1,2 @@
-7c9f7d67ec1d260cb1c5b7448e2173b1c8ce07d7 SOURCES/babeltrace-1.5.4.tar.bz2
+574dd85d98146974518212792c4ae9abb57f3084 SOURCES/babeltrace-1.5.8.tar.bz2
+16a2e75c0da4cdab3e2b7ccad0626771a5d1215e SOURCES/gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,2 @@
-SOURCES/babeltrace-1.5.4.tar.bz2
+SOURCES/babeltrace-1.5.8.tar.bz2
+SOURCES/gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg
--- a/SOURCES/babeltrace-1.5.8.tar.bz2.asc
+++ b/SOURCES/babeltrace-1.5.8.tar.bz2.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEf0kxSibg3nhCdoDgXxsqB4nxKxEFAl47HBUACgkQXxsqB4nx
+KxGTXxAAqCuLgy8iKktCC/gexq4OJgTPaJ/Ab2/jEyQt7EpOP1UtLbpxVQh44BKc
+kNZvSW6NPEUgSjQlBtNAC9RsRj8xu2NLQxoPGDL4fDEQgiXIVTfHEzUJ03d7a322
+XaQvqXaZ7C9fGJF1ODrdUPkRuOLu2oCdpJ8Do+VAcEQAkEpWNkRP6hH0r7r4CLZb
+ShLJEW13vaRiiQCFPW5yRgJWG+gXFGrjMtVFGgLNULdyxHinyxGd06D/+++Plx97
+Yqv0q3JkzwiMPfJkZMN5ilMPVP+RF/osoZYHBdOQLPVzV3Qb0T4GwIkspKFbszOG
+EFXchMylnICi7iSBt36qTagQfYaHQ/S+YrfqFHhhMrg0Mm9V8X0dDVrtWuZp10vp
+MFbRU88s64HywweZJMUhJC1gR2afVGTxvEKI7BMrmPSeIPryhUY/RsnYc+tKic0X
+wpp7Yk9NIaZ9IC7Xv59UXw7vP0quxN/Ph7faQIF8wF5+NE/Qi0VT5WWf+6hhA9cW
+SS8vNSMIfwN0ZpkjIExXi4fGgMXmtxKjBe5PDYmZvvpd66V3htndHUGASjg5Tt0e
+QPJwhyTscEfnyAxS7SRm2Ep1l6FioOleh4Rf3p66mVm4jLazj5aGqMFX6URZ4HYS
+y9fi9ZwednfghYqBjIfeDcDm8x7Wsy+3503LBfUPHgLiRiV9cjw=
+=CnjE
+-----END PGP SIGNATURE-----
--- a/SOURCES/babeltrace-getaddrinfo.patch
+++ b/SOURCES/babeltrace-getaddrinfo.patch
@ -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;
--- a/SOURCES/python39.patch
+++ b/SOURCES/python39.patch
@ -0,0 +1,19 @@
+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
+
+
--- a/SPECS/babeltrace.spec
+++ b/SPECS/babeltrace.spec
@ -1,11 +1,15 @@
 Name:           babeltrace
-Version:        1.5.4
-Release:        4%{?dist}
+Version:        1.5.8
+Release:        10%{?dist}
 Summary:        Trace Viewer and Converter, mainly for the Common Trace Format
 License:        MIT and GPLv2
 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:         python39.patch
+Patch1:         babeltrace-getaddrinfo.patch

 BuildRequires:  bison >= 2.4
 BuildRequires:  flex >= 2.5.35
@ -16,8 +20,9 @@ BuildRequires:  python3-devel
 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,75 @@ 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.
+* Wed Mar 16 2022 Bruno Larsen <blarsen@redhat.com> - 1.5.8-10
+- Use getaddrinfo instead of gethostbyname.
+  (Keith Seitz)
+
+* Tue Mar 15 2022 Bruno Larsen <blarsen@redhat.com> - 1.6.8-9
+- Bumped NVR to release subpackage
+  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

-* Wed Jul  1 2020 Keith Seitz <keiths@redhat.com> - 1.5.4-3
- Bump NVR for BaseOS move.
+* 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