From d61fecb27316443e127799eaab6b95fb620fedb9 Mon Sep 17 00:00:00 2001
From: pfg <pfg@FreeBSD.org>
Date: Wed, 20 Dec 2017 20:25:28 +0000
Subject: [PATCH] Revert r327005 - SPDX tags for license similar to
 BSD-2-Clause.

After consultation with SPDX experts and their matching guidelines[1],
the licensing doesn't exactly match the BSD-2-Clause. It yet remains to be
determined if they are equivalent or if there is a recognized license that
matches but it is safer to just revert the tags.

Let this also be a reminder that on FreeBSD, SPDX tags are only advisory
and have no legal value (but IANAL).

Pointyhat to:	pfg
Thanks to:	Rodney Grimes, Gary O'Neall

[1] https://spdx.org/spdx-license-list/matching-guidelines
---
 sbin/ipfw/altq.c       | 2 --
 sbin/ipfw/dummynet.c   | 4 +---
 sbin/ipfw/ipfw2.c      | 2 --
 sbin/ipfw/ipfw2.h      | 2 --
 sbin/ipfw/ipv6.c       | 2 --
 sbin/ipfw/main.c       | 2 --
 sbin/ipfw/nat.c        | 2 --
 sys/sys/msg.h          | 2 --
 sys/sys/snoop.h        | 2 --
 usr.sbin/watch/watch.c | 2 --
 10 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/sbin/ipfw/altq.c b/sbin/ipfw/altq.c
index a78852cfd63..85f6d719197 100644
--- a/sbin/ipfw/altq.c
+++ b/sbin/ipfw/altq.c
@@ -1,6 +1,4 @@
 /*-
- * 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
diff --git a/sbin/ipfw/dummynet.c b/sbin/ipfw/dummynet.c
index e3a04b389eb..6be21cfb230 100644
--- a/sbin/ipfw/dummynet.c
+++ b/sbin/ipfw/dummynet.c
@@ -1,6 +1,4 @@
-/*.
- * 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.
diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c
index 455669763bf..82cb23a9a5c 100644
--- a/sbin/ipfw/ipfw2.c
+++ b/sbin/ipfw/ipfw2.c
@@ -1,6 +1,4 @@
 /*-
- * 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
diff --git a/sbin/ipfw/ipfw2.h b/sbin/ipfw/ipfw2.h
index 274c0008a95..3fe15e93431 100644
--- a/sbin/ipfw/ipfw2.h
+++ b/sbin/ipfw/ipfw2.h
@@ -1,6 +1,4 @@
 /*-
- * 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
diff --git a/sbin/ipfw/ipv6.c b/sbin/ipfw/ipv6.c
index 5c643ca911e..103e7438c8c 100644
--- a/sbin/ipfw/ipv6.c
+++ b/sbin/ipfw/ipv6.c
@@ -1,6 +1,4 @@
 /*-
- * 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
diff --git a/sbin/ipfw/main.c b/sbin/ipfw/main.c
index 0ea0bb7cb63..a012c4de822 100644
--- a/sbin/ipfw/main.c
+++ b/sbin/ipfw/main.c
@@ -1,6 +1,4 @@
 /*-
- * 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
diff --git a/sbin/ipfw/nat.c b/sbin/ipfw/nat.c
index 70a50de947c..aced8ea10ec 100644
--- a/sbin/ipfw/nat.c
+++ b/sbin/ipfw/nat.c
@@ -1,6 +1,4 @@
 /*-
- * 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
diff --git a/sys/sys/msg.h b/sys/sys/msg.h
index d2e9f756d5d..c2bb2d25440 100644
--- a/sys/sys/msg.h
+++ b/sys/sys/msg.h
@@ -6,8 +6,6 @@
  *
  * Author:  Daniel Boulet
  *
- * SPDX-License-Identifier: BSD-2-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/snoop.h b/sys/sys/snoop.h
index 1a5e117976f..b25aa494ff8 100644
--- a/sys/sys/snoop.h
+++ b/sys/sys/snoop.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
  * Copyright (c) 1995 Ugen J.S.Antsilevich
  *
  * Redistribution and use in source forms, with and without modification,
diff --git a/usr.sbin/watch/watch.c b/usr.sbin/watch/watch.c
index 3585d4555b1..85583882ea4 100644
--- a/usr.sbin/watch/watch.c
+++ b/usr.sbin/watch/watch.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
  * Copyright (c) 1995 Ugen J.S.Antsilevich
  *
  * Redistribution and use in source forms, with and without modification,
-- 
2.45.0