opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 19:44:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8885 from vrothberg/vendor-psgo

Browse Source 
vendor containers/psgo@v1.5.2
This commit is contained in:
OpenShift Merge Robot
2021-01-05 10:53:36 -05:00
committed by GitHub
parent 1b9366d650 21f5154399
commit bc21fabbd7
8 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -14,7 +14,7 @@ require (
github.com/containers/common v0.31.2 github.com/containers/common v0.31.2
github.com/containers/conmon v2.0.20+incompatible github.com/containers/conmon v2.0.20+incompatible
github.com/containers/image/v5 v5.9.0 github.com/containers/image/v5 v5.9.0
github.com/containers/psgo v1.5.1 github.com/containers/psgo v1.5.2
github.com/containers/storage v1.24.4 github.com/containers/storage v1.24.4
github.com/coreos/go-systemd/v22 v22.1.0 github.com/coreos/go-systemd/v22 v22.1.0
github.com/cri-o/ocicni v0.2.1-0.20201125151022-df072ea5421c github.com/cri-o/ocicni v0.2.1-0.20201125151022-df072ea5421c

4
go.sum
View File

@ -114,8 +114,8 @@ github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b h1:Q8ePgVfHDpl
github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY= github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY=
github.com/containers/ocicrypt v1.0.3 h1:vYgl+RZ9Q3DPMuTfxmN+qp0X2Bj52uuY2vnt6GzVe1c= github.com/containers/ocicrypt v1.0.3 h1:vYgl+RZ9Q3DPMuTfxmN+qp0X2Bj52uuY2vnt6GzVe1c=
github.com/containers/ocicrypt v1.0.3/go.mod h1:CUBa+8MRNL/VkpxYIpaMtgn1WgXGyvPQj8jcy0EVG6g= github.com/containers/ocicrypt v1.0.3/go.mod h1:CUBa+8MRNL/VkpxYIpaMtgn1WgXGyvPQj8jcy0EVG6g=
github.com/containers/psgo v1.5.1 h1:MQNb7FLbXqBdqz6u4lI2QWizVz4RSTzs1+Nk9XT1iVA= github.com/containers/psgo v1.5.2 h1:3aoozst/GIwsrr/5jnFy3FrJay98uujPCu9lTuSZ/Cw=
github.com/containers/psgo v1.5.1/go.mod h1:2ubh0SsreMZjSXW1Hif58JrEcFudQyIy9EzPUWfawVU= github.com/containers/psgo v1.5.2/go.mod h1:2ubh0SsreMZjSXW1Hif58JrEcFudQyIy9EzPUWfawVU=
github.com/containers/storage v1.23.7/go.mod h1:cUT2zHjtx+WlVri30obWmM2gpqpi8jfPsmIzP1TVpEI= github.com/containers/storage v1.23.7/go.mod h1:cUT2zHjtx+WlVri30obWmM2gpqpi8jfPsmIzP1TVpEI=
github.com/containers/storage v1.24.1/go.mod h1:0xJL06Dmd+ZYXIUdnBUPN0JnhHGgwMkLvnnAonJfWJU= github.com/containers/storage v1.24.1/go.mod h1:0xJL06Dmd+ZYXIUdnBUPN0JnhHGgwMkLvnnAonJfWJU=
github.com/containers/storage v1.24.3 h1:8UB4S62l4hrU6Yw3dbsLCJtLg7Ofo39IN2HdckBIX4E= github.com/containers/storage v1.24.3 h1:8UB4S62l4hrU6Yw3dbsLCJtLg7Ofo39IN2HdckBIX4E=

2
vendor/github.com/containers/psgo/internal/capabilities/capabilities.go generated vendored
View File

@ -13,7 +13,7 @@
// limitations under the License. // limitations under the License.
// Package capabilities provides a mapping from common kernel bit masks to the // Package capabilities provides a mapping from common kernel bit masks to the
// alphanumerical represenation of kernel capabilities. See capabilities(7) // alphanumerical representation of kernel capabilities. See capabilities(7)
// for additional information. // for additional information.
package capabilities package capabilities

5
vendor/github.com/containers/psgo/internal/dev/tty.go generated vendored
View File

@ -113,8 +113,9 @@ func TTYs() (*[]TTY, error) {
} }
s := fi.Sys().(*syscall.Stat_t) s := fi.Sys().(*syscall.Stat_t)
t := TTY{ t := TTY{
Minor: minDevNum(s.Rdev), // Rdev is type uint32 on mips arch so we have to cast to uint64
Major: majDevNum(s.Rdev), Minor: minDevNum(uint64(s.Rdev)),
Major: majDevNum(uint64(s.Rdev)),
Path: dev, Path: dev,
} }
ttys = append(ttys, t) ttys = append(ttys, t)

2
vendor/github.com/containers/psgo/internal/proc/status.go generated vendored
View File

