Skip to content

Commit ccd44dc

Browse files
committed
vendor: switch to moby/sys/capability
github.com/moby/sys/capability is a fork of the (no longer maintained) github.com/syndtr/gocapability package. For the list of changes since the fork took place, see https://github.com/moby/sys/blob/main/capability/CHANGELOG.md Signed-off-by: Kir Kolyshkin <[email protected]>
1 parent 509de30 commit ccd44dc

File tree

18 files changed

+1482
-8
lines changed

18 files changed

+1482
-8
lines changed

chroot/run_linux.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ import (
1515
"github.com/containers/buildah/copier"
1616
"github.com/containers/storage/pkg/mount"
1717
"github.com/containers/storage/pkg/unshare"
18+
"github.com/moby/sys/capability"
1819
"github.com/opencontainers/runc/libcontainer/apparmor"
1920
"github.com/opencontainers/runtime-spec/specs-go"
2021
"github.com/sirupsen/logrus"
21-
"github.com/syndtr/gocapability/capability"
2222
"golang.org/x/sys/unix"
2323
)
2424

@@ -182,7 +182,7 @@ func setCapabilities(spec *specs.Spec, keepCaps ...string) error {
182182
capability.PERMITTED: spec.Process.Capabilities.Permitted,
183183
capability.AMBIENT: spec.Process.Capabilities.Ambient,
184184
}
185-
knownCaps := capability.List()
185+
knownCaps := capability.ListKnown()
186186
noCap := capability.Cap(-1)
187187
for capType, capList := range capMap {
188188
for _, capSpec := range capList {

cmd/buildah/unshare.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111

1212
"github.com/containers/storage"
1313
"github.com/containers/storage/pkg/unshare"
14+
"github.com/moby/sys/capability"
1415
"github.com/sirupsen/logrus"
1516
"github.com/spf13/cobra"
16-
"github.com/syndtr/gocapability/capability"
1717
)
1818

1919
var (
@@ -138,7 +138,7 @@ func debugCapabilities() {
138138
logrus.Errorf("error loading our current capabilities: %v", err)
139139
return
140140
}
141-
knownCaps := capability.List()
141+
knownCaps := capability.ListKnown()
142142
effective := make([]string, 0, len(knownCaps))
143143
for i := range knownCaps {
144144
have := pid.Get(capability.EFFECTIVE, knownCaps[i])

copier/copier_linux_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313

1414
"github.com/containers/storage/pkg/mount"
1515
"github.com/containers/storage/pkg/reexec"
16+
"github.com/moby/sys/capability"
1617
"github.com/stretchr/testify/assert"
1718
"github.com/stretchr/testify/require"
18-
"github.com/syndtr/gocapability/capability"
1919
"golang.org/x/sys/unix"
2020
)
2121

go.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ require (
2121
github.com/hashicorp/go-multierror v1.1.1
2222
github.com/mattn/go-shellwords v1.0.12
2323
github.com/moby/buildkit v0.16.0
24+
github.com/moby/sys/capability v0.3.0
2425
github.com/opencontainers/go-digest v1.0.0
2526
github.com/opencontainers/image-spec v1.1.0
2627
github.com/opencontainers/runc v1.2.0-rc.3
@@ -33,7 +34,6 @@ require (
3334
github.com/spf13/cobra v1.8.1
3435
github.com/spf13/pflag v1.0.5
3536
github.com/stretchr/testify v1.9.0
36-
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
3737
go.etcd.io/bbolt v1.3.11
3838
golang.org/x/crypto v0.27.0
3939
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948
@@ -128,6 +128,7 @@ require (
128128
github.com/sigstore/sigstore v1.8.4 // indirect
129129
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect
130130
github.com/sylabs/sif/v2 v2.18.0 // indirect
131+
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
131132
github.com/tchap/go-patricia/v2 v2.3.1 // indirect
132133
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
133134
github.com/ulikunitz/xz v0.5.12 // indirect

go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,8 @@ github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3N
240240
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
241241
github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
242242
github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
243+
github.com/moby/sys/capability v0.3.0 h1:kEP+y6te0gEXIaeQhIi0s7vKs/w0RPoH1qPa6jROcVg=
244+
github.com/moby/sys/capability v0.3.0/go.mod h1:4g9IK291rVkms3LKCDOoYlnV8xKwoDTpIrNEE35Wq0I=
243245
github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg=
244246
github.com/moby/sys/mountinfo v0.7.2/go.mod h1:1YOa8w8Ih7uW0wALDUgT1dTTSBrZ+HiBLGws92L2RU4=
245247
github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc=

tests/testreport/testreport.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212

1313
"github.com/containers/buildah/tests/testreport/types"
1414
"github.com/containers/storage/pkg/mount"
15+
"github.com/moby/sys/capability"
1516
"github.com/opencontainers/runtime-spec/specs-go"
1617
"github.com/sirupsen/logrus"
17-
"github.com/syndtr/gocapability/capability"
1818
"golang.org/x/sys/unix"
1919
"golang.org/x/term"
2020
)
@@ -107,7 +107,7 @@ func getProcessCapabilities(r *types.TestReport) error {
107107
capability.AMBIENT: &r.Spec.Process.Capabilities.Ambient,
108108
}
109109
for capType, capList := range caplistMap {
110-
for _, cap := range capability.List() {
110+
for _, cap := range capability.ListKnown() {
111111
if capabilities.Get(capType, cap) {
112112
*capList = append(*capList, strings.ToUpper("cap_"+cap.String()))
113113
}

vendor/github.com/moby/sys/capability/.codespellrc

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/moby/sys/capability/.golangci.yml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/moby/sys/capability/CHANGELOG.md

+90
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/moby/sys/capability/LICENSE

+25
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/moby/sys/capability/README.md

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/moby/sys/capability/capability.go

+144
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)