diff options
Diffstat (limited to 'vendor/github.com/godbus')
-rw-r--r-- | vendor/github.com/godbus/dbus/v5/.cirrus.yml | 6 | ||||
-rw-r--r-- | vendor/github.com/godbus/dbus/v5/README.md | 2 | ||||
-rw-r--r-- | vendor/github.com/godbus/dbus/v5/conn_other.go | 3 | ||||
-rw-r--r-- | vendor/github.com/godbus/dbus/v5/decoder.go | 8 | ||||
-rw-r--r-- | vendor/github.com/godbus/dbus/v5/transport_nonce_tcp.go | 4 |
5 files changed, 8 insertions, 15 deletions
diff --git a/vendor/github.com/godbus/dbus/v5/.cirrus.yml b/vendor/github.com/godbus/dbus/v5/.cirrus.yml index 4e900f86d..75a0d798a 100644 --- a/vendor/github.com/godbus/dbus/v5/.cirrus.yml +++ b/vendor/github.com/godbus/dbus/v5/.cirrus.yml @@ -1,10 +1,10 @@ freebsd_instance: - image_family: freebsd-13-0 + image_family: freebsd-14-0 task: name: Test on FreeBSD - install_script: pkg install -y go119 dbus + install_script: pkg install -y go122 dbus test_script: | /usr/local/etc/rc.d/dbus onestart && \ eval `dbus-launch --sh-syntax` && \ - go119 test -v ./... + go122 test -v ./... diff --git a/vendor/github.com/godbus/dbus/v5/README.md b/vendor/github.com/godbus/dbus/v5/README.md index 5c6b19655..da848a98d 100644 --- a/vendor/github.com/godbus/dbus/v5/README.md +++ b/vendor/github.com/godbus/dbus/v5/README.md @@ -14,7 +14,7 @@ D-Bus message bus system. ### Installation -This packages requires Go 1.12 or later. It can be installed by running the command below: +This packages requires Go 1.20 or later. It can be installed by running the command below: ``` go get github.com/godbus/dbus/v5 diff --git a/vendor/github.com/godbus/dbus/v5/conn_other.go b/vendor/github.com/godbus/dbus/v5/conn_other.go index 067e67cc5..1e9959446 100644 --- a/vendor/github.com/godbus/dbus/v5/conn_other.go +++ b/vendor/github.com/godbus/dbus/v5/conn_other.go @@ -7,7 +7,6 @@ import ( "bytes" "errors" "fmt" - "io/ioutil" "os" "os/exec" "os/user" @@ -61,7 +60,7 @@ func tryDiscoverDbusSessionBusAddress() string { // text file // containing the address of the socket, e.g.: // DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-E1c73yNqrG - if f, err := ioutil.ReadFile(runUserSessionDbusFile); err == nil { + if f, err := os.ReadFile(runUserSessionDbusFile); err == nil { fileContent := string(f) prefix := "DBUS_SESSION_BUS_ADDRESS=" diff --git a/vendor/github.com/godbus/dbus/v5/decoder.go b/vendor/github.com/godbus/dbus/v5/decoder.go index 97a827b83..d03bdd8e8 100644 --- a/vendor/github.com/godbus/dbus/v5/decoder.go +++ b/vendor/github.com/godbus/dbus/v5/decoder.go @@ -370,12 +370,6 @@ func (c *stringConverter) String(b []byte) string { } // toString converts a byte slice to a string without allocating. -// Starting from Go 1.20 you should use unsafe.String. func toString(b []byte) string { - var s string - h := (*reflect.StringHeader)(unsafe.Pointer(&s)) - h.Data = uintptr(unsafe.Pointer(&b[0])) - h.Len = len(b) - - return s + return unsafe.String(&b[0], len(b)) } diff --git a/vendor/github.com/godbus/dbus/v5/transport_nonce_tcp.go b/vendor/github.com/godbus/dbus/v5/transport_nonce_tcp.go index a61a82084..a08d0891c 100644 --- a/vendor/github.com/godbus/dbus/v5/transport_nonce_tcp.go +++ b/vendor/github.com/godbus/dbus/v5/transport_nonce_tcp.go @@ -5,8 +5,8 @@ package dbus import ( "errors" - "io/ioutil" "net" + "os" ) func init() { @@ -28,7 +28,7 @@ func newNonceTcpTransport(keys string) (transport, error) { if err != nil { return nil, err } - b, err := ioutil.ReadFile(noncefile) + b, err := os.ReadFile(noncefile) if err != nil { return nil, err } |