Merge pull request #165 from vrothberg/upgrade

Upgrade

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/containers/storage v1.55.0
 	github.com/opencontainers/runc v1.1.13
 	github.com/stretchr/testify v1.9.0
-	golang.org/x/sys v0.22.0
+	golang.org/x/sys v0.26.0
 )
 
 require (

go.sum

@@ -20,8 +20,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/host/host_nocgo.go

@@ -1,3 +1,4 @@
+//go:build !cgo
 // +build !cgo
 
 // Copyright 2018 psgo authors
@@ -21,7 +22,7 @@ package host
 import (
 	"encoding/binary"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"unsafe"
 )
 
@@ -46,7 +47,7 @@ const (
 
 func getFromAuxv(what uint, whatName string) (uint, error) {
 	dataLen := int(unsafe.Sizeof(int(0)))
-	p, err := ioutil.ReadFile("/proc/self/auxv")
+	p, err := os.ReadFile("/proc/self/auxv")
 	if err != nil {
 		return 0, err
 	}

internal/proc/attr.go

@@ -17,7 +17,6 @@ package proc
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strings"
 
@@ -27,7 +26,7 @@ import (
 // ParseAttrCurrent returns the contents of /proc/$pid/attr/current of "?" if
 // labeling is not supported on the host.
 func ParseAttrCurrent(pid string) (string, error) {
-	data, err := ioutil.ReadFile(fmt.Sprintf("/proc/%s/attr/current", pid))
+	data, err := os.ReadFile(fmt.Sprintf("/proc/%s/attr/current", pid))
 	if err != nil {
 		_, err = os.Stat(fmt.Sprintf("/proc/%s", pid))
 		if errors.Is(err, os.ErrNotExist) || errors.Is(err, unix.ESRCH) {

internal/proc/cmdline.go

@@ -17,12 +17,12 @@ package proc
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
+	"os"
 )
 
 // ParseCmdLine parses a /proc/$pid/cmdline file and returns a string slice.
 func ParseCmdLine(pid string) ([]string, error) {
-	data, err := ioutil.ReadFile(fmt.Sprintf("/proc/%s/cmdline", pid))
+	data, err := os.ReadFile(fmt.Sprintf("/proc/%s/cmdline", pid))
 	if err != nil {
 		return nil, err
 	}

internal/proc/stat.go

@@ -17,7 +17,7 @@ package proc
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"strings"
 )
 
@@ -114,7 +114,7 @@ type Stat struct {
 
 // readStat is used for mocking in unit tests.
 var readStat = func(path string) (string, error) {
-	rawData, err := ioutil.ReadFile(path)
+	rawData, err := os.ReadFile(path)
 	if err != nil {
 		return "", err
 	}

psgo.go

@@ -29,7 +29,6 @@ package psgo
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"runtime"
 	"sort"
@@ -110,7 +109,7 @@ func findID(idStr string, mapping []idtools.IDMap, lookupFunc func(uid string) (
 	}
 
 	// User not found, read the overflow
-	overflow, err := ioutil.ReadFile(overflowFile)
+	overflow, err := os.ReadFile(overflowFile)
 	if err != nil {
 		return "", err
 	}