Click Apparmor

Merge lp://staging/~jdstrand/click-apparmor/lp1383858 into lp://staging/click-apparmor

lp1383858
Merge into trunk

Proposed by Jamie Strandboge on 2014-10-22

Status:

Merged

Approved by:

Jamie Strandboge on 2014-10-22

Approved revision:

125

Merged at revision:

125

Proposed branch:

lp://staging/~jdstrand/click-apparmor/lp1383858

Merge into:

lp://staging/click-apparmor

Diff against target:

30 lines (+10/-0)

2 files modified

aa-clickhook (+3/-0)
debian/changelog (+7/-0)

To merge this branch:

bzr merge lp://staging/~jdstrand/click-apparmor/lp1383858

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Steve Beattie (community)		2014-10-22	Approve on 2014-10-22
Review via email: mp+239225@code.staging.launchpad.net

Description of the change

aa-clickhook: disable expr tree simplification when calling the parser since this considerably slows down click policy compiles (LP: #1383858).

Installing click-appamor and python3-apparmor-click show that profiles are being loaded with the added option:

$ ps auxww|grep apparmor_parser
root 29828 0.0 0.2 34808 21520 pts/45 R+ 12:00 0:00 /sbin/apparmor_parser -r --write-cache -O no-expr-simplify --cache-loc=/var/cache/apparmor /var/lib/apparmor/profiles/click_com.ubuntu.developer.jdstrand.applicationlifecycleapp_ApplicationLifecycleApp_0.1