From 6a84a52bed6c03062b0002a77fb8313aee990355 Mon Sep 17 00:00:00 2001 From: tg Date: Mon, 12 Sep 2005 18:59:51 +0000 Subject: [PATCH] simplify by not dup'ing --- copyright | 34 +++++----------------------------- 1 file changed, 5 insertions(+), 29 deletions(-) diff --git a/copyright b/copyright index d226b95..5424f91 100644 --- a/copyright +++ b/copyright @@ -1,4 +1,4 @@ -$MirOS: src/bin/mksh/copyright,v 1.4 2005/08/21 13:02:16 tg Exp $ +$MirOS: src/bin/mksh/copyright,v 1.5 2005/09/12 18:59:51 tg Exp $ mksh is a collective work under the following licence: @@ -29,32 +29,8 @@ mksh is a collective work under the following licence: The author recognises the contributions of the pdksh authors who have dedicated their work into the Public Domain. -The file "alloc.c" is covered by the following terms instead: +The file "alloc.c" is covered by a 2-clause UCB-style BSD licence in- +stead, please look at the file for the complete terms. -/*- - * Copyright (c) 2002 Marc Espie. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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. - * - * THIS SOFTWARE IS PROVIDED BY THE OPENBSD PROJECT AND CONTRIBUTORS - * ``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 OPENBSD - * PROJECT 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. - */ - -On systems which use the GNU libc, an additional file, "strlfun.c", is -included into the build. It is covered by the ISC/OpenBSD licence. +On systems which use the GNU libc, an additional file (strlfun.c) has +to be built. It is covered by the ISC/OpenBSD licence.