@ -24,7 +24,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
) )
// Status is a direct translation of a `/proc/[pid]/status`, wich provides much // Status is a direct translation of a `/proc/[pid]/status`, which provides much
// of the information in /proc/[pid]/stat and /proc/[pid]/statm in a format // of the information in /proc/[pid]/stat and /proc/[pid]/statm in a format
// that's easier for humans to parse. // that's easier for humans to parse.
type Status struct { type Status struct {

4
vendor/github.com/containers/psgo/internal/process/process.go generated vendored
View File

@ -31,9 +31,9 @@ type Process struct {
Pid string Pid string
// Stat contains data from /proc/$pid/stat. // Stat contains data from /proc/$pid/stat.
Stat proc.Stat Stat proc.Stat
// Status containes data from /proc/$pid/status. // Status contains data from /proc/$pid/status.
Status proc.Status Status proc.Status
// CmdLine containes data from /proc/$pid/cmdline. // CmdLine contains data from /proc/$pid/cmdline.
CmdLine []string CmdLine []string
// Label containers data from /proc/$pid/attr/current. // Label containers data from /proc/$pid/attr/current.
Label string Label string

24
vendor/github.com/containers/psgo/psgo.go generated vendored
View File

@ -482,7 +482,7 @@ func JoinNamespaceAndProcessInfoByPidsWithOptions(pids []string, descriptors []s
// catch race conditions // catch race conditions
continue continue
} }
return nil, errors.Wrapf(err, "error extracing PID namespace") return nil, errors.Wrapf(err, "error extracting PID namespace")
} }
if _, exists := nsMap[ns]; !exists { if _, exists := nsMap[ns]; !exists {
nsMap[ns] = true nsMap[ns] = true
@ -759,7 +759,7 @@ func processVSZ(p *process.Process, ctx *psContext) (string, error) {
} }
// parseCAP parses cap (a string bit mask) and returns the associated set of // parseCAP parses cap (a string bit mask) and returns the associated set of
// capabilities. If all capabilties are set, "full" is returned. If no // capabilities. If all capabilities are set, "full" is returned. If no
// capability is enabled, "none" is returned. // capability is enabled, "none" is returned.
func parseCAP(cap string) (string, error) { func parseCAP(cap string) (string, error) {
mask, err := strconv.ParseUint(cap, 16, 64) mask, err := strconv.ParseUint(cap, 16, 64)
@ -777,36 +777,36 @@ func parseCAP(cap string) (string, error) {
return strings.Join(caps, ","), nil return strings.Join(caps, ","), nil
} }
// processCAPAMB returns the set of ambient capabilties associated with // processCAPAMB returns the set of ambient capabilities associated with
// process p. If all capabilties are set, "full" is returned. If no // process p. If all capabilities are set, "full" is returned. If no
// capability is enabled, "none" is returned. // capability is enabled, "none" is returned.
func processCAPAMB(p *process.Process, ctx *psContext) (string, error) { func processCAPAMB(p *process.Process, ctx *psContext) (string, error) {
return parseCAP(p.Status.CapAmb) return parseCAP(p.Status.CapAmb)
} }
// processCAPINH returns the set of inheritable capabilties associated with // processCAPINH returns the set of inheritable capabilities associated with
// process p. If all capabilties are set, "full" is returned. If no // process p. If all capabilities are set, "full" is returned. If no
// capability is enabled, "none" is returned. // capability is enabled, "none" is returned.
func processCAPINH(p *process.Process, ctx *psContext) (string, error) { func processCAPINH(p *process.Process, ctx *psContext) (string, error) {
return parseCAP(p.Status.CapInh) return parseCAP(p.Status.CapInh)
} }
// processCAPPRM returns the set of permitted capabilties associated with // processCAPPRM returns the set of permitted capabilities associated with
// process p. If all capabilties are set, "full" is returned. If no // process p. If all capabilities are set, "full" is returned. If no
// capability is enabled, "none" is returned. // capability is enabled, "none" is returned.
func processCAPPRM(p *process.Process, ctx *psContext) (string, error) { func processCAPPRM(p *process.Process, ctx *psContext) (string, error) {
return parseCAP(p.Status.CapPrm) return parseCAP(p.Status.CapPrm)
} }
// processCAPEFF returns the set of effective capabilties associated with // processCAPEFF returns the set of effective capabilities associated with
// process p. If all capabilties are set, "full" is returned. If no // process p. If all capabilities are set, "full" is returned. If no
// capability is enabled, "none" is returned. // capability is enabled, "none" is returned.
func processCAPEFF(p *process.Process, ctx *psContext) (string, error) { func processCAPEFF(p *process.Process, ctx *psContext) (string, error) {
return parseCAP(p.Status.CapEff) return parseCAP(p.Status.CapEff)
} }
// processCAPBND returns the set of bounding capabilties associated with // processCAPBND returns the set of bounding capabilities associated with
// process p. If all capabilties are set, "full" is returned. If no // process p. If all capabilities are set, "full" is returned. If no
// capability is enabled, "none" is returned. // capability is enabled, "none" is returned.
func processCAPBND(p *process.Process, ctx *psContext) (string, error) { func processCAPBND(p *process.Process, ctx *psContext) (string, error) {
return parseCAP(p.Status.CapBnd) return parseCAP(p.Status.CapBnd)

2
vendor/modules.txt vendored
View File

@ -163,7 +163,7 @@ github.com/containers/ocicrypt/keywrap/pgp
github.com/containers/ocicrypt/keywrap/pkcs7 github.com/containers/ocicrypt/keywrap/pkcs7
github.com/containers/ocicrypt/spec github.com/containers/ocicrypt/spec
github.com/containers/ocicrypt/utils github.com/containers/ocicrypt/utils
# github.com/containers/psgo v1.5.1 # github.com/containers/psgo v1.5.2
github.com/containers/psgo github.com/containers/psgo
github.com/containers/psgo/internal/capabilities github.com/containers/psgo/internal/capabilities
github.com/containers/psgo/internal/cgroups github.com/containers/psgo/internal/cgroups