diff --git a/.elfutils.metadata b/.elfutils.metadata index 05a788a..c0f14c9 100644 --- a/.elfutils.metadata +++ b/.elfutils.metadata @@ -1 +1 @@ -3efc2253564a2ca8be0a5cf9aba3e4b5f544ee22 SOURCES/elfutils-0.182.tar.bz2 +ff645cefff25ee9bc98bcd233bd20a86392bf77a SOURCES/elfutils-0.185.tar.bz2 diff --git a/.gitignore b/.gitignore index 617df92..c919b40 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/elfutils-0.182.tar.bz2 +SOURCES/elfutils-0.185.tar.bz2 diff --git a/SOURCES/elfutils-0.182-debuginfod-test-fix.patch b/SOURCES/elfutils-0.182-debuginfod-test-fix.patch deleted file mode 100644 index 62efd07..0000000 --- a/SOURCES/elfutils-0.182-debuginfod-test-fix.patch +++ /dev/null @@ -1,43 +0,0 @@ -commit f172a31c56405750114924eba0786999bccc501f -Author: Mark Wielaard -Date: Mon Nov 2 15:20:54 2020 +0100 - - tests: Create bogus R/nothing.rpm with cyclic symlink. - - We used to try to trigger an error during debuginfod scanning using - a chmod 000 file. But this doesn't always result in an error. Create - a cyclic symlink instead, which always results in a failure to open/read. - - Signed-off-by: Mark Wielaard - -diff --git a/tests/ChangeLog b/tests/ChangeLog -index 57fc4c8e..2f8b75c3 100644 ---- a/tests/ChangeLog -+++ b/tests/ChangeLog -@@ -1,3 +1,8 @@ -+2020-11-02 Mark Wielaard -+ -+ * run-debuginfod-find.sh: Create bogus R/nothing.rpm with cyclic -+ symlink instead of chmod 000. -+ - 2020-10-31 Mark Wielaard - - * dwfl-proc-attach.c (dlopen): New external function override. -diff --git a/tests/run-debuginfod-find.sh b/tests/run-debuginfod-find.sh -index 48dbc7d4..5af45667 100755 ---- a/tests/run-debuginfod-find.sh -+++ b/tests/run-debuginfod-find.sh -@@ -95,9 +95,10 @@ wait_ready() - fi - } - --# create a 000 empty .rpm file to evoke a metric-visible error --touch R/nothing.rpm --chmod 000 R/nothing.rpm -+# create a bogus .rpm file to evoke a metric-visible error -+# Use a cyclic symlink instead of chmod 000 to make sure even root -+# would see an error (running the testsuite under root is NOT encouraged). -+ln -s R/nothing.rpm R/nothing.rpm - - env LD_LIBRARY_PATH=$ldpath DEBUGINFOD_URLS= ${abs_builddir}/../debuginfod/debuginfod $VERBOSE -F -R -d $DB -p $PORT1 -t0 -g0 --fdcache-fds 1 --fdcache-mbs 2 -Z .tar.xz -Z .tar.bz2=bzcat -v R F Z L > vlog4 2>&1 & - PID1=$! diff --git a/SOURCES/elfutils-0.182-s390-pid_memory_read.patch b/SOURCES/elfutils-0.182-s390-pid_memory_read.patch deleted file mode 100644 index 2c056cb..0000000 --- a/SOURCES/elfutils-0.182-s390-pid_memory_read.patch +++ /dev/null @@ -1,39 +0,0 @@ -commit e4d985a3c1c873f77d20fa0cd421458cc2824996 -Author: Andreas Krebbel -Date: Thu Nov 19 20:32:24 2020 +0100 - - IBM Z: Fix endianess problem in pid_memory_read - - The cached reads lack the big endian adjustments done in the fallback - path. - - Signed-off-by: Andreas Krebbel - -diff --git a/libdwfl/linux-pid-attach.c b/libdwfl/linux-pid-attach.c -index 3a6af997..b23139d9 100644 ---- a/libdwfl/linux-pid-attach.c -+++ b/libdwfl/linux-pid-attach.c -@@ -193,14 +193,22 @@ pid_memory_read (Dwfl *dwfl, Dwarf_Addr addr, Dwarf_Word *result, void *arg) - { - struct __libdwfl_pid_arg *pid_arg = arg; - pid_t tid = pid_arg->tid_attached; -+ Dwfl_Process *process = dwfl->process; - assert (tid > 0); - - #ifdef HAVE_PROCESS_VM_READV - if (read_cached_memory (pid_arg, addr, result)) -+ { -+#if SIZEOF_LONG == 8 -+# if BYTE_ORDER == BIG_ENDIAN -+ if (ebl_get_elfclass (process->ebl) == ELFCLASS32) -+ *result >>= 32; -+# endif -+#endif - return true; -+ } - #endif - -- Dwfl_Process *process = dwfl->process; - if (ebl_get_elfclass (process->ebl) == ELFCLASS64) - { - #if SIZEOF_LONG == 8 diff --git a/SPECS/elfutils.spec b/SPECS/elfutils.spec index df8247c..768aad4 100644 --- a/SPECS/elfutils.spec +++ b/SPECS/elfutils.spec @@ -1,6 +1,6 @@ Name: elfutils -Version: 0.182 -%global baserelease 3 +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,11 @@ BuildRequires: zstd BuildRequires: iproute BuildRequires: bsdtar BuildRequires: curl +BuildRequires: procps + +BuildRequires: automake +BuildRequires: autoconf +BuildRequires: gettext-devel %global _gnu %{nil} %global _program_prefix eu- @@ -57,8 +62,6 @@ BuildRequires: curl %endif # Patches -Patch1: elfutils-0.182-debuginfod-test-fix.patch -Patch2: elfutils-0.182-s390-pid_memory_read.patch %description Elfutils is a collection of utilities, including stack (to show @@ -222,6 +225,7 @@ Requires: elfutils-libs%{depsuffix} = %{version}-%{release} Requires: elfutils-libelf%{depsuffix} = %{version}-%{release} Requires: elfutils-debuginfod-client%{depsuffix} = %{version}-%{release} BuildRequires: systemd +BuildRequires: make Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -250,8 +254,8 @@ such servers to download those files on demand. %setup -q # Apply patches -%patch1 -p1 -b .debuginfod_test_fix -%patch2 -p1 + +autoreconf -f -v -i # In case the above patches added any new test scripts, make sure they # are executable. @@ -295,9 +299,9 @@ 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) +%make_build -s check || (cat tests/test-suite.log; true) # Only the latest Fedora and EPEL have these scriptlets, # older Fedora and plain RHEL don't. @@ -433,6 +437,9 @@ exit 0 %systemd_postun_with_restart debuginfod.service %changelog +* Thu May 27 2021 Mark Wielaard - 0.185-1 +- Upgrade to upstream 0.185 + * Thu Dec 17 2020 Mark Wielaard - 0.182-3 - Add elfutils-0.182-s390-pid_memory_read.patch