Merge remote-tracking branch 'up/main' into main-riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

elfutils-0.190-remove-ET_REL-unstrip-test.patch

@@ -0,0 +1,32 @@
+From 010cacd89b847659b3c666ac963269b06a8c5058 Mon Sep 17 00:00:00 2001
+From: Aaron Merey <amerey@redhat.com>
+Date: Tue, 28 Nov 2023 16:41:35 -0500
+Subject: [PATCH] tests/run-strip-strmerge.sh: remove ET_REL unstrip and
+ elflint tests
+
+These tests can fail on i386.  Remove them for now since stripping and
+unstripping an ET_REL file is obscure.
+
+---
+ tests/run-strip-strmerge.sh | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/tests/run-strip-strmerge.sh b/tests/run-strip-strmerge.sh
+index aa9c1eb..67543eb 100755
+--- a/tests/run-strip-strmerge.sh
++++ b/tests/run-strip-strmerge.sh
+@@ -69,11 +69,5 @@ echo elflint $stripped
+ testrun ${abs_top_builddir}/src/elflint --gnu $stripped
+ echo elflint $debugfile
+ testrun ${abs_top_builddir}/src/elflint --gnu -d $debugfile
+-echo unstrip
+-testrun ${abs_top_builddir}/src/unstrip -o $remerged $stripped $debugfile
+-echo elflint $remerged
+-testrun ${abs_top_builddir}/src/elflint --gnu $remerged
+-echo elfcmp
+-testrun ${abs_top_builddir}/src/elfcmp $merged $remerged
+
+ exit 0
+--
+2.41.0
+

elfutils.spec

@@ -1,6 +1,6 @@
 Name: elfutils
 Version: 0.190
-%global baserelease 3
+%global baserelease 4
 Release: %{baserelease}.0.riscv64%{?dist}
 URL: http://elfutils.org/
 %global source_url ftp://sourceware.org/pub/elfutils/%{version}/
@@ -77,6 +77,8 @@ BuildRequires: gettext-devel
 Patch1: elfutils-0.186-fdo-swap.patch
 # PR30975: Fix handling of corefiles with non-contiguous .so segments.
 Patch2: elfutils-0.190-fix-core-noncontig.patch
+# Remove obscure tests that can fail on i386.
+Patch3: elfutils-0.190-remove-ET_REL-unstrip-test.patch
 
 %description
 Elfutils is a collection of utilities, including stack (to show
@@ -454,6 +456,9 @@ exit 0
 * Sat Nov 25 2023 David Abdurachmanov <davidlt@rivosinc.com> - 0.190-3.0.riscv64
 - Ignore testsuite failures on riscv64
 
+* Tue Nov 28 2023 Aaron Merey <amerey@fedoraproject.org> - 0.190-4
+- Add elfutils-0.190-remove-ET_REL-unstrip-test.patch
+
 * Fri Nov 24 2023 Aaron Merey <amerey@fedoraproject.org> - 0.190-3
 - Add elfutils-0.190-fix-core-noncontig.patch