--- www/minio-client/Makefile (revision 527048) +++ www/minio-client/Makefile (working copy) @@ -2,7 +2,6 @@ PORTNAME= minio-client PORTVERSION= ${GH_TAGNAME:S/RELEASE.//:S/Z//:S/T/-/:S/-/./g} -PORTREVISION= 1 CATEGORIES= www MAINTAINER= jhixson@FreeBSD.org @@ -27,8 +26,8 @@ .endif USE_GITHUB= yes -GHTAG= RELEASE.2020-01-03T20-33-14Z -COMMIT_ID= 6d1a41458bdb1eda4d7064af16dcf4692e2967bb +GHTAG= RELEASE.2020-02-20T23-49-54Z +COMMIT_ID= 415271412666c03c51748f6cb8e73ecbf97dc30b GH_TUPLE= minio:mc:${GHTAG}:DEFAULT \ StackExchange:wmi:cbe66965904d:stackexchange_wmi/vendor/github.com/StackExchange/wmi \ cheggaaa:pb:v1.0.28:cheggaaa_pb/vendor/github.com/cheggaaa/pb \ @@ -38,14 +37,14 @@ fatih:color:v1.7.0:fatih_color/vendor/github.com/fatih/color \ fatih:structs:v1.1.0:fatih_structs/vendor/github.com/fatih/structs \ go-check:check:788fd7840127:go_check_check/vendor/gopkg.in/check.v1 \ - go-ini:ini:v1.48.0:go_ini_ini/vendor/gopkg.in/ini.v1 \ + go-ini:ini:v1.52.0:go_ini_ini/vendor/gopkg.in/ini.v1 \ go-ole:go-ole:v1.2.4:go_ole_go_ole/vendor/github.com/go-ole/go-ole \ go-yaml:yaml:v2.2.4:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ gogo:protobuf:v1.2.1:gogo_protobuf/vendor/github.com/gogo/protobuf \ - golang:crypto:497ca9f6d64f:golang_crypto/vendor/golang.org/x/crypto \ - golang:net:83d349e8ac1a:golang_net/vendor/golang.org/x/net \ + golang:crypto:1d94cc7ab1c6:golang_crypto/vendor/golang.org/x/crypto \ + golang:net:16171245cfb2:golang_net/vendor/golang.org/x/net \ golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \ - golang:sys:33540a1f6037:golang_sys/vendor/golang.org/x/sys \ + golang:sys:12a6c2dcc1e4:golang_sys/vendor/golang.org/x/sys \ golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \ google:go-genproto:24fa4b261c55:google_go_genproto/vendor/google.golang.org/genproto \ grpc:grpc-go:v1.22.0:grpc_grpc_go/vendor/google.golang.org/grpc \ @@ -59,8 +58,8 @@ mattn:go-isatty:v0.0.7:mattn_go_isatty/vendor/github.com/mattn/go-isatty \ mattn:go-runewidth:v0.0.5:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \ minio:cli:v1.22.0:minio_cli/vendor/github.com/minio/cli \ - minio:minio-go:a5786a9c2a5b:minio_minio_go/vendor/github.com/minio/minio-go/v6 \ - minio:minio:0b7bd024fb30:minio_minio/vendor/github.com/minio/minio \ + minio:minio-go:112c09f43c78:minio_minio_go/vendor/github.com/minio/minio-go/v6 \ + minio:minio:b849fd7a756d:minio_minio/vendor/github.com/minio/minio \ minio:sha256-simd:v0.1.1:minio_sha256_simd/vendor/github.com/minio/sha256-simd \ mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \ ncw:directio:v1.0.5:ncw_directio/vendor/github.com/ncw/directio \ @@ -69,14 +68,14 @@ posener:complete:6ffe496ea953:posener_complete/vendor/github.com/posener/complete \ rjeczalik:notify:v0.9.2:rjeczalik_notify/vendor/github.com/rjeczalik/notify \ secure-io:sio-go:v0.3.0:secure_io_sio_go/vendor/github.com/secure-io/sio-go \ - shirou:gopsutil:v2.20.1:shirou_gopsutil/vendor/github.com/shirou/gopsutil + shirou:gopsutil:v2.18.12:shirou_gopsutil/vendor/github.com/shirou/gopsutil PLIST_FILES= bin/${MC} -GO_BUILDFLAGS= -ldflags=' \ +GO_BUILDFLAGS= -ldflags=" \ -X github.com/minio/mc/cmd.Version=${GH_TAGNAME:C/RELEASE\.//:C|(..)-(..)-(..)Z|\1:\2:\3Z|} \ -X github.com/minio/mc/cmd.ReleaseTag=${GH_TAGNAME} \ -X github.com/minio/mc/cmd.CommitID=${COMMIT_ID} \ - -X github.com/minio/mc/cmd.GOPATH=${WRKSRC} -s -w' + -X github.com/minio/mc/cmd.GOPATH=${WRKSRC} -s -w" GO_TARGET= :${MC} .include --- www/minio-client/distinfo (revision 527048) +++ www/minio-client/distinfo (working copy) @@ -1,6 +1,6 @@ -TIMESTAMP = 1580656828 -SHA256 (minio-mc-2020.01.03.20.33.14-RELEASE.2020-01-03T20-33-14Z_GH0.tar.gz) = bb76741e2bc88f805af6d7764aed4b06d55aae68a6a34fd1b9e3bd89c8980d23 -SIZE (minio-mc-2020.01.03.20.33.14-RELEASE.2020-01-03T20-33-14Z_GH0.tar.gz) = 348931 +TIMESTAMP = 1582580981 +SHA256 (minio-mc-2020.02.20.23.49.54-RELEASE.2020-02-20T23-49-54Z_GH0.tar.gz) = 738958cca37386bd0400f165e2524dd59a38de612033927703300e41f193319b +SIZE (minio-mc-2020.02.20.23.49.54-RELEASE.2020-02-20T23-49-54Z_GH0.tar.gz) = 346959 SHA256 (StackExchange-wmi-cbe66965904d_GH0.tar.gz) = 14dbc4af6952acdb1b941d002cd36fd2299aa6b3144cbcbddbb032c47f816da5 SIZE (StackExchange-wmi-cbe66965904d_GH0.tar.gz) = 11279 SHA256 (cheggaaa-pb-v1.0.28_GH0.tar.gz) = f745c5636d3fb59bffab5f9d2a745a94a9608166c20c90936fc66848a5e816e6 @@ -17,8 +17,8 @@ SIZE (fatih-structs-v1.1.0_GH0.tar.gz) = 14444 SHA256 (go-check-check-788fd7840127_GH0.tar.gz) = b7c9de01f3ca7111d889f30f2bbcc36eda4d07c09f032aaba83e34a324146bae SIZE (go-check-check-788fd7840127_GH0.tar.gz) = 31597 -SHA256 (go-ini-ini-v1.48.0_GH0.tar.gz) = 4ac78ccf639d28331d446908df6365efd2737fef3e8b19a02c95dd0997cccccf -SIZE (go-ini-ini-v1.48.0_GH0.tar.gz) = 37076 +SHA256 (go-ini-ini-v1.52.0_GH0.tar.gz) = 56bce700d83c60ec5b27249fe7e18912f87f63a91d5e8d5cd07e2eb7823a300b +SIZE (go-ini-ini-v1.52.0_GH0.tar.gz) = 44304 SHA256 (go-ole-go-ole-v1.2.4_GH0.tar.gz) = 1f30df494ffc50c133c5f276f64c94820046b1a3a660c0cca49a5c3a8106db11 SIZE (go-ole-go-ole-v1.2.4_GH0.tar.gz) = 51655 SHA256 (go-yaml-yaml-v2.2.4_GH0.tar.gz) = 9004c9709200d52ef6e5c69af3f71f3adb1a2b7e884ea7597f306bf54b1f007c @@ -25,14 +25,14 @@ SIZE (go-yaml-yaml-v2.2.4_GH0.tar.gz) = 72209 SHA256 (gogo-protobuf-v1.2.1_GH0.tar.gz) = 99e423905ba8921e86817607a5294ffeedb66fdd4a85efce5eb2848f715fdb3a SIZE (gogo-protobuf-v1.2.1_GH0.tar.gz) = 2017393 -SHA256 (golang-crypto-497ca9f6d64f_GH0.tar.gz) = 804e2779ac334f8933c0fc68936536131cb0899d15f64132d6541fa9f333db8d -SIZE (golang-crypto-497ca9f6d64f_GH0.tar.gz) = 1711629 -SHA256 (golang-net-83d349e8ac1a_GH0.tar.gz) = 5752c376bc6383bf2055281336101c062b881f17ded2e960d718c8256023f9c7 -SIZE (golang-net-83d349e8ac1a_GH0.tar.gz) = 1103298 +SHA256 (golang-crypto-1d94cc7ab1c6_GH0.tar.gz) = 146d8d5e90d01c87497780049530e4ba64c77ad218fced0d0be6625cb61ce9cf +SIZE (golang-crypto-1d94cc7ab1c6_GH0.tar.gz) = 1725039 +SHA256 (golang-net-16171245cfb2_GH0.tar.gz) = 941e5a2afb85a131b42f8503fe1a760447a40a0f26539c11ca489f4f24a77e77 +SIZE (golang-net-16171245cfb2_GH0.tar.gz) = 1172446 SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65 SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285 -SHA256 (golang-sys-33540a1f6037_GH0.tar.gz) = 09ebdf007413c2eaddce123137443d08d1848be410c58896e772f0481ec385d5 -SIZE (golang-sys-33540a1f6037_GH0.tar.gz) = 1497659 +SHA256 (golang-sys-12a6c2dcc1e4_GH0.tar.gz) = 5350f98d232647593d1a926161325f4d1ca4632a7c9e6540a04ca407a7dd768f +SIZE (golang-sys-12a6c2dcc1e4_GH0.tar.gz) = 1536898 SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22 SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069 SHA256 (google-go-genproto-24fa4b261c55_GH0.tar.gz) = 96481b64c5971de2dd22d7c6f764d2acbeb4cd85ab6166856284115c3f99238c @@ -59,10 +59,10 @@ SIZE (mattn-go-runewidth-v0.0.5_GH0.tar.gz) = 16014 SHA256 (minio-cli-v1.22.0_GH0.tar.gz) = f91306a2f1f434e9c31d737914288661286b329a3008f42b7212c6c9f15c3fca SIZE (minio-cli-v1.22.0_GH0.tar.gz) = 58896 -SHA256 (minio-minio-go-a5786a9c2a5b_GH0.tar.gz) = 86ac8a84670cc2f8f605903058a330a3539c5d8656dda1943bc3664e8a4500fd -SIZE (minio-minio-go-a5786a9c2a5b_GH0.tar.gz) = 200969 -SHA256 (minio-minio-0b7bd024fb30_GH0.tar.gz) = d0a16263017c5728abe59f9d506312971e4bf56f958caf7a5c1ca03f11f9086c -SIZE (minio-minio-0b7bd024fb30_GH0.tar.gz) = 7145332 +SHA256 (minio-minio-go-112c09f43c78_GH0.tar.gz) = 128f09e41293d26cdecd605c164b8de8ce2bf28bc8f4f057464c235447c40796 +SIZE (minio-minio-go-112c09f43c78_GH0.tar.gz) = 205905 +SHA256 (minio-minio-b849fd7a756d_GH0.tar.gz) = 6348985f8c236bae4d015a36acf9b1e0a190dff69f96da3a5e367d7360560176 +SIZE (minio-minio-b849fd7a756d_GH0.tar.gz) = 7157105 SHA256 (minio-sha256-simd-v0.1.1_GH0.tar.gz) = bc1f1e80dc1291f6d26933658155488cc895f6b8a4944479d462cf5a79112109 SIZE (minio-sha256-simd-v0.1.1_GH0.tar.gz) = 65024 SHA256 (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 646671c73a84a8dfb4a5a76b80c7b63549ffefa906524d45077301bc7da76600 @@ -79,5 +79,5 @@ SIZE (rjeczalik-notify-v0.9.2_GH0.tar.gz) = 56851 SHA256 (secure-io-sio-go-v0.3.0_GH0.tar.gz) = 36effba2f27efdcd190725417e094fda16b89199c64ad8947020c1215de19d37 SIZE (secure-io-sio-go-v0.3.0_GH0.tar.gz) = 21831 -SHA256 (shirou-gopsutil-v2.20.1_GH0.tar.gz) = f2afad4c7b4be33bafb78e577fd90dfbf46a63eafad480623aead5dd73eec315 -SIZE (shirou-gopsutil-v2.20.1_GH0.tar.gz) = 133895 +SHA256 (shirou-gopsutil-v2.18.12_GH0.tar.gz) = 70e291291c1e2363c1b8d7656c394cbfc8a67c93eb95a861abdcd7644562afba +SIZE (shirou-gopsutil-v2.18.12_GH0.tar.gz) = 117507 --- www/minio-client/files/patch-pkg_disk_stat__freebsd.go (revision 527048) +++ www/minio-client/files/patch-pkg_disk_stat__freebsd.go (working copy) @@ -1,10 +1,10 @@ ---- pkg/disk/stat_freebsd.go.orig 2020-01-06 18:29:51 UTC +--- pkg/disk/stat_freebsd.go.orig 2020-02-24 22:16:58 UTC +++ pkg/disk/stat_freebsd.go -@@ -0,0 +1,68 @@ +@@ -0,0 +1,65 @@ +// +build freebsd + +/* -+ * MinIO Cloud Storage, (C) 2019 MinIO, Inc. ++ * MinIO Cloud Storage, (C) 2019-2020 MinIO, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. @@ -31,7 +31,6 @@ +// GetFileSystemAttrs return the file system attribute as string; containing mode, +// uid, gid, uname, Gname, atime, mtime, ctime and md5 +func GetFileSystemAttrs(file string) (string, error) { -+ + st := syscall.Stat_t{} + err := syscall.Stat(file, &st) + if err != nil { @@ -46,12 +45,11 @@ + fileAttr.WriteString("/gid:") + fileAttr.WriteString(strconv.Itoa(int(st.Gid))) + -+ fileAttr.WriteString("/gname:") + g, err := user.LookupGroupId(strconv.FormatUint(uint64(st.Gid), 10)) -+ if err != nil { -+ return "", err ++ if err == nil { ++ fileAttr.WriteString("/gname:") ++ fileAttr.WriteString(g.Name) + } -+ fileAttr.WriteString(g.Name) + + fileAttr.WriteString("/mode:") + fileAttr.WriteString(strconv.Itoa(int(st.Mode))) @@ -60,12 +58,11 @@ + fileAttr.WriteString("/uid:") + fileAttr.WriteString(strconv.Itoa(int(st.Uid))) + -+ fileAttr.WriteString("/uname:") -+ i, err := user.LookupId(strconv.FormatUint(uint64(st.Uid), 10)) -+ if err != nil { -+ return "", err ++ u, err := user.LookupId(strconv.FormatUint(uint64(st.Uid), 10)) ++ if err == nil { ++ fileAttr.WriteString("/uname:") ++ fileAttr.WriteString(u.Username) + } -+ fileAttr.WriteString(i.Username) + + return fileAttr.String(), nil +}