diff options
| author | Pedro F. Giffuni <pfg@FreeBSD.org> | 2017-12-13 16:13:17 +0000 |
|---|---|---|
| committer | Pedro F. Giffuni <pfg@FreeBSD.org> | 2017-12-13 16:13:17 +0000 |
| commit | 9b10f59a10b7adff0a5ea3b0fd182d521c3da643 (patch) | |
| tree | 7c9dda3c10a6033c206c8dc2cec370764c3a2b31 | |
| parent | 0118df5ecf3718e0dbb2c9943e72437908efada2 (diff) | |
| download | src-9b10f59a10b7adff0a5ea3b0fd182d521c3da643.tar.gz src-9b10f59a10b7adff0a5ea3b0fd182d521c3da643.zip | |
SPDX: mostly fixes to previous changes.
Introduce the recently approved BSD-1-Clause and replace 0BSD which
never did fit well our use cases.
Notes
Notes:
svn path=/head/; revision=326823
37 files changed, 68 insertions, 12 deletions
diff --git a/include/ifaddrs.h b/include/ifaddrs.h index e768d50cfa42..5e1953639af6 100644 --- a/include/ifaddrs.h +++ b/include/ifaddrs.h @@ -1,6 +1,8 @@ /* $FreeBSD$ */ -/* +/*- + * SPDX-License-Identifier: BSD-1-Clause + * * Copyright (c) 1995, 1999 * Berkeley Software Design, Inc. All rights reserved. * diff --git a/lib/libc/net/getifaddrs.c b/lib/libc/net/getifaddrs.c index 4c04e9ef0591..2de869ca6f9e 100644 --- a/lib/libc/net/getifaddrs.c +++ b/lib/libc/net/getifaddrs.c @@ -1,6 +1,8 @@ /* $KAME: getifaddrs.c,v 1.9 2001/08/20 02:31:20 itojun Exp $ */ -/* +/*- + * SPDX-License-Identifier: BSD-1-Clause + * * Copyright (c) 1995, 1999 * Berkeley Software Design, Inc. All rights reserved. * diff --git a/lib/libc/net/if_indextoname.c b/lib/libc/net/if_indextoname.c index 4b16433a4ee6..908e771c4a4e 100644 --- a/lib/libc/net/if_indextoname.c +++ b/lib/libc/net/if_indextoname.c @@ -1,6 +1,8 @@ /* $KAME: if_indextoname.c,v 1.7 2000/11/08 03:09:30 itojun Exp $ */ /*- + * SPDX-License-Identifier: BSD-1-Clause + * * Copyright (c) 1997, 2000 * Berkeley Software Design, Inc. All rights reserved. * diff --git a/lib/libc/net/if_nameindex.c b/lib/libc/net/if_nameindex.c index 138289c6814e..4b6b15ecefb1 100644 --- a/lib/libc/net/if_nameindex.c +++ b/lib/libc/net/if_nameindex.c @@ -1,6 +1,8 @@ /* $KAME: if_nameindex.c,v 1.8 2000/11/24 08:20:01 itojun Exp $ */ /*- + * SPDX-License-Identifier: BSD-1-Clause + * * Copyright (c) 1997, 2000 * Berkeley Software Design, Inc. All rights reserved. * diff --git a/lib/libc/net/if_nametoindex.c b/lib/libc/net/if_nametoindex.c index debf3fabc6af..c38fce76b037 100644 --- a/lib/libc/net/if_nametoindex.c +++ b/lib/libc/net/if_nametoindex.c @@ -1,6 +1,8 @@ /* $KAME: if_nametoindex.c,v 1.6 2000/11/24 08:18:54 itojun Exp $ */ /*- + * SPDX-License-Identifier: BSD-1-Clause + * * Copyright (c) 1997, 2000 * Berkeley Software Design, Inc. All rights reserved. * diff --git a/sys/dev/usb/net/if_mos.c b/sys/dev/usb/net/if_mos.c index 14619eccdf39..a5823cff1f1e 100644 --- a/sys/dev/usb/net/if_mos.c +++ b/sys/dev/usb/net/if_mos.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: 0BSD AND BSD-4-Clause + * SPDX-License-Identifier: (BSD-1-Clause AND BSD-4-Clause) * * Copyright (c) 2011 Rick van der Zwet <info@rickvanderzwet.nl> * diff --git a/sys/dev/usb/wlan/if_uath.c b/sys/dev/usb/wlan/if_uath.c index bd2930640f3d..07bac12415f9 100644 --- a/sys/dev/usb/wlan/if_uath.c +++ b/sys/dev/usb/wlan/if_uath.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND 0BSD + * SPDX-License-Identifier: (BSD-2-Clause-FreeBSD AND BSD-1-Clause) * * Copyright (c) 2006 Sam Leffler, Errno Consulting * Copyright (c) 2008-2009 Weongyo Jeong <weongyo@freebsd.org> diff --git a/sys/sys/_ucontext.h b/sys/sys/_ucontext.h index 17b3179dc7a7..2cdec1bf0a53 100644 --- a/sys/sys/_ucontext.h +++ b/sys/sys/_ucontext.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1999 Marcel Moolenaar * All rights reserved. * diff --git a/sys/sys/_vm_domain.h b/sys/sys/_vm_domain.h index 36d107a110b0..c34d737c9f6a 100644 --- a/sys/sys/_vm_domain.h +++ b/sys/sys/_vm_domain.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2015 Adrian Chadd <adrian@FreeBSD.org>. * All rights reserved. * diff --git a/sys/sys/auxv.h b/sys/sys/auxv.h index d389bac49623..97616055ecc6 100644 --- a/sys/sys/auxv.h +++ b/sys/sys/auxv.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2017 Michal Meloun * All rights reserved. * diff --git a/sys/sys/bus_dma.h b/sys/sys/bus_dma.h index c5799661585b..1320e65cb160 100644 --- a/sys/sys/bus_dma.h +++ b/sys/sys/bus_dma.h @@ -1,7 +1,7 @@ /* $NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: (BSD-2-Clause-NetBSD AND BSD-4-Clause) * * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/sys/bus_dma_internal.h b/sys/sys/bus_dma_internal.h index 4a12f730c7b6..ca67eb343975 100644 --- a/sys/sys/bus_dma_internal.h +++ b/sys/sys/bus_dma_internal.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2017 Jason A. Harmening. * All rights reserved. * diff --git a/sys/sys/capsicum.h b/sys/sys/capsicum.h index 0675100460f6..cb69473716f8 100644 --- a/sys/sys/capsicum.h +++ b/sys/sys/capsicum.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2008-2010, 2015 Robert N. M. Watson * Copyright (c) 2012 FreeBSD Foundation * All rights reserved. diff --git a/sys/sys/cnv.h b/sys/sys/cnv.h index c89eed37df3e..7b31f03ac042 100644 --- a/sys/sys/cnv.h +++ b/sys/sys/cnv.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2016 Adam Starak <starak.adam@gmail.com> * All rights reserved. * diff --git a/sys/sys/devmap.h b/sys/sys/devmap.h index 9403e7491acc..23e4bc664575 100644 --- a/sys/sys/devmap.h +++ b/sys/sys/devmap.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2013 Ian Lepore <ian@freebsd.org> * All rights reserved. * diff --git a/sys/sys/disk_zone.h b/sys/sys/disk_zone.h index 6f1fe5c15ef5..89fc3be716bf 100644 --- a/sys/sys/disk_zone.h +++ b/sys/sys/disk_zone.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2015 Spectra Logic Corporation * All rights reserved. * diff --git a/sys/sys/dnv.h b/sys/sys/dnv.h index 679a51f82cec..3e0322e8565f 100644 --- a/sys/sys/dnv.h +++ b/sys/sys/dnv.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2013 The FreeBSD Foundation * All rights reserved. * diff --git a/sys/sys/gtaskqueue.h b/sys/sys/gtaskqueue.h index e85196372323..61f66f3e8995 100644 --- a/sys/sys/gtaskqueue.h +++ b/sys/sys/gtaskqueue.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2014 Jeffrey Roberson <jeff@freebsd.org> * Copyright (c) 2016 Matthew Macy <mmacy@nextbsd.org> * All rights reserved. diff --git a/sys/sys/gzio.h b/sys/sys/gzio.h index 524d80238fac..eb4aecf4b5a8 100644 --- a/sys/sys/gzio.h +++ b/sys/sys/gzio.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2014 Mark Johnston <markj@FreeBSD.org> * * Redistribution and use in source and binary forms, with or without diff --git a/sys/sys/imgact_binmisc.h b/sys/sys/imgact_binmisc.h index 7d58fa081a9f..ef976ade464b 100644 --- a/sys/sys/imgact_binmisc.h +++ b/sys/sys/imgact_binmisc.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2013 Stacey D. Son * * Redistribution and use in source and binary forms, with or without diff --git a/sys/sys/intr.h b/sys/sys/intr.h index a82ffda5876e..74e2ae195b92 100644 --- a/sys/sys/intr.h +++ b/sys/sys/intr.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2015-2016 Svatopluk Kraus * Copyright (c) 2015-2016 Michal Meloun * All rights reserved. diff --git a/sys/sys/iov.h b/sys/sys/iov.h index 6dfed1b84b5c..3be01180a107 100644 --- a/sys/sys/iov.h +++ b/sys/sys/iov.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2013-2015 Sandvine Inc. * All rights reserved. * diff --git a/sys/sys/iov_schema.h b/sys/sys/iov_schema.h index 7157f63b9b7c..12e120795bef 100644 --- a/sys/sys/iov_schema.h +++ b/sys/sys/iov_schema.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2014-2015 Sandvine Inc. * All rights reserved. * diff --git a/sys/sys/mouse.h b/sys/sys/mouse.h index 9fd1d6d8c085..41226aeb6e6b 100644 --- a/sys/sys/mouse.h +++ b/sys/sys/mouse.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-1-Clause + * * Copyright (c) 1992, 1993 Erik Forsberg. * Copyright (c) 1996, 1997 Kazutaka YOKOTA * All rights reserved. diff --git a/sys/sys/msg.h b/sys/sys/msg.h index 5c9cdfe47d0c..a0a963d551d8 100644 --- a/sys/sys/msg.h +++ b/sys/sys/msg.h @@ -4,10 +4,10 @@ /*- * SVID compatible msg.h file * - * SPDX-License-Identifier: 0BSD - * * Author: Daniel Boulet * + * SPDX-License-Identifier: BSD-1-Clause + * * Copyright 1993 Daniel Boulet and RTMX Inc. * * This system call was implemented by Daniel Boulet under contract from RTMX. diff --git a/sys/sys/numa.h b/sys/sys/numa.h index c3c93b8e15f1..bb7b03257da6 100644 --- a/sys/sys/numa.h +++ b/sys/sys/numa.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 2015 Adrian Chadd <adrian@FreeBSD.org>. * All rights reserved. * diff --git a/sys/sys/nv.h b/sys/sys/nv.h index fcea2b3ed966..bf40f8f372a1 100644 --- a/sys/sys/nv.h +++ b/sys/sys/nv.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2009-2013 The FreeBSD Foundation * Copyright (c) 2013-2015 Mariusz Zaborski <oshogbo@FreeBSD.org> * All rights reserved. diff --git a/sys/sys/rman.h b/sys/sys/rman.h index 4de6022fc65c..9c2f465397ee 100644 --- a/sys/sys/rman.h +++ b/sys/sys/rman.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT + * * Copyright 1998 Massachusetts Institute of Technology * * Permission to use, copy, modify, and distribute this software and diff --git a/sys/sys/snoop.h b/sys/sys/snoop.h index d999750df3ef..f2d6b31a903e 100644 --- a/sys/sys/snoop.h +++ b/sys/sys/snoop.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: 0BSD + * SPDX-License-Identifier: BSD-1-Clause * * Copyright (c) 1995 Ugen J.S.Antsilevich * diff --git a/sys/sys/soundcard.h b/sys/sys/soundcard.h index 5506cea91dcd..2410fe110aac 100644 --- a/sys/sys/soundcard.h +++ b/sys/sys/soundcard.h @@ -3,6 +3,8 @@ */ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright by Hannu Savolainen 1993 / 4Front Technologies 1993-2006 * Modified for the new FreeBSD sound driver by Luigi Rizzo, 1997 * diff --git a/sys/sys/spigenio.h b/sys/sys/spigenio.h index 9e3ee9012ef7..4287cfec2d14 100644 --- a/sys/sys/spigenio.h +++ b/sys/sys/spigenio.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2000 Doug Rabson * All rights reserved. * diff --git a/sys/sys/tiio.h b/sys/sys/tiio.h index 9de9dd927587..e1123905236d 100644 --- a/sys/sys/tiio.h +++ b/sys/sys/tiio.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: (BSD-2-Clause-FreeBSD AND BSD-4-Clause) * * Copyright (c) 1999, 2000 Kenneth D. Merry. * All rights reserved. diff --git a/sys/sys/timetc.h b/sys/sys/timetc.h index f4cce450bebc..55f61af4c46c 100644 --- a/sys/sys/timetc.h +++ b/sys/sys/timetc.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * <phk@FreeBSD.ORG> wrote this file. As long as you retain this notice you diff --git a/sys/sys/zlib.h b/sys/sys/zlib.h index 16edae12b6f6..89dad6abdecc 100644 --- a/sys/sys/zlib.h +++ b/sys/sys/zlib.h @@ -17,6 +17,8 @@ /* +++ zlib.h */ /*- + SPDX-License-Identifier: BSD-3-Clause + zlib.h -- interface of the 'zlib' general purpose compression library version 1.0.4, Jul 24th, 1996. diff --git a/usr.sbin/ppp/arp.c b/usr.sbin/ppp/arp.c index b49515be70b7..f88fc1d1d97e 100644 --- a/usr.sbin/ppp/arp.c +++ b/usr.sbin/ppp/arp.c @@ -2,7 +2,7 @@ * sys-bsd.c - System-dependent procedures for setting up * PPP interfaces on bsd-4.4-ish systems (including 386BSD, NetBSD, etc.) * - * SPDX-License-Identifier: 0BSD + * SPDX-License-Identifier: BSD-1-Clause * * Copyright (c) 1989 Carnegie Mellon University. * All rights reserved. diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c index 0ae76d7ba2f6..441164dd2bd2 100644 --- a/usr.sbin/rarpd/rarpd.c +++ b/usr.sbin/rarpd/rarpd.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: 0BSD + * SPDX-License-Identifier: BSD-1-Clause * * Copyright (c) 1990, 1991, 1992, 1993, 1996 * The Regents of the University of California. All rights reserved. diff --git a/usr.sbin/watch/watch.c b/usr.sbin/watch/watch.c index afd59279ba8a..e0999757ab61 100644 --- a/usr.sbin/watch/watch.c +++ b/usr.sbin/watch/watch.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: 0BSD + * SPDX-License-Identifier: BSD-1-Clause * * Copyright (c) 1995 Ugen J.S.Antsilevich * |