svn commit: r327005 - in head: sbin/ipfw sys/sys usr.sbin/watch

[Pedro F. Giffuni]

Author: pfg
Date: Tue Dec 19 22:40:16 2017
New Revision: 327005
URL: https://svnweb.freebsd.org/changeset/base/327005

Log:
  SPDX: These are fundamentally BSD-2-Clause.
  
  They just omit the introductory line and numbering.

Modified:
  head/sbin/ipfw/altq.c
  head/sbin/ipfw/dummynet.c
  head/sbin/ipfw/ipfw2.c
  head/sbin/ipfw/ipfw2.h
  head/sbin/ipfw/ipv6.c
  head/sbin/ipfw/main.c
  head/sbin/ipfw/nat.c
  head/sys/sys/msg.h
  head/sys/sys/snoop.h
  head/usr.sbin/watch/watch.c

Modified: head/sbin/ipfw/altq.c
==============================================================================
--- head/sbin/ipfw/altq.c	Tue Dec 19 22:39:05 2017	(r327004)
+++ head/sbin/ipfw/altq.c	Tue Dec 19 22:40:16 2017	(r327005)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ * 
  * Copyright (c) 2002-2003 Luigi Rizzo
  * Copyright (c) 1996 Alex Nash, Paul Traina, Poul-Henning Kamp
  * Copyright (c) 1994 Ugen J.S.Antsilevich

Modified: head/sbin/ipfw/dummynet.c
==============================================================================
--- head/sbin/ipfw/dummynet.c	Tue Dec 19 22:39:05 2017	(r327004)
+++ head/sbin/ipfw/dummynet.c	Tue Dec 19 22:40:16 2017	(r327005)
@@ -1,4 +1,6 @@
-/*
+/*.
+ * SPDX-License-Identifier: BSD-2-Clause
+ * 
  * Codel/FQ_Codel and PIE/FQ_PIE Code:
  * Copyright (C) 2016 Centre for Advanced Internet Architectures,
  *  Swinburne University of Technology, Melbourne, Australia.

Modified: head/sbin/ipfw/ipfw2.c
==============================================================================
--- head/sbin/ipfw/ipfw2.c	Tue Dec 19 22:39:05 2017	(r327004)
+++ head/sbin/ipfw/ipfw2.c	Tue Dec 19 22:40:16 2017	(r327005)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ * 
  * Copyright (c) 2002-2003 Luigi Rizzo
  * Copyright (c) 1996 Alex Nash, Paul Traina, Poul-Henning Kamp
  * Copyright (c) 1994 Ugen J.S.Antsilevich

Modified: head/sbin/ipfw/ipfw2.h
==============================================================================
--- head/sbin/ipfw/ipfw2.h	Tue Dec 19 22:39:05 2017	(r327004)
+++ head/sbin/ipfw/ipfw2.h	Tue Dec 19 22:40:16 2017	(r327005)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ * 
  * Copyright (c) 2002-2003 Luigi Rizzo
  * Copyright (c) 1996 Alex Nash, Paul Traina, Poul-Henning Kamp
  * Copyright (c) 1994 Ugen J.S.Antsilevich

Modified: head/sbin/ipfw/ipv6.c
==============================================================================
--- head/sbin/ipfw/ipv6.c	Tue Dec 19 22:39:05 2017	(r327004)
+++ head/sbin/ipfw/ipv6.c	Tue Dec 19 22:40:16 2017	(r327005)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ * 
  * Copyright (c) 2002-2003 Luigi Rizzo
  * Copyright (c) 1996 Alex Nash, Paul Traina, Poul-Henning Kamp
  * Copyright (c) 1994 Ugen J.S.Antsilevich

Modified: head/sbin/ipfw/main.c
==============================================================================
--- head/sbin/ipfw/main.c	Tue Dec 19 22:39:05 2017	(r327004)
+++ head/sbin/ipfw/main.c	Tue Dec 19 22:40:16 2017	(r327005)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ * 
  * Copyright (c) 2002-2003,2010 Luigi Rizzo
  * Copyright (c) 1996 Alex Nash, Paul Traina, Poul-Henning Kamp
  * Copyright (c) 1994 Ugen J.S.Antsilevich

Modified: head/sbin/ipfw/nat.c
==============================================================================
--- head/sbin/ipfw/nat.c	Tue Dec 19 22:39:05 2017	(r327004)
+++ head/sbin/ipfw/nat.c	Tue Dec 19 22:40:16 2017	(r327005)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ * 
  * Copyright (c) 2002-2003 Luigi Rizzo
  * Copyright (c) 1996 Alex Nash, Paul Traina, Poul-Henning Kamp
  * Copyright (c) 1994 Ugen J.S.Antsilevich

Modified: head/sys/sys/msg.h
==============================================================================
--- head/sys/sys/msg.h	Tue Dec 19 22:39:05 2017	(r327004)
+++ head/sys/sys/msg.h	Tue Dec 19 22:40:16 2017	(r327005)
@@ -6,7 +6,7 @@
  *
  * Author:  Daniel Boulet
  *
- * SPDX-License-Identifier: BSD-1-Clause
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright 1993 Daniel Boulet and RTMX Inc.
  *

Modified: head/sys/sys/snoop.h
==============================================================================
--- head/sys/sys/snoop.h	Tue Dec 19 22:39:05 2017	(r327004)
+++ head/sys/sys/snoop.h	Tue Dec 19 22:40:16 2017	(r327005)
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-1-Clause
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1995 Ugen J.S.Antsilevich
  *

Modified: head/usr.sbin/watch/watch.c
==============================================================================
--- head/usr.sbin/watch/watch.c	Tue Dec 19 22:39:05 2017	(r327004)
+++ head/usr.sbin/watch/watch.c	Tue Dec 19 22:40:16 2017	(r327005)
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-1-Clause
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1995 Ugen J.S.Antsilevich
  *