vendor dbus fork (keybase#17810)

tendi09 · Jun 4, 2019 · c339db0 · c339db0
1 parent 5139371
commit c339db0
Show file tree

Hide file tree

Showing 31 changed files with 26 additions and 35 deletions.
diff --git a/go/libkb/secret_store_secretservice.go b/go/libkb/secret_store_secretservice.go
@@ -14,8 +14,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	dbus "github.com/guelfey/go.dbus"
 	secsrv "github.com/keybase/go-keychain/secretservice"
+	dbus "github.com/keybase/go.dbus"
 	"golang.org/x/crypto/hkdf"
 )
 

diff --git a/go/vendor/github.com/keybase/go-keychain/README.md b/go/vendor/github.com/keybase/go-keychain/README.md
diff --git a/go/vendor/github.com/keybase/go-keychain/corefoundation_1.10.go b/go/vendor/github.com/keybase/go-keychain/corefoundation_1.10.go
diff --git a/go/vendor/github.com/keybase/go-keychain/corefoundation_pre1.10.go b/go/vendor/github.com/keybase/go-keychain/corefoundation_pre1.10.go
diff --git a/go/vendor/github.com/keybase/go-keychain/datetime.go b/go/vendor/github.com/keybase/go-keychain/datetime.go
diff --git a/go/vendor/github.com/keybase/go-keychain/secretservice/secretservice.go b/go/vendor/github.com/keybase/go-keychain/secretservice/secretservice.go
diff --git a/go/vendor/github.com/keybase/go-keychain/staticcheck.conf b/go/vendor/github.com/keybase/go-keychain/staticcheck.conf
diff --git a/go/vendor/github.com/guelfey/go.dbus/LICENSE → go/vendor/github.com/keybase/go.dbus/LICENSE b/go/vendor/github.com/guelfey/go.dbus/LICENSE → go/vendor/github.com/keybase/go.dbus/LICENSE
diff --git a/...ithub.com/guelfey/go.dbus/README.markdown → ...ithub.com/keybase/go.dbus/README.markdown b/...ithub.com/guelfey/go.dbus/README.markdown → ...ithub.com/keybase/go.dbus/README.markdown
diff --git a/go/vendor/github.com/guelfey/go.dbus/auth.go → go/vendor/github.com/keybase/go.dbus/auth.go b/go/vendor/github.com/guelfey/go.dbus/auth.go → go/vendor/github.com/keybase/go.dbus/auth.go
diff --git a/...thub.com/guelfey/go.dbus/auth_external.go → ...thub.com/keybase/go.dbus/auth_external.go b/...thub.com/guelfey/go.dbus/auth_external.go → ...thub.com/keybase/go.dbus/auth_external.go
diff --git a/...r/github.com/guelfey/go.dbus/auth_sha1.go → ...r/github.com/keybase/go.dbus/auth_sha1.go b/...r/github.com/guelfey/go.dbus/auth_sha1.go → ...r/github.com/keybase/go.dbus/auth_sha1.go
diff --git a/go/vendor/github.com/guelfey/go.dbus/call.go → go/vendor/github.com/keybase/go.dbus/call.go b/go/vendor/github.com/guelfey/go.dbus/call.go → go/vendor/github.com/keybase/go.dbus/call.go
diff --git a/go/vendor/github.com/guelfey/go.dbus/conn.go → go/vendor/github.com/keybase/go.dbus/conn.go b/go/vendor/github.com/guelfey/go.dbus/conn.go → go/vendor/github.com/keybase/go.dbus/conn.go
diff --git a/...github.com/guelfey/go.dbus/conn_darwin.go → ...github.com/keybase/go.dbus/conn_darwin.go b/...github.com/guelfey/go.dbus/conn_darwin.go → ...github.com/keybase/go.dbus/conn_darwin.go
diff --git a/.../github.com/guelfey/go.dbus/conn_other.go → .../github.com/keybase/go.dbus/conn_other.go b/.../github.com/guelfey/go.dbus/conn_other.go → .../github.com/keybase/go.dbus/conn_other.go
diff --git a/go/vendor/github.com/guelfey/go.dbus/dbus.go → go/vendor/github.com/keybase/go.dbus/dbus.go b/go/vendor/github.com/guelfey/go.dbus/dbus.go → go/vendor/github.com/keybase/go.dbus/dbus.go
diff --git a/...dor/github.com/guelfey/go.dbus/decoder.go → ...dor/github.com/keybase/go.dbus/decoder.go b/...dor/github.com/guelfey/go.dbus/decoder.go → ...dor/github.com/keybase/go.dbus/decoder.go
diff --git a/go/vendor/github.com/guelfey/go.dbus/doc.go → go/vendor/github.com/keybase/go.dbus/doc.go b/go/vendor/github.com/guelfey/go.dbus/doc.go → go/vendor/github.com/keybase/go.dbus/doc.go
diff --git a/...dor/github.com/guelfey/go.dbus/encoder.go → ...dor/github.com/keybase/go.dbus/encoder.go b/...dor/github.com/guelfey/go.dbus/encoder.go → ...dor/github.com/keybase/go.dbus/encoder.go
diff --git a/...ndor/github.com/guelfey/go.dbus/export.go → ...ndor/github.com/keybase/go.dbus/export.go b/...ndor/github.com/guelfey/go.dbus/export.go → ...ndor/github.com/keybase/go.dbus/export.go
diff --git a/...dor/github.com/guelfey/go.dbus/message.go → ...dor/github.com/keybase/go.dbus/message.go b/...dor/github.com/guelfey/go.dbus/message.go → ...dor/github.com/keybase/go.dbus/message.go
diff --git a/go/vendor/github.com/guelfey/go.dbus/sig.go → go/vendor/github.com/keybase/go.dbus/sig.go b/go/vendor/github.com/guelfey/go.dbus/sig.go → go/vendor/github.com/keybase/go.dbus/sig.go
diff --git a/...b.com/guelfey/go.dbus/transport_darwin.go → ...b.com/keybase/go.dbus/transport_darwin.go b/...b.com/guelfey/go.dbus/transport_darwin.go → ...b.com/keybase/go.dbus/transport_darwin.go
diff --git a/....com/guelfey/go.dbus/transport_generic.go → ....com/keybase/go.dbus/transport_generic.go b/....com/guelfey/go.dbus/transport_generic.go → ....com/keybase/go.dbus/transport_generic.go
diff --git a/...hub.com/guelfey/go.dbus/transport_unix.go → ...hub.com/keybase/go.dbus/transport_unix.go b/...hub.com/guelfey/go.dbus/transport_unix.go → ...hub.com/keybase/go.dbus/transport_unix.go
diff --git a/...com/guelfey/go.dbus/transport_unixcred.go → ...com/keybase/go.dbus/transport_unixcred.go b/...com/guelfey/go.dbus/transport_unixcred.go → ...com/keybase/go.dbus/transport_unixcred.go
diff --git a/...dor/github.com/guelfey/go.dbus/variant.go → ...dor/github.com/keybase/go.dbus/variant.go b/...dor/github.com/guelfey/go.dbus/variant.go → ...dor/github.com/keybase/go.dbus/variant.go
diff --git a/...thub.com/guelfey/go.dbus/variant_lexer.go → ...thub.com/keybase/go.dbus/variant_lexer.go b/...thub.com/guelfey/go.dbus/variant_lexer.go → ...thub.com/keybase/go.dbus/variant_lexer.go
diff --git a/...hub.com/guelfey/go.dbus/variant_parser.go → ...hub.com/keybase/go.dbus/variant_parser.go b/...hub.com/guelfey/go.dbus/variant_parser.go → ...hub.com/keybase/go.dbus/variant_parser.go
diff --git a/go/vendor/vendor.json b/go/vendor/vendor.json
@@ -390,12 +390,6 @@
 			"revision": "eaa750b9bf4dcb7cb20454be850613b66cda3273",
 			"revisionTime": "2015-06-08T14:53:52-07:00"
 		},
