From 7db1d33cbaa4cb9495a31533db2cb6debf45ed0a Mon Sep 17 00:00:00 2001 From: agc Date: Wed, 10 Dec 2003 12:06:25 +0000 Subject: Modify the licences of code written by Theo De Raadt from a 4-clause to a 2-clause licence (retaining UCB clauses (1) and (2)), per PR 22409 from Joel Baker, approved by Theo de Raadt, and ratified by myself - the only discrepancy being the handling of the original clause 3 in src/usr.sbin/yppoll/yppoll.c. --- sys/dev/sun/pfourreg.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/sun/pfourreg.h b/sys/dev/sun/pfourreg.h index fc682c04d31..33112311cbf 100644 --- a/sys/dev/sun/pfourreg.h +++ b/sys/dev/sun/pfourreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: pfourreg.h,v 1.1 2000/08/20 14:28:51 pk Exp $ */ +/* $NetBSD: pfourreg.h,v 1.2 2003/12/10 12:06:25 agc Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -48,11 +48,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 Theo de Raadt. - * 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 -- cgit