From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id oCqdLj20BmSJgQEASxT56A (envelope-from ) for ; Tue, 07 Mar 2023 04:49:17 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id QPdFLT20BmSeuQAAG6o9tA (envelope-from ) for ; Tue, 07 Mar 2023 04:49:17 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5086F937A for ; Tue, 7 Mar 2023 04:49:17 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZOK1-0000hJ-9b; Mon, 06 Mar 2023 22:49:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZOJy-0000gd-NK for guix-patches@gnu.org; Mon, 06 Mar 2023 22:49:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZOJy-0005kf-F6 for guix-patches@gnu.org; Mon, 06 Mar 2023 22:49:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pZOJy-0002NH-Ar for guix-patches@gnu.org; Mon, 06 Mar 2023 22:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61969] [PATCH core-updates v2] gnu: patchelf: Update to 0.17.2. References: <20230304225825.3080-1-winter@winter.cafe> In-Reply-To: <20230304225825.3080-1-winter@winter.cafe> Resent-From: Winter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 07 Mar 2023 03:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61969 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61969@debbugs.gnu.org Cc: Winter Received: via spool by 61969-submit@debbugs.gnu.org id=B61969.16781608868921 (code B ref 61969); Tue, 07 Mar 2023 03:49:02 +0000 Received: (at 61969) by debbugs.gnu.org; 7 Mar 2023 03:48:06 +0000 Received: from localhost ([127.0.0.1]:44185 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZOJ3-0002Jn-Lg for submit@debbugs.gnu.org; Mon, 06 Mar 2023 22:48:06 -0500 Received: from out-42.mta0.migadu.com ([91.218.175.42]:15436) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZOJ0-0002Iq-IL for 61969@debbugs.gnu.org; Mon, 06 Mar 2023 22:48:04 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=winter.cafe; s=key1; t=1678160880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=tBqHxnEBSWwm9y8FSfODkl/NcKJHicXNkOUHq4/KosA=; b=ZaCD+fbtmW502GO4F9HZuOtVfwSX9LX4MzlntcmtTb0RkRfPe1LNM52n2jAmnQSLc68kWP u/PioG4lTiMHGacgz1CFyexYfsbCsuz+IS0fYUGKqiBQ1DFvd6+cOYm21DUu27FG37E2In RrNYEa0iIoTmfzlJNEvEaY0q7DCOGh2QBdjdi9y+CU/4M9jBOnlXiaBphzxtGXJE3cq/cY UFOOqP4waK7fvb4smBasFSRHz3M2b1Xm0mthDNaFo1aUyXsoaghWGuKEshKdiQnuAShdsX LFwWDEU8Y1IZw79Q0iwK3wdAefc3aau9KwmkDnre1Ekqmn2HyOXr4VR/r+8InA== Date: Mon, 6 Mar 2023 22:47:52 -0500 Message-Id: <20230307034752.3113-1-winter@winter.cafe> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Winter X-ACL-Warn: , Winter via Guix-patches From: Winter via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN Authentication-Results: aspmx1.migadu.com; none X-Migadu-Spam-Score: -4.00 X-Spam-Score: -4.00 X-Migadu-Queue-Id: 5086F937A X-Migadu-Scanner: scn1.migadu.com X-TUID: G+lHrzJ0o0s+ * gnu/packages/elf.scm (patchelf): Update to 0.17.2. [uri]: Use the release tarballs posted to GitHub releases, which have superseded the ones hosted on releases.nixos.org. [arguments]: Add fixes for two tests added since the last update. [properties]: Remove release-monitoring-url, as the GitHub updater will be used now that the releases are hosted there. --- gnu/packages/elf.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 6ef09399d4..1c8fc80365 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -247,16 +247,16 @@ (define-public libelf (define-public patchelf (package (name "patchelf") - (version "0.11") + (version "0.17.2") (source (origin (method url-fetch) (uri (string-append - "https://nixos.org/releases/patchelf/patchelf-" + "https://github.com/NixOS/patchelf/releases/download/" version "/patchelf-" version ".tar.bz2")) (sha256 (base32 - "16ms3ijcihb88j3x6cl8cbvhia72afmfcphczb9cfwr0gbc22chx")))) + "1qnql97ghbb7nhv9zpm4ip0cqj05xyyxk391jv0j5r3jc0vymqms")))) (build-system gnu-build-system) (arguments '(#:phases @@ -271,6 +271,14 @@ (define-public patchelf ;; Find libgcc_s.so, which is necessary for the test: (("/xxxxxxxxxxxxxxx") (string-append (assoc-ref inputs "gcc:lib") "/lib"))) + (substitute* "tests/replace-needed.sh" + ;; This test assumes that only libc will be linked alongside + ;; libfoo, but we also link libgcc_s. + (("grep -v 'foo\\\\.so'") "grep -E 'libc.*\\.so'")) + (substitute* "tests/set-empty-rpath.sh" + ;; Binaries with empty RPATHs cannot run on Guix, because + ;; we still need to find libgcc_s (see above). + (("^\\$\\{SCRATCH\\}\\/simple.$") "")) #t))))) (native-inputs `(("gcc:lib" ,gcc "lib"))) @@ -279,9 +287,6 @@ (define-public patchelf (description "PatchELF allows the ELF \"interpreter\" and RPATH of an ELF binary to be changed.") - ;; This can probably be removed with the next release. - (properties - '((release-monitoring-url . "https://github.com/NixOS/patchelf/releases"))) (license gpl3+))) (define-public libdwarf base-commit: a56eafd28bdafda9824a6a85e1ab974b8210f9bb -- 2.39.1