summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Redaelli2016-07-20 09:31:22 +0200
committerTimothy Redaelli2016-07-20 09:31:22 +0200
commit6047b1a462f84a4ff43cc7f046baf57f69a4526e (patch)
treed5e94633bf8f9ef412425f0fd946989222a2ea11
parent0ffe949a24b5d7eb4796998039ac445f6167328c (diff)
downloadaur-6047b1a462f84a4ff43cc7f046baf57f69a4526e.tar.gz
Add confinement support for Manjaro
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rw-r--r--disable-devmode-enforcing.patch23
3 files changed, 16 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 84567887581e..588631a625d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -27,7 +27,7 @@ pkgbase = snapd-confinement
md5sums = 1d841a1d09ba86945551dfc5c5658b2e
md5sums = 53722064f5e270fd7530de6ba4590f04
md5sums = 7fd19e053051825b189914cedb95c3e7
- md5sums = cf60668da3dbce5a779aec3c52c69528
+ md5sums = 48be5347e87d12f2b200e46d11da3a7a
pkgname = snapd-confinement
diff --git a/PKGBUILD b/PKGBUILD
index 2eb66ce2101f..136a83417179 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -26,7 +26,7 @@ md5sums=('SKIP'
'1d841a1d09ba86945551dfc5c5658b2e'
'53722064f5e270fd7530de6ba4590f04'
'7fd19e053051825b189914cedb95c3e7'
- 'cf60668da3dbce5a779aec3c52c69528')
+ '48be5347e87d12f2b200e46d11da3a7a')
_gourl=github.com/snapcore/snapd
diff --git a/disable-devmode-enforcing.patch b/disable-devmode-enforcing.patch
index f55c1009dc2f..06a60f604815 100644
--- a/disable-devmode-enforcing.patch
+++ b/disable-devmode-enforcing.patch
@@ -1,19 +1,23 @@
---- snapd/release/release.go.bak 2016-07-18 16:43:17.137859989 +0200
-+++ snapd/release/release.go 2016-07-18 16:50:05.033109215 +0200
-@@ -43,6 +43,10 @@
+--- a/release/release.go
++++ b/release/release.go
+@@ -41,8 +41,14 @@ type OS struct {
+ // security features for confinement and devmode is forced.
+ func (os *OS) ForceDevMode() bool {
switch os.ID {
- case "neon":
- fallthrough
+ case "arch":
+ fallthrough
++ case "manjaro":
++ fallthrough
+ case "neon":
+ fallthrough
+ case "parabola":
+ fallthrough
case "ubuntu":
return false
---- snapd/release/release_test.go.bak 2016-07-18 16:48:05.185499404 +0200
-+++ snapd/release/release_test.go 2016-07-18 16:49:34.725213399 +0200
-@@ -107,7 +107,7 @@
+--- a/release/release_test.go
++++ b/release/release_test.go
+@@ -107,14 +107,16 @@ func (s *ReleaseTestSuite) TestForceDevMode(c *C) {
devmode bool
}{
// Please keep this list sorted
@@ -22,8 +26,9 @@
{id: "debian", devmode: true},
{id: "elementary", devmode: true},
{id: "elementary", idVersion: "0.4", devmode: false},
-@@ -115,6 +115,7 @@
+ {id: "fedora", devmode: true},
{id: "gentoo", devmode: true},
++ {id: "manjaro", devmode: false},
{id: "neon", devmode: false},
{id: "opensuse", devmode: true},
+ {id: "parabola", devmode: false},