[PATCH 08/18] packaging: set LANG=C.utf-8 during tests

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
Gbp-Pq: Name 0009-PATCH-08-18-packaging-set-LANG-C.utf-8-during-tests.patch

[PATCH 06/18] tests: explicitly remove the mount point

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
Gbp-Pq: Name 0008-PATCH-06-18-tests-explicitly-remove-the-mount-point.patch

[PATCH 05/18] tests: use consistent syntax to call snapctl

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
Gbp-Pq: Name 0007-PATCH-05-18-tests-use-consistent-syntax-to-call-snap.patch

[PATCH 04/18] tests: use snapctl umount rather than umount

Snapctl creates systemd mount units that may be activated again, so plain
umount is insufficient to correctly undo all the changes.

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
Gbp-Pq: Name 0006-PATCH-04-18-tests-use-snapctl-umount-rather-than-umo.patch

[PATCH 03/18] Merge pull request from GHSA-p9v8-q5m4-pf46

* o/hookstate: recognize "--" in snapctl argument parser

When parsing snapctl argument vector recognize the "--" as an option
terminator, so that dash-options are not recognized afterwards.

Fixes: https://bugs.launchpad.net/snapd/+bug/2065077
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
* tests: add regression test for lp-2065077

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
---------

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
Gbp-Pq: Name 0005-PATCH-03-18-Merge-pull-request-from-GHSA-p9v8-q5m4-p.patch

man-page-sections

Gbp-Pq: Name 0010-man-page-sections.patch

[PATCH 7/9] 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 <me@zygoon.pl>
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
Gbp-Pq: Name 0007-i18n-use-dummy-localizations-to-avoid-dependencies.patch

[PATCH 4/9] cmd/snap: skip tests depending on text wrapping

Upstream snapd contains 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 <me@zygoon.pl>
Gbp-Pq: Name 0004-cmd-snap-skip-tests-depending-on-text-wrapping.patch

[PATCH 3/9] 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 <me@zygoon.pl>
Gbp-Pq: Name 0003-cmd-snap-seccomp-skip-tests-that-use-m32.patch

snapd (2.63-4) unstable; urgency=medium

  * debian: fix lxc/fuse woes
  * debian: remove smoke test intended for containers, closes: #1076490

[dgit import unpatched snapd 2.63-4]

Import snapd_2.63-4.debian.tar.xz

[dgit import tarball snapd 2.63-4 snapd_2.63-4.debian.tar.xz]

Import snapd_2.63.orig.tar.gz

[dgit import orig snapd_2.63.orig.tar.gz]