From 696447095f4d7fd1752336c4b7dc59be694d74bb Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Mon, 25 Mar 2019 18:48:58 -0400 Subject: [PATCH] Change license from 3-clause BSD to 2-clause BSD and add SPDX tags. --- COPYING | 33 ++++++++++++++++----------------- NEWS | 1 + superhack.c | 2 ++ wumpus.c | 2 ++ 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/COPYING b/COPYING index 7e5dd19..0498485 100644 --- 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 0aca7a1..327faa8 100644 --- 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 eff24c2..2a245bd 100644 --- 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 diff --git a/wumpus.c b/wumpus.c index 6068fd6..b4d983c 100644 --- 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 -- 2.31.1