From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id MNeuAz4zUmH6tgAAgWs5BA (envelope-from ) for ; Mon, 27 Sep 2021 23:10:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id IOzROj0zUmHqFAAAbx9fmQ (envelope-from ) for ; Mon, 27 Sep 2021 21:10:21 +0000 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 421CF2143E for ; Mon, 27 Sep 2021 23:10:21 +0200 (CEST) Received: from localhost ([::1]:35384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUxtD-000329-Ma for larch@yhetil.org; Mon, 27 Sep 2021 17:10:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUxsx-00031l-7B for bug-guix@gnu.org; Mon, 27 Sep 2021 17:10:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59664) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mUxsw-0008ON-Uu for bug-guix@gnu.org; Mon, 27 Sep 2021 17:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mUxsw-0004gL-Hi for bug-guix@gnu.org; Mon, 27 Sep 2021 17:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#50830: [core-updates-frozen] glibc looks for $sysconfdir/etc/localtime rather than /etc/localtime Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 27 Sep 2021 21:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50830 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: John Kehayias Received: via spool by 50830-submit@debbugs.gnu.org id=B50830.163277694817929 (code B ref 50830); Mon, 27 Sep 2021 21:10:02 +0000 Received: (at 50830) by debbugs.gnu.org; 27 Sep 2021 21:09:08 +0000 Received: from localhost ([127.0.0.1]:42977 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUxs3-0004f6-F9 for submit@debbugs.gnu.org; Mon, 27 Sep 2021 17:09:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUxs1-0004ec-JA for 50830@debbugs.gnu.org; Mon, 27 Sep 2021 17:09:06 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:43962) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUxrw-0007ZA-4G; Mon, 27 Sep 2021 17:09:00 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=36406 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUxrv-0001Tv-SA; Mon, 27 Sep 2021 17:09:00 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87czovkqtp.fsf@inria.fr> Date: Mon, 27 Sep 2021 23:08:58 +0200 In-Reply-To: (John Kehayias's message of "Sun, 26 Sep 2021 21:06:53 +0000") Message-ID: <87mtnxhgk5.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "50830@debbugs.gnu.org" <50830@debbugs.gnu.org> Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1632777021; 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; bh=fW7Y8GzYLN6L/CKXUBUekf27xwTAlbCS0GTPRUnlxKY=; b=KGuKOAmjTFrgMu+FNX4vzvcJANXLwSz1vj8l4Q4iVxZwtgBRj8WqDqTfgh/R4OFUGEA+lT Wdo/Saj6ygzw7BEgILgEhqmhV0Y55beuJALxsZnebnYGvjkvF1Nx11tRgfSncANowuifbJ h+tP6Ez+WWxcpNr6GIVRlCWRE1A2fExYFFbJk5o4tEK+GCrYqZ1YtHvCChcoo/lT/6znTL /aIkCZvs4G5oMmXyqus77s2pvPEWTtVOYjvHmCte2aVzmPWb+eG1smbeMra9HYbsnZ5cz/ MJTcg83gUoMX5MwqEkK0PRKVw+bsgOPicbhMxWBdRUPoK0QxSfYEJbU6v+z4NQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632777021; a=rsa-sha256; cv=none; b=Fge6AmyKB4yqEksj4cAl9V6fDBeyB4ad9IF9eJJzFq0Yx+n/xPoC75Wdq+jjScZ/OOEMoM p6v321MhR0p6N0Q8j/uDE69neHs9TS8EWeDx0l/4tEsIHZalX/Ai3/BDeizRAtAnwrPfic PcUM4t4JFZ/zhTuzwEbMY/W9A17cthPaKRUcF4OZ1nKc6IilmXjE8UkDHY8twiRCxKSotY dw6xPtF3qU75Bszz0ZH6C/j17NulwptzGA7thQ1pfy71aF0qx3xp4NZkV5UgIWNe2QSLmn Ujwcr18UnlRaOdx6X7fyD8ll3vL2S3+tzm7SEtRuCrq6lHC98wJYFgWRStwjFQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Spam-Score: -1.89 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: 421CF2143E X-Spam-Score: -1.89 X-Migadu-Scanner: scn0.migadu.com X-TUID: rh4VcwzwuJNG --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, John Kehayias skribis: > Just to followup, here is the relevant part of my `guix describe`: > > guix c6a8d6d > repository URL: https://git.savannah.gnu.org/git/guix.git > branch: core-updates-frozen > commit: c6a8d6db77520097bd0b2df99bfab659bfcfd64c > > On a side note, nearly everything else seems to work well for me on core-= updates-frozen. Will be happy to test a post-world-rebuild when that comes. Yay, nice! So here=E2=80=99s a patch to fix it, and another one to do a minor cleanup operation. I=E2=80=99ve confirmed that glibc 2.33 builds fine, as well as 2.31. I haven=E2=80=99t checked cross-compilation yet. Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-glibc-Remove-unneeded-nscd-patching.patch >From d27621e9af056c91e1419ce678614b9dfd5956d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 27 Sep 2021 14:18:12 +0200 Subject: [PATCH 1/2] gnu: glibc: Remove unneeded nscd patching. This change had no effect already in glibc 2.29, which has proper versioning. * gnu/packages/base.scm (glibc)[arguments]: Remove obsolete 'nscd/nscd_stat.c' 'substitute*' statement. --- gnu/packages/base.scm | 9 --------- 1 file changed, 9 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 174af43917..9c45f524dc 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -830,15 +830,6 @@ the store.") (string-append "#define _PATH_BSHELL \"" bash "/bin/sh\"\n"))) - ;; Nscd uses __DATE__ and __TIME__ to create a string to - ;; make sure the client and server come from the same - ;; libc. Use something deterministic instead. - (substitute* "nscd/nscd_stat.c" - (("static const char compilation\\[21\\] =.*$") - (string-append - "static const char compilation[21] = \"" - (string-take (basename out) 20) "\";\n"))) - ;; Make sure we don't retain a reference to the ;; bootstrap Perl. (substitute* "malloc/mtrace.pl" -- 2.33.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-glibc-Look-for-the-current-timezone-in-etc-local.patch >From 73120bc3a430b677afb3d9e0ead1567fdb961aa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 27 Sep 2021 14:19:48 +0200 Subject: [PATCH 2/2] gnu: glibc: Look for the current timezone in /etc/localtime. Fixes . Reported by podiki on #guix. Previously, glibc 2.33 would look for /gnu/store/...-glibc-2.33/etc/localtime instead of /etc/localtime. * gnu/packages/base.scm (glibc)[arguments]: Remove #:make-flags. [phases]: In 'pre-configure', modify 'inet/Makefile' instead of 'sunrpc/Makefile' since this is where these bits are in 2.33. (glibc-2.31)[arguments]: Add 'set-etc-rpc-installation-directory' phase. (glibc-2.30): Inherit from GLIBC-2.31. * gnu/tests/base.scm (run-basic-test)["libc honors /etc/localtime"]: New test. --- gnu/packages/base.scm | 25 ++++++++++++++++--------- gnu/tests/base.scm | 11 +++++++++++ 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 9c45f524dc..68f238a2fe 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -775,11 +775,6 @@ the store.") '("--disable-werror") '())) - ;; Arrange so that /etc/rpc & co. go to $out/etc. - #:make-flags (list (string-append "sysconfdir=" - (assoc-ref %outputs "out") - "/etc")) - #:tests? #f ; XXX #:phases (modify-phases %standard-phases (add-before @@ -793,8 +788,7 @@ the store.") (bash (or (assoc-ref inputs "static-bash") (assoc-ref native-inputs "static-bash")))) ;; Install the rpc data base file under `$out/etc/rpc'. - ;; FIXME: Use installFlags = [ "sysconfdir=$(out)/etc" ]; - (substitute* "sunrpc/Makefile" + (substitute* "inet/Makefile" (("^\\$\\(inst_sysconfdir\\)/rpc(.*)$" _ suffix) (string-append out "/etc/rpc" suffix "\n")) (("^install-others =.*$") @@ -950,11 +944,24 @@ with the Linux kernel.") "glibc-2.31-hurd-clock_gettime_monotonic.patch" "glibc-hurd-signal-sa-siginfo.patch" "glibc-hurd-mach-print.patch" - "glibc-hurd-gettyent.patch")))))) + "glibc-hurd-gettyent.patch")))) + (arguments + (substitute-keyword-arguments (package-arguments glibc) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'configure 'set-etc-rpc-installation-directory + (lambda* (#:key outputs #:allow-other-keys) + ;; Install the rpc data base file under `$out/etc/rpc'. + (let ((out (assoc-ref outputs "out"))) + (substitute* "sunrpc/Makefile" + (("^\\$\\(inst_sysconfdir\\)/rpc(.*)$" _ suffix) + (string-append out "/etc/rpc" suffix "\n")) + (("^install-others =.*$") + (string-append "install-others = " out "/etc/rpc\n")))))))))))) (define-public glibc-2.30 (package - (inherit glibc) + (inherit glibc-2.31) (version "2.30") (native-inputs ;; This fails with a build error in libc-tls.c when using GCC 10. Use an diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index 4bc3598874..ce4e682200 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -87,6 +87,7 @@ Otherwise assume that there is no password for root." (use-modules (gnu build marionette) (guix build syscalls) (srfi srfi-1) + (srfi srfi-19) (srfi srfi-26) (srfi srfi-64) (ice-9 match)) @@ -196,6 +197,16 @@ info --version") (pk 'services services) '(root #$@(operating-system-shepherd-service-names os))))) + (test-equal "libc honors /etc/localtime" + -7200 ;CEST = GMT+2 + ;; Assume OS is configured to have a CEST timezone. + (let* ((sept-2021 (time-second + (date->time-utc + (make-date 0 0 00 12 01 09 2021 7200))))) + (marionette-eval + `(tm:gmtoff (localtime ,sept-2021)) + marionette))) + (test-equal "/var/log/messages is not world-readable" #o640 ; (begin -- 2.33.0 --=-=-=--