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/6377770da8fe
branches:  trunk
changeset: 761576:6377770da8fe
user:      chuck <chuck%NetBSD.org@localhost>
date:      Tue Feb 01 19:40:24 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/net/if_atm.h         |   9 +--------
 sys/net/if_atmsubr.c     |  11 ++---------
 sys/netinet/if_atm.c     |  11 ++---------
 sys/netinet/if_atm.h     |   9 +--------
 sys/netnatm/natm.c       |  11 ++---------
 sys/netnatm/natm.h       |   9 +--------
 sys/netnatm/natm_pcb.c   |  11 ++---------
 sys/netnatm/natm_proto.c |  11 ++---------
 8 files changed, 13 insertions(+), 69 deletions(-)

diffs (245 lines):

diff -r 4a3ec185cf7c -r 6377770da8fe sys/net/if_atm.h
--- a/sys/net/if_atm.h  Tue Feb 01 19:37:37 2011 +0000
+++ b/sys/net/if_atm.h  Tue Feb 01 19:40:24 2011 +0000
@@ -1,7 +1,6 @@
-/*      $NetBSD: if_atm.h,v 1.18 2008/02/20 17:05:52 matt Exp $       */
+/*      $NetBSD: if_atm.h,v 1.19 2011/02/01 19:46:28 chuck Exp $       */
 
 /*
- *
  * Copyright (c) 1996 Charles D. Cranor and Washington University.
  * 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
- *     Washington University.
- * 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 4a3ec185cf7c -r 6377770da8fe sys/net/if_atmsubr.c
--- a/sys/net/if_atmsubr.c      Tue Feb 01 19:37:37 2011 +0000
+++ b/sys/net/if_atmsubr.c      Tue Feb 01 19:40:24 2011 +0000
@@ -1,7 +1,6 @@
-/*      $NetBSD: if_atmsubr.c,v 1.48 2010/04/05 07:22:22 joerg Exp $       */
+/*      $NetBSD: if_atmsubr.c,v 1.49 2011/02/01 19:46:28 chuck Exp $       */
 
 /*
- *
  * Copyright (c) 1996 Charles D. Cranor and Washington University.
  * 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
- *     Washington University.
- * 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
@@ -37,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atmsubr.c,v 1.48 2010/04/05 07:22:22 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atmsubr.c,v 1.49 2011/02/01 19:46:28 chuck Exp $");
 
 #include "opt_inet.h"
 #include "opt_gateway.h"
diff -r 4a3ec185cf7c -r 6377770da8fe sys/netinet/if_atm.c
--- a/sys/netinet/if_atm.c      Tue Feb 01 19:37:37 2011 +0000
+++ b/sys/netinet/if_atm.c      Tue Feb 01 19:40:24 2011 +0000
@@ -1,7 +1,6 @@
-/*      $NetBSD: if_atm.c,v 1.31 2009/04/18 14:58:05 tsutsui Exp $       */
+/*      $NetBSD: if_atm.c,v 1.32 2011/02/01 19:43:12 chuck Exp $       */
 
 /*
- *
  * Copyright (c) 1996 Charles D. Cranor and Washington University.
  * 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
- *      Washington University.
- * 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
@@ -37,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atm.c,v 1.31 2009/04/18 14:58:05 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atm.c,v 1.32 2011/02/01 19:43:12 chuck Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff -r 4a3ec185cf7c -r 6377770da8fe sys/netinet/if_atm.h
--- a/sys/netinet/if_atm.h      Tue Feb 01 19:37:37 2011 +0000
+++ b/sys/netinet/if_atm.h      Tue Feb 01 19:40:24 2011 +0000
@@ -1,7 +1,6 @@
-/*      $NetBSD: if_atm.h,v 1.11 2008/10/24 17:07:33 dyoung Exp $       */
+/*      $NetBSD: if_atm.h,v 1.12 2011/02/01 19:43:12 chuck Exp $       */
 
 /*
- *
  * Copyright (c) 1996 Charles D. Cranor and Washington University.
  * 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
- *      Washington University.
- * 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 4a3ec185cf7c -r 6377770da8fe sys/netnatm/natm.c
--- a/sys/netnatm/natm.c        Tue Feb 01 19:37:37 2011 +0000
+++ b/sys/netnatm/natm.c        Tue Feb 01 19:40:24 2011 +0000
@@ -1,7 +1,6 @@
-/*     $NetBSD: natm.c,v 1.22 2009/04/18 14:58:06 tsutsui Exp $        */
+/*     $NetBSD: natm.c,v 1.23 2011/02/01 19:40:24 chuck Exp $  */
 
 /*
- *
  * Copyright (c) 1996 Charles D. Cranor and Washington University.
  * 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
- *      Washington University.
- * 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
@@ -37,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: natm.c,v 1.22 2009/04/18 14:58:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: natm.c,v 1.23 2011/02/01 19:40:24 chuck Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 4a3ec185cf7c -r 6377770da8fe sys/netnatm/natm.h
--- a/sys/netnatm/natm.h        Tue Feb 01 19:37:37 2011 +0000
+++ b/sys/netnatm/natm.h        Tue Feb 01 19:40:24 2011 +0000
@@ -1,7 +1,6 @@
-/*     $NetBSD: natm.h,v 1.10 2009/03/14 14:46:11 dsl Exp $    */
+/*     $NetBSD: natm.h,v 1.11 2011/02/01 19:40:24 chuck Exp $  */
 
 /*
- *
  * Copyright (c) 1996 Charles D. Cranor and Washington University.
  * 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
- *      Washington University.
- * 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 4a3ec185cf7c -r 6377770da8fe sys/netnatm/natm_pcb.c
--- a/sys/netnatm/natm_pcb.c    Tue Feb 01 19:37:37 2011 +0000
+++ b/sys/netnatm/natm_pcb.c    Tue Feb 01 19:40:24 2011 +0000
@@ -1,7 +1,6 @@
-/*     $NetBSD: natm_pcb.c,v 1.13 2009/03/18 16:00:24 cegger Exp $     */
+/*     $NetBSD: natm_pcb.c,v 1.14 2011/02/01 19:40:24 chuck Exp $      */
 
 /*
- *
  * Copyright (c) 1996 Charles D. Cranor and Washington University.
  * 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
- *      Washington University.
- * 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 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: natm_pcb.c,v 1.13 2009/03/18 16:00:24 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: natm_pcb.c,v 1.14 2011/02/01 19:40:24 chuck Exp $");
 
 #include "opt_ddb.h"
 
diff -r 4a3ec185cf7c -r 6377770da8fe sys/netnatm/natm_proto.c
--- a/sys/netnatm/natm_proto.c  Tue Feb 01 19:37:37 2011 +0000
+++ b/sys/netnatm/natm_proto.c  Tue Feb 01 19:40:24 2011 +0000
@@ -1,7 +1,6 @@
-/*     $NetBSD: natm_proto.c,v 1.13 2008/04/24 11:38:39 ad Exp $       */
+/*     $NetBSD: natm_proto.c,v 1.14 2011/02/01 19:40:24 chuck Exp $    */
 
 /*
- *
  * Copyright (c) 1996 Charles D. Cranor and Washington University.
  * 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
- *      Washington University.
- * 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
@@ -37,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: natm_proto.c,v 1.13 2008/04/24 11:38:39 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: natm_proto.c,v 1.14 2011/02/01 19:40:24 chuck Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>



Home | Main Index | Thread Index | Old Index