From owner-svn-src-head@freebsd.org  Mon Nov 27 15:25:08 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 90FADE54BFE;
 Mon, 27 Nov 2017 15:25:08 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 548B276F4C;
 Mon, 27 Nov 2017 15:25:08 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARFP7JE006672;
 Mon, 27 Nov 2017 15:25:07 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARFP2Pf006621;
 Mon, 27 Nov 2017 15:25:02 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271525.vARFP2Pf006621@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:25:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326274 - in head/libexec: atrun bootpd/tools/bootptest
 pppoed rpc.rwalld rpc.sprayd rtld-aout rtld-elf rtld-elf/amd64 rtld-elf/arm
 rtld-elf/i386 rtld-elf/mips rtld-elf/powerpc rtld-elf...
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: in head/libexec: atrun bootpd/tools/bootptest pppoed
 rpc.rwalld rpc.sprayd rtld-aout rtld-elf rtld-elf/amd64 rtld-elf/arm
 rtld-elf/i386 rtld-elf/mips rtld-elf/powerpc rtld-elf/powerpc64
 rtld-elf/sparc...
X-SVN-Commit-Revision: 326274
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:25:08 -0000

Author: pfg
Date: Mon Nov 27 15:25:02 2017
New Revision: 326274
URL: https://svnweb.freebsd.org/changeset/base/326274

Log:
  libexec: 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.

Modified:
  head/libexec/atrun/atrun.c
  head/libexec/atrun/gloadavg.c
  head/libexec/atrun/gloadavg.h
  head/libexec/bootpd/tools/bootptest/print-bootp.c
  head/libexec/pppoed/pppoed.c
  head/libexec/rpc.rwalld/rwalld.c
  head/libexec/rpc.sprayd/sprayd.c
  head/libexec/rtld-aout/shlib.c
  head/libexec/rtld-aout/shlib.h
  head/libexec/rtld-aout/support.c
  head/libexec/rtld-aout/support.h
  head/libexec/rtld-elf/amd64/reloc.c
  head/libexec/rtld-elf/amd64/rtld_machdep.h
  head/libexec/rtld-elf/arm/rtld_machdep.h
  head/libexec/rtld-elf/debug.c
  head/libexec/rtld-elf/debug.h
  head/libexec/rtld-elf/i386/reloc.c
  head/libexec/rtld-elf/i386/rtld_machdep.h
  head/libexec/rtld-elf/map_object.c
  head/libexec/rtld-elf/mips/reloc.c
  head/libexec/rtld-elf/mips/rtld_machdep.h
  head/libexec/rtld-elf/powerpc/reloc.c
  head/libexec/rtld-elf/powerpc/rtld_machdep.h
  head/libexec/rtld-elf/powerpc64/reloc.c
  head/libexec/rtld-elf/powerpc64/rtld_machdep.h
  head/libexec/rtld-elf/rtld.c
  head/libexec/rtld-elf/rtld.h
  head/libexec/rtld-elf/rtld_lock.c
  head/libexec/rtld-elf/rtld_lock.h
  head/libexec/rtld-elf/rtld_printf.h
  head/libexec/rtld-elf/rtld_tls.h
  head/libexec/rtld-elf/sparc64/reloc.c
  head/libexec/rtld-elf/sparc64/rtld_machdep.h
  head/libexec/rtld-elf/xmalloc.c
  head/libexec/save-entropy/save-entropy.sh
  head/libexec/talkd/extern.h
  head/libexec/tftpd/tftp-file.c
  head/libexec/tftpd/tftp-file.h
  head/libexec/tftpd/tftp-io.c
  head/libexec/tftpd/tftp-io.h
  head/libexec/tftpd/tftp-options.c
  head/libexec/tftpd/tftp-options.h
  head/libexec/tftpd/tftp-transfer.c
  head/libexec/tftpd/tftp-transfer.h
  head/libexec/tftpd/tftp-utils.c
  head/libexec/tftpd/tftp-utils.h
  head/libexec/ulog-helper/ulog-helper.c

