Module Name: src
Committed By: snj
Date: Sun Oct 18 18:14:00 UTC 2009
Modified Files:
src/share/man/man5: genassym.cf.5
src/sys/arch/amd64/amd64: kgdb_machdep.c
src/sys/arch/arm/arm32: kgdb_machdep.c
src/sys/arch/i386/i386: kgdb_machdep.c
src/sys/arch/mips/mips: kgdb_machdep.c
src/sys/arch/sh3/sh3: kgdb_machdep.c
src/sys/dev/podulebus: hcsc.c
src/usr.bin/genassym: genassym.1 genassym.sh
Log Message:
Move Matthias Pfaller's files to 2-clause license. OK matth...@.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/share/man/man5/genassym.cf.5
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amd64/amd64/kgdb_machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/arm32/kgdb_machdep.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/i386/i386/kgdb_machdep.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mips/mips/kgdb_machdep.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sh3/sh3/kgdb_machdep.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/podulebus/hcsc.c
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/genassym/genassym.1
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/genassym/genassym.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man5/genassym.cf.5
diff -u src/share/man/man5/genassym.cf.5:1.11 src/share/man/man5/genassym.cf.5:1.12
--- src/share/man/man5/genassym.cf.5:1.11 Sun Sep 11 23:32:48 2005
+++ src/share/man/man5/genassym.cf.5 Sun Oct 18 18:13:59 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: genassym.cf.5,v 1.11 2005/09/11 23:32:48 wiz Exp $
+.\" $NetBSD: genassym.cf.5,v 1.12 2009/10/18 18:13:59 snj Exp $
.\"
.\" Copyright (c) 1997 Matthias Pfaller.
.\" All rights reserved.
@@ -11,11 +11,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
Index: src/sys/arch/amd64/amd64/kgdb_machdep.c
diff -u src/sys/arch/amd64/amd64/kgdb_machdep.c:1.5 src/sys/arch/amd64/amd64/kgdb_machdep.c:1.6
--- src/sys/arch/amd64/amd64/kgdb_machdep.c:1.5 Sat Mar 14 15:36:00 2009
+++ src/sys/arch/amd64/amd64/kgdb_machdep.c Sun Oct 18 18:13:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kgdb_machdep.c,v 1.5 2009/03/14 15:36:00 dsl Exp $ */
+/* $NetBSD: kgdb_machdep.c,v 1.6 2009/10/18 18:13:59 snj Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -42,11 +42,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
@@ -61,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.5 2009/03/14 15:36:00 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.6 2009/10/18 18:13:59 snj Exp $");
#include "opt_ddb.h"
Index: src/sys/arch/arm/arm32/kgdb_machdep.c
diff -u src/sys/arch/arm/arm32/kgdb_machdep.c:1.6 src/sys/arch/arm/arm32/kgdb_machdep.c:1.7
--- src/sys/arch/arm/arm32/kgdb_machdep.c:1.6 Sat Mar 14 15:36:01 2009
+++ src/sys/arch/arm/arm32/kgdb_machdep.c Sun Oct 18 18:14:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kgdb_machdep.c,v 1.6 2009/03/14 15:36:01 dsl Exp $ */
+/* $NetBSD: kgdb_machdep.c,v 1.7 2009/10/18 18:14:00 snj Exp $ */
/*
* Copyright (c) 1996 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
@@ -31,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.6 2009/03/14 15:36:01 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.7 2009/10/18 18:14:00 snj Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
Index: src/sys/arch/i386/i386/kgdb_machdep.c
diff -u src/sys/arch/i386/i386/kgdb_machdep.c:1.20 src/sys/arch/i386/i386/kgdb_machdep.c:1.21
--- src/sys/arch/i386/i386/kgdb_machdep.c:1.20 Sat Mar 14 15:36:07 2009
+++ src/sys/arch/i386/i386/kgdb_machdep.c Sun Oct 18 18:14:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kgdb_machdep.c,v 1.20 2009/03/14 15:36:07 dsl Exp $ */
+/* $NetBSD: kgdb_machdep.c,v 1.21 2009/10/18 18:14:00 snj Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -42,11 +42,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
@@ -61,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.20 2009/03/14 15:36:07 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.21 2009/10/18 18:14:00 snj Exp $");
#include "opt_ddb.h"
Index: src/sys/arch/mips/mips/kgdb_machdep.c
diff -u src/sys/arch/mips/mips/kgdb_machdep.c:1.14 src/sys/arch/mips/mips/kgdb_machdep.c:1.15
--- src/sys/arch/mips/mips/kgdb_machdep.c:1.14 Sat Mar 14 15:36:10 2009
+++ src/sys/arch/mips/mips/kgdb_machdep.c Sun Oct 18 18:14:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kgdb_machdep.c,v 1.14 2009/03/14 15:36:10 dsl Exp $ */
+/* $NetBSD: kgdb_machdep.c,v 1.15 2009/10/18 18:14:00 snj Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -42,11 +42,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
@@ -61,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.14 2009/03/14 15:36:10 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.15 2009/10/18 18:14:00 snj Exp $");
#include "opt_ddb.h"
Index: src/sys/arch/sh3/sh3/kgdb_machdep.c
diff -u src/sys/arch/sh3/sh3/kgdb_machdep.c:1.15 src/sys/arch/sh3/sh3/kgdb_machdep.c:1.16
--- src/sys/arch/sh3/sh3/kgdb_machdep.c:1.15 Sun Jan 11 23:20:37 2009
+++ src/sys/arch/sh3/sh3/kgdb_machdep.c Sun Oct 18 18:14:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kgdb_machdep.c,v 1.15 2009/01/11 23:20:37 cegger Exp $ */
+/* $NetBSD: kgdb_machdep.c,v 1.16 2009/10/18 18:14:00 snj Exp $ */
/*-
* Copyright (c) 1997, 2002 The NetBSD Foundation, Inc.
@@ -42,11 +42,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
@@ -61,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.15 2009/01/11 23:20:37 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.16 2009/10/18 18:14:00 snj Exp $");
#include "opt_ddb.h"
Index: src/sys/dev/podulebus/hcsc.c
diff -u src/sys/dev/podulebus/hcsc.c:1.19 src/sys/dev/podulebus/hcsc.c:1.20
--- src/sys/dev/podulebus/hcsc.c:1.19 Mon Apr 28 20:23:56 2008
+++ src/sys/dev/podulebus/hcsc.c Sun Oct 18 18:14:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hcsc.c,v 1.19 2008/04/28 20:23:56 martin Exp $ */
+/* $NetBSD: hcsc.c,v 1.20 2009/10/18 18:14:00 snj Exp $ */
/*
* Copyright (c) 2001 Ben Harris
@@ -41,11 +41,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
@@ -67,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hcsc.c,v 1.19 2008/04/28 20:23:56 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hcsc.c,v 1.20 2009/10/18 18:14:00 snj Exp $");
#include <sys/param.h>
Index: src/usr.bin/genassym/genassym.1
diff -u src/usr.bin/genassym/genassym.1:1.3 src/usr.bin/genassym/genassym.1:1.4
--- src/usr.bin/genassym/genassym.1:1.3 Thu Aug 18 01:09:02 2005
+++ src/usr.bin/genassym/genassym.1 Sun Oct 18 18:14:00 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: genassym.1,v 1.3 2005/08/18 01:09:02 rpaulo Exp $
+.\" $NetBSD: genassym.1,v 1.4 2009/10/18 18:14:00 snj Exp $
.\"
.\" Copyright (c) 1997 Matthias Pfaller.
.\" All rights reserved.
@@ -11,11 +11,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
Index: src/usr.bin/genassym/genassym.sh
diff -u src/usr.bin/genassym/genassym.sh:1.4 src/usr.bin/genassym/genassym.sh:1.5
--- src/usr.bin/genassym/genassym.sh:1.4 Sun Oct 19 22:10:05 2008
+++ src/usr.bin/genassym/genassym.sh Sun Oct 18 18:14:00 2009
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: genassym.sh,v 1.4 2008/10/19 22:10:05 apb Exp $
+# $NetBSD: genassym.sh,v 1.5 2009/10/18 18:14:00 snj Exp $
#
# Copyright (c) 1997 Matthias Pfaller.
# All rights reserved.
@@ -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
