Matthias Pfaller rescinded clauses three and four of his license

http://mail-index.netbsd.org/source-changes/2009/10/18/msg002090.html

4 files changed, 6 insertions, 26 deletions

diff --git a/share/man/man5/genassym.cf.5 b/share/man/man5/genassym.cf.5
index 7c921011624..3f587fcdbe1 100644
--- a/share/man/man5/genassym.cf.5
+++ b/share/man/man5/genassym.cf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: genassym.cf.5,v 1.9 2014/03/18 22:36:31 miod Exp $
+.\"	$OpenBSD: genassym.cf.5,v 1.10 2014/07/05 07:18:33 jsg Exp $
 .\"	$NetBSD: genassym.cf.5,v 1.8 2001/06/19 12:34:27 wiz Exp $
 .\"
 .\" Copyright (c) 1997 Matthias Pfaller.
@@ -12,11 +12,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 Matthias Pfaller.
-.\" 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
@@ -29,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 18 2014 $
+.Dd $Mdocdate: July 5 2014 $
 .Dt GENASSYM.CF 5
 .Os
 .Sh NAME
diff --git a/share/man/man8/genassym.sh.8 b/share/man/man8/genassym.sh.8
index cffbaf5a74f..fbd31ab84ae 100644
--- a/share/man/man8/genassym.sh.8
+++ b/share/man/man8/genassym.sh.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: genassym.sh.8,v 1.7 2007/05/31 19:19:59 jmc Exp $
+.\"	$OpenBSD: genassym.sh.8,v 1.8 2014/07/05 07:18:33 jsg Exp $
 .\"	$NetBSD: genassym.sh.8,v 1.5 1999/03/17 20:31:19 garbled Exp $
 .\"
 .\" Copyright (c) 1997 Matthias Pfaller.
@@ -12,11 +12,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 Matthias Pfaller.
-.\" 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
@@ -29,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: July 5 2014 $
 .Dt GENASSYM.SH 8
 .Os
 .Sh NAME
diff --git a/sys/arch/i386/i386/kgdb_machdep.c b/sys/arch/i386/i386/kgdb_machdep.c
index 23841d35dd6..1b0d5217e33 100644
--- a/sys/arch/i386/i386/kgdb_machdep.c
+++ b/sys/arch/i386/i386/kgdb_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kgdb_machdep.c,v 1.10 2014/03/29 18:09:29 guenther Exp $	*/
+/*	$OpenBSD: kgdb_machdep.c,v 1.11 2014/07/05 07:18:33 jsg Exp $	*/
 /*	$NetBSD: kgdb_machdep.c,v 1.6 1998/08/13 21:36:03 thorpej Exp $	*/
 
 /*-
@@ -43,11 +43,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 Matthias Pfaller.
- * 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
diff --git a/sys/kern/genassym.sh b/sys/kern/genassym.sh
index f3096373f91..53110899eaa 100644
--- a/sys/kern/genassym.sh
+++ b/sys/kern/genassym.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.sh,v 1.11 2004/02/01 13:13:37 miod Exp $
+#	$OpenBSD: genassym.sh,v 1.12 2014/07/05 07:18:33 jsg Exp $
 #	$NetBSD: genassym.sh,v 1.9 1998/04/25 19:48:27 matthias 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 Matthias Pfaller.
-# 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