summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/file/file_5.45.bb4
-rw-r--r--meta/recipes-devtools/file/files/print_c.patch27
2 files changed, 30 insertions, 1 deletions
diff --git a/meta/recipes-devtools/file/file_5.45.bb b/meta/recipes-devtools/file/file_5.45.bb
index a7127023cb..8477668658 100644
--- a/meta/recipes-devtools/file/file_5.45.bb
+++ b/meta/recipes-devtools/file/file_5.45.bb
@@ -11,7 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=0251eaec1188b20d9a72c502ecfdd
11DEPENDS = "file-replacement-native" 11DEPENDS = "file-replacement-native"
12DEPENDS:class-native = "bzip2-replacement-native" 12DEPENDS:class-native = "bzip2-replacement-native"
13 13
14SRC_URI = "git://github.com/file/file.git;branch=master;protocol=https" 14SRC_URI = "git://github.com/file/file.git;branch=master;protocol=https \
15 file://print_c.patch \
16 "
15 17
16SRCREV = "4cbd5c8f0851201d203755b76cb66ba991ffd8be" 18SRCREV = "4cbd5c8f0851201d203755b76cb66ba991ffd8be"
17S = "${WORKDIR}/git" 19S = "${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
index 0000000000..760813f9c2
--- /dev/null
+++ b/meta/recipes-devtools/file/files/print_c.patch
@@ -0,0 +1,27 @@
1From e329257b8e22362b62e6c930447ef6feadd63f32 Mon Sep 17 00:00:00 2001
2From: Joe Slater <joe.slater@windriver.com>
3Date: Mon, 7 Aug 2023 22:37:19 +0000
4Subject: [PATCH] print.c: initialize timezone data for localtime_r()
5
6The man page for localtime() points out that while it acts
7like tzset() has been called, localtime_r() might not. We
8have a local version of localtime_r() that avoids this, but
9we do not compile it.
10
11Upstream-Status: Submitted [file@astron.com]
12
13Signed-off-by: Joe Slater <joe.slater@windriver.com>
14---
15 src/print.c | 1 +
16 1 file changed, 1 insertion(+)
17
18--- git.orig/src/print.c
19+++ git/src/print.c
20@@ -289,6 +289,7 @@ file_fmtdatetime(char *buf, size_t bsize
21 goto out;
22
23 if (flags & FILE_T_LOCAL) {
24+ tzset();
25 tm = localtime_r(&t, &tmz);
26 } else {
27 tm = gmtime_r(&t, &tmz);