From 215fccf86a912bc92fc28bab68d4518420d10959 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@klomp.org>
Date: Mon, 31 May 2021 16:43:18 +0200
Subject: [PATCH] 0.185-1 - Upgrade to upstream 0.185

Resolves: #1953753
routine rebase of elfutils for rhel 9
---
 .gitignore    |  1 +
 elfutils.spec | 15 ++++++++++++---
 sources       |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 710bb51..df63d0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
 /elfutils-0.181.tar.bz2
 /elfutils-0.182.tar.bz2
 /elfutils-0.183.tar.bz2
+/elfutils-0.185.tar.bz2
diff --git a/elfutils.spec b/elfutils.spec
index 98ed9fa..347f13e 100644
--- a/elfutils.spec
+++ b/elfutils.spec
@@ -1,6 +1,6 @@
 Name: elfutils
-Version: 0.183
-%global baserelease 2
+Version: 0.185
+%global baserelease 1
 Release: %{baserelease}%{?dist}
 URL: http://elfutils.org/
 %global source_url ftp://sourceware.org/pub/elfutils/%{version}/
@@ -46,6 +46,7 @@ BuildRequires: zstd
 BuildRequires: iproute
 BuildRequires: bsdtar
 BuildRequires: curl
+BuildRequires: procps
 
 BuildRequires: automake
 BuildRequires: autoconf
@@ -284,7 +285,7 @@ touch ${RPM_BUILD_ROOT}%{_localstatedir}/cache/debuginfod/debuginfod.sqlite
 
 %check
 # Record some build root versions in build.log
-uname -r; rpm -q binutils gcc glibc
+uname -r; rpm -q binutils gcc glibc || true
 
 %make_build -s check || (cat tests/test-suite.log; false)
 
@@ -409,6 +410,14 @@ exit 0
 %systemd_postun_with_restart debuginfod.service
 
 %changelog
+* Mon May 31 2021 Mark Wielaard <mjw@redhat.com> - 0.185-1
+- Upgrade to upstream 0.185
+  - debuginfod-client: Simplify curl handle reuse so downloads which
+                       return an error are retried.
+  - elfcompress: Always exit with code 0 when the operation succeeds
+                 (even when nothing was done). On error the exit code
+                 is now always 1.
+
 * Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 0.183-2
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
diff --git a/sources b/sources
index 9e0e03d..b564fdb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (elfutils-0.183.tar.bz2) = bdafdd738a33cebe4f87849e5e6f1133881e77ef71b27faa0f0234ff80e9674f506957898326c2a55fd8438cbd189f7930597d0b4b9ca6c77921cc0cbd83b6b7
+SHA512 (elfutils-0.185.tar.bz2) = 34de0de1355b11740e036e0fc64f2fc063587c8eb121b19216ee5548d3f0f268d8fc3995176c47190466b9d881007cfa11a9d01e9a50e38af6119492bf8bb47f