d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SPDX: mostly fixes to previous changes.

Browse Source 
Introduce the recently approved BSD-1-Clause and replace 0BSD which
never did fit well our use cases.
This commit is contained in:
Pedro F. Giffuni 2017-12-13 16:13:17 +00:00
parent 0118df5ecf
commit 9b10f59a10
37 changed files with 68 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/ifaddrs.h
View File

@ -1,6 +1,8 @@
/* $FreeBSD$ */ /* $FreeBSD$ */
/* /*-
* SPDX-License-Identifier: BSD-1-Clause
*
* Copyright (c) 1995, 1999 * Copyright (c) 1995, 1999
* Berkeley Software Design, Inc. All rights reserved. * Berkeley Software Design, Inc. All rights reserved.
* *

4
lib/libc/net/getifaddrs.c
View File

@ -1,6 +1,8 @@
/* $KAME: getifaddrs.c,v 1.9 2001/08/20 02:31:20 itojun Exp $ */ /* $KAME: getifaddrs.c,v 1.9 2001/08/20 02:31:20 itojun Exp $ */
/* /*-
* SPDX-License-Identifier: BSD-1-Clause
*
* Copyright (c) 1995, 1999 * Copyright (c) 1995, 1999
* Berkeley Software Design, Inc. All rights reserved. * Berkeley Software Design, Inc. All rights reserved.
* *

2
lib/libc/net/if_indextoname.c
View File

@ -1,6 +1,8 @@
/* $KAME: if_indextoname.c,v 1.7 2000/11/08 03:09:30 itojun Exp $ */ /* $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 * Copyright (c) 1997, 2000
* Berkeley Software Design, Inc. All rights reserved. * Berkeley Software Design, Inc. All rights reserved.
* *

2
lib/libc/net/if_nameindex.c
View File

@ -1,6 +1,8 @@
/* $KAME: if_nameindex.c,v 1.8 2000/11/24 08:20:01 itojun Exp $ */ /* $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 * Copyright (c) 1997, 2000
* Berkeley Software Design, Inc. All rights reserved. * Berkeley Software Design, Inc. All rights reserved.
* *

2
lib/libc/net/if_nametoindex.c
View File

@ -1,6 +1,8 @@
/* $KAME: if_nametoindex.c,v 1.6 2000/11/24 08:18:54 itojun Exp $ */ /* $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 * Copyright (c) 1997, 2000
* Berkeley Software Design, Inc. All rights reserved. * Berkeley Software Design, Inc. All rights reserved.
* *

2
sys/dev/usb/net/if_mos.c
View File

@ -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> * Copyright (c) 2011 Rick van der Zwet <info@rickvanderzwet.nl>
* *

2
sys/dev/usb/wlan/if_uath.c
View File

@ -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) 2006 Sam Leffler, Errno Consulting
* Copyright (c) 2008-2009 Weongyo Jeong <weongyo@freebsd.org> * Copyright (c) 2008-2009 Weongyo Jeong <weongyo@freebsd.org>

2
sys/sys/_ucontext.h
View File

@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-3-Clause
*
* Copyright (c) 1999 Marcel Moolenaar * Copyright (c) 1999 Marcel Moolenaar
* All rights reserved. * All rights reserved.
* *

2
sys/sys/_vm_domain.h
View File

@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 2015 Adrian Chadd <adrian@FreeBSD.org>. * Copyright (c) 2015 Adrian Chadd <adrian@FreeBSD.org>.
* All rights reserved. * All rights reserved.
* *

2
sys/sys/auxv.h
View File

@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 2017 Michal Meloun * Copyright (c) 2017 Michal Meloun
* All rights reserved. * All rights reserved.
* *

2
sys/sys/bus_dma.h
View File

@ -1,7 +1,7 @@
/* $NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $ */ /* $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. * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
* All rights reserved. * All rights reserved.

2
sys/sys/bus_dma_internal.h
View File

@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 2017 Jason A. Harmening. * Copyright (c) 2017 Jason A. Harmening.
* All rights reserved. * All rights reserved.
* *

2
sys/sys/capsicum.h
View File

@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 2008-2010, 2015 Robert N. M. Watson * Copyright (c) 2008-2010, 2015 Robert N. M. Watson
* Copyright (c) 2012 FreeBSD Foundation * Copyright (c) 2012 FreeBSD Foundation
* All rights reserved. * All rights reserved.

2
sys/sys/cnv.h
View File

@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 2016 Adam Starak <starak.adam@gmail.com> * Copyright (c) 2016 Adam Starak <starak.adam@gmail.com>
* All rights reserved. * All rights reserved.
* *

2
sys/sys/devmap.h
View File

@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org> * Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved. * All rights reserved.
* *

2
sys/sys/disk_zone.h
View File

@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 2015 Spectra Logic Corporation * Copyright (c) 2015 Spectra Logic Corporation
* All rights reserved. * All rights reserved.
* *

2
sys/sys/dnv.h
View File

@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 2013 The FreeBSD Foundation * Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved. * All rights reserved.
* *

2
sys/sys/gtaskqueue.h
View File

@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 2014 Jeffrey Roberson <jeff@freebsd.org> * Copyright (c) 2014 Jeffrey Roberson <jeff@freebsd.org>
* Copyright (c) 2016 Matthew Macy <mmacy@nextbsd.org> * Copyright (c) 2016 Matthew Macy <mmacy@nextbsd.org>
* All rights reserved. * All rights reserved.

2
sys/sys/gzio.h
View File

@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 2014 Mark Johnston <markj@FreeBSD.org> * Copyright (c) 2014 Mark Johnston <markj@FreeBSD.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without

2
sys/sys/imgact_binmisc.h
View File

@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 2013 Stacey D. Son * Copyright (c) 2013 Stacey D. Son
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without

2
sys/sys/intr.h
View File

@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 2015-2016 Svatopluk Kraus * Copyright (c) 2015-2016 Svatopluk Kraus
* Copyright (c) 2015-2016 Michal Meloun * Copyright (c) 2015-2016 Michal Meloun
* All rights reserved. * All rights reserved.

2
sys/sys/iov.h
View File

@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 2013-2015 Sandvine Inc. * Copyright (c) 2013-2015 Sandvine Inc.
* All rights reserved. * All rights reserved.
* *

2
sys/sys/iov_schema.h
View File

@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 2014-2015 Sandvine Inc. * Copyright (c) 2014-2015 Sandvine Inc.
* All rights reserved. * All rights reserved.
* *

2
sys/sys/mouse.h
View File

@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-1-Clause
*
* Copyright (c) 1992, 1993 Erik Forsberg. * Copyright (c) 1992, 1993 Erik Forsberg.
* Copyright (c) 1996, 1997 Kazutaka YOKOTA * Copyright (c) 1996, 1997 Kazutaka YOKOTA
* All rights reserved. * All rights reserved.

4
sys/sys/msg.h
View File

@ -4,10 +4,10 @@
/*- /*-
* SVID compatible msg.h file * SVID compatible msg.h file
* *
* SPDX-License-Identifier: 0BSD
*
* Author: Daniel Boulet * Author: Daniel Boulet
* *
* SPDX-License-Identifier: BSD-1-Clause
*
* Copyright 1993 Daniel Boulet and RTMX Inc. * Copyright 1993 Daniel Boulet and RTMX Inc.
* *
* This system call was implemented by Daniel Boulet under contract from RTMX. * This system call was implemented by Daniel Boulet under contract from RTMX.

2
sys/sys/numa.h
View File

@ -1,4 +1,6 @@
/* /*
* SPDX-License-Identifier: BSD-3-Clause
*
* Copyright (c) 2015 Adrian Chadd <adrian@FreeBSD.org>. * Copyright (c) 2015 Adrian Chadd <adrian@FreeBSD.org>.
* All rights reserved. * All rights reserved.
* *

2
sys/sys/nv.h
View File

@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2013 The FreeBSD Foundation * Copyright (c) 2009-2013 The FreeBSD Foundation
* Copyright (c) 2013-2015 Mariusz Zaborski <oshogbo@FreeBSD.org> * Copyright (c) 2013-2015 Mariusz Zaborski <oshogbo@FreeBSD.org>
* All rights reserved. * All rights reserved.

2
sys/sys/rman.h
View File

@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: MIT
*
* Copyright 1998 Massachusetts Institute of Technology * Copyright 1998 Massachusetts Institute of Technology
* *
* Permission to use, copy, modify, and distribute this software and * Permission to use, copy, modify, and distribute this software and

2
sys/sys/snoop.h
View File

@ -1,5 +1,5 @@
/*- /*-
* SPDX-License-Identifier: 0BSD * SPDX-License-Identifier: BSD-1-Clause
* *
* Copyright (c) 1995 Ugen J.S.Antsilevich * Copyright (c) 1995 Ugen J.S.Antsilevich
* *

2
sys/sys/soundcard.h
View File

@ -3,6 +3,8 @@
*/ */
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause
*
* Copyright by Hannu Savolainen 1993 / 4Front Technologies 1993-2006 * Copyright by Hannu Savolainen 1993 / 4Front Technologies 1993-2006
* Modified for the new FreeBSD sound driver by Luigi Rizzo, 1997 * Modified for the new FreeBSD sound driver by Luigi Rizzo, 1997
* *

