Notification time stamped 2022-06-29 22:38:49 UTC
From 371a7a4dc3fdffeee4e787e76c530b9174518db7 Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson(a)efficios.com>
Date: Jun 03 2019 19:02:57 +0000
Subject: New upstream release 2.10.7
---
diff --git a/.gitignore b/.gitignore
index 69a37ec..8c4f75c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
/lttng-tools-2.10.3.tar.bz2
/lttng-tools-2.10.4.tar.bz2
/lttng-tools-2.10.5.tar.bz2
+/lttng-tools-2.10.7.tar.bz2
diff --git a/0001-Fix-namespace-our-gettid-wrapper.patch
b/0001-Fix-namespace-our-gettid-wrapper.patch
new file mode 100644
index 0000000..80c5ea4
--- /dev/null
+++ b/0001-Fix-namespace-our-gettid-wrapper.patch
@@ -0,0 +1,71 @@
+From 28bdc78d537266bf33e3f3b56c1b50dce5a22c6b Mon Sep 17 00:00:00 2001
+From: Michael Jeanson <mjeanson(a)efficios.com>
+Date: Mon, 3 Jun 2019 14:59:08 -0400
+Subject: [PATCH] Fix: namespace our gettid wrapper
+
+Since glibc 2.30, a gettid wrapper was added that conflicts with our
+static declaration. Namespace our wrapper so there is no conflict,
+we'll add support for the glibc provided wrapper in a further commit.
+
+Signed-off-by: Michael Jeanson <mjeanson(a)efficios.com>
+---
+ src/common/compat/tid.h | 12 +++++++-----
+ src/common/error.h | 4 ++--
+ 2 files changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/src/common/compat/tid.h b/src/common/compat/tid.h
+index 40f562f9..15f9fdc7 100644
+--- a/src/common/compat/tid.h
++++ b/src/common/compat/tid.h
+@@ -29,23 +29,25 @@
+ #include <syscall.h>
+ #endif
+
+-#if defined(_syscall0)
+-_syscall0(pid_t, gettid)
+-#elif defined(__NR_gettid)
++#if defined(__NR_gettid)
++
+ #include <unistd.h>
+-static inline pid_t gettid(void)
++static inline pid_t lttng_gettid(void)
+ {
+ return syscall(__NR_gettid);
+ }
++
+ #else
++
+ #include <sys/types.h>
+ #include <unistd.h>
+
+ /* Fall-back on getpid for tid if not available. */
+-static inline pid_t gettid(void)
++static inline pid_t lttng_gettid(void)
+ {
+ return getpid();
+ }
++
+ #endif
+
+ #endif /* LTTNG_TID_H */
+diff --git a/src/common/error.h b/src/common/error.h
+index c90c4ae0..3fe742c0 100644
+--- a/src/common/error.h
++++ b/src/common/error.h
+@@ -151,11 +151,11 @@ static inline void __lttng_print_check_abort(enum lttng_error_level
type)
+ /* Three level of debug. Use -v, -vv or -vvv for the levels */
+ #define _ERRMSG(msg, type, fmt, args...) __lttng_print(type, msg \
+ " - %s [%ld/%ld]: " fmt " (in %s() at " __FILE__ ":"
XSTR(__LINE__) ")\n", \
+- log_add_time(), (long) getpid(), (long) gettid(), ## args, __func__)
++ log_add_time(), (long) getpid(), (long) lttng_gettid(), ## args, __func__)
+
+ #define _ERRMSG_NO_LOC(msg, type, fmt, args...) __lttng_print(type, msg \
+ " - %s [%ld/%ld]: " fmt "\n", \
+- log_add_time(), (long) getpid(), (long) gettid(), ## args)
++ log_add_time(), (long) getpid(), (long) lttng_gettid(), ## args)
+
+ #define MSG(fmt, args...) \
+ __lttng_print(PRINT_MSG, fmt "\n", ## args)
+--
+2.22.0.rc2
+
diff --git a/lttng-tools.spec b/lttng-tools.spec
index 9421dbf..8a6bcb4 100644
--- a/lttng-tools.spec
+++ b/lttng-tools.spec
@@ -1,11 +1,12 @@
Name: lttng-tools
-Version: 2.10.5
-Release: 2%{?dist}
+Version: 2.10.7
+Release: 1%{?dist}
License: GPLv2 and LGPLv2
URL:
http://lttng.org
Summary: LTTng control and utility programs
Source0:
http://lttng.org/files/lttng-tools/%{name}-%{version}.tar.bz2
Source1: lttng-sessiond.service
+Patch0: 0001-Fix-namespace-our-gettid-wrapper.patch
BuildRequires: libuuid-devel popt-devel libtool systemd-units
BuildRequires: lttng-ust-devel >= 2.10.0
@@ -37,7 +38,7 @@ This package provides the development files to
implement trace control in external applications
%prep
-%setup -q
+%autosetup -p1
%build
# Reinitialize libtool with the fedora version to remove Rpath
@@ -129,6 +130,9 @@ exit 0
%{_libdir}/pkgconfig/lttng-ctl.pc
%changelog
+* Mon Jun 03 2019 Michael Jeanson <mjeanson(a)efficios.com> - 2.10.7-1
+- New upstream release
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.10.5-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index 6a0bc82..0186bf4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lttng-tools-2.10.5.tar.bz2) =
30689be92331fb3421ecb67150dab29c182c2febd5db77113dc0439c2289cdadb645043bbbbb4a95c6da40dbf8bbc258dd775e22b908e9514fbeffc450312a5b
+SHA512 (lttng-tools-2.10.7.tar.bz2) =
1151f8f251d05959e7ec597dfcece2a968887c4551cfb238d30447b0d93b25d23a1cfbc4f3a6651a8c2c7dd95119a0d8886bbe43ff50b28c6c9ca9f4f109d3b7
https://src.fedoraproject.org/rpms/lttng-tools/c/371a7a4dc3fdffeee4e787e7...