Cleanup output; and permit setcap e value to be superset of ip.
This means one can say:
setcap "all=e cap_net_raw=p" ping
which is equivalent to
setcap "cap_net_raw=ep" ping
diff --git a/libcap/Makefile b/libcap/Makefile
index 61aab78..c492559 100644
--- a/libcap/Makefile
+++ b/libcap/Makefile
@@ -26,9 +26,9 @@
cap_names.h: _makenames
./_makenames > cap_names.h
-cap_names.sed: Makefile /usr/include/linux/capability.h
+cap_names.sed: Makefile $(KERNEL_HEADERS)/linux/capability.h
@echo "=> making cap_names.c from <linux/capability.h>"
- @sed -ne '/^#define[ \t]CAP[_A-Z]\+[ \t]\+[0-9]\+/{s/^#define \([^ \t]*\)[ \t]*\([^ \t]*\)/ \{ \2, \"\1\" \},/;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;p;}' < /usr/include/linux/capability.h | fgrep -v 0x > cap_names.sed
+ @sed -ne '/^#define[ \t]CAP[_A-Z]\+[ \t]\+[0-9]\+/{s/^#define \([^ \t]*\)[ \t]*\([^ \t]*\)/ \{ \2, \"\1\" \},/;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;p;}' < $(KERNEL_HEADERS)/linux/capability.h | fgrep -v 0x > cap_names.sed
# @sed -ne '/^#define[ \t]CAP[_A-Z]\+[ \t]\+[0-9]\+/{s/^#define CAP_\([^ \t]*\)[ \t]*\([^ \t]*\)/ \{ \2, \"\1\" \},/;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;p;}' < /usr/include/linux/capability.h | fgrep -v 0x > cap_names.sed
$(STALIBNAME): $(OBJS)