2
sys/sys/spigenio.h
View File

@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 2000 Doug Rabson * Copyright (c) 2000 Doug Rabson
* All rights reserved. * All rights reserved.
* *

2
sys/sys/tiio.h
View File

@ -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. * Copyright (c) 1999, 2000 Kenneth D. Merry.
* All rights reserved. * All rights reserved.

2
sys/sys/timetc.h
View File

@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: Beerware
*
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
* "THE BEER-WARE LICENSE" (Revision 42): * "THE BEER-WARE LICENSE" (Revision 42):
* <phk@FreeBSD.ORG> wrote this file. As long as you retain this notice you * <phk@FreeBSD.ORG> wrote this file. As long as you retain this notice you

2
sys/sys/zlib.h
View File

@ -17,6 +17,8 @@
/* +++ zlib.h */ /* +++ zlib.h */
/*- /*-
SPDX-License-Identifier: BSD-3-Clause
zlib.h -- interface of the 'zlib' general purpose compression library zlib.h -- interface of the 'zlib' general purpose compression library
version 1.0.4, Jul 24th, 1996. version 1.0.4, Jul 24th, 1996.

2
usr.sbin/ppp/arp.c
View File

@ -2,7 +2,7 @@
* sys-bsd.c - System-dependent procedures for setting up * sys-bsd.c - System-dependent procedures for setting up
* PPP interfaces on bsd-4.4-ish systems (including 386BSD, NetBSD, etc.) * 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. * Copyright (c) 1989 Carnegie Mellon University.
* All rights reserved. * All rights reserved.

2
usr.sbin/rarpd/rarpd.c
View File

@ -1,5 +1,5 @@
/*- /*-
* SPDX-License-Identifier: 0BSD * SPDX-License-Identifier: BSD-1-Clause
* *
* Copyright (c) 1990, 1991, 1992, 1993, 1996 * Copyright (c) 1990, 1991, 1992, 1993, 1996
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

2
usr.sbin/watch/watch.c
View File

@ -1,5 +1,5 @@
/*- /*-
* SPDX-License-Identifier: 0BSD * SPDX-License-Identifier: BSD-1-Clause
* *
* Copyright (c) 1995 Ugen J.S.Antsilevich * Copyright (c) 1995 Ugen J.S.Antsilevich
* *