Modified: head/libexec/atrun/atrun.c
==============================================================================
--- head/libexec/atrun/atrun.c	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/atrun/atrun.c	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,5 +1,8 @@
-/* 
+/*-
  *  atrun.c - run jobs queued by at; run with root privileges.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  *  Copyright (C) 1993, 1994 Thomas Koenig
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/libexec/atrun/gloadavg.c
==============================================================================
--- head/libexec/atrun/gloadavg.c	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/atrun/gloadavg.c	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,6 +1,8 @@
-/* 
+/*-
  *  gloadavg.c - get load average for Linux
  *  Copyright (C) 1993  Thomas Koenig
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: head/libexec/atrun/gloadavg.h
==============================================================================
--- head/libexec/atrun/gloadavg.h	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/atrun/gloadavg.h	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,6 +1,8 @@
-/* 
+/*-
  *  gloadavg.h -  header for atrun(8)
  *  Copyright (C) 1993  Thomas Koenig
+ *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: head/libexec/bootpd/tools/bootptest/print-bootp.c
==============================================================================
--- head/libexec/bootpd/tools/bootptest/print-bootp.c	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/bootpd/tools/bootptest/print-bootp.c	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1988-1990
  *      The Regents of the University of California.  All rights reserved.
  *

Modified: head/libexec/pppoed/pppoed.c
==============================================================================
--- head/libexec/pppoed/pppoed.c	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/pppoed/pppoed.c	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999-2001 Brian Somers <brian@Awfulhak.org>
  * All rights reserved.
  *

Modified: head/libexec/rpc.rwalld/rwalld.c
==============================================================================
--- head/libexec/rpc.rwalld/rwalld.c	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rpc.rwalld/rwalld.c	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1993 Christopher G. Demetriou
  * All rights reserved.
  *

Modified: head/libexec/rpc.sprayd/sprayd.c
==============================================================================
--- head/libexec/rpc.sprayd/sprayd.c	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rpc.sprayd/sprayd.c	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1994 Christos Zoulas
  * All rights reserved.
  *

Modified: head/libexec/rtld-aout/shlib.c
==============================================================================
--- head/libexec/rtld-aout/shlib.c	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-aout/shlib.c	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1993 Paul Kranenburg
  * All rights reserved.
  *

Modified: head/libexec/rtld-aout/shlib.h
==============================================================================
--- head/libexec/rtld-aout/shlib.h	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-aout/shlib.h	Mon Nov 27 15:25:02 2017	(r326274)
@@ -2,6 +2,8 @@
  * Copyright (C) 1996
  *	Peter Wemm.  All rights reserved.
  *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:

Modified: head/libexec/rtld-aout/support.c
==============================================================================
--- head/libexec/rtld-aout/support.c	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-aout/support.c	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,9 +1,11 @@
-/*
+/*-
  * Generic "support" routines to replace those obtained from libiberty for ld.
  *
  * I've collected these from random bits of (published) code I've written
  * over the years, not that they are a big deal.  peter@freebsd.org
- *-
+ *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (C) 1996
  *	Peter Wemm.  All rights reserved.
  *

Modified: head/libexec/rtld-aout/support.h
==============================================================================
--- head/libexec/rtld-aout/support.h	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-aout/support.h	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (C) 1996
  *	Peter Wemm.  All rights reserved.
  *

Modified: head/libexec/rtld-elf/amd64/reloc.c
==============================================================================
--- head/libexec/rtld-elf/amd64/reloc.c	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-elf/amd64/reloc.c	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright 1996, 1997, 1998, 1999 John D. Polstra.
  * All rights reserved.
  *

Modified: head/libexec/rtld-elf/amd64/rtld_machdep.h
==============================================================================
--- head/libexec/rtld-elf/amd64/rtld_machdep.h	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-elf/amd64/rtld_machdep.h	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999, 2000 John D. Polstra.
  * All rights reserved.
  *

Modified: head/libexec/rtld-elf/arm/rtld_machdep.h
==============================================================================
--- head/libexec/rtld-elf/arm/rtld_machdep.h	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-elf/arm/rtld_machdep.h	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999, 2000 John D. Polstra.
  * All rights reserved.
  *

Modified: head/libexec/rtld-elf/debug.c
==============================================================================
--- head/libexec/rtld-elf/debug.c	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-elf/debug.c	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright 1996-1998 John D. Polstra.
  * All rights reserved.
  *

Modified: head/libexec/rtld-elf/debug.h
==============================================================================
--- head/libexec/rtld-elf/debug.h	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-elf/debug.h	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright 1996-1998 John D. Polstra.
  * All rights reserved.
  *

Modified: head/libexec/rtld-elf/i386/reloc.c
==============================================================================
--- head/libexec/rtld-elf/i386/reloc.c	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-elf/i386/reloc.c	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright 1996, 1997, 1998, 1999 John D. Polstra.
  * All rights reserved.
  *

Modified: head/libexec/rtld-elf/i386/rtld_machdep.h
==============================================================================
--- head/libexec/rtld-elf/i386/rtld_machdep.h	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-elf/i386/rtld_machdep.h	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999, 2000 John D. Polstra.
  * All rights reserved.
  *

Modified: head/libexec/rtld-elf/map_object.c
==============================================================================
--- head/libexec/rtld-elf/map_object.c	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-elf/map_object.c	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright 1996-1998 John D. Polstra.
  * All rights reserved.
  *

Modified: head/libexec/rtld-elf/mips/reloc.c
==============================================================================
--- head/libexec/rtld-elf/mips/reloc.c	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-elf/mips/reloc.c	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,6 +1,8 @@
 /*	$NetBSD: mips_reloc.c,v 1.58 2010/01/14 11:57:06 skrll Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright 1997 Michael L. Hitch <mhitch@montana.edu>
  * Portions copyright 2002 Charles M. Hannum <root@ihack.net>
  * All rights reserved.

Modified: head/libexec/rtld-elf/mips/rtld_machdep.h
==============================================================================
--- head/libexec/rtld-elf/mips/rtld_machdep.h	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-elf/mips/rtld_machdep.h	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999, 2000 John D. Polstra.
  * All rights reserved.
  *

Modified: head/libexec/rtld-elf/powerpc/reloc.c
==============================================================================
--- head/libexec/rtld-elf/powerpc/reloc.c	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-elf/powerpc/reloc.c	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,6 +1,8 @@
 /*      $NetBSD: ppc_reloc.c,v 1.10 2001/09/10 06:09:41 mycroft Exp $   */
 
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
  * Copyright (C) 1998   Tsubai Masanari
  * All rights reserved.
  *

