[apparmor] [2 patches] was (Re: [patch 0/3] Separate out libapparmor headers)

[Steve Beattie]

On Tue, Dec 24, 2013 at 12:59:32PM -0800, Steve Beattie wrote:
> This patch series:
> 
>   1) moves the publicly visible libapparmor headers into a separate
>      location in the libapparmor source tree, which can be included by
>      source files in other parts of our tree without worrying about
>      libapparmor internals or conflicting header names.
> 
>   2) updates the parser patch from Tyler Hicks to use the new header
>      location as part of the include paths when building against in-tree
>      libapparmor.
> 
>   3) updates the previous patch I submitted for the regression tests
>      to build against in-tree libapparmor to also use the new header
>      location.

Sigh, in putting these together I managed to break the build by
overlooking the mod_apparmor and pam_apparmor directories. The first
patch adds support for the USE_SYSTEM make flag and adjusts search
paths for mod_apparmor and pam_apparmor, as well as fixing up a
couple of the (probably ought to be deprecated) tomcat locations
where apparmor.h is included.

The second patch is on top of the first. By raising an error for being
unable to find libapparmor any time a make command is run, we break
things like make clean and other targets that don't strictly depend on
libapparmor existing (note that Tyler's implementation for the parser
did not do this). The second patch fixes this for the regression tests,
mod_apparmor and pam_apparmor by making a separate libapparmor_check
target that looks to see if an error message should be generated.

-- 
Steve Beattie
<sbeattie at ubuntu.com>
http://NxNW.org/~steve/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: misc-fix_libapparmor_breakage.patch
Type: text/x-diff
Size: 6578 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20140107/db0ce9f5/attachment-0002.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: tree-fix_make_clean_error.patch
Type: text/x-diff
Size: 5811 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20140107/db0ce9f5/attachment-0003.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20140107/db0ce9f5/attachment-0001.pgp>