aboutsummaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorPedro F. Giffuni <pfg@FreeBSD.org>2017-11-27 15:37:16 +0000
committerPedro F. Giffuni <pfg@FreeBSD.org>2017-11-27 15:37:16 +0000
commit1de7b4b805ddbf2429da511c053686ac4591ed89 (patch)
treef8124ad7243ccb1b4e727aa06c7f7c643addfc17 /sbin
parentf0cfa1b168014f56c02b83e5f28412cc5f78d117 (diff)
downloadsrc-1de7b4b805ddbf2429da511c053686ac4591ed89.tar.gz
src-1de7b4b805ddbf2429da511c053686ac4591ed89.zip
various: general adoption of SPDX licensing ID tags.
Mainly focus on files that use BSD 2-Clause license, however the tool I was using misidentified many licenses so this was mostly a manual - error prone - task. The Software Package Data Exchange (SPDX) group provides a specification to make it easier for automated tools to detect and summarize well known opensource licenses. We are gradually adopting the specification, noting that the tags are considered only advisory and do not, in any way, superceed or replace the license texts. No functional change intended.
Notes
Notes: svn path=/head/; revision=326276
Diffstat (limited to 'sbin')
-rw-r--r--sbin/adjkerntz/adjkerntz.c4
-rw-r--r--sbin/adjkerntz/pathnames.h6
-rw-r--r--sbin/camcontrol/camcontrol.h4
-rw-r--r--sbin/camcontrol/fwdownload.c2
-rw-r--r--sbin/camcontrol/modeedit.c2
-rw-r--r--sbin/camcontrol/progress.c2
-rw-r--r--sbin/camcontrol/progress.h2
-rw-r--r--sbin/camcontrol/util.c4
-rw-r--r--sbin/ccdconfig/ccdconfig.c4
-rw-r--r--sbin/ccdconfig/pathnames.h4
-rw-r--r--sbin/comcontrol/comcontrol.c2
-rw-r--r--sbin/conscontrol/conscontrol.c2
-rw-r--r--sbin/ddb/ddb.c2
-rw-r--r--sbin/ddb/ddb.h2
-rw-r--r--sbin/ddb/ddb_capture.c2
-rw-r--r--sbin/ddb/ddb_script.c2
-rw-r--r--sbin/devd/devd.h2
-rw-r--r--sbin/devd/devd.hh2
-rw-r--r--sbin/devd/parse.y2
-rw-r--r--sbin/devd/token.l2
-rw-r--r--sbin/devfs/devfs.c2
-rw-r--r--sbin/devfs/extern.h2
-rw-r--r--sbin/devfs/rule.c2
-rw-r--r--sbin/etherswitchcfg/etherswitchcfg.c2
-rw-r--r--sbin/fsck/fsutil.h4
-rw-r--r--sbin/fsck_ffs/ea.c4
-rw-r--r--sbin/fsck_ffs/suj.c2
-rw-r--r--sbin/fsck_msdosfs/boot.c4
-rw-r--r--sbin/fsck_msdosfs/check.c4
-rw-r--r--sbin/fsck_msdosfs/dir.c4
-rw-r--r--sbin/fsck_msdosfs/dosfs.h4
-rw-r--r--sbin/fsck_msdosfs/ext.h4
-rw-r--r--sbin/fsck_msdosfs/fat.c4
-rw-r--r--sbin/fsck_msdosfs/main.c4
-rw-r--r--sbin/fsdb/fsdb.c4
-rw-r--r--sbin/fsdb/fsdb.h4
-rw-r--r--sbin/fsdb/fsdbutil.c4
-rw-r--r--sbin/fsirand/fsirand.c4
-rw-r--r--sbin/gbde/gbde.c2
-rw-r--r--sbin/geom/class/cache/geom_cache.c2
-rw-r--r--sbin/geom/class/concat/geom_concat.c2
-rw-r--r--sbin/geom/class/eli/geom_eli.c2
-rw-r--r--sbin/geom/class/journal/geom_journal.c2
-rw-r--r--sbin/geom/class/journal/geom_journal.h2
-rw-r--r--sbin/geom/class/journal/geom_journal_ufs.c2
-rw-r--r--sbin/geom/class/label/geom_label.c2
-rw-r--r--sbin/geom/class/mirror/geom_mirror.c2
-rw-r--r--sbin/geom/class/mountver/geom_mountver.c2
-rw-r--r--sbin/geom/class/multipath/geom_multipath.c2
-rw-r--r--sbin/geom/class/nop/geom_nop.c2
-rw-r--r--sbin/geom/class/part/geom_part.c2
-rw-r--r--sbin/geom/class/raid/geom_raid.c2
-rw-r--r--sbin/geom/class/raid3/geom_raid3.c2
-rw-r--r--sbin/geom/class/sched/geom_sched.c2
-rw-r--r--sbin/geom/class/shsec/geom_shsec.c2
-rw-r--r--sbin/geom/class/stripe/geom_stripe.c2
-rw-r--r--sbin/geom/class/virstor/geom_virstor.c2
-rw-r--r--sbin/geom/core/geom.c2
-rw-r--r--sbin/geom/core/geom.h2
-rw-r--r--sbin/geom/misc/subr.c2
-rw-r--r--sbin/geom/misc/subr.h2
-rw-r--r--sbin/ggate/ggatec/ggatec.c2
-rw-r--r--sbin/ggate/ggated/ggated.c2
-rw-r--r--sbin/ggate/ggatel/ggatel.c2
-rw-r--r--sbin/ggate/shared/ggate.c2
-rw-r--r--sbin/ggate/shared/ggate.h2
-rw-r--r--sbin/gvinum/gvinum.c4
-rw-r--r--sbin/hastctl/hastctl.c2
-rw-r--r--sbin/hastd/activemap.c2
-rw-r--r--sbin/hastd/activemap.h2
-rw-r--r--sbin/hastd/control.c2
-rw-r--r--sbin/hastd/control.h2
-rw-r--r--sbin/hastd/ebuf.c2
-rw-r--r--sbin/hastd/ebuf.h2
-rw-r--r--sbin/hastd/event.c2
-rw-r--r--sbin/hastd/event.h2
-rw-r--r--sbin/hastd/hast.h2
-rw-r--r--sbin/hastd/hast_checksum.c2
-rw-r--r--sbin/hastd/hast_checksum.h2
-rw-r--r--sbin/hastd/hast_compression.c2
-rw-r--r--sbin/hastd/hast_compression.h2
-rw-r--r--sbin/hastd/hast_proto.c2
-rw-r--r--sbin/hastd/hast_proto.h2
-rw-r--r--sbin/hastd/hastd.c2
-rw-r--r--sbin/hastd/hastd.h2
-rw-r--r--sbin/hastd/hooks.c2
-rw-r--r--sbin/hastd/hooks.h2
-rw-r--r--sbin/hastd/lzf.c4
-rw-r--r--sbin/hastd/lzf.h4
-rw-r--r--sbin/hastd/metadata.c2
-rw-r--r--sbin/hastd/metadata.h2
-rw-r--r--sbin/hastd/nv.c2
-rw-r--r--sbin/hastd/nv.h2
-rw-r--r--sbin/hastd/parse.y2
-rw-r--r--sbin/hastd/pjdlog.c2
-rw-r--r--sbin/hastd/pjdlog.h2
-rw-r--r--sbin/hastd/primary.c2
-rw-r--r--sbin/hastd/proto.c2
-rw-r--r--sbin/hastd/proto.h2
-rw-r--r--sbin/hastd/proto_common.c2
-rw-r--r--sbin/hastd/proto_impl.h2
-rw-r--r--sbin/hastd/proto_socketpair.c2
-rw-r--r--sbin/hastd/proto_tcp.c2
-rw-r--r--sbin/hastd/proto_uds.c2
-rw-r--r--sbin/hastd/rangelock.c2
-rw-r--r--sbin/hastd/rangelock.h2
-rw-r--r--sbin/hastd/refcnt.h2
-rw-r--r--sbin/hastd/secondary.c2
-rw-r--r--sbin/hastd/subr.c2
-rw-r--r--sbin/hastd/subr.h2
-rw-r--r--sbin/hastd/synch.h2
-rw-r--r--sbin/hastd/token.l2
-rw-r--r--sbin/ifconfig/af_nd6.c4
-rw-r--r--sbin/ifconfig/carp.c4
-rw-r--r--sbin/ifconfig/ifbridge.c2
-rw-r--r--sbin/ifconfig/ifconfig.h4
-rw-r--r--sbin/ifconfig/iffib.c2
-rw-r--r--sbin/ifconfig/ifgif.c2
-rw-r--r--sbin/ifconfig/ifgre.c2
-rw-r--r--sbin/ifconfig/ifgroup.c2
-rw-r--r--sbin/ifconfig/ifieee80211.c4
-rw-r--r--sbin/ifconfig/ifmac.c2
-rw-r--r--sbin/ifconfig/ifpfsync.c4
-rw-r--r--sbin/iscontrol/auth_subr.c2
-rw-r--r--sbin/iscontrol/config.c4
-rw-r--r--sbin/iscontrol/fsm.c2
-rw-r--r--sbin/iscontrol/iscontrol.c2
-rw-r--r--sbin/iscontrol/iscontrol.h2
-rw-r--r--sbin/iscontrol/login.c2
-rw-r--r--sbin/iscontrol/misc.c2
-rw-r--r--sbin/iscontrol/pdu.c2
-rw-r--r--sbin/kldconfig/kldconfig.c4
-rw-r--r--sbin/kldload/kldload.c2
-rw-r--r--sbin/kldstat/kldstat.c2
-rw-r--r--sbin/kldunload/kldunload.c2
-rw-r--r--sbin/ldconfig/elfhints.c2
-rw-r--r--sbin/ldconfig/ldconfig.c4
-rw-r--r--sbin/ldconfig/ldconfig.h2
-rw-r--r--sbin/mdconfig/mdconfig.c2
-rw-r--r--sbin/mdmfs/mdmfs.c4
-rw-r--r--sbin/mksnap_ffs/mksnap_ffs.c4
-rw-r--r--sbin/mount/extern.h2
-rw-r--r--sbin/mount_fusefs/mount_fusefs.c2
-rw-r--r--sbin/mount_msdosfs/mount_msdosfs.c4
-rw-r--r--sbin/nandfs/lssnap.c2
-rw-r--r--sbin/nandfs/mksnap.c2
-rw-r--r--sbin/nandfs/nandfs.c2
-rw-r--r--sbin/nandfs/nandfs.h2
-rw-r--r--sbin/nandfs/rmsnap.c2
-rw-r--r--sbin/newfs_msdos/newfs_msdos.c4
-rw-r--r--sbin/newfs_nandfs/newfs_nandfs.c2
-rw-r--r--sbin/nos-tun/nos-tun.c4
-rw-r--r--sbin/nvmecontrol/devlist.c2
-rw-r--r--sbin/nvmecontrol/firmware.c2
-rw-r--r--sbin/nvmecontrol/identify.c2
-rw-r--r--sbin/nvmecontrol/logpage.c2
-rw-r--r--sbin/nvmecontrol/nvmecontrol.c2
-rw-r--r--sbin/nvmecontrol/nvmecontrol.h2
-rw-r--r--sbin/nvmecontrol/perftest.c2
-rw-r--r--sbin/nvmecontrol/reset.c2
-rw-r--r--sbin/pfctl/parse.y4
-rw-r--r--sbin/pfctl/pf_print_state.c4
-rw-r--r--sbin/pfctl/pfctl.c4
-rw-r--r--sbin/pfctl/pfctl.h4
-rw-r--r--sbin/pfctl/pfctl_parser.c4
-rw-r--r--sbin/pfctl/pfctl_parser.h4
-rw-r--r--sbin/pfctl/pfctl_radix.c4
-rw-r--r--sbin/pfctl/pfctl_table.c4
-rw-r--r--sbin/rcorder/rcorder.c4
-rw-r--r--sbin/reboot/nextboot.sh2
-rw-r--r--sbin/spppcontrol/spppcontrol.c4
171 files changed, 389 insertions, 45 deletions
diff --git a/sbin/adjkerntz/adjkerntz.c b/sbin/adjkerntz/adjkerntz.c
index c42379d71915..e6cadcf7f189 100644
--- a/sbin/adjkerntz/adjkerntz.c
+++ b/sbin/adjkerntz/adjkerntz.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* 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 c0e7526c0448..43356cd357a9 100644
--- a/sbin/adjkerntz/pathnames.h
+++ b/sbin/adjkerntz/pathnames.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1993 by Andrew A. Chernov, Moscow, Russia.
* All rights reserved.
*
@@ -22,6 +24,8 @@
* 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$
*/
#include <paths.h>
diff --git a/sbin/camcontrol/camcontrol.h b/sbin/camcontrol/camcontrol.h
index 1756da677800..f6a0a3979150 100644
--- a/sbin/camcontrol/camcontrol.h
+++ b/sbin/camcontrol/camcontrol.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1998 Kenneth D. Merry.
* All rights reserved.
*
diff --git a/sbin/camcontrol/fwdownload.c b/sbin/camcontrol/fwdownload.c
index a233a492dd25..20a35a6bb101 100644
--- a/sbin/camcontrol/fwdownload.c
+++ b/sbin/camcontrol/fwdownload.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Sandvine Incorporated. All rights reserved.
* Copyright (c) 2002-2011 Andre Albsmeier <andre@albsmeier.net>
* All rights reserved.
diff --git a/sbin/camcontrol/modeedit.c b/sbin/camcontrol/modeedit.c
index e7b877d7be85..4a2c8e9a8e3b 100644
--- a/sbin/camcontrol/modeedit.c
+++ b/sbin/camcontrol/modeedit.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Kelly Yancey <kbyanc@posi.net>
* Derived from work done by Julian Elischer <julian@tfs.com,
* julian@dialix.oz.au>, 1993, and Peter Dufault <dufault@hda.com>, 1994.
diff --git a/sbin/camcontrol/progress.c b/sbin/camcontrol/progress.c
index f76305c33525..054b3f5391e7 100644
--- a/sbin/camcontrol/progress.c
+++ b/sbin/camcontrol/progress.c
@@ -1,6 +1,8 @@
/* $NetBSD: progressbar.c,v 1.21 2009/04/12 10:18:52 lukem Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sbin/camcontrol/progress.h b/sbin/camcontrol/progress.h
index a457c328eb2b..1234c1136eaf 100644
--- a/sbin/camcontrol/progress.h
+++ b/sbin/camcontrol/progress.h
@@ -1,6 +1,8 @@
/* $NetBSD: progressbar.c,v 1.21 2009/04/12 10:18:52 lukem Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1997-2012 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sbin/camcontrol/util.c b/sbin/camcontrol/util.c
index 360928179043..c22f3a05e746 100644
--- a/sbin/camcontrol/util.c
+++ b/sbin/camcontrol/util.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Written By Julian ELischer
* Copyright julian Elischer 1993.
* Permission is granted to use or redistribute this file in any way as long
diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c
index 76867ba8ff07..b47331cee396 100644
--- a/sbin/ccdconfig/ccdconfig.c
+++ b/sbin/ccdconfig/ccdconfig.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003 Poul-Henning Kamp
* Copyright (c) 1995 Jason R. Thorpe.
* All rights reserved.
diff --git a/sbin/ccdconfig/pathnames.h b/sbin/ccdconfig/pathnames.h
index 538cfeda096d..1622df8995d2 100644
--- a/sbin/ccdconfig/pathnames.h
+++ b/sbin/ccdconfig/pathnames.h
@@ -1,6 +1,8 @@
/* $NetBSD: pathnames.h,v 1.1 1995/08/17 16:37:20 thorpej Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995 Jason R. Thorpe.
* All rights reserved.
*
diff --git a/sbin/comcontrol/comcontrol.c b/sbin/comcontrol/comcontrol.c
index a7c696ce6794..6bfb47b74c2d 100644
--- a/sbin/comcontrol/comcontrol.c
+++ b/sbin/comcontrol/comcontrol.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1992 Christopher G. Demetriou
* All rights reserved.
*
diff --git a/sbin/conscontrol/conscontrol.c b/sbin/conscontrol/conscontrol.c
index 3d49709c391c..f4298eb8a2cc 100644
--- a/sbin/conscontrol/conscontrol.c
+++ b/sbin/conscontrol/conscontrol.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jonathan Lemon <jlemon@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/ddb/ddb.c b/sbin/ddb/ddb.c
index edba7f8509a5..a90a693e1b03 100644
--- a/sbin/ddb/ddb.c
+++ b/sbin/ddb/ddb.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sbin/ddb/ddb.h b/sbin/ddb/ddb.h
index 8363bccfd889..6f9a6f99f04b 100644
--- a/sbin/ddb/ddb.h
+++ b/sbin/ddb/ddb.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* 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 370fc0058ba9..d8836f52ac83 100644
--- a/sbin/ddb/ddb_capture.c
+++ b/sbin/ddb/ddb_capture.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* 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 13829049dbea..06f8a4e1644c 100644
--- a/sbin/ddb/ddb_script.c
+++ b/sbin/ddb/ddb_script.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sbin/devd/devd.h b/sbin/devd/devd.h
index becfe82aba70..ca78ec0feaea 100644
--- a/sbin/devd/devd.h
+++ b/sbin/devd/devd.h
@@ -1,6 +1,8 @@
/*-
* DEVD (Device action daemon)
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 M. Warner Losh <imp@freebsd.org>.
* All rights reserved.
*
diff --git a/sbin/devd/devd.hh b/sbin/devd/devd.hh
index 945eb2fd6820..af4ce192dec0 100644
--- a/sbin/devd/devd.hh
+++ b/sbin/devd/devd.hh
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002-2003 M. Warner Losh.
* All rights reserved.
*
diff --git a/sbin/devd/parse.y b/sbin/devd/parse.y
index 6334b4e5a27b..ae5cbdfae82d 100644
--- a/sbin/devd/parse.y
+++ b/sbin/devd/parse.y
@@ -2,6 +2,8 @@
/*-
* DEVD (Device action daemon)
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 M. Warner Losh <imp@freebsd.org>.
* All rights reserved.
*
diff --git a/sbin/devd/token.l b/sbin/devd/token.l
index b3441c3a03d1..2221dcf05f7f 100644
--- a/sbin/devd/token.l
+++ b/sbin/devd/token.l
@@ -2,6 +2,8 @@
/*-
* DEVD (Device action daemon)
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 M. Warner Losh <imp@freebsd.org>.
* All rights reserved.
*
diff --git a/sbin/devfs/devfs.c b/sbin/devfs/devfs.c
index bd6fea911ff0..7be94c4737de 100644
--- a/sbin/devfs/devfs.c
+++ b/sbin/devfs/devfs.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001, 2002 Dima Dorfman.
* All rights reserved.
*
diff --git a/sbin/devfs/extern.h b/sbin/devfs/extern.h
index a9f8d224838d..c02a7afba30e 100644
--- a/sbin/devfs/extern.h
+++ b/sbin/devfs/extern.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Dima Dorfman.
* All rights reserved.
*
diff --git a/sbin/devfs/rule.c b/sbin/devfs/rule.c
index bb3ebe107c10..cd868b6f4dbf 100644
--- a/sbin/devfs/rule.c
+++ b/sbin/devfs/rule.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Dima Dorfman.
* All rights reserved.
*
diff --git a/sbin/etherswitchcfg/etherswitchcfg.c b/sbin/etherswitchcfg/etherswitchcfg.c
index ee56ff9106d9..cffa59e3e802 100644
--- a/sbin/etherswitchcfg/etherswitchcfg.c
+++ b/sbin/etherswitchcfg/etherswitchcfg.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
*
diff --git a/sbin/fsck/fsutil.h b/sbin/fsck/fsutil.h
index 013b821b29d0..c6300a0cc0c4 100644
--- a/sbin/fsck/fsutil.h
+++ b/sbin/fsck/fsutil.h
@@ -1,6 +1,8 @@
/* $NetBSD: fsutil.h,v 1.114 2009/10/21 01:07:46 snj Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 1996 Christos Zoulas. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sbin/fsck_ffs/ea.c b/sbin/fsck_ffs/ea.c
index e9c3fced57a1..29e5f46d7651 100644
--- a/sbin/fsck_ffs/ea.c
+++ b/sbin/fsck_ffs/ea.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/sbin/fsck_ffs/suj.c b/sbin/fsck_ffs/suj.c
index f537537d2e3b..69ed3d5e59ac 100644
--- a/sbin/fsck_ffs/suj.c
+++ b/sbin/fsck_ffs/suj.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* 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 667af93a86ea..35a81ee4baa2 100644
--- a/sbin/fsck_msdosfs/boot.c
+++ b/sbin/fsck_msdosfs/boot.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* 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 083389e09933..6d027bbcebe5 100644
--- a/sbin/fsck_msdosfs/check.c
+++ b/sbin/fsck_msdosfs/check.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* 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 52f1e9c3d635..a57a39ef2018 100644
--- a/sbin/fsck_msdosfs/dir.c
+++ b/sbin/fsck_msdosfs/dir.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
* Copyright (c) 1995 Martin Husemann
* Some structure declaration borrowed from Paul Popelka
diff --git a/sbin/fsck_msdosfs/dosfs.h b/sbin/fsck_msdosfs/dosfs.h
index 485b3a15e668..3d84ea01519e 100644
--- a/sbin/fsck_msdosfs/dosfs.h
+++ b/sbin/fsck_msdosfs/dosfs.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
* Copyright (c) 1995 Martin Husemann
* Some structure declaration borrowed from Paul Popelka
diff --git a/sbin/fsck_msdosfs/ext.h b/sbin/fsck_msdosfs/ext.h
index ef9c420c90d0..ebc94677b9b3 100644
--- a/sbin/fsck_msdosfs/ext.h
+++ b/sbin/fsck_msdosfs/ext.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
* Copyright (c) 1995 Martin Husemann
*
diff --git a/sbin/fsck_msdosfs/fat.c b/sbin/fsck_msdosfs/fat.c
index b509c50246a6..8a548379b405 100644
--- a/sbin/fsck_msdosfs/fat.c
+++ b/sbin/fsck_msdosfs/fat.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
* Copyright (c) 1995 Martin Husemann
*
diff --git a/sbin/fsck_msdosfs/main.c b/sbin/fsck_msdosfs/main.c
index e9baf84b626b..8425d8adee8a 100644
--- a/sbin/fsck_msdosfs/main.c
+++ b/sbin/fsck_msdosfs/main.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (C) 1995 Wolfgang Solfrank
* Copyright (c) 1995 Martin Husemann
*
diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c
index 4a612ec7cd2e..a7dbfcb690c9 100644
--- a/sbin/fsdb/fsdb.c
+++ b/sbin/fsdb/fsdb.c
@@ -1,6 +1,8 @@
/* $NetBSD: fsdb.c,v 1.2 1995/10/08 23:18:10 thorpej Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995 John T. Kohl
* All rights reserved.
*
diff --git a/sbin/fsdb/fsdb.h b/sbin/fsdb/fsdb.h
index ddd15153f5cb..b8dc1e0a2dd6 100644
--- a/sbin/fsdb/fsdb.h
+++ b/sbin/fsdb/fsdb.h
@@ -1,6 +1,8 @@
/* $NetBSD: fsdb.h,v 1.2 1995/10/08 23:18:11 thorpej Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995 John T. Kohl
* All rights reserved.
*
diff --git a/sbin/fsdb/fsdbutil.c b/sbin/fsdb/fsdbutil.c
index b3f3f7c0e3c8..6ad315df8eb6 100644
--- a/sbin/fsdb/fsdbutil.c
+++ b/sbin/fsdb/fsdbutil.c
@@ -1,6 +1,8 @@
/* $NetBSD: fsdbutil.c,v 1.2 1995/10/08 23:18:12 thorpej Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995 John T. Kohl
* All rights reserved.
*
diff --git a/sbin/fsirand/fsirand.c b/sbin/fsirand/fsirand.c
index dc9f03a8a727..6b1b1371e17b 100644
--- a/sbin/fsirand/fsirand.c
+++ b/sbin/fsirand/fsirand.c
@@ -1,6 +1,8 @@
/* $OpenBSD: fsirand.c,v 1.9 1997/02/28 00:46:33 millert Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* 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 710ae2c7b477..16afe5e5a489 100644
--- a/sbin/gbde/gbde.c
+++ b/sbin/gbde/gbde.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/sbin/geom/class/cache/geom_cache.c b/sbin/geom/class/cache/geom_cache.c
index 4b18e67dd0bd..fca9f4d7ca37 100644
--- a/sbin/geom/class/cache/geom_cache.c
+++ b/sbin/geom/class/cache/geom_cache.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Ruslan Ermilov <ru@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/concat/geom_concat.c b/sbin/geom/class/concat/geom_concat.c
index d4f3645f340d..f2a7ffda334a 100644
--- a/sbin/geom/class/concat/geom_concat.c
+++ b/sbin/geom/class/concat/geom_concat.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/eli/geom_eli.c b/sbin/geom/class/eli/geom_eli.c
index 1b88bfa8bc73..84e721316eb6 100644
--- a/sbin/geom/class/eli/geom_eli.c
+++ b/sbin/geom/class/eli/geom_eli.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/journal/geom_journal.c b/sbin/geom/class/journal/geom_journal.c
index 681ff47940f5..a828e26bfecd 100644
--- a/sbin/geom/class/journal/geom_journal.c
+++ b/sbin/geom/class/journal/geom_journal.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/journal/geom_journal.h b/sbin/geom/class/journal/geom_journal.h
index 63d35b487926..6725fe04001a 100644
--- a/sbin/geom/class/journal/geom_journal.h
+++ b/sbin/geom/class/journal/geom_journal.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/journal/geom_journal_ufs.c b/sbin/geom/class/journal/geom_journal_ufs.c
index 07d1922df81a..324be1748261 100644
--- a/sbin/geom/class/journal/geom_journal_ufs.c
+++ b/sbin/geom/class/journal/geom_journal_ufs.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/label/geom_label.c b/sbin/geom/class/label/geom_label.c
index 8a2f57c149f4..e69b93fdf8f9 100644
--- a/sbin/geom/class/label/geom_label.c
+++ b/sbin/geom/class/label/geom_label.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/mirror/geom_mirror.c b/sbin/geom/class/mirror/geom_mirror.c
index f30b96ceb2f5..668b0a399548 100644
--- a/sbin/geom/class/mirror/geom_mirror.c
+++ b/sbin/geom/class/mirror/geom_mirror.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2009 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/mountver/geom_mountver.c b/sbin/geom/class/mountver/geom_mountver.c
index bff69c545cda..0d065d71612e 100644
--- a/sbin/geom/class/mountver/geom_mountver.c
+++ b/sbin/geom/class/mountver/geom_mountver.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Edward Tomasz Napierala <trasz@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/multipath/geom_multipath.c b/sbin/geom/class/multipath/geom_multipath.c
index 574391149c3b..12f194ff762d 100644
--- a/sbin/geom/class/multipath/geom_multipath.c
+++ b/sbin/geom/class/multipath/geom_multipath.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Mathew Jacob <mjacob@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/nop/geom_nop.c b/sbin/geom/class/nop/geom_nop.c
index f05a5227bd9b..f7ffc3db549d 100644
--- a/sbin/geom/class/nop/geom_nop.c
+++ b/sbin/geom/class/nop/geom_nop.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/part/geom_part.c b/sbin/geom/class/part/geom_part.c
index 7f668d32e9a6..29c066c4714f 100644
--- a/sbin/geom/class/part/geom_part.c
+++ b/sbin/geom/class/part/geom_part.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007, 2008 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sbin/geom/class/raid/geom_raid.c b/sbin/geom/class/raid/geom_raid.c
index d3383bc8bffe..efb356f6a7e3 100644
--- a/sbin/geom/class/raid/geom_raid.c
+++ b/sbin/geom/class/raid/geom_raid.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/raid3/geom_raid3.c b/sbin/geom/class/raid3/geom_raid3.c
index cd0aa65b14c5..1ad347dae384 100644
--- a/sbin/geom/class/raid3/geom_raid3.c
+++ b/sbin/geom/class/raid3/geom_raid3.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/sched/geom_sched.c b/sbin/geom/class/sched/geom_sched.c
index 727913c9762f..7b7b281d7d55 100644
--- a/sbin/geom/class/sched/geom_sched.c
+++ b/sbin/geom/class/sched/geom_sched.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Fabio Checconi
* Copyright (c) 2010 Luigi Rizzo, Universita` di Pisa
* All rights reserved.
diff --git a/sbin/geom/class/shsec/geom_shsec.c b/sbin/geom/class/shsec/geom_shsec.c
index a5d1b6617995..78e27b34bff9 100644
--- a/sbin/geom/class/shsec/geom_shsec.c
+++ b/sbin/geom/class/shsec/geom_shsec.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/stripe/geom_stripe.c b/sbin/geom/class/stripe/geom_stripe.c
index 1fb16e98c7e7..038d2ce310a0 100644
--- a/sbin/geom/class/stripe/geom_stripe.c
+++ b/sbin/geom/class/stripe/geom_stripe.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/virstor/geom_virstor.c b/sbin/geom/class/virstor/geom_virstor.c
index 66dab0d5c624..25ebdebbe7eb 100644
--- a/sbin/geom/class/virstor/geom_virstor.c
+++ b/sbin/geom/class/virstor/geom_virstor.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Ivan Voras <ivoras@freebsd.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c
index e0b77baeec09..b4c5661ce5ed 100644
--- a/sbin/geom/core/geom.c
+++ b/sbin/geom/core/geom.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* 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 3b0a8eb3c323..89c5828c6429 100644
--- a/sbin/geom/core/geom.h
+++ b/sbin/geom/core/geom.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* 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 5f5ca9115bc6..a8e60f6d286a 100644
--- a/sbin/geom/misc/subr.c
+++ b/sbin/geom/misc/subr.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* 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 5ad1269f84d9..579c94c21491 100644
--- a/sbin/geom/misc/subr.h
+++ b/sbin/geom/misc/subr.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* 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 ea4f701abafa..a2aa49e2b362 100644
--- a/sbin/ggate/ggatec/ggatec.c
+++ b/sbin/ggate/ggatec/ggatec.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* 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 e234cb57b290..e52bdd7cdd15 100644
--- a/sbin/ggate/ggated/ggated.c
+++ b/sbin/ggate/ggated/ggated.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* 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 0b89df091d2a..4659cacbee17 100644
--- a/sbin/ggate/ggatel/ggatel.c
+++ b/sbin/ggate/ggatel/ggatel.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* 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 cf9b9ca1574f..2f544f7a2c9c 100644
--- a/sbin/ggate/shared/ggate.c
+++ b/sbin/ggate/shared/ggate.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* 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 898efea6507e..9ea901036726 100644
--- a/sbin/ggate/shared/ggate.h
+++ b/sbin/ggate/shared/ggate.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* 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 4feaa811f2d8..7c35cff8eb4a 100644
--- a/sbin/gvinum/gvinum.c
+++ b/sbin/gvinum/gvinum.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Lukas Ertl
* Copyright (c) 2005 Chris Jones
* Copyright (c) 2007 Ulf Lilleengen
diff --git a/sbin/hastctl/hastctl.c b/sbin/hastctl/hastctl.c
index 474f1b24cea0..162ba2610991 100644
--- a/sbin/hastctl/hastctl.c
+++ b/sbin/hastctl/hastctl.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/activemap.c b/sbin/hastd/activemap.c
index 5728ea0d7816..73577d2764e9 100644
--- a/sbin/hastd/activemap.c
+++ b/sbin/hastd/activemap.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/activemap.h b/sbin/hastd/activemap.h
index 42f0221dc49d..e42a37e0d96f 100644
--- a/sbin/hastd/activemap.h
+++ b/sbin/hastd/activemap.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/control.c b/sbin/hastd/control.c
index 364225bb6dfc..52e567a52879 100644
--- a/sbin/hastd/control.c
+++ b/sbin/hastd/control.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/control.h b/sbin/hastd/control.h
index 0795c70b14b4..18096162eb65 100644
--- a/sbin/hastd/control.h
+++ b/sbin/hastd/control.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/ebuf.c b/sbin/hastd/ebuf.c
index 1ae2a26b586f..22d3251ec75c 100644
--- a/sbin/hastd/ebuf.c
+++ b/sbin/hastd/ebuf.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/ebuf.h b/sbin/hastd/ebuf.h
index 06275e7c9095..83500ed7f646 100644
--- a/sbin/hastd/ebuf.h
+++ b/sbin/hastd/ebuf.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/event.c b/sbin/hastd/event.c
index ef65df12ba8c..105939f123bf 100644
--- a/sbin/hastd/event.c
+++ b/sbin/hastd/event.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* 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 1614bf199163..c3773298794d 100644
--- a/sbin/hastd/event.h
+++ b/sbin/hastd/event.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* 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 c529de59631f..b1e2537a51f3 100644
--- a/sbin/hastd/hast.h
+++ b/sbin/hastd/hast.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sbin/hastd/hast_checksum.c b/sbin/hastd/hast_checksum.c
index 0cdf1e6f0627..f7ef6a64b4e1 100644
--- a/sbin/hastd/hast_checksum.c
+++ b/sbin/hastd/hast_checksum.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* 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 979982826a0a..ea37a2ff1a1a 100644
--- a/sbin/hastd/hast_checksum.h
+++ b/sbin/hastd/hast_checksum.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* 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 f524eb1ad4aa..e6a2192c6a53 100644
--- a/sbin/hastd/hast_compression.c
+++ b/sbin/hastd/hast_compression.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* 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 eabdfb23c03f..b7ea66290bdd 100644
--- a/sbin/hastd/hast_compression.h
+++ b/sbin/hastd/hast_compression.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* 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 367e4e171816..81dd01a21f17 100644
--- a/sbin/hastd/hast_proto.c
+++ b/sbin/hastd/hast_proto.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sbin/hastd/hast_proto.h b/sbin/hastd/hast_proto.h
index 49f3b563cc06..3a0a3fbdc884 100644
--- a/sbin/hastd/hast_proto.h
+++ b/sbin/hastd/hast_proto.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/hastd.c b/sbin/hastd/hastd.c
index 3d42f5d47959..160dfef437e9 100644
--- a/sbin/hastd/hastd.c
+++ b/sbin/hastd/hastd.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2010-2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sbin/hastd/hastd.h b/sbin/hastd/hastd.h
index d23e85503907..965a63d1cb6d 100644
--- a/sbin/hastd/hastd.h
+++ b/sbin/hastd/hastd.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/hooks.c b/sbin/hastd/hooks.c
index 8cff3bf5ba4f..0aeb1e076f7d 100644
--- a/sbin/hastd/hooks.c
+++ b/sbin/hastd/hooks.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 The FreeBSD Foundation
* Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/hastd/hooks.h b/sbin/hastd/hooks.h
index 4ce435e2b02a..3ace6d35a7af 100644
--- a/sbin/hastd/hooks.h
+++ b/sbin/hastd/hooks.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 The FreeBSD Foundation
* Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/hastd/lzf.c b/sbin/hastd/lzf.c
index cca6a177aef8..687cd0847cb5 100644
--- a/sbin/hastd/lzf.c
+++ b/sbin/hastd/lzf.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000-2008 Marc Alexander Lehmann <schmorp@schmorp.de>
*
* Redistribution and use in source and binary forms, with or without modifica-
diff --git a/sbin/hastd/lzf.h b/sbin/hastd/lzf.h
index b1ad52eaf2b4..b3a3b0979e6b 100644
--- a/sbin/hastd/lzf.h
+++ b/sbin/hastd/lzf.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000-2008 Marc Alexander Lehmann <schmorp@schmorp.de>
*
* Redistribution and use in source and binary forms, with or without modifica-
diff --git a/sbin/hastd/metadata.c b/sbin/hastd/metadata.c
index 6d9f3664f034..2d998b706c5a 100644
--- a/sbin/hastd/metadata.c
+++ b/sbin/hastd/metadata.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/metadata.h b/sbin/hastd/metadata.h
index 83d35f4c2f23..4efd13ff7b87 100644
--- a/sbin/hastd/metadata.h
+++ b/sbin/hastd/metadata.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/nv.c b/sbin/hastd/nv.c
index fefc2dfbdf84..81def8aeb5cd 100644
--- a/sbin/hastd/nv.c
+++ b/sbin/hastd/nv.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/nv.h b/sbin/hastd/nv.h
index d49fa5d579f9..7d93a71b2a47 100644
--- a/sbin/hastd/nv.h
+++ b/sbin/hastd/nv.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/parse.y b/sbin/hastd/parse.y
index 6bfb537c79cb..4e7687c8d23d 100644
--- a/sbin/hastd/parse.y
+++ b/sbin/hastd/parse.y
@@ -1,5 +1,7 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sbin/hastd/pjdlog.c b/sbin/hastd/pjdlog.c
index bc4018facf4d..9ac9a69b75da 100644
--- a/sbin/hastd/pjdlog.c
+++ b/sbin/hastd/pjdlog.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/hastd/pjdlog.h b/sbin/hastd/pjdlog.h
index 0f01f798bffe..6a1833db0187 100644
--- a/sbin/hastd/pjdlog.h
+++ b/sbin/hastd/pjdlog.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/hastd/primary.c b/sbin/hastd/primary.c
index 8fa3383f9c84..620cb6e72720 100644
--- a/sbin/hastd/primary.c
+++ b/sbin/hastd/primary.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 The FreeBSD Foundation
* Copyright (c) 2010-2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sbin/hastd/proto.c b/sbin/hastd/proto.c
index 53bbf7a36323..249da7d5e4ea 100644
--- a/sbin/hastd/proto.c
+++ b/sbin/hastd/proto.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/proto.h b/sbin/hastd/proto.h
index 1a60e5bfd87c..b7f2d44adfd2 100644
--- a/sbin/hastd/proto.h
+++ b/sbin/hastd/proto.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* 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 843366bda228..5a927f563637 100644
--- a/sbin/hastd/proto_common.c
+++ b/sbin/hastd/proto_common.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sbin/hastd/proto_impl.h b/sbin/hastd/proto_impl.h
index d62f26f97594..2d035beee8b0 100644
--- a/sbin/hastd/proto_impl.h
+++ b/sbin/hastd/proto_impl.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* 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 d13caa988ea6..9c4e9f1b12c9 100644
--- a/sbin/hastd/proto_socketpair.c
+++ b/sbin/hastd/proto_socketpair.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* 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 6dc066155574..d2bf98318af5 100644
--- a/sbin/hastd/proto_tcp.c
+++ b/sbin/hastd/proto_tcp.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sbin/hastd/proto_uds.c b/sbin/hastd/proto_uds.c
index 087b788225a6..5c18a2c43fcb 100644
--- a/sbin/hastd/proto_uds.c
+++ b/sbin/hastd/proto_uds.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/rangelock.c b/sbin/hastd/rangelock.c
index e14c5b8075f7..129b82bedbfc 100644
--- a/sbin/hastd/rangelock.c
+++ b/sbin/hastd/rangelock.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/rangelock.h b/sbin/hastd/rangelock.h
index 2ad9895c5079..93281a382a26 100644
--- a/sbin/hastd/rangelock.h
+++ b/sbin/hastd/rangelock.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/refcnt.h b/sbin/hastd/refcnt.h
index 11801cb9256f..5e86f13a7c45 100644
--- a/sbin/hastd/refcnt.h
+++ b/sbin/hastd/refcnt.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 John Baldwin <jhb@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/hastd/secondary.c b/sbin/hastd/secondary.c
index 5e1207a35677..fa3142eb0d21 100644
--- a/sbin/hastd/secondary.c
+++ b/sbin/hastd/secondary.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/hastd/subr.c b/sbin/hastd/subr.c
index 62818b21b984..51e0a55e4191 100644
--- a/sbin/hastd/subr.c
+++ b/sbin/hastd/subr.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sbin/hastd/subr.h b/sbin/hastd/subr.h
index c7657544630f..93e344d0b181 100644
--- a/sbin/hastd/subr.h
+++ b/sbin/hastd/subr.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sbin/hastd/synch.h b/sbin/hastd/synch.h
index db4d83b48b49..2644e54cebdc 100644
--- a/sbin/hastd/synch.h
+++ b/sbin/hastd/synch.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/token.l b/sbin/hastd/token.l
index e8f676094ef0..bc423e17b6e5 100644
--- a/sbin/hastd/token.l
+++ b/sbin/hastd/token.l
@@ -1,5 +1,7 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sbin/ifconfig/af_nd6.c b/sbin/ifconfig/af_nd6.c
index 68789ca58999..8c576117e226 100644
--- a/sbin/ifconfig/af_nd6.c
+++ b/sbin/ifconfig/af_nd6.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Hiroki Sato. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sbin/ifconfig/carp.c b/sbin/ifconfig/carp.c
index 2a2ee47d4f86..dcf966d873ee 100644
--- a/sbin/ifconfig/carp.c
+++ b/sbin/ifconfig/carp.c
@@ -1,7 +1,9 @@
/* $FreeBSD$ */
/* from $OpenBSD: ifconfig.c,v 1.82 2003/10/19 05:43:35 mcbride Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Michael Shalayeff. All rights reserved.
* Copyright (c) 2003 Ryan McBride. All rights reserved.
*
diff --git a/sbin/ifconfig/ifbridge.c b/sbin/ifconfig/ifbridge.c
index 0f0d5b5498d6..8ccbd622dff4 100644
--- a/sbin/ifconfig/ifbridge.c
+++ b/sbin/ifconfig/ifbridge.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 2001 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h
index ada224f67052..5a9af3aaa7b8 100644
--- a/sbin/ifconfig/ifconfig.h
+++ b/sbin/ifconfig/ifconfig.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997 Peter Wemm.
* All rights reserved.
*
diff --git a/sbin/ifconfig/iffib.c b/sbin/ifconfig/iffib.c
index 19219482304b..7cb21ce54b09 100644
--- a/sbin/ifconfig/iffib.c
+++ b/sbin/ifconfig/iffib.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Alexander V. Chernikov
* Copyright (c) 2011 Christian S.J. Peron
* Copyright (c) 2011 Bjoern A. Zeeb
diff --git a/sbin/ifconfig/ifgif.c b/sbin/ifconfig/ifgif.c
index 72ceb1b6e982..b75dd4e0a7dd 100644
--- a/sbin/ifconfig/ifgif.c
+++ b/sbin/ifconfig/ifgif.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Hiroki Sato. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sbin/ifconfig/ifgre.c b/sbin/ifconfig/ifgre.c
index 36896785a8e2..cdd129a14539 100644
--- a/sbin/ifconfig/ifgre.c
+++ b/sbin/ifconfig/ifgre.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Andrew Thompson. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sbin/ifconfig/ifgroup.c b/sbin/ifconfig/ifgroup.c
index d12c5fb8e8a6..d3792e00a1cb 100644
--- a/sbin/ifconfig/ifgroup.c
+++ b/sbin/ifconfig/ifgroup.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Max Laier. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c
index cc90daccda6d..052c9f0ee033 100644
--- a/sbin/ifconfig/ifieee80211.c
+++ b/sbin/ifconfig/ifieee80211.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright 2001 The Aerospace Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sbin/ifconfig/ifmac.c b/sbin/ifconfig/ifmac.c
index 3b171ea0bae5..31f4e970951c 100644
--- a/sbin/ifconfig/ifmac.c
+++ b/sbin/ifconfig/ifmac.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2001 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/sbin/ifconfig/ifpfsync.c b/sbin/ifconfig/ifpfsync.c
index 82199ee5acee..3c9a9ed7a70f 100644
--- a/sbin/ifconfig/ifpfsync.c
+++ b/sbin/ifconfig/ifpfsync.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Ryan McBride. All rights reserved.
* Copyright (c) 2004 Max Laier. All rights reserved.
*
diff --git a/sbin/iscontrol/auth_subr.c b/sbin/iscontrol/auth_subr.c
index 5f8292985a84..a4c17ba20868 100644
--- a/sbin/iscontrol/auth_subr.c
+++ b/sbin/iscontrol/auth_subr.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
*
diff --git a/sbin/iscontrol/config.c b/sbin/iscontrol/config.c
index 639a702513e0..2fe44512f311 100644
--- a/sbin/iscontrol/config.c
+++ b/sbin/iscontrol/config.c
@@ -1,4 +1,6 @@
- /*-
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2009 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
*
diff --git a/sbin/iscontrol/fsm.c b/sbin/iscontrol/fsm.c
index bfeeb7fb8bfc..8efbe6667b16 100644
--- a/sbin/iscontrol/fsm.c
+++ b/sbin/iscontrol/fsm.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
*
diff --git a/sbin/iscontrol/iscontrol.c b/sbin/iscontrol/iscontrol.c
index 2e8f2ea44502..967795ba8356 100644
--- a/sbin/iscontrol/iscontrol.c
+++ b/sbin/iscontrol/iscontrol.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
*
diff --git a/sbin/iscontrol/iscontrol.h b/sbin/iscontrol/iscontrol.h
index 6aa5612e2321..cc7a6cb772e7 100644
--- a/sbin/iscontrol/iscontrol.h
+++ b/sbin/iscontrol/iscontrol.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
*
diff --git a/sbin/iscontrol/login.c b/sbin/iscontrol/login.c
index 92bbc64b7bbe..7cb990029047 100644
--- a/sbin/iscontrol/login.c
+++ b/sbin/iscontrol/login.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
*
diff --git a/sbin/iscontrol/misc.c b/sbin/iscontrol/misc.c
index b6fe6dffb6a0..339763404e78 100644
--- a/sbin/iscontrol/misc.c
+++ b/sbin/iscontrol/misc.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
*
diff --git a/sbin/iscontrol/pdu.c b/sbin/iscontrol/pdu.c
index 7ce90eaa203c..3133e5367f25 100644
--- a/sbin/iscontrol/pdu.c
+++ b/sbin/iscontrol/pdu.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
*
diff --git a/sbin/kldconfig/kldconfig.c b/sbin/kldconfig/kldconfig.c
index 8c7d7327a1de..2dbd88b3ad3d 100644
--- a/sbin/kldconfig/kldconfig.c
+++ b/sbin/kldconfig/kldconfig.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Peter Pentchev
* All rights reserved.
*
diff --git a/sbin/kldload/kldload.c b/sbin/kldload/kldload.c
index 39a4114887f8..254a409cd2a7 100644
--- a/sbin/kldload/kldload.c
+++ b/sbin/kldload/kldload.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Doug Rabson
* All rights reserved.
*
diff --git a/sbin/kldstat/kldstat.c b/sbin/kldstat/kldstat.c
index ee819cdc04d6..d9e6bef24596 100644
--- a/sbin/kldstat/kldstat.c
+++ b/sbin/kldstat/kldstat.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Doug Rabson
* All rights reserved.
*
diff --git a/sbin/kldunload/kldunload.c b/sbin/kldunload/kldunload.c
index 8a3ea6176f66..637b9f623893 100644
--- a/sbin/kldunload/kldunload.c
+++ b/sbin/kldunload/kldunload.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Doug Rabson
* All rights reserved.
*
diff --git a/sbin/ldconfig/elfhints.c b/sbin/ldconfig/elfhints.c
index 9bdf56e4271e..bbedac64b3ff 100644
--- a/sbin/ldconfig/elfhints.c
+++ b/sbin/ldconfig/elfhints.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 John D. Polstra
* All rights reserved.
*
diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c
index 764ca3e12ab2..a9494cc9f6ad 100644
--- a/sbin/ldconfig/ldconfig.c
+++ b/sbin/ldconfig/ldconfig.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1993,1995 Paul Kranenburg
* All rights reserved.
*
diff --git a/sbin/ldconfig/ldconfig.h b/sbin/ldconfig/ldconfig.h
index 859bcbd204bc..9b278255ac07 100644
--- a/sbin/ldconfig/ldconfig.h
+++ b/sbin/ldconfig/ldconfig.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 John D. Polstra
* All rights reserved.
*
diff --git a/sbin/mdconfig/mdconfig.c b/sbin/mdconfig/mdconfig.c
index a76af2c7fdb0..933d448fde32 100644
--- a/sbin/mdconfig/mdconfig.c
+++ b/sbin/mdconfig/mdconfig.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000-2004 Poul-Henning Kamp <phk@FreeBSD.org>
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
diff --git a/sbin/mdmfs/mdmfs.c b/sbin/mdmfs/mdmfs.c
index ee2faf0dcbaf..cbe64d4b5377 100644
--- a/sbin/mdmfs/mdmfs.c
+++ b/sbin/mdmfs/mdmfs.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Dima Dorfman.
* All rights reserved.
*
diff --git a/sbin/mksnap_ffs/mksnap_ffs.c b/sbin/mksnap_ffs/mksnap_ffs.c
index db49fdb46ea1..374617bf50fd 100644
--- a/sbin/mksnap_ffs/mksnap_ffs.c
+++ b/sbin/mksnap_ffs/mksnap_ffs.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2003 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/sbin/mount/extern.h b/sbin/mount/extern.h
index 91e2ec480b2e..29c6e49412c3 100644
--- a/sbin/mount/extern.h
+++ b/sbin/mount/extern.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* 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 7d4b9a1ebd6b..2dd2dcafb828 100644
--- a/sbin/mount_fusefs/mount_fusefs.c
+++ b/sbin/mount_fusefs/mount_fusefs.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Jean-Sebastien Pedron
* Copyright (c) 2005 Csaba Henk
* All rights reserved.
diff --git a/sbin/mount_msdosfs/mount_msdosfs.c b/sbin/mount_msdosfs/mount_msdosfs.c
index 8814fdd1692a..d439ba671b83 100644
--- a/sbin/mount_msdosfs/mount_msdosfs.c
+++ b/sbin/mount_msdosfs/mount_msdosfs.c
@@ -1,6 +1,8 @@
/* $NetBSD: mount_msdos.c,v 1.18 1997/09/16 12:24:18 lukem Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Christopher G. Demetriou
* All rights reserved.
*
diff --git a/sbin/nandfs/lssnap.c b/sbin/nandfs/lssnap.c
index fbee3cd7e55a..cb240fb1da84 100644
--- a/sbin/nandfs/lssnap.c
+++ b/sbin/nandfs/lssnap.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/nandfs/mksnap.c b/sbin/nandfs/mksnap.c
index cd2d1309313f..f75eda3834a9 100644
--- a/sbin/nandfs/mksnap.c
+++ b/sbin/nandfs/mksnap.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/nandfs/nandfs.c b/sbin/nandfs/nandfs.c
index f7ddda161055..b319b58bc5c1 100644
--- a/sbin/nandfs/nandfs.c
+++ b/sbin/nandfs/nandfs.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/nandfs/nandfs.h b/sbin/nandfs/nandfs.h
index f544cc254be1..993d9338e904 100644
--- a/sbin/nandfs/nandfs.h
+++ b/sbin/nandfs/nandfs.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/nandfs/rmsnap.c b/sbin/nandfs/rmsnap.c
index df2cbd562f14..c07439d694ef 100644
--- a/sbin/nandfs/rmsnap.c
+++ b/sbin/nandfs/rmsnap.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/newfs_msdos/newfs_msdos.c b/sbin/newfs_msdos/newfs_msdos.c
index 5677568c97e6..dc312140cd48 100644
--- a/sbin/newfs_msdos/newfs_msdos.c
+++ b/sbin/newfs_msdos/newfs_msdos.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Robert Nordier
* All rights reserved.
*
diff --git a/sbin/newfs_nandfs/newfs_nandfs.c b/sbin/newfs_nandfs/newfs_nandfs.c
index 274d502ce840..e432cc6e6420 100644
--- a/sbin/newfs_nandfs/newfs_nandfs.c
+++ b/sbin/newfs_nandfs/newfs_nandfs.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf.
* All rights reserved.
*
diff --git a/sbin/nos-tun/nos-tun.c b/sbin/nos-tun/nos-tun.c
index ee0fc4ce0b73..76e11bae75c4 100644
--- a/sbin/nos-tun/nos-tun.c
+++ b/sbin/nos-tun/nos-tun.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996, Nickolay Dudorov
* All rights reserved.
*
diff --git a/sbin/nvmecontrol/devlist.c b/sbin/nvmecontrol/devlist.c
index 35a46c187a7f..2a37245b7f5b 100644
--- a/sbin/nvmecontrol/devlist.c
+++ b/sbin/nvmecontrol/devlist.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
*
diff --git a/sbin/nvmecontrol/firmware.c b/sbin/nvmecontrol/firmware.c
index a9aa49fc9ce8..cc2833b840af 100644
--- a/sbin/nvmecontrol/firmware.c
+++ b/sbin/nvmecontrol/firmware.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 EMC Corp.
* All rights reserved.
*
diff --git a/sbin/nvmecontrol/identify.c b/sbin/nvmecontrol/identify.c
index e7994520ded5..423bbc841d21 100644
--- a/sbin/nvmecontrol/identify.c
+++ b/sbin/nvmecontrol/identify.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
*
diff --git a/sbin/nvmecontrol/logpage.c b/sbin/nvmecontrol/logpage.c
index ccda7f06ce10..7c19730659c1 100644
--- a/sbin/nvmecontrol/logpage.c
+++ b/sbin/nvmecontrol/logpage.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 EMC Corp.
* All rights reserved.
*
diff --git a/sbin/nvmecontrol/nvmecontrol.c b/sbin/nvmecontrol/nvmecontrol.c
index 6c658d24b39c..55caf0b7e031 100644
--- a/sbin/nvmecontrol/nvmecontrol.c
+++ b/sbin/nvmecontrol/nvmecontrol.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
*
diff --git a/sbin/nvmecontrol/nvmecontrol.h b/sbin/nvmecontrol/nvmecontrol.h
index 92898dbea066..d3f6badf0fce 100644
--- a/sbin/nvmecontrol/nvmecontrol.h
+++ b/sbin/nvmecontrol/nvmecontrol.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
*
diff --git a/sbin/nvmecontrol/perftest.c b/sbin/nvmecontrol/perftest.c
index cc9119826f70..cdedd1b7d6f1 100644
--- a/sbin/nvmecontrol/perftest.c
+++ b/sbin/nvmecontrol/perftest.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
*
diff --git a/sbin/nvmecontrol/reset.c b/sbin/nvmecontrol/reset.c
index 8ce597ea1a17..7cb335928337 100644
--- a/sbin/nvmecontrol/reset.c
+++ b/sbin/nvmecontrol/reset.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
*
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y
index db09a44ad6b4..c976358325e7 100644
--- a/sbin/pfctl/parse.y
+++ b/sbin/pfctl/parse.y
@@ -1,6 +1,8 @@
/* $OpenBSD: parse.y,v 1.554 2008/10/17 12:59:53 henning Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 2001 Markus Friedl. All rights reserved.
* Copyright (c) 2001 Daniel Hartmeier. All rights reserved.
* Copyright (c) 2001 Theo de Raadt. All rights reserved.
diff --git a/sbin/pfctl/pf_print_state.c b/sbin/pfctl/pf_print_state.c
index 346e6236f320..810c773f1019 100644
--- a/sbin/pfctl/pf_print_state.c
+++ b/sbin/pfctl/pf_print_state.c
@@ -1,6 +1,8 @@
/* $OpenBSD: pf_print_state.c,v 1.52 2008/08/12 16:40:18 david Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 2001 Daniel Hartmeier
* All rights reserved.
*
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c
index c00f4c3b8045..9586e1929991 100644
--- a/sbin/pfctl/pfctl.c
+++ b/sbin/pfctl/pfctl.c
@@ -1,6 +1,8 @@
/* $OpenBSD: pfctl.c,v 1.278 2008/08/31 20:18:17 jmc Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 2001 Daniel Hartmeier
* Copyright (c) 2002,2003 Henning Brauer
* All rights reserved.
diff --git a/sbin/pfctl/pfctl.h b/sbin/pfctl/pfctl.h
index 2c69bc2068b0..a432f109726a 100644
--- a/sbin/pfctl/pfctl.h
+++ b/sbin/pfctl/pfctl.h
@@ -1,6 +1,8 @@
/* $OpenBSD: pfctl.h,v 1.42 2007/12/05 12:01:47 chl Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 2001 Daniel Hartmeier
* All rights reserved.
*
diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c
index a47dfd04103c..7786061839c9 100644
--- a/sbin/pfctl/pfctl_parser.c
+++ b/sbin/pfctl/pfctl_parser.c
@@ -1,6 +1,8 @@
/* $OpenBSD: pfctl_parser.c,v 1.240 2008/06/10 20:55:02 mcbride Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 2001 Daniel Hartmeier
* Copyright (c) 2002,2003 Henning Brauer
* All rights reserved.
diff --git a/sbin/pfctl/pfctl_parser.h b/sbin/pfctl/pfctl_parser.h
index 2b7fea7bf7a0..e652c97cf203 100644
--- a/sbin/pfctl/pfctl_parser.h
+++ b/sbin/pfctl/pfctl_parser.h
@@ -1,6 +1,8 @@
/* $OpenBSD: pfctl_parser.h,v 1.86 2006/10/31 23:46:25 mcbride Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 2001 Daniel Hartmeier
* All rights reserved.
*
diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c
index 5038e0b39ba2..6b303c6211f5 100644
--- a/sbin/pfctl/pfctl_radix.c
+++ b/sbin/pfctl/pfctl_radix.c
@@ -1,6 +1,8 @@
/* $OpenBSD: pfctl_radix.c,v 1.27 2005/05/21 21:03:58 henning Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 2002 Cedric Berger
* All rights reserved.
*
diff --git a/sbin/pfctl/pfctl_table.c b/sbin/pfctl/pfctl_table.c
index f3a1efdd06ba..db338fbe0876 100644
--- a/sbin/pfctl/pfctl_table.c
+++ b/sbin/pfctl/pfctl_table.c
@@ -1,6 +1,8 @@
/* $OpenBSD: pfctl_table.c,v 1.67 2008/06/10 20:55:02 mcbride Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 2002 Cedric Berger
* All rights reserved.
*
diff --git a/sbin/rcorder/rcorder.c b/sbin/rcorder/rcorder.c
index 37faa2470e55..86fba7cfca10 100644
--- a/sbin/rcorder/rcorder.c
+++ b/sbin/rcorder/rcorder.c
@@ -2,7 +2,9 @@
/* $NetBSD: rcorder.c,v 1.7 2000/08/04 07:33:55 enami Exp $ */
#endif
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998, 1999 Matthew R. Green
* All rights reserved.
* Copyright (c) 1998
diff --git a/sbin/reboot/nextboot.sh b/sbin/reboot/nextboot.sh
index d9bbb259e31e..e975215f695a 100644
--- a/sbin/reboot/nextboot.sh
+++ b/sbin/reboot/nextboot.sh
@@ -1,5 +1,7 @@
#! /bin/sh
#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2002 Gordon Tetlow. All rights reserved.
# Copyright (c) 2012 Sandvine Incorporated. All rights reserved.
#
diff --git a/sbin/spppcontrol/spppcontrol.c b/sbin/spppcontrol/spppcontrol.c
index 9cb84ab8e8df..e56310c635e9 100644
--- a/sbin/spppcontrol/spppcontrol.c
+++ b/sbin/spppcontrol/spppcontrol.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997, 2001 Joerg Wunsch
*
* All rights reserved.