bump opencontainers/selinux to v1.2
authorSebastiaan van Stijn <github@gone.nl>
Wed, 27 Mar 2019 15:08:02 +0000 (16:08 +0100)
committerDmitry Smirnov <onlyjob@debian.org>
Tue, 8 Oct 2019 03:37:25 +0000 (04:37 +0100)
Gbp-Pq: Name selinux-containerd_cri.patch

containerd/vendor/github.com/containerd/cri/pkg/server/helpers.go

index 0605f40844a28ce1d720340dd581d7776b72edc3..642816541334bcf4daa3bec0f50008d6a61da114 100644 (file)
@@ -34,7 +34,6 @@ import (
        imagedigest "github.com/opencontainers/go-digest"
        runtimespec "github.com/opencontainers/runtime-spec/specs-go"
        "github.com/opencontainers/runtime-tools/generate"
-       "github.com/opencontainers/selinux/go-selinux"
        "github.com/opencontainers/selinux/go-selinux/label"
        "github.com/pkg/errors"
        "golang.org/x/net/context"
@@ -343,7 +342,12 @@ func initSelinuxOpts(selinuxOpt *runtime.SELinuxOption) (string, string, error)
                selinuxOpt.GetRole(),
                selinuxOpt.GetType(),
                selinuxOpt.GetLevel())
-       return label.InitLabels(selinux.DupSecOpt(labelOpts))
+
+       options, err := label.DupSecOpt(labelOpts)
+       if err != nil {
+               return "", "", err
+       }
+       return label.InitLabels(options)
 }
 
 func checkSelinuxLevel(level string) (bool, error) {