diff options
| author | Warner Losh <imp@FreeBSD.org> | 2023-05-10 15:40:58 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2023-05-12 16:44:03 +0000 |
| commit | 4d846d260e2b9a3d4d0a701462568268cbfe7a5b (patch) | |
| tree | e06136ddd235d1b7d34c2926249174a5840ad842 /sbin | |
| parent | 2b519b170709b9c2bb9f66641737d1d80a5d2538 (diff) | |
| download | src-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 'sbin')
149 files changed, 149 insertions, 149 deletions
diff --git a/sbin/adjkerntz/adjkerntz.c b/sbin/adjkerntz/adjkerntz.c index e6cadcf7f189..cbe3d9b08250 100644 --- a/sbin/adjkerntz/adjkerntz.c +++ b/sbin/adjkerntz/adjkerntz.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 1993-1998 by Andrey A. Chernov, Moscow, Russia. * All rights reserved. diff --git a/sbin/adjkerntz/pathnames.h b/sbin/adjkerntz/pathnames.h index 43356cd357a9..365cb672d9fd 100644 --- a/sbin/adjkerntz/pathnames.h +++ b/sbin/adjkerntz/pathnames.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 1993 by Andrew A. Chernov, Moscow, Russia. * All rights reserved. diff --git a/sbin/bectl/bectl.8 b/sbin/bectl/bectl.8 index 974c6ece9d12..a989ffd8bba0 100644 --- a/sbin/bectl/bectl.8 +++ b/sbin/bectl/bectl.8 @@ -1,5 +1,5 @@ .\" -.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD +.\" SPDX-License-Identifier: BSD-2-Clause .\" .\" Copyright (c) 2017 Kyle J. Kneitinger <kyle@kneit.in> .\" diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index 9e3833ba834e..018b8cb7930f 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2017 Kyle J. Kneitinger <kyle@kneit.in> * diff --git a/sbin/bectl/bectl.h b/sbin/bectl/bectl.h index 878af24f0cbb..c160286b31ae 100644 --- a/sbin/bectl/bectl.h +++ b/sbin/bectl/bectl.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org> * diff --git a/sbin/bectl/bectl_jail.c b/sbin/bectl/bectl_jail.c index 8e196a14257a..702dc7ecbf2d 100644 --- a/sbin/bectl/bectl_jail.c +++ b/sbin/bectl/bectl_jail.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org> * diff --git a/sbin/bectl/bectl_list.c b/sbin/bectl/bectl_list.c index 8fd541419dcd..4f04389f6b3a 100644 --- a/sbin/bectl/bectl_list.c +++ b/sbin/bectl/bectl_list.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org> * diff --git a/sbin/bectl/tests/bectl_test.sh b/sbin/bectl/tests/bectl_test.sh index b101591c3ee9..5f865b86954e 100755 --- a/sbin/bectl/tests/bectl_test.sh +++ b/sbin/bectl/tests/bectl_test.sh @@ -1,5 +1,5 @@ # -# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# SPDX-License-Identifier: BSD-2-Clause # # Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org> # diff --git a/sbin/camcontrol/fwdownload.c b/sbin/camcontrol/fwdownload.c index 02b60f25df04..45195bf8605c 100644 --- a/sbin/camcontrol/fwdownload.c +++ b/sbin/camcontrol/fwdownload.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2011 Sandvine Incorporated. All rights reserved. * Copyright (c) 2002-2011 Andre Albsmeier <andre@albsmeier.net> diff --git a/sbin/camcontrol/modeedit.c b/sbin/camcontrol/modeedit.c index 15e5c6608f47..b8c3d40faa3c 100644 --- a/sbin/camcontrol/modeedit.c +++ b/sbin/camcontrol/modeedit.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2000 Kelly Yancey <kbyanc@posi.net> * Derived from work done by Julian Elischer <julian@tfs.com, diff --git a/sbin/comcontrol/comcontrol.c b/sbin/comcontrol/comcontrol.c index 6bfb47b74c2d..98670e1c7ab4 100644 --- a/sbin/comcontrol/comcontrol.c +++ b/sbin/comcontrol/comcontrol.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1992 Christopher G. Demetriou * All rights reserved. diff --git a/sbin/conscontrol/conscontrol.c b/sbin/conscontrol/conscontrol.c index f4298eb8a2cc..5633720b7987 100644 --- a/sbin/conscontrol/conscontrol.c +++ b/sbin/conscontrol/conscontrol.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001 Jonathan Lemon <jlemon@FreeBSD.org> * All rights reserved. diff --git a/sbin/ddb/ddb.c b/sbin/ddb/ddb.c index a90a693e1b03..d886ce9bdc52 100644 --- a/sbin/ddb/ddb.c +++ b/sbin/ddb/ddb.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2007 Robert N. M. Watson * All rights reserved. diff --git a/sbin/ddb/ddb.h b/sbin/ddb/ddb.h index 6f9a6f99f04b..c21fceb31ee9 100644 --- a/sbin/ddb/ddb.h +++ b/sbin/ddb/ddb.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2007 Robert N. M. Watson * All rights reserved. diff --git a/sbin/ddb/ddb_capture.c b/sbin/ddb/ddb_capture.c index 1bb27b5b7e93..3754e810e038 100644 --- a/sbin/ddb/ddb_capture.c +++ b/sbin/ddb/ddb_capture.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2008 Robert N. M. Watson * All rights reserved. diff --git a/sbin/ddb/ddb_script.c b/sbin/ddb/ddb_script.c index e36cb6606380..f110a7a16434 100644 --- a/sbin/ddb/ddb_script.c +++ b/sbin/ddb/ddb_script.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2007 Robert N. M. Watson * All rights reserved. diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc index abce58a1e659..0dd6b32b7ed7 100644 --- a/sbin/devd/devd.cc +++ b/sbin/devd/devd.cc @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause AND BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-3-Clause AND BSD-2-Clause * * Copyright (c) 2002-2010 M. Warner Losh <imp@FreeBSD.org> * diff --git a/sbin/devd/devd.h b/sbin/devd/devd.h index a291e8141298..4ba3888d3841 100644 --- a/sbin/devd/devd.h +++ b/sbin/devd/devd.h @@ -1,7 +1,7 @@ /*- * DEVD (Device action daemon) * - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2002 M. Warner Losh <imp@FreeBSD.org> * diff --git a/sbin/devd/devd.hh b/sbin/devd/devd.hh index 62511d8ec3a5..a21e873c1764 100644 --- a/sbin/devd/devd.hh +++ b/sbin/devd/devd.hh @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2002-2003 M. Warner Losh <imp@FreeBSD.org> * diff --git a/sbin/devd/parse.y b/sbin/devd/parse.y index 9b8fd592045a..06faa1d69782 100644 --- a/sbin/devd/parse.y +++ b/sbin/devd/parse.y @@ -2,7 +2,7 @@ /*- * DEVD (Device action daemon) * - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2002 M. Warner Losh <imp@FreeBSD.org> * diff --git a/sbin/devd/token.l b/sbin/devd/token.l index 30e48e815fe3..65b319f37936 100644 --- a/sbin/devd/token.l +++ b/sbin/devd/token.l @@ -2,7 +2,7 @@ /*- * DEVD (Device action daemon) * - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2002 M. Warner Losh <imp@FreeBSD.org> * diff --git a/sbin/devfs/devfs.c b/sbin/devfs/devfs.c index b5a6bf4015a2..5f6352064f1f 100644 --- a/sbin/devfs/devfs.c +++ b/sbin/devfs/devfs.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001, 2002 Dima Dorfman. * All rights reserved. diff --git a/sbin/devfs/extern.h b/sbin/devfs/extern.h index c02a7afba30e..4fde53c2f82a 100644 --- a/sbin/devfs/extern.h +++ b/sbin/devfs/extern.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2002 Dima Dorfman. * All rights reserved. diff --git a/sbin/devfs/rule.c b/sbin/devfs/rule.c index 0bfc7ffaf3c8..9a7d100be128 100644 --- a/sbin/devfs/rule.c +++ b/sbin/devfs/rule.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2002 Dima Dorfman. * All rights reserved. diff --git a/sbin/etherswitchcfg/etherswitchcfg.c b/sbin/etherswitchcfg/etherswitchcfg.c index 7f3403918fad..7d260af6f050 100644 --- a/sbin/etherswitchcfg/etherswitchcfg.c +++ b/sbin/etherswitchcfg/etherswitchcfg.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2011-2012 Stefan Bethke. * All rights reserved. diff --git a/sbin/fdisk/fdisk_mbr_enc.c b/sbin/fdisk/fdisk_mbr_enc.c index 1202896276c6..351fd3ef0a08 100644 --- a/sbin/fdisk/fdisk_mbr_enc.c +++ b/sbin/fdisk/fdisk_mbr_enc.c @@ -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/sbin/fdisk/fdisk_mbr_enc.h b/sbin/fdisk/fdisk_mbr_enc.h index 5a1a6bf70fce..e3ebcfcec93c 100644 --- a/sbin/fdisk/fdisk_mbr_enc.h +++ b/sbin/fdisk/fdisk_mbr_enc.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2019 Conrad Meyer <cem@FreeBSD.org> * diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h index 1c8b9169e590..092d9575dc2a 100644 --- a/sbin/fsck_ffs/fsck.h +++ b/sbin/fsck_ffs/fsck.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause and BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-3-Clause and BSD-2-Clause * * Copyright (c) 2002 Networks Associates Technology, Inc. * All rights reserved. diff --git a/sbin/fsck_ffs/gjournal.c b/sbin/fsck_ffs/gjournal.c index cd2c9df878a8..f3bdd5a66907 100644 --- a/sbin/fsck_ffs/gjournal.c +++ b/sbin/fsck_ffs/gjournal.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause AND BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-3-Clause AND BSD-2-Clause * * Copyright (c) 2006 Pawel Jakub Dawidek <pjd@FreeBSD.org> * All rights reserved. diff --git a/sbin/fsck_ffs/suj.c b/sbin/fsck_ffs/suj.c index 9c8e1322b801..8fed3d7723d6 100644 --- a/sbin/fsck_ffs/suj.c +++ b/sbin/fsck_ffs/suj.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright 2009, 2010 Jeffrey W. Roberson <jeff@FreeBSD.org> * All rights reserved. diff --git a/sbin/fsck_msdosfs/boot.c b/sbin/fsck_msdosfs/boot.c index 887312ed7c41..3d1657ad66f3 100644 --- a/sbin/fsck_msdosfs/boot.c +++ b/sbin/fsck_msdosfs/boot.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 1995, 1997 Wolfgang Solfrank * Copyright (c) 1995 Martin Husemann diff --git a/sbin/fsck_msdosfs/check.c b/sbin/fsck_msdosfs/check.c index 9519315672ab..654ceeb9c5ca 100644 --- a/sbin/fsck_msdosfs/check.c +++ b/sbin/fsck_msdosfs/check.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank * Copyright (c) 1995 Martin Husemann diff --git a/sbin/fsck_msdosfs/dir.c b/sbin/fsck_msdosfs/dir.c index dbe4e0c7db2f..02fe07880e0e 100644 --- a/sbin/fsck_msdosfs/dir.c +++ b/sbin/fsck_msdosfs/dir.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2019 Google LLC * Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank diff --git a/sbin/fsck_msdosfs/dosfs.h b/sbin/fsck_msdosfs/dosfs.h index d89a08689825..6016a5077dfd 100644 --- a/sbin/fsck_msdosfs/dosfs.h +++ b/sbin/fsck_msdosfs/dosfs.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank * Copyright (c) 1995 Martin Husemann diff --git a/sbin/fsck_msdosfs/ext.h b/sbin/fsck_msdosfs/ext.h index 532e840acfc8..1f6453dedb74 100644 --- a/sbin/fsck_msdosfs/ext.h +++ b/sbin/fsck_msdosfs/ext.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank * Copyright (c) 1995 Martin Husemann diff --git a/sbin/fsirand/fsirand.c b/sbin/fsirand/fsirand.c index 90305416f556..cd60093e3642 100644 --- a/sbin/fsirand/fsirand.c +++ b/sbin/fsirand/fsirand.c @@ -1,7 +1,7 @@ /* $OpenBSD: fsirand.c,v 1.9 1997/02/28 00:46:33 millert Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com> * All rights reserved. diff --git a/sbin/gbde/gbde.c b/sbin/gbde/gbde.c index 8f4c2b1fce53..3289f5a07ff2 100644 --- a/sbin/gbde/gbde.c +++ b/sbin/gbde/gbde.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2002 Poul-Henning Kamp * Copyright (c) 2002 Networks Associates Technology, Inc. diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c index 535d7d9f6f21..5556c846c565 100644 --- a/sbin/geom/core/geom.c +++ b/sbin/geom/core/geom.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2004-2009 Pawel Jakub Dawidek <pjd@FreeBSD.org> * All rights reserved. diff --git a/sbin/geom/core/geom.h b/sbin/geom/core/geom.h index a76021c8aca5..48dd6cd55821 100644 --- a/sbin/geom/core/geom.h +++ b/sbin/geom/core/geom.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org> * All rights reserved. diff --git a/sbin/geom/misc/subr.c b/sbin/geom/misc/subr.c index 297a1cc09a36..c297d0182b49 100644 --- a/sbin/geom/misc/subr.c +++ b/sbin/geom/misc/subr.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2004-2010 Pawel Jakub Dawidek <pjd@FreeBSD.org> * All rights reserved. diff --git a/sbin/geom/misc/subr.h b/sbin/geom/misc/subr.h index 579c94c21491..6e86c5b24fa3 100644 --- a/sbin/geom/misc/subr.h +++ b/sbin/geom/misc/subr.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2004-2010 Pawel Jakub Dawidek <pjd@FreeBSD.org> * All rights reserved. diff --git a/sbin/ggate/ggatec/ggatec.c b/sbin/ggate/ggatec/ggatec.c index 0de8504ce3c4..5102700f7959 100644 --- a/sbin/ggate/ggatec/ggatec.c +++ b/sbin/ggate/ggatec/ggatec.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org> * All rights reserved. diff --git a/sbin/ggate/ggated/ggated.c b/sbin/ggate/ggated/ggated.c index 7cacbf58037e..01138a3795d7 100644 --- a/sbin/ggate/ggated/ggated.c +++ b/sbin/ggate/ggated/ggated.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org> * All rights reserved. diff --git a/sbin/ggate/ggatel/ggatel.c b/sbin/ggate/ggatel/ggatel.c index 4659cacbee17..4b7d99c1ee72 100644 --- a/sbin/ggate/ggatel/ggatel.c +++ b/sbin/ggate/ggatel/ggatel.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org> * All rights reserved. diff --git a/sbin/ggate/shared/ggate.c b/sbin/ggate/shared/ggate.c index 2f544f7a2c9c..c1951d241a99 100644 --- a/sbin/ggate/shared/ggate.c +++ b/sbin/ggate/shared/ggate.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org> * All rights reserved. diff --git a/sbin/ggate/shared/ggate.h b/sbin/ggate/shared/ggate.h index d399b247cd75..4950d6ca102c 100644 --- a/sbin/ggate/shared/ggate.h +++ b/sbin/ggate/shared/ggate.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org> * All rights reserved. diff --git a/sbin/gvinum/gvinum.c b/sbin/gvinum/gvinum.c index 5a081e92a8df..336d51f93cf3 100644 --- a/sbin/gvinum/gvinum.c +++ b/sbin/gvinum/gvinum.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2004 Lukas Ertl * Copyright (c) 2005 Chris Jones diff --git a/sbin/hastctl/hastctl.c b/sbin/hastctl/hastctl.c index 162ba2610991..b649ced1f29e 100644 --- a/sbin/hastctl/hastctl.c +++ b/sbin/hastctl/hastctl.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * All rights reserved. diff --git a/sbin/hastd/activemap.c b/sbin/hastd/activemap.c index 73577d2764e9..439461f8b04a 100644 --- a/sbin/hastd/activemap.c +++ b/sbin/hastd/activemap.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * All rights reserved. diff --git a/sbin/hastd/activemap.h b/sbin/hastd/activemap.h index e42a37e0d96f..14f074c9f260 100644 --- a/sbin/hastd/activemap.h +++ b/sbin/hastd/activemap.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * All rights reserved. diff --git a/sbin/hastd/control.c b/sbin/hastd/control.c index 52e567a52879..61bec25b95e1 100644 --- a/sbin/hastd/control.c +++ b/sbin/hastd/control.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * All rights reserved. diff --git a/sbin/hastd/control.h b/sbin/hastd/control.h index 18096162eb65..327474ca34ba 100644 --- a/sbin/hastd/control.h +++ b/sbin/hastd/control.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * All rights reserved. diff --git a/sbin/hastd/ebuf.c b/sbin/hastd/ebuf.c index 83f99f834288..5e6e1bb558a1 100644 --- a/sbin/hastd/ebuf.c +++ b/sbin/hastd/ebuf.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * All rights reserved. diff --git a/sbin/hastd/ebuf.h b/sbin/hastd/ebuf.h index 83500ed7f646..8dc1c69c1ff4 100644 --- a/sbin/hastd/ebuf.h +++ b/sbin/hastd/ebuf.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * All rights reserved. diff --git a/sbin/hastd/event.c b/sbin/hastd/event.c index 105939f123bf..b4548d3da190 100644 --- a/sbin/hastd/event.c +++ b/sbin/hastd/event.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org> * All rights reserved. diff --git a/sbin/hastd/event.h b/sbin/hastd/event.h index c3773298794d..8a25c8474419 100644 --- a/sbin/hastd/event.h +++ b/sbin/hastd/event.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org> * All rights reserved. diff --git a/sbin/hastd/hast.h b/sbin/hastd/hast.h index b1e2537a51f3..c8f27898abc5 100644 --- a/sbin/hastd/hast.h +++ b/sbin/hastd/hast.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net> diff --git a/sbin/hastd/hast_checksum.c b/sbin/hastd/hast_checksum.c index dccba3752cb1..f975d28f13f4 100644 --- a/sbin/hastd/hast_checksum.c +++ b/sbin/hastd/hast_checksum.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net> * All rights reserved. diff --git a/sbin/hastd/hast_checksum.h b/sbin/hastd/hast_checksum.h index ea37a2ff1a1a..4ddbb5df712d 100644 --- a/sbin/hastd/hast_checksum.h +++ b/sbin/hastd/hast_checksum.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net> * All rights reserved. diff --git a/sbin/hastd/hast_compression.c b/sbin/hastd/hast_compression.c index e6a2192c6a53..def7dd0ff29c 100644 --- a/sbin/hastd/hast_compression.c +++ b/sbin/hastd/hast_compression.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net> * All rights reserved. diff --git a/sbin/hastd/hast_compression.h b/sbin/hastd/hast_compression.h index b7ea66290bdd..094450ef2647 100644 --- a/sbin/hastd/hast_compression.h +++ b/sbin/hastd/hast_compression.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net> * All rights reserved. diff --git a/sbin/hastd/hast_proto.c b/sbin/hastd/hast_proto.c index 81dd01a21f17..0a85b46fa2c8 100644 --- a/sbin/hastd/hast_proto.c +++ b/sbin/hastd/hast_proto.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net> diff --git a/sbin/hastd/hast_proto.h b/sbin/hastd/hast_proto.h index 3a0a3fbdc884..bc3b0a476503 100644 --- a/sbin/hastd/hast_proto.h +++ b/sbin/hastd/hast_proto.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * All rights reserved. diff --git a/sbin/hastd/hastd.c b/sbin/hastd/hastd.c index be58411b7ec7..4f0acfeac9c0 100644 --- a/sbin/hastd/hastd.c +++ b/sbin/hastd/hastd.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * Copyright (c) 2010-2011 Pawel Jakub Dawidek <pawel@dawidek.net> diff --git a/sbin/hastd/hastd.h b/sbin/hastd/hastd.h index 965a63d1cb6d..60167453e223 100644 --- a/sbin/hastd/hastd.h +++ b/sbin/hastd/hastd.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * All rights reserved. diff --git a/sbin/hastd/hooks.c b/sbin/hastd/hooks.c index 13890b5fcb10..e15e5df43ed5 100644 --- a/sbin/hastd/hooks.c +++ b/sbin/hastd/hooks.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2010 The FreeBSD Foundation * Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org> diff --git a/sbin/hastd/hooks.h b/sbin/hastd/hooks.h index 3ace6d35a7af..8f9861a46058 100644 --- a/sbin/hastd/hooks.h +++ b/sbin/hastd/hooks.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2010 The FreeBSD Foundation * Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org> diff --git a/sbin/hastd/lzf.c b/sbin/hastd/lzf.c index 687cd0847cb5..2b0ee88b2cd3 100644 --- a/sbin/hastd/lzf.c +++ b/sbin/hastd/lzf.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2000-2008 Marc Alexander Lehmann <schmorp@schmorp.de> * diff --git a/sbin/hastd/lzf.h b/sbin/hastd/lzf.h index b3a3b0979e6b..2c7cd60be5b7 100644 --- a/sbin/hastd/lzf.h +++ b/sbin/hastd/lzf.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2000-2008 Marc Alexander Lehmann <schmorp@schmorp.de> * diff --git a/sbin/hastd/metadata.c b/sbin/hastd/metadata.c index 2d998b706c5a..2bdbb9612a8b 100644 --- a/sbin/hastd/metadata.c +++ b/sbin/hastd/metadata.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * All rights reserved. diff --git a/sbin/hastd/metadata.h b/sbin/hastd/metadata.h index 4efd13ff7b87..693cc3ae836b 100644 --- a/sbin/hastd/metadata.h +++ b/sbin/hastd/metadata.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2010 The FreeBSD Foundation * All rights reserved. diff --git a/sbin/hastd/nv.c b/sbin/hastd/nv.c index 81def8aeb5cd..128db3f7f0ad 100644 --- a/sbin/hastd/nv.c +++ b/sbin/hastd/nv.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * All rights reserved. diff --git a/sbin/hastd/nv.h b/sbin/hastd/nv.h index 7d93a71b2a47..b1bb2042bf17 100644 --- a/sbin/hastd/nv.h +++ b/sbin/hastd/nv.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * All rights reserved. diff --git a/sbin/hastd/parse.y b/sbin/hastd/parse.y index 4e7687c8d23d..f1551a09b500 100644 --- a/sbin/hastd/parse.y +++ b/sbin/hastd/parse.y @@ -1,6 +1,6 @@ %{ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net> diff --git a/sbin/hastd/pjdlog.c b/sbin/hastd/pjdlog.c index 9ac9a69b75da..d314f2b9e3b5 100644 --- a/sbin/hastd/pjdlog.c +++ b/sbin/hastd/pjdlog.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * Copyright (c) 2011 Pawel Jakub Dawidek <pjd@FreeBSD.org> diff --git a/sbin/hastd/pjdlog.h b/sbin/hastd/pjdlog.h index 6a1833db0187..7cb35999f95e 100644 --- a/sbin/hastd/pjdlog.h +++ b/sbin/hastd/pjdlog.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * Copyright (c) 2011 Pawel Jakub Dawidek <pjd@FreeBSD.org> diff --git a/sbin/hastd/primary.c b/sbin/hastd/primary.c index 620cb6e72720..99733a838de2 100644 --- a/sbin/hastd/primary.c +++ b/sbin/hastd/primary.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009 The FreeBSD Foundation * Copyright (c) 2010-2011 Pawel Jakub Dawidek <pawel@dawidek.net> diff --git a/sbin/hastd/proto.c b/sbin/hastd/proto.c index 249da7d5e4ea..9e6b8a4c0670 100644 --- a/sbin/hastd/proto.c +++ b/sbin/hastd/proto.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * All rights reserved. diff --git a/sbin/hastd/proto.h b/sbin/hastd/proto.h index b7f2d44adfd2..6b7007517647 100644 --- a/sbin/hastd/proto.h +++ b/sbin/hastd/proto.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * All rights reserved. diff --git a/sbin/hastd/proto_common.c b/sbin/hastd/proto_common.c index 5a927f563637..c6d4dbbedff9 100644 --- a/sbin/hastd/proto_common.c +++ b/sbin/hastd/proto_common.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net> diff --git a/sbin/hastd/proto_impl.h b/sbin/hastd/proto_impl.h index 2d035beee8b0..57a39384395a 100644 --- a/sbin/hastd/proto_impl.h +++ b/sbin/hastd/proto_impl.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * All rights reserved. diff --git a/sbin/hastd/proto_socketpair.c b/sbin/hastd/proto_socketpair.c index 9c4e9f1b12c9..a51b3e543517 100644 --- a/sbin/hastd/proto_socketpair.c +++ b/sbin/hastd/proto_socketpair.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * All rights reserved. diff --git a/sbin/hastd/proto_tcp.c b/sbin/hastd/proto_tcp.c index d2bf98318af5..9ec0326c7daa 100644 --- a/sbin/hastd/proto_tcp.c +++ b/sbin/hastd/proto_tcp.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net> diff --git a/sbin/hastd/proto_uds.c b/sbin/hastd/proto_uds.c index 5c18a2c43fcb..183f630ebb69 100644 --- a/sbin/hastd/proto_uds.c +++ b/sbin/hastd/proto_uds.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * All rights reserved. diff --git a/sbin/hastd/rangelock.c b/sbin/hastd/rangelock.c index 129b82bedbfc..715aea122780 100644 --- a/sbin/hastd/rangelock.c +++ b/sbin/hastd/rangelock.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2010 The FreeBSD Foundation * All rights reserved. diff --git a/sbin/hastd/rangelock.h b/sbin/hastd/rangelock.h index 93281a382a26..86c6b8e05c57 100644 --- a/sbin/hastd/rangelock.h +++ b/sbin/hastd/rangelock.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2010 The FreeBSD Foundation * All rights reserved. diff --git a/sbin/hastd/refcnt.h b/sbin/hastd/refcnt.h index 8001570b7c85..1c240e1c4b94 100644 --- a/sbin/hastd/refcnt.h +++ b/sbin/hastd/refcnt.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2005 John Baldwin <jhb@FreeBSD.org> * diff --git a/sbin/hastd/secondary.c b/sbin/hastd/secondary.c index fa3142eb0d21..e9882dbc7f3a 100644 --- a/sbin/hastd/secondary.c +++ b/sbin/hastd/secondary.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org> diff --git a/sbin/hastd/subr.c b/sbin/hastd/subr.c index 51e0a55e4191..1319a4d942cc 100644 --- a/sbin/hastd/subr.c +++ b/sbin/hastd/subr.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2010 The FreeBSD Foundation * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net> diff --git a/sbin/hastd/subr.h b/sbin/hastd/subr.h index 93e344d0b181..1ab4afb5df55 100644 --- a/sbin/hastd/subr.h +++ b/sbin/hastd/subr.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2010 The FreeBSD Foundation * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net> diff --git a/sbin/hastd/synch.h b/sbin/hastd/synch.h index 2644e54cebdc..807d28774f64 100644 --- a/sbin/hastd/synch.h +++ b/sbin/hastd/synch.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * All rights reserved. diff --git a/sbin/hastd/token.l b/sbin/hastd/token.l index bc423e17b6e5..876ce891eff1 100644 --- a/sbin/hastd/token.l +++ b/sbin/hastd/token.l @@ -1,6 +1,6 @@ %{ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009-2010 The FreeBSD Foundation * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net> diff --git a/sbin/ifconfig/af_nd6.c b/sbin/ifconfig/af_nd6.c index b6cda30dc06d..d1be5a4dc00f 100644 --- a/sbin/ifconfig/af_nd6.c +++ b/sbin/ifconfig/af_nd6.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009 Hiroki Sato. All rights reserved. * diff --git a/sbin/ifconfig/carp.c b/sbin/ifconfig/carp.c index 940b3fa34c74..aab5f2985328 100644 --- a/sbin/ifconfig/carp.c +++ b/sbin/ifconfig/carp.c @@ -2,7 +2,7 @@ /* from $OpenBSD: ifconfig.c,v 1.82 2003/10/19 05:43:35 mcbride Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2002 Michael Shalayeff. All rights reserved. * Copyright (c) 2003 Ryan McBride. All rights reserved. diff --git a/sbin/ifconfig/iffib.c b/sbin/ifconfig/iffib.c index 7cb21ce54b09..1a622d7ddfce 100644 --- a/sbin/ifconfig/iffib.c +++ b/sbin/ifconfig/iffib.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2011 Alexander V. Chernikov * Copyright (c) 2011 Christian S.J. Peron diff --git a/sbin/ifconfig/ifgif.c b/sbin/ifconfig/ifgif.c index b75dd4e0a7dd..7fcad2001000 100644 --- a/sbin/ifconfig/ifgif.c +++ b/sbin/ifconfig/ifgif.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009 Hiroki Sato. All rights reserved. * diff --git a/sbin/ifconfig/ifgre.c b/sbin/ifconfig/ifgre.c index d6fc0d5b53a2..677e484cfec3 100644 --- a/sbin/ifconfig/ifgre.c +++ b/sbin/ifconfig/ifgre.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2008 Andrew Thompson. All rights reserved. * diff --git a/sbin/ifconfig/ifgroup.c b/sbin/ifconfig/ifgroup.c index c6f5c2959845..67dbc7f689f5 100644 --- a/sbin/ifconfig/ifgroup.c +++ b/sbin/ifconfig/ifgroup.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2006 Max Laier. All rights reserved. * diff --git a/sbin/ifconfig/ifpfsync.c b/sbin/ifconfig/ifpfsync.c index 90646ff00223..e5118fff36af 100644 --- a/sbin/ifconfig/ifpfsync.c +++ b/sbin/ifconfig/ifpfsync.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2003 Ryan McBride. All rights reserved. * Copyright (c) 2004 Max Laier. All rights reserved. diff --git a/sbin/ipfw/nat64clat.c b/sbin/ipfw/nat64clat.c index 962fe7064f8d..08be444318cc 100644 --- a/sbin/ipfw/nat64clat.c +++ b/sbin/ipfw/nat64clat.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2019 Yandex LLC * Copyright (c) 2019 Andrey V. Elsukov <ae@FreeBSD.org> diff --git a/sbin/ipfw/nat64lsn.c b/sbin/ipfw/nat64lsn.c index ff36181815d9..755414f49959 100644 --- a/sbin/ipfw/nat64lsn.c +++ b/sbin/ipfw/nat64lsn.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2015-2019 Yandex LLC * Copyright (c) 2015-2016 Alexander V. Chernikov <melifaro@FreeBSD.org> diff --git a/sbin/ipfw/nat64stl.c b/sbin/ipfw/nat64stl.c index e82ec202b5c6..def9b9dd9b58 100644 --- a/sbin/ipfw/nat64stl.c +++ b/sbin/ipfw/nat64stl.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2015-2019 Yandex LLC * Copyright (c) 2015-2019 Andrey V. Elsukov <ae@FreeBSD.org> diff --git a/sbin/kldconfig/kldconfig.c b/sbin/kldconfig/kldconfig.c index 2dbd88b3ad3d..7f256c17f1c8 100644 --- a/sbin/kldconfig/kldconfig.c +++ b/sbin/kldconfig/kldconfig.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001 Peter Pentchev * All rights reserved. diff --git a/sbin/kldload/kldload.c b/sbin/kldload/kldload.c index a8e43fdd1f92..8946d8ac281f 100644 --- a/sbin/kldload/kldload.c +++ b/sbin/kldload/kldload.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997 Doug Rabson * All rights reserved. diff --git a/sbin/kldstat/kldstat.c b/sbin/kldstat/kldstat.c index b8e4fd6e4b5d..2fee78238e9e 100644 --- a/sbin/kldstat/kldstat.c +++ b/sbin/kldstat/kldstat.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997 Doug Rabson * All rights reserved. diff --git a/sbin/kldunload/kldunload.c b/sbin/kldunload/kldunload.c index 637b9f623893..44a602d33f49 100644 --- a/sbin/kldunload/kldunload.c +++ b/sbin/kldunload/kldunload.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997 Doug Rabson * All rights reserved. diff --git a/sbin/ldconfig/elfhints.c b/sbin/ldconfig/elfhints.c index 81236feec5ca..ad464f463c1a 100644 --- a/sbin/ldconfig/elfhints.c +++ b/sbin/ldconfig/elfhints.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998 John D. Polstra * All rights reserved. diff --git a/sbin/ldconfig/ldconfig.h b/sbin/ldconfig/ldconfig.h index 8aff4e6a5ef2..1196b3fb97b0 100644 --- a/sbin/ldconfig/ldconfig.h +++ b/sbin/ldconfig/ldconfig.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998 John D. Polstra * All rights reserved. diff --git a/sbin/mdconfig/mdconfig.c b/sbin/mdconfig/mdconfig.c index 9f4f3fc3a392..0571ab60443d 100644 --- a/sbin/mdconfig/mdconfig.c +++ b/sbin/mdconfig/mdconfig.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2000-2004 Poul-Henning Kamp <phk@FreeBSD.org> * Copyright (c) 2012 The FreeBSD Foundation diff --git a/sbin/mdmfs/mdmfs.c b/sbin/mdmfs/mdmfs.c index 2e6bb458def3..e42bea43575f 100644 --- a/sbin/mdmfs/mdmfs.c +++ b/sbin/mdmfs/mdmfs.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001 Dima Dorfman. * All rights reserved. diff --git a/sbin/mount/extern.h b/sbin/mount/extern.h index 29c6e49412c3..cdd422b188ab 100644 --- a/sbin/mount/extern.h +++ b/sbin/mount/extern.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997 FreeBSD Inc. * All rights reserved. diff --git a/sbin/mount_fusefs/mount_fusefs.c b/sbin/mount_fusefs/mount_fusefs.c index 9cb5de66d2dd..9b9b6d002d08 100644 --- a/sbin/mount_fusefs/mount_fusefs.c +++ b/sbin/mount_fusefs/mount_fusefs.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2005 Jean-Sebastien Pedron * Copyright (c) 2005 Csaba Henk diff --git a/sbin/newfs_msdos/newfs_msdos.c b/sbin/newfs_msdos/newfs_msdos.c index bac250e7dd05..635e9250a727 100644 --- a/sbin/newfs_msdos/newfs_msdos.c +++ b/sbin/newfs_msdos/newfs_msdos.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998 Robert Nordier * All rights reserved. diff --git a/sbin/nos-tun/nos-tun.c b/sbin/nos-tun/nos-tun.c index 76e11bae75c4..b31fef273d39 100644 --- a/sbin/nos-tun/nos-tun.c +++ b/sbin/nos-tun/nos-tun.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1996, Nickolay Dudorov * All rights reserved. diff --git a/sbin/nvmecontrol/comnd.c b/sbin/nvmecontrol/comnd.c index 0c53c54b9818..6f460670c442 100644 --- a/sbin/nvmecontrol/comnd.c +++ b/sbin/nvmecontrol/comnd.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2019 Netflix, Inc * diff --git a/sbin/nvmecontrol/comnd.h b/sbin/nvmecontrol/comnd.h index 91c97d4a873f..f84e80181ff5 100644 --- a/sbin/nvmecontrol/comnd.h +++ b/sbin/nvmecontrol/comnd.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2019 Netflix, Inc * diff --git a/sbin/nvmecontrol/devlist.c b/sbin/nvmecontrol/devlist.c index 61e6dd47ef8e..ce54bb85f234 100644 --- a/sbin/nvmecontrol/devlist.c +++ b/sbin/nvmecontrol/devlist.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2012-2013 Intel Corporation * All rights reserved. diff --git a/sbin/nvmecontrol/firmware.c b/sbin/nvmecontrol/firmware.c index e6ebc9b70321..4fada6aa04e3 100644 --- a/sbin/nvmecontrol/firmware.c +++ b/sbin/nvmecontrol/firmware.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 EMC Corp. * All rights reserved. diff --git a/sbin/nvmecontrol/format.c b/sbin/nvmecontrol/format.c index a9ab80562032..c9a15b133381 100644 --- a/sbin/nvmecontrol/format.c +++ b/sbin/nvmecontrol/format.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2018-2019 Alexander Motin <mav@FreeBSD.org> * diff --git a/sbin/nvmecontrol/identify.c b/sbin/nvmecontrol/identify.c index 0d4d8003e5d2..7d80103ba539 100644 --- a/sbin/nvmecontrol/identify.c +++ b/sbin/nvmecontrol/identify.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2012-2013 Intel Corporation * All rights reserved. diff --git a/sbin/nvmecontrol/identify_ext.c b/sbin/nvmecontrol/identify_ext.c index 2e4f4ea044e1..617db86b6ddb 100644 --- a/sbin/nvmecontrol/identify_ext.c +++ b/sbin/nvmecontrol/identify_ext.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2012-2013 Intel Corporation * All rights reserved. diff --git a/sbin/nvmecontrol/logpage.c b/sbin/nvmecontrol/logpage.c index 4ed941e5f045..f5c7af8c535c 100644 --- a/sbin/nvmecontrol/logpage.c +++ b/sbin/nvmecontrol/logpage.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 EMC Corp. * All rights reserved. diff --git a/sbin/nvmecontrol/modules/intel/intel.c b/sbin/nvmecontrol/modules/intel/intel.c index 895ffe30683f..02fad72d4bc2 100644 --- a/sbin/nvmecontrol/modules/intel/intel.c +++ b/sbin/nvmecontrol/modules/intel/intel.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 EMC Corp. * All rights reserved. diff --git a/sbin/nvmecontrol/modules/samsung/samsung.c b/sbin/nvmecontrol/modules/samsung/samsung.c index d07732967b54..b85959eaa937 100644 --- a/sbin/nvmecontrol/modules/samsung/samsung.c +++ b/sbin/nvmecontrol/modules/samsung/samsung.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2022 Wanpeng Qian <wanpengqian@gmail.org> * diff --git a/sbin/nvmecontrol/nc_util.c b/sbin/nvmecontrol/nc_util.c index e2ad59b2fd23..f5382cf311dc 100644 --- a/sbin/nvmecontrol/nc_util.c +++ b/sbin/nvmecontrol/nc_util.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2017 Netflix, Inc. * diff --git a/sbin/nvmecontrol/ns.c b/sbin/nvmecontrol/ns.c index 25b90e896982..9b9de403e125 100644 --- a/sbin/nvmecontrol/ns.c +++ b/sbin/nvmecontrol/ns.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2017 Netflix, Inc. * Copyright (C) 2018-2019 Alexander Motin <mav@FreeBSD.org> diff --git a/sbin/nvmecontrol/nsid.c b/sbin/nvmecontrol/nsid.c index 34671901b49c..4b9cb568eaee 100644 --- a/sbin/nvmecontrol/nsid.c +++ b/sbin/nvmecontrol/nsid.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2019 Alexander Motin <mav@FreeBSD.org> * diff --git a/sbin/nvmecontrol/nvmecontrol.c b/sbin/nvmecontrol/nvmecontrol.c index 68a2ecb9b0b8..91e2d516f691 100644 --- a/sbin/nvmecontrol/nvmecontrol.c +++ b/sbin/nvmecontrol/nvmecontrol.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2012-2013 Intel Corporation * All rights reserved. diff --git a/sbin/nvmecontrol/nvmecontrol.h b/sbin/nvmecontrol/nvmecontrol.h index 4b587c48d9a0..3e76de1cc276 100644 --- a/sbin/nvmecontrol/nvmecontrol.h +++ b/sbin/nvmecontrol/nvmecontrol.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2012-2013 Intel Corporation * All rights reserved. diff --git a/sbin/nvmecontrol/nvmecontrol_ext.h b/sbin/nvmecontrol/nvmecontrol_ext.h index d60fcd4d8a2c..f0215effb671 100644 --- a/sbin/nvmecontrol/nvmecontrol_ext.h +++ b/sbin/nvmecontrol/nvmecontrol_ext.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2018 Netflix, Inc. * diff --git a/sbin/nvmecontrol/passthru.c b/sbin/nvmecontrol/passthru.c index 0b24d7b1ea1f..d714e63e3e01 100644 --- a/sbin/nvmecontrol/passthru.c +++ b/sbin/nvmecontrol/passthru.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2019-2021 Netflix, Inc * diff --git a/sbin/nvmecontrol/perftest.c b/sbin/nvmecontrol/perftest.c index 0223bf3b5d51..a54301aecf39 100644 --- a/sbin/nvmecontrol/perftest.c +++ b/sbin/nvmecontrol/perftest.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2012-2013 Intel Corporation * All rights reserved. diff --git a/sbin/nvmecontrol/reset.c b/sbin/nvmecontrol/reset.c index f5ab7265c98b..8d5285c867c2 100644 --- a/sbin/nvmecontrol/reset.c +++ b/sbin/nvmecontrol/reset.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2012-2013 Intel Corporation * All rights reserved. diff --git a/sbin/nvmecontrol/resv.c b/sbin/nvmecontrol/resv.c index 8649c0da8a91..f70a44dba381 100644 --- a/sbin/nvmecontrol/resv.c +++ b/sbin/nvmecontrol/resv.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2019 Alexander Motin <mav@FreeBSD.org> * diff --git a/sbin/nvmecontrol/sanitize.c b/sbin/nvmecontrol/sanitize.c index d5f649959d70..9680b3d138d9 100644 --- a/sbin/nvmecontrol/sanitize.c +++ b/sbin/nvmecontrol/sanitize.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2019 Alexander Motin <mav@FreeBSD.org> * diff --git a/sbin/nvmecontrol/selftest.c b/sbin/nvmecontrol/selftest.c index 17945248f8e3..4dc2d4c0b517 100644 --- a/sbin/nvmecontrol/selftest.c +++ b/sbin/nvmecontrol/selftest.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2020 Chuck Tuffli * diff --git a/sbin/nvmecontrol/tests/basic.sh b/sbin/nvmecontrol/tests/basic.sh index 4a3a8ed73c5c..42a576f4d634 100755 --- a/sbin/nvmecontrol/tests/basic.sh +++ b/sbin/nvmecontrol/tests/basic.sh @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# SPDX-License-Identifier: BSD-2-Clause # # Copyright (c) 2020 David A. Bright # diff --git a/sbin/pfilctl/pfilctl.c b/sbin/pfilctl/pfilctl.c index 2a56009b35b8..3c6a2d980494 100644 --- a/sbin/pfilctl/pfilctl.c +++ b/sbin/pfilctl/pfilctl.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2019 Gleb Smirnoff <glebius@FreeBSD.org> * diff --git a/sbin/ping/main.c b/sbin/ping/main.c index fce58e05bd2f..2f94b5d3227d 100644 --- a/sbin/ping/main.c +++ b/sbin/ping/main.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2019 Jan Sucan <jansucan@FreeBSD.org> * All rights reserved. diff --git a/sbin/ping/main.h b/sbin/ping/main.h index 51a368403bab..14cf7f75021f 100644 --- a/sbin/ping/main.h +++ b/sbin/ping/main.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2019 Jan Sucan <jansucan@FreeBSD.org> * All rights reserved. diff --git a/sbin/ping/ping.h b/sbin/ping/ping.h index 36ce3c0b973d..40fcd500336a 100644 --- a/sbin/ping/ping.h +++ b/sbin/ping/ping.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2019 Jan Sucan <jansucan@FreeBSD.org> * All rights reserved. diff --git a/sbin/ping/ping6.h b/sbin/ping/ping6.h index 5879b3684f2f..10ff6214f8ab 100644 --- a/sbin/ping/ping6.h +++ b/sbin/ping/ping6.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2019 Jan Sucan <jansucan@FreeBSD.org> * All rights reserved. diff --git a/sbin/ping/tests/in_cksum_test.c b/sbin/ping/tests/in_cksum_test.c index 597f6ac20722..a0353adfc9a4 100644 --- a/sbin/ping/tests/in_cksum_test.c +++ b/sbin/ping/tests/in_cksum_test.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2019 Jan Sucan <jansucan@FreeBSD.org> * All rights reserved. diff --git a/sbin/ping/tests/ping_test.sh b/sbin/ping/tests/ping_test.sh index 53383f2fb7bc..0bd6b334acbe 100644 --- a/sbin/ping/tests/ping_test.sh +++ b/sbin/ping/tests/ping_test.sh @@ -1,5 +1,5 @@ # -# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# SPDX-License-Identifier: BSD-2-Clause # # Copyright (C) 2019 Jan Sucan <jansucan@FreeBSD.org> # All rights reserved. diff --git a/sbin/ping/utils.h b/sbin/ping/utils.h index cb56e587a368..4288e1069af2 100644 --- a/sbin/ping/utils.h +++ b/sbin/ping/utils.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2019 Jan Sucan <jansucan@FreeBSD.org> * All rights reserved. diff --git a/sbin/rcorder/rcorder.c b/sbin/rcorder/rcorder.c index a8d4f4fdc3e1..1e3c60f8a1c8 100644 --- a/sbin/rcorder/rcorder.c +++ b/sbin/rcorder/rcorder.c @@ -3,7 +3,7 @@ #endif /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998, 1999 Matthew R. Green * All rights reserved. diff --git a/sbin/reboot/nextboot.sh b/sbin/reboot/nextboot.sh index 2350c42516bf..df6460bc4557 100644 --- a/sbin/reboot/nextboot.sh +++ b/sbin/reboot/nextboot.sh @@ -1,6 +1,6 @@ #! /bin/sh # -# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# SPDX-License-Identifier: BSD-2-Clause # # Copyright (c) 2002 Gordon Tetlow. All rights reserved. # Copyright (c) 2012 Sandvine Incorporated. All rights reserved. diff --git a/sbin/route/tests/basic.sh b/sbin/route/tests/basic.sh index 370a96a25892..a6a6679f1b70 100644 --- a/sbin/route/tests/basic.sh +++ b/sbin/route/tests/basic.sh @@ -1,5 +1,5 @@ #- -# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# SPDX-License-Identifier: BSD-2-Clause # # Copyright (c) 2020 Ahsan Barkati # diff --git a/sbin/route/tests/utils.subr b/sbin/route/tests/utils.subr index fda9980eb78d..d53ba7d5534c 100644 --- a/sbin/route/tests/utils.subr +++ b/sbin/route/tests/utils.subr @@ -1,5 +1,5 @@ #- -# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# SPDX-License-Identifier: BSD-2-Clause # # Copyright (c) 2020 Ahsan Barkati # |