Modified: head/libexec/rtld-elf/powerpc/rtld_machdep.h
==============================================================================
--- head/libexec/rtld-elf/powerpc/rtld_machdep.h	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-elf/powerpc/rtld_machdep.h	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999, 2000 John D. Polstra.
  * All rights reserved.
  *

Modified: head/libexec/rtld-elf/powerpc64/reloc.c
==============================================================================
--- head/libexec/rtld-elf/powerpc64/reloc.c	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-elf/powerpc64/reloc.c	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,6 +1,8 @@
 /*      $NetBSD: ppc_reloc.c,v 1.10 2001/09/10 06:09:41 mycroft Exp $   */
 
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
  * Copyright (C) 1998   Tsubai Masanari
  * All rights reserved.
  *

Modified: head/libexec/rtld-elf/powerpc64/rtld_machdep.h
==============================================================================
--- head/libexec/rtld-elf/powerpc64/rtld_machdep.h	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-elf/powerpc64/rtld_machdep.h	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999, 2000 John D. Polstra.
  * All rights reserved.
  *

Modified: head/libexec/rtld-elf/rtld.c
==============================================================================
--- head/libexec/rtld-elf/rtld.c	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-elf/rtld.c	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright 1996, 1997, 1998, 1999, 2000 John D. Polstra.
  * Copyright 2003 Alexander Kabaev <kan@FreeBSD.ORG>.
  * Copyright 2009-2013 Konstantin Belousov <kib@FreeBSD.ORG>.

Modified: head/libexec/rtld-elf/rtld.h
==============================================================================
--- head/libexec/rtld-elf/rtld.h	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-elf/rtld.h	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright 1996, 1997, 1998, 1999, 2000 John D. Polstra.
  * All rights reserved.
  *

Modified: head/libexec/rtld-elf/rtld_lock.c
==============================================================================
--- head/libexec/rtld-elf/rtld_lock.c	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-elf/rtld_lock.c	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright 1999, 2000 John D. Polstra.
  * All rights reserved.
  *

Modified: head/libexec/rtld-elf/rtld_lock.h
==============================================================================
--- head/libexec/rtld-elf/rtld_lock.h	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-elf/rtld_lock.h	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright 2003 Alexander Kabaev.
  * All rights reserved.
  *

Modified: head/libexec/rtld-elf/rtld_printf.h
==============================================================================
--- head/libexec/rtld-elf/rtld_printf.h	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-elf/rtld_printf.h	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright 2011 Konstantin Belousov <kib@FreeBSD.org>.
  * All rights reserved.
  *

