Michael Vogt [Thu, 17 Feb 2022 15:29:46 +0000 (15:29 +0000)]
Merge snapd (2.37.4-1+deb10u1) import into refs/heads/workingbranch
Alex Murray [Thu, 18 Nov 2021 00:33:45 +0000 (11:03 +1030)]
[PATCH 15/36] cmd/snap-confine: Prevent user-controlled race in setup_private_mount
When setting up the private mount namespace for a snap, snap-confine tries
to reuse the existing /tmp/snap.$SNAP_NAME directory if it already
exists. However, a user could create this directory before snap-confine is
executed and hence snap-confine would reuse it, along with any contents
that already existed. This could allow a user to symlink their own contents
into this directory and snap-confine would then mount that into the snap's
mount namespace. Finally this could allow an unprivileged attacker to cause
snap-confine to escape confinement by causing it to be executed under a
less restrictive AppArmor profile when this vulnerability is combined with
others. Fix this by moving the erroneous directory out of the way if it
doesn't have the expected permissions / ownership so we can re-create it
with the correct restrictive permissions.
This resolves CVE-2021-44731.
Signed-off-by: Alex Murray <alex.murray@canonical.com>
Gbp-Pq: Topic cve202144730
Gbp-Pq: Name 0015-cmd-snap-confine-Prevent-user-controlled-race-in-set.patch
Alex Murray [Wed, 17 Nov 2021 04:13:41 +0000 (14:43 +1030)]
[PATCH 14/36] cmd/snap-confine: Remove execute permission from AppArmor profile
The snap-confine AppArmor profile cargo-culted a work-around for the
handling of encryptfs encrypted home directories from the AppArmor
base abstraction. Unfortunately this includes permission to execute
arbitrary binaries from within the user's Private home directory
and so could be used to trick snap-confine to execute arbitrary
user-controlled binaries, which when combined with other flaws in
snap-confine could then be used to try and escape confinement.
Signed-off-by: Alex Murray <alex.murray@canonical.com>
Gbp-Pq: Topic cve202144730
Gbp-Pq: Name 0014-cmd-snap-confine-Remove-execute-permission-from-AppA.patch
Alex Murray [Wed, 17 Nov 2021 04:07:39 +0000 (14:37 +1030)]
[PATCH 13/36] cmd/libsnap-confine-private: Tighten AppArmor label check
Only consider snap-confine as confined by AppArmor when the AppArmor label
matches an expected path location for the snap-confine binary, rather than
just if the label is not "unconfined". This ensures snap-confine will fail
to execute if it is executed under a more permissive AppArmor profile than
expected.
Signed-off-by: Alex Murray <alex.murray@canonical.com>
Gbp-Pq: Topic cve202144730
Gbp-Pq: Name 0013-cmd-libsnap-confine-private-Tighten-AppArmor-label-c.patch
Alex Murray [Wed, 17 Nov 2021 04:02:09 +0000 (14:32 +1030)]
[PATCH 12/36] cmd/libsnap-confine-private: Don't fail open on apparmor confinement
aa_is_enabled() can be made to fail by setting low open file limits or
similar - in this case, snap-confine would continue executing as though it
were unconfined. However, this can be detected by checking errno more
closely - so only fail open when we know AppArmor either is not supported
or has been explicitly disabled at boot and otherwise fail closed.
Signed-off-by: Alex Murray <alex.murray@canonical.com>
Gbp-Pq: Topic cve202144730
Gbp-Pq: Name 0012-cmd-libsnap-confine-private-Don-t-fail-open-on-appar.patch
Alex Murray [Wed, 17 Nov 2021 03:57:22 +0000 (14:27 +1030)]
[PATCH 11/36] cmd/libsnap-confine-private: Defend against hardlink attacks
When snap-confine goes to execute other helper binaries (snap-update-ns
etc) via sc_open_snapd_tool(), these other binaries are located relative to
the currently executing snap-confine process via /proc/self/exe. Since it
is possible for regular users to hardlink setuid binaries when
fs.protected_hardlinks is 0, it is possible to hardlink snap-confine to
another location and then place an attacker controlled binary in place of
snap-update-ns and have this executed as root by snap-confine. Protect
against this by checking that snap-confine is located either within
/usr/lib/snapd or within the core or snapd snaps as expected.
This resolves CVE-2021-44730.
Signed-off-by: Alex Murray <alex.murray@canonical.com>
Gbp-Pq: Topic cve202144730
Gbp-Pq: Name 0011-cmd-libsnap-confine-private-Defend-against-hardlink-.patch
Alex Murray [Wed, 17 Nov 2021 03:53:25 +0000 (14:23 +1030)]
[PATCH 10/36] cmd/libsnap-confine-private: Fix use of uninitialised variable
Ensure xdg_runtime_dir_env is zero initialisd in
sc_call_snap_update_ns_as_user() otherwise when XDG_RUNTIME_DIR is not
defined the uninitialised contents of this buffer will be passed to
snap-update-ns. This is unlikely to be an issue in practice as
snap-update-ns is quite defensive in terms of environment variable handing
already.
Signed-off-by: Alex Murray <alex.murray@canonical.com>
Gbp-Pq: Topic cve202144730
Gbp-Pq: Name 0010-cmd-libsnap-confine-private-Fix-use-of-uninitialised.patch
Michael Hudson-Doyle [Thu, 17 Feb 2022 15:29:46 +0000 (15:29 +0000)]
man-page-sections
Gbp-Pq: Name 0010-man-page-sections.patch
Zygmunt Krynicki [Thu, 17 Jan 2019 14:42:35 +0000 (16:42 +0200)]
[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>
Gbp-Pq: Name 0007-i18n-use-dummy-localizations-to-avoid-dependencies.patch
Zygmunt Krynicki [Thu, 17 Jan 2019 13:51:14 +0000 (15:51 +0200)]
[PATCH 6/9] 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 <me@zygoon.pl>
Gbp-Pq: Name 0006-systemd-disable-snapfuse-system.patch
Zygmunt Krynicki [Thu, 17 Jan 2019 13:46:00 +0000 (15:46 +0200)]
[PATCH 5/9] 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 <me@zygoon.pl>
Gbp-Pq: Name 0005-advisor-errtracker-use-upstream-bolt-package.patch
Zygmunt Krynicki [Thu, 17 Jan 2019 15:38:41 +0000 (17:38 +0200)]
[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
Zygmunt Krynicki [Thu, 17 Jan 2019 15:21:22 +0000 (17:21 +0200)]
[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
Zygmunt Krynicki [Thu, 17 Jan 2019 15:11:12 +0000 (17:11 +0200)]
[PATCH 2/9] 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 <me@zygoon.pl>
Gbp-Pq: Name 0002-cmd-snap-seccomp-skip-tests-that-fail-on-4.19.patch
Zygmunt Krynicki [Thu, 17 Jan 2019 13:48:46 +0000 (15:48 +0200)]
[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>
Gbp-Pq: Name 0001-cmd-snap-seccomp-use-upstream-seccomp-package.patch
Michael Vogt [Thu, 17 Feb 2022 15:29:46 +0000 (15:29 +0000)]
snapd (2.37.4-1+deb10u1) buster-security; urgency=medium
* SECURITY UPDATE: local privilege escalation
- d/p/cve202144730: Add validations of the
location of the snap-confine binary within snapd.
- d/p/cve202144730: Fix race condition in snap-confine
when preparing a private mount namespace for a snap.
- CVE-2021-44730
- CVE-2021-44731
[dgit import unpatched snapd 2.37.4-1+deb10u1]
Michael Vogt [Thu, 17 Feb 2022 15:29:46 +0000 (15:29 +0000)]
Import snapd_2.37.4-1+deb10u1.debian.tar.xz
[dgit import tarball snapd 2.37.4-1+deb10u1 snapd_2.37.4-1+deb10u1.debian.tar.xz]
Zygmunt Krynicki [Thu, 28 Feb 2019 17:21:26 +0000 (17:21 +0000)]
Merge snapd (2.37.4-1) import into refs/heads/workingbranch
Zygmunt Krynicki [Thu, 28 Feb 2019 17:21:26 +0000 (17:21 +0000)]
Import snapd_2.37.4.orig.tar.xz
[dgit import orig snapd_2.37.4.orig.tar.xz]
Michael Hudson-Doyle [Thu, 28 Feb 2019 17:21:26 +0000 (17:21 +0000)]
man-page-sections
Gbp-Pq: Name 0010-man-page-sections.patch
Zygmunt Krynicki [Thu, 17 Jan 2019 14:42:35 +0000 (16:42 +0200)]
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>
Gbp-Pq: Name 0007-i18n-use-dummy-localizations-to-avoid-dependencies.patch
Zygmunt Krynicki [Thu, 17 Jan 2019 13:51:14 +0000 (15:51 +0200)]
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 <me@zygoon.pl>
Gbp-Pq: Name 0006-systemd-disable-snapfuse-system.patch
Zygmunt Krynicki [Thu, 17 Jan 2019 13:46:00 +0000 (15:46 +0200)]
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 <me@zygoon.pl>
Gbp-Pq: Name 0005-advisor-errtracker-use-upstream-bolt-package.patch
Zygmunt Krynicki [Thu, 17 Jan 2019 15:38:41 +0000 (17:38 +0200)]
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
Zygmunt Krynicki [Thu, 17 Jan 2019 15:21:22 +0000 (17:21 +0200)]
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
Zygmunt Krynicki [Thu, 17 Jan 2019 15:11:12 +0000 (17:11 +0200)]
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 <me@zygoon.pl>
Gbp-Pq: Name 0002-cmd-snap-seccomp-skip-tests-that-fail-on-4.19.patch
Zygmunt Krynicki [Thu, 17 Jan 2019 13:48:46 +0000 (15:48 +0200)]
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>
Gbp-Pq: Name 0001-cmd-snap-seccomp-use-upstream-seccomp-package.patch
Zygmunt Krynicki [Thu, 28 Feb 2019 17:21:26 +0000 (17:21 +0000)]
snapd (2.37.4-1) unstable; urgency=medium
* New upstream release
* d/patches0008-snap-squashsh-skip-TestBuildDate-on-Debian.patch: drop,
fixed upstream
[dgit import unpatched snapd 2.37.4-1]
Zygmunt Krynicki [Thu, 28 Feb 2019 17:21:26 +0000 (17:21 +0000)]
Import snapd_2.37.4-1.debian.tar.xz
[dgit import tarball snapd 2.37.4-1 snapd_2.37.4-1.debian.tar.xz]
Michael Hudson-Doyle [Thu, 7 Feb 2019 08:26:34 +0000 (08:26 +0000)]
Merge snapd (2.37.2-1) import into refs/heads/workingbranch
Michael Hudson-Doyle [Thu, 7 Feb 2019 08:26:34 +0000 (08:26 +0000)]
man-page-sections
Gbp-Pq: Name 0010-man-page-sections.patch
Zygmunt Krynicki [Mon, 21 Jan 2019 15:54:44 +0000 (16:54 +0100)]
snap/squashsh: skip TestBuildDate on Debian
On Debian the reported build date of a squashfs file is about two days
back from what the test expected.
Signed-off-by: Zygmunt Krynicki <me@zygoon.pl>
Gbp-Pq: Name 0008-snap-squashsh-skip-TestBuildDate-on-Debian.patch
Zygmunt Krynicki [Thu, 17 Jan 2019 14:42:35 +0000 (16:42 +0200)]
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>
Gbp-Pq: Name 0007-i18n-use-dummy-localizations-to-avoid-dependencies.patch
Zygmunt Krynicki [Thu, 17 Jan 2019 13:51:14 +0000 (15:51 +0200)]
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 <me@zygoon.pl>
Gbp-Pq: Name 0006-systemd-disable-snapfuse-system.patch
Zygmunt Krynicki [Thu, 17 Jan 2019 13:46:00 +0000 (15:46 +0200)]
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 <me@zygoon.pl>
Gbp-Pq: Name 0005-advisor-errtracker-use-upstream-bolt-package.patch
Zygmunt Krynicki [Thu, 17 Jan 2019 15:38:41 +0000 (17:38 +0200)]
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
Zygmunt Krynicki [Thu, 17 Jan 2019 15:21:22 +0000 (17:21 +0200)]
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
Zygmunt Krynicki [Thu, 17 Jan 2019 15:11:12 +0000 (17:11 +0200)]
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 <me@zygoon.pl>
Gbp-Pq: Name 0002-cmd-snap-seccomp-skip-tests-that-fail-on-4.19.patch
Zygmunt Krynicki [Thu, 17 Jan 2019 13:48:46 +0000 (15:48 +0200)]
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>
Gbp-Pq: Name 0001-cmd-snap-seccomp-use-upstream-seccomp-package.patch
Michael Hudson-Doyle [Thu, 7 Feb 2019 08:26:34 +0000 (08:26 +0000)]
snapd (2.37.2-1) unstable; urgency=medium
* New upstream releease.
[dgit import unpatched snapd 2.37.2-1]
Michael Hudson-Doyle [Thu, 7 Feb 2019 08:26:34 +0000 (08:26 +0000)]
Import snapd_2.37.2.orig.tar.xz
[dgit import orig snapd_2.37.2.orig.tar.xz]
Michael Hudson-Doyle [Thu, 7 Feb 2019 08:26:34 +0000 (08:26 +0000)]
Import snapd_2.37.2-1.debian.tar.xz
[dgit import tarball snapd 2.37.2-1 snapd_2.37.2-1.debian.tar.xz]
Michael Hudson-Doyle [Thu, 24 Jan 2019 03:11:17 +0000 (03:11 +0000)]
Merge snapd (2.37-3) import into refs/heads/workingbranch
Michael Hudson-Doyle [Thu, 24 Jan 2019 03:11:17 +0000 (03:11 +0000)]
man-page-sections
Gbp-Pq: Name 0010-man-page-sections.patch
Zygmunt Krynicki [Mon, 21 Jan 2019 17:55:12 +0000 (18:55 +0100)]
interfaces/apparmor: mock presence of overlayfs root
During the release of the snapd 2.37 we noticed that the Debian
builds performed in sbuild are failing on several unit tests. The same
source package would build file in pbuilder.
Investigation uncovered that sbuild is using overlayfs root internally.
This is picked up by the apparmor overlayfs detector and causes snapd to
generate an additional configuration file for snap-confine.
For reference, the offending entry from /proc/self/mountinfo:
228 23 0:40 / / rw,relatime shared:119 - overlay sid-amd64-sbuild rw,lowerdir=/var/lib/schroot/union/underlay/sid-amd64-sbuild-
85592074-da40-4faa-8b25-
a354b207cdf2,upperdir=/var/lib/schroot/union/overlay/sid-amd64-sbuild-
85592074-da40-4faa-8b25-
a354b207cdf2/upper,workdir=/var/lib/schroot/union/overlay/sid-amd64-sbuild-
85592074-da40-4faa-8b25-
a354b207cdf2/work
The extra generated file was upsetting tests that looked at
/var/lib/snapd/apparmor/snap-confine.
Signed-off-by: Zygmunt Krynicki <me@zygoon.pl>
Gbp-Pq: Name 0009-interfaces-apparmor-mock-presence-of-overlayfs-root.patch
Zygmunt Krynicki [Mon, 21 Jan 2019 15:54:44 +0000 (16:54 +0100)]
snap/squashsh: skip TestBuildDate on Debian
On Debian the reported build date of a squashfs file is about two days
back from what the test expected.
Signed-off-by: Zygmunt Krynicki <me@zygoon.pl>
Gbp-Pq: Name 0008-snap-squashsh-skip-TestBuildDate-on-Debian.patch
Zygmunt Krynicki [Thu, 17 Jan 2019 14:42:35 +0000 (16:42 +0200)]
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>
Gbp-Pq: Name 0007-i18n-use-dummy-localizations-to-avoid-dependencies.patch
Zygmunt Krynicki [Thu, 17 Jan 2019 13:51:14 +0000 (15:51 +0200)]
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 <me@zygoon.pl>
Gbp-Pq: Name 0006-systemd-disable-snapfuse-system.patch
Zygmunt Krynicki [Thu, 17 Jan 2019 13:46:00 +0000 (15:46 +0200)]
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 <me@zygoon.pl>
Gbp-Pq: Name 0005-advisor-errtracker-use-upstream-bolt-package.patch
Zygmunt Krynicki [Thu, 17 Jan 2019 15:38:41 +0000 (17:38 +0200)]
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
Zygmunt Krynicki [Thu, 17 Jan 2019 15:21:22 +0000 (17:21 +0200)]
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
Zygmunt Krynicki [Thu, 17 Jan 2019 15:11:12 +0000 (17:11 +0200)]
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 <me@zygoon.pl>
Gbp-Pq: Name 0002-cmd-snap-seccomp-skip-tests-that-fail-on-4.19.patch
Zygmunt Krynicki [Thu, 17 Jan 2019 13:48:46 +0000 (15:48 +0200)]
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>
Gbp-Pq: Name 0001-cmd-snap-seccomp-use-upstream-seccomp-package.patch
Michael Hudson-Doyle [Thu, 24 Jan 2019 03:11:17 +0000 (03:11 +0000)]
snapd (2.37-3) unstable; urgency=medium
* Fix --no-arch-any build.
[dgit import unpatched snapd 2.37-3]
Michael Hudson-Doyle [Thu, 24 Jan 2019 03:11:17 +0000 (03:11 +0000)]
Import snapd_2.37-3.debian.tar.xz
[dgit import tarball snapd 2.37-3 snapd_2.37-3.debian.tar.xz]
Zygmunt Krynicki [Tue, 22 Jan 2019 11:39:58 +0000 (11:39 +0000)]
Import snapd_2.37.orig.tar.xz
[dgit import orig snapd_2.37.orig.tar.xz]
Michael Stapelberg [Sat, 10 Feb 2018 22:18:15 +0000 (22:18 +0000)]
Merge snapd (2.30-5) import into refs/heads/workingbranch
Steve Langasek [Sat, 10 Feb 2018 22:18:15 +0000 (22:18 +0000)]
fix-pkg-config-line
Gbp-Pq: Name fix-pkg-config-line.patch
Steve Langasek [Sat, 10 Feb 2018 22:18:15 +0000 (22:18 +0000)]
disable-TestDoRequestSerialErrorsOnNoHost
Gbp-Pq: Name disable-TestDoRequestSerialErrorsOnNoHost.patch
Steve Langasek [Sat, 10 Feb 2018 22:18:15 +0000 (22:18 +0000)]
no-seccomp-fork
Gbp-Pq: Name no-seccomp-fork.patch
Steve Langasek [Sat, 10 Feb 2018 22:18:15 +0000 (22:18 +0000)]
disable-seccomp-tests
Gbp-Pq: Name disable-seccomp-tests.patch
Steve Langasek [Sat, 10 Feb 2018 22:18:15 +0000 (22:18 +0000)]
disable-i18n
Gbp-Pq: Name disable-i18n.patch
Michael Stapelberg [Sat, 10 Feb 2018 22:18:15 +0000 (22:18 +0000)]
snapd (2.30-5) unstable; urgency=medium
* Team upload.
* add fix-pkg-config-line.patch to fix FTBFS
* Set XS-Go-Import-Path
[dgit import unpatched snapd 2.30-5]
Michael Stapelberg [Sat, 10 Feb 2018 22:18:15 +0000 (22:18 +0000)]
Import snapd_2.30-5.debian.tar.xz
[dgit import tarball snapd 2.30-5 snapd_2.30-5.debian.tar.xz]
Michael Hudson-Doyle [Tue, 16 Jan 2018 00:02:31 +0000 (00:02 +0000)]
Merge snapd (2.30-4) import into refs/heads/workingbranch
Steve Langasek [Tue, 16 Jan 2018 00:02:31 +0000 (00:02 +0000)]
disable-TestDoRequestSerialErrorsOnNoHost
Gbp-Pq: Name disable-TestDoRequestSerialErrorsOnNoHost.patch
Steve Langasek [Tue, 16 Jan 2018 00:02:31 +0000 (00:02 +0000)]
no-seccomp-fork
Gbp-Pq: Name no-seccomp-fork.patch
Steve Langasek [Tue, 16 Jan 2018 00:02:31 +0000 (00:02 +0000)]
disable-seccomp-tests
Gbp-Pq: Name disable-seccomp-tests.patch
Steve Langasek [Tue, 16 Jan 2018 00:02:31 +0000 (00:02 +0000)]
disable-i18n
Gbp-Pq: Name disable-i18n.patch
Michael Hudson-Doyle [Tue, 16 Jan 2018 00:02:31 +0000 (00:02 +0000)]
snapd (2.30-4) unstable; urgency=medium
* Fix Built-Using computation on Debian.
* Add d/patches/disable-TestDoRequestSerialErrorsOnNoHost.patch to disable
a flaky test.
[dgit import unpatched snapd 2.30-4]
Michael Hudson-Doyle [Tue, 16 Jan 2018 00:02:31 +0000 (00:02 +0000)]
Import snapd_2.30-4.debian.tar.xz
[dgit import tarball snapd 2.30-4 snapd_2.30-4.debian.tar.xz]
Michael Hudson-Doyle [Thu, 4 Jan 2018 20:39:07 +0000 (20:39 +0000)]
Import snapd_2.30.orig.tar.gz
[dgit import orig snapd_2.30.orig.tar.gz]
Michael Hudson-Doyle [Tue, 26 Sep 2017 17:41:53 +0000 (18:41 +0100)]
Merge snapd (2.27.6-2) import into refs/heads/workingbranch
Steve Langasek [Tue, 26 Sep 2017 17:41:53 +0000 (18:41 +0100)]
no-reexec-on-debian
Gbp-Pq: Name no-reexec-on-debian.patch
Steve Langasek [Tue, 26 Sep 2017 17:41:53 +0000 (18:41 +0100)]
pb.v1-canonical-path
Gbp-Pq: Name pb.v1-canonical-path.patch
Steve Langasek [Tue, 26 Sep 2017 17:41:53 +0000 (18:41 +0100)]
no-seccomp-fork
Gbp-Pq: Name no-seccomp-fork.patch
Steve Langasek [Tue, 26 Sep 2017 17:41:53 +0000 (18:41 +0100)]
disable-seccomp-tests
Gbp-Pq: Name disable-seccomp-tests.patch
Steve Langasek [Tue, 26 Sep 2017 17:41:53 +0000 (18:41 +0100)]
disable-i18n
Gbp-Pq: Name disable-i18n.patch
Steve Langasek [Tue, 26 Sep 2017 17:41:53 +0000 (18:41 +0100)]
apparmor-compat
Gbp-Pq: Name apparmor-compat.patch
Zygmunt Krynicki [Fri, 8 Sep 2017 08:52:58 +0000 (10:52 +0200)]
osutil: adjust StreamCommand tests for golang 1.9
In golang 1.9 there are richer error constructs returned from certain
operations and tests were very precisely monitoring the result. This
patch adjust tests to work on both golang 1.9 and earlier.
Signed-off-by: Zygmunt Krynicki <me@zygoon.pl>
Gbp-Pq: Name 0001-osutil-adjust-StreamCommand-tests-for-golang-1.9.patch
Michael Hudson-Doyle [Tue, 26 Sep 2017 17:41:53 +0000 (18:41 +0100)]
snapd (2.27.6-2) unstable; urgency=medium
* Add d/patches/0001-osutil-adjust-StreamCommand-tests-for-golang-1.9.patch
to fix FTBFS with Go 1.9. (Closes: #876867)
[dgit import unpatched snapd 2.27.6-2]
Michael Hudson-Doyle [Tue, 26 Sep 2017 17:41:53 +0000 (18:41 +0100)]
Import snapd_2.27.6-2.debian.tar.xz
[dgit import tarball snapd 2.27.6-2 snapd_2.27.6-2.debian.tar.xz]
Zygmunt Krynicki [Thu, 7 Sep 2017 22:03:18 +0000 (23:03 +0100)]
Merge snapd (2.27.6-1) import into refs/heads/workingbranch
Zygmunt Krynicki [Thu, 7 Sep 2017 22:03:18 +0000 (23:03 +0100)]
Import snapd_2.27.6.orig.tar.gz
[dgit import orig snapd_2.27.6.orig.tar.gz]
Steve Langasek [Thu, 7 Sep 2017 22:03:18 +0000 (23:03 +0100)]
no-reexec-on-debian
Gbp-Pq: Name no-reexec-on-debian.patch
Steve Langasek [Thu, 7 Sep 2017 22:03:18 +0000 (23:03 +0100)]
pb.v1-canonical-path
Gbp-Pq: Name pb.v1-canonical-path.patch
Steve Langasek [Thu, 7 Sep 2017 22:03:18 +0000 (23:03 +0100)]
no-seccomp-fork
Gbp-Pq: Name no-seccomp-fork.patch
Steve Langasek [Thu, 7 Sep 2017 22:03:18 +0000 (23:03 +0100)]
disable-seccomp-tests
Gbp-Pq: Name disable-seccomp-tests.patch
Steve Langasek [Thu, 7 Sep 2017 22:03:18 +0000 (23:03 +0100)]
disable-i18n
Gbp-Pq: Name disable-i18n.patch
Steve Langasek [Thu, 7 Sep 2017 22:03:18 +0000 (23:03 +0100)]
apparmor-compat
Gbp-Pq: Name apparmor-compat.patch
Zygmunt Krynicki [Thu, 7 Sep 2017 22:03:18 +0000 (23:03 +0100)]
snapd (2.27.6-1) unstable; urgency=medium
* New upstream release, LP: #
1703798:
- interfaces: add udev netlink support to hardware-observe
- interfaces/network-{control,observe}: allow receiving
kobject_uevent() messages
[dgit import unpatched snapd 2.27.6-1]
Zygmunt Krynicki [Thu, 7 Sep 2017 22:03:18 +0000 (23:03 +0100)]
Import snapd_2.27.6-1.debian.tar.xz
[dgit import tarball snapd 2.27.6-1 snapd_2.27.6-1.debian.tar.xz]
Michael Hudson-Doyle [Thu, 24 Aug 2017 10:12:52 +0000 (11:12 +0100)]
Merge snapd (2.27.4-1) import into refs/heads/workingbranch
Steve Langasek [Thu, 24 Aug 2017 10:12:52 +0000 (11:12 +0100)]
no-reexec-on-debian
Gbp-Pq: Name no-reexec-on-debian.patch
Steve Langasek [Thu, 24 Aug 2017 10:12:52 +0000 (11:12 +0100)]
pb.v1-canonical-path
Gbp-Pq: Name pb.v1-canonical-path.patch
Steve Langasek [Thu, 24 Aug 2017 10:12:52 +0000 (11:12 +0100)]
no-seccomp-fork
Gbp-Pq: Name no-seccomp-fork.patch
Steve Langasek [Thu, 24 Aug 2017 10:12:52 +0000 (11:12 +0100)]
disable-seccomp-tests
Gbp-Pq: Name disable-seccomp-tests.patch
Steve Langasek [Thu, 24 Aug 2017 10:12:52 +0000 (11:12 +0100)]
disable-i18n
Gbp-Pq: Name disable-i18n.patch
Steve Langasek [Thu, 24 Aug 2017 10:12:52 +0000 (11:12 +0100)]
apparmor-compat
Gbp-Pq: Name apparmor-compat.patch
Michael Hudson-Doyle [Thu, 24 Aug 2017 10:12:52 +0000 (11:12 +0100)]
snapd (2.27.4-1) unstable; urgency=medium
* New upstream release.
* Enable seccomp.
[dgit import unpatched snapd 2.27.4-1]