Update github.com/godbus/dbus to latest compatible version

Still not to v5, as this requires updating github.com/coreos/go-systemd. Signed-off-by: Mateusz Gozdek <mateusz@kinvolk.io>
flatcar · Nov 17, 2020 · a684af3 · a684af3
1 parent ff2b5e3
commit a684af3
Show file tree

Hide file tree

Showing 28 changed files with 1,501 additions and 393 deletions.
diff --git a/go.mod b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/coreos/etcd/client v0.0.0-00010101000000-000000000000
 	github.com/coreos/go-systemd v0.0.0-20141015001424-e3e4f602334e
 	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f
-	github.com/godbus/dbus v0.0.0-20141007185835-25a4b8ca48c6
+	github.com/godbus/dbus v4.1.0+incompatible
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/rkt/rkt v1.30.0
 	golang.org/x/net v0.0.0-20201031054903-ff519b6c9102

diff --git a/go.sum b/go.sum
@@ -2,8 +2,8 @@ github.com/coreos/go-systemd v0.0.0-20141015001424-e3e4f602334e h1:UL9vt+QLxHxLG
 github.com/coreos/go-systemd v0.0.0-20141015001424-e3e4f602334e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/godbus/dbus v0.0.0-20141007185835-25a4b8ca48c6 h1:ktNNkmZO+GEJH27RAe03xbhUuXOFgAr5p59K25XYyhk=
-github.com/godbus/dbus v0.0.0-20141007185835-25a4b8ca48c6/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
+github.com/godbus/dbus v4.1.0+incompatible h1:WqqLRTsQic3apZUK9qC5sGNfXthmPXzUZ7nQPrNITa4=
+github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/rkt/rkt v1.30.0 h1:ZI5RQtSibfjicSttV/HLiHuWreYClEJA2Or5XKAdJb0=

diff --git a/updateengine/client.go b/updateengine/client.go
@@ -36,7 +36,7 @@ const (
 // Client is a dbus client subscribed to updateengine status updates
 type Client struct {
 	conn   *dbus.Conn
-	object *dbus.Object
+	object dbus.BusObject
 	ch     chan *dbus.Signal
 }
 

diff --git a/vendor/github.com/godbus/dbus/.travis.yml b/vendor/github.com/godbus/dbus/.travis.yml
diff --git a/vendor/github.com/godbus/dbus/CONTRIBUTING.md b/vendor/github.com/godbus/dbus/CONTRIBUTING.md
diff --git a/vendor/github.com/godbus/dbus/LICENSE b/vendor/github.com/godbus/dbus/LICENSE
diff --git a/vendor/github.com/godbus/dbus/MAINTAINERS b/vendor/github.com/godbus/dbus/MAINTAINERS
diff --git a/vendor/github.com/godbus/dbus/README.markdown b/vendor/github.com/godbus/dbus/README.markdown
diff --git a/vendor/github.com/godbus/dbus/call.go b/vendor/github.com/godbus/dbus/call.go