Source-Changes-HG archive

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

[src/trunk]: src/sys udpate license clauses on my code to match the new-style...



details:   https://anonhg.NetBSD.org/src/rev/16205d1445bb
branches:  trunk
changeset: 761620:16205d1445bb
user:      chuck <chuck%NetBSD.org@localhost>
date:      Wed Feb 02 17:53:41 2011 +0000

description:
udpate license clauses on my code to match the new-style BSD licenses.
based on diff that rmind@ sent me.

no functional change with this commit.

diffstat:

 sys/arch/mvme68k/stand/sboot/console.c  |   9 +--------
 sys/arch/mvme68k/stand/sboot/etherfun.c |   9 +--------
 sys/arch/mvme68k/stand/sboot/etherfun.h |   9 +--------
 sys/arch/mvme68k/stand/sboot/sboot.c    |   9 +--------
 sys/arch/mvme68k/stand/sboot/sboot.h    |   9 +--------
 sys/uvm/uvm.h                           |  28 +---------------------------
 sys/uvm/uvm_page.c                      |  30 ++----------------------------
 7 files changed, 8 insertions(+), 95 deletions(-)

diffs (204 lines):

diff -r 3ebf7eaa85d1 -r 16205d1445bb sys/arch/mvme68k/stand/sboot/console.c
--- a/sys/arch/mvme68k/stand/sboot/console.c    Wed Feb 02 16:37:27 2011 +0000
+++ b/sys/arch/mvme68k/stand/sboot/console.c    Wed Feb 02 17:53:41 2011 +0000
@@ -1,7 +1,6 @@
-/*     $NetBSD: console.c,v 1.6 2008/01/12 09:54:33 tsutsui Exp $      */
+/*     $NetBSD: console.c,v 1.7 2011/02/02 17:53:41 chuck Exp $        */
 
 /*
- *
  * Copyright (c) 1995 Charles D. Cranor and Seth Widoff
  * All rights reserved.
  *
@@ -13,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 by Charles D. Cranor
- *     and Seth Widoff.
- * 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 3ebf7eaa85d1 -r 16205d1445bb sys/arch/mvme68k/stand/sboot/etherfun.c
--- a/sys/arch/mvme68k/stand/sboot/etherfun.c   Wed Feb 02 16:37:27 2011 +0000
+++ b/sys/arch/mvme68k/stand/sboot/etherfun.c   Wed Feb 02 17:53:41 2011 +0000
@@ -1,7 +1,6 @@
-/*     $NetBSD: etherfun.c,v 1.9 2008/01/12 09:54:33 tsutsui Exp $     */
+/*     $NetBSD: etherfun.c,v 1.10 2011/02/02 17:53:41 chuck Exp $      */
 
 /*
- *
  * Copyright (c) 1995 Charles D. Cranor and Seth Widoff
  * All rights reserved.
  *
@@ -13,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 by Charles D. Cranor
- *     and Seth Widoff.
- * 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 3ebf7eaa85d1 -r 16205d1445bb sys/arch/mvme68k/stand/sboot/etherfun.h
--- a/sys/arch/mvme68k/stand/sboot/etherfun.h   Wed Feb 02 16:37:27 2011 +0000
+++ b/sys/arch/mvme68k/stand/sboot/etherfun.h   Wed Feb 02 17:53:41 2011 +0000
@@ -1,7 +1,6 @@
-/*     $NetBSD: etherfun.h,v 1.4 2008/01/12 09:54:33 tsutsui Exp $     */
+/*     $NetBSD: etherfun.h,v 1.5 2011/02/02 17:53:41 chuck Exp $       */
 
 /*
- *
  * Copyright (c) 1995 Charles D. Cranor and Seth Widoff
  * All rights reserved.
  *
@@ -13,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 by Charles D. Cranor
- *     and Seth Widoff.
- * 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 3ebf7eaa85d1 -r 16205d1445bb sys/arch/mvme68k/stand/sboot/sboot.c
--- a/sys/arch/mvme68k/stand/sboot/sboot.c      Wed Feb 02 16:37:27 2011 +0000
+++ b/sys/arch/mvme68k/stand/sboot/sboot.c      Wed Feb 02 17:53:41 2011 +0000
@@ -1,7 +1,6 @@
-/*     $NetBSD: sboot.c,v 1.6 2008/01/12 09:54:33 tsutsui Exp $        */
+/*     $NetBSD: sboot.c,v 1.7 2011/02/02 17:53:41 chuck Exp $  */
 
 /*
- *
  * Copyright (c) 1995 Charles D. Cranor and Seth Widoff
  * All rights reserved.
  *
@@ -13,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 by Charles D. Cranor
- *     and Seth Widoff.
- * 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 3ebf7eaa85d1 -r 16205d1445bb sys/arch/mvme68k/stand/sboot/sboot.h
--- a/sys/arch/mvme68k/stand/sboot/sboot.h      Wed Feb 02 16:37:27 2011 +0000
+++ b/sys/arch/mvme68k/stand/sboot/sboot.h      Wed Feb 02 17:53:41 2011 +0000
@@ -1,7 +1,6 @@
-/*     $NetBSD: sboot.h,v 1.6 2007/03/04 06:00:24 christos Exp $       */
+/*     $NetBSD: sboot.h,v 1.7 2011/02/02 17:53:41 chuck Exp $  */
 
 /*
- *
  * Copyright (c) 1995 Charles D. Cranor and Seth Widoff
  * All rights reserved.
  *
@@ -13,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 by Charles D. Cranor
- *     and Seth Widoff.
- * 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 3ebf7eaa85d1 -r 16205d1445bb sys/uvm/uvm.h
--- a/sys/uvm/uvm.h     Wed Feb 02 16:37:27 2011 +0000
+++ b/sys/uvm/uvm.h     Wed Feb 02 17:53:41 2011 +0000
@@ -1,30 +1,4 @@
-/*     $NetBSD: uvm.h,v 1.60 2011/02/02 15:13:33 chuck Exp $   */
-
-/*
- * Copyright (c) 2010 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
+/*     $NetBSD: uvm.h,v 1.61 2011/02/02 17:53:42 chuck Exp $   */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
diff -r 3ebf7eaa85d1 -r 16205d1445bb sys/uvm/uvm_page.c
--- a/sys/uvm/uvm_page.c        Wed Feb 02 16:37:27 2011 +0000
+++ b/sys/uvm/uvm_page.c        Wed Feb 02 17:53:41 2011 +0000
@@ -1,30 +1,4 @@
-/*     $NetBSD: uvm_page.c,v 1.170 2011/02/02 15:25:27 chuck Exp $     */
-
-/*
- * Copyright (c) 2010 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
+/*     $NetBSD: uvm_page.c,v 1.171 2011/02/02 17:53:42 chuck Exp $     */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -92,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.170 2011/02/02 15:25:27 chuck Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.171 2011/02/02 17:53:42 chuck Exp $");
 
 #include "opt_ddb.h"
 #include "opt_uvmhist.h"



Home | Main Index | Thread Index | Old Index