snapd:upstream-patches-for-debian-10

Last commit made on 2019-01-17
Get this branch:
git clone -b upstream-patches-for-debian-10 https://git.launchpad.net/snapd

Branch merges

Branch information

Name:
upstream-patches-for-debian-10
Repository:
lp:snapd

Recent commits

e67e9dd... by Zygmunt Krynicki on 2019-01-17

i18n: use dummy localizations to avoid dependencies

Upstream snapd uses the github.com/ojii/gettext.go package for access to
translation catalogs. This package is currently not available in Debian
and prevents building the package. As such, replace the real
implementation with a simple dummy one that always uses the English
input strings.

Signed-off-by: Zygmunt Krynicki <email address hidden>

aa94735... by Zygmunt Krynicki on 2019-01-17

systemd: disable snapfuse system

Upstream snapd uses an elaborate hack to bundle squashfuse under the
name snapfuse, and built as a fake go package. This component is not
available in Debian where bundling elements is not allowed.

Signed-off-by: Zygmunt Krynicki <email address hidden>

ff66035... by Zygmunt Krynicki on 2019-01-17

advisor,errtracker: use upstream bolt package

Upstream snapd uses a fork of the bolt package that carries additional
patches for bugs that were discovered by snapd developers. Bolt itself
appears to be an abandoned project and is not accepting any new patches.

In various distributions the upstream bolt package may or may not have
been patched but the forked version was definitely not packaged. As
such, to build snapd in Debian the upstream bolt package name must be
used.

Signed-off-by: Zygmunt Krynicki <email address hidden>

9559578... by Zygmunt Krynicki on 2019-01-17

cmd/snap: skip tests depending on text wrapping

Upstream snapd conains tests that check the output of various commands
along with the --help command-line argument. The output is wrapped to
match terminal width and for readability. The algorithm for wrapping
has apparently changed across versions of github.com/jessevdk/go-flags.

Since this test is not critical for anything it can be disabled to let
the package build.

Signed-off-by: Zygmunt Krynicki <email address hidden>

ea5a842... by Zygmunt Krynicki on 2019-01-17

cmd/snap-seccomp: skip tests that use -m32

Apparently Debian's amd64 compiler somehow cannot compile -m32 mode
binaries. The compilation error is:

 multipass@debian-10:~/packaging/snapd/cmd/snap-seccomp$ go test
 cannot build multi-lib syscall runner: exit status 1
 In file included from /usr/include/errno.h:25,
    from /tmp/check-3806730340354206876/1/seccomp_syscall_runner.c:3:
 /usr/include/features.h:424:12: fatal error: sys/cdefs.h: No such file or directory
  # include <sys/cdefs.h>
      ^~~~~~~~~~~~~
 compilation terminated.
 OK: 2 passed, 11 skipped

I was unable to resolve this issue, let's disable this test until we can get to
the bottom of it.

Signed-off-by: Zygmunt Krynicki <email address hidden>

c846cae... by Zygmunt Krynicki on 2019-01-17

cmd/snap-seccomp: skip tests that fail on 4.19

It seems that the Debian 4.19.0-1 kernel contains a regression in
seccomp execution. While this issue is investigated in parallel along
with the security team, the release of updated snapd package should not
be held by this issue.

Signed-off-by: Zygmunt Krynicki <email address hidden>

870e53b... by Zygmunt Krynicki on 2019-01-17

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 <email address hidden>

316597a... by Maciej Borzecki on 2019-01-17

Merge pull request #6392 from bboozzoo/bboozzoo/interfaces-sorting-helpers

interfaces: helpers for sorting plug/slot/connection refs

081926e... by Maciej Borzecki on 2019-01-17

interfaces: helpers for sorting plug/slot/connection refs

Add helpers for sorting slot/plug/connection refs.

Allows external packages to sort their collections without the necessity to
implement the actual ordering logic. Instead, it should be possible to directly
plug provided helpers into sort.Interface.Less().

Signed-off-by: Maciej Borzecki <email address hidden>

9eb08d9... by Zygmunt Krynicki on 2019-01-16

Merge pull request #6390 from mvo5/release-2.37

release: 2.37