]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
file: fix call to localtime_r()
authorJoe Slater <joe.slater@windriver.com>
Tue, 22 Aug 2023 22:28:00 +0000 (15:28 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 29 Aug 2023 08:40:55 +0000 (09:40 +0100)
Depending on the version of glibc, localtime_r() must
be preceded by a call to tzset() or it will ignore any
value of TZ in the environment.  This problem will only
be seen when building file-native on outdated hosts.

Signed-off-by: Joe Slater <joe.slater@windriver.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-devtools/file/file_5.45.bb
meta/recipes-devtools/file/files/print_c.patch [new file with mode: 0644]

index a7127023cbfc435ef305279f9adc5ea5697de1a2..8477668658d1d3fa178a761911450fbe020f7a84 100644 (file)
@@ -11,7 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=0251eaec1188b20d9a72c502ecfdd
 DEPENDS = "file-replacement-native"
 DEPENDS:class-native = "bzip2-replacement-native"
 
-SRC_URI = "git://github.com/file/file.git;branch=master;protocol=https"
+SRC_URI = "git://github.com/file/file.git;branch=master;protocol=https \
+           file://print_c.patch \
+          "
 
 SRCREV = "4cbd5c8f0851201d203755b76cb66ba991ffd8be"
 S = "${WORKDIR}/git"
diff --git a/meta/recipes-devtools/file/files/print_c.patch b/meta/recipes-devtools/file/files/print_c.patch
new file mode 100644 (file)
index 0000000..760813f
--- /dev/null
@@ -0,0 +1,27 @@
+From e329257b8e22362b62e6c930447ef6feadd63f32 Mon Sep 17 00:00:00 2001
+From: Joe Slater <joe.slater@windriver.com>
+Date: Mon, 7 Aug 2023 22:37:19 +0000
+Subject: [PATCH] print.c: initialize timezone data for localtime_r()
+
+The man page for localtime() points out that while it acts
+like tzset() has been called, localtime_r() might not.  We
+have a local version of localtime_r() that avoids this, but
+we do not compile it.
+
+Upstream-Status: Submitted [file@astron.com]
+
+Signed-off-by: Joe Slater <joe.slater@windriver.com>
+---
+ src/print.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- git.orig/src/print.c
++++ git/src/print.c
+@@ -289,6 +289,7 @@ file_fmtdatetime(char *buf, size_t bsize
+               goto out;
+       if (flags & FILE_T_LOCAL) {
++              tzset();
+               tm = localtime_r(&t, &tmz);
+       } else {
+               tm = gmtime_r(&t, &tmz);