[PATCH 1/9] 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>
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
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 81670ce8b21981107172c0ca692e7d98cb240df3..f7b5b8b62b5c511f3710a6bdd23367c0641144ae 100644 (file)
--- a/cmd/snap-seccomp/main.go
+++ b/cmd/snap-seccomp/main.go
@@ -180,10 +180,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 e4190991a8ce697461d0d5de587830c4e7adebf8..01b4a5d54fcab7f4c3508d6fcbfdab1d0c6e6670 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"

diff --git a/cmd/snap-seccomp/versioninfo.go b/cmd/snap-seccomp/versioninfo.go
index b206d9b8c732d8b116e700f0e343ad4377fb19d2..2ddba5fd0becfbbc1eae1ac92b3711a8e4c69704 100644 (file)
--- a/cmd/snap-seccomp/versioninfo.go
+++ b/cmd/snap-seccomp/versioninfo.go
@@ -25,7 +25,7 @@ import (
        "os"
        "strings"
 
-       "github.com/mvo5/libseccomp-golang"
+       "github.com/seccomp/libseccomp-golang"
 
        "github.com/snapcore/snapd/cmd/snap-seccomp/syscalls"
        "github.com/snapcore/snapd/osutil"

diff --git a/cmd/snap-seccomp/versioninfo_test.go b/cmd/snap-seccomp/versioninfo_test.go
index 24e01141b960505adc61d61265b4eb5e9f82c0d1..eb234a1f5f62089e75e4e2fe482d80c037c496db 100644 (file)
--- a/cmd/snap-seccomp/versioninfo_test.go
+++ b/cmd/snap-seccomp/versioninfo_test.go
@@ -25,7 +25,7 @@ import (
 
        . "gopkg.in/check.v1"
 
-       "github.com/mvo5/libseccomp-golang"
+       "github.com/seccomp/libseccomp-golang"
 
        main "github.com/snapcore/snapd/cmd/snap-seccomp"
        "github.com/snapcore/snapd/osutil"