From 5ab6bac110cb1e7d2870e6c2da7281bae055ae3e Mon Sep 17 00:00:00 2001 From: "Pedro F. Giffuni" Date: Thu, 28 Dec 2017 17:51:53 +0000 Subject: [PATCH] rpc.sprayd: Remove 3rd and 4th clauses in christos' license. Obtained from: NetBSD --- libexec/rpc.sprayd/rpc.sprayd.8 | 7 +------ libexec/rpc.sprayd/sprayd.c | 9 ++------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/libexec/rpc.sprayd/rpc.sprayd.8 b/libexec/rpc.sprayd/rpc.sprayd.8 index 6e817120ea43..ea19442a4fa4 100644 --- a/libexec/rpc.sprayd/rpc.sprayd.8 +++ b/libexec/rpc.sprayd/rpc.sprayd.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: rpc.sprayd.8,v 1.9 2003/02/25 10:34:50 wiz Exp $ +.\" $NetBSD: rpc.sprayd.8,v 1.10 2009/10/21 01:07:46 snj Exp $ .\" .\" Copyright (c) 1994 Christos Zoulas .\" All rights reserved. @@ -11,11 +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. -.\" 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 WARRANTIES diff --git a/libexec/rpc.sprayd/sprayd.c b/libexec/rpc.sprayd/sprayd.c index aeb4522f6c64..0456be67bd78 100644 --- a/libexec/rpc.sprayd/sprayd.c +++ b/libexec/rpc.sprayd/sprayd.c @@ -1,7 +1,7 @@ -/* $NetBSD: sprayd.c,v 1.14 2006/05/09 20:18:07 mrg Exp $ */ +/* $NetBSD: sprayd.c,v 1.15 2009/10/21 01:07:46 snj Exp $ */ /*- - * SPDX-License-Identifier: BSD-4-Clause + * SPDX-License-Identifier: BSD-2-Clause-NetBSD * * Copyright (c) 1994 Christos Zoulas * All rights reserved. @@ -14,11 +14,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 WARRANTIES