CI Tests: Simplify test for rhbz2188064

- Add elfutils-0.188-deprecated-CURLINFO.patch,
  elfutils-0.188-CURL_AT_LEAST_VERSION.patch and
  elfutils-0.188-CURLOPT_PROTOCOLS_STR.patch

.gitignore

@@ -30,8 +30,3 @@
 /elfutils-0.187.tar.bz2
 /elfutils-0.188.tar.bz2
 /elfutils-0.189.tar.bz2
-/elfutils-0.190.tar.bz2
-/elfutils-0.191.tar.bz2
-/elfutils-0.192.tar.bz2
-/elfutils-0.193.tar.bz2
-/elfutils-0.194.tar.bz2

elfutils-0.189-c99-compat.patch

@@ -0,0 +1,31 @@
+From 6e7ac623674242628c9e54892a532d55d3288bb8 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Sat, 22 Apr 2023 21:37:09 +0200
+Subject: [PATCH] testsuite: Avoid C99 compatibility issues in
+ run-native-test.sh
+
+Include <unistd.h> for the pause function, and add the return type
+of main.  Avoids an implicit function declaration and implicit int.
+
+Signed-off-by: Florian Weimer <fweimer@redhat.com>
+---
+ tests/run-native-test.sh | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/run-native-test.sh b/tests/run-native-test.sh
+index d19007f2..042a51c6 100755
+--- a/tests/run-native-test.sh
++++ b/tests/run-native-test.sh
+@@ -27,7 +27,8 @@
+ # in all builds.
+ 
+ tempfiles native.c native
+-echo 'main () { while (1) pause (); }' > native.c
++printf '#include <unistd.h>\nint main (void) { while (1) pause (); }\n' \
++  > native.c
+ 
+ native=0
+ kill_native()
+-- 
+2.31.1
+

elfutils-0.189-elfcompress.patch

@@ -0,0 +1,95 @@
+From ef9164520c81ea61efe88777a8ad61bf17a54201 Mon Sep 17 00:00:00 2001
+From: Mark Wielaard <mark@klomp.org>
+Date: Sat, 22 Apr 2023 01:26:17 +0200
+Subject: [PATCH] elfcompress: Don't compress if section already compressed
+ unless forced
+
+Before commit a5b07cdf9 "support ZSTD compression algorithm"
+elfcompress would not try to compress a section if it already
+had the requested compression type (or was already uncompressed)
+unless the --force flag was given. An else if construct was changed
+to an if in the commit causing elfcompress to warn (in verbose mode)
+but then still try to (re)compress the section.
+
+Add an explicit check so if nothing needs (un)compressing, the file
+isn't changed.
+
+The diff looks large, but git diff -b -w is just:
+
++     if (force || type != schtype)
++       {
+          if (shdr->sh_type != SHT_NOBITS
+              && (shdr->sh_flags & SHF_ALLOC) == 0)
+            {
+@@ -554,6 +556,7 @@ process_file (const char *fname)
+              printf ("[%zd] %s ignoring %s section\n", ndx, sname,
+                      (shdr->sh_type == SHT_NOBITS ? "no bits" : "allocated"));
+        }
++   }
+
+Signed-off-by: Mark Wielaard <mark@klomp.org>
+---
+ src/elfcompress.c | 43 +++++++++++++++++++++++--------------------
+ 1 file changed, 23 insertions(+), 20 deletions(-)
+
+diff --git a/src/elfcompress.c b/src/elfcompress.c
+index 18ade66f..f771b92a 100644
+--- a/src/elfcompress.c
++++ b/src/elfcompress.c
+@@ -529,30 +529,33 @@ process_file (const char *fname)
+ 		  }
+ 	    }
+ 
+-	  if (shdr->sh_type != SHT_NOBITS
+-	      && (shdr->sh_flags & SHF_ALLOC) == 0)
++	  if (force || type != schtype)
+ 	    {
+-	      set_section (sections, ndx);
+-	      /* Check if we might want to change this section name.  */
+-	      if (! adjust_names
+-		  && ((type != ZLIB_GNU
+-		       && startswith (sname, ".zdebug"))
+-		      || (type == ZLIB_GNU
+-			  && startswith (sname, ".debug"))))
+-		adjust_names = true;
+-
+-	      /* We need a buffer this large if we change the names.  */
+-	      if (adjust_names)
++	      if (shdr->sh_type != SHT_NOBITS
++		  && (shdr->sh_flags & SHF_ALLOC) == 0)
+ 		{
+-		  size_t slen = strlen (sname);
+-		  if (slen > maxnamelen)
+-		    maxnamelen = slen;
++		  set_section (sections, ndx);
++		  /* Check if we might want to change this section name.  */
++		  if (! adjust_names
++		      && ((type != ZLIB_GNU
++			   && startswith (sname, ".zdebug"))
++			  || (type == ZLIB_GNU
++			      && startswith (sname, ".debug"))))
++		    adjust_names = true;
++
++		  /* We need a buffer this large if we change the names.  */
++		  if (adjust_names)
++		    {
++		      size_t slen = strlen (sname);
++		      if (slen > maxnamelen)
++			maxnamelen = slen;
++		    }
+ 		}
++	      else
++		if (verbose >= 0)
++		  printf ("[%zd] %s ignoring %s section\n", ndx, sname,
++			  (shdr->sh_type == SHT_NOBITS ? "no bits" : "allocated"));
+ 	    }
+-	  else
+-	    if (verbose >= 0)
+-	      printf ("[%zd] %s ignoring %s section\n", ndx, sname,
+-		      (shdr->sh_type == SHT_NOBITS ? "no bits" : "allocated"));
+ 	}
+ 
+       if (shdr->sh_type == SHT_SYMTAB)
+-- 
+2.31.1
+

elfutils-0.194-alloc-jobs.patch

