svn commit: r340166 - in head: . sys/sys

[Ed Maste]

Author: emaste
Date: Mon Nov  5 22:36:45 2018
New Revision: 340166
URL: https://svnweb.freebsd.org/changeset/base/340166

Log:
  revert r340156, restoring sys/sys/capability.h
  
  More time is still needed for ports to accommodate the migration to
  capsicum.h.
  
  The header was renamed in 2014 due to concerns about conflicts with with
  a draft POSIX.1e capability.h header on other systems and there is (now)
  no need for complex autoconf tests for both capability.h and capsicum.h.
  Any supported Capsicum-capable system has capsicum.h.
  
  Reported by:	antoine
  Sponsored by:	The FreeBSD Foundation

Added:
  head/sys/sys/capability.h
     - copied unchanged from r340155, head/sys/sys/capability.h
Modified:
  head/ObsoleteFiles.inc

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Mon Nov  5 22:26:57 2018	(r340165)
+++ head/ObsoleteFiles.inc	Mon Nov  5 22:36:45 2018	(r340166)
@@ -38,8 +38,6 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
-# 20181105: backwards-compatibility capability.h header removed
-OLD_FILES+=usr/include/sys/capability.h
 # 20181030: malloc_domain(9) KPI change
 OLD_FILES+=share/man/man9/malloc_domain.9.gz
 # 20181026: joy(4) removal

Copied: head/sys/sys/capability.h (from r340155, head/sys/sys/capability.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/sys/capability.h	Mon Nov  5 22:36:45 2018	(r340166, copy of r340155, head/sys/sys/capability.h)
@@ -0,0 +1,46 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 2014 Robert N. M. Watson
+ * All rights reserved.
+ *
+ * This software was developed at the University of Cambridge Computer
+ * Laboratory with support from a grant from Google, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+/*
+ * Historically, the key userspace and kernel Capsicum definitions were found
+ * in this file.  However, it conflicted with POSIX.1e's capability.h, so has
+ * been renamed capsicum.h.  The file remains for backwards compatibility
+ * reasons as a nested include.
+ */
+#ifndef _SYS_CAPABILITY_H_
+#define	_SYS_CAPABILITY_H_
+
+#warning this file includes <sys/capability.h> which is deprecated
+#include <sys/capsicum.h>
+
+#endif /* !_SYS_CAPABILITY_H_ */