secretservice: use upstream godbus module

contains bug fixes not yet backported to keychain fork Signed-off-by: CrazyMax <[email protected]>
docker · May 29, 2023 · 8e87ceb · 8e87ceb
1 parent 3011b3f
commit 8e87ceb
Show file tree

Hide file tree

Showing 21 changed files with 73 additions and 64 deletions.
diff --git a/go.mod b/go.mod
@@ -4,12 +4,14 @@ go 1.19
 
 require (
 	github.com/danieljoos/wincred v1.2.0
+	github.com/keybase/dbus v0.0.0-20220506165403-5aa21ea2c23a
 	github.com/keybase/go-keychain v0.0.0-20230523030712-b5615109f100
 )
 
 require (
-	github.com/keybase/dbus v0.0.0-20220506165403-5aa21ea2c23a // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	golang.org/x/crypto v0.1.0 // indirect
 	golang.org/x/sys v0.8.0 // indirect
 )
+
+replace github.com/keybase/dbus => github.com/godbus/dbus/v5 v5.1.0
diff --git a/go.sum b/go.sum
@@ -1,8 +1,8 @@
 github.com/danieljoos/wincred v1.2.0 h1:ozqKHaLK0W/ii4KVbbvluM91W2H3Sh0BncbUNPS7jLE=
 github.com/danieljoos/wincred v1.2.0/go.mod h1:FzQLLMKBFdvu+osBrnFODiv32YGwCfx0SkRa/eYHgec=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/keybase/dbus v0.0.0-20220506165403-5aa21ea2c23a h1:K0EAzgzEQHW4Y5lxrmvPMltmlRDzlhLfGmots9EHUTI=
-github.com/keybase/dbus v0.0.0-20220506165403-5aa21ea2c23a/go.mod h1:YPNKjjE7Ubp9dTbnWvsP3HT+hYnY6TfXzubYTBeUxc8=
+github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
+github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/keybase/go-keychain v0.0.0-20230523030712-b5615109f100 h1:rG3VnJUnAWyiv7qYmmdOdSapzz6HM+zb9/uRFr0T5EM=
 github.com/keybase/go-keychain v0.0.0-20230523030712-b5615109f100/go.mod h1:qDHUvIjGZJUtdPtuP4WMu5/U4aVWbFw1MhlkJqCGmCQ=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

diff --git a/vendor/github.com/keybase/dbus/README.md b/vendor/github.com/keybase/dbus/README.md
diff --git a/vendor/github.com/keybase/dbus/call.go b/vendor/github.com/keybase/dbus/call.go
diff --git a/vendor/github.com/keybase/dbus/conn.go b/vendor/github.com/keybase/dbus/conn.go
diff --git a/vendor/github.com/keybase/dbus/conn_darwin.go b/vendor/github.com/keybase/dbus/conn_darwin.go
diff --git a/vendor/github.com/keybase/dbus/conn_other.go b/vendor/github.com/keybase/dbus/conn_other.go
diff --git a/vendor/github.com/keybase/dbus/conn_unix.go b/vendor/github.com/keybase/dbus/conn_unix.go
diff --git a/vendor/github.com/keybase/dbus/conn_windows.go b/vendor/github.com/keybase/dbus/conn_windows.go
diff --git a/vendor/github.com/keybase/dbus/dbus.go b/vendor/github.com/keybase/dbus/dbus.go
diff --git a/vendor/github.com/keybase/dbus/decoder.go b/vendor/github.com/keybase/dbus/decoder.go
diff --git a/vendor/github.com/keybase/dbus/default_handler.go b/vendor/github.com/keybase/dbus/default_handler.go
diff --git a/vendor/github.com/keybase/dbus/match.go b/vendor/github.com/keybase/dbus/match.go
diff --git a/vendor/github.com/keybase/dbus/message.go b/vendor/github.com/keybase/dbus/message.go
diff --git a/vendor/github.com/keybase/dbus/object.go b/vendor/github.com/keybase/dbus/object.go
diff --git a/vendor/github.com/keybase/dbus/sequential_handler.go b/vendor/github.com/keybase/dbus/sequential_handler.go
diff --git a/vendor/github.com/keybase/dbus/sig.go b/vendor/github.com/keybase/dbus/sig.go
diff --git a/vendor/github.com/keybase/dbus/transport_nonce_tcp.go b/vendor/github.com/keybase/dbus/transport_nonce_tcp.go