From 2f3eb870d9a95f69ed5a61a0d89405a53742be7a Mon Sep 17 00:00:00 2001 From: jsg Date: Wed, 4 Jan 2023 10:05:44 +0000 Subject: [PATCH] Michael L. Hitch agreed to rescind clause 3 and 4 in NetBSD ncr53cxxx.c rev 1.16 osiop.ss rev 1.2 https://mail-index.netbsd.org/source-changes/2009/10/21/msg002215.html --- sys/dev/microcode/siop/ncr53cxxx.c | 9 ++------- sys/dev/microcode/siop/osiop.ss | 7 +------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/sys/dev/microcode/siop/ncr53cxxx.c b/sys/dev/microcode/siop/ncr53cxxx.c index ea445bedf24..b7730981bfb 100644 --- a/sys/dev/microcode/siop/ncr53cxxx.c +++ b/sys/dev/microcode/siop/ncr53cxxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr53cxxx.c,v 1.7 2005/10/08 15:54:49 krw Exp $ */ +/* $OpenBSD: ncr53cxxx.c,v 1.8 2023/01/04 10:05:44 jsg Exp $ */ /* $NetBSD: ncr53cxxx.c,v 1.14 2005/02/11 06:21:22 simonb 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Michael L. Hitch. - * 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 @@ -416,7 +411,7 @@ main (int argc, char *argv[]) if (outfp) { time_t cur_time; - fprintf(outfp, "/*\t$OpenBSD: ncr53cxxx.c,v 1.7 2005/10/08 15:54:49 krw Exp $\t*/\n"); + fprintf(outfp, "/*\t$OpenBSD: ncr53cxxx.c,v 1.8 2023/01/04 10:05:44 jsg Exp $\t*/\n"); fprintf(outfp, "/*\n"); fprintf(outfp, " *\tDO NOT EDIT - this file is automatically generated.\n"); time(&cur_time); diff --git a/sys/dev/microcode/siop/osiop.ss b/sys/dev/microcode/siop/osiop.ss index 4978bb98405..f477647bda8 100644 --- a/sys/dev/microcode/siop/osiop.ss +++ b/sys/dev/microcode/siop/osiop.ss @@ -1,4 +1,4 @@ -; $OpenBSD: osiop.ss,v 1.2 2013/01/06 22:06:54 martynas Exp $ +; $OpenBSD: osiop.ss,v 1.3 2023/01/04 10:05:44 jsg Exp $ ; $NetBSD: osiop.ss,v 1.1 2001/04/30 04:47:51 tsutsui 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. All advertising materials mentioning features or use of this software -; must display the following acknowledgement: -; This product includes software developed by Michael L. Hitch. -; 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 -- 2.20.1