@@ -1,135 +0,0 @@
-From f66135f16fe44182a3fc5b651d7e5071c936217d Mon Sep 17 00:00:00 2001
-From: Aaron Merey <amerey@redhat.com>
-Date: Mon, 27 Oct 2025 22:00:12 -0400
-Subject: [PATCH] readelf: Allocate job_data one-by-one as needed
-
-Currently, job_data is stored in an array whose size is equal to the
-number of debug sections (.debug_*, .eh_frame, .gdb_index, etc.).
-
-This size may be too small if a binary contains multiple debug sections
-with the same name.  For example an ET_REL binary compiled with -ggdb3
-can contain multiple .debug_macro sections.
-
-Fix this by allocating job_data on the fly when preparing to read a
-debug section.  This supports an arbitrary number of debug sections
-while also avoiding unnecessary memory allocation.
-
-https://sourceware.org/bugzilla/show_bug.cgi?id=33580
-
-Signed-off-by: Aaron Merey <amerey@redhat.com>
----
- src/readelf.c | 49 +++++++++++++++++++++++++------------------------
- 1 file changed, 25 insertions(+), 24 deletions(-)
-
-diff --git a/src/readelf.c b/src/readelf.c
-index ee6c203d..a2d17358 100644
---- a/src/readelf.c
-+++ b/src/readelf.c
-@@ -12200,7 +12200,8 @@ getone_dwflmod (Dwfl_Module *dwflmod,
-   return DWARF_CB_OK;
- }
- 
--typedef struct {
-+typedef struct Job_Data {
-+  struct Job_Data *next;
-   Dwfl_Module *dwflmod;
-   Ebl *ebl;
-   GElf_Ehdr *ehdr;
-@@ -12230,7 +12231,7 @@ do_job (void *data, FILE *out)
-    If thread safety is not supported or the maximum number of threads is set
-    to 1, then immediately call START_ROUTINE with the given arguments.  */
- static void
--schedule_job (job_data jdata[], size_t idx,
-+schedule_job (job_data **jdatalist,
- 	      void (*start_routine) (Dwfl_Module *, Ebl *, GElf_Ehdr *,
- 				     Elf_Scn *, GElf_Shdr *, Dwarf *, FILE *),
- 	      Dwfl_Module *dwflmod, Ebl *ebl, GElf_Ehdr *ehdr, Elf_Scn *scn,
-@@ -12239,21 +12240,24 @@ schedule_job (job_data jdata[], size_t idx,
- #ifdef USE_LOCKS
-   if (max_threads > 1)
-     {
--      /* Add to the job queue.  */
--      jdata[idx].dwflmod = dwflmod;
--      jdata[idx].ebl = ebl;
--      jdata[idx].ehdr = ehdr;
--      jdata[idx].scn = *scn;
--      jdata[idx].shdr = *shdr;
--      jdata[idx].dbg = dbg;
--      jdata[idx].fp = start_routine;
-+      job_data *jdata = xmalloc (sizeof (job_data));
-+
-+      jdata->dwflmod = dwflmod;
-+      jdata->ebl = ebl;
-+      jdata->ehdr = ehdr;
-+      jdata->scn = *scn;
-+      jdata->shdr = *shdr;
-+      jdata->dbg = dbg;
-+      jdata->fp = start_routine;
-+      jdata->next = *jdatalist;
-+      *jdatalist = jdata;
- 
--      add_job (do_job, (void *) &jdata[idx]);
-+      add_job (do_job, (void *) jdata);
-     }
-   else
-     start_routine (dwflmod, ebl, ehdr, scn, shdr, dbg, stdout);
- #else
--  (void) jdata; (void) idx;
-+  (void) jdatalist;
- 
-   start_routine (dwflmod, ebl, ehdr, scn, shdr, dbg, stdout);
- #endif
-@@ -12431,8 +12435,7 @@ print_debug (Dwfl_Module *dwflmod, Ebl *ebl, GElf_Ehdr *ehdr)
-   if (unlikely (elf_getshdrstrndx (ebl->elf, &shstrndx) < 0))
-     error_exit (0, _("cannot get section header string table index"));
- 
--  ssize_t num_jobs = 0;
--  job_data *jdata = NULL;
-+  job_data *jdatalist = NULL;
- 
-   /* If the .debug_info section is listed as implicitly required then
-      we must make sure to handle it before handling any other debug
-@@ -12531,13 +12534,6 @@ print_debug (Dwfl_Module *dwflmod, Ebl *ebl, GElf_Ehdr *ehdr)
- 	  if (name == NULL)
- 	    continue;
- 
--	  if (jdata == NULL)
--	    {
--	      jdata = calloc (ndebug_sections, sizeof (*jdata));
--	      if (jdata == NULL)
--		error_exit (0, _("failed to allocate job data"));
--	    }
--
- 	  int n;
- 	  for (n = 0; n < ndebug_sections; ++n)
- 	    {
-@@ -12561,10 +12557,9 @@ print_debug (Dwfl_Module *dwflmod, Ebl *ebl, GElf_Ehdr *ehdr)
- 		{
- 		  if (((print_debug_sections | implicit_debug_sections)
- 		       & debug_sections[n].bitmask))
--		    schedule_job (jdata, num_jobs++, debug_sections[n].fp,
-+		    schedule_job (&jdatalist, debug_sections[n].fp,
- 				  dwflmod, ebl, ehdr, scn, shdr, dbg);
- 
--		  assert (num_jobs <= ndebug_sections);
- 		  break;
- 		}
- 	    }
-@@ -12579,7 +12574,13 @@ print_debug (Dwfl_Module *dwflmod, Ebl *ebl, GElf_Ehdr *ehdr)
- 
-   dwfl_end (skel_dwfl);
-   free (skel_name);
--  free (jdata);
-+
-+  while (jdatalist != NULL)
-+    {
-+      job_data *jdata = jdatalist;
-+      jdatalist = jdatalist->next;
-+      free (jdata);
-+    }
- 
-   /* Turn implicit and/or explicit back on in case we go over another file.  */
-   if (implicit_info)
--- 
-2.51.0
-

elfutils-0.194-fix-const.patch

@@ -1,301 +0,0 @@
-From 4a5cf8be906d5991e7527e69e3f2ceaa74811301 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@suse.de>
-Date: Mon, 24 Nov 2025 13:46:16 +0100
-Subject: [PATCH] Fix const-correctness issues
-
-These were uncovered by the C23 const-preserving library macros.
----
- debuginfod/debuginfod-client.c |  2 +-
- libcpu/riscv_disasm.c          | 52 +++++++++++++++++-----------------
- libdw/dwarf_getsrclines.c      |  6 ++--
- src/readelf.c                  |  8 +++---
- 4 files changed, 34 insertions(+), 34 deletions(-)
-
-diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
-index c0ff5967..c5bc8a4f 100644
---- a/debuginfod/debuginfod-client.c
-+++ b/debuginfod/debuginfod-client.c
-@@ -3104,7 +3104,7 @@ int debuginfod_add_http_header (debuginfod_client *client, const char* header)
-   /* Sanity check header value is of the form Header: Value.
-      It should contain at least one colon that isn't the first or
-      last character.  */
--  char *colon = strchr (header, ':'); /* first colon */
-+  const char *colon = strchr (header, ':'); /* first colon */
-   if (colon == NULL /* present */
-       || colon == header /* not at beginning - i.e., have a header name */
-       || *(colon + 1) == '\0') /* not at end - i.e., have a value */
-diff --git a/libcpu/riscv_disasm.c b/libcpu/riscv_disasm.c
-index 0dee842a..749d4567 100644
---- a/libcpu/riscv_disasm.c
-+++ b/libcpu/riscv_disasm.c
-@@ -77,7 +77,7 @@ static const char *regnames[32] =
-     "a6", "a7", "s2", "s3", "s4", "s5", "s6", "s7",
-     "s8", "s9", "s10", "s11", "t3", "t4", "t5", "t6"
-   };
--#define REG(nr) ((char *) regnames[nr])
-+#define REG(nr) regnames[nr]
- #define REGP(nr) REG (8 + (nr))
- 
- 
-@@ -88,7 +88,7 @@ static const char *fregnames[32] =
-     "fa6", "fa7", "fs2", "fs3", "fs4", "fs5", "fs6", "fs7",
-     "fs8", "fs9", "fs10", "fs11", "ft8", "ft9", "ft10", "ft11"
-   };
--#define FREG(nr) ((char *) fregnames[nr])
-+#define FREG(nr) fregnames[nr]
- #define FREGP(nr) FREG (8 + (nr))
- 
- 
-@@ -163,12 +163,12 @@ riscv_disasm (Ebl *ebl,
- 	  break;
- 	}
- 
--      char *mne = NULL;
-+      const char *mne = NULL;
-       /* Max length is 24, which is "illegal", so we print it as
-          "0x<48 hex chars>"
-          See: No instruction encodings defined for these sizes yet, below  */
-       char mnebuf[50];
--      char *op[5] = { NULL, NULL, NULL, NULL, NULL };
-+      const char *op[5] = { NULL, NULL, NULL, NULL, NULL };
-       char immbuf[32];
-       size_t len;
-       char *strp = NULL;
-@@ -400,7 +400,7 @@ riscv_disasm (Ebl *ebl,
- 		    {
- 		      "sub", "xor", "or", "and", "subw", "addw", NULL, NULL
- 		    };
--		  mne = (char *) arithmne[((first >> 10) & 0x4) | ((first >> 5) & 0x3)];
-+		  mne = arithmne[((first >> 10) & 0x4) | ((first >> 5) & 0x3)];
- 		}
- 		op[0] = op[1] = REGP ((first >> 7) & 0x7);
- 	      break;
-@@ -572,7 +572,7 @@ riscv_disasm (Ebl *ebl,
- 		{
- 		  NULL, NULL, "flw", "fld", "flq", NULL, NULL, NULL
- 		};
--	      mne = (char *) (idx == 0x00 ? loadmne[func] : floadmne[func]);
-+	      mne = idx == 0x00 ? loadmne[func] : floadmne[func];
- 	      break;
- 	    case 0x03:
- 	      // MISC-MEM
-@@ -595,8 +595,8 @@ riscv_disasm (Ebl *ebl,
- 		  uint32_t succ = (word >> 24) & 0xf;
- 		  if (pred != 0xf || succ != 0xf)
- 		    {
--		      op[0] = (char *) order[succ];
--		      op[1] = (char *) order[pred];
-+		      op[0] = order[succ];
-+		      op[1] = order[pred];
- 		     }
- 		   mne = "fence";
- 		}
-@@ -614,7 +614,7 @@ riscv_disasm (Ebl *ebl,
- 		  "addi", NULL, "slti", "sltiu", "xori", NULL, "ori", "andi"
- 		};
- 	      func = (word >> 12) & 0x7;
--	      mne = (char *) opimmmne[func];
-+	      mne = opimmmne[func];
- 	      if (mne == NULL)
- 		{
- 		  const uint64_t shiftmask = ebl->class == ELFCLASS32 ? 0x1f : 0x3f;
-@@ -697,7 +697,7 @@ riscv_disasm (Ebl *ebl,
- 		{
- 		  NULL, NULL, "fsw", "fsd", "fsq", NULL, NULL, NULL
- 		};
--	      mne = (char *) (idx == 0x08 ? storemne[func] : fstoremne[func]);
-+	      mne = idx == 0x08 ? storemne[func] : fstoremne[func];
- 	      break;
- 	    case 0x0b:
- 	      // AMO
-@@ -778,7 +778,7 @@ riscv_disasm (Ebl *ebl,
- 		    }
- 		  else
- 		    {
--		      mne = (char *) (idx == 0x0c ? arithmne2[func] : arithmne3[func]);
-+		      mne = idx == 0x0c ? arithmne2[func] : arithmne3[func];
- 		      op[1] = REG (rs1);
- 		      op[2] = REG (rs2);
- 		    }
-@@ -811,7 +811,7 @@ riscv_disasm (Ebl *ebl,
- 		  op[2] = FREG (rs2);
- 		  op[3] = FREG (rs3);
- 		  if (rm != 0x7)
--		    op[4] = (char *) rndmode[rm];
-+		    op[4] = rndmode[rm];
- 		}
- 	      break;
- 	    case 0x14:
-@@ -839,7 +839,7 @@ riscv_disasm (Ebl *ebl,
- 		      op[1] = FREG (rs1);
- 		      op[2] = FREG (rs2);
- 		      if (rm != 0x7)
--			op[3] = (char *) rndmode[rm];
-+			op[3] = rndmode[rm];
- 		    }
- 		  else if (func == 0x1c && width != 2 && rs2 == 0 && rm <= 1)
- 		    {
-@@ -950,7 +950,7 @@ riscv_disasm (Ebl *ebl,
- 			}
- 		      mne = mnebuf;
- 		      if (rm != 0x7 && (func == 0x18 || width == 0 || rs2 >= 2))
--			op[2] = (char *) rndmode[rm];
-+			op[2] = rndmode[rm];
- 		    }
- 		  else if (func == 0x0b && rs2 == 0)
- 		    {
-@@ -961,7 +961,7 @@ riscv_disasm (Ebl *ebl,
- 		      *cp = '\0';
- 		      mne = mnebuf;
- 		      if (rm != 0x7)
--			op[2] = (char *) rndmode[rm];
-+			op[2] = rndmode[rm];
- 		    }
- 		  else if (func == 0x05 && rm < 2)
- 		    {
-@@ -1007,7 +1007,7 @@ riscv_disasm (Ebl *ebl,
- 		  "beq", "bne", NULL, NULL, "blt", "bge", "bltu", "bgeu"
- 		};
- 	      func = (word >> 12) & 0x7;
--	      mne = (char *) branchmne[func];
-+	      mne = branchmne[func];
- 	      if (rs1 == 0 && func == 5)
- 		{
- 		  op[0] = op[1];
-@@ -1035,7 +1035,7 @@ riscv_disasm (Ebl *ebl,
- 	      else if (func == 5 || func == 7)
- 		{
- 		  // binutils use these opcodes and the reverse parameter order
--		  char *tmp = op[0];
-+		  const char *tmp = op[0];
- 		  op[0] = op[1];
- 		  op[1] = tmp;
- 		  mne = func == 5 ? "ble" : "bleu";
-@@ -1103,7 +1103,7 @@ riscv_disasm (Ebl *ebl,
- 			{
- 			  NULL, "frflags", "frrm", "frsr",
- 			};
--		      mne = (char *) unprivrw[csr - 0x000];
-+		      mne = unprivrw[csr - 0x000];
- 		    }
- 		  else if (csr >= 0xc00 && csr <= 0xc03)
- 		    {
-@@ -1111,7 +1111,7 @@ riscv_disasm (Ebl *ebl,
- 			{
- 			  "rdcycle", "rdtime", "rdinstret"
- 			};
--		      mne = (char *) unprivrolow[csr - 0xc00];
-+		      mne = unprivrolow[csr - 0xc00];
- 		    }
- 		  op[0] = REG ((word >> 7) & 0x1f);
- 		}
-@@ -1128,7 +1128,7 @@ riscv_disasm (Ebl *ebl,
- 			{
- 			  NULL, "fsflagsi", "fsrmi", NULL
- 			};
--		      mne = (char *) ((word & 0x4000) == 0 ? unprivrs : unprivrsi)[csr - 0x000];
-+		      mne = ((word & 0x4000) == 0 ? unprivrs : unprivrsi)[csr - 0x000];
- 
- 		      if ((word & 0x4000) == 0)
- 			op[0] = REG ((word >> 15) & 0x1f);
-@@ -1259,12 +1259,12 @@ riscv_disasm (Ebl *ebl,
- 		  if (rd != 0)
- 		    op[last++] = REG (rd);
- 		  struct known_csrs key = { csr, NULL };
--		  struct known_csrs *found = bsearch (&key, known,
--						      sizeof (known) / sizeof (known[0]),
--						      sizeof (known[0]),
--						      compare_csr);
-+		  const struct known_csrs *found = bsearch (&key, known,
-+							    sizeof (known) / sizeof (known[0]),
-+							    sizeof (known[0]),
-+							    compare_csr);
- 		  if (found)
--		    op[last] = (char *) found->name;
-+		    op[last] = found->name;
- 		  else
- 		    {
- 		      snprintf (addrbuf, sizeof (addrbuf), "0x%" PRIx32, csr);
-@@ -1289,7 +1289,7 @@ riscv_disasm (Ebl *ebl,
- 		  else if (instr == 3 && rd == 0)
- 		    mne = "csrc";
- 		  else
--		    mne = (char *) mnecsr[instr];
-+		    mne = mnecsr[instr];
- 		}
- 	      break;
- 	    default:
-diff --git a/libdw/dwarf_getsrclines.c b/libdw/dwarf_getsrclines.c
-index be10cdee..76db2929 100644
---- a/libdw/dwarf_getsrclines.c
-+++ b/libdw/dwarf_getsrclines.c
-@@ -364,7 +364,7 @@ read_srcfiles (Dwarf *dbg,
-       const unsigned char *dirp = linep;
-       while (dirp < lineendp && *dirp != 0)
- 	{
--	  uint8_t *endp = memchr (dirp, '\0', lineendp - dirp);
-+	  const uint8_t *endp = memchr (dirp, '\0', lineendp - dirp);
- 	  if (endp == NULL)
- 	    goto invalid_data;
- 	  ++ndirs;
-@@ -440,7 +440,7 @@ read_srcfiles (Dwarf *dbg,
-       for (unsigned int n = 1; n < ndirlist; n++)
- 	{
- 	  dirarray[n].dir = (char *) linep;
--	  uint8_t *endp = memchr (linep, '\0', lineendp - linep);
-+	  const uint8_t *endp = memchr (linep, '\0', lineendp - linep);
- 	  assert (endp != NULL); // Checked above when calculating ndirlist.
- 	  dirarray[n].len = endp - linep;
- 	  linep = endp + 1;
-@@ -927,7 +927,7 @@ read_srclines (Dwarf *dbg,
- 	    case DW_LNE_define_file:
- 	      {
- 		char *fname = (char *) linep;
--		uint8_t *endp = memchr (linep, '\0', lineendp - linep);
-+		const uint8_t *endp = memchr (linep, '\0', lineendp - linep);
- 		if (endp == NULL)
- 		  goto invalid_data;
- 		size_t fnamelen = endp - linep;
-diff --git a/src/readelf.c b/src/readelf.c
-index a2d17358..fbdf8c71 100644
---- a/src/readelf.c
-+++ b/src/readelf.c
-@@ -8269,7 +8269,7 @@ attr_callback (Dwarf_Attribute *attrp, void *arg)
- 		    valuestr = dwarf_filesrc (files, num, NULL, NULL);
- 		    if (valuestr != NULL)
- 		      {
--			char *filename = strrchr (valuestr, '/');
-+			const char *filename = strrchr (valuestr, '/');
- 			if (filename != NULL)
- 			  valuestr = filename + 1;
- 		      }
-@@ -9033,7 +9033,7 @@ print_form_data (Dwarf *dbg, int form, const unsigned char *readp,
- 		 Dwarf_Off str_offsets_base, FILE *out)
- {
-   Dwarf_Word val;
--  unsigned char *endp;
-+  const unsigned char *endp;
-   Elf_Data *data;
-   char *str;
-   switch (form)
-@@ -9530,7 +9530,7 @@ print_debug_line_section (Dwfl_Module *dwflmod, Ebl *ebl, GElf_Ehdr *ehdr,
- 	{
- 	  while (linep < lineendp && *linep != 0)
- 	    {
--	      unsigned char *endp = memchr (linep, '\0', lineendp - linep);
-+	      const unsigned char *endp = memchr (linep, '\0', lineendp - linep);
- 	      if (unlikely (endp == NULL))
- 		goto invalid_unit;
- 
-@@ -9764,7 +9764,7 @@ print_debug_line_section (Dwfl_Module *dwflmod, Ebl *ebl, GElf_Ehdr *ehdr,
- 		case DW_LNE_define_file:
- 		  {
- 		    char *fname = (char *) linep;
--		    unsigned char *endp = memchr (linep, '\0',
-+		    const unsigned char *endp = memchr (linep, '\0',
- 						  lineendp - linep);
- 		    if (unlikely (endp == NULL))
- 		      goto invalid_unit;
--- 
-2.52.0
-

elfutils.spec

@@ -1,14 +1,10 @@
-# Rebuild --with static to enable static subpackages
-# This is *not* supported by elfutils maintainers
-%bcond_with static
-
 Name: elfutils
-Version: 0.194
+Version: 0.189
 %global baserelease 2
 Release: %{baserelease}%{?dist}
 URL: http://elfutils.org/
 %global source_url ftp://sourceware.org/pub/elfutils/%{version}/
-License: GPL-3.0-or-later AND (GPL-2.0-or-later OR LGPL-3.0-or-later) AND GFDL-1.3-no-invariants-or-later
+License: GPLv3+ and (GPLv2+ or LGPLv3+) and GFDL
 Source: %{?source_url}%{name}-%{version}.tar.bz2
 Source1: elfutils-debuginfod.sysusers
 Summary: A collection of utilities and DSOs to handle ELF files and DWARF data
@@ -16,16 +12,13 @@ Summary: A collection of utilities and DSOs to handle ELF files and DWARF data
 # Needed for isa specific Provides and Requires.
 %global depsuffix %{?_isa}%{!?_isa:-%{_arch}}
 
-# eu-stacktrace currently only supports x86_64
-%ifarch x86_64
-%global enable_stacktrace 1
-%else
-%global enable_stacktrace 0
-%endif
-
 Requires: elfutils-libelf%{depsuffix} = %{version}-%{release}
 Requires: elfutils-libs%{depsuffix} = %{version}-%{release}
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 20
+Recommends: elfutils-debuginfod-client%{depsuffix} = %{version}-%{release}
+%else
 Requires: elfutils-debuginfod-client%{depsuffix} = %{version}-%{release}
+%endif
 
 BuildRequires: gcc
 # For libstdc++ demangle support
@@ -46,8 +39,6 @@ BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33
 BuildRequires: pkgconfig(libcurl) >= 7.29.0
 BuildRequires: pkgconfig(sqlite3) >= 3.7.17
 BuildRequires: pkgconfig(libarchive) >= 3.1.2
-# For debugindod metadata query
-BuildRequires: pkgconfig(json-c) >= 0.11
 
 # For tests need to bunzip2 test files.
 BuildRequires: bzip2
@@ -59,19 +50,6 @@ BuildRequires: bsdtar
 BuildRequires: curl
 # For run-debuginfod-response-headers.sh test case
 BuildRequires: socat
-# For run-debuginfod-find-metadata.sh
-BuildRequires: jq
-
-# For debuginfod rpm IMA verification
-BuildRequires: rpm-devel
-BuildRequires: ima-evm-utils-devel
-BuildRequires: openssl-devel
-BuildRequires: rpm-sign
-
-# For eu-stacktrace
-%if %{enable_stacktrace}
-BuildRequires: sysprof-capture-devel
-%endif
 
 BuildRequires: automake
 BuildRequires: autoconf
@@ -96,12 +74,10 @@ BuildRequires: gettext-devel
 
 # For s390x... FDO package notes are bogus.
 Patch1: elfutils-0.186-fdo-swap.patch
-
-# Prevent assert failure in readelf for some -ggdb3 binaries.
-Patch2: elfutils-0.194-alloc-jobs.patch
-
-# Fix const warning from newer GCC.
-Patch3: elfutils-0.194-fix-const.patch
+# testsuite: Avoid C99 compatibility issues in run-native-test.sh
+Patch2: elfutils-0.189-c99-compat.patch
+# elfcompress: Don't compress if section already compressed unless forced
+Patch3: elfutils-0.189-elfcompress.patch
 
 %description
 Elfutils is a collection of utilities, including stack (to show
@@ -113,7 +89,7 @@ elfcompress (to compress or decompress ELF sections).
 
 %package libs
 Summary: Libraries to handle compiled objects
-License: GPL-2.0-or-later OR LGPL-3.0-or-later
+License: GPLv2+ or LGPLv3+
 %if 0%{!?_isa:1}
 Provides: elfutils-libs%{depsuffix} = %{version}-%{release}
 %endif
@@ -136,7 +112,7 @@ libraries.
 
 %package devel
 Summary: Development libraries to handle compiled objects
-License: GPL-2.0-or-later OR LGPL-3.0-or-later
+License: GPLv2+ or LGPLv3+
 %if 0%{!?_isa:1}
 Provides: elfutils-devel%{depsuffix} = %{version}-%{release}
 %endif
@@ -147,6 +123,7 @@ Recommends: elfutils-debuginfod-client-devel%{depsuffix} = %{version}-%{release}
 %else
 Requires: elfutils-debuginfod-client-devel%{depsuffix} = %{version}-%{release}
 %endif
+Obsoletes: elfutils-devel-static < 0.180-5
 
 %description devel
 The elfutils-devel package contains the libraries to create
@@ -154,24 +131,9 @@ applications for handling compiled objects.  libdw provides access
 to the DWARF debugging information.  libasm provides a programmable
 assembler interface.
 
-%if %{with static}
-%package devel-static
-Summary: Static archives to handle compiled objects
-License: GPL-2.0-or-later OR LGPL-3.0-or-later
-%if 0%{!?_isa:1}
-Provides: elfutils-devel-static%{depsuffix} = %{version}-%{release}
-%endif
-Requires: elfutils-devel%{depsuffix} = %{version}-%{release}
-Requires: elfutils-libelf-devel-static%{depsuffix} = %{version}-%{release}
-
-%description devel-static
-The elfutils-devel-static package contains the static archives
-with the code to handle compiled objects.
-%endif
-
 %package libelf
 Summary: Library to read and write ELF files
-License: GPL-2.0-or-later OR LGPL-3.0-or-later
+License: GPLv2+ or LGPLv3+
 %if 0%{!?_isa:1}
 Provides: elfutils-libelf%{depsuffix} = %{version}-%{release}
 %endif
@@ -185,12 +147,13 @@ elfutils package use it also to generate new ELF files.
 
 %package libelf-devel
 Summary: Development support for libelf
-License: GPL-2.0-or-later OR LGPL-3.0-or-later
+License: GPLv2+ or LGPLv3+
 %if 0%{!?_isa:1}
 Provides: elfutils-libelf-devel%{depsuffix} = %{version}-%{release}
 %endif
 Requires: elfutils-libelf%{depsuffix} = %{version}-%{release}
 Obsoletes: libelf-devel <= 0.8.2-2
+Obsoletes: elfutils-libelf-devel-static < 0.180-5
 
 %description libelf-devel
 The elfutils-libelf-devel package contains the libraries to create
@@ -198,25 +161,10 @@ applications for handling compiled objects.  libelf allows you to
 access the internals of the ELF object file format, so you can see the
 different sections of an ELF file.
 
-%if %{with static}
-%package libelf-devel-static
-Summary: Static archive of libelf
-License: GPL-2.0-or-later OR LGPL-3.0-or-later
-%if 0%{!?_isa:1}
-Provides: elfutils-libelf-devel-static%{depsuffix} = %{version}-%{release}
-%endif
-Requires: elfutils-libelf-devel%{depsuffix} = %{version}-%{release}
-Requires: libzstd-static%{depsuffix}
-
-%description libelf-devel-static
-The elfutils-libelf-static package contains the static archive
-for libelf.
-%endif
-
 %if %{provide_yama_scope}
 %package default-yama-scope
 Summary: Default yama attach scope sysctl setting
-License: GPL-2.0-or-later OR LGPL-3.0-or-later
+License: GPLv2+ or LGPLv3+
 Provides: default-yama-scope
 BuildArch: noarch
 # For the sysctl_apply macro we need systemd as build requires.
@@ -250,7 +198,7 @@ profiling) of processes.
 
 %package debuginfod-client
 Summary: Library and command line client for build-id HTTP ELF/DWARF server
-License: GPL-3.0-or-later AND (GPL-2.0-or-later OR LGPL-3.0-or-later)
+License: GPLv3+ and (GPLv2+ or LGPLv3+)
 %if 0%{!?_isa:1}
 Provides: elfutils-debuginfod-client%{depsuffix} = %{version}-%{release}
 %endif
@@ -260,7 +208,7 @@ Requires: elfutils-libelf%{depsuffix} = %{version}-%{release}
 
 %package debuginfod-client-devel
 Summary: Libraries and headers to build debuginfod client applications
-License: GPL-2.0-or-later OR LGPL-3.0-or-later
+License: GPLv2+ or LGPLv3+
 %if 0%{!?_isa:1}
 Provides: elfutils-debuginfod-client-devel%{depsuffix} = %{version}-%{release}
 %endif
@@ -268,7 +216,7 @@ Requires: elfutils-debuginfod-client%{depsuffix} = %{version}-%{release}
 
 %package debuginfod
 Summary: HTTP ELF/DWARF file server addressed by build-id
-License: GPL-3.0-or-later
+License: GPLv3+
 Requires: elfutils-libs%{depsuffix} = %{version}-%{release}
 Requires: elfutils-libelf%{depsuffix} = %{version}-%{release}
 Requires: elfutils-debuginfod-client%{depsuffix} = %{version}-%{release}
@@ -328,16 +276,11 @@ trap 'cat config.log' EXIT
 # dist_debuginfod_url is defined in macros.dist. Fedora and CentOS have
 # URLs pointing to their respective servers.  RHEL and Amazon Linux do
 # not configure a default server.
-%configure CFLAGS="$RPM_OPT_FLAGS" \
 %if "%{?dist_debuginfod_url}"
-	--enable-debuginfod \
-	--enable-debuginfod-urls="%{dist_debuginfod_url}" \
+%configure CFLAGS="$RPM_OPT_FLAGS" --enable-debuginfod-urls=%{dist_debuginfod_url}
+%else
+%configure CFLAGS="$RPM_OPT_FLAGS"
 %endif
-%if %{enable_stacktrace}
-	--enable-stacktrace \
-%endif
-	--enable-debuginfod-ima-verification \
-	--enable-debuginfod-ima-cert-path=%{_sysconfdir}/keys/ima
 trap '' EXIT
 %make_build
 
@@ -345,10 +288,8 @@ trap '' EXIT
 %make_install
 
 chmod +x ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/lib*.so*
-%if %{without static}
 # We don't want the static libraries
 rm ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/lib{elf,dw,asm}.a
-%endif
 
 %find_lang %{name}
 
@@ -411,11 +352,7 @@ fi
 %{_bindir}/eu-ranlib
 %{_bindir}/eu-readelf
 %{_bindir}/eu-size
-%{_bindir}/eu-srcfiles
 %{_bindir}/eu-stack
-%if %{enable_stacktrace}
-%{_bindir}/eu-stacktrace
-%endif
 %{_bindir}/eu-strings
 %{_bindir}/eu-strip
 %{_bindir}/eu-unstrip
@@ -438,17 +375,10 @@ fi
 %{_includedir}/elfutils/libdwfl.h
 %{_includedir}/elfutils/libdwelf.h
 %{_includedir}/elfutils/version.h
-%{_includedir}/elfutils/libdwfl_stacktrace.h
 %{_libdir}/libasm.so
 %{_libdir}/libdw.so
 %{_libdir}/pkgconfig/libdw.pc
 
-%if %{with static}
-%files devel-static
-%{_libdir}/libdw.a
-%{_libdir}/libasm.a
-%endif
-
 %files -f %{name}.lang libelf
 %license COPYING-GPLV2 COPYING-LGPLV3
 %{_libdir}/libelf-%{version}.so
@@ -461,15 +391,6 @@ fi
 %{_libdir}/libelf.so
 %{_libdir}/pkgconfig/libelf.pc
 %{_mandir}/man3/elf_*.3*
-%{_mandir}/man3/elf32_*.3*
-%{_mandir}/man3/elf64_*.3*
-%{_mandir}/man3/gelf_*.3*
-%{_mandir}/man3/libelf.3*
-
-%if %{with static}
-%files libelf-devel-static
-%{_libdir}/libelf.a
-%endif
 
 %if %{provide_yama_scope}
 %files default-yama-scope
@@ -485,7 +406,6 @@ fi
 %config(noreplace) %{_sysconfdir}/profile.d/*
 %if "%{?dist_debuginfod_url}"
 %config(noreplace) %{_sysconfdir}/debuginfod/*
-%config(noreplace) %{_datadir}/fish/vendor_conf.d/*
 %endif
 
 %files debuginfod-client-devel
@@ -502,6 +422,7 @@ fi
 %{_sysusersdir}/elfutils-debuginfod.conf
 %endif
 %{_mandir}/man8/debuginfod*.8*
+%{_mandir}/man7/debuginfod*.7*
 
 
 %dir %attr(0700,debuginfod,debuginfod) %{_localstatedir}/cache/debuginfod
@@ -525,133 +446,6 @@ exit 0
 %systemd_postun_with_restart debuginfod.service
 
 %changelog
-* Tue Dec 09 2025 Aaron Merey <amerey@redhat.com> - 0.194-2
-- Add elfutils-0.194-fix-const.patch
-
-* Tue Oct 28 2025 Aaron Merey <amerey@redhat.com> - 0.194-1
-- Upgrade to upstream elfutils 0.194
-- Add elfutils-0.194-alloc-jobs.patch
-
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.193-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Mon Apr 28 2025 Aaron Merey <amerey@redhat.com> - 0.193-1
-- Upgrade to upstream elfutils 0.193
-- Drop upstreamed patches
-  elfutils-0.192-ATOMIC_VAR_INIT.patch
-  elfutils-0.192-libelf-static.patch
-  elfutils-0.192-fix-configure-conditional.patch
-  elfutils-0.192-more-dwarf5-lang.patch
-  elfutils-0.192-fix-zsh-profile.patch
-  elfutils-0.192-stacktrace-lto.patch
-  elfutils-0.192-imasig-fail-free.patch
-  elfutils-0.192-strip-ignore-non-ET_REL.patch
-
-* Sun Feb 23 2025 Mark Wielaard <mjw@fedoraproject.org> - 0.192-9
-- Add elfutils-0.192-imasig-fail-free.patch
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.192-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Mon Dec 2 2024 Mark Wielaard <mjw@fedoraproject.org> - 0.192-7
-- Add elfutils-0.192-ATOMIC_VAR_INIT.patch
-- Add elfutils-0.192-more-dwarf5-lang.patch
-
-* Tue Nov 12 2024 Aaron Merey <amerey@fedoraproject.org> - 0.192-6
-- Add elfutils-0.192-strip-ignore-non-ET_REL.patch
-- Set debuginfod IMA cert path
-
-* Tue Oct 29 2024 Aaron Merey <amerey@fedoraproject.org> - 0.192-5
-- Enable debuginfod IMA verification
-- Add elfutils-0.192-fix-configure-conditional.patch
-- Add elfutils-0.192-fix-zsh-profile.patch
-
-* Thu Oct 24 2024 Mark Wielaard <mjw@fedoraproject.org> - 0.192-4
-- Add elfutils-0.192-stacktrace-lto.patch
-- Enable eu-stacktrace on x86_64
-
-* Tue Oct 22 2024 Aaron Merey <amerey@fedoraproject.org> - 0.192-3
-- Add elfutils-0.192-libelf-static.patch
-
-* Mon Oct 21 2024 Aaron Merey <amerey@fedoraproject.org> - 0.192-2
-- Add BuildRequires for json-c
-
-* Mon Oct 21 2024 Aaron Merey <amerey@fedoraproject.org> - 0.192-1
-- Upgrade to upstream elfutils 0.192
-- Drop upstreamed patches
-  Add elfutils-0.190-profile-empty-urls.patch
-  Add elfutils-0.190-riscv-flatten.patch
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.191-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Mon Apr 22 2024 Aaron Merey <amerey@fedoraproject.org> - 0.191-7
-- Capitalize SPDX booleans.
-
-* Fri Apr 19 2024 Mark Wielaard <mjw@fedoraproject.org> - 0.191-6
-- eu-srcfiles directly links to libdebuginfod.so so explicitly
-  Require elfutils-debuginfod-client not just Recommends.
-
-* Wed Mar 27 2024 Mark Wielaard <mjw@fedoraproject.org> - 0.191-5
-- Add elfutils-0.190-profile-empty-urls.patch
-
-* Wed Mar 20 2024 Mark Wielaard <mjw@fedoraproject.org> - 0.191-4
-- Add elfutils-0.190-riscv-flatten.patch
-
-* Fri Mar 15 2024 Michel Lind <salimma@fedoraproject.org> - 0.191-3
-- Add feature flag for reenabling elfutils-libelf-devel-static and elfutils-devel-static
-- Add dependency on libzstd-static for elfutils-libelf-devel-static
-
-* Mon Mar  4 2024 Aaron Merey <amerey@fedoraproject.org> - 0.191-2
-- Update SPDX license.
-
-* Mon Mar  4 2024 Aaron Merey <amerey@fedoraproject.org> - 0.191-1
-- Upgrade to upstream elfutils 0.191
-- Drop upstreamed patches
-  elfutils-0.190-fix-core-noncontig.patch
-  elfutils-0.190-gcc-14.patch
-  elfutils-0.190-remove-ET_REL-unstrip-test.patch
-- Drop testcore-noncontig.bz2
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.190-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.190-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* 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
-
-* Fri Nov  3 2023 Mark Wielaard <mjw@fedoraproject.org> - 0.190-2
-- Update Fedora license tags to spdx license tags
-
-* Fri Nov  3 2023 Mark Wielaard <mjw@fedoraproject.org> - 0.190-1
-- Upgrade to upstream elfutils 0.190
-- Add eu-srcfiles
-- Drop upstreamed patches
-  elfutils-0.189-relr.patch
-  elfutils-0.189-debuginfod_config_cache-double-close.patch
-  elfutils-0.189-elf_getdata_rawchunk.patch
-  elfutils-0.189-elfcompress.patch
-  elfutils-0.189-c99-compat.patch
-- Only package debuginfod-client-config.7 manpage for debuginfod-client
-
-* Thu Aug 24 2023 Mark Wielaard <mjw@fedoraproject.org> - 0.189-6
-- Update elfutils-0.189-relr.patch
-
-* Wed Aug 23 2023 Mark Wielaard <mjw@fedoraproject.org> - 0.189-5
-- Add elfutils-0.189-relr.patch
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.189-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jun 22 2023 Mark Wielaard <mjw@fedoraproject.org> - 0.189-3
-- Add elfutils-0.189-elf_getdata_rawchunk.patch
-- Add elfutils-0.189-debuginfod_config_cache-double-close.patch
-
 * Sat Apr 22 2023 Mark Wielaard <mjw@fedoraproject.org> - 0.189-2
 - Add elfutils-0.189-c99-compat.patch
 - Add elfutils-0.189-elfcompress.patch

sources

@@ -1 +1 @@
-SHA512 (elfutils-0.194.tar.bz2) = 5d00502f61b92643bf61dc61da4ddded36c423466388d992bcd388c5208761b8ed9db1a01492c085cd0984eef30c08f895a8e307e78e0df8df40b56ae35b78a5
+SHA512 (elfutils-0.189.tar.bz2) = 93a877e34db93e5498581d0ab2d702b08c0d87e4cafd9cec9d6636dfa85a168095c305c11583a5b0fb79374dd93bc8d0e9ce6016e6c172764bcea12861605b71