cmd/snap-seccomp: use upstream seccomp package

Upstream snapd uses a fork that carries additional compatibility patch
required to build snapd for Ubuntu 14.04. This patch is not required with
the latest snapshot of the upstream seccomp golang bindings but they are
neither released upstream nor backported (in their entirety) to Ubuntu
14.04.

The forked seccomp library is not packaged in Debian. As such, to build
snapd, we need to switch to the regular, non-forked package name.

Signed-off-by: Zygmunt Krynicki <me@zygoon.pl>
Gbp-Pq: Name 0001-cmd-snap-seccomp-use-upstream-seccomp-package.patch

diff --git a/cmd/snap-seccomp/main.go b/cmd/snap-seccomp/main.go
index 2d9158f4d4625e32502083ceb76154ddd16ab1ef..fb546252f6ebea54e3eb8646f2db142dbddbe3f1 100644 (file)
--- a/cmd/snap-seccomp/main.go
+++ b/cmd/snap-seccomp/main.go
@@ -181,10 +181,7 @@ import (
        "strings"
        "syscall"
 
-       // FIXME: we want github.com/seccomp/libseccomp-golang but that
-       // will not work with trusty because libseccomp-golang checks
-       // for the seccomp version and errors if it find one < 2.2.0
-       "github.com/mvo5/libseccomp-golang"
+       "github.com/seccomp/libseccomp-golang"
 
        "github.com/snapcore/snapd/arch"
        "github.com/snapcore/snapd/osutil"

diff --git a/cmd/snap-seccomp/main_test.go b/cmd/snap-seccomp/main_test.go
index 9a8a28fbfbbf733bcc31963c4b90f2385bd801b6..5c64abf52e006ad25da5de2897d68cf73cb849d6 100644 (file)
--- a/cmd/snap-seccomp/main_test.go
+++ b/cmd/snap-seccomp/main_test.go
@@ -32,7 +32,7 @@ import (
 
        . "gopkg.in/check.v1"
 
-       "github.com/mvo5/libseccomp-golang"
+       "github.com/seccomp/libseccomp-golang"
 
        "github.com/snapcore/snapd/arch"
        main "github.com/snapcore/snapd/cmd/snap-seccomp"