SPDX: These are fundamentally BSD-2-Clause.

They just omit the introductory line and numbering.
2017-12-19 22:40:16 +00:00 · 2017-12-19 22:40:16 +00:00 · d17aef79bb
commit d17aef79bb
parent b501cc5da6
10 changed files with 24 additions and 10 deletions
--- a/sbin/ipfw/altq.c
+++ b/sbin/ipfw/altq.c
@ -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
--- a/sbin/ipfw/dummynet.c
+++ b/sbin/ipfw/dummynet.c
@ -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.
--- a/sbin/ipfw/ipfw2.c
+++ b/sbin/ipfw/ipfw2.c
@ -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
--- a/sbin/ipfw/ipfw2.h
+++ b/sbin/ipfw/ipfw2.h
@ -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
--- a/sbin/ipfw/ipv6.c
+++ b/sbin/ipfw/ipv6.c
@ -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
--- a/sbin/ipfw/main.c
+++ b/sbin/ipfw/main.c
@ -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
--- a/sbin/ipfw/nat.c
+++ b/sbin/ipfw/nat.c
@ -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
--- a/sys/sys/msg.h
+++ b/sys/sys/msg.h
@ -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.
 *
--- a/sys/sys/snoop.h
+++ b/sys/sys/snoop.h
@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-1-Clause
+ * SPDX-License-Identifier: BSD-2-Clause
 *
 * Copyright (c) 1995 Ugen J.S.Antsilevich
 *
--- a/usr.sbin/watch/watch.c
+++ b/usr.sbin/watch/watch.c
@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-1-Clause
+ * SPDX-License-Identifier: BSD-2-Clause
 *
 * Copyright (c) 1995 Ugen J.S.Antsilevich
 *