Merge lp://qastaging/~apparmor-dev/apparmor/aa-fixes into lp://qastaging/~apparmor-dev/apparmor/apparmor-ubuntu-citrain
| Status: | Merged |
|---|---|
| Approved by: | Jamie Strandboge |
| Approved revision: | 1507 |
| Merged at revision: | 1500 |
| Proposed branch: | lp://qastaging/~apparmor-dev/apparmor/aa-fixes |
| Merge into: | lp://qastaging/~apparmor-dev/apparmor/apparmor-ubuntu-citrain |
| Diff against target: |
1166 lines (+1101/-2) 10 files modified
debian/changelog (+26/-2) debian/patches/bare-capability-rule-support.patch (+89/-0) debian/patches/check-config-for-sysctl.patch (+274/-0) debian/patches/fix-typo-in-dbus_write.patch (+22/-0) debian/patches/increase-swap-size.patch (+30/-0) debian/patches/initialize-mount-flags.patch (+17/-0) debian/patches/limited-mount-rule-support.patch (+222/-0) debian/patches/series (+8/-0) debian/patches/test-mount-mediation.patch (+266/-0) debian/patches/test-v6-policy.patch (+147/-0) |
| To merge this branch: | bzr merge lp://qastaging/~apparmor-dev/apparmor/aa-fixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jamie Strandboge | Approve | ||
|
Review via email:
|
|||
Description of the change
Is your branch in sync with latest trunk? Yes
Is debian/changelog properly formatted in the MP? Yes
Did you build your software in a clean sbuild/pbuilder chroot or ppa? Yes (security-proposed PPA)
Did you build your software in a clean sbuild/pbuilder chroot or ppa on armhf? Yes (security-proposed PPA)
Has your component TestPlan been executed successfully on emulator/armhf Touch build (eg, one of N4, N10, N7 (either), Galaxy Nexus) and clean Ubuntu Desktop VM? I've done an abbreviated version of the TestPlan, at jdstrand's request:
- Ran QRT's test-apparmor.py (to test the changes to the regression suite and aa.py)
- Created an LXC container, started it, and verified that it was confined (for LP: #1296459)
- Manually tested the Python utils (for LP: #1294825 and LP: #1294819)
+ Note that they still backtrace on the LXC abstractions due to LP: #1295346 and LP: #1298678)
- Launched apps and verified their confinement on Touch
- Did exploratory testing on Touch and Desktop
Has a 5 minute exploratory testing run been executed on an armhf Touch build? Yes (N7)
If you changed the packaging (debian/), did you subscribe a core-dev to this MP? N/A
What components might get impacted by your changes?
- The apparmor/aa.py Python module and the utils shipped in apparmor-utils
- apparmor_parser
- The in-tree regression tests (they don't get installed but are used for testing)
Have you requested review by the teams of these owning components? Yes, upstream AppArmor has acked all changes and jdstrand is the reviewer of this merge
| Seth Arnold (seth-arnold) wrote | # |
Looks great, thanks!