diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-01-04 09:24:15 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-01-04 09:24:15 +0000 |
| commit | 21127390e57bc4f81803632aa7c7b003b8a86adb (patch) | |
| tree | 3b61b014908c73220bba870eb0bdfb5778c81064 | |
| parent | b1880379d3f28fa0f607f40ab086594457fab9fa (diff) | |
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
| -rw-r--r-- | sys/arch/alpha/stand/netboot/dev_net.c | 7 | ||||
| -rw-r--r-- | sys/lib/libsa/bootparam.c | 7 |
2 files changed, 2 insertions, 12 deletions
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 |