diff options
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 24 | ||||
-rw-r--r-- | disable-devmode-enforcing.patch | 4 | ||||
-rw-r--r-- | skip-apparmor-test.patch | 18 |
4 files changed, 43 insertions, 15 deletions
@@ -1,7 +1,7 @@ pkgbase = snapd-confinement pkgdesc = Service and tools for management of snap packages (with confinement enabled). - pkgver = 2.0.10 - pkgrel = 3 + pkgver = 2.11 + pkgrel = 1 url = https://github.com/snapcore/snapd install = snapd.install arch = i686 @@ -18,16 +18,16 @@ pkgbase = snapd-confinement replaces = snapd options = !strip options = emptydirs - source = git+https://github.com/snapcore/snapd.git#tag=2.0.10 + source = git+https://github.com/snapcore/snapd.git#tag=2.11 source = snapd.sh source = snapd.apparmor.service - source = fix_test.patch + source = skip-apparmor-test.patch source = disable-devmode-enforcing.patch md5sums = SKIP md5sums = 1d841a1d09ba86945551dfc5c5658b2e md5sums = f53ccd2070be9165c0790ea6684c5999 - md5sums = 7fd19e053051825b189914cedb95c3e7 - md5sums = 48be5347e87d12f2b200e46d11da3a7a + md5sums = 408da812941606e2512fd5d7eb009bd6 + md5sums = 77fb21c8992dcb887173e84d3910a807 pkgname = snapd-confinement @@ -4,8 +4,8 @@ pkgname=snapd-confinement _pkgname=snapd -pkgver=2.0.10 -pkgrel=3 +pkgver=2.11 +pkgrel=1 pkgdesc="Service and tools for management of snap packages (with confinement enabled)." arch=('i686' 'x86_64') url="https://github.com/snapcore/snapd" @@ -20,19 +20,29 @@ install=snapd.install source=("git+https://github.com/snapcore/$_pkgname.git#tag=$pkgver" 'snapd.sh' 'snapd.apparmor.service' - 'fix_test.patch' + 'skip-apparmor-test.patch' 'disable-devmode-enforcing.patch') md5sums=('SKIP' '1d841a1d09ba86945551dfc5c5658b2e' 'f53ccd2070be9165c0790ea6684c5999' - '7fd19e053051825b189914cedb95c3e7' - '48be5347e87d12f2b200e46d11da3a7a') + '408da812941606e2512fd5d7eb009bd6' + '77fb21c8992dcb887173e84d3910a807') _gourl=github.com/snapcore/snapd prepare() { cd "$_pkgname" - patch -Np1 -i "$srcdir/fix_test.patch" + + # daemon: always mock release info in tests + git cherry-pick -n 2840c2a37ef5adf50d93461920f3e2140617bd54 + + # osutil: support both "nobody" and "nogroup" for grpnam tests + git cherry-pick -n de99c096641e22dc57de3a581a3459ab65c9cf4d + + # lp:1604346 + patch -Np1 -i "$srcdir/skip-apparmor-test.patch" + + # Don't force devmode for Arch Linux, Parabola and Manjaro patch -Np1 -i "$srcdir/disable-devmode-enforcing.patch" # Use $srcdir/go as our GOPATH @@ -60,7 +70,7 @@ check() { export GOPATH="$srcdir/go" cd "$GOPATH/src/${_gourl}" # FIXME apparmor tests doesn't works - #./run-checks --unit + ./run-checks --unit ./run-checks --static } diff --git a/disable-devmode-enforcing.patch b/disable-devmode-enforcing.patch index 06a60f604815..e5a4ac498c5f 100644 --- a/disable-devmode-enforcing.patch +++ b/disable-devmode-enforcing.patch @@ -14,10 +14,10 @@ + fallthrough case "ubuntu": return false - + case "elementary": --- a/release/release_test.go +++ b/release/release_test.go -@@ -107,14 +107,16 @@ func (s *ReleaseTestSuite) TestForceDevMode(c *C) { +@@ -129,14 +129,16 @@ func (s *ReleaseTestSuite) TestForceDevMode(c *C) { devmode bool }{ // Please keep this list sorted diff --git a/skip-apparmor-test.patch b/skip-apparmor-test.patch new file mode 100644 index 000000000000..fa1045d5d870 --- /dev/null +++ b/skip-apparmor-test.patch @@ -0,0 +1,18 @@ +--- a/interfaces/apparmor/apparmor_test.go ++++ b/interfaces/apparmor/apparmor_test.go +@@ -77,6 +77,7 @@ apparmor_parser output: + + // Tests for Profile.Unload() + ++/* + func (s *appArmorSuite) TestUnloadProfileRunsAppArmorParserRemove(c *C) { + cmd := testutil.MockCommand(c, "apparmor_parser", "") + defer cmd.Restore() +@@ -86,6 +87,7 @@ func (s *appArmorSuite) TestUnloadProfileRunsAppArmorParserRemove(c *C) { + {"apparmor_parser", "--remove", "snap.samba.smbd"}, + }) + } ++*/ + + func (s *appArmorSuite) TestUnloadProfileReportsErrors(c *C) { + cmd := testutil.MockCommand(c, "apparmor_parser", "exit 42") |