Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Move Matt Green's code from a 4-clause to a 3-clause licence...
details: https://anonhg.NetBSD.org/src/rev/203b07b1e832
branches: trunk
changeset: 553264:203b07b1e832
user: agc <agc%NetBSD.org@localhost>
date: Mon Oct 13 14:22:20 2003 +0000
description:
Move Matt Green's code from a 4-clause to a 3-clause licence by removing
the advertising clause. Diffs provided in PR 22396 by Joel Baker, the changes
were confirmed to the board by Matt Green.
diffstat:
bin/rcmd/rcmd.1 | 33 +-------------------------
lib/csu/sparc_elf/dot_init.h | 32 +++++++++++++++++++++++++-
lib/libc/net/rcmd.c | 37 ++----------------------------
lib/libc/sys/swapctl.2 | 33 +-------------------------
lib/libwrap/libwrap2netbsd | 8 +-----
sbin/rcorder/rcorder.c | 27 +++++++++++++++++++++-
sys/arch/sparc/sparc/in_cksum.c | 6 ++--
sys/arch/sparc64/sparc64/in4_cksum.c | 6 ++--
sys/compat/netbsd32/netbsd32_exec_aout.c | 30 +++++++++++++++++++++++-
sys/compat/netbsd32/netbsd32_exec_elf32.c | 30 +++++++++++++++++++++++-
usr.bin/systat/swap.c | 37 ++----------------------------
11 files changed, 130 insertions(+), 149 deletions(-)
diffs (truncated from 470 to 300 lines):
diff -r 829541fd5dce -r 203b07b1e832 bin/rcmd/rcmd.1
--- a/bin/rcmd/rcmd.1 Mon Oct 13 13:19:41 2003 +0000
+++ b/bin/rcmd/rcmd.1 Mon Oct 13 14:22:20 2003 +0000
@@ -1,5 +1,6 @@
-.\" $NetBSD: rcmd.1,v 1.15 2003/08/07 09:05:26 agc Exp $
+.\" $NetBSD: rcmd.1,v 1.16 2003/10/13 14:22:20 agc Exp $
.\"
+.\" Copyright (c) 1997 Matthew R. Green.
.\" Copyright (c) 1983, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -27,36 +28,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" Copyright (c) 1997 Matthew R. Green.
-.\"
-.\" 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.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University 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 REGENTS 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 REGENTS 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.
-.\"
.\" from: @(#)rsh.1 6.10 (Berkeley) 7/24/91
.\" from: NetBSD: rsh.1,v 1.3 1997/01/09 20:21:14 tls Exp
.\"
diff -r 829541fd5dce -r 203b07b1e832 lib/csu/sparc_elf/dot_init.h
--- a/lib/csu/sparc_elf/dot_init.h Mon Oct 13 13:19:41 2003 +0000
+++ b/lib/csu/sparc_elf/dot_init.h Mon Oct 13 14:22:20 2003 +0000
@@ -1,8 +1,36 @@
-/* $NetBSD: dot_init.h,v 1.2 2002/09/19 01:24:43 grant Exp $ */
+/* $NetBSD: dot_init.h,v 1.3 2003/10/13 14:22:20 agc Exp $ */
+
+/*-
+ * Copyright (c) 2001 Matthew Green
+ * 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.
+ * 3. 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
+ * 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.
+ */
/*-
* Copyright (c) 2001 Ross Harvey
- * Copyright (c) 2001 Matthew Green
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff -r 829541fd5dce -r 203b07b1e832 lib/libc/net/rcmd.c
--- a/lib/libc/net/rcmd.c Mon Oct 13 13:19:41 2003 +0000
+++ b/lib/libc/net/rcmd.c Mon Oct 13 14:22:20 2003 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: rcmd.c,v 1.53 2003/08/07 16:43:12 agc Exp $ */
+/* $NetBSD: rcmd.c,v 1.54 2003/10/13 14:22:20 agc Exp $ */
/*
+ * Copyright (c) 1997 Matthew R. Green.
* Copyright (c) 1983, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
@@ -29,44 +30,12 @@
* SUCH DAMAGE.
*/
-/*
- * Copyright (c) 1997 Matthew R. Green.
- *
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University 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 REGENTS 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 REGENTS 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.
- */
-
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
static char sccsid[] = "@(#)rcmd.c 8.3 (Berkeley) 3/26/94";
#else
-__RCSID("$NetBSD: rcmd.c,v 1.53 2003/08/07 16:43:12 agc Exp $");
+__RCSID("$NetBSD: rcmd.c,v 1.54 2003/10/13 14:22:20 agc Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
diff -r 829541fd5dce -r 203b07b1e832 lib/libc/sys/swapctl.2
--- a/lib/libc/sys/swapctl.2 Mon Oct 13 13:19:41 2003 +0000
+++ b/lib/libc/sys/swapctl.2 Mon Oct 13 14:22:20 2003 +0000
@@ -1,5 +1,6 @@
-.\" $NetBSD: swapctl.2,v 1.27 2003/08/07 16:44:10 agc Exp $
+.\" $NetBSD: swapctl.2,v 1.28 2003/10/13 14:22:20 agc Exp $
.\"
+.\" Copyright (c) 1997 Matthew R. Green
.\" Copyright (c) 1980, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -27,36 +28,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" Copyright (c) 1997 Matthew R. Green
-.\"
-.\" 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.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University 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 REGENTS 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 REGENTS 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.
-.\"
.Dd June 20, 1997
.Dt SWAPCTL 2
.Os
diff -r 829541fd5dce -r 203b07b1e832 lib/libwrap/libwrap2netbsd
--- a/lib/libwrap/libwrap2netbsd Mon Oct 13 13:19:41 2003 +0000
+++ b/lib/libwrap/libwrap2netbsd Mon Oct 13 14:22:20 2003 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: libwrap2netbsd,v 1.4 1997/01/20 06:22:50 cjs Exp $
+# $NetBSD: libwrap2netbsd,v 1.5 2003/10/13 14:22:20 agc Exp $
#
# Copyright (c) 1996 Matthew R. Green
# All rights reserved.
@@ -13,11 +13,7 @@
# 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 Matthew R. Green for
-# the NetBSD Project.
-# 4. The name of the author may not be used to endorse or promote products
+# 3. 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
diff -r 829541fd5dce -r 203b07b1e832 sbin/rcorder/rcorder.c
--- a/sbin/rcorder/rcorder.c Mon Oct 13 13:19:41 2003 +0000
+++ b/sbin/rcorder/rcorder.c Mon Oct 13 14:22:20 2003 +0000
@@ -1,8 +1,33 @@
-/* $NetBSD: rcorder.c,v 1.11 2002/11/30 03:10:54 lukem Exp $ */
+/* $NetBSD: rcorder.c,v 1.12 2003/10/13 14:22:20 agc Exp $ */
/*
* Copyright (c) 1998, 1999 Matthew R. Green
* 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.
+ * 3. 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
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR 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.
+ */
+
+/*
* Copyright (c) 1998
* Perry E. Metzger. All rights reserved.
*
diff -r 829541fd5dce -r 203b07b1e832 sys/arch/sparc/sparc/in_cksum.c
--- a/sys/arch/sparc/sparc/in_cksum.c Mon Oct 13 13:19:41 2003 +0000
+++ b/sys/arch/sparc/sparc/in_cksum.c Mon Oct 13 14:22:20 2003 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: in_cksum.c,v 1.14 2003/08/07 16:29:44 agc Exp $ */
+/* $NetBSD: in_cksum.c,v 1.15 2003/10/13 14:22:20 agc Exp $ */
/*
+ * Copyright (c) 1995 Matthew R. Green.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -38,7 +39,6 @@
/*
* Copyright (c) 1995 Zubin Dittia.
- * Copyright (c) 1995 Matthew R. Green.
* Copyright (c) 1994, 1998 Charles M. Hannum.
*
* All advertising materials mentioning features or use of this software
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_cksum.c,v 1.14 2003/08/07 16:29:44 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_cksum.c,v 1.15 2003/10/13 14:22:20 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff -r 829541fd5dce -r 203b07b1e832 sys/arch/sparc64/sparc64/in4_cksum.c
--- a/sys/arch/sparc64/sparc64/in4_cksum.c Mon Oct 13 13:19:41 2003 +0000
+++ b/sys/arch/sparc64/sparc64/in4_cksum.c Mon Oct 13 14:22:20 2003 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: in4_cksum.c,v 1.4 2003/08/07 16:29:50 agc Exp $ */
+/* $NetBSD: in4_cksum.c,v 1.5 2003/10/13 14:22:20 agc Exp $ */
/*
+ * Copyright (c) 1995 Matthew R. Green.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -39,7 +40,6 @@
Home |
Main Index |
Thread Index |
Old Index