svn commit: r327040 - in head: sbin/ipfw sys/sys usr.sbin/watch
Pedro F. Giffuni
pfg at FreeBSD.org
Wed Dec 20 20:25:31 UTC 2017
Author: pfg
Date: Wed Dec 20 20:25:28 2017
New Revision: 327040
URL: https://svnweb.freebsd.org/changeset/base/327040
Log:
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
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 Wed Dec 20 19:16:11 2017 (r327039)
+++ head/sbin/ipfw/altq.c Wed Dec 20 20:25:28 2017 (r327040)
@@ -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
Modified: head/sbin/ipfw/dummynet.c
==============================================================================
--- head/sbin/ipfw/dummynet.c Wed Dec 20 19:16:11 2017 (r327039)
+++ head/sbin/ipfw/dummynet.c Wed Dec 20 20:25:28 2017 (r327040)
@@ -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.
Modified: head/sbin/ipfw/ipfw2.c
==============================================================================
--- head/sbin/ipfw/ipfw2.c Wed Dec 20 19:16:11 2017 (r327039)
+++ head/sbin/ipfw/ipfw2.c Wed Dec 20 20:25:28 2017 (r327040)
@@ -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
Modified: head/sbin/ipfw/ipfw2.h
==============================================================================
--- head/sbin/ipfw/ipfw2.h Wed Dec 20 19:16:11 2017 (r327039)
+++ head/sbin/ipfw/ipfw2.h Wed Dec 20 20:25:28 2017 (r327040)
@@ -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
Modified: head/sbin/ipfw/ipv6.c
==============================================================================
--- head/sbin/ipfw/ipv6.c Wed Dec 20 19:16:11 2017 (r327039)
+++ head/sbin/ipfw/ipv6.c Wed Dec 20 20:25:28 2017 (r327040)
@@ -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
Modified: head/sbin/ipfw/main.c
==============================================================================
--- head/sbin/ipfw/main.c Wed Dec 20 19:16:11 2017 (r327039)
+++ head/sbin/ipfw/main.c Wed Dec 20 20:25:28 2017 (r327040)
@@ -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
Modified: head/sbin/ipfw/nat.c
==============================================================================
--- head/sbin/ipfw/nat.c Wed Dec 20 19:16:11 2017 (r327039)
+++ head/sbin/ipfw/nat.c Wed Dec 20 20:25:28 2017 (r327040)
@@ -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
Modified: head/sys/sys/msg.h
==============================================================================
--- head/sys/sys/msg.h Wed Dec 20 19:16:11 2017 (r327039)
+++ head/sys/sys/msg.h Wed Dec 20 20:25:28 2017 (r327040)
@@ -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.
Modified: head/sys/sys/snoop.h
==============================================================================
--- head/sys/sys/snoop.h Wed Dec 20 19:16:11 2017 (r327039)
+++ head/sys/sys/snoop.h Wed Dec 20 20:25:28 2017 (r327040)
@@ -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,
Modified: head/usr.sbin/watch/watch.c
==============================================================================
--- head/usr.sbin/watch/watch.c Wed Dec 20 19:16:11 2017 (r327039)
+++ head/usr.sbin/watch/watch.c Wed Dec 20 20:25:28 2017 (r327040)
@@ -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,
More information about the svn-src-head
mailing list