Source-Changes-HG archive

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

[src/trunk]: src/sys Remove clause 3 and 4 leftovers from TNF licenses in mor...



details:   https://anonhg.NetBSD.org/src/rev/407fb45f819d
branches:  trunk
changeset: 466230:407fb45f819d
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Dec 15 16:48:25 2019 +0000

description:
Remove clause 3 and 4 leftovers from TNF licenses in more sources.

Confirmed by martin@ in PR/54760.

diffstat:

 sys/arch/amigappc/include/intr.h                  |   9 +--------
 sys/arch/arm/at91/at91dbgu.c                      |  13 +++----------
 sys/arch/hpc/stand/hpcboot/arm/arm_pxa2x0_asm.asm |   9 +--------
 sys/arch/hpc/stand/hpcboot/arm/arm_sa1100_asm.asm |   9 +--------
 sys/arch/hpcarm/include/kloader.h                 |   9 +--------
 sys/arch/ia64/ia64/bus_space.c                    |  11 ++---------
 sys/arch/ia64/include/bus.h                       |   9 +--------
 sys/arch/mips/cavium/octeon_dma.c                 |  11 ++---------
 sys/arch/x68k/dev/intiovar.h                      |   8 +-------
 sys/arch/x68k/dev/mfp.c                           |  10 ++--------
 sys/arch/zaurus/include/kloader.h                 |   9 +--------
 sys/compat/common/kern_time_30.c                  |  11 ++---------
 sys/compat/common/sysv_msg_50.c                   |  11 ++---------
 sys/compat/common/sysv_sem_50.c                   |  11 ++---------
 sys/compat/common/sysv_shm_50.c                   |  11 ++---------
 sys/compat/common/uipc_syscalls_50.c              |   9 +--------
 sys/compat/common/vfs_syscalls_50.c               |  11 ++---------
 sys/compat/net/if.h                               |   9 +--------
 sys/compat/netbsd32/netbsd32_compat_16.c          |  11 ++---------
 sys/compat/netbsd32/netbsd32_compat_50.c          |  11 ++---------
 sys/compat/netbsd32/netbsd32_compat_50_sysv.c     |  11 ++---------
 sys/compat/netbsd32/netbsd32_compat_60.c          |  11 ++---------
 sys/compat/netinet6/in6_var.h                     |   9 +--------
 sys/compat/ultrix/ultrix_exec.h                   |   8 +-------
 sys/dev/ic/adv.c                                  |  11 ++---------
 sys/dev/ic/adv.h                                  |   9 +--------
 sys/dev/ic/advlib.c                               |  11 ++---------
 sys/dev/ic/advlib.h                               |   9 +--------
 sys/dev/ic/advmcode.c                             |  11 ++---------
 sys/dev/ic/advmcode.h                             |   9 +--------
 sys/dev/ic/adw.c                                  |  11 ++---------
 sys/dev/ic/adw.h                                  |   9 +--------
 sys/dev/ic/adwlib.c                               |  11 ++---------
 sys/dev/ic/adwlib.h                               |   9 +--------
 sys/dev/ic/adwmcode.c                             |  11 ++---------
 sys/dev/ic/adwmcode.h                             |   9 +--------
 sys/dev/raidframe/rf_compat50.c                   |   9 +--------
 sys/dev/raidframe/rf_compat50.h                   |   9 +--------
 sys/dev/usb/uberry.c                              |  11 ++---------
 sys/dev/usb/uipad.c                               |  11 ++---------
 40 files changed, 62 insertions(+), 339 deletions(-)

diffs (truncated from 1108 to 300 lines):

