upgpkg: snapd 2.60-1

upstream release

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

3 files changed, 12 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 12dde1c927ba..f936f54028ad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = snapd
 	pkgdesc = Service and tools for management of snap packages.
-	pkgver = 2.59.5
-	pkgrel = 2
+	pkgver = 2.60
+	pkgrel = 1
 	url = https://github.com/snapcore/snapd
 	install = snapd.install
 	arch = x86_64
@@ -28,9 +28,7 @@ pkgbase = snapd
 	options = !strip
 	options = emptydirs
 	options = !lto
-	source = snapd-2.59.5.tar.xz::https://github.com/snapcore/snapd/releases/download/2.59.5/snapd_2.59.5.vendor.tar.xz
-	source = 0001-snap-confine-add-tmpfs-mount-rule-to-apparmor-profil.patch
-	sha256sums = d2d9efbc2db7fa79edf0c73286320ab5ba039ae30874e88725ef326c618ae5df
-	sha256sums = 03caf6a339e29bfdaa443c36d2b3f7350f1869c8b6cab86ba5fb46d858fef596
+	source = snapd-2.60.tar.xz::https://github.com/snapcore/snapd/releases/download/2.60/snapd_2.60.vendor.tar.xz
+	sha256sums = 1d940ba7cee1b6a1fd961c591abf8fdde9d313eff0fb8b6967ad01f40426f33e
 
 pkgname = snapd
diff --git a/0001-snap-confine-add-tmpfs-mount-rule-to-apparmor-profil.patch b/0001-snap-confine-add-tmpfs-mount-rule-to-apparmor-profil.patch
deleted file mode 100644
index 62a771c05697..000000000000
--- a/0001-snap-confine-add-tmpfs-mount-rule-to-apparmor-profil.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 385d206348e4dad96ab4fe0fd08f3818515e3906 Mon Sep 17 00:00:00 2001
-Message-ID: <385d206348e4dad96ab4fe0fd08f3818515e3906.1686423653.git.maciek.borzecki@gmail.com>
-From: Michael Vogt <mvo@ubuntu.com>
-Date: Mon, 5 Jun 2023 16:18:47 +0200
-Subject: [PATCH] snap-confine: add `tmpfs` mount rule to apparmor profile
- (#12845)
-
-There is a bugfix to make the mount rules more strict/explicit in apparmor 3.0.10, see https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.0.10 - this affects snapd as it's current profile relies on the implicit behavior. With this commit the missing mount rule is added explicitly.
-
-Signed-off-by: Maciej Borzecki <maciek.borzecki@gmail.com>
----
- cmd/snap-confine/snap-confine.apparmor.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cmd/snap-confine/snap-confine.apparmor.in b/cmd/snap-confine/snap-confine.apparmor.in
-index fb999368bc477f1fa311047696480becfe1e65ad..73d14c8c781b00fd1b3c28f814c9d7686d05c679 100644
---- a/cmd/snap-confine/snap-confine.apparmor.in
-+++ b/cmd/snap-confine/snap-confine.apparmor.in
-@@ -172,6 +172,7 @@
- 
-     # boostrapping the mount namespace
-     /tmp/snap.rootfs_*/ rw,
-+    mount fstype=tmpfs none -> /tmp/snap.rootfs_*/,
-     mount options=(rw rshared) -> /,
-     mount options=(rw bind) /tmp/snap.rootfs_*/ -> /tmp/snap.rootfs_*/,
-     mount options=(rw unbindable) -> /tmp/snap.rootfs_*/,
--- 
-2.41.0
-
diff --git a/PKGBUILD b/PKGBUILD
index ee8250b37871..75dc923d9a7e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@ pkgdesc="Service and tools for management of snap packages."
 depends=('squashfs-tools' 'libseccomp' 'libsystemd' 'apparmor')
 optdepends=('bash-completion: bash completion support'
             'xdg-desktop-portal: desktop integration')
-pkgver=2.59.5
-pkgrel=2
+pkgver=2.60
+pkgrel=1
 arch=('x86_64' 'i686' 'armv7h' 'aarch64')
 url="https://github.com/snapcore/snapd"
 license=('GPL3')
@@ -19,11 +19,9 @@ options=('!strip' 'emptydirs' '!lto')
 install=snapd.install
 source=(
     "$pkgname-$pkgver.tar.xz::https://github.com/snapcore/${pkgname}/releases/download/${pkgver}/${pkgname}_${pkgver}.vendor.tar.xz"
-    "0001-snap-confine-add-tmpfs-mount-rule-to-apparmor-profil.patch"
 )
 sha256sums=(
-    'd2d9efbc2db7fa79edf0c73286320ab5ba039ae30874e88725ef326c618ae5df'
-    '03caf6a339e29bfdaa443c36d2b3f7350f1869c8b6cab86ba5fb46d858fef596'
+    '1d940ba7cee1b6a1fd961c591abf8fdde9d313eff0fb8b6967ad01f40426f33e'
 )
 
 
@@ -202,4 +200,9 @@ 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"
+
+  # Remove prompt services
+  rm -fv "$pkgdir/usr/lib/systemd/system/snapd.aa-prompt-listener.service"
+  rm -fv "$pkgdir/usr/lib/systemd/user/snapd.aa-prompt-ui.service"
+  rm -fv "$pkgdir/usr/share/dbus-1/services/io.snapcraft.Prompt.service"
 }