github.com/bugraaydogar/snapd@v0.0.0-20210315170335-8c70bb858939/packaging/debian-sid/patches/0001-cmd-snap-seccomp-use-upstream-seccomp-package.patch (about)

     1  From cb851cfe883af568e56e50b492579b49869928ab Mon Sep 17 00:00:00 2001
     2  From: Zygmunt Krynicki <me@zygoon.pl>
     3  Date: Thu, 17 Jan 2019 15:48:46 +0200
     4  Subject: [PATCH 1/9] cmd/snap-seccomp: use upstream seccomp package
     5  
     6  Upstream snapd uses a fork that carries additional compatibility patch
     7  required to build snapd for Ubuntu 14.04. This patch is not required with
     8  the latest snapshot of the upstream seccomp golang bindings but they are
     9  neither released upstream nor backported (in their entirety) to Ubuntu
    10  14.04.
    11  
    12  The forked seccomp library is not packaged in Debian. As such, to build
    13  snapd, we need to switch to the regular, non-forked package name.
    14  
    15  Signed-off-by: Zygmunt Krynicki <me@zygoon.pl>
    16  Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
    17  ---
    18   cmd/snap-seccomp/main.go             | 5 +----
    19   cmd/snap-seccomp/main_test.go        | 2 +-
    20   cmd/snap-seccomp/versioninfo.go      | 2 +-
    21   cmd/snap-seccomp/versioninfo_test.go | 2 +-
    22   4 files changed, 4 insertions(+), 7 deletions(-)
    23  
    24  Index: snapd/cmd/snap-seccomp/main.go
    25  ===================================================================
    26  --- snapd.orig/cmd/snap-seccomp/main.go
    27  +++ snapd/cmd/snap-seccomp/main.go
    28  @@ -180,10 +180,7 @@ import (
    29   	"strings"
    30   	"syscall"
    31   
    32  -	// FIXME: we want github.com/seccomp/libseccomp-golang but that
    33  -	// will not work with trusty because libseccomp-golang checks
    34  -	// for the seccomp version and errors if it find one < 2.2.0
    35  -	"github.com/mvo5/libseccomp-golang"
    36  +	"github.com/seccomp/libseccomp-golang"
    37   
    38   	"github.com/snapcore/snapd/arch"
    39   	"github.com/snapcore/snapd/osutil"
    40  Index: snapd/cmd/snap-seccomp/main_test.go
    41  ===================================================================
    42  --- snapd.orig/cmd/snap-seccomp/main_test.go
    43  +++ snapd/cmd/snap-seccomp/main_test.go
    44  @@ -32,7 +32,7 @@ import (
    45   
    46   	. "gopkg.in/check.v1"
    47   
    48  -	"github.com/mvo5/libseccomp-golang"
    49  +	"github.com/seccomp/libseccomp-golang"
    50   
    51   	"github.com/snapcore/snapd/arch"
    52   	main "github.com/snapcore/snapd/cmd/snap-seccomp"
    53  Index: snapd/cmd/snap-seccomp/versioninfo.go
    54  ===================================================================
    55  --- snapd.orig/cmd/snap-seccomp/versioninfo.go
    56  +++ snapd/cmd/snap-seccomp/versioninfo.go
    57  @@ -25,7 +25,7 @@ import (
    58   	"os"
    59   	"strings"
    60   
    61  -	"github.com/mvo5/libseccomp-golang"
    62  +	"github.com/seccomp/libseccomp-golang"
    63   
    64   	"github.com/snapcore/snapd/cmd/snap-seccomp/syscalls"
    65   	"github.com/snapcore/snapd/osutil"
    66  Index: snapd/cmd/snap-seccomp/versioninfo_test.go
    67  ===================================================================
    68  --- snapd.orig/cmd/snap-seccomp/versioninfo_test.go
    69  +++ snapd/cmd/snap-seccomp/versioninfo_test.go
    70  @@ -25,7 +25,7 @@ import (
    71   
    72   	. "gopkg.in/check.v1"
    73   
    74  -	"github.com/mvo5/libseccomp-golang"
    75  +	"github.com/seccomp/libseccomp-golang"
    76   
    77   	main "github.com/snapcore/snapd/cmd/snap-seccomp"
    78   	"github.com/snapcore/snapd/osutil"