Change license from 3-clause BSD to 2-clause BSD and add SPDX tags.

diff --git a/COPYING b/COPYING
index 7e5dd196e3513bcb7dc1825a21c200726d3a53a0..04984852844521f42c9b087d1ef473b53bfd7fd8 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,28 +1,27 @@
                        BSD LICENSE
 
+Copyright (c) 2015, Eric S. Raymond
+All rights reserved.
+
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+modification, are permitted provided that the following conditions are
+met:
 
-Redistributions of source code must retain the above copyright
+1. Redistributions of source code must retain the above copyright
 notice, this list of conditions and the following disclaimer.
 
-Redistributions in binary form must reproduce the above copyright
+2. Redistributions in binary form must reproduce the above copyright
 notice, this list of conditions and the following disclaimer in the
 documentation and/or other materials provided with the distribution.
 
-Neither name of the this project nor the names of its contributors
-may be used to endorse or promote products derived from this software
-without specific prior written permission.
-
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

diff --git a/NEWS b/NEWS
index 0aca7a19bdc0f7eb4cd6d8b4931d9c1b1c682c8f..327faa8d11cec424e8a6ec7584a2839cc89ec77d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@
 Repository head::
   Added the logo and a historical note about it.
   Minor bug fix for suprhack.
+  Change license from 3-clause BSD to 2-clause BSD and add SPDX tags.
 
 1.6: 2015-04-04::
   Code audited with cppcheck. Changed to modern packaging.

diff --git a/superhack.c b/superhack.c
index eff24c2fb4725f604a7137aac28d97397ff93053..2a245bdaac5814a19953f16a1906403021737b11 100644 (file)
--- a/superhack.c
+++ b/superhack.c
@@ -8,6 +8,8 @@
  *
  * Any resemblance to persons living or dead is strictly coincidental.  And
  * if you believe *that*...
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <stdio.h>

diff --git a/wumpus.c b/wumpus.c
index 6068fd689d4af240b4035bdc8a2b0cdf6bc410dc..b4d983c73a444ff1ac2572ae9d636ee62f1f2435 100644 (file)
--- a/wumpus.c
+++ b/wumpus.c
@@ -25,6 +25,8 @@
  *
  * So, pretend for a little while that your workstation is an ASR-33 and
  * limber up your fingers for a trip to nostalgia-land...
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <stdio.h>