[src/trunk]: src Switch files copyright Reinoud Zandijk from BSD 4 clause to ...

[maya <maya%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b2aa6a6b5f88
branches:  trunk
changeset: 460316:b2aa6a6b5f88
user:      maya <maya%NetBSD.org@localhost>
date:      Wed Oct 16 21:52:22 2019 +0000

description:
Switch files copyright Reinoud Zandijk from BSD 4 clause to BSD 2 clause.

OK'd by reinoud in email (from 4 Feb 2019).

diffstat:

 sbin/mount_nilfs/mount_nilfs.8 |   9 +--------
 sbin/mount_nilfs/mount_nilfs.c |  11 ++---------
 sbin/mount_udf/mount_udf.8     |   9 +--------
 sbin/mount_udf/mount_udf.c     |  11 ++---------
 sys/arch/arm/iomd/qms.c        |  11 ++---------
 sys/dev/pci/auixp.c            |  11 ++---------
 sys/dev/pci/auixpreg.h         |   9 +--------
 sys/dev/pci/auixpvar.h         |   9 +--------
 sys/fs/nilfs/nilfs_mount.h     |   9 +--------
 sys/fs/udf/udf_mount.h         |   9 +--------
 10 files changed, 14 insertions(+), 84 deletions(-)

diffs (266 lines):

diff -r 1691ea22e0b4 -r b2aa6a6b5f88 sbin/mount_nilfs/mount_nilfs.8
--- a/sbin/mount_nilfs/mount_nilfs.8    Wed Oct 16 20:49:59 2019 +0000
+++ b/sbin/mount_nilfs/mount_nilfs.8    Wed Oct 16 21:52:22 2019 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: mount_nilfs.8,v 1.4 2016/06/01 12:01:21 wiz Exp $
+.\" $NetBSD: mount_nilfs.8,v 1.5 2019/10/16 21:52:22 maya Exp $
 .\"
 .\" Copyright (c) 2008, 2009 Reinoud Zandijk
 .\" All rights reserved.
@@ -11,13 +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 for the
-.\"          NetBSD Project.  See http://www.NetBSD.org/ for
-.\"          information about NetBSD.
-.\" 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 1691ea22e0b4 -r b2aa6a6b5f88 sbin/mount_nilfs/mount_nilfs.c
--- a/sbin/mount_nilfs/mount_nilfs.c    Wed Oct 16 20:49:59 2019 +0000
+++ b/sbin/mount_nilfs/mount_nilfs.c    Wed Oct 16 21:52:22 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mount_nilfs.c,v 1.3 2016/02/21 22:51:29 christos Exp $ */
+/* $NetBSD: mount_nilfs.c,v 1.4 2019/10/16 21:52:22 maya Exp $ */
 
 /*
  * Copyright (c) 2008, 2009 Reinoud Zandijk
@@ -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 for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 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
@@ -36,7 +29,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mount_nilfs.c,v 1.3 2016/02/21 22:51:29 christos Exp $");
+__RCSID("$NetBSD: mount_nilfs.c,v 1.4 2019/10/16 21:52:22 maya Exp $");
 #endif /* not lint */
 
 
diff -r 1691ea22e0b4 -r b2aa6a6b5f88 sbin/mount_udf/mount_udf.8
--- a/sbin/mount_udf/mount_udf.8        Wed Oct 16 20:49:59 2019 +0000
+++ b/sbin/mount_udf/mount_udf.8        Wed Oct 16 21:52:22 2019 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: mount_udf.8,v 1.13 2016/09/12 02:45:07 sevan Exp $
+.\" $NetBSD: mount_udf.8,v 1.14 2019/10/16 21:52:22 maya Exp $
 .\"
 .\" Copyright (c) 2006, 2008 Reinoud Zandijk
 .\" All rights reserved.
@@ -11,13 +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 for the
-.\"          NetBSD Project.  See http://www.NetBSD.org/ for
-.\"          information about NetBSD.
-.\" 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 1691ea22e0b4 -r b2aa6a6b5f88 sbin/mount_udf/mount_udf.c
--- a/sbin/mount_udf/mount_udf.c        Wed Oct 16 20:49:59 2019 +0000
+++ b/sbin/mount_udf/mount_udf.c        Wed Oct 16 21:52:22 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mount_udf.c,v 1.14 2016/02/21 22:51:30 christos Exp $ */
+/* $NetBSD: mount_udf.c,v 1.15 2019/10/16 21:52:22 maya Exp $ */
 
 /*
  * Copyright (c) 2006 Reinoud Zandijk
@@ -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 for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 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
@@ -36,7 +29,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mount_udf.c,v 1.14 2016/02/21 22:51:30 christos Exp $");
+__RCSID("$NetBSD: mount_udf.c,v 1.15 2019/10/16 21:52:22 maya Exp $");
 #endif /* not lint */
 
 
diff -r 1691ea22e0b4 -r b2aa6a6b5f88 sys/arch/arm/iomd/qms.c
--- a/sys/arch/arm/iomd/qms.c   Wed Oct 16 20:49:59 2019 +0000
+++ b/sys/arch/arm/iomd/qms.c   Wed Oct 16 21:52:22 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: qms.c,v 1.18 2012/05/14 10:38:08 skrll Exp $   */
+/*     $NetBSD: qms.c,v 1.19 2019/10/16 21:52:22 maya Exp $    */
 
 /*-
  * Copyright (c) 2001 Reinoud Zandijk
@@ -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/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: qms.c,v 1.18 2012/05/14 10:38:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qms.c,v 1.19 2019/10/16 21:52:22 maya Exp $");
 
 #include <sys/callout.h>
 #include <sys/device.h>
diff -r 1691ea22e0b4 -r b2aa6a6b5f88 sys/dev/pci/auixp.c
--- a/sys/dev/pci/auixp.c       Wed Oct 16 20:49:59 2019 +0000
+++ b/sys/dev/pci/auixp.c       Wed Oct 16 21:52:22 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auixp.c,v 1.47 2019/06/08 08:02:38 isaki Exp $ */
+/* $NetBSD: auixp.c,v 1.48 2019/10/16 21:52:22 maya Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Reinoud Zandijk <reinoud%netbsd.org@localhost>
@@ -11,13 +11,6 @@
  *    notice, this list of conditions and the following disclaimer.
  * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
- * 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 AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -50,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.47 2019/06/08 08:02:38 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.48 2019/10/16 21:52:22 maya Exp $");
 
 #include <sys/types.h>
 #include <sys/errno.h>
diff -r 1691ea22e0b4 -r b2aa6a6b5f88 sys/dev/pci/auixpreg.h
--- a/sys/dev/pci/auixpreg.h    Wed Oct 16 20:49:59 2019 +0000
+++ b/sys/dev/pci/auixpreg.h    Wed Oct 16 21:52:22 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auixpreg.h,v 1.3 2005/12/11 12:22:48 christos Exp $ */
+/* $NetBSD: auixpreg.h,v 1.4 2019/10/16 21:52:22 maya Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Reinoud Zandijk <reinoud%netbsd.org@localhost>
@@ -11,13 +11,6 @@
  *    notice, this list of conditions and the following disclaimer.
  * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
- * 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 AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff -r 1691ea22e0b4 -r b2aa6a6b5f88 sys/dev/pci/auixpvar.h
--- a/sys/dev/pci/auixpvar.h    Wed Oct 16 20:49:59 2019 +0000
+++ b/sys/dev/pci/auixpvar.h    Wed Oct 16 21:52:22 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auixpvar.h,v 1.9 2019/05/08 13:40:18 isaki Exp $*/
+/* $NetBSD: auixpvar.h,v 1.10 2019/10/16 21:52:22 maya Exp $*/
 
 /*
  * Copyright (c) 2004, 2005 Reinoud Zandijk <reinoud%netbsd.org@localhost>
@@ -11,13 +11,6 @@
  *    notice, this list of conditions and the following disclaimer.
  * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
- * 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 AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff -r 1691ea22e0b4 -r b2aa6a6b5f88 sys/fs/nilfs/nilfs_mount.h
--- a/sys/fs/nilfs/nilfs_mount.h        Wed Oct 16 20:49:59 2019 +0000
+++ b/sys/fs/nilfs/nilfs_mount.h        Wed Oct 16 21:52:22 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nilfs_mount.h,v 1.1 2009/07/18 16:31:42 reinoud Exp $ */
+/* $NetBSD: nilfs_mount.h,v 1.2 2019/10/16 21:52:22 maya Exp $ */
 
 /*
  * Copyright (c) 2008, 2009 Reinoud Zandijk
@@ -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 for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 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 1691ea22e0b4 -r b2aa6a6b5f88 sys/fs/udf/udf_mount.h
--- a/sys/fs/udf/udf_mount.h    Wed Oct 16 20:49:59 2019 +0000
+++ b/sys/fs/udf/udf_mount.h    Wed Oct 16 21:52:22 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_mount.h,v 1.3 2006/02/02 15:52:23 reinoud Exp $ */
+/* $NetBSD: udf_mount.h,v 1.4 2019/10/16 21:52:22 maya Exp $ */
 
 /*
  * Copyright (c) 2006 Reinoud Zandijk
@@ -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 for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 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