Subject: bug#61969: closed (Re: bug#61969: [PATCH core-updates] gnu: patchelf: Update to 0.17.2.)

From: [email-masked] (GNU bug Tracking System)
Date: Mon, 22 Jan 2024 04:38:03 +0000

Your bug report

#61969: [PATCH core-updates] gnu: patchelf: Update to 0.17.2.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
61969: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=61969
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: bug#61969: [PATCH core-updates] gnu: patchelf: Update to 0.17.2.
From: Maxim Cournoyer <[email-masked]>
To: Winter <[email-masked]>
Cc: [email-masked]
Date: Sun, 21 Jan 2024 23:36:51 -0500
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi,

Winter <[email-masked]> writes:

> v2 fixes the comments to be more accurate, the actual code remains unchanged.

Applied to core-updates (with a post-update to 0.18.0).

-- 
Thanks,
Maxim

Subject: [PATCH core-updates] gnu: patchelf: Update to 0.17.2.
From: Winter <[email-masked]>
To: [email-masked]
Cc: Winter <[email-masked]>
Date: Sat, 4 Mar 2023 17:58:25 -0500
List-Id: <debbugs-submit.debbugs.gnu.org>

* 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