Skip to content

Commit c55530b

Browse files
albanrata
andcommitted
vendoring: Use libseccomp with notify support
The notify support has been merged in libseccomp-golang in this PR: seccomp/libseccomp-golang#59 Also, we update to new API of libseccomp-golang so code doesn't break. Signed-off-by: Alban Crequy <[email protected]> Signed-off-by: Rodrigo Campos <[email protected]> Co-authored-by: Rodrigo Campos <[email protected]>
1 parent a244d57 commit c55530b

File tree

12 files changed

+708
-129
lines changed

12 files changed

+708
-129
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/mrunalp/fileutils v0.5.0
1616
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
1717
github.com/opencontainers/selinux v1.8.4
18-
github.com/seccomp/libseccomp-golang v0.9.1
18+
github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921
1919
github.com/sirupsen/logrus v1.8.1
2020
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
2121
// NOTE: urfave/cli must be <= v1.22.1 due to a regression: https://github.com/urfave/cli/issues/1092

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
5252
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
5353
github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
5454
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
55-
github.com/seccomp/libseccomp-golang v0.9.1 h1:NJjM5DNFOs0s3kYE1WUOr6G8V97sdt46rlXTMfXGWBo=
56-
github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
55+
github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921 h1:58EBmR2dMNL2n/FnbQewK3D14nXr0V9CObDSvMJLq+Y=
56+
github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg=
5757
github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
5858
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
5959
github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=

libcontainer/seccomp/patchbpf/enosys_linux.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ func enosysPatchFilter(config *configs.Seccomp, filter *libseccomp.ScmpFilter) (
584584

585585
func filterFlags(filter *libseccomp.ScmpFilter) (flags uint, noNewPrivs bool, err error) {
586586
// Ignore the error since pre-2.4 libseccomp is treated as API level 0.
587-
apiLevel, _ := libseccomp.GetApi()
587+
apiLevel, _ := libseccomp.GetAPI()
588588

589589
noNewPrivs, err = filter.GetNoNewPrivsBit()
590590
if err != nil {

vendor/github.com/seccomp/libseccomp-golang/.travis.yml

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

vendor/github.com/seccomp/libseccomp-golang/SUBMITTING_PATCHES renamed to vendor/github.com/seccomp/libseccomp-golang/CONTRIBUTING.md

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

vendor/github.com/seccomp/libseccomp-golang/Makefile

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

vendor/github.com/seccomp/libseccomp-golang/README renamed to vendor/github.com/seccomp/libseccomp-golang/README.md

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

vendor/github.com/seccomp/libseccomp-golang/go.mod

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

vendor/github.com/seccomp/libseccomp-golang/go.sum

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

0 commit comments

Comments
 (0)