svn commit: r326823 - in head: include lib/libc/net sys/dev/usb/net sys/dev/usb/wlan sys/sys usr.sbin/ppp usr.sbin/rarpd usr.sbin/watch

Pedro F. Giffuni pfg at FreeBSD.org
Wed Dec 13 16:13:22 UTC 2017 

Author: pfg
Date: Wed Dec 13 16:13:17 2017
New Revision: 326823
URL: https://svnweb.freebsd.org/changeset/base/326823

Log:
  SPDX: mostly fixes to previous changes.
  
  Introduce the recently approved BSD-1-Clause and replace 0BSD which
  never did fit well our use cases.

Modified:
  head/include/ifaddrs.h
  head/lib/libc/net/getifaddrs.c
  head/lib/libc/net/if_indextoname.c
  head/lib/libc/net/if_nameindex.c
  head/lib/libc/net/if_nametoindex.c
  head/sys/dev/usb/net/if_mos.c
  head/sys/dev/usb/wlan/if_uath.c
  head/sys/sys/_ucontext.h
  head/sys/sys/_vm_domain.h
  head/sys/sys/auxv.h
  head/sys/sys/bus_dma.h
  head/sys/sys/bus_dma_internal.h
  head/sys/sys/capsicum.h
  head/sys/sys/cnv.h
  head/sys/sys/devmap.h
  head/sys/sys/disk_zone.h
  head/sys/sys/dnv.h
  head/sys/sys/gtaskqueue.h
  head/sys/sys/gzio.h
  head/sys/sys/imgact_binmisc.h
  head/sys/sys/intr.h
  head/sys/sys/iov.h
  head/sys/sys/iov_schema.h
  head/sys/sys/mouse.h
  head/sys/sys/msg.h
  head/sys/sys/numa.h
  head/sys/sys/nv.h
  head/sys/sys/rman.h
  head/sys/sys/snoop.h
  head/sys/sys/soundcard.h
  head/sys/sys/spigenio.h
  head/sys/sys/tiio.h
  head/sys/sys/timetc.h
  head/sys/sys/zlib.h
  head/usr.sbin/ppp/arp.c
  head/usr.sbin/rarpd/rarpd.c
  head/usr.sbin/watch/watch.c

