From 8c801194b548d1f2d6f47dfcdd5611ae72e29759 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 12 Oct 2021 14:01:56 -0400 Subject: 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. Signed-off-by: Maxim Cournoyer --- gnu/tests/base.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/tests/base.scm') diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index 9198a3e267..38d4317e52 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -87,6 +87,7 @@ (define test (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 @@ (define marionette (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 -- cgit v1.2.3