From 81c2dfda1e36d6ecc16ea1d7d76e624ddd2f8f09 Mon Sep 17 00:00:00 2001
From: Javier Maestro <jjmaestro@ieee.org>
Date: Thu, 12 Dec 2024 22:23:39 +0000
Subject: [PATCH] fix: locale time override (#133)

Fixes #110

The locale rule has a time argument that wasn't being used in the
locale.sh script.

Fix plus test exercising it.
---
 distroless/private/locale.sh |  4 ++-
 examples/locale/BUILD.bazel  | 47 +++++++++++++++++++-----------------
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/distroless/private/locale.sh b/distroless/private/locale.sh
index 9d0130f..9b90d3e 100755
--- a/distroless/private/locale.sh
+++ b/distroless/private/locale.sh
@@ -14,4 +14,6 @@ shift 4
 
 tmp=$(mktemp -d)
 "$bsdtar" -xf "$package_path" $@ -C "$tmp"
-"$bsdtar" -cf - $@ --format=mtree --options '!gname,!uname,!sha1,!nlink,!time' "@$package_path" |  sed 's/$/ time=0.0/' | "$bsdtar" --gzip --options 'gzip:!timestamp' -cf "$out" -C "$tmp/" @-
\ No newline at end of file
+"$bsdtar" -cf - $@ --format=mtree --options '!gname,!uname,!sha1,!nlink,!time' "@$package_path" |
+    sed 's/$/ time='"$time"'/' |
+    "$bsdtar" --gzip --options 'gzip:!timestamp' -cf "$out" -C "$tmp/" @-
diff --git a/examples/locale/BUILD.bazel b/examples/locale/BUILD.bazel
index 5c41fca..df31630 100644
--- a/examples/locale/BUILD.bazel
+++ b/examples/locale/BUILD.bazel
@@ -1,6 +1,8 @@
 load("//distroless:defs.bzl", "locale")
 load("//distroless/tests:asserts.bzl", "assert_tar_mtree")
 
+EPOCH = 123
+
 locale(
     name = "bullseye",
     charset = "C.UTF-8",
@@ -39,6 +41,7 @@ assert_tar_mtree(
 locale(
     name = "bookworm",
     package = "@example-bookworm-libc-bin//:data.tar.xz",
+    time = str(EPOCH),
 )
 
 assert_tar_mtree(
@@ -46,26 +49,26 @@ assert_tar_mtree(
     actual = "bookworm",
     expected = """\
 #mtree
-./usr time=0.0 mode=755 gid=0 uid=0 type=dir
-./usr/lib time=0.0 mode=755 gid=0 uid=0 type=dir
-./usr/lib/locale time=0.0 mode=755 gid=0 uid=0 type=dir
-./usr/lib/locale/C.utf8 time=0.0 mode=755 gid=0 uid=0 type=dir
-./usr/lib/locale/C.utf8/LC_ADDRESS time=0.0 mode=644 gid=0 uid=0 type=file size=127
-./usr/lib/locale/C.utf8/LC_COLLATE time=0.0 mode=644 gid=0 uid=0 type=file size=1406
-./usr/lib/locale/C.utf8/LC_CTYPE time=0.0 mode=644 gid=0 uid=0 type=file size=353616
-./usr/lib/locale/C.utf8/LC_IDENTIFICATION time=0.0 mode=644 gid=0 uid=0 type=file size=258
-./usr/lib/locale/C.utf8/LC_MEASUREMENT time=0.0 mode=644 gid=0 uid=0 type=file size=23
-./usr/lib/locale/C.utf8/LC_MONETARY time=0.0 mode=644 gid=0 uid=0 type=file size=270
-./usr/lib/locale/C.utf8/LC_NAME time=0.0 mode=644 gid=0 uid=0 type=file size=62
-./usr/lib/locale/C.utf8/LC_NUMERIC time=0.0 mode=644 gid=0 uid=0 type=file size=50
-./usr/lib/locale/C.utf8/LC_PAPER time=0.0 mode=644 gid=0 uid=0 type=file size=34
-./usr/lib/locale/C.utf8/LC_TELEPHONE time=0.0 mode=644 gid=0 uid=0 type=file size=47
-./usr/lib/locale/C.utf8/LC_TIME time=0.0 mode=644 gid=0 uid=0 type=file size=3360
-./usr/lib/locale/C.utf8/LC_MESSAGES time=0.0 mode=755 gid=0 uid=0 type=dir
-./usr/lib/locale/C.utf8/LC_MESSAGES/SYS_LC_MESSAGES time=0.0 mode=644 gid=0 uid=0 type=file size=48
-./usr/share time=0.0 mode=755 gid=0 uid=0 type=dir
-./usr/share/doc time=0.0 mode=755 gid=0 uid=0 type=dir
-./usr/share/doc/libc-bin time=0.0 mode=755 gid=0 uid=0 type=dir
-./usr/share/doc/libc-bin/copyright time=0.0 mode=644 gid=0 uid=0 type=file size=25467
-""",
+./usr time={time}.0 mode=755 gid=0 uid=0 type=dir
+./usr/lib time={time}.0 mode=755 gid=0 uid=0 type=dir
+./usr/lib/locale time={time}.0 mode=755 gid=0 uid=0 type=dir
+./usr/lib/locale/C.utf8 time={time}.0 mode=755 gid=0 uid=0 type=dir
+./usr/lib/locale/C.utf8/LC_ADDRESS time={time}.0 mode=644 gid=0 uid=0 type=file size=127
+./usr/lib/locale/C.utf8/LC_COLLATE time={time}.0 mode=644 gid=0 uid=0 type=file size=1406
+./usr/lib/locale/C.utf8/LC_CTYPE time={time}.0 mode=644 gid=0 uid=0 type=file size=353616
+./usr/lib/locale/C.utf8/LC_IDENTIFICATION time={time}.0 mode=644 gid=0 uid=0 type=file size=258
+./usr/lib/locale/C.utf8/LC_MEASUREMENT time={time}.0 mode=644 gid=0 uid=0 type=file size=23
+./usr/lib/locale/C.utf8/LC_MONETARY time={time}.0 mode=644 gid=0 uid=0 type=file size=270
+./usr/lib/locale/C.utf8/LC_NAME time={time}.0 mode=644 gid=0 uid=0 type=file size=62
+./usr/lib/locale/C.utf8/LC_NUMERIC time={time}.0 mode=644 gid=0 uid=0 type=file size=50
+./usr/lib/locale/C.utf8/LC_PAPER time={time}.0 mode=644 gid=0 uid=0 type=file size=34
+./usr/lib/locale/C.utf8/LC_TELEPHONE time={time}.0 mode=644 gid=0 uid=0 type=file size=47
+./usr/lib/locale/C.utf8/LC_TIME time={time}.0 mode=644 gid=0 uid=0 type=file size=3360
+./usr/lib/locale/C.utf8/LC_MESSAGES time={time}.0 mode=755 gid=0 uid=0 type=dir
+./usr/lib/locale/C.utf8/LC_MESSAGES/SYS_LC_MESSAGES time={time}.0 mode=644 gid=0 uid=0 type=file size=48
+./usr/share time={time}.0 mode=755 gid=0 uid=0 type=dir
+./usr/share/doc time={time}.0 mode=755 gid=0 uid=0 type=dir
+./usr/share/doc/libc-bin time={time}.0 mode=755 gid=0 uid=0 type=dir
+./usr/share/doc/libc-bin/copyright time={time}.0 mode=644 gid=0 uid=0 type=file size=25467
+""".format(time = EPOCH),
 )