From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 4DO5I1PNA2RlLAEAbAwnHQ (envelope-from ) for ; Sat, 04 Mar 2023 23:59:31 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 2O6hI1PNA2R4ewEAauVa8A (envelope-from ) for ; Sat, 04 Mar 2023 23:59:31 +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 675FB4140 for ; Sat, 4 Mar 2023 23:59:31 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pYaqJ-0006hf-P3; Sat, 04 Mar 2023 17:59:07 -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 1pYaqG-0006hD-CK for guix-patches@gnu.org; Sat, 04 Mar 2023 17:59:04 -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 1pYaqE-0000uO-IT for guix-patches@gnu.org; Sat, 04 Mar 2023 17:59:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pYaqE-00084N-0q for guix-patches@gnu.org; Sat, 04 Mar 2023 17:59:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61969] [PATCH core-updates] gnu: patchelf: Update to 0.17.2. Resent-From: Winter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Mar 2023 22:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61969 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61969@debbugs.gnu.org Cc: Winter X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167797072930993 (code B ref -1); Sat, 04 Mar 2023 22:59:01 +0000 Received: (at submit) by debbugs.gnu.org; 4 Mar 2023 22:58:49 +0000 Received: from localhost ([127.0.0.1]:37978 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYaq0-00083p-H3 for submit@debbugs.gnu.org; Sat, 04 Mar 2023 17:58:48 -0500 Received: from lists.gnu.org ([209.51.188.17]:47466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYapy-00083h-T0 for submit@debbugs.gnu.org; Sat, 04 Mar 2023 17:58:47 -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 1pYapw-0006dU-Mf for guix-patches@gnu.org; Sat, 04 Mar 2023 17:58:44 -0500 Received: from out-49.mta0.migadu.com ([91.218.175.49]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pYapu-0000rx-GP for guix-patches@gnu.org; Sat, 04 Mar 2023 17:58:44 -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=1677970717; 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=x+jY0QpFtOnVy7oM16BsobRHZcK7M7ADKWvc9RJDYVI=; b=POhmcCqe8Io8det/LZKZSYnMxpCF0oxRYnVdi5svxR1+qfRvJt1N+6Hl1wPjtmfMa35JaY f+UNfpBAk2NxACH2F31y260kt/kKnp9AXSOOxYAm0ER9nrd8e6S4q+VdNlc9kzYK/sJVxn WbVi3kLnECbGbnvx60ZgApqckxrw1zyKYFv7u3zUI+RvD9vi4QYczwhgocAUug/ZEqmqWi ha6FIpNPBvFSn8TyBIaIJK4/qdob1Ici1fjwo9/fK1xXyF6jotwSzaJQw4Qg1hTgAuCkJL ObNhc+bGpWV3a0LRqThjDevgyBOMO2EzlrsDyBZ+4HqGp+VHjt5CeVfLecYHhQ== Date: Sat, 4 Mar 2023 17:58:25 -0500 Message-Id: <20230304225825.3080-1-winter@winter.cafe> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=91.218.175.49; envelope-from=winter@winter.cafe; helo=out-49.mta0.migadu.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 ARC-Seal: i=1; s=key1; d=yhetil.org; t=1677970771; a=rsa-sha256; cv=none; b=bIOwa7V5/4ryoD4ua6EVUlc81ZWC9bgoN7ZVGGE9nNGzM0phMF6A8KhU8sNNvfqxM3reD6 yvLRpTEY4EV/ajbT/eBDZAf64cxvGbsr+wwdS8bfHCWKfdm55PhJ5ues+jcqspi0tix1qo PTEKzubmu/IwfPoWA3kktjtNba9YHAun3UoL25cR2ZNR2FrR3/MaMc0oZ2kJbYl9GB4fWf tvZAPIxbIpUZ9xN2EAMeJz+ION8fD/ed5YXlUkibqnRKLd2l4C4skqZsyF6qO8Kc4fTmx7 3biKizRBIS5TJk+m2eQmpKv30svcp7JDBTI88aMznFeUfCDhGrTiXF5fwjmk/g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=winter.cafe header.s=key1 header.b=POhmcCqe; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1677970771; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=x+jY0QpFtOnVy7oM16BsobRHZcK7M7ADKWvc9RJDYVI=; b=ie0M2YelZSEm+qn+y7bmzdKEMeSsv/i1q4yaah7eqC9wdT/HY6Z+iOqhE15/FgllL+8f9+ jL204Utvl+2jDBLydXatYAjFI4Fc46tHvUofelkmYFsnjd3871TLyfPsi5dxmnspqvtbPf eCPsgn1CmLEui4hwZN/9vWLYl65uaC3hrAFj1p0U+KNYcogO2ynhh4KibR+blOXNbjYxrk Y40lCu7DG6jj4/93l+7tnyYbLTOdXxctQTgCG/2CRt+dZm40u6Oh7NvR1If2Hoi2RbTCJf ETZ8FasH0aggfhVI0aaCiV2IUfFvhraFDVF0cctZ5k+ci1FXIr5kTvOyjWvlqg== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -3.40 X-Spam-Score: -3.40 X-Migadu-Queue-Id: 675FB4140 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=winter.cafe header.s=key1 header.b=POhmcCqe; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org X-TUID: wWkpFKrvWFki * 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..3074d22d7d 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 when we explictly link libgcc_s. (It passes when using Nixpkgs' + ;; toolchain because of special casing: https://github.com/NixOS/patchelf/blob/65bf3d9dc12d994e73694a49c0813d753071d450/tests/Makefile.am#L73-L74.) + (("grep -v 'foo\\\\.so'") "grep -E 'libc.*\\.so'")) + (substitute* "tests/set-empty-rpath.sh" + ;; Binaries with empty RPATHs cannot run on Guix. + (("^\\$\\{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