From 662c167d12eeb3e43a0dd4b78ccd5de493583a53 Mon Sep 17 00:00:00 2001
From: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
Date: Mon, 22 Sep 2014 23:59:25 -0300
Subject: [PATCH] Import patches-unapplied version 2.243 to
ubuntu/utopic-proposed
Imported using git-ubuntu import.
Changelog parent: 3781f8a8b090f99542dae87df9db235dee010f7f
New changelog entries:
* Updating apparmor features file for Ubuntu Touch
---
debian/changelog | 6 ++++++
.../includes.chroot/var/cache/apparmor/.features | 8 ++++++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4b5e4eb4..be302166 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.243) utopic; urgency=medium
+
+ * Updating apparmor features file for Ubuntu Touch
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> Mon, 22 Sep 2014 23:59:25 -0300
+
livecd-rootfs (2.242) utopic; urgency=medium
* get-ppa-fingerprint: Adjust use of
diff --git a/live-build/ubuntu-touch/includes.chroot/var/cache/apparmor/.features b/live-build/ubuntu-touch/includes.chroot/var/cache/apparmor/.features
index 652f78d9..9d7e6af1 100644
--- a/live-build/ubuntu-touch/includes.chroot/var/cache/apparmor/.features
+++ b/live-build/ubuntu-touch/includes.chroot/var/cache/apparmor/.features
@@ -23,7 +23,9 @@ profile {yes
mount {mask {mount umount
}
}
-network {af_mask {unspec unix local inet ax25 ipx appletalk netrom bridge atmpvc x25 inet6 rose netbeui security key netlink packet ash econet atmsvc rds sna irda pppox wanpipe llc can tipc bluetooth iucv rxrpc isdn phonet ieee802154 caif alg nfc max
+network {af_unix {yes
+}
+af_mask {unspec unix inet ax25 ipx appletalk netrom bridge atmpvc x25 inet6 rose netbeui security key netlink packet ash econet atmsvc rds sna irda pppox wanpipe llc can tipc bluetooth iucv rxrpc isdn phonet ieee802154 caif alg nfc
}
}
file {mask {create read write exec append mmap_exec link lock
@@ -40,7 +42,9 @@ change_hat {yes
}
policy {set_load {yes
}
-versions {v6 {yes
+versions {v7 {yes
+}
+v6 {yes
}
v5 {yes
}