From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id oIndOc58+WaBQwEA62LTzQ:P1 (envelope-from ) for ; Sun, 29 Sep 2024 16:14:07 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id oIndOc58+WaBQwEA62LTzQ (envelope-from ) for ; Sun, 29 Sep 2024 18:14:07 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="QahaMUH/"; 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=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1727626446; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=Bj1lKmYP2vMyEhp6gsax7w5U9HViU3Gt0TKXvmzA/e0=; b=oQFgOxpehMlUFCztnFShOmVHNkKFpoyUIRq6v7dS8o7cVQcEJELnsyLRuyMCbUVXk1LEkK nt9oxtLK4cEqzCMt89otM5fwKCSH9Pv75A/5gwJT+9jc8SxwyG4WelPibMD2DY0PeU1hMb VCQzZ4un38V4MwUJSAwWrIeTUFigni4auK3wYsxz3YWSv3qJYMx2fn+USlPcnaBLlkrAtd CRfEeMDDqJ3jysO/y09jpC1yUjmUT1wtLbhomadYWS8eOOAn/pgh3SgiepawrZ2yAQBR7r mLn7FkPvkJgLeCGEj4s9e2sjjeACjr6oWEoc4nYAx7HoMryLkq2Q6bf1zO2N/A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="QahaMUH/"; 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=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1727626446; a=rsa-sha256; cv=none; b=F49hLEFrO02ld4MKOoO9pgeyaN80szkQPTjDICaoQt+0/S9Wyg0k9OYrLW+fTXWQ+KZQBf WBVZvQJ3Dx5Q6tXfksukE1QJ+ZfIWflQ3Lu2g23Wnhuik0Z6nx9GMLwOwf1KhA+LQswXcr BIaqOpgS9tyO1A6/rvIPshrEEGWdyiHUqGP7jmLkZ69RZNJ43dQIAAoxMWeyglWTk1NFcu 65epMMabzbwl2Tnzp0heAMMcV76nMdIEdOi+rgP7tUpuRUoIqyKntKnrcB0MRIr2RPLpfq 9S+jpQR03zX1iYpYBbWHAb5GxT7Ss0SbB+VfcqrePVvH6uMNCjmruFUS7ZX+Cw== 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 947BA792E3 for ; Sun, 29 Sep 2024 18:14:06 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suwYG-0001CV-Es; Sun, 29 Sep 2024 12:13:40 -0400 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 1suwY8-0001C0-Q6 for guix-patches@gnu.org; Sun, 29 Sep 2024 12:13:33 -0400 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 1suwY8-00066h-Bi for guix-patches@gnu.org; Sun, 29 Sep 2024 12:13:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=Bj1lKmYP2vMyEhp6gsax7w5U9HViU3Gt0TKXvmzA/e0=; b=QahaMUH/b/0+2cb+tP2/aUB/FPLlQ/iKj0yVBmLD629iV85bbr0CJNvqVdQT3SvdqVE1YqSuwE2cKf2QGEcX8p6TMTOOti5TdS3+tUVJTDnL3O41sW/4ahCfS/fntisMp/kUCJKdza3CNNukCD5LdRr5AEcNHh6ZnM5D6eFt9IWRKV+p3+wcBwzI7xSdCwCHGNjjO5vI1Py8eoSZpWiWqF37uthQMN4M2RRzXqgkEB9hHNyqIs7Uq3TsVWAztV3KDpmZYqOxzSICSBTt1dnLtaNaa9iwMREvAjbaL71ljJEFr3kb0eXmnRmryvxSJr+r7+CYOPdO5Kf8seJSBNwKHg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1suwYd-00070e-OX for guix-patches@gnu.org; Sun, 29 Sep 2024 12:14:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73529] [PATCH core] gnu: patchelf: Build from git sources. Resent-From: Z572 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 29 Sep 2024 16:14:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73529 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: attila.lendvai@gmail.com Cc: Attila Lendvai , 73529@debbugs.gnu.org Received: via spool by 73529-submit@debbugs.gnu.org id=B73529.172762639926795 (code B ref 73529); Sun, 29 Sep 2024 16:14:03 +0000 Received: (at 73529) by debbugs.gnu.org; 29 Sep 2024 16:13:19 +0000 Received: from localhost ([127.0.0.1]:40966 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suwXt-0006xu-12 for submit@debbugs.gnu.org; Sun, 29 Sep 2024 12:13:18 -0400 Received: from smtp81.cstnet.cn ([159.226.251.81]:33068 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suwXo-0006w3-TE for 73529@debbugs.gnu.org; Sun, 29 Sep 2024 12:13:15 -0400 Received: from m (unknown [117.147.109.111]) by APP-03 (Coremail) with SMTP id rQCowAC3v1tsfPlmUu0gAg--.20440S2; Mon, 30 Sep 2024 00:12:29 +0800 (CST) From: Z572 In-Reply-To: <91e06adbec896b8e685d7bc2501da3e7dc932233.1727525522.git.attila@lendvai.name> (attila lendvai's message of "Sat, 28 Sep 2024 14:12:03 +0200") References: <91e06adbec896b8e685d7bc2501da3e7dc932233.1727525522.git.attila@lendvai.name> Date: Mon, 30 Sep 2024 00:12:27 +0800 Message-ID: <87r0928mms.fsf@iscas.ac.cn> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-CM-TRANSID: rQCowAC3v1tsfPlmUu0gAg--.20440S2 X-Coremail-Antispam: 1UD129KBjvJXoWxGw17tr4UXry7Gw45WrW5trb_yoW5Ww4fpr y3Zr4S9w4kK348JwsrKF1jgw1Yvr1xtF1rZw4Ivrn7C39IvFZ7trW2kFWFyFnrZF1fWw47 ZayrZw4rJF18uFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUyEb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Jr0_JF4l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Jr0_Gr1l84ACjcxK6I8E87Iv67AKxVWUJVW8JwA2z4x0Y4vEx4 A2jsIEc7CjxVAFwI0_Jr0_Gr1le2I262IYc4CY6c8Ij28IcVAaY2xG8wASzI0EjI02j7Aq F2xKxwAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4 A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvEwIxGrwCF04k20xvY 0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I 0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jrv_JF1lIxkGc2Ij64vIr41lIxAI cVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcV CF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIE c7CjxVAFwI0_Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7IU5PpnJUUUUU== X-Originating-IP: [117.147.109.111] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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: , 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 X-Migadu-Spam-Score: -8.23 X-Spam-Score: -8.23 X-Migadu-Queue-Id: 947BA792E3 X-Migadu-Scanner: mx13.migadu.com X-TUID: ejoIocxFheEs --=-=-= Content-Type: text/plain attila.lendvai@gmail.com writes: > From: Attila Lendvai > > 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----- --=-=-=--