snapd: bump release to 2.33.1, improve compat with arch derivatives

- update to 2.33.1 release
- backport a patch that improves distro detection on arch derivatives
- drop unused /var/lib/snapd/apparmor directory

Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com>

2 files changed, 40 insertions, 4 deletions

diff --git a/0001-dirs-improve-identification-of-Arch-Linux-like-syste.patch b/0001-dirs-improve-identification-of-Arch-Linux-like-syste.patch
new file mode 100644
index 000000000000..66074c0aab24
--- /dev/null
+++ b/0001-dirs-improve-identification-of-Arch-Linux-like-syste.patch
@@ -0,0 +1,30 @@
+From 043ea8a4831975373e1cb5c63dc09ee5609f5d36 Mon Sep 17 00:00:00 2001
+Message-Id: <043ea8a4831975373e1cb5c63dc09ee5609f5d36.1529666554.git.maciej.zenon.borzecki@canonical.com>
+From: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
+Date: Fri, 22 Jun 2018 12:34:30 +0200
+Subject: [PATCH] dirs: improve identification of Arch Linux like systems
+
+Arch Linux derivatives correctly set ID_LIKE=archlinux but we use 'arch' in our
+detection (which is only set by Arch as ID=arch).
+
+Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
+---
+ dirs/dirs.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dirs/dirs.go b/dirs/dirs.go
+index df4c028083c16c6abfa7438a5b11459e9dcc9b07..2e84ae962665f97e1bc2312993a89b1a8bc58bbf 100644
+--- a/dirs/dirs.go
++++ b/dirs/dirs.go
+@@ -178,7 +178,7 @@ func SetRootDir(rootdir string) {
+ 	}
+ 	GlobalRootDir = rootdir
+ 
+-	if release.DistroLike("fedora", "arch", "manjaro") {
++	if release.DistroLike("fedora", "archlinux", "manjaro") {
+ 		SnapMountDir = filepath.Join(rootdir, "/var/lib/snapd/snap")
+ 	} else {
+ 		SnapMountDir = filepath.Join(rootdir, defaultSnapMountDir)
+-- 
+2.17.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 951aa3147772..644bc2816690 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@ pkgname=snapd
 pkgdesc="Service and tools for management of snap packages."
 depends=('squashfs-tools' 'libseccomp' 'libsystemd')
 optdepends=('bash-completion: bash completion support')
-pkgver=2.33
-pkgrel=2
+pkgver=2.33.1
+pkgrel=1
 arch=('x86_64')
 url="https://github.com/snapcore/snapd"
 license=('GPL3')
@@ -16,8 +16,10 @@ makedepends=('git' 'go' 'go-tools' 'libseccomp' 'libcap' 'systemd' 'xfsprogs' 'p
 conflicts=('snap-confine')
 options=('!strip' 'emptydirs')
 install=snapd.install
-source=("$pkgname-$pkgver.tar.xz::https://github.com/snapcore/${pkgname}/releases/download/${pkgver}/${pkgname}_${pkgver}.vendor.tar.xz")
-sha256sums=('35f429194398461e74e13aaec47307754adcafc1571044d625fcf561537c103c')
+source=("$pkgname-$pkgver.tar.xz::https://github.com/snapcore/${pkgname}/releases/download/${pkgver}/${pkgname}_${pkgver}.vendor.tar.xz"
+        '0001-dirs-improve-identification-of-Arch-Linux-like-syste.patch')
+sha256sums=('ac36fc0093c3eb3eaf2158db3ad3a26114903724d6cb98b7068fe45d6b440d94'
+           '8f3d31705c1d32f5b199c0794f03acf40e2eb8e0c54fb5cb49831fdbfe5aaf80')
 
 _gourl=github.com/snapcore/snapd
 
@@ -32,6 +34,8 @@ prepare() {
   # above describes.
   mkdir -p "$(dirname "$GOPATH/src/${_gourl}")"
   ln --no-target-directory -fs "$srcdir/$pkgname-$pkgver" "$GOPATH/src/${_gourl}"
+
+  patch -Np1 -i "$srcdir/0001-dirs-improve-identification-of-Arch-Linux-like-syste.patch"
 }
 
 build() {
@@ -153,4 +157,6 @@ package() {
   rm -fv "$pkgdir/usr/lib/snapd/snapd.core-fixup.sh"
   rm -fv "$pkgdir/usr/bin/ubuntu-core-launcher"
   rm -fv "$pkgdir/usr/lib/snapd/system-shutdown"
+  # apparmor bits
+  rm -rfv "$pkgdir"/var/lib/snapd/apparmor
 }