Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys Drop 3rd and 4th clauses (except on files where copyrigh...



details:   https://anonhg.NetBSD.org/src/rev/2da6b2096413
branches:  trunk
changeset: 748371:2da6b2096413
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Oct 21 23:53:38 2009 +0000

description:
Drop 3rd and 4th clauses (except on files where copyright is shared
with UC, in which case only the ad clause has been removed). Approved
by mhitch@ (copyright holder).

diffstat:

 sys/arch/amiga/dev/bzivsc.c            |  10 +++-------
 sys/arch/amiga/dev/bzivscvar.h         |   8 +-------
 sys/arch/amiga/dev/bzscvar.h           |   8 +-------
 sys/arch/amiga/dev/bztzscvar.h         |   8 +-------
 sys/arch/amiga/dev/cbiisc.c            |  10 +++-------
 sys/arch/amiga/dev/cbiiscvar.h         |   8 +-------
 sys/arch/amiga/dev/cbsc.c              |  10 +++-------
 sys/arch/amiga/dev/cbscvar.h           |   8 +-------
 sys/arch/amiga/dev/flscvar.h           |   8 +-------
 sys/arch/amiga/dev/if_es.c             |   9 ++-------
 sys/arch/amiga/dev/if_esreg.h          |   7 +------
 sys/arch/amiga/dev/siop2_script.ss     |   7 +------
 sys/arch/amiga/dev/siop_script.ss      |   7 +------
 sys/arch/amiga/stand/loadbsd/loadbsd.c |   7 +------
 sys/dev/microcode/siop/ncr53cxxx.c     |  11 +++--------
 sys/dev/microcode/siop/osiop.ss        |   7 +------
 16 files changed, 25 insertions(+), 108 deletions(-)

diffs (truncated from 399 to 300 lines):

diff -r d47707f66821 -r 2da6b2096413 sys/arch/amiga/dev/bzivsc.c
--- a/sys/arch/amiga/dev/bzivsc.c       Wed Oct 21 23:33:32 2009 +0000
+++ b/sys/arch/amiga/dev/bzivsc.c       Wed Oct 21 23:53:38 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bzivsc.c,v 1.26 2008/04/13 04:55:52 tsutsui Exp $ */
+/*     $NetBSD: bzivsc.c,v 1.27 2009/10/21 23:53:38 snj Exp $ */
 
 /*
  * Copyright (c) 1997 Michael L. Hitch
@@ -13,11 +13,7 @@
  * 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 contains software written by Michael L. Hitch for
- *     the NetBSD project.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -36,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bzivsc.c,v 1.26 2008/04/13 04:55:52 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bzivsc.c,v 1.27 2009/10/21 23:53:38 snj Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff -r d47707f66821 -r 2da6b2096413 sys/arch/amiga/dev/bzivscvar.h
--- a/sys/arch/amiga/dev/bzivscvar.h    Wed Oct 21 23:33:32 2009 +0000
+++ b/sys/arch/amiga/dev/bzivscvar.h    Wed Oct 21 23:53:38 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bzivscvar.h,v 1.3 2008/04/13 04:55:52 tsutsui Exp $    */
+/*     $NetBSD: bzivscvar.h,v 1.4 2009/10/21 23:53:38 snj Exp $        */
 
 /*
  * Copyright (c) 1997 Michael L. Hitch.
@@ -12,12 +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 for the NetBSD Project
- *     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
diff -r d47707f66821 -r 2da6b2096413 sys/arch/amiga/dev/bzscvar.h
--- a/sys/arch/amiga/dev/bzscvar.h      Wed Oct 21 23:33:32 2009 +0000
+++ b/sys/arch/amiga/dev/bzscvar.h      Wed Oct 21 23:53:38 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bzscvar.h,v 1.5 2008/04/13 04:55:52 tsutsui Exp $      */
+/*     $NetBSD: bzscvar.h,v 1.6 2009/10/21 23:53:38 snj Exp $  */
 
 /*
  * Copyright (c) 1997 Michael L. Hitch.
@@ -12,12 +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 for the NetBSD Project
- *     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
diff -r d47707f66821 -r 2da6b2096413 sys/arch/amiga/dev/bztzscvar.h
--- a/sys/arch/amiga/dev/bztzscvar.h    Wed Oct 21 23:33:32 2009 +0000
+++ b/sys/arch/amiga/dev/bztzscvar.h    Wed Oct 21 23:53:38 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bztzscvar.h,v 1.4 2008/04/13 04:55:52 tsutsui Exp $    */
+/*     $NetBSD: bztzscvar.h,v 1.5 2009/10/21 23:53:38 snj Exp $        */
 
 /*
  * Copyright (c) 1997 Michael L. Hitch.
@@ -12,12 +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 for the NetBSD Project
- *     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
diff -r d47707f66821 -r 2da6b2096413 sys/arch/amiga/dev/cbiisc.c
--- a/sys/arch/amiga/dev/cbiisc.c       Wed Oct 21 23:33:32 2009 +0000
+++ b/sys/arch/amiga/dev/cbiisc.c       Wed Oct 21 23:53:38 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cbiisc.c,v 1.27 2008/04/13 04:55:52 tsutsui Exp $ */
+/*     $NetBSD: cbiisc.c,v 1.28 2009/10/21 23:53:38 snj Exp $ */
 
 /*
  * Copyright (c) 1997 Michael L. Hitch
@@ -13,11 +13,7 @@
  * 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 contains software written by Michael L. Hitch for
- *     the NetBSD project.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -36,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cbiisc.c,v 1.27 2008/04/13 04:55:52 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cbiisc.c,v 1.28 2009/10/21 23:53:38 snj Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff -r d47707f66821 -r 2da6b2096413 sys/arch/amiga/dev/cbiiscvar.h
--- a/sys/arch/amiga/dev/cbiiscvar.h    Wed Oct 21 23:33:32 2009 +0000
+++ b/sys/arch/amiga/dev/cbiiscvar.h    Wed Oct 21 23:53:38 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cbiiscvar.h,v 1.3 2008/04/13 04:55:52 tsutsui Exp $    */
+/*     $NetBSD: cbiiscvar.h,v 1.4 2009/10/21 23:53:38 snj Exp $        */
 
 /*
  * Copyright (c) 1997 Michael L. Hitch.
@@ -12,12 +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 for the NetBSD Project
- *     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
diff -r d47707f66821 -r 2da6b2096413 sys/arch/amiga/dev/cbsc.c
--- a/sys/arch/amiga/dev/cbsc.c Wed Oct 21 23:33:32 2009 +0000
+++ b/sys/arch/amiga/dev/cbsc.c Wed Oct 21 23:53:38 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cbsc.c,v 1.28 2008/04/13 04:55:52 tsutsui Exp $ */
+/*     $NetBSD: cbsc.c,v 1.29 2009/10/21 23:53:38 snj Exp $ */
 
 /*
  * Copyright (c) 1997 Michael L. Hitch
@@ -13,11 +13,7 @@
  * 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 contains software written by Michael L. Hitch for
- *     the NetBSD project.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -36,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cbsc.c,v 1.28 2008/04/13 04:55:52 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cbsc.c,v 1.29 2009/10/21 23:53:38 snj Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff -r d47707f66821 -r 2da6b2096413 sys/arch/amiga/dev/cbscvar.h
--- a/sys/arch/amiga/dev/cbscvar.h      Wed Oct 21 23:33:32 2009 +0000
+++ b/sys/arch/amiga/dev/cbscvar.h      Wed Oct 21 23:53:38 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cbscvar.h,v 1.3 2008/04/13 04:55:52 tsutsui Exp $      */
+/*     $NetBSD: cbscvar.h,v 1.4 2009/10/21 23:53:38 snj Exp $  */
 
 /*
  * Copyright (c) 1997 Michael L. Hitch.
@@ -12,12 +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 for the NetBSD Project
- *     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
diff -r d47707f66821 -r 2da6b2096413 sys/arch/amiga/dev/flscvar.h
--- a/sys/arch/amiga/dev/flscvar.h      Wed Oct 21 23:33:32 2009 +0000
+++ b/sys/arch/amiga/dev/flscvar.h      Wed Oct 21 23:53:38 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: flscvar.h,v 1.6 2008/04/13 04:55:52 tsutsui Exp $      */
+/*     $NetBSD: flscvar.h,v 1.7 2009/10/21 23:53:38 snj Exp $  */
 
 /*
  * Copyright (c) 1997 Michael L. Hitch.
@@ -12,12 +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 for the NetBSD Project
- *     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
diff -r d47707f66821 -r 2da6b2096413 sys/arch/amiga/dev/if_es.c
--- a/sys/arch/amiga/dev/if_es.c        Wed Oct 21 23:33:32 2009 +0000
+++ b/sys/arch/amiga/dev/if_es.c        Wed Oct 21 23:53:38 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_es.c,v 1.46 2009/05/19 18:39:26 phx Exp $ */
+/*     $NetBSD: if_es.c,v 1.47 2009/10/21 23:53:38 snj Exp $ */
 
 /*
  * Copyright (c) 1995 Michael L. Hitch
@@ -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 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
@@ -38,7 +33,7 @@
 #include "opt_ns.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.46 2009/05/19 18:39:26 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.47 2009/10/21 23:53:38 snj Exp $");
 
 #include "bpfilter.h"
 
diff -r d47707f66821 -r 2da6b2096413 sys/arch/amiga/dev/if_esreg.h
--- a/sys/arch/amiga/dev/if_esreg.h     Wed Oct 21 23:33:32 2009 +0000
+++ b/sys/arch/amiga/dev/if_esreg.h     Wed Oct 21 23:53:38 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_esreg.h,v 1.6 2003/01/28 22:35:05 wiz Exp $ */
+/*     $NetBSD: if_esreg.h,v 1.7 2009/10/21 23:53:38 snj Exp $ */
 
 /*
  * Copyright (c) 1995 Michael L. Hitch
@@ -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 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
diff -r d47707f66821 -r 2da6b2096413 sys/arch/amiga/dev/siop2_script.ss
--- a/sys/arch/amiga/dev/siop2_script.ss        Wed Oct 21 23:33:32 2009 +0000
+++ b/sys/arch/amiga/dev/siop2_script.ss        Wed Oct 21 23:53:38 2009 +0000
@@ -1,4 +1,4 @@
-;      $NetBSD: siop2_script.ss,v 1.6 2005/12/11 12:16:28 christos Exp $
+;      $NetBSD: siop2_script.ss,v 1.7 2009/10/21 23:53:38 snj Exp $
 
 ;
 ; Copyright (c) 1998 Michael L. Hitch
@@ -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 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
diff -r d47707f66821 -r 2da6b2096413 sys/arch/amiga/dev/siop_script.ss
--- a/sys/arch/amiga/dev/siop_script.ss Wed Oct 21 23:33:32 2009 +0000
+++ b/sys/arch/amiga/dev/siop_script.ss Wed Oct 21 23:53:38 2009 +0000



Home | Main Index | Thread Index | Old Index