[apparmor] [patch] small fix for capability series

Jamie Strandboge jamie at canonical.com
Thu Mar 22 21:37:22 UTC 2012


On Thu, 2012-03-22 at 14:33 -0700, Steve Beattie wrote:
> When creating the prior abstraction patches, I mistakenly converted
> /usr/include/linux/capability.h to <sys/capability.h>. This patch
> corrects the issue.
> 
> === modified file 'common/Make.rules'
> --- common/Make.rules	2012-03-22 20:19:27 +0000
> +++ common/Make.rules	2012-03-22 21:29:40 +0000
> @@ -157,7 +157,7 @@
>  # =====================
>  
>  # emits defined capabilities in a simple list, e.g. "CAP_NAME CAP_NAME2"
> -CAPABILITIES=$(shell echo "\#include <sys/capability.h>" | cpp -dM | LC_ALL=C sed -n -e '/CAP_EMPTY_SET/d' -e 's/^\#define[ \t]\+CAP_\([A-Z0-9_]\+\)[ \t]\+\([0-9xa-f]\+\)\(.*\)$$/CAP_\1/p' | sort)
> +CAPABILITIES=$(shell echo "\#include <linux/capability.h>" | cpp -dM | LC_ALL=C sed -n -e '/CAP_EMPTY_SET/d' -e 's/^\#define[ \t]\+CAP_\([A-Z0-9_]\+\)[ \t]\+\([0-9xa-f]\+\)\(.*\)$$/CAP_\1/p' | sort)
>  
>  .PHONY: list_capabilities
>  list_capabilities: /usr/include/linux/capability.h
> 

NAK. Isn't this needed in addition?

-- 
Jamie Strandboge             | http://www.canonical.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002.1-use-linux-capability-h.patch
Type: text/x-patch
Size: 1793 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20120322/64ec670b/attachment-0001.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20120322/64ec670b/attachment-0001.pgp>


More information about the AppArmor mailing list