From: jsg <jsg@openbsd.org>
Date: Wed, 4 Jan 2023 09:24:14 +0000 (+0000)
Subject: Gordon W. Ross agreed to rescind clause 3 and 4 in
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f330940439f98646fd9d03dc4285bc1479e79059;p=openbsd

Gordon W. Ross agreed to rescind clause 3 and 4 in
NetBSD dev_net.c rev 1.15 bootparam.c rev 1.19

https://mail-index.netbsd.org/source-changes/2009/10/21/msg002212.html
---

diff --git a/sys/arch/alpha/stand/netboot/dev_net.c b/sys/arch/alpha/stand/netboot/dev_net.c
index dce364ba506..d7c23e252fb 100644
--- a/sys/arch/alpha/stand/netboot/dev_net.c
+++ b/sys/arch/alpha/stand/netboot/dev_net.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dev_net.c,v 1.5 2021/01/29 16:22:36 deraadt Exp $	*/
+/*	$OpenBSD: dev_net.c,v 1.6 2023/01/04 09:24:14 jsg Exp $	*/
 /*	$NetBSD: dev_net.c,v 1.4 1997/04/06 08:41:24 cgd 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Gordon W. Ross
  *
  * 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/sys/lib/libsa/bootparam.c b/sys/lib/libsa/bootparam.c
index 8bf8be46c87..0c58490014a 100644
--- a/sys/lib/libsa/bootparam.c
+++ b/sys/lib/libsa/bootparam.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bootparam.c,v 1.12 2014/07/13 15:31:20 mpi Exp $	*/
+/*	$OpenBSD: bootparam.c,v 1.13 2023/01/04 09:24:14 jsg Exp $	*/
 /*	$NetBSD: bootparam.c,v 1.10 1996/10/14 21:16:55 thorpej 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Gordon W. Ross
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES