Received: (at 75517) by debbugs.gnu.org; 19 Jan 2025 23:39:48 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Jan 19 18:39:48 2025 Received: from localhost ([127.0.0.1]:48212 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tZetP-0006BV-UX for submit <at> debbugs.gnu.org; Sun, 19 Jan 2025 18:39:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39844) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1tZetM-0006B8-Pd; Sun, 19 Jan 2025 18:39:45 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1tZetH-0005qy-Am; Sun, 19 Jan 2025 18:39:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=c39h6m4U3je7+M635Li2/uCLqS3VNtXryczt6UDVSXI=; b=HACFPhWH6SNTumYcmMOB Xj4+g56eXHW4CXL+4gUNM/JfNZL2QNBpj1dfIMhLSazcYvHHuUqGf7M1krNjGu7E/cvOomwxkmC0Q vw4cvPNxzTHMfmdKRep2yVeVFi+tYUvlm0SEZsJTs7atlvCAieVAu6UEl90GSSAFqPFZ8oab2rnEl BN9Wksc4d5MnECyBP6q5FoDaydZU7b2j1QNUyptX41uAWAWNX3kGvXW1Pj3TeaIShkg7reLNAhJCw l4FZTAOWGtqRI0uXPZYUM3MUeqQK9xk8Rv8ZIDflGGCIOQuLUedDpJJK/2zpLT6xKTFhv7AJw+c0h SmsGSre4tay36w==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Janneke Nieuwenhuizen <janneke@HIDDEN> Subject: Re: bug#75518: Request for merging "core-packages-team" branch In-Reply-To: <878qr8awy6.fsf@HIDDEN> (Janneke Nieuwenhuizen's message of "Sat, 18 Jan 2025 17:49:53 +0100") References: <87jzb0dp41.fsf@HIDDEN> <8734hgulpy.fsf@HIDDEN> <878qr8awy6.fsf@HIDDEN> Date: Mon, 20 Jan 2025 00:39:25 +0100 Message-ID: <87y0z6ml02.fsf_-_@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 75517 Cc: 74676 <at> debbugs.gnu.org, 75517 <at> debbugs.gnu.org, 75518 <at> debbugs.gnu.org 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: -3.3 (---) Hello, Janneke Nieuwenhuizen <janneke@HIDDEN> skribis: > That would be lovely, especially if it builds :) It actually does! :-) I went a bit further and tried =E2=80=9Cguix build coreutils=E2=80=9D. It=E2=80=99s close to completion right now, but I=E2= =80=99m going to bed. I=E2=80=99m confident: unlike previous upgrades, there are no major depreca= tions like the removal of Sun RPC, libutil.so, libcrypt.so, etc. (there=E2=80=99s= not much left to remove :-)). So, pushed. The one thing that still needs to be tested is (cross-)compilation to GNU/Hurd. There are probably patches that can be dropped there. Thanks, Ludo=E2=80=99.
guix-patches@HIDDEN:bug#75517; Package guix-patches.
Full text available.
Received: (at 75517) by debbugs.gnu.org; 18 Jan 2025 16:50:13 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Jan 18 11:50:13 2025
Received: from localhost ([127.0.0.1]:43535 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tZC1U-0001Ba-OD
for submit <at> debbugs.gnu.org; Sat, 18 Jan 2025 11:50:13 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:54746)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <janneke@HIDDEN>)
id 1tZC1R-00016E-Cj; Sat, 18 Jan 2025 11:50:10 -0500
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1tZC1K-0000Nc-Ud; Sat, 18 Jan 2025 11:50:02 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
From; bh=vQ5TdAsXANDeKm4ORY9hDnmjAfZiu/ynXOytg/DO2K4=; b=LydM6OwulDiyd6mUOmCZ
Ui4TVRDUBUBts8bQ7flYrmLSThZhsSWV7mETsS+mS3zJ85e0C0TgjlxhrlT+Xnr6RAqjgqesIjuD+
JQviNe8FU7LLeO53LWxuusKvUvM801aDmkGoW3ZZaBzRiyTTBuy/GtFNs4W4ezjmljGc6CvsyAgZq
L9mImYVpMrM79xKvpCPs3iN8+Ru3Vk8iDirYjplGWtnJNckjvvqnqHhP9jF/DAerXnmjX975cpcdq
rgog3ZA1EmH0CqNHJs8ZPNOJnmImrDunKCZxjtX/HO2O/HzwCrWWNZX0gr9w7j1ESXVWnzYvXm4YJ
BO8BfNBq75DyyQ==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Subject: Re: bug#75518: Request for merging "core-packages-team" branch
In-Reply-To: <8734hgulpy.fsf@HIDDEN> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?=
=?utf-8?Q?s?= message of "Sat, 18 Jan 2025 17:32:09 +0100")
Organization: AvatarAcademy.nl
References: <87jzb0dp41.fsf@HIDDEN> <8734hgulpy.fsf@HIDDEN>
X-Url: http://AvatarAcademy.nl
Date: Sat, 18 Jan 2025 17:49:53 +0100
Message-ID: <878qr8awy6.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 75517
Cc: 74676 <at> debbugs.gnu.org, 75517 <at> debbugs.gnu.org, 75518 <at> debbugs.gnu.org
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: -3.3 (---)
Ludovic Court=C3=A8s writes:
Hi!
> Janneke Nieuwenhuizen <janneke@HIDDEN> skribis:
>
>> Cuirass says we're at 81% success rate for i686-linux and x86_64-linux,
>> and possibly my #74676, meant as an old style "please help with the
>> gcc-14 transition", should have been named "Request for merging" already
>> anyway. Hard to keep up with all the changes but more formality is a
>> good thing I guess :)
>
> I=E2=80=99m testing the patch below to upgrade glibc to 2.40 (I=E2=80=99m=
at
> =E2=80=98gcc-mesboot-4.9.4=E2=80=99 so there are still quite a few hours =
before I get
> around to building glibc).
Oh, I didn't realise 2.40 was out already!
> I think we must upgrade glibc in this branch because (1) we want to get
> rid of this graft and more generally get the latest fixes, and (2) we
> cannot just ungraft since the graft uses =E2=80=98git-fetch=E2=80=99, whi=
ch cannot be
> relied on in =E2=80=98commencement.scm=E2=80=99 (we still assume that
> =E2=80=98builtin:git-download=E2=80=99 may be unavailable, and when it=E2=
=80=99s unavailable, we
> have a circular dependency).
>
> Thoughts?
That would be lovely, especially if it builds :)
Greetings,
Janneke
--=20
Janneke Nieuwenhuizen <janneke@HIDDEN> | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade=
my.com
guix-patches@HIDDEN:bug#75517; Package guix-patches.
Full text available.
Received: (at 75517) by debbugs.gnu.org; 18 Jan 2025 16:32:30 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Jan 18 11:32:30 2025
Received: from localhost ([127.0.0.1]:43502 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tZBkH-0000Jg-L1
for submit <at> debbugs.gnu.org; Sat, 18 Jan 2025 11:32:30 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:48540)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <ludo@HIDDEN>)
id 1tZBkE-0000JL-Bx; Sat, 18 Jan 2025 11:32:23 -0500
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <ludo@HIDDEN>)
id 1tZBk7-0006oq-0Y; Sat, 18 Jan 2025 11:32:16 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
From; bh=6EVR7N/h+nyu9uYt6qGJ2E2l0bfCv9pfBibL+BDiw8s=; b=e0gcbfdKSVFp4ABUbwlS
ATEGZy8VNKeP4mhbJzqLXL0KrUuI1ZDmPmCNNmDKLwYgy7Stk7ypBdvM04wEz1wo/Zevft5NRgBPD
XMPCOqoZnzL+L599sKWdzjDTKVTfoo+9QUuciID0LqAgSKkPIlRO5wyKaD5jVPoUcAzY6t7e0gQp1
tt2Hanp34towRZsRCMEYRPn3vTXbSuRlhAMDrED6dAxYAasACHQyiknX77ulVu0OiQLvInqeWqSQS
PiWcU2ab/k2dsJb8Y3D0a1bANBS0YEmKwcoKdiHGMme+4raK+Lvo48mZYm5CUiizjTmtjcYssbyi0
Tw/Ndc8dBEAiIw==;
From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN>
To: Janneke Nieuwenhuizen <janneke@HIDDEN>
Subject: Re: bug#75518: Request for merging "core-packages-team" branch
In-Reply-To: <87jzb0dp41.fsf@HIDDEN> (Janneke Nieuwenhuizen's message of
"Sun, 12 Jan 2025 16:32:46 +0100")
References: <87jzb0dp41.fsf@HIDDEN>
Date: Sat, 18 Jan 2025 17:32:09 +0100
Message-ID: <8734hgulpy.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 75517
Cc: 74676 <at> debbugs.gnu.org, 75517 <at> debbugs.gnu.org, 75518 <at> debbugs.gnu.org
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.0 (-)
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Hello!
Janneke Nieuwenhuizen <janneke@HIDDEN> skribis:
> Cuirass says we're at 81% success rate for i686-linux and x86_64-linux,
> and possibly my #74676, meant as an old style "please help with the
> gcc-14 transition", should have been named "Request for merging" already
> anyway. Hard to keep up with all the changes but more formality is a
> good thing I guess :)
I=E2=80=99m testing the patch below to upgrade glibc to 2.40 (I=E2=80=99m at
=E2=80=98gcc-mesboot-4.9.4=E2=80=99 so there are still quite a few hours be=
fore I get
around to building glibc).
I think we must upgrade glibc in this branch because (1) we want to get
rid of this graft and more generally get the latest fixes, and (2) we
cannot just ungraft since the graft uses =E2=80=98git-fetch=E2=80=99, which=
cannot be
relied on in =E2=80=98commencement.scm=E2=80=99 (we still assume that
=E2=80=98builtin:git-download=E2=80=99 may be unavailable, and when it=E2=
=80=99s unavailable, we
have a circular dependency).
Thoughts?
Ludo=E2=80=99.
--=-=-=
Content-Type: text/x-patch; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
diff --git a/gnu/local.mk b/gnu/local.mk
index f4d04c4abb..3b123cba1d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1,5 +1,5 @@
# GNU Guix --- Functional package management for GNU
-# Copyright =C2=A9 2012-2024 Ludovic Court=C3=A8s <ludo@HIDDEN>
+# Copyright =C2=A9 2012-2025 Ludovic Court=C3=A8s <ludo@HIDDEN>
# Copyright =C2=A9 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2022, 2=
023, 2024 Andreas Enge <andreas@HIDDEN>
# Copyright =C2=A9 2016 Mathieu Lirzin <mthl@HIDDEN>
# Copyright =C2=A9 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ma=
rk H Weaver <mhw@HIDDEN>
@@ -1437,6 +1437,7 @@ dist_patch_DATA =3D \
%D%/packages/patches/glibc-2.33-riscv64-miscompilation.patch \
%D%/packages/patches/glibc-2.39-git-updates.patch \
%D%/packages/patches/glibc-2.39-fmod-libm-a.patch \
+ %D%/packages/patches/glibc-2.40-dl-cache.patch \
%D%/packages/patches/glibc-CVE-2019-7309.patch \
%D%/packages/patches/glibc-CVE-2019-9169.patch \
%D%/packages/patches/glibc-CVE-2019-19126.patch \
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index fc48c9d844..95c237e140 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright =C2=A9 2012-2024 Ludovic Court=C3=A8s <ludo@HIDDEN>
+;;; Copyright =C2=A9 2012-2025 Ludovic Court=C3=A8s <ludo@HIDDEN>
;;; Copyright =C2=A9 2014, 2019 Andreas Enge <andreas@HIDDEN>
;;; Copyright =C2=A9 2012 Nikita Karetnikov <nikita@HIDDEN>
;;; Copyright =C2=A9 2014, 2015, 2016, 2018 Mark H Weaver <mhw@HIDDEN>
@@ -879,10 +879,9 @@ (define* (make-ld-wrapper name #:key
(license gpl3+)))
=20
(define %glibc-patches
- (list "glibc-2.39-git-updates.patch"
- "glibc-ldd-powerpc.patch"
+ (list "glibc-ldd-powerpc.patch"
"glibc-2.38-ldd-x86_64.patch"
- "glibc-dl-cache.patch"
+ "glibc-2.40-dl-cache.patch"
"glibc-2.37-versioned-locpath.patch"
;; "glibc-allow-kernel-2.6.32.patch"
"glibc-reinstate-prlimit64-fallback.patch"
@@ -898,18 +897,17 @@ (define-public glibc
;; version 2.28, GNU/Hurd used a different glibc branch.
(package
(name "glibc")
- (version "2.39")
+ (version "2.40")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.=
xz"))
(sha256
(base32
- "09nrwb0ksbah9k35jchd28xxp2hidilqdgz7b8v5f30pz1yd8yzp"))
+ "18h50b0zm8dkpzj81w033v99rbxiykk3v697yr4dfqwjbqbr1a0r"))
(patches (map search-patch %glibc-patches))))
(properties `((lint-hidden-cve . ("CVE-2024-2961"
"CVE-2024-33601" "CVE-2024-33602"
"CVE-2024-33600" "CVE-2024-33599"))))
- (replacement glibc/fixed)
(build-system gnu-build-system)
=20
;; Glibc's <limits.h> refers to <linux/limit.h>, for instance, so glibc
@@ -1187,28 +1185,6 @@ (define-public glibc
(license lgpl2.0+)
(home-page "https://www.gnu.org/software/libc/")))
=20
-(define glibc/fixed
- (package
- (inherit glibc)
- (name "glibc")
- (version (package-version glibc))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "git://sourceware.org/git/glibc.git")
- ;; This is the latest commit from the
- ;; 'release/2.39/master' branch, where CVEs and other
- ;; important bug fixes are cherry picked.
- (commit "2c882bf9c15d206aaf04766d1b8e3ae5b1002cc2")))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "111yf24g0qcfcxywfzrilmjxysahlbkzxfimcz9rq8p00qzvvf51"))
- (patches (map search-patch
- (fold (cut delete <...>)
- %glibc-patches
- '("glibc-2.39-git-updates.patch"))))))))
-
;; Define a variation of glibc which uses the default /etc/ld.so.cache, us=
eful
;; in FHS containers.
(define-public glibc-for-fhs
@@ -1220,7 +1196,7 @@ (define-public glibc-for-fhs
;; directories, re-enabling the default /etc/ld.so.ca=
che
;; behavior.
(patches
- (delete (search-patch "glibc-dl-cache.patch")
+ (delete (search-patch "glibc-2.40-dl-cache.patch")
(origin-patches (package-source glibc)))))))=
))
=20
;; Below are old libc versions, which we use mostly to build locale data in
@@ -1444,7 +1420,6 @@ (define-public glibc-2.29
"glibc-ldd-x86_64.patch"
"glibc-CVE-2019-7309.patch"
"glibc-CVE-2019-9169.patch"
- "glibc-2.29-git-updates.patch"
"glibc-hidden-visibility-ldconfig.p=
atch"
"glibc-versioned-locpath.patch"
"glibc-allow-kernel-2.6.32.patch"
diff --git a/gnu/packages/patches/glibc-2.40-dl-cache.patch b/gnu/packages/=
patches/glibc-2.40-dl-cache.patch
new file mode 100644
index 0000000000..d41faa5225
--- /dev/null
+++ b/gnu/packages/patches/glibc-2.40-dl-cache.patch
@@ -0,0 +1,113 @@
+Read the shared library cache relative to $ORIGIN instead of reading
+from /etc/ld.so.cache. Also arrange so that this cache takes
+precedence over RUNPATH.
+
+diff --git a/elf/dl-cache.c b/elf/dl-cache.c
+index 7c7dc587..19d1d79a 100644
+--- a/elf/dl-cache.c
++++ b/elf/dl-cache.c
+@@ -374,6 +374,52 @@ _dl_cache_libcmp (const char *p1, const char *p2)
+ return *p1 - *p2;
+ }
+=20
++/* Special value representing the lack of an ld.so cache. */
++static const char ld_so_cache_lacking[] =3D "/ld.so cache is lacking";
++
++/* Return the per-application ld.so cache, relative to $ORIGIN, or NULL if
++ that fails for some reason. Do not return the system-wide LD_SO_CACHE
++ since on a foreign distro it would contain invalid information. */
++static const char *
++ld_so_cache (void)
++{
++ static const char *loader_cache;
++
++ if (loader_cache =3D=3D NULL)
++ {
++ static const char store[] =3D @STORE_DIRECTORY@;
++ const char *origin =3D _dl_get_origin ();
++
++ /* Check whether ORIGIN is something like "/gnu/store/=E2=80=A6-foo=
/bin". */
++ if (origin !=3D (char *) -1 /* _dl_get_origin reported failure */
++ && strncmp (store, origin, strlen (store)) =3D=3D 0
++ && origin[sizeof store - 1] =3D=3D '/')
++ {
++ char *store_item_end =3D strchr (origin + sizeof store, '/');
++
++ if (store_item_end !=3D NULL)
++ {
++ static const char suffix[] =3D "/etc/ld.so.cache";
++ size_t store_item_len =3D store_item_end - origin;
++
++ /* Note: We can't use 'malloc' because it can be interposed.
++ Likewise, 'strncpy' is not available. */
++ char *cache =3D alloca (strlen (origin) + sizeof suffix);
++
++ strcpy (cache, origin);
++ strcpy (cache + store_item_len, suffix);
++
++ loader_cache =3D __strdup (cache) ?: ld_so_cache_lacking;
++ }
++ else
++ loader_cache =3D ld_so_cache_lacking;
++ }
++ else
++ loader_cache =3D ld_so_cache_lacking;
++ }
++
++ return loader_cache;
++}
+=20
+ /* Look up NAME in ld.so.cache and return the file name stored there, or =
null
+ if none is found. The cache is loaded if it was not already. If load=
ing
+@@ -387,12 +433,15 @@ _dl_load_cache_lookup (const char *name)
+ {
+ /* Print a message if the loading of libs is traced. */
+ if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS))
+- _dl_debug_printf (" search cache=3D%s\n", LD_SO_CACHE);
++ _dl_debug_printf (" search cache=3D%s\n", ld_so_cache ());
++
++ if (__glibc_unlikely (ld_so_cache () =3D=3D ld_so_cache_lacking))
++ return NULL;
+=20
+ if (cache =3D=3D NULL)
+ {
+ /* Read the contents of the file. */
+- void *file =3D _dl_sysdep_read_whole_file (LD_SO_CACHE, &cachesize,
++ void *file =3D _dl_sysdep_read_whole_file (ld_so_cache (), &cachesi=
ze,
+ PROT_READ);
+=20
+ /* We can handle three different cache file formats here:
+diff --git a/elf/dl-load.c b/elf/dl-load.c
+index 8a89b710..b8802e74 100644
+--- a/elf/dl-load.c
++++ b/elf/dl-load.c
+@@ -2038,14 +2038,6 @@ _dl_map_object (struct link_map *loader, const char=
*name,
+ loader ?: GL(dl_ns)[LM_ID_BASE]._ns_loaded,
+ LA_SER_LIBPATH, &found_other_class);
+=20
+- /* Look at the RUNPATH information for this binary. */
+- if (fd =3D=3D -1 && loader !=3D NULL
+- && cache_rpath (loader, &loader->l_runpath_dirs,
+- DT_RUNPATH, "RUNPATH"))
+- fd =3D open_path (name, namelen, mode,
+- &loader->l_runpath_dirs, &realname, &fb, loader,
+- LA_SER_RUNPATH, &found_other_class);
+-
+ #ifdef USE_LDCONFIG
+ if (fd =3D=3D -1
+ && (__glibc_likely ((mode & __RTLD_SECURE) =3D=3D 0)
+@@ -2104,6 +2096,14 @@ _dl_map_object (struct link_map *loader, const char=
*name,
+ }
+ #endif
+=20
++ /* Look at the RUNPATH information for this binary. */
++ if (fd =3D=3D -1 && loader !=3D NULL
++ && cache_rpath (loader, &loader->l_runpath_dirs,
++ DT_RUNPATH, "RUNPATH"))
++ fd =3D open_path (name, namelen, mode,
++ &loader->l_runpath_dirs, &realname, &fb, loader,
++ LA_SER_RUNPATH, &found_other_class);
++
+ /* Finally, try the default path. */
+ if (fd =3D=3D -1
+ && ((l =3D loader ?: GL(dl_ns)[nsid]._ns_loaded) =3D=3D NULL
--=-=-=--
guix-patches@HIDDEN:bug#75517; Package guix-patches.
Full text available.Received: (at 75517-done) by debbugs.gnu.org; 12 Jan 2025 15:37:46 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Jan 12 10:37:46 2025 Received: from localhost ([127.0.0.1]:48805 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tX026-0002yF-Br for submit <at> debbugs.gnu.org; Sun, 12 Jan 2025 10:37:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58768) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <janneke@HIDDEN>) id 1tX01y-0002xc-SD; Sun, 12 Jan 2025 10:37:40 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1tX01t-000420-0l; Sun, 12 Jan 2025 10:37:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=lVwKHzRtP6zWE8uZuG80Q/T7To6mvu2gA5gd30d2z6g=; b=CtHRMrVXigXTePyaU/8w 2gbWhMyvH/cUCoWAu4X8oRAgbJdylujAP3nCCc7+1QrJGJn7dURxV433A8s9O9e6Xf2u8krt2/fdA W+NjsevIBfAZ3iHKt5+don5Jd7kTYznTOlcRTvRb9sCNcAtTbzr0YTBtS0LvJvSVt8heYV+csYzaW 7rLNl6eB0Sc9mGQOMJtg2svNLT+zle+c8mtulZM1wXWzNm0iWkll94gSEXpnGpwWvFTTqtpwUPWWv B01OkoxhOU51661mt18Wj2jwHudZC2xfYQzat4Eo6mk6PBYCXv3OGWUqUpVYlCUnjVnLXsDIc9hIb wFp5de4KOVqVFA==; From: Janneke Nieuwenhuizen <janneke@HIDDEN> To: 75517-done <at> debbugs.gnu.org Subject: Re: bug#75517: Request for merging core-packages-team branch In-Reply-To: <87jzb0dp41.fsf@HIDDEN> (Janneke Nieuwenhuizen's message of "Sun, 12 Jan 2025 16:32:46 +0100") References: <87o70cdpvc.fsf@HIDDEN> <87jzb0dp41.fsf@HIDDEN> Date: Sun, 12 Jan 2025 16:37:27 +0100 Message-ID: <87ed18dow8.fsf_-_@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 75517-done Cc: 74676 <at> debbugs.gnu.org, 75518 <at> debbugs.gnu.org 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: -3.3 (---) Janneke Nieuwenhuizen writes: Closing this bug with wrong subject (missing double quotes around branch na= me). --=20 Janneke Nieuwenhuizen <janneke@HIDDEN> | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com
Janneke Nieuwenhuizen <janneke@HIDDEN>:Janneke Nieuwenhuizen <janneke@HIDDEN>:Received: (at 75517) by debbugs.gnu.org; 12 Jan 2025 15:33:00 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Jan 12 10:32:59 2025 Received: from localhost ([127.0.0.1]:48788 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tWzxT-0002k6-Jm for submit <at> debbugs.gnu.org; Sun, 12 Jan 2025 10:32:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41422) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <janneke@HIDDEN>) id 1tWzxQ-0002je-76; Sun, 12 Jan 2025 10:32:57 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1tWzxK-0003aY-AY; Sun, 12 Jan 2025 10:32:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=Ov4++fQzVr5dEpoceeMfBdEOlB1Yk0f5B53QmYsjfVs=; b=rZ4UC1xJrB+FEt roLra8N5pLvmwqjRVRsskSs06gHhC4dyOTr/qmIG8yjwpInlB9Ilcoc12idxvBSPcKCwAznXIuTSZ U2h+7gMX63dlWGr+y4TcCycfCL0YKiEe3241QDQqhQGiSmv+DYpnvI3Y606OwS8w01PBBdugE6RqO xcQ0+aZz2sRjcQcaZmVKRL1Tktdxj0YwR9ITzlkcRyAS9cqvc/4cQ8NgX2C8RhKhQQXAgkd5RxTSl W2kPNBicOStFp+jFrM0YL3ce2Ns9EE9q/EVrsit+MzsFpK8Y9SCk1MhtxHWN/bwNBaS0kVUEFHLep Ydu8PtJzDwOGSg+C5CPg==; From: Janneke Nieuwenhuizen <janneke@HIDDEN> To: guix-patches@HIDDEN Subject: Request for merging "core-packages-team" branch Organization: AvatarAcademy.nl X-Url: http://AvatarAcademy.nl Date: Sun, 12 Jan 2025 16:32:46 +0100 Message-ID: <87jzb0dp41.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 75517 Cc: 74676 <at> debbugs.gnu.org, 75517 <at> debbugs.gnu.org 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: -3.3 (---) Hi! Cuirass says we're at 81% success rate for i686-linux and x86_64-linux, and possibly my #74676, meant as an old style "please help with the gcc-14 transition", should have been named "Request for merging" already anyway. Hard to keep up with all the changes but more formality is a good thing I guess :) Greetings, Janneke --=20 Janneke Nieuwenhuizen <janneke@HIDDEN> | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com
guix-patches@HIDDEN:bug#75517; Package guix-patches.
Full text available.Received: (at submit) by debbugs.gnu.org; 12 Jan 2025 15:16:40 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Jan 12 10:16:40 2025 Received: from localhost ([127.0.0.1]:48750 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tWzhf-0001wS-RD for submit <at> debbugs.gnu.org; Sun, 12 Jan 2025 10:16:40 -0500 Received: from lists.gnu.org ([2001:470:142::17]:53212) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <janneke@HIDDEN>) id 1tWzha-0001vw-Kw for submit <at> debbugs.gnu.org; Sun, 12 Jan 2025 10:16:34 -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 <janneke@HIDDEN>) id 1tWzhT-0001xA-43 for guix-patches@HIDDEN; Sun, 12 Jan 2025 10:16:28 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1tWzhR-0008HH-Ch; Sun, 12 Jan 2025 10:16:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=Ov4++fQzVr5dEpoceeMfBdEOlB1Yk0f5B53QmYsjfVs=; b=AvxGcm6VFnjSzm qNPHkvKY+tjOjNUdHXRO+uvWXo75qj1WlI0viJwkx9NKkUbA+DZKw3xSkg9vYr3EBIGOzcks3eqhX T10/2qIUnoP/Gc6l9rEWoL3RkqvE4sg0SGyhVTfzI8xiy5FJ5a70PE+F7ai+ObCeyW3m4nost5qFM i/upElcmZ4zFBj9xulbxPulfSQbTQLx3qb9Pf+8vl1lt1rk1bwRa561OGUTSMGtEuVluBoWRFkvqg o6jU78u8jKgYDMT7pO6PIBH4GLUGwowSUsQ2h5wX3Op7xmxh+LG448xvtpaHhOVC+zoiJX2ayd/EP 7kKKwAoo3ltHPM8StdRw==; From: Janneke Nieuwenhuizen <janneke@HIDDEN> To: guix-patches@HIDDEN Subject: Request for merging core-packages-team branch Organization: AvatarAcademy.nl User-Agent: Gnus/5.13 (Gnus v5.13) X-Url: http://AvatarAcademy.nl Date: Sun, 12 Jan 2025 16:16:23 +0100 Message-ID: <87o70cdpvc.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: submit Cc: 74676 <at> debbugs.gnu.org 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.0 (-) Hi! Cuirass says we're at 81% success rate for i686-linux and x86_64-linux, and possibly my #74676, meant as an old style "please help with the gcc-14 transition", should have been named "Request for merging" already anyway. Hard to keep up with all the changes but more formality is a good thing I guess :) Greetings, Janneke --=20 Janneke Nieuwenhuizen <janneke@HIDDEN> | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com
Janneke Nieuwenhuizen <janneke@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#75517; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.