Browse Source

update archive/tar patch for go 1.16

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 4 years ago
parent
commit
f400e84a43
1 changed files with 2 additions and 2 deletions
  1. 2 2
      patches/0001-archive-tar-do-not-populate-user-group-names.patch

+ 2 - 2
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
 @@ -8,10 +8,7 @@ package tar
  
  
  import (
  import (
- 	"os"
+	"io/fs"
 -	"os/user"
 -	"os/user"
  	"runtime"
  	"runtime"
 -	"strconv"
 -	"strconv"
@@ -39,7 +39,7 @@ index 868105f338..9640ed4bab 100644
 -// The downside is that renaming uname or gname by the OS never takes effect.
 -// The downside is that renaming uname or gname by the OS never takes effect.
 -var userMap, groupMap sync.Map // map[int]string
 -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)
  	sys, ok := fi.Sys().(*syscall.Stat_t)
  	if !ok {
  	if !ok {
 @@ -31,22 +24,9 @@ func statUnix(fi os.FileInfo, h *Header) error {
 @@ -31,22 +24,9 @@ func statUnix(fi os.FileInfo, h *Header) error {