aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2023-05-10 15:40:58 +0000
committerWarner Losh <imp@FreeBSD.org>2023-05-12 16:44:03 +0000
commit4d846d260e2b9a3d4d0a701462568268cbfe7a5b (patch)
treee06136ddd235d1b7d34c2926249174a5840ad842 /include
parent2b519b170709b9c2bb9f66641737d1d80a5d2538 (diff)
downloadsrc-4d846d260e2b9a3d4d0a701462568268cbfe7a5b.tar.gz
src-4d846d260e2b9a3d4d0a701462568268cbfe7a5b.zip
spdx: The BSD-2-Clause-FreeBSD identifier is obsolete, drop -FreeBSD
The SPDX folks have obsoleted the BSD-2-Clause-FreeBSD identifier. Catch up to that fact and revert to their recommended match of BSD-2-Clause. Discussed with: pfg MFC After: 3 days Sponsored by: Netflix
Diffstat (limited to 'include')
-rw-r--r--include/bitstring.h2
-rw-r--r--include/complex.h2
-rw-r--r--include/cpio.h2
-rw-r--r--include/elf-hints.h2
-rw-r--r--include/elf.h2
-rw-r--r--include/fmtmsg.h2
-rw-r--r--include/inttypes.h2
-rw-r--r--include/iso646.h2
-rw-r--r--include/kenv.h2
-rw-r--r--include/langinfo.h2
-rw-r--r--include/malloc_np.h2
-rwxr-xr-xinclude/mk-osreldate.sh2
-rw-r--r--include/monetary.h2
-rw-r--r--include/mqueue.h2
-rw-r--r--include/nss.h2
-rw-r--r--include/printf.h2
-rw-r--r--include/proc_service.h2
-rw-r--r--include/rpc/rpcsec_gss.h2
-rw-r--r--include/semaphore.h2
-rw-r--r--include/spawn.h2
-rw-r--r--include/stdalign.h2
-rw-r--r--include/stdbool.h2
-rw-r--r--include/stdnoreturn.h2
-rw-r--r--include/strings.h2
-rw-r--r--include/tgmath.h2
-rw-r--r--include/uchar.h2
-rw-r--r--include/ulimit.h2
-rw-r--r--include/utmpx.h2
-rw-r--r--include/uuid.h2
-rw-r--r--include/varargs.h2
-rw-r--r--include/wordexp.h2
-rw-r--r--include/xlocale.h2
-rw-r--r--include/xlocale/_ctype.h2
-rw-r--r--include/xlocale/_inttypes.h2
-rw-r--r--include/xlocale/_langinfo.h2
-rw-r--r--include/xlocale/_locale.h2
-rw-r--r--include/xlocale/_monetary.h2
-rw-r--r--include/xlocale/_stdio.h2
-rw-r--r--include/xlocale/_stdlib.h2
-rw-r--r--include/xlocale/_string.h2
-rw-r--r--include/xlocale/_time.h2
-rw-r--r--include/xlocale/_uchar.h2
-rw-r--r--include/xlocale/_wchar.h2
43 files changed, 43 insertions, 43 deletions
diff --git a/include/bitstring.h b/include/bitstring.h
index b179880f1e42..47f9a2d66741 100644
--- a/include/bitstring.h
+++ b/include/bitstring.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
diff --git a/include/complex.h b/include/complex.h
index c31c15d9da4b..9bc151e0c075 100644
--- a/include/complex.h
+++ b/include/complex.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2011 The FreeBSD Project.
* All rights reserved.
diff --git a/include/cpio.h b/include/cpio.h
index 9cbd44e16522..64ddb1e0f71b 100644
--- a/include/cpio.h
+++ b/include/cpio.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
diff --git a/include/elf-hints.h b/include/elf-hints.h
index 679cc34e249e..e1ded3788a81 100644
--- a/include/elf-hints.h
+++ b/include/elf-hints.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 John D. Polstra.
* All rights reserved.
diff --git a/include/elf.h b/include/elf.h
index f230ae729fea..158167972888 100644
--- a/include/elf.h
+++ b/include/elf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 David E. O'Brien.
* All rights reserved.
diff --git a/include/fmtmsg.h b/include/fmtmsg.h
index 1251c95d489d..18c7fda5e0d8 100644
--- a/include/fmtmsg.h
+++ b/include/fmtmsg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
diff --git a/include/inttypes.h b/include/inttypes.h
index adf74e5a3e9d..75a2e0f5ba9f 100644
--- a/include/inttypes.h
+++ b/include/inttypes.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
diff --git a/include/iso646.h b/include/iso646.h
index a2ab46abf4e0..0b51e427ee81 100644
--- a/include/iso646.h
+++ b/include/iso646.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Alex Nash
* All rights reserved.
diff --git a/include/kenv.h b/include/kenv.h
index 0f5e8a92fa27..bdd2540cbe6e 100644
--- a/include/kenv.h
+++ b/include/kenv.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Maxime Henrion <mux@FreeBSD.org>
* All rights reserved.
diff --git a/include/langinfo.h b/include/langinfo.h
index 87273072a905..6dc3de5ccc55 100644
--- a/include/langinfo.h
+++ b/include/langinfo.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
diff --git a/include/malloc_np.h b/include/malloc_np.h
index 94c7026ef10f..4adcdc505e9c 100644
--- a/include/malloc_np.h
+++ b/include/malloc_np.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2006 Jason Evans <jasone@FreeBSD.org>.
* All rights reserved.
diff --git a/include/mk-osreldate.sh b/include/mk-osreldate.sh
index 037a308fa826..e62ee1087b8f 100755
--- a/include/mk-osreldate.sh
+++ b/include/mk-osreldate.sh
@@ -1,5 +1,5 @@
#!/bin/sh -
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2013 Garrett Cooper
# All rights reserved.
diff --git a/include/monetary.h b/include/monetary.h
index d7b381b82042..36525f4489a3 100644
--- a/include/monetary.h
+++ b/include/monetary.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
diff --git a/include/mqueue.h b/include/mqueue.h
index 987cf0bd4e23..b194ab073ab1 100644
--- a/include/mqueue.h
+++ b/include/mqueue.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/include/nss.h b/include/nss.h
index 0cc155a0393c..9fd034561fa8 100644
--- a/include/nss.h
+++ b/include/nss.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/include/printf.h b/include/printf.h
index 2a643f94c657..625ab354610c 100644
--- a/include/printf.h
+++ b/include/printf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Poul-Henning Kamp
* All rights reserved.
diff --git a/include/proc_service.h b/include/proc_service.h
index 3b12ff949460..e5d75de13de6 100644
--- a/include/proc_service.h
+++ b/include/proc_service.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Xu <davidxu@freebsd.org>
* Copyright (c) 2004 Marcel Moolenaar
diff --git a/include/rpc/rpcsec_gss.h b/include/rpc/rpcsec_gss.h
index 2878ae04b70d..6bd1fe6c697d 100644
--- a/include/rpc/rpcsec_gss.h
+++ b/include/rpc/rpcsec_gss.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
diff --git a/include/semaphore.h b/include/semaphore.h
index f330d5142058..83b8949237a8 100644
--- a/include/semaphore.h
+++ b/include/semaphore.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 David Xu <davidxu@freebsd.org>
*
diff --git a/include/spawn.h b/include/spawn.h
index 53373a6c8db8..6f7abc724641 100644
--- a/include/spawn.h
+++ b/include/spawn.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/include/stdalign.h b/include/stdalign.h
index 6f777fde3df5..c9b5cfc63c5d 100644
--- a/include/stdalign.h
+++ b/include/stdalign.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/include/stdbool.h b/include/stdbool.h
index 2879da798da6..62067966a1dc 100644
--- a/include/stdbool.h
+++ b/include/stdbool.h
@@ -1,5 +1,5 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Jeroen Ruigrok van der Werven <asmodai@FreeBSD.org>
* All rights reserved.
diff --git a/include/stdnoreturn.h b/include/stdnoreturn.h
index e8fc7dca71b3..37bcb04e5b64 100644
--- a/include/stdnoreturn.h
+++ b/include/stdnoreturn.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/include/strings.h b/include/strings.h
index 9df19e4ce9ce..337e02419437 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
diff --git a/include/tgmath.h b/include/tgmath.h
index bf7a61c5f320..8ee3835fe123 100644
--- a/include/tgmath.h
+++ b/include/tgmath.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Stefan Farfeleder.
* All rights reserved.
diff --git a/include/uchar.h b/include/uchar.h
index a84a58b3a2dd..d518aedab451 100644
--- a/include/uchar.h
+++ b/include/uchar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/include/ulimit.h b/include/ulimit.h
index 2579a5201518..4c34c87836ac 100644
--- a/include/ulimit.h
+++ b/include/ulimit.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Kyle Martin <mkm@ieee.org>
* All rights reserved.
diff --git a/include/utmpx.h b/include/utmpx.h
index b71d9638d81e..2f8faaade523 100644
--- a/include/utmpx.h
+++ b/include/utmpx.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/include/uuid.h b/include/uuid.h
index 8056acaf7157..3c9deceab591 100644
--- a/include/uuid.h
+++ b/include/uuid.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002,2005 Marcel Moolenaar
* Copyright (c) 2002 Hiten Mahesh Pandya
diff --git a/include/varargs.h b/include/varargs.h
index a5d59f46ddf1..6aa002c73ff3 100644
--- a/include/varargs.h
+++ b/include/varargs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Alexander Kabaev
* All rights reserved.
diff --git a/include/wordexp.h b/include/wordexp.h
index bda6ff542fb7..48beda5e63a3 100644
--- a/include/wordexp.h
+++ b/include/wordexp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
diff --git a/include/xlocale.h b/include/xlocale.h
index 647c43b315c9..1e6b89394363 100644
--- a/include/xlocale.h
+++ b/include/xlocale.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, 2012 The FreeBSD Foundation
* All rights reserved.
diff --git a/include/xlocale/_ctype.h b/include/xlocale/_ctype.h
index 7d25eec25f0a..96e3fdd78c78 100644
--- a/include/xlocale/_ctype.h
+++ b/include/xlocale/_ctype.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 The FreeBSD Foundation
*
diff --git a/include/xlocale/_inttypes.h b/include/xlocale/_inttypes.h
index 35729139c71e..c4a116c78d55 100644
--- a/include/xlocale/_inttypes.h
+++ b/include/xlocale/_inttypes.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, 2012 The FreeBSD Foundation
*
diff --git a/include/xlocale/_langinfo.h b/include/xlocale/_langinfo.h
index 6886ca335f22..98fed8a406ba 100644
--- a/include/xlocale/_langinfo.h
+++ b/include/xlocale/_langinfo.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, 2012 The FreeBSD Foundation
*
diff --git a/include/xlocale/_locale.h b/include/xlocale/_locale.h
index d186b04ecd6d..491605006a4e 100644
--- a/include/xlocale/_locale.h
+++ b/include/xlocale/_locale.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, 2012 The FreeBSD Foundation
*
diff --git a/include/xlocale/_monetary.h b/include/xlocale/_monetary.h
index 13b1c3cc2a3d..ebe602a95283 100644
--- a/include/xlocale/_monetary.h
+++ b/include/xlocale/_monetary.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, 2012 The FreeBSD Foundation
*
diff --git a/include/xlocale/_stdio.h b/include/xlocale/_stdio.h
index d0df7931cfd0..9dce2d3665a1 100644
--- a/include/xlocale/_stdio.h
+++ b/include/xlocale/_stdio.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, 2012 The FreeBSD Foundation
*
diff --git a/include/xlocale/_stdlib.h b/include/xlocale/_stdlib.h
index 380cbe0bdb1b..3480ac7b96e5 100644
--- a/include/xlocale/_stdlib.h
+++ b/include/xlocale/_stdlib.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, 2012 The FreeBSD Foundation
*
diff --git a/include/xlocale/_string.h b/include/xlocale/_string.h
index 64b128df161d..2f509cd6064f 100644
--- a/include/xlocale/_string.h
+++ b/include/xlocale/_string.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, 2012 The FreeBSD Foundation
*
diff --git a/include/xlocale/_time.h b/include/xlocale/_time.h
index fe0057b0b15f..019a3b051e5e 100644
--- a/include/xlocale/_time.h
+++ b/include/xlocale/_time.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, 2012 The FreeBSD Foundation
*
diff --git a/include/xlocale/_uchar.h b/include/xlocale/_uchar.h
index 0c6ed09373f2..fb2429d13fe0 100644
--- a/include/xlocale/_uchar.h
+++ b/include/xlocale/_uchar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/include/xlocale/_wchar.h b/include/xlocale/_wchar.h
index 7ce562eb7c21..4ee80e2c8d61 100644
--- a/include/xlocale/_wchar.h
+++ b/include/xlocale/_wchar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, 2012 The FreeBSD Foundation
*