From 64de3fdd5893e55c8aa20df2dcf1d9e86d851b34 Mon Sep 17 00:00:00 2001 From: "Pedro F. Giffuni" Date: Thu, 30 Nov 2017 20:33:45 +0000 Subject: [PATCH] SPDX: use the Beerware identifier. --- lib/libfetch/ftp.c | 2 +- sbin/recoverdisk/recoverdisk.c | 2 ++ share/examples/BSD_daemon/beastie.fig | 2 ++ share/examples/libusb20/bulk.c | 5 ++++- share/examples/libusb20/control.c | 5 ++++- sys/dev/led/led.c | 2 ++ sys/dev/md/md.c | 4 ++-- sys/dev/mn/if_mn.c | 2 ++ sys/dev/ppbus/pps.c | 2 ++ sys/i386/i386/elan-mmcr.c | 2 ++ sys/i386/i386/mp_clock.c | 2 ++ sys/kern/imgact_gzip.c | 2 ++ sys/kern/inflate.c | 4 +++- sys/kern/kern_tc.c | 2 ++ sys/kern/subr_disk.c | 2 ++ sys/sys/disk.h | 2 ++ sys/sys/smp.h | 2 ++ sys/sys/timepps.h | 2 ++ sys/x86/include/x86_smp.h | 2 ++ tools/tools/kernxref/kernxref.sh | 2 ++ usr.bin/ministat/ministat.c | 4 +++- usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c | 2 ++ usr.sbin/ctm/ctm/ctm.c | 4 +++- usr.sbin/ctm/ctm/ctm_ed.c | 4 +++- usr.sbin/ctm/ctm/ctm_input.c | 4 +++- usr.sbin/ctm/ctm/ctm_pass1.c | 4 +++- usr.sbin/ctm/ctm/ctm_pass2.c | 4 +++- usr.sbin/ctm/ctm/ctm_pass3.c | 4 +++- usr.sbin/ctm/ctm/ctm_passb.c | 4 +++- usr.sbin/ctm/ctm/ctm_syntax.c | 4 +++- usr.sbin/fdwrite/fdwrite.c | 4 +++- 31 files changed, 76 insertions(+), 16 deletions(-) diff --git a/lib/libfetch/ftp.c b/lib/libfetch/ftp.c index b71897e830e..213e20a5877 100644 --- a/lib/libfetch/ftp.c +++ b/lib/libfetch/ftp.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: (BSD-3-Clause AND Beerware) * * Copyright (c) 1998-2011 Dag-Erling Smørgrav * All rights reserved. diff --git a/sbin/recoverdisk/recoverdisk.c b/sbin/recoverdisk/recoverdisk.c index ac2788a6fcb..aef0bdd5717 100644 --- a/sbin/recoverdisk/recoverdisk.c +++ b/sbin/recoverdisk/recoverdisk.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you diff --git a/share/examples/BSD_daemon/beastie.fig b/share/examples/BSD_daemon/beastie.fig index 1c156ca5ece..68e191d1c68 100644 --- a/share/examples/BSD_daemon/beastie.fig +++ b/share/examples/BSD_daemon/beastie.fig @@ -1,4 +1,6 @@ #FIG 3.2 +# SPDX-License-Identifier: Beerware +# # ---------------------------------------------------------------------------- # "THE BEER-WARE LICENSE" (Revision 42): # wrote this file. As long as you retain this notice you diff --git a/share/examples/libusb20/bulk.c b/share/examples/libusb20/bulk.c index 08ba029c081..b6190a97121 100644 --- a/share/examples/libusb20/bulk.c +++ b/share/examples/libusb20/bulk.c @@ -1,4 +1,7 @@ -/* ---------------------------------------------------------------------------- +/*- + * SPDX-License-Identifier: Beerware + * + * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42) (by Poul-Henning Kamp): * wrote this file. As long as you retain this notice you * can do whatever you want with this stuff. If we meet some day, and you think diff --git a/share/examples/libusb20/control.c b/share/examples/libusb20/control.c index 724ef5979ed..ca48e8bffb2 100644 --- a/share/examples/libusb20/control.c +++ b/share/examples/libusb20/control.c @@ -1,4 +1,7 @@ -/* ---------------------------------------------------------------------------- +/*- + * SPDX-License-Identifier: Beerware + * + * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42) (by Poul-Henning Kamp): * wrote this file. As long as you retain this notice you * can do whatever you want with this stuff. If we meet some day, and you think diff --git a/sys/dev/led/led.c b/sys/dev/led/led.c index c519e2218ec..b1972776709 100644 --- a/sys/dev/led/led.c +++ b/sys/dev/led/led.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c index a5ecb3ce9f3..ee76b4f54ba 100644 --- a/sys/dev/md/md.c +++ b/sys/dev/md/md.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: (Beerware AND BSD-3-Clause) + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you @@ -11,8 +13,6 @@ */ /*- - * SPDX-License-Identifier: BSD-3-Clause - * * The following functions are based in the vn(4) driver: mdstart_swap(), * mdstart_vnode(), mdcreate_swap(), mdcreate_vnode() and mddestroy(), * and as such under the following copyright: diff --git a/sys/dev/mn/if_mn.c b/sys/dev/mn/if_mn.c index a4ec603876d..028de7d6c6f 100644 --- a/sys/dev/mn/if_mn.c +++ b/sys/dev/mn/if_mn.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you diff --git a/sys/dev/ppbus/pps.c b/sys/dev/ppbus/pps.c index 7a360d12df6..c94d8d4a1ff 100644 --- a/sys/dev/ppbus/pps.c +++ b/sys/dev/ppbus/pps.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you diff --git a/sys/i386/i386/elan-mmcr.c b/sys/i386/i386/elan-mmcr.c index 6f631462181..a26e226ba47 100644 --- a/sys/i386/i386/elan-mmcr.c +++ b/sys/i386/i386/elan-mmcr.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you diff --git a/sys/i386/i386/mp_clock.c b/sys/i386/i386/mp_clock.c index 48264ce7353..cc0f315ed65 100644 --- a/sys/i386/i386/mp_clock.c +++ b/sys/i386/i386/mp_clock.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you diff --git a/sys/kern/imgact_gzip.c b/sys/kern/imgact_gzip.c index 47b72800428..aee229e7049 100644 --- a/sys/kern/imgact_gzip.c +++ b/sys/kern/imgact_gzip.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you diff --git a/sys/kern/inflate.c b/sys/kern/inflate.c index d7a480bb97d..4021fc3869e 100644 --- a/sys/kern/inflate.c +++ b/sys/kern/inflate.c @@ -1,5 +1,7 @@ -/* +/*- * Most parts of this file are not covered by: + * + * SPDX-License-Identifier: Beerware * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index e060f485053..377a8b55359 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index 23915402e30..9b9b572916b 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you diff --git a/sys/sys/disk.h b/sys/sys/disk.h index 4ab0b09e12c..4338b03e924 100644 --- a/sys/sys/disk.h +++ b/sys/sys/disk.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you diff --git a/sys/sys/smp.h b/sys/sys/smp.h index fdf4c4cfb1b..fe5e4e64ec2 100644 --- a/sys/sys/smp.h +++ b/sys/sys/smp.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you diff --git a/sys/sys/timepps.h b/sys/sys/timepps.h index d472c804dc4..99ea2207be3 100644 --- a/sys/sys/timepps.h +++ b/sys/sys/timepps.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you diff --git a/sys/x86/include/x86_smp.h b/sys/x86/include/x86_smp.h index ec5bf36461b..a9699dea038 100644 --- a/sys/x86/include/x86_smp.h +++ b/sys/x86/include/x86_smp.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you diff --git a/tools/tools/kernxref/kernxref.sh b/tools/tools/kernxref/kernxref.sh index ded6d415715..e729a100b7b 100644 --- a/tools/tools/kernxref/kernxref.sh +++ b/tools/tools/kernxref/kernxref.sh @@ -1,5 +1,7 @@ : # +# SPDX-License-Identifier: Beerware +# # ---------------------------------------------------------------------------- # "THE BEER-WARE LICENSE" (Revision 42): # wrote this file. As long as you retain this notice you diff --git a/usr.bin/ministat/ministat.c b/usr.bin/ministat/ministat.c index ae4f977a5fb..625fb329e2b 100644 --- a/usr.bin/ministat/ministat.c +++ b/usr.bin/ministat/ministat.c @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c index 4709c9aabb3..662aa6e4461 100644 --- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c +++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: (BSD-2-Clause AND Beerware) + * * Copyright (c) 2005-2006 The FreeBSD Project * All rights reserved. * diff --git a/usr.sbin/ctm/ctm/ctm.c b/usr.sbin/ctm/ctm/ctm.c index 0ea4895ca40..3f36ace8101 100644 --- a/usr.sbin/ctm/ctm/ctm.c +++ b/usr.sbin/ctm/ctm/ctm.c @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you diff --git a/usr.sbin/ctm/ctm/ctm_ed.c b/usr.sbin/ctm/ctm/ctm_ed.c index e3ec464030e..c4d62428b28 100644 --- a/usr.sbin/ctm/ctm/ctm_ed.c +++ b/usr.sbin/ctm/ctm/ctm_ed.c @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you diff --git a/usr.sbin/ctm/ctm/ctm_input.c b/usr.sbin/ctm/ctm/ctm_input.c index 32166d311f1..a04d3ebc349 100644 --- a/usr.sbin/ctm/ctm/ctm_input.c +++ b/usr.sbin/ctm/ctm/ctm_input.c @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you diff --git a/usr.sbin/ctm/ctm/ctm_pass1.c b/usr.sbin/ctm/ctm/ctm_pass1.c index 57adcbe933d..2c981b750b5 100644 --- a/usr.sbin/ctm/ctm/ctm_pass1.c +++ b/usr.sbin/ctm/ctm/ctm_pass1.c @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you diff --git a/usr.sbin/ctm/ctm/ctm_pass2.c b/usr.sbin/ctm/ctm/ctm_pass2.c index a0b857ab5dc..83dd72c87c2 100644 --- a/usr.sbin/ctm/ctm/ctm_pass2.c +++ b/usr.sbin/ctm/ctm/ctm_pass2.c @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you diff --git a/usr.sbin/ctm/ctm/ctm_pass3.c b/usr.sbin/ctm/ctm/ctm_pass3.c index 34c6d87c1d5..e77e8107722 100644 --- a/usr.sbin/ctm/ctm/ctm_pass3.c +++ b/usr.sbin/ctm/ctm/ctm_pass3.c @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you diff --git a/usr.sbin/ctm/ctm/ctm_passb.c b/usr.sbin/ctm/ctm/ctm_passb.c index ee3a69c5fbc..3f32cb238d7 100644 --- a/usr.sbin/ctm/ctm/ctm_passb.c +++ b/usr.sbin/ctm/ctm/ctm_passb.c @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you diff --git a/usr.sbin/ctm/ctm/ctm_syntax.c b/usr.sbin/ctm/ctm/ctm_syntax.c index 66389431d7e..968e653e646 100644 --- a/usr.sbin/ctm/ctm/ctm_syntax.c +++ b/usr.sbin/ctm/ctm/ctm_syntax.c @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you diff --git a/usr.sbin/fdwrite/fdwrite.c b/usr.sbin/fdwrite/fdwrite.c index 8c953a6f535..d2f8de340b5 100644 --- a/usr.sbin/fdwrite/fdwrite.c +++ b/usr.sbin/fdwrite/fdwrite.c @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you