Revert r330897:

This was intended to be a non-functional change. It wasn't. The commit
message was thus wrong. In addition it broke arm, and merged crypto
related code.

Revert with prejudice.

This revert skips files touched in r316370 since that commit was since
MFCed. This revert also skips files that require $FreeBSD$ property
changes.

Thank you to those who helped me get out of this mess including but not
limited to gonzo, kevans, rgrimes.

Requested by: gjb (re)

13 files changed, 1 insertions, 27 deletions

diff --git a/sys/security/audit/audit.c b/sys/security/audit/audit.c
index 939dd6f..399bec9 100644
--- a/sys/security/audit/audit.c
+++ b/sys/security/audit/audit.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1999-2005 Apple Inc.
  * Copyright (c) 2006-2007 Robert N. M. Watson
  * All rights reserved.
diff --git a/sys/security/audit/audit.h b/sys/security/audit/audit.h
index bf6a005..559d571 100644
--- a/sys/security/audit/audit.h
+++ b/sys/security/audit/audit.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1999-2005 Apple Inc.
  * All rights reserved.
  *
diff --git a/sys/security/audit/audit_arg.c b/sys/security/audit/audit_arg.c
index 91b103e..c006b90 100644
--- a/sys/security/audit/audit_arg.c
+++ b/sys/security/audit/audit_arg.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1999-2005 Apple Inc.
  * All rights reserved.
  *
diff --git a/sys/security/audit/audit_bsm.c b/sys/security/audit/audit_bsm.c
index 26c6d02..fed111a 100644
--- a/sys/security/audit/audit_bsm.c
+++ b/sys/security/audit/audit_bsm.c
@@ -1,6 +1,4 @@
 /*
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1999-2009 Apple Inc.
  * All rights reserved.
  *
diff --git a/sys/security/audit/audit_bsm_klib.c b/sys/security/audit/audit_bsm_klib.c
index 7ccdd1e..f44fac9 100644
--- a/sys/security/audit/audit_bsm_klib.c
+++ b/sys/security/audit/audit_bsm_klib.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
  * Copyright (c) 1999-2009 Apple Inc.
  * Copyright (c) 2005 Robert N. M. Watson
  * All rights reserved.
diff --git a/sys/security/audit/audit_private.h b/sys/security/audit/audit_private.h
index 9d5e7a5..b5c373a 100644
--- a/sys/security/audit/audit_private.h
+++ b/sys/security/audit/audit_private.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1999-2009 Apple Inc.
  * All rights reserved.
  *
diff --git a/sys/security/audit/audit_syscalls.c b/sys/security/audit/audit_syscalls.c
index fb50273..73411a4 100644
--- a/sys/security/audit/audit_syscalls.c
+++ b/sys/security/audit/audit_syscalls.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1999-2009 Apple Inc.
  * All rights reserved.
  *
diff --git a/sys/security/audit/audit_worker.c b/sys/security/audit/audit_worker.c
index beae9d0..f526cd4 100644
--- a/sys/security/audit/audit_worker.c
+++ b/sys/security/audit/audit_worker.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1999-2008 Apple Inc.
  * Copyright (c) 2006-2008 Robert N. M. Watson
  * All rights reserved.
diff --git a/sys/security/audit/bsm_domain.c b/sys/security/audit/bsm_domain.c
index 1c381e3..8119956 100644
--- a/sys/security/audit/bsm_domain.c
+++ b/sys/security/audit/bsm_domain.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2008 Apple Inc.
  * All rights reserved.
  *
diff --git a/sys/security/audit/bsm_errno.c b/sys/security/audit/bsm_errno.c
index fc069a7..9506025 100644
--- a/sys/security/audit/bsm_errno.c
+++ b/sys/security/audit/bsm_errno.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2008 Apple Inc.
  * All rights reserved.
  *
diff --git a/sys/security/audit/bsm_fcntl.c b/sys/security/audit/bsm_fcntl.c
index fec1e82..e29f11a 100644
--- a/sys/security/audit/bsm_fcntl.c
+++ b/sys/security/audit/bsm_fcntl.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2008-2009 Apple Inc.
  * All rights reserved.
  *
diff --git a/sys/security/audit/bsm_socket_type.c b/sys/security/audit/bsm_socket_type.c
index 640a512..afa8e6c 100644
--- a/sys/security/audit/bsm_socket_type.c
+++ b/sys/security/audit/bsm_socket_type.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2008 Apple Inc.
  * All rights reserved.
  *
diff --git a/sys/security/audit/bsm_token.c b/sys/security/audit/bsm_token.c
index 05a1dcf..84f4fce 100644
--- a/sys/security/audit/bsm_token.c
+++ b/sys/security/audit/bsm_token.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2004-2009 Apple Inc.
  * Copyright (c) 2005 SPARTA, Inc.
  * All rights reserved.