From acd82300137e7d6c98b8f50276ae7e9230e68b40 Mon Sep 17 00:00:00 2001 From: Kristin Laemmert Date: Tue, 15 Sep 2020 14:14:25 -0400 Subject: [PATCH] vendor: upgrade go-userdirs library to fix openBSD crash (#26249) Fixes #26175 --- go.mod | 2 +- go.sum | 6 ++---- .../apparentlymart/go-userdirs/userdirs/app_stub.go | 2 +- .../apparentlymart/go-userdirs/userdirs/app_unix.go | 2 +- vendor/modules.txt | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 4f79a3f200..a58cbf2908 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible github.com/apparentlymart/go-cidr v1.1.0 github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0 - github.com/apparentlymart/go-userdirs v0.0.0-20190512014041-4a23807e62b9 + github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13 github.com/apparentlymart/go-versions v1.0.0 github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da // indirect diff --git a/go.sum b/go.sum index 2adc08d99f..7de2dc3fa1 100644 --- a/go.sum +++ b/go.sum @@ -72,8 +72,8 @@ github.com/apparentlymart/go-textseg v1.0.0 h1:rRmlIsPEEhUTIKQb7T++Nz/A5Q6C9IuX2 github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk= github.com/apparentlymart/go-textseg/v12 v12.0.0 h1:bNEQyAGak9tojivJNkoqWErVCQbjdL7GzRt3F8NvfJ0= github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec= -github.com/apparentlymart/go-userdirs v0.0.0-20190512014041-4a23807e62b9 h1:GRMI604e1ILyP9b5DTNAZFHx+Vu693kxb9ZBrIA2JQg= -github.com/apparentlymart/go-userdirs v0.0.0-20190512014041-4a23807e62b9/go.mod h1:7kfpUbyCdGJ9fDRCp3fopPQi5+cKNHgTE4ZuNrO71Cw= +github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13 h1:JtuelWqyixKApmXm3qghhZ7O96P6NKpyrlSIe8Rwnhw= +github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13/go.mod h1:7kfpUbyCdGJ9fDRCp3fopPQi5+cKNHgTE4ZuNrO71Cw= github.com/apparentlymart/go-versions v1.0.0 h1:4A4CekGuwDUQqc+uTXCrdb9Y98JZsML2sdfNTeVjsK4= github.com/apparentlymart/go-versions v1.0.0/go.mod h1:YF5j7IQtrOAOnsGkniupEA5bfCjzd7i14yu0shZavyM= github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 h1:7Ip0wMmLHLRJdrloDxZfhMm0xrLXZS8+COSu2bXmEQs= @@ -501,8 +501,6 @@ github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557/go.mod h1:ce1O1j6Ut github.com/zclconf/go-cty v1.0.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= github.com/zclconf/go-cty v1.2.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= -github.com/zclconf/go-cty v1.6.1 h1:wHtZ+LSSQVwUSb+XIJ5E9hgAQxyWATZsAWT+ESJ9dQ0= -github.com/zclconf/go-cty v1.6.1/go.mod h1:VDR4+I79ubFBGm1uJac1226K5yANQFHeauxPBoP54+o= github.com/zclconf/go-cty v1.6.2-0.20200908203537-4ad5e68430d3 h1:iGouBJrrvGf/H4L6a2n7YBCO0FDhq81FEHI4ILDphkw= github.com/zclconf/go-cty v1.6.2-0.20200908203537-4ad5e68430d3/go.mod h1:VDR4+I79ubFBGm1uJac1226K5yANQFHeauxPBoP54+o= github.com/zclconf/go-cty-yaml v1.0.2 h1:dNyg4QLTrv2IfJpm7Wtxi55ed5gLGOlPrZ6kMd51hY0= diff --git a/vendor/github.com/apparentlymart/go-userdirs/userdirs/app_stub.go b/vendor/github.com/apparentlymart/go-userdirs/userdirs/app_stub.go index 3a725b18e7..75321996aa 100644 --- a/vendor/github.com/apparentlymart/go-userdirs/userdirs/app_stub.go +++ b/vendor/github.com/apparentlymart/go-userdirs/userdirs/app_stub.go @@ -1,4 +1,4 @@ -// +build !linux,!windows,!darwin,!aix,!dragonfly,!freebsd,!netbsd,!solaris +// +build !linux,!windows,!darwin,!aix,!dragonfly,!freebsd,!netbsd,!openbsd,!solaris // The above build constraint must contain the negation of all of the build // constraints found in the other app_*.go files, to catch any other OS diff --git a/vendor/github.com/apparentlymart/go-userdirs/userdirs/app_unix.go b/vendor/github.com/apparentlymart/go-userdirs/userdirs/app_unix.go index 3842f94402..44493df3cc 100644 --- a/vendor/github.com/apparentlymart/go-userdirs/userdirs/app_unix.go +++ b/vendor/github.com/apparentlymart/go-userdirs/userdirs/app_unix.go @@ -1,4 +1,4 @@ -// +build linux aix dragonfly freebsd netbsd solaris +// +build linux aix dragonfly freebsd netbsd openbsd solaris package userdirs diff --git a/vendor/modules.txt b/vendor/modules.txt index 4f40990da6..1e627797e6 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -97,7 +97,7 @@ github.com/apparentlymart/go-cidr/cidr github.com/apparentlymart/go-dump/dump # github.com/apparentlymart/go-textseg/v12 v12.0.0 github.com/apparentlymart/go-textseg/v12/textseg -# github.com/apparentlymart/go-userdirs v0.0.0-20190512014041-4a23807e62b9 +# github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13 ## explicit github.com/apparentlymart/go-userdirs/internal/unix github.com/apparentlymart/go-userdirs/macosbase