Modified: head/include/ifaddrs.h
==============================================================================
--- head/include/ifaddrs.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/include/ifaddrs.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -1,6 +1,8 @@
 /*	$FreeBSD$	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-1-Clause
+ *
  * Copyright (c) 1995, 1999
  *	Berkeley Software Design, Inc.  All rights reserved.
  *

Modified: head/lib/libc/net/getifaddrs.c
==============================================================================
--- head/lib/libc/net/getifaddrs.c	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/lib/libc/net/getifaddrs.c	Wed Dec 13 16:13:17 2017	(r326823)
@@ -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.
  *

Modified: head/lib/libc/net/if_indextoname.c
==============================================================================
--- head/lib/libc/net/if_indextoname.c	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/lib/libc/net/if_indextoname.c	Wed Dec 13 16:13:17 2017	(r326823)
@@ -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.
  *

Modified: head/lib/libc/net/if_nameindex.c
==============================================================================
--- head/lib/libc/net/if_nameindex.c	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/lib/libc/net/if_nameindex.c	Wed Dec 13 16:13:17 2017	(r326823)
@@ -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.
  *

Modified: head/lib/libc/net/if_nametoindex.c
==============================================================================
--- head/lib/libc/net/if_nametoindex.c	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/lib/libc/net/if_nametoindex.c	Wed Dec 13 16:13:17 2017	(r326823)
@@ -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.
  *

Modified: head/sys/dev/usb/net/if_mos.c
==============================================================================
--- head/sys/dev/usb/net/if_mos.c	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/dev/usb/net/if_mos.c	Wed Dec 13 16:13:17 2017	(r326823)
@@ -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 at rickvanderzwet.nl>
  *

Modified: head/sys/dev/usb/wlan/if_uath.c
==============================================================================
--- head/sys/dev/usb/wlan/if_uath.c	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/dev/usb/wlan/if_uath.c	Wed Dec 13 16:13:17 2017	(r326823)
@@ -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 at freebsd.org>

Modified: head/sys/sys/_ucontext.h
==============================================================================
--- head/sys/sys/_ucontext.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/_ucontext.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1999 Marcel Moolenaar
  * All rights reserved.
  *

Modified: head/sys/sys/_vm_domain.h
==============================================================================
--- head/sys/sys/_vm_domain.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/_vm_domain.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015 Adrian Chadd <adrian at FreeBSD.org>.
  * All rights reserved.
  *

Modified: head/sys/sys/auxv.h
==============================================================================
--- head/sys/sys/auxv.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/auxv.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2017 Michal Meloun
  * All rights reserved.
  *

Modified: head/sys/sys/bus_dma.h
==============================================================================
--- head/sys/sys/bus_dma.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/bus_dma.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -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.

Modified: head/sys/sys/bus_dma_internal.h
==============================================================================
--- head/sys/sys/bus_dma_internal.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/bus_dma_internal.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2017 Jason A. Harmening.
  * All rights reserved.
  *

Modified: head/sys/sys/capsicum.h
==============================================================================
--- head/sys/sys/capsicum.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/capsicum.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -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.

Modified: head/sys/sys/cnv.h
==============================================================================
--- head/sys/sys/cnv.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/cnv.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2016 Adam Starak <starak.adam at gmail.com>
  * All rights reserved.
  *

Modified: head/sys/sys/devmap.h
==============================================================================
--- head/sys/sys/devmap.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/devmap.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2013 Ian Lepore <ian at freebsd.org>
  * All rights reserved.
  *

Modified: head/sys/sys/disk_zone.h
==============================================================================
--- head/sys/sys/disk_zone.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/disk_zone.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015 Spectra Logic Corporation
  * All rights reserved.
  *

Modified: head/sys/sys/dnv.h
==============================================================================
--- head/sys/sys/dnv.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/dnv.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2013 The FreeBSD Foundation
  * All rights reserved.
  *

Modified: head/sys/sys/gtaskqueue.h
==============================================================================
--- head/sys/sys/gtaskqueue.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/gtaskqueue.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2014 Jeffrey Roberson <jeff at freebsd.org>
  * Copyright (c) 2016 Matthew Macy <mmacy at nextbsd.org>
  * All rights reserved.

Modified: head/sys/sys/gzio.h
==============================================================================
--- head/sys/sys/gzio.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/gzio.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2014 Mark Johnston <markj at FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/sys/imgact_binmisc.h
==============================================================================
--- head/sys/sys/imgact_binmisc.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/imgact_binmisc.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -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

Modified: head/sys/sys/intr.h
==============================================================================
--- head/sys/sys/intr.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/intr.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -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.

Modified: head/sys/sys/iov.h
==============================================================================
--- head/sys/sys/iov.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/iov.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2013-2015 Sandvine Inc.
  * All rights reserved.
  *

Modified: head/sys/sys/iov_schema.h
==============================================================================
--- head/sys/sys/iov_schema.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/iov_schema.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2014-2015 Sandvine Inc.
  * All rights reserved.
  *

Modified: head/sys/sys/mouse.h
==============================================================================
--- head/sys/sys/mouse.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/mouse.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -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.

Modified: head/sys/sys/msg.h
==============================================================================
--- head/sys/sys/msg.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/msg.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -4,9 +4,9 @@
 /*-
  * 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.
  *

Modified: head/sys/sys/numa.h
==============================================================================
--- head/sys/sys/numa.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/numa.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2015 Adrian Chadd <adrian at FreeBSD.org>.
  * All rights reserved.
  *

Modified: head/sys/sys/nv.h
==============================================================================
--- head/sys/sys/nv.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/nv.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Copyright (c) 2009-2013 The FreeBSD Foundation
  * Copyright (c) 2013-2015 Mariusz Zaborski <oshogbo at FreeBSD.org>
  * All rights reserved.

Modified: head/sys/sys/rman.h
==============================================================================
--- head/sys/sys/rman.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/rman.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT
+ *
  * Copyright 1998 Massachusetts Institute of Technology
  *
  * Permission to use, copy, modify, and distribute this software and

Modified: head/sys/sys/snoop.h
==============================================================================
--- head/sys/sys/snoop.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/snoop.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: 0BSD
+ * SPDX-License-Identifier: BSD-1-Clause
  *
  * Copyright (c) 1995 Ugen J.S.Antsilevich
  *

Modified: head/sys/sys/soundcard.h
==============================================================================
--- head/sys/sys/soundcard.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/soundcard.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -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
  *

Modified: head/sys/sys/spigenio.h
==============================================================================
--- head/sys/sys/spigenio.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/spigenio.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000 Doug Rabson
  * All rights reserved.
  *

Modified: head/sys/sys/tiio.h
==============================================================================
--- head/sys/sys/tiio.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/tiio.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -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.

Modified: head/sys/sys/timetc.h
==============================================================================
--- head/sys/sys/timetc.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/timetc.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: Beerware
+ *
  * ----------------------------------------------------------------------------
  * "THE BEER-WARE LICENSE" (Revision 42):
  * <phk at FreeBSD.ORG> wrote this file.  As long as you retain this notice you

Modified: head/sys/sys/zlib.h
==============================================================================
--- head/sys/sys/zlib.h	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/sys/sys/zlib.h	Wed Dec 13 16:13:17 2017	(r326823)
@@ -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.
 

Modified: head/usr.sbin/ppp/arp.c
==============================================================================
--- head/usr.sbin/ppp/arp.c	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/usr.sbin/ppp/arp.c	Wed Dec 13 16:13:17 2017	(r326823)
@@ -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.

Modified: head/usr.sbin/rarpd/rarpd.c
==============================================================================
--- head/usr.sbin/rarpd/rarpd.c	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/usr.sbin/rarpd/rarpd.c	Wed Dec 13 16:13:17 2017	(r326823)
@@ -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.

Modified: head/usr.sbin/watch/watch.c
==============================================================================
--- head/usr.sbin/watch/watch.c	Wed Dec 13 16:09:00 2017	(r326822)
+++ head/usr.sbin/watch/watch.c	Wed Dec 13 16:13:17 2017	(r326823)
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: 0BSD
+ * SPDX-License-Identifier: BSD-1-Clause
  *
  * Copyright (c) 1995 Ugen J.S.Antsilevich
  *

More information about the svn-src-all mailing list