GNU logs - #73529, boring messages

Message sent to guix-patches@HIDDEN:

Subject: [bug#73529] [PATCH core] gnu: patchelf: Build from git sources.
Resent-From: attila.lendvai@HIDDEN
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 28 Sep 2024 12:17:01 +0000
Resent-Message-ID: <handler.73529.B.17275257774493 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 73529 <at> debbugs.gnu.org
Cc: Attila Lendvai <attila@HIDDEN>
From: attila.lendvai@HIDDEN
Date: Sat, 28 Sep 2024 14:12:03 +0200
Message-ID: <91e06adbec896b8e685d7bc2501da3e7dc932233.1727525522.git.attila@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2a00:1450:4864:20::431;
 envelope-from=attila.lendvai@HIDDEN; helo=mail-wr1-x431.google.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, FREEMAIL_FROM=0.001,
 SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.3 (-)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.3 (--)

From: Attila Lendvai <attila@HIDDEN>

Rationale: it makes it much easier to build a pending PR by using
`(commit "pull/544/head")` in the origin, or in general to experiment
with different patchelf versions.  It also makes it more resilient
against attacks hidden in release tarballs.

Change-Id: I94eaedcd826c32b2c90823fe026718213f8d5962
---

sadly, this leads to endless rebuilds...

 gnu/packages/elf.scm | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm
index dc2db836321..21228a9d878 100644
--- a/gnu/packages/elf.scm
+++ b/gnu/packages/elf.scm
@@ -278,19 +278,19 @@ (define-public patchelf
     (name "patchelf")
     (version "0.18.0")
     (source (origin
-             (method url-fetch)
-             (uri (string-append
-                   "https://github.com/NixOS/patchelf/releases/download/"
-                   version
-                   "/patchelf-" version ".tar.bz2"))
-             (sha256
-              (base32
-               "02s7ap86rx6yagfh9xwp96sgsj0p6hp99vhiq9wn4mxshakv4lhr"))))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/NixOS/patchelf")
+                    (commit version)))
+              (file-name (git-file-name "patchelf" version))
+              (sha256
+               (base32
+                "1v5mh8wdax4a97hw79nvzy0dixkbs0h487xkskkljkkdamq4rj5z"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'fix-tests
+         (add-after 'bootstrap 'fix-tests
            ;; Our GCC code ensures that RUNPATH is never empty, it includes
            ;; at least glibc/lib and gcc:lib/lib.
            (lambda* (#:key inputs #:allow-other-keys)
@@ -298,8 +298,8 @@ (define-public patchelf
                ;; Disable checking for an empty runpath:
                (("^if test.*") "")
                ;; Find libgcc_s.so, which is necessary for the test:
-               (("/xxxxxxxxxxxxxxx") (string-append (assoc-ref inputs "gcc:lib")
-                                                    "/lib")))
+               (("/xxxxxxxxxxxxxxx")
+                (dirname (search-input-file inputs "/lib/libgcc_s.so"))))
              (substitute* "tests/replace-needed.sh"
                ;; This test assumes that only libc will be linked alongside
                ;; libfoo, but we also link libgcc_s.
@@ -312,7 +312,10 @@ (define-public patchelf
              (substitute* "tests/Makefile.in"
                ((".*shared-rpath\\.sh \\.*") "")))))))
     (native-inputs
-     `(("gcc:lib" ,gcc "lib")))
+     (list
+      autoconf
+      automake
+      (list gcc "lib")))
     (home-page "https://nixos.org/patchelf.html")
     (synopsis "Modify the dynamic linker and RPATH of ELF executables")
     (description

base-commit: 4f86fa20179ded1e6314eeba7da17309d501a32f
-- 
2.46.0

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: attila.lendvai@HIDDEN
Subject: bug#73529: Acknowledgement ([PATCH core] gnu: patchelf: Build
 from git sources.)
Message-ID: <handler.73529.B.17275257774493.ack <at> debbugs.gnu.org>
References: <91e06adbec896b8e685d7bc2501da3e7dc932233.1727525522.git.attila@HIDDEN>
X-Gnu-PR-Message: ack 73529
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Reply-To: 73529 <at> debbugs.gnu.org
Date: Sat, 28 Sep 2024 12:17:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 guix-patches@HIDDEN

If you wish to submit further information on this problem, please
send it to 73529 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
73529: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D73529
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to guix-patches@HIDDEN:

Subject: [bug#73529] [PATCH core] gnu: patchelf: Build from git sources.
Resent-From: Z572 <zhengjunjie@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sun, 29 Sep 2024 16:14:03 +0000
Resent-Message-ID: <handler.73529.B73529.172762639926795 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: attila.lendvai@HIDDEN
Cc: Attila Lendvai <attila@HIDDEN>, 73529 <at> debbugs.gnu.org
From: Z572 <zhengjunjie@HIDDEN>
In-Reply-To: <91e06adbec896b8e685d7bc2501da3e7dc932233.1727525522.git.attila@HIDDEN>
 (attila lendvai's message of "Sat, 28 Sep 2024 14:12:03 +0200")
References: <91e06adbec896b8e685d7bc2501da3e7dc932233.1727525522.git.attila@HIDDEN>
Date: Mon, 30 Sep 2024 00:12:27 +0800
Message-ID: <87r0928mms.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
 micalg=pgp-sha512; protocol="application/pgp-signature"
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

--=-=-=
Content-Type: text/plain

attila.lendvai@HIDDEN writes:

> From: Attila Lendvai <attila@HIDDEN>
>
> Rationale: it makes it much easier to build a pending PR by using
> `(commit "pull/544/head")` in the origin, or in general to experiment
> with different patchelf versions.  It also makes it more resilient
> against attacks hidden in release tarballs.
>
> Change-Id: I94eaedcd826c32b2c90823fe026718213f8d5962
> ---
>
> sadly, this leads to endless rebuilds...
>
>  gnu/packages/elf.scm | 27 +++++++++++++++------------
>  1 file changed, 15 insertions(+), 12 deletions(-)
>
> diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm
> index dc2db836321..21228a9d878 100644
> --- a/gnu/packages/elf.scm
> +++ b/gnu/packages/elf.scm
> @@ -278,19 +278,19 @@ (define-public patchelf
>      (name "patchelf")
>      (version "0.18.0")
>      (source (origin
> -             (method url-fetch)
> -             (uri (string-append
> -                   "https://github.com/NixOS/patchelf/releases/download/"
> -                   version
> -                   "/patchelf-" version ".tar.bz2"))
> -             (sha256
> -              (base32
> -               "02s7ap86rx6yagfh9xwp96sgsj0p6hp99vhiq9wn4mxshakv4lhr"))))
> +              (method git-fetch)
> +              (uri (git-reference
> +                    (url "https://github.com/NixOS/patchelf")
> +                    (commit version)))
> +              (file-name (git-file-name "patchelf" version))

i think should "(git-file-name name version)" ?

> +              (sha256
> +               (base32
> +                "1v5mh8wdax4a97hw79nvzy0dixkbs0h487xkskkljkkdamq4rj5z"))))
>      (build-system gnu-build-system)
>      (arguments
>       '(#:phases
>         (modify-phases %standard-phases
> -         (add-after 'unpack 'fix-tests
> +         (add-after 'bootstrap 'fix-tests

Just a question, why do you need to change to bootstrap here?

>             ;; Our GCC code ensures that RUNPATH is never empty, it includes
>             ;; at least glibc/lib and gcc:lib/lib.
>             (lambda* (#:key inputs #:allow-other-keys)
> @@ -298,8 +298,8 @@ (define-public patchelf
>                 ;; Disable checking for an empty runpath:
>                 (("^if test.*") "")
>                 ;; Find libgcc_s.so, which is necessary for the test:
> -               (("/xxxxxxxxxxxxxxx") (string-append (assoc-ref inputs "gcc:lib")
> -                                                    "/lib")))
> +               (("/xxxxxxxxxxxxxxx")
> +                (dirname (search-input-file inputs "/lib/libgcc_s.so"))))
>               (substitute* "tests/replace-needed.sh"
>                 ;; This test assumes that only libc will be linked alongside
>                 ;; libfoo, but we also link libgcc_s.
> @@ -312,7 +312,10 @@ (define-public patchelf
>               (substitute* "tests/Makefile.in"
>                 ((".*shared-rpath\\.sh \\.*") "")))))))
>      (native-inputs
> -     `(("gcc:lib" ,gcc "lib")))
> +     (list
> +      autoconf
> +      automake
> +      (list gcc "lib")))

