Skip to content

Sync apparmor-3.0 profiles with master

Daniel Richard G. requested to merge iskunk/apparmor:new-3.0 into apparmor-3.0

This MR syncs the profiles/ directory in the apparmor-3.0 branch with master. After merging, git diff apparmor-3.0 master -- profiles will produce no output.

Ordinarily, this would take the form of cherry-picked commits. But as the desired changes are limited to the profiles/ directory, git cherry-pick only takes whole commits, and several of the involved commits modify files elsewhere in the tree, there does not appear to be a good way to do that. (I conferred with @cboltz on this earlier to confirm.)

Nevertheless, since the branches will become identical under profiles/, tracking down the original commit of a particular profile line should not be onerous. And of course, backporting to the 3.0 branch will be easy-peasy after this.

There are three commits here. The first one simply brings over comment changes and include if exists <local/*> lines, i.e. the freebies. The second one syncs profiles/Makefile. The third one has all the "interesting" changes. Please let me know if some alternate structure is desired.

Merge request reports

Loading