From: Sebastiaan van Stijn <github@gone.nl>
Date: Wed, 27 Mar 2019 15:08:02 +0000 (+0100)
Subject: bump opencontainers/selinux to v1.2
X-Git-Tag: archive/raspbian/18.09.9+dfsg1-5+rpi1~1^2~10
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1f162fb2b8f8049e8305c1f88ba906922ebcec51;p=docker.io.git

bump opencontainers/selinux to v1.2


Gbp-Pq: Name selinux-containerd_cri.patch
---

diff --git a/containerd/vendor/github.com/containerd/cri/pkg/server/helpers.go b/containerd/vendor/github.com/containerd/cri/pkg/server/helpers.go
index 0605f408..64281654 100644
--- a/containerd/vendor/github.com/containerd/cri/pkg/server/helpers.go
+++ b/containerd/vendor/github.com/containerd/cri/pkg/server/helpers.go
@@ -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) {