It would be nice to mention removing labels and adding new dependencies
in the submission, and etc/committer.scm maybe useful.

>      (home-page "https://nixos.org/patchelf.html")
>      (synopsis "Modify the dynamic linker and RPATH of ELF executables")
>      (description
>
> base-commit: 4f86fa20179ded1e6314eeba7da17309d501a32f

--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmb5fGsACgkQO1qpk+Gi
3/Cy7w//UKSJiyTtUJyut54f7ZehQV0EdZ6I/IC7qVRrWb1naDGPGvzyRBHYEnk2
/1BBSQerlT4d/flkVct3LQP5+gbdm7iH92tFiYSqSOnOezLDT/MyqGS7pxPTMmhG
P6myOwdyHUd+GBtiUM3a/co8kXrhpyOlYq58NN48JSmubcuDQqERAeuXA4oos0VE
okqcvG6oVF9u1zSxTyEkgXTiGSzKodPRH9aOuADZnChAjMasRlimWqwlbrGec3QS
3PY7JRyFmaCZYmN0fdkPaSmFuyAlq88NSyuiL6srT0bJx2dlzKPXZuHkKUVn6TEJ
xQnMEY6sOlCXpNEDp1eWpnOqMKz0aG2AibLtMRvwj5ErvHVdqowEeKSVjivG1a4i
aeMcJzuEFk7hzELusug8FazMAarKGCKdUgp4aVxzDba6IbkBk1/4TYAmhVFRkEJX
irBs/hsoigctE2Rrnj4E0nNmt7vP997vrL4mB8QI91vfJElN0osrwEP+MsXrQxYF
ObCgwNTBlx3ntJsRst6vM+slB/ODWsbq1btDGkUlPmqbhz7YDS4c9bDyrHFW1GmY
JM6sqd+jmlaoYnyhgFSGGVmdTKpWDkTs8vATU7aNBTb5QUdidZl23u6sZrHhk/bF
fO44LE5H4gdgRN6Eq4HgLdus07bbyKF8awDeFAH8mpMoHIcVrow=
=l3KM
-----END PGP SIGNATURE-----
--=-=-=--

Message sent to guix-patches@HIDDEN:

Subject: [bug#73529] [PATCH core] gnu: patchelf: Build from git sources.
Resent-From: Attila Lendvai <attila@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 30 Sep 2024 08:16:02 +0000
Resent-Message-ID: <handler.73529.B73529.17276841046999 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: Z572 <zhengjunjie@HIDDEN>
Cc: attila.lendvai@HIDDEN, 73529 <at> debbugs.gnu.org
Date: Mon, 30 Sep 2024 08:14:17 +0000
From: Attila Lendvai <attila@HIDDEN>
Message-ID: <KrCzt5SaJzVnwJ-T14UrBQDEE1jPco5sPPzr6z1f4iOm8z_QBGEtXPa69SL9tZqkRU81X84IMnaTGe_Y0Vh4IPoPaefbuxV23r_Z_eEi_XI=@lendvai.name>
In-Reply-To: <87r0928mms.fsf@HIDDEN>
References: <91e06adbec896b8e685d7bc2501da3e7dc932233.1727525522.git.attila@HIDDEN>
 <87r0928mms.fsf@HIDDEN>
Feedback-ID: 28384833:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

> > + (file-name (git-file-name "patchelf" version))
>=20
>=20
> i think should "(git-file-name name version)" ?

hrm. i tried that at first, but it errored out with `name` being undefined.=
 i retried it just now to double check, and now it works. i must have been =
confused by something.

the updated patch will have `name` in there.

> > + (sha256
> > + (base32
> > + "1v5mh8wdax4a97hw79nvzy0dixkbs0h487xkskkljkkdamq4rj5z"))))
> > (build-system gnu-build-system)
> > (arguments
> > '(#:phases
> > (modify-phases %standard-phases
> > - (add-after 'unpack 'fix-tests
> > + (add-after 'bootstrap 'fix-tests
>=20
>=20
> Just a question, why do you need to change to bootstrap here?

because the last substitute* touches `tests/Makefile.in` which is generated=
 by the bootstrap phase (by the auto* tools).

but now that you asked, i've changed it to target `tests/Makefile.am` inste=
ad.

> > (native-inputs
> > - `(("gcc:lib" ,gcc "lib")))
> > + (list
> > + autoconf
> > + automake
> > + (list gcc "lib")))
>=20
>=20
> It would be nice to mention removing labels and adding new dependencies
> in the submission, and etc/committer.scm maybe useful.

ok, i'll send an updated patch soon.

BTW, etc/committer.scm broke on this package. i've sent a patch to fix that=
:

https://issues.guix.gnu.org/73562

--=20
=E2=80=A2 attila lendvai
=E2=80=A2 PGP: 963F 5D5F 45C7 DFCD 0A39
--
=E2=80=9CWhere there are rulers, there are no rules, only interest-serving =
opinions enforced by violence. To want rulers is to beg for chaos.=E2=80=
=9D
=09=E2=80=94 Brandon Roark

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#73529] [PATCH core v2] gnu: patchelf: Build from git
References: <91e06adbec896b8e685d7bc2501da3e7dc932233.1727525522.git.attila@HIDDEN>
In-Reply-To: <91e06adbec896b8e685d7bc2501da3e7dc932233.1727525522.git.attila@HIDDEN>
Resent-From: attila.lendvai@HIDDEN
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 30 Sep 2024 08:18:02 +0000
Resent-Message-ID: <handler.73529.B73529.17276842297596 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 73529
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 73529 <at> debbugs.gnu.org
Cc: Attila Lendvai <attila@HIDDEN>
Received: via spool by 73529-submit <at> debbugs.gnu.org id=B73529.17276842297596
          (code B ref 73529); Mon, 30 Sep 2024 08:18:02 +0000
Received: (at 73529) by debbugs.gnu.org; 30 Sep 2024 08:17:09 +0000
Received: from localhost ([127.0.0.1]:44664 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1svBae-0001yS-Mk
	for submit <at> debbugs.gnu.org; Mon, 30 Sep 2024 04:17:09 -0400
Received: from mail-ed1-f48.google.com ([209.85.208.48]:43275)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <attila.lendvai@HIDDEN>) id 1svBab-0001y0-4p
 for 73529 <at> debbugs.gnu.org; Mon, 30 Sep 2024 04:17:07 -0400
Received: by mail-ed1-f48.google.com with SMTP id
 4fb4d7f45d1cf-5c87ab540b3so5946785a12.1
 for <73529 <at> debbugs.gnu.org>; Mon, 30 Sep 2024 01:16:32 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1727684127; x=1728288927; darn=debbugs.gnu.org;
 h=content-transfer-encoding:mime-version:message-id:date:subject:cc
 :to:from:from:to:cc:subject:date:message-id:reply-to;
 bh=jMklndtch/z2TrFAYz0zHAuCoH+XWgv+2eDsGuf5iAU=;
 b=FhMKuHooDqvLsc8p2hMz9eO/Xhl9+EqZKTPkjw92AQtQreoOHcMeQkfCx9pjQxLeIE
 js1RI2wRi9/lqVmB9aFnBlDgYR8xrxqms2FKNiHVjyaflEghNoTDO5ofMcPOhQIR9VpA
 0GlqqsXwZvPA7jB54yxGBXxq+Q1Fq6VvLhh1wqwts+78RNaIWbxIeJprnY9eg/+fo5Fl
 fCRE3ZgcTTULpNBkVieU92xAmjFIS7qJ4MGrBsv9MucUrF+aey2Kxc0n4UL7A37KAIZa
 DKmyEveXBmy3hqHYOuKOkC5W7cn+lS2SR7PJiA5xvP+18hB+62R+b+Y5fmnLoqfoFFcS
 LQ4g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1727684127; x=1728288927;
 h=content-transfer-encoding:mime-version:message-id:date:subject:cc
 :to:from:x-gm-message-state:from:to:cc:subject:date:message-id
 :reply-to;
 bh=jMklndtch/z2TrFAYz0zHAuCoH+XWgv+2eDsGuf5iAU=;
 b=DT/QgVWWZF5hHVox/SIWf4VTDtc7MhDKiXvFXTA0eCiuYNstWt9plKt8roh2r4wTM9
 9cvNkq+XnwLHIcAL0VqbRKbxmohE1KjJ5s7KG1OVGyiD1Mr5GRa+HrMfaV3NeYbeCUu1
 wcMcXqjyT7+GWw0n3QsDRD/bKvLlJLpHCSv5pqN4KhJscY7JYRl9P8HbQvL7cDM6btqr
 Mxtjf6IZ3SUTy6AyOGrtQ3EArtZChX78Blmci63EfEDfqYQYZUuymLKtuC9RNkoifqhd
 /5W7rbObjWn3XsB/7pIoGKvcMK7J0aj7bwE/YEOtSBHeRRPZnKZiRQqQD1fbCoH+up0O
 +GCQ==
X-Gm-Message-State: AOJu0YxjKeC/wKPCgguZfJxA9fTi98ZS38HbR/9xSCesw4U9knTJofVj
 jHp6NA9KL7h+EGsZ0967+yfdvgwOmofcnWivz2GXYbePrIls4CKAPJSV0g==
X-Google-Smtp-Source: AGHT+IFSI/VhKmKfyMLTSLnAnYhwQ+IH/PxSsDRwsrwl+AWtbzzkZD2A0j3fp0yTj80CNV9t2a6P5g==
X-Received: by 2002:a05:6402:2424:b0:5c4:1c89:6e36 with SMTP id
 4fb4d7f45d1cf-5c8777f3231mr16829513a12.19.1727684126715; 
 Mon, 30 Sep 2024 01:15:26 -0700 (PDT)
Received: from lelap.lan (2a00-1f40-b161-3580--477.pool6.panelnet.hu.
 [2a00:1f40:b161:3580::477]) by smtp.gmail.com with ESMTPSA id
 4fb4d7f45d1cf-5c882405166sm4283329a12.9.2024.09.30.01.15.26
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Mon, 30 Sep 2024 01:15:26 -0700 (PDT)
From: attila.lendvai@HIDDEN
X-Google-Original-From: attila@HIDDEN
Date: Mon, 30 Sep 2024 10:15:10 +0200
Message-ID: <9706446756fd9c5c9e40ae1fa8fc6ca326407178.1727684109.git.attila@HIDDEN>
X-Mailer: git-send-email 2.46.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.9 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.9 (-)

From: Attila Lendvai <attila@HIDDEN>

Rationale: it makes it much easier for anyone to build a pending PR (simply by
using `(commit "pull/544/head")` in the origin).  It also makes it more
resilient against attacks hidden in release tarballs.

* gnu/packages/elf.scm (patchelf): Change source origin to the git repo and
adjust inputs accordingly.
[native-inputs]: Add autoconf, automake.

Change-Id: I94eaedcd826c32b2c90823fe026718213f8d5962
---
 gnu/packages/elf.scm | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm
index dc2db836321..98b80c24b3e 100644
--- a/gnu/packages/elf.scm
+++ b/gnu/packages/elf.scm
@@ -278,14 +278,14 @@ (define-public patchelf
     (name "patchelf")
     (version "0.18.0")
     (source (origin
-             (method url-fetch)
-             (uri (string-append
-                   "https://github.com/NixOS/patchelf/releases/download/"
-                   version
-                   "/patchelf-" version ".tar.bz2"))
-             (sha256
-              (base32
-               "02s7ap86rx6yagfh9xwp96sgsj0p6hp99vhiq9wn4mxshakv4lhr"))))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/NixOS/patchelf")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1v5mh8wdax4a97hw79nvzy0dixkbs0h487xkskkljkkdamq4rj5z"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases
@@ -298,8 +298,8 @@ (define-public patchelf
                ;; Disable checking for an empty runpath:
                (("^if test.*") "")
                ;; Find libgcc_s.so, which is necessary for the test:
-               (("/xxxxxxxxxxxxxxx") (string-append (assoc-ref inputs "gcc:lib")
-                                                    "/lib")))
+               (("/xxxxxxxxxxxxxxx")
+                (dirname (search-input-file inputs "/lib/libgcc_s.so"))))
              (substitute* "tests/replace-needed.sh"
                ;; This test assumes that only libc will be linked alongside
                ;; libfoo, but we also link libgcc_s.
@@ -309,10 +309,13 @@ (define-public patchelf
                ;; we still need to find libgcc_s (see above).
                (("^\"\\$\\{SCRATCH\\}\"\\/simple.$") ""))
              ;; Skip this test for now.
-             (substitute* "tests/Makefile.in"
+             (substitute* "tests/Makefile.am"
                ((".*shared-rpath\\.sh \\.*") "")))))))
     (native-inputs
-     `(("gcc:lib" ,gcc "lib")))
+     (list
+      autoconf
+      automake
+      (list gcc "lib")))
     (home-page "https://nixos.org/patchelf.html")
     (synopsis "Modify the dynamic linker and RPATH of ELF executables")
     (description

base-commit: d74fc6c8e6428c37a5bfad85b08999ff47000208
-- 
2.46.0

Last modified: Sun, 12 Jan 2025 05:45:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.