From patchwork Sun Jan 12 20:39:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mark Wielaard X-Patchwork-Id: 19763 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6248917A85; Sun, 12 Jan 2020 20:41:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 3B2E417A84 for ; Sun, 12 Jan 2020 20:41:13 +0000 (GMT) Received: from localhost ([::1]:41636 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iqk2q-0002rI-Py for patchwork@mira.cbaines.net; Sun, 12 Jan 2020 15:41:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42854) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iqk2i-0002rC-Oy for guix-patches@gnu.org; Sun, 12 Jan 2020 15:41:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iqk2g-0004nI-1O for guix-patches@gnu.org; Sun, 12 Jan 2020 15:41:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:52120) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iqk2f-0004mf-So for guix-patches@gnu.org; Sun, 12 Jan 2020 15:41:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iqk2f-0007QR-RB for guix-patches@gnu.org; Sun, 12 Jan 2020 15:41:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38803] [PATCH] gnu: elfutils: Update to 0.178 References: <20191230014101.2425-1-mark@klomp.org> In-Reply-To: <20191230014101.2425-1-mark@klomp.org> Resent-From: Mark Wielaard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Jan 2020 20:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38803@debbugs.gnu.org Cc: Mark Wielaard , Brett Gilio Received: via spool by 38803-submit@debbugs.gnu.org id=B38803.157886160528461 (code B ref 38803); Sun, 12 Jan 2020 20:41:01 +0000 Received: (at 38803) by debbugs.gnu.org; 12 Jan 2020 20:40:05 +0000 Received: from localhost ([127.0.0.1]:58093 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iqk1Y-0007OO-V6 for submit@debbugs.gnu.org; Sun, 12 Jan 2020 15:40:05 -0500 Received: from wildebeest.demon.nl ([212.238.236.112]:33296 helo=gnu.wildebeest.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iqk1T-0007OC-WB for 38803@debbugs.gnu.org; Sun, 12 Jan 2020 15:39:51 -0500 Received: from tarox.wildebeest.org (tarox.wildebeest.org [172.31.17.39]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id E807A300B37B; Sun, 12 Jan 2020 21:39:42 +0100 (CET) Received: by tarox.wildebeest.org (Postfix, from userid 1000) id D201B40441B3; Sun, 12 Jan 2020 21:39:42 +0100 (CET) From: Mark Wielaard Date: Sun, 12 Jan 2020 21:39:39 +0100 Message-Id: <20200112203939.20141-1-mark@klomp.org> X-Mailer: git-send-email 2.18.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This introduces debuginfod support which requires a couple of new inputs. * gnu/local.ml (dist_patch_DATA): Remove elfutils-tests-ptrace.patch. Add elfutils-0.178-tests-build-id.patch. * gnu/packages/elf.scm (elfutils): Update to 0.178 [native-inputs]: Add iproute and pkg-config. [inputs]: Add cpio, libarchive, libmicrohttpd, libcurl, rpm and sqlite. [synopsis]: Updated. [description]: Updated. [license]: List all licenses used. * gnu/packages/patches/elfutils-tests-ptrace.patch: Removed. Fixed upstream. * gnu/packages/patches/elfutils-0.178-tests-build-id.patch: New. Patches backported from upstream git. --- This updated patch adds the licenses list. Updates the synopsis and description of the package. And adds/removes the patches from gnu/local.ml. gnu/local.mk | 2 +- gnu/packages/elf.scm | 51 ++++-- .../elfutils-0.178-tests-build-id.patch | 159 ++++++++++++++++++ .../patches/elfutils-tests-ptrace.patch | 64 ------- 4 files changed, 198 insertions(+), 78 deletions(-) create mode 100644 gnu/packages/patches/elfutils-0.178-tests-build-id.patch delete mode 100644 gnu/packages/patches/elfutils-tests-ptrace.patch diff --git a/gnu/local.mk b/gnu/local.mk index 33cf439870..6574d2aa78 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -813,7 +813,7 @@ dist_patch_DATA = \ %D%/packages/patches/dstat-skip-devices-without-io.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/einstein-build.patch \ - %D%/packages/patches/elfutils-tests-ptrace.patch \ + %D%/packages/patches/elfutils-0.178-tests-build-id.patch \ %D%/packages/patches/elixir-path-length.patch \ %D%/packages/patches/elm-compiler-disable-reactor.patch \ %D%/packages/patches/elm-compiler-fix-map-key.patch \ diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 75caa54296..9f38c519aa 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2019 Mark Wielaard ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,36 +28,44 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) - #:use-module ((guix licenses) #:select (gpl3+ lgpl3+ lgpl2.0+)) + #:use-module ((guix licenses) #:select (gpl2+ gpl3+ lgpl3+ lgpl2.0+ fdl1.3+)) #:use-module (gnu packages) + #:use-module (gnu packages backup) #:use-module (gnu packages compression) + #:use-module (gnu packages cpio) + #:use-module (gnu packages curl) #:use-module (gnu packages documentation) #:use-module (gnu packages gcc) + #:use-module (gnu packages gnunet) ; for libmicrohttpd + #:use-module (gnu packages linux) ; for iproute #:use-module (gnu packages m4) + #:use-module (gnu packages package-management) ; for rpm #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages sphinx) + #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages xml)) (define-public elfutils (package (name "elfutils") - (version "0.176") + (version "0.178") (source (origin (method url-fetch) (uri (string-append "https://sourceware.org/elfutils/ftp/" version "/elfutils-" version ".tar.bz2")) (sha256 (base32 - "08qhrl4g6qqr4ga46jhh78y56a47p3msa5b2x1qhzbxhf71lfmzb")) - (patches (search-patches "elfutils-tests-ptrace.patch")))) + "1wm0yfcih4rjwbg59qgm4jyqmbsdmk6z5qajljyw9sfljq7a1rri")) + (patches (search-patches "elfutils-0.178-tests-build-id.patch")))) (build-system gnu-build-system) ;; Separate programs because that's usually not what elfutils users want, - ;; and because they duplicate what Binutils provides. + ;; and because they duplicate what Binutils provides (but are named + ;; differently, using the eu- prefix and can be installed in parallel). (outputs '("out" ; libelf.so, elfutils/*.h, etc. - "bin")) ; ld, nm, objdump, etc. + "bin")) ; eu-nm, eu-objdump, etc. (arguments ;; Programs don't have libelf.so in their RUNPATH and libraries don't @@ -81,17 +90,33 @@ (("run-backtrace-native.sh") "")) #t))))) - (native-inputs `(("m4" ,m4))) - (inputs `(("zlib" ,zlib))) + (native-inputs `(("iproute", iproute) ;; needed in tests for ss + ("m4", m4) + ("pkg-config", pkg-config))) + (inputs `(("cpio", cpio) + ("libarchive", libarchive) + ("libmicrohttpd", libmicrohttpd) + ("libcurl", curl) + ("rpm", rpm) + ("sqlite", sqlite) + ("zlib" ,zlib))) (home-page "https://sourceware.org/elfutils/") - (synopsis "Linker and ELF manipulation tools") + (synopsis "Collection of utilities and libraries to handle ELF files and +DWARF data") (description - "This package provides command-line tools to manipulate binaries in the -Executable and Linkable Format (@dfn{ELF}). This includes @command{ld}, -@command{ar}, @command{objdump}, @command{addr2line}, and more.") + "A collection of utilities and libraries to read, create and modify ELF +binary files, find and handle DWARF debug data, symbols, thread state and +stacktraces for processes and core files on GNU/Linux. Includes libelf for +manipulating ELF files, libdw for inspecting DWARF data and process state and +utilities like eu-stack (to show backtraces), eu-nm (for listing symbols from +object files), eu-size (for listing the section sizes of an object or archive +file), eu-strip (for discarding symbols), eu-readelf (to see the raw ELF file +structures), eu-elflint (to check for well-formed ELF files) and +eu-elfcompress (to compress or decompress ELF sections).") ;; Libraries are dual-licensed LGPLv3.0+ | GPLv2, and programs are GPLv3+. - (license lgpl3+))) + ;; Some documentation is under the GFDL1.3+, without invariant texts. + (license (list lgpl3+ gpl2+ gpl3+ fdl1.3+)))) (define-public libabigail (package diff --git a/gnu/packages/patches/elfutils-0.178-tests-build-id.patch b/gnu/packages/patches/elfutils-0.178-tests-build-id.patch new file mode 100644 index 0000000000..ca9bd480b8 --- /dev/null +++ b/gnu/packages/patches/elfutils-0.178-tests-build-id.patch @@ -0,0 +1,159 @@ +commit 3f445279b60b16b6cb062921b74ae400344b4a68 +Author: Mark Wielaard +Date: Thu Dec 5 14:22:56 2019 +0100 + + tests: Run elfcompress under testrun in run-elfclassify.sh + + Otherwise elfcompress might run against the system libelf which might + be too old or missing. + + Signed-off-by: Mark Wielaard + +diff --git a/tests/run-elfclassify.sh b/tests/run-elfclassify.sh +index 5a849bbd..fb14139d 100755 +--- a/tests/run-elfclassify.sh ++++ b/tests/run-elfclassify.sh +@@ -267,7 +267,7 @@ $(echo $kmod_files | sed -e "s/ /\n/g") + EOF + + echo "gnu compressed kmods are unstripped" +-${abs_top_builddir}/src/elfcompress -t gnu --force $kmod_files ++testrun ${abs_top_builddir}/src/elfcompress -t gnu --force $kmod_files + testrun ${abs_top_builddir}/src/elfclassify --unstripped $kmod_files + testrun_compare ${abs_top_builddir}/src/elfclassify --unstripped --print $kmod_files < +Date: Fri Dec 6 15:48:00 2019 +0100 + + tests: Run strip under testrun in run-debuginfod-find.sh + + Otherwise strip might run against the system libelf which might be too + old or missing. + + Signed-off-by: Mark Wielaard + +diff --git a/tests/run-debuginfod-find.sh b/tests/run-debuginfod-find.sh +index 0ade03b7..6f92fbf1 100755 +--- a/tests/run-debuginfod-find.sh ++++ b/tests/run-debuginfod-find.sh +@@ -102,7 +102,7 @@ export DEBUGINFOD_TIMEOUT=10 + echo "int main() { return 0; }" > ${PWD}/prog.c + tempfiles prog.c + gcc -g -o prog ${PWD}/prog.c +- ${abs_top_builddir}/src/strip -g -f prog.debug ${PWD}/prog ++testrun ${abs_top_builddir}/src/strip -g -f prog.debug ${PWD}/prog + BUILDID=`env LD_LIBRARY_PATH=$ldpath ${abs_builddir}/../src/readelf \ + -a prog | grep 'Build ID' | cut -d ' ' -f 7` + + +commit cf1b5fe170fa24f32871ef284ff2968c73816f98 +Author: Mark Wielaard +Date: Fri Dec 6 17:20:00 2019 +0100 + + Make sure to always build with build-ids. + + We really need build-ids for various things. If the system compiler + doesn't generate build-ids warn and generate them anyway for both the + binaries and the tests. + + Signed-off-by: Mark Wielaard + +diff --git a/configure.ac b/configure.ac +index 5a2dc373..36a6b6c2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -197,6 +197,15 @@ if test "$ac_cv_zdefs" = "yes"; then + dso_LDFLAGS="$dso_LDFLAGS $ZDEFS_LDFLAGS" + fi + ++# We really want build-ids. Warn and force generating them if gcc was ++# configure without --enable-linker-build-id ++AC_CACHE_CHECK([whether the compiler generates build-ids], ac_cv_buildid, [dnl ++AC_LINK_IFELSE([AC_LANG_PROGRAM()],[ac_cv_buildid=yes; readelf -n conftest$EXEEXT | grep -q NT_GNU_BUILD_ID || ac_cv_buildid=no],AC_MSG_FAILURE([unexpected compile failure]))]) ++if test "$ac_cv_buildid" = "no"; then ++ AC_MSG_WARN([compiler doesn't generate build-id by default]) ++ LDFLAGS="$LDFLAGS -Wl,--build-id" ++fi ++ + ZRELRO_LDFLAGS="-Wl,-z,relro" + AC_CACHE_CHECK([whether gcc supports $ZRELRO_LDFLAGS], ac_cv_zrelro, [dnl + save_LDFLAGS="$LDFLAGS" +diff --git a/tests/run-debuginfod-find.sh b/tests/run-debuginfod-find.sh +index 6f92fbf1..6533996a 100755 +--- a/tests/run-debuginfod-find.sh ++++ b/tests/run-debuginfod-find.sh +@@ -101,7 +101,7 @@ export DEBUGINFOD_TIMEOUT=10 + # cannot find it without debuginfod. + echo "int main() { return 0; }" > ${PWD}/prog.c + tempfiles prog.c +-gcc -g -o prog ${PWD}/prog.c ++gcc -Wl,--build-id -g -o prog ${PWD}/prog.c + testrun ${abs_top_builddir}/src/strip -g -f prog.debug ${PWD}/prog + BUILDID=`env LD_LIBRARY_PATH=$ldpath ${abs_builddir}/../src/readelf \ + -a prog | grep 'Build ID' | cut -d ' ' -f 7` +@@ -138,7 +138,7 @@ cmp $filename ${PWD}/prog.c + # Build another, non-stripped binary + echo "int main() { return 0; }" > ${PWD}/prog2.c + tempfiles prog2.c +-gcc -g -o prog2 ${PWD}/prog2.c ++gcc -Wl,--build-id -g -o prog2 ${PWD}/prog2.c + BUILDID2=`env LD_LIBRARY_PATH=$ldpath ${abs_builddir}/../src/readelf \ + -a prog2 | grep 'Build ID' | cut -d ' ' -f 7` + +--- a/configure 1970-01-01 01:00:00.000000000 +0100 ++++ b/configure 2019-12-11 14:18:11.812008097 +0100 +@@ -5325,6 +5325,43 @@ + dso_LDFLAGS="$dso_LDFLAGS $ZDEFS_LDFLAGS" + fi + ++# We really want build-ids. Warn and force generating them if gcc was ++# configure without --enable-linker-build-id ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler generates build-ids" >&5 ++$as_echo_n "checking whether the compiler generates build-ids... " >&6; } ++if ${ac_cv_buildid+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_buildid=yes; readelf -n conftest$EXEEXT | grep -q NT_GNU_BUILD_ID || ac_cv_buildid=no ++else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "unexpected compile failure ++See \`config.log' for more details" "$LINENO" 5; } ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_buildid" >&5 ++$as_echo "$ac_cv_buildid" >&6; } ++if test "$ac_cv_buildid" = "no"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: compiler doesn't generate build-id by default" >&5 ++$as_echo "$as_me: WARNING: compiler doesn't generate build-id by default" >&2;} ++ LDFLAGS="$LDFLAGS -Wl,--build-id" ++fi ++ + ZRELRO_LDFLAGS="-Wl,-z,relro" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc supports $ZRELRO_LDFLAGS" >&5 + $as_echo_n "checking whether gcc supports $ZRELRO_LDFLAGS... " >&6; } diff --git a/gnu/packages/patches/elfutils-tests-ptrace.patch b/gnu/packages/patches/elfutils-tests-ptrace.patch deleted file mode 100644 index cd46999063..0000000000 --- a/gnu/packages/patches/elfutils-tests-ptrace.patch +++ /dev/null @@ -1,64 +0,0 @@ -This patch allows us to skip tests that require PTRACE_ATTACH in situations -where PTRACE_ATTACH is only allowed when CAP_SYS_PTRACE is held (i.e., for -root, by default.) - -Reported at . - ---- elfutils-0.161/tests/run-deleted.sh 2015-04-11 16:38:33.028556235 +0200 -+++ elfutils-0.161/tests/run-deleted.sh 2015-04-11 16:46:15.012442185 +0200 -@@ -17,6 +17,15 @@ - - . $srcdir/backtrace-subr.sh - -+# Check whether the Yama policy allows us to use PTRACE_ATTACH. -+if [ -f /proc/sys/kernel/yama/ptrace_scope ] -+then -+ if [ `cat /proc/sys/kernel/yama/ptrace_scope` -ne 0 ] -+ then -+ exit 77 -+ fi -+fi -+ - tempfiles deleted deleted-lib.so - cp -p ${abs_builddir}/deleted ${abs_builddir}/deleted-lib.so . - ---- elfutils-0.161/tests/vdsosyms.c 2015-04-11 16:40:20.633461110 +0200 -+++ elfutils-0.161/tests/vdsosyms.c 2015-04-11 16:45:06.611866677 +0200 -@@ -23,6 +23,8 @@ - #include - #include - #include -+#include -+#include - #include - #include ELFUTILS_HEADER(dwfl) - -@@ -68,6 +70,7 @@ module_callback (Dwfl_Module *mod, void - int - main (int argc __attribute__ ((unused)), char **argv __attribute__ ((unused))) - { -+ static const char ptrace_scope_file[] = "/proc/sys/kernel/yama/ptrace_scope"; - static char *debuginfo_path; - static const Dwfl_Callbacks proc_callbacks = - { -@@ -76,6 +79,20 @@ main (int argc __attribute__ ((unused)), - - .find_elf = dwfl_linux_proc_find_elf, - }; -+ -+ /* Check whether the Yama policy allows us to use PTRACE_ATTACH. */ -+ int ptrace_scope = open (ptrace_scope_file, O_RDONLY); -+ if (ptrace_scope >= 0) -+ { -+ char buf[10]; -+ int count = read (ptrace_scope, buf, sizeof buf); -+ assert (count > 0); -+ if (buf[0] != '0') -+ /* We're not allowed, so skip this test. */ -+ return 77; -+ close (ptrace_scope); -+ } -+ - Dwfl *dwfl = dwfl_begin (&proc_callbacks); - if (dwfl == NULL) - error (2, 0, "dwfl_begin: %s", dwfl_errmsg (-1));