Switch to github.com/kolyshkin/capability v0.1.1

See https://github.com/kolyshkin/capability/releases
for more details.

Signed-off-by: Kir Kolyshkin <[email protected]>

go.mod

@@ -10,14 +10,14 @@ require (
  github.com/cyphar/filepath-securejoin v0.2.4
  github.com/docker/go-units v0.5.0
  github.com/godbus/dbus/v5 v5.1.0
+ github.com/kolyshkin/capability v0.1.1
  github.com/moby/sys/mountinfo v0.7.1
  github.com/moby/sys/user v0.1.0
  github.com/mrunalp/fileutils v0.5.1
  github.com/opencontainers/runtime-spec v1.2.0
  github.com/opencontainers/selinux v1.11.0
  github.com/seccomp/libseccomp-golang v0.10.0
  github.com/sirupsen/logrus v1.9.3
- github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
  github.com/urfave/cli v1.22.14
  github.com/vishvananda/netlink v1.1.0
  golang.org/x/net v0.24.0

go.sum

@@ -26,6 +26,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/kolyshkin/capability v0.1.1 h1:th2w1lW+eNsYjiHl5ID/vFbOb3mj8vjterkwzZbvhOs=
+github.com/kolyshkin/capability v0.1.1/go.mod h1:LLvqGTUJOPNZaZd47EGYif+S7+CmFocn0v7gt9ue2pg=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -60,8 +62,6 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI=
-github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/urfave/cli v1.22.14 h1:ebbhrRiGK2i4naQJr+1Xj92HXZCrK7MsyTS/ob3HnAk=
 github.com/urfave/cli v1.22.14/go.mod h1:X0eDS6pD6Exaclxm99NJ3FiCDRED7vIHpx2mDOHLvkA=
 github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0=

libcontainer/capabilities/capabilities.go

@@ -8,9 +8,9 @@ import (
  "strings"
  "sync"
 
+ "github.com/kolyshkin/capability"
  "github.com/opencontainers/runc/libcontainer/configs"
  "github.com/sirupsen/logrus"
- "github.com/syndtr/gocapability/capability"
 )
 
 const allCapabilityTypes = capability.CAPS | capability.BOUNDING | capability.AMBIENT
@@ -24,15 +24,19 @@ var (
  capability.AMBIENT,
  }
 
- capMap = sync.OnceValue(func() map[string]capability.Cap {
- cm := make(map[string]capability.Cap, capability.CAP_LAST_CAP+1)
+ capMap = sync.OnceValues(func() (map[string]capability.Cap, error) {
+ last, err := capability.LastCap()
+ if err != nil {
+ return nil, err
+ }
+ cm := make(map[string]capability.Cap, last+1)
  for _, c := range capability.List() {
- if c > capability.CAP_LAST_CAP {
+ if c > last {
  continue
  }
  cm["CAP_"+strings.ToUpper(c.String())] = c
  }
- return cm
+ return cm, nil
  })
 )
 
@@ -51,12 +55,12 @@ func KnownCapabilities() []string {
 // or Capabilities that are unavailable in the current environment are ignored,
 // printing a warning instead.
 func New(capConfig *configs.Capabilities) (*Caps, error) {
- var (
- err error
- c Caps
- )
+ var c Caps
 
- cm := capMap()
+ cm, err := capMap()
+ if err != nil {
+ return nil, err
+ }
  unknownCaps := make(map[string]struct{})
  ignoredCaps := make(map[string]struct{})
  // capSlice converts the slice of capability names in caps, to their numeric

libcontainer/capabilities/capabilities_linux_test.go

@@ -5,10 +5,10 @@ import (
  "os"
  "testing"
 
+ "github.com/kolyshkin/capability"
  "github.com/opencontainers/runc/libcontainer/configs"
  "github.com/sirupsen/logrus"
  "github.com/sirupsen/logrus/hooks/test"
- "github.com/syndtr/gocapability/capability"
 )
 
 func TestNew(t *testing.T) {