From ea7ed5a10d9f03173b7a36080da79b357b591a33 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 17:59:24 +0000 Subject: [PATCH 1/3] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- elfutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/elfutils.spec b/elfutils.spec index 359a9c3..a40edd3 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -1,6 +1,6 @@ Name: elfutils Version: 0.190 -%global baserelease 4 +%global baserelease 5 Release: %{baserelease}%{?dist} URL: http://elfutils.org/ %global source_url ftp://sourceware.org/pub/elfutils/%{version}/ @@ -449,6 +449,9 @@ exit 0 %systemd_postun_with_restart debuginfod.service %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 0.190-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Nov 28 2023 Aaron Merey - 0.190-4 - Add elfutils-0.190-remove-ET_REL-unstrip-test.patch From 30c0ab2617e9af730633270fd864c496e6e0ca71 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 19 Jan 2024 14:25:33 -0500 Subject: [PATCH 2/3] Fix build with GCC 14 https://sourceware.org/git/?p=elfutils.git;h=ae580d48278b9924da7503886b37be34378e1b04 --- elfutils-0.190-gcc-14.patch | 33 +++++++++++++++++++++++++++++++++ elfutils.spec | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 elfutils-0.190-gcc-14.patch diff --git a/elfutils-0.190-gcc-14.patch b/elfutils-0.190-gcc-14.patch new file mode 100644 index 0000000..f81bcc8 --- /dev/null +++ b/elfutils-0.190-gcc-14.patch @@ -0,0 +1,33 @@ +From: Sergei Trofimovich +Date: Thu, 21 Dec 2023 09:23:30 +0000 (+0000) +Subject: tests: fix build against upcoming `gcc-14` (`-Werror=calloc-transposed-args`) +X-Git-Url: https://sourceware.org/git/?p=elfutils.git;a=commitdiff_plain;h=ae580d48278b9924da7503886b37be34378e1b04;hp=a2194f6b305bf0d0b9dd49dccd0a5c21994c8eea + +tests: fix build against upcoming `gcc-14` (`-Werror=calloc-transposed-args`) + +`gcc-14` added a new `-Wcalloc-transposed-args` warning recently. It +detected minor infelicity in `calloc()` API usage in `elfutils`: + + elfstrmerge.c: In function 'main': + elfstrmerge.c:450:32: error: + 'calloc' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Werror=calloc-transposed-args] + 450 | newscnbufs = calloc (sizeof (void *), newshnums); + | ^~~~ + elfstrmerge.c:450:32: note: earlier argument should specify number of elements, later size of each element + +Signed-off-by: Sergei Trofimovich +--- + +diff --git a/tests/elfstrmerge.c b/tests/elfstrmerge.c +index 56350bb91..4eb58bbb5 100644 +--- a/tests/elfstrmerge.c ++++ b/tests/elfstrmerge.c +@@ -447,7 +447,7 @@ main (int argc, char **argv) + } + + newshnums = shdrnum - 1; +- newscnbufs = calloc (sizeof (void *), newshnums); ++ newscnbufs = calloc (newshnums, sizeof (void *)); + if (newscnbufs == NULL) + fail_errno ("Couldn't allocate memory for new section buffers", NULL); + diff --git a/elfutils.spec b/elfutils.spec index a40edd3..d890ae6 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -79,6 +79,8 @@ Patch1: elfutils-0.186-fdo-swap.patch 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 +# tests: fix build against gcc-14 (-Werror=calloc-transposed-args) +Patch4: elfutils-0.190-gcc-14.patch %description Elfutils is a collection of utilities, including stack (to show From fc141358f549682689833673f78e857733bdafdc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 10:15:47 +0000 Subject: [PATCH 3/3] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- elfutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/elfutils.spec b/elfutils.spec index d890ae6..ee877fd 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -1,6 +1,6 @@ Name: elfutils Version: 0.190 -%global baserelease 5 +%global baserelease 6 Release: %{baserelease}%{?dist} URL: http://elfutils.org/ %global source_url ftp://sourceware.org/pub/elfutils/%{version}/ @@ -451,6 +451,9 @@ exit 0 %systemd_postun_with_restart debuginfod.service %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 0.190-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 0.190-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild