[apparmor] [PATCH] build on non-Linux systems again

[Kees Cook]

This uses sys/capability.h instead of linux/capability.h, so that AppArmor
can build on non-Linux systems again.

Signed-off-by: Kees Cook <kees at ubuntu.com>


Index: apparmor-debian/common/Make.rules
===================================================================
--- apparmor-debian.orig/common/Make.rules	2012-04-24 11:23:59.000000000 -0700
+++ apparmor-debian/common/Make.rules	2012-05-05 09:46:19.614215990 -0700
@@ -157,10 +157,10 @@
 # =====================
 
 # emits defined capabilities in a simple list, e.g. "CAP_NAME CAP_NAME2"
-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)
+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)
 
 .PHONY: list_capabilities
-list_capabilities: /usr/include/linux/capability.h
+list_capabilities:
 	@echo "$(CAPABILITIES)"
 
 # =====================

-- 
Kees Cook