-		{
-			"checksumSHA1": "37mmUDpo8//7mhcLc9rnsD8OfrE=",
-			"path": "github.com/guelfey/go.dbus",
-			"revision": "f6a3a2366cc39b8479cadc499d3c735fb10fbdda",
-			"revisionTime": "2013-11-13T12:16:18Z"
-		},
 		{
 			"checksumSHA1": "degm0JimzEvQjOTMaHOO6QzXNMI=",
 			"path": "github.com/hashicorp/golang-lru",
@@ -637,16 +631,16 @@
 			"revisionTime": "2018-08-01T17:02:38Z"
 		},
 		{
-			"checksumSHA1": "mzJSAXuGoLPulltCYgqEo9AVuvQ=",
+			"checksumSHA1": "g0PJMcZdWKAs1cwRwracYXf2omQ=",
 			"path": "github.com/keybase/go-keychain",
-			"revision": "da9bb486ccd551aeb1929211500fc4a0bcb62a56",
-			"revisionTime": "2019-03-11T21:27:40Z"
+			"revision": "948cd561218ecd8f9c4548b09ce9d17fcd4b1ba5",
+			"revisionTime": "2019-06-04T18:42:05Z"
 		},
 		{
-			"checksumSHA1": "U4UI9YzOjjzb5wNqyLfGfZBzvcc=",
+			"checksumSHA1": "U/MVaUmN88p7XzeVia6QNUkSW64=",
 			"path": "github.com/keybase/go-keychain/secretservice",
-			"revision": "18419f45091c941bd31260f957523063206554ef",
-			"revisionTime": "2019-04-10T17:11:33Z"
+			"revision": "948cd561218ecd8f9c4548b09ce9d17fcd4b1ba5",
+			"revisionTime": "2019-06-04T18:42:05Z"
 		},
 		{
 			"checksumSHA1": "w0V3FTmunObVwElsp+UUASB06+c=",
@@ -714,6 +708,12 @@
 			"revision": "b1d96ab97b58dcaf6fd4e4c21cdf73a5bc3a388e",
 			"revisionTime": "2018-09-13T22:10:37Z"
 		},
+		{
+			"checksumSHA1": "e4+s/4oTQwUd2sfvU2bh2fxYnNI=",
+			"path": "github.com/keybase/go.dbus",
+			"revision": "7ce83444282d459dcd3724fa5e2721d1662c5dc0",
+			"revisionTime": "2019-06-04T18:23:40Z"
+		},
 		{
 			"checksumSHA1": "6siKrD8lFPCe0S3OF9E4wuRgUAo=",
 			"path": "github.com/keybase/golang-ico",