From 598f2ef1c1473f83fd6ee66aa12c82cce5243dab Mon Sep 17 00:00:00 2001
From: Michael Petlan <mpetlan@redhat.com>
Date: Tue, 30 Aug 2022 14:41:13 +0200
Subject: [PATCH] Rebase to upstream v1.3.1

Related: rhbz#2075215

Signed-off-by: Michael Petlan <mpetlan@redhat.com>
---
 .gitignore                            |  1 +
 libtracefs-1.0.2-harden-linking.patch |  4 ++--
 libtracefs.spec                       | 10 +++++++---
 sources                               |  2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3962b9e..0cd861b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /libtracefs-1.0.2.tar.gz
+/libtracefs-1.3.1.tar.gz
diff --git a/libtracefs-1.0.2-harden-linking.patch b/libtracefs-1.0.2-harden-linking.patch
index 1e80e6b..878f74b 100644
--- a/libtracefs-1.0.2-harden-linking.patch
+++ b/libtracefs-1.0.2-harden-linking.patch
@@ -4,8 +4,8 @@
  
  do_compile_shared_library =			\
  	($(print_shared_lib_compile)		\
--	$(CC) --shared $^ '-Wl,-soname,$(1),-rpath=$$ORIGIN' -o $@ $(LIBS))
-+	$(CC) --shared $^ '-Wl,-soname,$(1),-rpath=$$ORIGIN' -o $@ $(GCCLDFLAGS) $(LIBS))
+-	$(CC) --shared $^ '-Wl,-soname,$(1),-rpath=$$ORIGIN' -o $@ $(LDFLAGS) $(LIBS))
++	$(CC) --shared $^ '-Wl,-soname,$(1),-rpath=$$ORIGIN' -o $@ $(GCCLDFLAGS) $(LDFLAGS) $(LIBS))
  
  do_compile_plugin_obj =				\
  	($(print_plugin_obj_compile)		\
diff --git a/libtracefs.spec b/libtracefs.spec
index 35185ca..09791de 100644
--- a/libtracefs.spec
+++ b/libtracefs.spec
@@ -10,8 +10,8 @@
 %global _lto_cflags %nil
 
 Name: libtracefs
-Version: 1.0.2
-Release: 7%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
 License: LGPLv2+ and GPLv2+
 Summary: Library for access kernel tracefs
 
@@ -59,7 +59,7 @@ rm -rf %{buildroot}/%{_libdir}/libtracefs.a
 %license LICENSES/LGPL-2.1
 %license LICENSES/GPL-2.0
 %{_libdir}/%{name}.so.1
-%{_libdir}/%{name}.so.1.0.2
+%{_libdir}/%{name}.so.1.3.1
 
 %files devel
 %{_includedir}/tracefs/tracefs.h
@@ -67,6 +67,10 @@ rm -rf %{buildroot}/%{_libdir}/libtracefs.a
 %{_libdir}/%{name}.so
 
 %changelog
+* Tue Aug 30 2022 Michael Petlan <mpetlan@redhat.com> - 1.3.1-1
+- Rebase to 1.3.1
+  Related: rhbz#2075215
+
 * Fri Jan 14 2022 Michael Petlan <mpetlan@redhat.com> - 1.0.2-7
 - Harden library linking; add the flags to install section too
   Related: rhbz#2038853
diff --git a/sources b/sources
index 3e6bd08..9446dd2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libtracefs-1.0.2.tar.gz) = 1fc64f7ba3a575201bf6bc3e1328c4aa5825a5d6ebf5b3bf4b46db751e1460ef986714e47fc6528aebcb190bf3dcd246b29de59fbd52634c14bb364cdf028281
+SHA512 (libtracefs-1.3.1.tar.gz) = 1d8423ff1033a4ab601dd8e9fa4a801c27425234505070733641c8c9a4dd382cc6563d3fde89958f18e0bc95e2cbbdf65e69a2935fe208d5de9fd3ac26374ec1