From 7c6645b32b8fae91a2c82cc06ef4c0351895e6c5 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 20 May 2021 11:19:22 +0200 Subject: [PATCH] update archive/tar patch for go 1.16 Signed-off-by: Sebastiaan van Stijn (cherry picked from commit f400e84a43817e0977a8a2980e75ed8050a13ce0) Signed-off-by: Sebastiaan van Stijn --- .../0001-archive-tar-do-not-populate-user-group-names.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/0001-archive-tar-do-not-populate-user-group-names.patch b/patches/0001-archive-tar-do-not-populate-user-group-names.patch index 0af43b3fcb..c5599b6102 100644 --- a/patches/0001-archive-tar-do-not-populate-user-group-names.patch +++ b/patches/0001-archive-tar-do-not-populate-user-group-names.patch @@ -23,7 +23,7 @@ index 868105f338..9640ed4bab 100644 @@ -8,10 +8,7 @@ package tar import ( - "os" + "io/fs" - "os/user" "runtime" - "strconv" @@ -39,7 +39,7 @@ index 868105f338..9640ed4bab 100644 -// The downside is that renaming uname or gname by the OS never takes effect. -var userMap, groupMap sync.Map // map[int]string - - func statUnix(fi os.FileInfo, h *Header) error { + func statUnix(fi fs.FileInfo, h *Header) error { sys, ok := fi.Sys().(*syscall.Stat_t) if !ok { @@ -31,22 +24,9 @@ func statUnix(fi os.FileInfo, h *Header) error {