From 1cab65e45d47b6c605d57b4e4603d35ade5517b1 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 6 Mar 2020 15:19:45 -0500 Subject: [PATCH] New upstream release 2.11.1 --- .gitignore | 1 + 0001-Fix-build-with-fno-common.patch | 47 ------------------ ...0B4ED915F2D3FA45F5B16217280A9781186ACF.gpg | Bin 0 -> 1486 bytes lttng-ust-2.11.1.tar.bz2.asc | 11 ++++ lttng-ust.spec | 19 +++++-- sources | 2 +- 6 files changed, 28 insertions(+), 52 deletions(-) delete mode 100644 0001-Fix-build-with-fno-common.patch create mode 100644 gpgkey-2A0B4ED915F2D3FA45F5B16217280A9781186ACF.gpg create mode 100644 lttng-ust-2.11.1.tar.bz2.asc diff --git a/.gitignore b/.gitignore index d62d5dc..90fd7c4 100644 --- a/.gitignore +++ b/.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 diff --git a/0001-Fix-build-with-fno-common.patch b/0001-Fix-build-with-fno-common.patch deleted file mode 100644 index 2e3888b..0000000 --- a/0001-Fix-build-with-fno-common.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 924c35aab1d0d31e9b651c6403cc7fa352e74242 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson -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 -Signed-off-by: Mathieu Desnoyers -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 - #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 - diff --git a/gpgkey-2A0B4ED915F2D3FA45F5B16217280A9781186ACF.gpg b/gpgkey-2A0B4ED915F2D3FA45F5B16217280A9781186ACF.gpg new file mode 100644 index 0000000000000000000000000000000000000000..93013f51a6a7168aa8ac8f39fc4b7be646e698b6 GIT binary patch literal 1486 zcmV;<1u^=W0SyFBsbVVu2mrw1XT_Nn6`gd78Mn>x({fMzOED`a+wk%OUR^gwrolEr z7hxO|nbAorx|=ojm9R`ASh6BAjNKLv9v;I8u^3I~CHt;4(<2u`Mn>?Y5uW0Ys@Q3n zzQFuQWmlTRn@YGqrJy|aXG5lkSgBAT+R2q&O!J@`Jo2ZGm775_n2%3xMvBzcok5&bUk zk~TC;%u^>`1*>tniJmBsi4wR9D)NYsh-JzLkyqPG*I*R85Y{J^4m4o`OWf>?>~W0w zJ-yJ!w50_KpAGF>wx0kI0RRECGEHH0XlZ42AVg(zZf|*Ia&sU&ZDDk1X=QaTWMy-1 zZ+T^Mb3kQgW@%$-Z*wkVZ*4w_0aXMO0RjL&0viJc3ke7Z0|EvW2m%QT3j`Jd0|5da z0Rk6*79j*G3r^V;^3(c7^|4|XC<>Q>7;4W20$e=WUQ>7;4Ww zwg>+~9-uzA&7eoX!W~-!)RR+=Ot%0e;u0@o^yB2) zTFFn26llG{3VWNrMX)?{3fp@NqjHt&d%)uP-vdF~ij7hluIX}ncgZu319 z149mezJ#|~YJg*LXR{Ro76jjBtu84nxWNc<8zGeVG8j29Llb`|{$s^tMxnM&fls<1 z>E+QWe2%9}P|!0H5jYz7=NwgR_nm!SqYU-mN>xZfj;ke9=X$O}AD7+%c`_~`-3-)A16!Hxy(Ku`EiYT^ix=&8K~AmmgX%pNrYDEN~&*h7!8Cg6&H|K5jJ`V$+87 z&>F=`V}HL93Ns@@#{EjqMTL}oh`wZJ-iyw0vcz1+vCtzn#qA5iHm0YN5bIwjCdi!v z7C`);hd_a}3Kd*709@SE+g8AMi&;P!grV(_3ob5*Nbef%yYZixV?Tm_STHfx4tT13 zu}hu-ImW{HLmi{aj#O-9Gj)$RA|C7&qaf~U5mJ&FR*k!*C9;BW!6~R8W5L=s8+OF z<2e8k0RRDs0Urby0RjLC1p-c~Vyglh3;+rV5Em#4mw^~+&$Md?|7pXcb`K>VE>vHr z?b`Zru8hI-uuTgYNX^S(cFNEgF_Xb;3TKdNrkV1yFXFqZNtZo`r+ypq%`k6w7dQ6I&*`6Q&?oe3YL;GAv-%rW^baB2Jn`;Exz oI*l{h)U|Wn&eb+QSZ&cQhLXk&Z|RrVJYj7A-RR0hYEr6-#u#U&)c^nh literal 0 HcmV?d00001 diff --git a/lttng-ust-2.11.1.tar.bz2.asc b/lttng-ust-2.11.1.tar.bz2.asc new file mode 100644 index 0000000..ca606a4 --- /dev/null +++ b/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----- diff --git a/lttng-ust.spec b/lttng-ust.spec index 24feebd..2c40819 100644 --- a/lttng-ust.spec +++ b/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 - 2.11.1-1 +- New upstream release +- Add requires systemtap-sdt-devel to lttng-ust-devel (#1386412) + * Wed Jan 29 2020 Fedora Release Engineering - 2.11.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 6b422c2..d198dba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lttng-ust-2.11.0.tar.bz2) = fb7258961a7e913487806a7e0129c95becff8c631382b119ff1d78f95cdd7460ec24e62671642160fdb006a3a292b2b10f35c8424f0367ce7c6a41cbcca77a09 +SHA512 (lttng-ust-2.11.1.tar.bz2) = 7a23cbd567f7ce56819e21e399d4e3c4832e20709969417eb467926c8aafa1841fe0062bab9fa52bfbd75afad64e019abe2bace3610d661328d933b9969e5fed