Modified: head/libexec/rtld-elf/rtld_tls.h
==============================================================================
--- head/libexec/rtld-elf/rtld_tls.h	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-elf/rtld_tls.h	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2004 Doug Rabson
  * All rights reserved.
  *

Modified: head/libexec/rtld-elf/sparc64/reloc.c
==============================================================================
--- head/libexec/rtld-elf/sparc64/reloc.c	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-elf/sparc64/reloc.c	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,6 +1,8 @@
 /*	$NetBSD: mdreloc.c,v 1.42 2008/04/28 20:23:04 martin Exp $	*/
 
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
  * Copyright (c) 2000 Eduardo Horvath.
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.

Modified: head/libexec/rtld-elf/sparc64/rtld_machdep.h
==============================================================================
--- head/libexec/rtld-elf/sparc64/rtld_machdep.h	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-elf/sparc64/rtld_machdep.h	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999, 2000 John D. Polstra.
  * All rights reserved.
  *

Modified: head/libexec/rtld-elf/xmalloc.c
==============================================================================
--- head/libexec/rtld-elf/xmalloc.c	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/rtld-elf/xmalloc.c	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright 1996-1998 John D. Polstra.
  * All rights reserved.
  *

Modified: head/libexec/save-entropy/save-entropy.sh
==============================================================================
--- head/libexec/save-entropy/save-entropy.sh	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/save-entropy/save-entropy.sh	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,5 +1,7 @@
 #!/bin/sh
 #
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
 # Copyright (c) 2001-2006,2012 Douglas Barton, dougb@FreeBSD.org
 # All rights reserved.
 #

Modified: head/libexec/talkd/extern.h
==============================================================================
--- head/libexec/talkd/extern.h	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/talkd/extern.h	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2002 M. Warner Losh.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/libexec/tftpd/tftp-file.c
==============================================================================
--- head/libexec/tftpd/tftp-file.c	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/tftpd/tftp-file.c	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (C) 2008 Edwin Groothuis. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

Modified: head/libexec/tftpd/tftp-file.h
==============================================================================
--- head/libexec/tftpd/tftp-file.h	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/tftpd/tftp-file.h	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (C) 2008 Edwin Groothuis. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

Modified: head/libexec/tftpd/tftp-io.c
==============================================================================
--- head/libexec/tftpd/tftp-io.c	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/tftpd/tftp-io.c	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (C) 2008 Edwin Groothuis. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

Modified: head/libexec/tftpd/tftp-io.h
==============================================================================
--- head/libexec/tftpd/tftp-io.h	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/tftpd/tftp-io.h	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (C) 2008 Edwin Groothuis. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

Modified: head/libexec/tftpd/tftp-options.c
==============================================================================
--- head/libexec/tftpd/tftp-options.c	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/tftpd/tftp-options.c	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (C) 2008 Edwin Groothuis. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

Modified: head/libexec/tftpd/tftp-options.h
==============================================================================
--- head/libexec/tftpd/tftp-options.h	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/tftpd/tftp-options.h	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (C) 2008 Edwin Groothuis. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

Modified: head/libexec/tftpd/tftp-transfer.c
==============================================================================
--- head/libexec/tftpd/tftp-transfer.c	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/tftpd/tftp-transfer.c	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (C) 2008 Edwin Groothuis. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

Modified: head/libexec/tftpd/tftp-transfer.h
==============================================================================
--- head/libexec/tftpd/tftp-transfer.h	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/tftpd/tftp-transfer.h	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (C) 2008 Edwin Groothuis. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

Modified: head/libexec/tftpd/tftp-utils.c
==============================================================================
--- head/libexec/tftpd/tftp-utils.c	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/tftpd/tftp-utils.c	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (C) 2008 Edwin Groothuis. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

Modified: head/libexec/tftpd/tftp-utils.h
==============================================================================
--- head/libexec/tftpd/tftp-utils.h	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/tftpd/tftp-utils.h	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (C) 2008 Edwin Groothuis. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

Modified: head/libexec/ulog-helper/ulog-helper.c
==============================================================================
--- head/libexec/ulog-helper/ulog-helper.c	Mon Nov 27 15:24:13 2017	(r326273)
+++ head/libexec/ulog-helper/ulog-helper.c	Mon Nov 27 15:25:02 2017	(r326274)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2009 Ed Schouten <ed@FreeBSD.org>
  * All rights reserved.
  *