New upstream release 2.11.1

.gitignore

@@ -17,3 +17,4 @@
 /lttng-ust-2.10.3.tar.bz2
 /lttng-ust-2.10.4.tar.bz2
 /lttng-ust-2.11.0.tar.bz2
+/lttng-ust-2.11.1.tar.bz2

0001-Fix-build-with-fno-common.patch

@@ -1,47 +0,0 @@
-From 924c35aab1d0d31e9b651c6403cc7fa352e74242 Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <mjeanson@efficios.com>
-Date: Thu, 16 Jan 2020 10:59:14 -0500
-Subject: [PATCH lttng-ust] Fix: build with -fno-common
-
-GCC 10 will default to building with -fno-common, this inhibits the
-linker from merging multiple tentative definitions of a symbol in an
-archive. Keep only the declaration in the libustsnprintf.la convenience
-library.
-
-Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-Change-Id: I8fb7c72811ce7e62f10342f55fcabeeabfdd4c67
----
- liblttng-ust-ctl/ustctl.c      | 2 --
- liblttng-ust-fd/lttng-ust-fd.c | 2 --
- 2 files changed, 4 deletions(-)
-
-diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
-index 8c38ffaf..9e650466 100644
---- a/liblttng-ust-ctl/ustctl.c
-+++ b/liblttng-ust-ctl/ustctl.c
-@@ -77,8 +77,6 @@ extern void lttng_ring_buffer_client_discard_exit(void);
- extern void lttng_ring_buffer_client_discard_rt_exit(void);
- extern void lttng_ring_buffer_metadata_client_exit(void);
- 
--volatile enum ust_loglevel ust_loglevel;
--
- int ustctl_release_handle(int sock, int handle)
- {
- 	struct ustcomm_ust_msg lum;
-diff --git a/liblttng-ust-fd/lttng-ust-fd.c b/liblttng-ust-fd/lttng-ust-fd.c
-index 863f0618..4818e02e 100644
---- a/liblttng-ust-fd/lttng-ust-fd.c
-+++ b/liblttng-ust-fd/lttng-ust-fd.c
-@@ -28,8 +28,6 @@
- #include <helper.h>
- #include "usterr-signal-safe.h"
- 
--volatile enum ust_loglevel ust_loglevel;
--
- static int (*__lttng_ust_fd_plibc_close)(int fd);
- static int (*__lttng_ust_fd_plibc_fclose)(FILE *stream);
- 
--- 
-2.17.1
-

lttng-ust-2.11.1.tar.bz2.asc

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCAAdFiEEKgtO2RXy0/pF9bFiFygKl4EYas8FAl5gGQsACgkQFygKl4EY
+as/0zAf8DyCNLRBBbluyZ8yQFbllU2e35RKWrAl+8by7ab/3S7OQYTmbgg0oIEqN
+mICW3O2IbqsOv62dvEETim3U7wMLZEj5W9soRt/yCAiVTMuYRZU2Ou+HwT2WGaT8
+/8zZN6sJnp+/bBPxQc4yMdawiphu7dZRYNcVOnVGT/GuBhbj3kpOkMQzWbxTfr/h
+rFE2zCBTVeXbC/IrUvliSo3XDb+GRhNIHRnrsaP6S35uoGUH4q913Ns4Y1YYk1gB
+XhBzppylroV2EU7UDPbScqbdbSFfOP629YT2Wl4+5HlI5MEz2evoI/C4i7pFXOid
+AOKLrBy6Tf1XSLUvk+As5rOlDYKuAA==
+=2TJk
+-----END PGP SIGNATURE-----

lttng-ust.spec

@@ -13,18 +13,21 @@
 
 
 Name:           lttng-ust
-Version:        2.11.0
-Release:        4%{?dist}
+Version:        2.11.1
+Release:        1%{?dist}
 
 License:        LGPLv2.1, MIT and GPLv2
 Summary:        LTTng Userspace Tracer library
 URL:            https://lttng.org
 Source0:        https://lttng.org/files/lttng-ust/%{name}-%{version}.tar.bz2
+Source1:        https://lttng.org/files/lttng-ust/%{name}-%{version}.tar.bz2.asc
+# gpg2 --export --export-options export-minimal 2A0B4ED915F2D3FA45F5B16217280A9781186ACF > gpgkey-2A0B4ED915F2D3FA45F5B16217280A9781186ACF.gpg
+Source2:        gpgkey-2A0B4ED915F2D3FA45F5B16217280A9781186ACF.gpg
 Patch0:         lttng-gen-tp-shebang.patch
-Patch1:         0001-Fix-build-with-fno-common.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
+BuildRequires:  gnupg2
 BuildRequires:  libtool
 BuildRequires:  libuuid-devel
 BuildRequires:  pkgconfig
@@ -43,6 +46,7 @@ trace-points using LTTng.
 Summary:        LTTng Userspace Tracer library headers and development files
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       userspace-rcu-devel
+Requires:       systemtap-sdt-devel
 
 %description -n %{name}-devel
 The %{name}-devel package contains libraries and header to instrument
@@ -61,6 +65,7 @@ applications that use %{name}'s Python logging backend.
 
 
 %prep
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %autosetup -p1
 
 %build
@@ -98,8 +103,10 @@ make check
 
 %dir %{_docdir}/%{name}
 %{_docdir}/%{name}/ChangeLog
-%{_docdir}/%{name}/README.md
+%{_docdir}/%{name}/COPYING
 %{_docdir}/%{name}/java-agent.txt
+%{_docdir}/%{name}/LICENSE
+%{_docdir}/%{name}/README.md
 
 
 %files -n %{name}-devel
@@ -117,6 +124,10 @@ make check
 %{python3_sitelib}/lttngust-*.egg-info
 
 %changelog
+* Fri Mar 06 2020 Michael Jeanson <mjeanson@efficios.com> - 2.11.1-1
+- New upstream release
+- Add requires systemtap-sdt-devel to lttng-ust-devel (#1386412)
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (lttng-ust-2.11.0.tar.bz2) = fb7258961a7e913487806a7e0129c95becff8c631382b119ff1d78f95cdd7460ec24e62671642160fdb006a3a292b2b10f35c8424f0367ce7c6a41cbcca77a09
+SHA512 (lttng-ust-2.11.1.tar.bz2) = 7a23cbd567f7ce56819e21e399d4e3c4832e20709969417eb467926c8aafa1841fe0062bab9fa52bfbd75afad64e019abe2bace3610d661328d933b9969e5fed