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.
---
 contrib/tcpdump/tcpdump.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'contrib')

diff --git a/contrib/tcpdump/tcpdump.c b/contrib/tcpdump/tcpdump.c
index afcc152..d5dae16 100644
--- a/contrib/tcpdump/tcpdump.c
+++ b/contrib/tcpdump/tcpdump.c
@@ -69,7 +69,7 @@ extern int SIZE_BUF;
 #include <string.h>
 #include <limits.h>
 #ifdef __FreeBSD__
-#include <sys/capability.h>
+#include <sys/capsicum.h>
 #include <sys/ioccom.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
-- 
cgit v1.1