diff -r c02a63f84aba -r 407fb45f819d sys/arch/amigappc/include/intr.h
--- a/sys/arch/amigappc/include/intr.h  Sun Dec 15 16:44:27 2019 +0000
+++ b/sys/arch/amigappc/include/intr.h  Sun Dec 15 16:48:25 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.h,v 1.26 2011/06/19 08:00:56 matt Exp $   */
+/*     $NetBSD: intr.h,v 1.27 2019/12/15 16:48:25 tsutsui Exp $        */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -15,13 +15,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 the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff -r c02a63f84aba -r 407fb45f819d sys/arch/arm/at91/at91dbgu.c
--- a/sys/arch/arm/at91/at91dbgu.c      Sun Dec 15 16:44:27 2019 +0000
+++ b/sys/arch/arm/at91/at91dbgu.c      Sun Dec 15 16:48:25 2019 +0000
@@ -1,5 +1,5 @@
-/*     $Id: at91dbgu.c,v 1.16 2019/11/10 21:16:23 chs Exp $    */
-/*     $NetBSD: at91dbgu.c,v 1.16 2019/11/10 21:16:23 chs Exp $ */
+/*     $Id: at91dbgu.c,v 1.17 2019/12/15 16:48:25 tsutsui Exp $        */
+/*     $NetBSD: at91dbgu.c,v 1.17 2019/12/15 16:48:25 tsutsui Exp $ */
 
 /*
  *
@@ -26,13 +26,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 the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -83,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91dbgu.c,v 1.16 2019/11/10 21:16:23 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91dbgu.c,v 1.17 2019/12/15 16:48:25 tsutsui Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
diff -r c02a63f84aba -r 407fb45f819d sys/arch/hpc/stand/hpcboot/arm/arm_pxa2x0_asm.asm
--- a/sys/arch/hpc/stand/hpcboot/arm/arm_pxa2x0_asm.asm Sun Dec 15 16:44:27 2019 +0000
+++ b/sys/arch/hpc/stand/hpcboot/arm/arm_pxa2x0_asm.asm Sun Dec 15 16:48:25 2019 +0000
@@ -1,4 +1,4 @@
-;      $NetBSD: arm_pxa2x0_asm.asm,v 1.1 2010/04/06 16:20:28 nonaka Exp $      
+;      $NetBSD: arm_pxa2x0_asm.asm,v 1.2 2019/12/15 16:48:25 tsutsui Exp $     
 ;
 ; Copyright (c) 2001 The NetBSD Foundation, Inc.
 ; All rights reserved.
@@ -14,13 +14,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 the NetBSD
-;        Foundation, Inc. and its contributors.
-; 4. Neither the name of The NetBSD Foundation nor the names of its
-;    contributors may be used to endorse or promote products derived
-;    from this software without specific prior written permission.
 ;
 ; THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 ; ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff -r c02a63f84aba -r 407fb45f819d sys/arch/hpc/stand/hpcboot/arm/arm_sa1100_asm.asm
--- a/sys/arch/hpc/stand/hpcboot/arm/arm_sa1100_asm.asm Sun Dec 15 16:44:27 2019 +0000
+++ b/sys/arch/hpc/stand/hpcboot/arm/arm_sa1100_asm.asm Sun Dec 15 16:48:25 2019 +0000
@@ -1,4 +1,4 @@
-;      $NetBSD: arm_sa1100_asm.asm,v 1.1 2010/04/06 16:20:28 nonaka Exp $      
+;      $NetBSD: arm_sa1100_asm.asm,v 1.2 2019/12/15 16:48:25 tsutsui Exp $     
 ;
 ; Copyright (c) 2001 The NetBSD Foundation, Inc.
 ; All rights reserved.
@@ -14,13 +14,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 the NetBSD
-;        Foundation, Inc. and its contributors.
-; 4. Neither the name of The NetBSD Foundation nor the names of its
-;    contributors may be used to endorse or promote products derived
-;    from this software without specific prior written permission.
 ;
 ; THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 ; ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff -r c02a63f84aba -r 407fb45f819d sys/arch/hpcarm/include/kloader.h
--- a/sys/arch/hpcarm/include/kloader.h Sun Dec 15 16:44:27 2019 +0000
+++ b/sys/arch/hpcarm/include/kloader.h Sun Dec 15 16:48:25 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kloader.h,v 1.2 2015/06/11 08:14:38 matt Exp $ */
+/*     $NetBSD: kloader.h,v 1.3 2019/12/15 16:48:25 tsutsui Exp $      */
 
 /*-
  * Copyright (c) 2002, 2004 The NetBSD Foundation, Inc.
@@ -12,13 +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 the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff -r c02a63f84aba -r 407fb45f819d sys/arch/ia64/ia64/bus_space.c
--- a/sys/arch/ia64/ia64/bus_space.c    Sun Dec 15 16:44:27 2019 +0000
+++ b/sys/arch/ia64/ia64/bus_space.c    Sun Dec 15 16:48:25 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_space.c,v 1.1 2009/07/20 04:41:36 kiyohara Exp $   */
+/*     $NetBSD: bus_space.c,v 1.2 2019/12/15 16:48:26 tsutsui Exp $    */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -16,13 +16,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 the NetBSD
- *     Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -38,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.1 2009/07/20 04:41:36 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.2 2019/12/15 16:48:26 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r c02a63f84aba -r 407fb45f819d sys/arch/ia64/include/bus.h
--- a/sys/arch/ia64/include/bus.h       Sun Dec 15 16:44:27 2019 +0000
+++ b/sys/arch/ia64/include/bus.h       Sun Dec 15 16:48:25 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus.h,v 1.3 2019/09/23 16:17:56 skrll Exp $    */
+/*     $NetBSD: bus.h,v 1.4 2019/12/15 16:48:26 tsutsui Exp $  */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -16,13 +16,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 the NetBSD
- *     Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff -r c02a63f84aba -r 407fb45f819d sys/arch/mips/cavium/octeon_dma.c
--- a/sys/arch/mips/cavium/octeon_dma.c Sun Dec 15 16:44:27 2019 +0000
+++ b/sys/arch/mips/cavium/octeon_dma.c Sun Dec 15 16:48:25 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: octeon_dma.c,v 1.2 2016/07/11 16:15:35 matt Exp $      */
+/*     $NetBSD: octeon_dma.c,v 1.3 2019/12/15 16:48:26 tsutsui Exp $   */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -15,13 +15,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 the NetBSD
- *     Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -41,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_dma.c,v 1.2 2016/07/11 16:15:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_dma.c,v 1.3 2019/12/15 16:48:26 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r c02a63f84aba -r 407fb45f819d sys/arch/x68k/dev/intiovar.h
--- a/sys/arch/x68k/dev/intiovar.h      Sun Dec 15 16:44:27 2019 +0000
+++ b/sys/arch/x68k/dev/intiovar.h      Sun Dec 15 16:48:25 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intiovar.h,v 1.14 2013/01/22 11:58:39 isaki Exp $      */
+/*     $NetBSD: intiovar.h,v 1.15 2019/12/15 16:48:26 tsutsui Exp $    */
 
 /*
  *
@@ -13,12 +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 the NetBSD
- *        Foundation, Inc. and its contributors.
- * 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff -r c02a63f84aba -r 407fb45f819d sys/arch/x68k/dev/mfp.c
--- a/sys/arch/x68k/dev/mfp.c   Sun Dec 15 16:44:27 2019 +0000
+++ b/sys/arch/x68k/dev/mfp.c   Sun Dec 15 16:48:25 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mfp.c,v 1.26 2014/03/26 08:17:59 christos Exp $        */
+/*     $NetBSD: mfp.c,v 1.27 2019/12/15 16:48:26 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 1998 NetBSD Foundation, Inc.
@@ -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 by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -42,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfp.c,v 1.26 2014/03/26 08:17:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfp.c,v 1.27 2019/12/15 16:48:26 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r c02a63f84aba -r 407fb45f819d sys/arch/zaurus/include/kloader.h
--- a/sys/arch/zaurus/include/kloader.h Sun Dec 15 16:44:27 2019 +0000
+++ b/sys/arch/zaurus/include/kloader.h Sun Dec 15 16:48:25 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kloader.h,v 1.2 2015/06/11 15:11:14 matt Exp $ */
+/*     $NetBSD: kloader.h,v 1.3 2019/12/15 16:48:26 tsutsui Exp $      */
 
 /*-
  * Copyright (c) 2002, 2004 The NetBSD Foundation, Inc.
@@ -12,13 +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 the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff -r c02a63f84aba -r 407fb45f819d sys/compat/common/kern_time_30.c
--- a/sys/compat/common/kern_time_30.c  Sun Dec 15 16:44:27 2019 +0000
+++ b/sys/compat/common/kern_time_30.c  Sun Dec 15 16:48:25 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_time_30.c,v 1.7 2019/01/27 02:08:39 pgoyette Exp $        */
+/*     $NetBSD: kern_time_30.c,v 1.8 2019/12/15 16:48:26 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright



Home | Main Index | Thread Index | Old Index