From 3cffa34a9c36fd65558b26f3e9832b4b96941377 Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Tue, 22 Aug 2023 15:28:00 -0700 Subject: file: fix call to localtime_r() 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. (From OE-Core rev: 791145f3064d7807630d3591b9e7c7b2dc37152c) Signed-off-by: Joe Slater Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- meta/recipes-devtools/file/file_5.45.bb | 4 +++- meta/recipes-devtools/file/files/print_c.patch | 27 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/file/files/print_c.patch (limited to 'meta/recipes-devtools/file') 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 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 index 0000000000..760813f9c2 --- /dev/null +++ b/meta/recipes-devtools/file/files/print_c.patch @@ -0,0 +1,27 @@ +From e329257b8e22362b62e6c930447ef6feadd63f32 Mon Sep 17 00:00:00 2001 +From: Joe Slater +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 +--- + 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); -- cgit v1.2.3-54-g00ecf