From bcbbcda0f2e4af8b9dd5b88b8aee78fb712e107e Mon Sep 17 00:00:00 2001
From: rwatson <rwatson@FreeBSD.org>
Date: Thu, 19 Mar 2015 12:32:48 +0000
Subject: Merge an applicable subset of r263234 from HEAD to stable/10:

  Update most userspace consumers of capability.h to use capsicum.h instead.

  auditdistd is not updated as I will make the change upstream and then do a
  vendor import sometime in the next week or two.

Note that a significant fraction does not apply, as FreeBSD 10 doesn't
contain a Capsicumised ping, casperd, libcasper, etc.  When these features
are merged, the capsicum.h change will need to be merged with them.

Sponsored by:	Google, Inc.
---
 usr.bin/kdump/kdump.c             | 2 +-
 usr.bin/kdump/mksubr              | 6 +++---
 usr.bin/procstat/procstat_files.c | 2 +-
 usr.bin/rwho/rwho.c               | 2 +-
 usr.bin/uniq/uniq.c               | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'usr.bin')

diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index d8fa9b4..37edd0c 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -46,7 +46,7 @@ extern int errno;
 #include <sys/errno.h>
 #undef _KERNEL
 #include <sys/param.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
 #include <sys/errno.h>
 #define _KERNEL
 #include <sys/time.h>
diff --git a/usr.bin/kdump/mksubr b/usr.bin/kdump/mksubr
index c026d2a..f5b9132 100644
--- a/usr.bin/kdump/mksubr
+++ b/usr.bin/kdump/mksubr
@@ -190,7 +190,7 @@ cat <<_EOF_
 #include <sys/umtx.h>
 #include <nfsserver/nfs.h>
 #include <ufs/ufs/quota.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 
@@ -451,7 +451,7 @@ _EOF_
 
 auto_or_type     "accessmodename"      "[A-Z]_OK[[:space:]]+0?x?[0-9A-Fa-f]+"         "sys/unistd.h"
 auto_switch_type "acltypename"         "ACL_TYPE_[A-Z4_]+[[:space:]]+0x[0-9]+"        "sys/acl.h"
-auto_or_type     "capfcntlname"        "CAP_FCNTL_[A-Z]+[[:space:]]+\(1"              "sys/capability.h"
+auto_or_type     "capfcntlname"        "CAP_FCNTL_[A-Z]+[[:space:]]+\(1"              "sys/capsicum.h"
 auto_switch_type "extattrctlname"      "EXTATTR_NAMESPACE_[A-Z]+[[:space:]]+0x[0-9]+" "sys/extattr.h"
 auto_switch_type "fadvisebehavname"    "POSIX_FADV_[A-Z]+[[:space:]]+[0-9]+"          "sys/fcntl.h"
 auto_or_type     "flagsname"           "O_[A-Z]+[[:space:]]+0x[0-9A-Fa-f]+"           "sys/fcntl.h"
@@ -739,7 +739,7 @@ cat <<_EOF_
 }
 _EOF_
 egrep '#define[[:space:]]+CAP_[A-Z_]+[[:space:]]+CAPRIGHT\([0-9],[[:space:]]+0x[0-9]{16}ULL\)' \
-	$include_dir/sys/capability.h | \
+	$include_dir/sys/capsicum.h | \
 	sed -E 's/[	]+/ /g' | \
 	awk -F '[   \(,\)]' '
 	BEGIN {
diff --git a/usr.bin/procstat/procstat_files.c b/usr.bin/procstat/procstat_files.c
index 103b8e1..c88065f 100644
--- a/usr.bin/procstat/procstat_files.c
+++ b/usr.bin/procstat/procstat_files.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/param.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
 #include <sys/un.h>
diff --git a/usr.bin/rwho/rwho.c b/usr.bin/rwho/rwho.c
index 8c985f0..3fb0da5 100644
--- a/usr.bin/rwho/rwho.c
+++ b/usr.bin/rwho/rwho.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)rwho.c	8.1 (Berkeley) 6/6/93";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/capability.h>
+#include <sys/capsicum.h>
 #include <sys/param.h>
 #include <sys/file.h>
 
diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c
index 8e7f40f..7c1b0e3 100644
--- a/usr.bin/uniq/uniq.c
+++ b/usr.bin/uniq/uniq.c
@@ -44,7 +44,7 @@ static const char rcsid[] =
   "$FreeBSD$";
 #endif /* not lint */
 
-#include <sys/capability.h>
+#include <sys/capsicum.h>
 
 #include <ctype.h>
 #include <err.h>
-- 
cgit v1.1