0.189-1 - Upgrade to upsteam elfutils 0.189

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

.gitignore

@@ -29,3 +29,4 @@
 /elfutils-0.186.tar.bz2
 /elfutils-0.187.tar.bz2
 /elfutils-0.188.tar.bz2
+/elfutils-0.189.tar.bz2

elfutils-0.188-compile-warnings.patch

@@ -1,109 +0,0 @@
-commit 75f2de448f311807e2493f2a37a980e2d872b229
-Author: Mark Wielaard <mark@klomp.org>
-Date:   Thu Nov 3 13:38:45 2022 +0100
-
-    readelf: Check phdr != NULL or shdr != NULL in handle_dynamic.
-    
-    The compiler doesn't know that when use_dynamic_segment is true,
-    then phdr should/will be non-NULL and otherwise shdr is non-NULL.
-    Add explicit checks to help the compiler out and in case an error
-    is made calling the handle_dynamic function.
-    
-    Signed-off-by: Mark Wielaard <mark@klomp.org>
-
-diff --git a/src/readelf.c b/src/readelf.c
-index 0e0b05c4..e721a209 100644
---- a/src/readelf.c
-+++ b/src/readelf.c
-@@ -1828,7 +1828,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr, GElf_Phdr *phdr)
-   size_t dyn_ents;
- 
-   /* Get the data of the section.  */
--  if (use_dynamic_segment)
-+  if (use_dynamic_segment && phdr != NULL)
-     data = elf_getdata_rawchunk(ebl->elf, phdr->p_offset,
- 				phdr->p_filesz, ELF_T_DYN);
-   else
-@@ -1840,7 +1840,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr, GElf_Phdr *phdr)
-   /* Get the dynamic section entry number */
-   dyn_ents = get_dyn_ents (data);
- 
--  if (!use_dynamic_segment)
-+  if (!use_dynamic_segment && shdr != NULL)
-     {
-       /* Get the section header string table index.  */
-       if (unlikely (elf_getshdrstrndx (ebl->elf, &shstrndx) < 0))
-@@ -1862,7 +1862,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr, GElf_Phdr *phdr)
- 	      (int) shdr->sh_link,
- 	      elf_strptr (ebl->elf, shstrndx, glink->sh_name));
-     }
--  else
-+  else if (phdr != NULL)
-     {
-       printf (ngettext ("\
- \nDynamic segment contains %lu entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "\n",
-@@ -1879,7 +1879,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr, GElf_Phdr *phdr)
-   /* if --use-dynamic option is enabled,
-      use the string table to get the related library info.  */
-   Elf_Data *strtab_data = NULL;
--  if (use_dynamic_segment)
-+  if (use_dynamic_segment && phdr != NULL)
-     {
-       strtab_data = get_dynscn_strtab(ebl->elf, phdr);
-       if (strtab_data == NULL)
-@@ -1903,7 +1903,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr, GElf_Phdr *phdr)
- 	  || dyn->d_tag == DT_RPATH
- 	  || dyn->d_tag == DT_RUNPATH)
- 	{
--	  if (! use_dynamic_segment)
-+	  if (! use_dynamic_segment && shdr != NULL)
- 	    name = elf_strptr (ebl->elf, shdr->sh_link, dyn->d_un.d_val);
- 	  else if (dyn->d_un.d_val < strtab_data->d_size
- 		   && memrchr (strtab_data->d_buf + dyn->d_un.d_val, '\0',
-
-commit b0a0235771906e3bcd6174c4e3c020b5522b0be5
-Author: Mark Wielaard <mark@klomp.org>
-Date:   Thu Nov 3 13:44:35 2022 +0100
-
-    libdw: Don't dereference and assign values we are skipping
-    
-    We don't use the FDE address encoding byte, so no reason
-    to read and store it. Just skip past it.
-    
-    Signed-off-by: Mark Wielaard <mark@klomp.org>
-
-diff --git a/libdw/dwarf_next_cfi.c b/libdw/dwarf_next_cfi.c
-index 23b16885..be08984f 100644
---- a/libdw/dwarf_next_cfi.c
-+++ b/libdw/dwarf_next_cfi.c
-@@ -226,7 +226,7 @@ dwarf_next_cfi (const unsigned char e_ident[],
- 	      if (sized_augmentation)
- 		{
- 		  /* Skip FDE address encoding byte.  */
--		  encoding = *bytes++;
-+		  bytes++;
- 		  continue;
- 		}
- 	      break;
-
-commit 52a6a3110e019d696284fdd822c2a2f0987dded2
-Author: Mark Wielaard <mark@klomp.org>
-Date:   Thu Nov 3 13:52:32 2022 +0100
-
-    readelf: Check gelf_getdyn doesn't return NULL
-    
-    Signed-off-by: Mark Wielaard <mark@klomp.org>
-
-diff --git a/src/readelf.c b/src/readelf.c
-index e721a209..3dafb041 100644
---- a/src/readelf.c
-+++ b/src/readelf.c
-@@ -4910,7 +4910,7 @@ get_dynscn_addrs(Elf *elf, GElf_Phdr *phdr, GElf_Addr addrs[i_max])
-     GElf_Dyn dyn_mem;
-     GElf_Dyn *dyn = gelf_getdyn(data, dyn_idx, &dyn_mem);
-     /* DT_NULL Marks end of dynamic section.  */
--    if (dyn->d_tag == DT_NULL)
-+    if (dyn == NULL || dyn->d_tag == DT_NULL)
-       break;
- 
-     switch (dyn->d_tag) {

elfutils-0.188-debuginfod-client-lifetime.patch

@@ -1,171 +0,0 @@
-commit c424e5f3d24f76e01242d15ba361dc6234706fed
-Author: Frank Ch. Eigler <fche@redhat.com>
-Date:   Thu Nov 3 10:07:31 2022 -0400
-
-    debuginfod.cxx: fix coverity-found use-after-release error
-    
-    The debuginfod_client object lifetime needs more careful handling,
-    made easier with the defer_dtor<> gadget.
-    
-    Signed-off-by: Frank Ch. Eigler <fche@redhat.com>
-
-diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
-index f46da6ef..02a11477 100644
---- a/debuginfod/debuginfod.cxx
-+++ b/debuginfod/debuginfod.cxx
-@@ -2249,85 +2249,82 @@ handle_buildid (MHD_Connection* conn,
- 
-   int fd = -1;
-   debuginfod_client *client = debuginfod_pool_begin ();
--  if (client != NULL)
--    {
--      debuginfod_set_progressfn (client, & debuginfod_find_progress);
-+  if (client == NULL)
-+    throw libc_exception(errno, "debuginfod client pool alloc");
-+  defer_dtor<debuginfod_client*,void> client_closer (client, debuginfod_pool_end);
-+  
-+  debuginfod_set_progressfn (client, & debuginfod_find_progress);
- 
--      if (conn)
--        {
--          // Transcribe incoming User-Agent:
--          string ua = MHD_lookup_connection_value (conn, MHD_HEADER_KIND, "User-Agent") ?: "";
--          string ua_complete = string("User-Agent: ") + ua;
--          debuginfod_add_http_header (client, ua_complete.c_str());
--
--          // Compute larger XFF:, for avoiding info loss during
--          // federation, and for future cyclicity detection.
--          string xff = MHD_lookup_connection_value (conn, MHD_HEADER_KIND, "X-Forwarded-For") ?: "";
--          if (xff != "")
--            xff += string(", "); // comma separated list
--
--          unsigned int xff_count = 0;
--          for (auto&& i : xff){
--            if (i == ',') xff_count++;
--          }
-+  if (conn)
-+    {
-+      // Transcribe incoming User-Agent:
-+      string ua = MHD_lookup_connection_value (conn, MHD_HEADER_KIND, "User-Agent") ?: "";
-+      string ua_complete = string("User-Agent: ") + ua;
-+      debuginfod_add_http_header (client, ua_complete.c_str());
-+      
-+      // Compute larger XFF:, for avoiding info loss during
-+      // federation, and for future cyclicity detection.
-+      string xff = MHD_lookup_connection_value (conn, MHD_HEADER_KIND, "X-Forwarded-For") ?: "";
-+      if (xff != "")
-+        xff += string(", "); // comma separated list
-+      
-+      unsigned int xff_count = 0;
-+      for (auto&& i : xff){
-+        if (i == ',') xff_count++;
-+      }
- 
--          // if X-Forwarded-For: exceeds N hops,
--          // do not delegate a local lookup miss to upstream debuginfods.
--          if (xff_count >= forwarded_ttl_limit)
--            throw reportable_exception(MHD_HTTP_NOT_FOUND, "not found, --forwared-ttl-limit reached \
-+      // if X-Forwarded-For: exceeds N hops,
-+      // do not delegate a local lookup miss to upstream debuginfods.
-+      if (xff_count >= forwarded_ttl_limit)
-+        throw reportable_exception(MHD_HTTP_NOT_FOUND, "not found, --forwared-ttl-limit reached \
- and will not query the upstream servers");
- 
--          // Compute the client's numeric IP address only - so can't merge with conninfo()
--          const union MHD_ConnectionInfo *u = MHD_get_connection_info (conn,
--                                                                       MHD_CONNECTION_INFO_CLIENT_ADDRESS);
--          struct sockaddr *so = u ? u->client_addr : 0;
--          char hostname[256] = ""; // RFC1035
--          if (so && so->sa_family == AF_INET) {
--            (void) getnameinfo (so, sizeof (struct sockaddr_in), hostname, sizeof (hostname), NULL, 0,
--                                NI_NUMERICHOST);
--          } else if (so && so->sa_family == AF_INET6) {
--            struct sockaddr_in6* addr6 = (struct sockaddr_in6*) so;
--            if (IN6_IS_ADDR_V4MAPPED(&addr6->sin6_addr)) {
--              struct sockaddr_in addr4;
--              memset (&addr4, 0, sizeof(addr4));
--              addr4.sin_family = AF_INET;
--              addr4.sin_port = addr6->sin6_port;
--              memcpy (&addr4.sin_addr.s_addr, addr6->sin6_addr.s6_addr+12, sizeof(addr4.sin_addr.s_addr));
--              (void) getnameinfo ((struct sockaddr*) &addr4, sizeof (addr4),
--                                  hostname, sizeof (hostname), NULL, 0,
--                                  NI_NUMERICHOST);
--            } else {
--              (void) getnameinfo (so, sizeof (struct sockaddr_in6), hostname, sizeof (hostname), NULL, 0,
--                                  NI_NUMERICHOST);
--            }
--          }
--          
--          string xff_complete = string("X-Forwarded-For: ")+xff+string(hostname);
--          debuginfod_add_http_header (client, xff_complete.c_str());
-+      // Compute the client's numeric IP address only - so can't merge with conninfo()
-+      const union MHD_ConnectionInfo *u = MHD_get_connection_info (conn,
-+                                                                   MHD_CONNECTION_INFO_CLIENT_ADDRESS);
-+      struct sockaddr *so = u ? u->client_addr : 0;
-+      char hostname[256] = ""; // RFC1035
-+      if (so && so->sa_family == AF_INET) {
-+        (void) getnameinfo (so, sizeof (struct sockaddr_in), hostname, sizeof (hostname), NULL, 0,
-+                            NI_NUMERICHOST);
-+      } else if (so && so->sa_family == AF_INET6) {
-+        struct sockaddr_in6* addr6 = (struct sockaddr_in6*) so;
-+        if (IN6_IS_ADDR_V4MAPPED(&addr6->sin6_addr)) {
-+          struct sockaddr_in addr4;
-+          memset (&addr4, 0, sizeof(addr4));
-+          addr4.sin_family = AF_INET;
-+          addr4.sin_port = addr6->sin6_port;
-+          memcpy (&addr4.sin_addr.s_addr, addr6->sin6_addr.s6_addr+12, sizeof(addr4.sin_addr.s_addr));
-+          (void) getnameinfo ((struct sockaddr*) &addr4, sizeof (addr4),
-+                              hostname, sizeof (hostname), NULL, 0,
-+                              NI_NUMERICHOST);
-+        } else {
-+          (void) getnameinfo (so, sizeof (struct sockaddr_in6), hostname, sizeof (hostname), NULL, 0,
-+                              NI_NUMERICHOST);
-         }
--
--      if (artifacttype == "debuginfo")
--	fd = debuginfod_find_debuginfo (client,
--					(const unsigned char*) buildid.c_str(),
--					0, NULL);
--      else if (artifacttype == "executable")
--	fd = debuginfod_find_executable (client,
--					 (const unsigned char*) buildid.c_str(),
--					 0, NULL);
--      else if (artifacttype == "source")
--	fd = debuginfod_find_source (client,
--				     (const unsigned char*) buildid.c_str(),
--				     0, suffix.c_str(), NULL);
--      else if (artifacttype == "section")
--	fd = debuginfod_find_section (client,
--				      (const unsigned char*) buildid.c_str(),
--				      0, section.c_str(), NULL);
--
-+      }
-+          
-+      string xff_complete = string("X-Forwarded-For: ")+xff+string(hostname);
-+      debuginfod_add_http_header (client, xff_complete.c_str());
-     }
--  else
--    fd = -errno; /* Set by debuginfod_begin.  */
--  debuginfod_pool_end (client);
--
-+  
-+  if (artifacttype == "debuginfo")
-+    fd = debuginfod_find_debuginfo (client,
-+                                    (const unsigned char*) buildid.c_str(),
-+                                    0, NULL);
-+  else if (artifacttype == "executable")
-+    fd = debuginfod_find_executable (client,
-+                                     (const unsigned char*) buildid.c_str(),
-+                                     0, NULL);
-+  else if (artifacttype == "source")
-+    fd = debuginfod_find_source (client,
-+                                 (const unsigned char*) buildid.c_str(),
-+                                 0, suffix.c_str(), NULL);
-+  else if (artifacttype == "section")
-+    fd = debuginfod_find_section (client,
-+                                  (const unsigned char*) buildid.c_str(),
-+                                  0, section.c_str(), NULL);
-+  
-   if (fd >= 0)
-     {
-       if (conn != 0)

elfutils-0.188-static-extract_section.patch

@@ -1,24 +0,0 @@
-commit 58a7aa900bc2d9822b0d0cb596ba95a21ff0fd2d
-Author: Mark Wielaard <mark@klomp.org>
-Date:   Wed Nov 2 17:54:11 2022 +0100
-
-    debuginfod: Mark extract_section function static
-    
-    The extract_section function in debuginfod-client.c is an internal
-    function and should not be exported. Mark it as static.
-    
-    Signed-off-by: Mark Wielaard <mark@klomp.org>
-
-diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
-index 0c4a00cf..f48e32cc 100644
---- a/debuginfod/debuginfod-client.c
-+++ b/debuginfod/debuginfod-client.c
-@@ -621,7 +621,7 @@ path_escape (const char *src, char *dest)
-    section name was not found.  -EEXIST indicates that the section was
-    found but had type SHT_NOBITS.  */
- 
--int
-+static int
- extract_section (int fd, const char *section, char *fd_path, char **usr_path)
- {
-   elf_version (EV_CURRENT);

elfutils.spec

@@ -1,6 +1,6 @@
 Name: elfutils
-Version: 0.188
-%global baserelease 3
+Version: 0.189
+%global baserelease 1
 Release: %{baserelease}%{?dist}
 URL: http://elfutils.org/
 %global source_url ftp://sourceware.org/pub/elfutils/%{version}/
@@ -74,12 +74,6 @@ BuildRequires: gettext-devel
 
 # For s390x... FDO package notes are bogus.
 Patch1: elfutils-0.186-fdo-swap.patch
-# Don't export internal function.
-Patch2: elfutils-0.188-static-extract_section.patch
-# Silence some compiler warnings
-Patch3: elfutils-0.188-compile-warnings.patch
-# The debuginfod_client object lifetime needs more careful handling
-Patch4: elfutils-0.188-debuginfod-client-lifetime.patch
 
 %description
 Elfutils is a collection of utilities, including stack (to show
@@ -448,6 +442,17 @@ exit 0
 %systemd_postun_with_restart debuginfod.service
 
 %changelog
+* Fri Mar 3 2023 Mark Wielaard <mjw@fedoraproject.org> - 0.189-1
+- Upgrade to upsteam elfutils 0.189.
+
+* Fri Jan 27 2023 Mark Wielaard <mjw@fedoraproject.org> - 0.188-5
+- Add elfutils-0.188-deprecated-CURLINFO.patch,
+  elfutils-0.188-CURL_AT_LEAST_VERSION.patch and
+  elfutils-0.188-CURLOPT_PROTOCOLS_STR.patch
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.188-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Mon Nov 7 2022 Mark Wielaard <mjw@fedoraproject.org> - 0.188-3
 - Add elfutils-0.188-compile-warnings.patch
 - Add elfutils-0.188-debuginfod-client-lifetime.patch

sources

@@ -1 +1 @@
-SHA512 (elfutils-0.188.tar.bz2) = 585551b2d937d19d1becfc2f28935db1dd1a3d25571a62f322b70ac8da98c1a741a55d070327705df6c3e2ee026652e0b9a3c733b050a0b0ec5f2fc75d5b74b5
+SHA512 (elfutils-0.189.tar.bz2) = 93a877e34db93e5498581d0ab2d702b08c0d87e4cafd9cec9d6636dfa85a168095c305c11583a5b0fb79374dd93bc8d0e9ce6016e6c172764bcea12861605b71

tests/Regression/GNU-Attribute-notes-not-recognized/Makefile

@@ -54,7 +54,7 @@ $(METADATA): Makefile
 	@echo "TestTime:        48h" >> $(METADATA)
 	@echo "RunFor:          elfutils" >> $(METADATA)
 	@echo "Requires:        elfutils" >> $(METADATA)
-	@echo "Requires:        bash" >> $(METADATA)
+	@echo "Requires:        bash bash-debuginfo" >> $(METADATA)
 	@echo "Priority:        Normal" >> $(METADATA)
 	@echo "License:         GPLv2+" >> $(METADATA)
 	@echo "Confidential:    no" >> $(METADATA)

tests/Regression/GNU-Attribute-notes-not-recognized/main.fmf

@@ -2,15 +2,15 @@ summary: GNU-Attribute-notes-not-recognized
 description: |
     Bug summary: elfutils doesn't recognize GNU Attribute notes
     Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1650125
-contact:
-- Martin Cermak <mcermak@redhat.com>
+contact: Martin Cermak <mcermak@redhat.com>
 component:
-- elfutils
+  - elfutils
 test: ./runtest.sh
 framework: beakerlib
 recommend:
-- elfutils
-- bash
+  - elfutils
+  - bash
+  - bash-debuginfo
 duration: 48h
 extra-summary: /tools/elfutils/Regression/GNU-Attribute-notes-not-recognized
 extra-task: /tools/elfutils/Regression/GNU-Attribute-notes-not-recognized

tests/Regression/GNU-Attribute-notes-not-recognized/runtest.sh

@@ -32,12 +32,35 @@ PACKAGE="elfutils"
 
 rlJournalStart
     rlPhaseStartTest
-	# Rely on that /bin/bash is annobin-annotated per
-	# - https://fedoraproject.org/wiki/Toolchain/Watermark
-	# - https://fedoraproject.org/wiki/Changes/Annobin
-	# Seems to work fine with bash-4.4.19-6.el8 and elfutils-0.174-5.el8.
-	set -o pipefail
-	rlRun "eu-readelf -n /bin/bash | grep -2 '^  GA' | fgrep 'GNU Build Attribute' | tail -50"
+        # Rely on that /bin/bash is annobin-annotated per
+        # - https://fedoraproject.org/wiki/Toolchain/Watermark
+        # - https://fedoraproject.org/wiki/Changes/Annobin
+        # Seems to work fine with bash-4.4.19-6.el8 and elfutils-0.174-5.el8.
+        f="/bin/bash"
+
+        # Annobin notes originally used to reside in the binary itself.
+        # Later on they moved to debuginfo.
+        # Let's see if we can chase down needed debuginfo somewhere...
+
+        # Attempt getting the needed file using debuginfod
+        export DEBUGINFOD_URLS=https://debuginfod.fedoraproject.org/
+        rlRun "f=\"$f $(debuginfod-find debuginfo /bin/bash)\""
+
+        # Attempt getting the needed file by traditional means
+        rlRun "debuginfo-install -y bash"
+        rlRun "buildid=$(eu-readelf -n /bin/bash | awk '/Build ID:/ {print $NF}')"
+        for i in $(rpm -ql bash-debuginfo); do
+            test -f $i || continue
+            if eu-readelf -n $i | fgrep $buildid; then
+                rlRun "f=\"$f $i\""
+            fi
+        done
+
+        set -o pipefail
+        export f
+        # Check if eu-readelf can read the notes from at least one of files
+        # that can possibly contain it...
+        rlRun "(for i in $f; do eu-readelf -n $i; done ) | grep -2 '^  GA' | fgrep 'GNU Build Attribute' | tail -50"
     rlPhaseEnd
 rlJournalPrintText
 rlJournalEnd