From 8e0491f90a9cd0a09d7d26ab891491faff95acd6 Mon Sep 17 00:00:00 2001 From: ray <> Date: Thu, 26 Jun 2008 05:42:05 +0000 Subject: [PATCH] First pass at removing clauses 3 and 4 from NetBSD licenses. Not sure what's more surprising: how long it took for NetBSD to catch up to the rest of the BSDs (including UCB), or the amount of code that NetBSD has claimed for itself without attributing to the actual authors. OK deraadt@ --- src/include/cpio.h | 9 +-------- src/include/getopt.h | 9 +-------- src/include/nl_types.h | 9 +-------- src/include/re_comp.h | 9 +-------- src/include/tar.h | 9 +-------- src/include/wchar.h | 9 +-------- src/lib/libc/stdlib/hcreate.3 | 11 ++--------- src/lib/libutil/getmaxpartitions.3 | 11 ++--------- src/lib/libutil/getmaxpartitions.c | 9 +-------- src/lib/libutil/getrawpartition.3 | 11 ++--------- src/lib/libutil/getrawpartition.c | 9 +-------- src/lib/libutil/opendisk.3 | 11 ++--------- src/lib/libutil/opendisk.c | 9 +-------- src/lib/libutil/pidfile.3 | 11 ++--------- src/lib/libutil/pidfile.c | 9 +-------- 15 files changed, 20 insertions(+), 125 deletions(-) diff --git a/src/include/cpio.h b/src/include/cpio.h index e2fab709..c38d59fa 100644 --- a/src/include/cpio.h +++ b/src/include/cpio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpio.h,v 1.2 1997/09/21 10:45:27 niklas Exp $ */ +/* $OpenBSD: cpio.h,v 1.3 2008/06/26 05:42:04 ray Exp $ */ /* $NetBSD: cpio.h,v 1.1 1996/02/05 22:34:11 jtc Exp $ */ /*- @@ -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 --git a/src/include/getopt.h b/src/include/getopt.h index 6b4954b5..0311b078 100644 --- a/src/include/getopt.h +++ b/src/include/getopt.h @@ -1,4 +1,4 @@ -/* $OpenBSD: getopt.h,v 1.1 2002/12/03 20:24:29 millert Exp $ */ +/* $OpenBSD: getopt.h,v 1.2 2008/06/26 05:42:04 ray Exp $ */ /* $NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $ */ /*- @@ -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 --git a/src/include/nl_types.h b/src/include/nl_types.h index 56179b14..5d03c06c 100644 --- a/src/include/nl_types.h +++ b/src/include/nl_types.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nl_types.h,v 1.7 2002/02/16 21:27:17 millert Exp $ */ +/* $OpenBSD: nl_types.h,v 1.8 2008/06/26 05:42:04 ray Exp $ */ /* $NetBSD: nl_types.h,v 1.6 1996/05/13 23:11:15 jtc Exp $ */ /*- @@ -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 --git a/src/include/re_comp.h b/src/include/re_comp.h index 58b9c3cc..3e4d7c51 100644 --- a/src/include/re_comp.h +++ b/src/include/re_comp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: re_comp.h,v 1.3 2002/02/16 21:27:17 millert Exp $ */ +/* $OpenBSD: re_comp.h,v 1.4 2008/06/26 05:42:04 ray Exp $ */ /* $NetBSD: re_comp.h,v 1.1 1996/02/05 22:34:12 jtc Exp $ */ /*- @@ -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 --git a/src/include/tar.h b/src/include/tar.h index f0c91202..17f51245 100644 --- a/src/include/tar.h +++ b/src/include/tar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tar.h,v 1.2 1997/09/21 10:45:57 niklas Exp $ */ +/* $OpenBSD: tar.h,v 1.3 2008/06/26 05:42:04 ray Exp $ */ /* $NetBSD: tar.h,v 1.1 1996/02/05 22:34:13 jtc Exp $ */ /*- @@ -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 --git a/src/include/wchar.h b/src/include/wchar.h index 90dbce5d..8a2397f6 100644 --- a/src/include/wchar.h +++ b/src/include/wchar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wchar.h,v 1.8 2006/01/06 18:53:04 millert Exp $ */ +/* $OpenBSD: wchar.h,v 1.9 2008/06/26 05:42:04 ray Exp $ */ /* $NetBSD: wchar.h,v 1.16 2003/03/07 07:11:35 tshiozak Exp $ */ /*- @@ -42,13 +42,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 --git a/src/lib/libc/stdlib/hcreate.3 b/src/lib/libc/stdlib/hcreate.3 index 17d5d8f4..4ff17a08 100644 --- a/src/lib/libc/stdlib/hcreate.3 +++ b/src/lib/libc/stdlib/hcreate.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: hcreate.3,v 1.4 2007/05/31 19:19:31 jmc Exp $ +.\" $OpenBSD: hcreate.3,v 1.5 2008/06/26 05:42:05 ray Exp $ .\" $NetBSD: hcreate.3,v 1.6 2003/04/16 13:34:46 wiz Exp $ .\" .\" Copyright (c) 1999 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 @@ -35,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: June 26 2008 $ .Dt HCREATE 3 .Os .Sh NAME diff --git a/src/lib/libutil/getmaxpartitions.3 b/src/lib/libutil/getmaxpartitions.3 index 4e93a45d..535b03dd 100644 --- a/src/lib/libutil/getmaxpartitions.3 +++ b/src/lib/libutil/getmaxpartitions.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: getmaxpartitions.3,v 1.4 2007/05/31 19:19:38 jmc Exp $ +.\" $OpenBSD: getmaxpartitions.3,v 1.5 2008/06/26 05:42:05 ray Exp $ .\" $NetBSD: getmaxpartitions.3,v 1.1 1996/05/16 07:03:30 thorpej Exp $ .\" .\" Copyright (c) 1996 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 @@ -35,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: June 26 2008 $ .Dt GETMAXPARTITIONS 3 .Os .Sh NAME diff --git a/src/lib/libutil/getmaxpartitions.c b/src/lib/libutil/getmaxpartitions.c index 99cca80a..b06b8b57 100644 --- a/src/lib/libutil/getmaxpartitions.c +++ b/src/lib/libutil/getmaxpartitions.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getmaxpartitions.c,v 1.6 2006/04/02 02:10:35 deraadt Exp $ */ +/* $OpenBSD: getmaxpartitions.c,v 1.7 2008/06/26 05:42:05 ray Exp $ */ /* $NetBSD: getmaxpartitions.c,v 1.1 1996/05/16 07:03:31 thorpej Exp $ */ /*- @@ -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 --git a/src/lib/libutil/getrawpartition.3 b/src/lib/libutil/getrawpartition.3 index ead2908f..6003661d 100644 --- a/src/lib/libutil/getrawpartition.3 +++ b/src/lib/libutil/getrawpartition.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: getrawpartition.3,v 1.5 2007/05/31 19:19:38 jmc Exp $ +.\" $OpenBSD: getrawpartition.3,v 1.6 2008/06/26 05:42:05 ray Exp $ .\" $NetBSD: getrawpartition.3,v 1.1 1996/05/16 07:03:32 thorpej Exp $ .\" .\" Copyright (c) 1996 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 @@ -35,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: June 26 2008 $ .Dt GETRAWPARTITION 3 .Os .Sh NAME diff --git a/src/lib/libutil/getrawpartition.c b/src/lib/libutil/getrawpartition.c index 6543b35b..363cec9a 100644 --- a/src/lib/libutil/getrawpartition.c +++ b/src/lib/libutil/getrawpartition.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getrawpartition.c,v 1.6 2006/04/02 02:10:35 deraadt Exp $ */ +/* $OpenBSD: getrawpartition.c,v 1.7 2008/06/26 05:42:05 ray Exp $ */ /* $NetBSD: getrawpartition.c,v 1.1 1996/05/16 07:03:33 thorpej Exp $ */ /*- @@ -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 --git a/src/lib/libutil/opendisk.3 b/src/lib/libutil/opendisk.3 index 3f7ca851..29b5d490 100644 --- a/src/lib/libutil/opendisk.3 +++ b/src/lib/libutil/opendisk.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: opendisk.3,v 1.4 2007/05/31 19:19:38 jmc Exp $ +.\" $OpenBSD: opendisk.3,v 1.5 2008/06/26 05:42:05 ray Exp $ .\" $NetBSD: opendisk.3,v 1.4 1999/07/02 15:49:12 simonb 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 @@ -35,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: June 26 2008 $ .Dt OPENDISK 3 .Os .Sh NAME diff --git a/src/lib/libutil/opendisk.c b/src/lib/libutil/opendisk.c index f253b432..62178b42 100644 --- a/src/lib/libutil/opendisk.c +++ b/src/lib/libutil/opendisk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: opendisk.c,v 1.4 2005/10/19 18:48:11 deraadt Exp $ */ +/* $OpenBSD: opendisk.c,v 1.5 2008/06/26 05:42:05 ray Exp $ */ /* $NetBSD: opendisk.c,v 1.4 1997/09/30 17:13:50 phil Exp $ */ /*- @@ -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 --git a/src/lib/libutil/pidfile.3 b/src/lib/libutil/pidfile.3 index 74936922..856ea661 100644 --- a/src/lib/libutil/pidfile.3 +++ b/src/lib/libutil/pidfile.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pidfile.3,v 1.5 2007/05/31 19:19:38 jmc Exp $ +.\" $OpenBSD: pidfile.3,v 1.6 2008/06/26 05:42:05 ray Exp $ .\" $NetBSD: pidfile.3,v 1.2 2001/04/12 22:34:31 sommerfeld Exp $ .\" .\" Copyright (c) 1999 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 @@ -35,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: June 26 2008 $ .Dt PIDFILE 3 .Os .Sh NAME diff --git a/src/lib/libutil/pidfile.c b/src/lib/libutil/pidfile.c index 0af51287..3625be34 100644 --- a/src/lib/libutil/pidfile.c +++ b/src/lib/libutil/pidfile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pidfile.c,v 1.7 2005/08/02 21:46:23 espie Exp $ */ +/* $OpenBSD: pidfile.c,v 1.8 2008/06/26 05:42:05 ray Exp $ */ /* $NetBSD: pidfile.c,v 1.4 2001/02/19 22:43:42 cgd Exp $ */ /*- @@ -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