diff -Nru urfkill-0.6.0~20140527.173146.03f4503/debian/changelog urfkill-0.6.0~20140527.173146.03f4503/debian/changelog --- urfkill-0.6.0~20140527.173146.03f4503/debian/changelog 2014-05-29 04:40:05.000000000 -0500 +++ urfkill-0.6.0~20140527.173146.03f4503/debian/changelog 2014-06-24 12:37:45.000000000 -0500 @@ -1,3 +1,16 @@ +urfkill (0.6.0~20140527.173146.03f4503-0ubuntu1~mtrudel1ubuntu1) UNRELEASED; urgency=medium + + [ Jamie Strandboge ] + * add lenient AppArmor profile to allow connecting to ofono (LP: #1296415) + - add debian/usr.lib.urfkilld + - debian/control: Build-Depends on dh-apparmor + - debian/rules: update override_dh_installdeb to use dh_apparmor + - debian/urfkill.dirs: add etc/apparmor.d + - debian/urfkill.install: install profile in to place + - debian/urfkill.upstart.in: update to load AppArmor profile + + -- Jamie Strandboge Mon, 23 Jun 2014 17:36:01 -0500 + urfkill (0.6.0~20140527.173146.03f4503-0ubuntu1~mtrudel1) utopic; urgency=medium [ Mathieu Trudel-Lapierre ] diff -Nru urfkill-0.6.0~20140527.173146.03f4503/debian/control urfkill-0.6.0~20140527.173146.03f4503/debian/control --- urfkill-0.6.0~20140527.173146.03f4503/debian/control 2014-05-29 04:40:05.000000000 -0500 +++ urfkill-0.6.0~20140527.173146.03f4503/debian/control 2014-06-23 17:38:10.000000000 -0500 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Keng-Yu Lin -Build-Depends: debhelper (>= 9), dh-autoreconf (>=2), dh-exec (>=0.3), autotools-dev, libglib2.0-dev, libdbus-1-dev, libdbus-glib-1-dev, libudev-dev, libpolkit-gobject-1-dev, libexpat1-dev, intltool (>=0.40.0), gobject-introspection (>= 0.6.7), libgirepository1.0-dev (>= 0.6.7), gir1.2-gtk-2.0, gir1.2-gtk-3.0, autopoint, gtk-doc-tools, hardening-wrapper +Build-Depends: debhelper (>= 9), dh-autoreconf (>=2), dh-exec (>=0.3), autotools-dev, libglib2.0-dev, libdbus-1-dev, libdbus-glib-1-dev, libudev-dev, libpolkit-gobject-1-dev, libexpat1-dev, intltool (>=0.40.0), gobject-introspection (>= 0.6.7), libgirepository1.0-dev (>= 0.6.7), gir1.2-gtk-2.0, gir1.2-gtk-3.0, autopoint, gtk-doc-tools, hardening-wrapper, dh-apparmor Standards-Version: 3.9.4 Homepage: http://www.freedesktop.org/wiki/Software/urfkill diff -Nru urfkill-0.6.0~20140527.173146.03f4503/debian/rules urfkill-0.6.0~20140527.173146.03f4503/debian/rules --- urfkill-0.6.0~20140527.173146.03f4503/debian/rules 2014-05-29 04:40:05.000000000 -0500 +++ urfkill-0.6.0~20140527.173146.03f4503/debian/rules 2014-06-23 17:39:07.000000000 -0500 @@ -32,3 +32,7 @@ %: dh $@ --with autotools_dev,autoreconf + +override_dh_installdeb: + dh_apparmor --profile-name=usr.lib.urfkilld -purfkill + dh_installdeb diff -Nru urfkill-0.6.0~20140527.173146.03f4503/debian/urfkill.dirs urfkill-0.6.0~20140527.173146.03f4503/debian/urfkill.dirs --- urfkill-0.6.0~20140527.173146.03f4503/debian/urfkill.dirs 2014-05-29 04:40:05.000000000 -0500 +++ urfkill-0.6.0~20140527.173146.03f4503/debian/urfkill.dirs 2014-06-23 17:41:07.000000000 -0500 @@ -1 +1,2 @@ var/lib/urfkill +etc/apparmor.d diff -Nru urfkill-0.6.0~20140527.173146.03f4503/debian/urfkill.install urfkill-0.6.0~20140527.173146.03f4503/debian/urfkill.install --- urfkill-0.6.0~20140527.173146.03f4503/debian/urfkill.install 2014-05-29 04:40:05.000000000 -0500 +++ urfkill-0.6.0~20140527.173146.03f4503/debian/urfkill.install 2014-06-23 17:41:26.000000000 -0500 @@ -4,3 +4,4 @@ usr/share/man/ usr/lib/*/urfkill/urfkilld debian/scripts/ /usr/share/urfkill/ +debian/usr.lib.urfkilld etc/apparmor.d diff -Nru urfkill-0.6.0~20140527.173146.03f4503/debian/urfkill.upstart.in urfkill-0.6.0~20140527.173146.03f4503/debian/urfkill.upstart.in --- urfkill-0.6.0~20140527.173146.03f4503/debian/urfkill.upstart.in 2014-05-29 04:40:05.000000000 -0500 +++ urfkill-0.6.0~20140527.173146.03f4503/debian/urfkill.upstart.in 2014-06-24 12:37:25.000000000 -0500 @@ -11,4 +11,8 @@ respawn +pre-start script + /lib/init/apparmor-profile-load usr.lib.urfkilld +end script + exec /usr/lib/@DEB_HOST_MULTIARCH@/urfkill/urfkilld diff -Nru urfkill-0.6.0~20140527.173146.03f4503/debian/usr.lib.urfkilld urfkill-0.6.0~20140527.173146.03f4503/debian/usr.lib.urfkilld --- urfkill-0.6.0~20140527.173146.03f4503/debian/usr.lib.urfkilld 1969-12-31 18:00:00.000000000 -0600 +++ urfkill-0.6.0~20140527.173146.03f4503/debian/usr.lib.urfkilld 2014-06-24 17:29:48.000000000 -0500 @@ -0,0 +1,16 @@ +#include + +# Permissive profile to have profile name to limit access to ofonod (LP: #1296415) +/usr/lib/*/urfkill/urfkilld (attach_disconnected) { + capability, + mount, + remount, + umount, + network, + / rwkl, + /** rwlkm, + /** pix, + dbus, + signal, + ptrace, +}