aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro F. Giffuni <pfg@FreeBSD.org>2017-12-19 22:40:16 +0000
committerPedro F. Giffuni <pfg@FreeBSD.org>2017-12-19 22:40:16 +0000
commitd17aef79bb2cd7646e57f533d7418938edd74971 (patch)
tree8867cbac33629fff120554cd404cb6f1a99166cc
parentb501cc5da6f8e10d354ace1befbf59737543eb30 (diff)
downloadsrc-d17aef79bb2cd7646e57f533d7418938edd74971.tar.gz
src-d17aef79bb2cd7646e57f533d7418938edd74971.zip
SPDX: These are fundamentally BSD-2-Clause.
They just omit the introductory line and numbering.
Notes
Notes: svn path=/head/; revision=327005
-rw-r--r--sbin/ipfw/altq.c4
-rw-r--r--sbin/ipfw/dummynet.c4
-rw-r--r--sbin/ipfw/ipfw2.c4
-rw-r--r--sbin/ipfw/ipfw2.h4
-rw-r--r--sbin/ipfw/ipv6.c4
-rw-r--r--sbin/ipfw/main.c4
-rw-r--r--sbin/ipfw/nat.c4
-rw-r--r--sys/sys/msg.h2
-rw-r--r--sys/sys/snoop.h2
-rw-r--r--usr.sbin/watch/watch.c2
10 files changed, 24 insertions, 10 deletions
diff --git a/sbin/ipfw/altq.c b/sbin/ipfw/altq.c
index 8398ab611f23..a78852cfd633 100644
--- 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
diff --git a/sbin/ipfw/dummynet.c b/sbin/ipfw/dummynet.c
index 0aa3bb5c1e3a..e3a04b389eb2 100644
--- 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.
diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c
index 7c491466cbb8..455669763bf5 100644
--- 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
diff --git a/sbin/ipfw/ipfw2.h b/sbin/ipfw/ipfw2.h
index 8befdc91cc91..274c0008a95f 100644
--- 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
diff --git a/sbin/ipfw/ipv6.c b/sbin/ipfw/ipv6.c
index 4fce1d2a288c..5c643ca911e2 100644
--- 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
diff --git a/sbin/ipfw/main.c b/sbin/ipfw/main.c
index b7ff07a60949..0ea0bb7cb634 100644
--- 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
diff --git a/sbin/ipfw/nat.c b/sbin/ipfw/nat.c
index 28dac8645bf8..70a50de947c6 100644
--- 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
diff --git a/sys/sys/msg.h b/sys/sys/msg.h
index a0a963d551d8..d2e9f756d5dc 100644
--- 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.
*
diff --git a/sys/sys/snoop.h b/sys/sys/snoop.h
index f2d6b31a903e..1a5e117976f1 100644
--- 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
*
diff --git a/usr.sbin/watch/watch.c b/usr.sbin/watch/watch.c
index e0999757ab61..3585d4555b18 100644
--- 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
*