Date: Thu, 28 Dec 2017 17:51:54 +0000 (UTC) From: "Pedro F. Giffuni" <pfg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r327290 - head/libexec/rpc.sprayd Message-ID: <201712281751.vBSHpsYM035096@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pfg Date: Thu Dec 28 17:51:53 2017 New Revision: 327290 URL: https://svnweb.freebsd.org/changeset/base/327290 Log: rpc.sprayd: Remove 3rd and 4th clauses in christos' license. Obtained from: NetBSD Modified: head/libexec/rpc.sprayd/rpc.sprayd.8 head/libexec/rpc.sprayd/sprayd.c Modified: head/libexec/rpc.sprayd/rpc.sprayd.8 ============================================================================== --- head/libexec/rpc.sprayd/rpc.sprayd.8 Thu Dec 28 17:44:30 2017 (r327289) +++ head/libexec/rpc.sprayd/rpc.sprayd.8 Thu Dec 28 17:51:53 2017 (r327290) @@ -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 Modified: head/libexec/rpc.sprayd/sprayd.c ============================================================================== --- head/libexec/rpc.sprayd/sprayd.c Thu Dec 28 17:44:30 2017 (r327289) +++ head/libexec/rpc.sprayd/sprayd.c Thu Dec 28 17:51:53 2017 (r327290) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712281751.vBSHpsYM035096>