From 8745f4e33d4450fb9bd6fe1f48e7ac4b045785a5 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Wed, 20 May 2015 23:43:03 +0000 Subject: Remove clauses 3 and 4 from Christos Zoulas' BSD license. This is safe because Christos did that himself in NetBSD in 2008. No code change. --- LICENSE | 7 +++---- compat_stringlist.c | 4 +--- compat_stringlist.h | 7 +------ 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/LICENSE b/LICENSE index 5745fa3e..ab32accc 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -$Id: LICENSE,v 1.8 2015/05/20 22:22:59 schwarze Exp $ +$Id: LICENSE,v 1.9 2015/05/20 23:43:03 schwarze Exp $ With the exceptions noted below, all code and documentation contained in the mdocml toolkit is protected by the Copyright @@ -37,9 +37,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. The following files included from outside sources are protected by -other people's Copyright and are distributed under various 2-clause, -3-clause, and 4-clause BSD licenses; see these individual files for -details. +other people's Copyright and are distributed under various 2-clause +and 3-clause BSD licenses; see these individual files for details. soelim.c, soelim.1: Copyright (c) 2014 Baptiste Daroussin diff --git a/compat_stringlist.c b/compat_stringlist.c index 05b62d38..570fcdd1 100644 --- a/compat_stringlist.c +++ b/compat_stringlist.c @@ -1,4 +1,4 @@ -/* $Id: compat_stringlist.c,v 1.3 2015/05/20 23:00:43 schwarze Exp $ */ +/* $Id: compat_stringlist.c,v 1.4 2015/05/20 23:43:03 schwarze Exp $ */ /* * Copyright (c) 1994 Christos Zoulas * All rights reserved. @@ -11,8 +11,6 @@ * 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. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED diff --git a/compat_stringlist.h b/compat_stringlist.h index 5751fb22..424f1a23 100644 --- a/compat_stringlist.h +++ b/compat_stringlist.h @@ -1,4 +1,4 @@ -/* $Id: compat_stringlist.h,v 1.2 2015/05/20 22:22:59 schwarze Exp $ */ +/* $Id: compat_stringlist.h,v 1.3 2015/05/20 23:43:03 schwarze Exp $ */ /* $NetBSD: stringlist.h,v 1.2 1997/01/17 06:11:36 lukem Exp $ */ /* @@ -13,11 +13,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Christos Zoulas. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -- cgit v1.2.3-56-ge451