From b910aff8e6c7657fc63932d210f84d6e79bd05a1 Mon Sep 17 00:00:00 2001 From: Zygmunt Krynicki Date: Thu, 17 Jan 2019 15:48:46 +0200 Subject: [PATCH] [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 Signed-off-by: Maciej Borzecki Gbp-Pq: Name 0001-cmd-snap-seccomp-use-upstream-seccomp-package.patch --- cmd/snap-seccomp/main.go | 5 +---- cmd/snap-seccomp/main_test.go | 2 +- cmd/snap-seccomp/versioninfo.go | 2 +- cmd/snap-seccomp/versioninfo_test.go | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/cmd/snap-seccomp/main.go b/cmd/snap-seccomp/main.go index 81670ce8..f7b5b8b6 100644 --- 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 dcbd8d27..3314d9ad 100644 --- 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 b206d9b8..2ddba5fd 100644 --- 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 24e01141..eb234a1f 100644 --- 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" -- 2.30.2