Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Drop 3rd and 4th clauses. Approved by gwr@ (copyright holder).
details: https://anonhg.NetBSD.org/src/rev/4c70a03e78bc
branches: trunk
changeset: 748368:4c70a03e78bc
user: snj <snj%NetBSD.org@localhost>
date: Wed Oct 21 23:12:09 2009 +0000
description:
Drop 3rd and 4th clauses. Approved by gwr@ (copyright holder).
diffstat:
distrib/utils/ssh/ssh.c | 7 +------
distrib/utils/tls/tls.c | 7 +------
sbin/edlabel/edlabel.c | 7 +------
sys/arch/alpha/stand/netboot/dev_net.c | 7 +------
sys/arch/hp300/stand/common/netio.c | 7 +------
sys/arch/hp300/stand/common/rawfs.c | 7 +------
sys/arch/i386/stand/lib/netif/netif_small.c | 7 +------
sys/arch/i386/stand/lib/netif/netif_small.h | 7 +------
sys/arch/mvme68k/stand/bootst/rawfs.c | 7 +------
sys/arch/mvme68k/stand/libsa/SRT0.S | 7 +------
sys/arch/newsmips/stand/boot/net.c | 7 +------
sys/arch/newsmips/stand/boot/netif_news.c | 7 +------
sys/arch/sbmips/stand/netboot/dev_net.c | 7 +------
sys/arch/sparc/stand/common/dvma.c | 7 +------
sys/arch/sparc/stand/common/net.c | 7 +------
sys/arch/sparc/stand/common/netif_sun.c | 7 +------
sys/arch/sun68k/stand/tapeboot/rawfs.c | 7 +------
sys/arch/vax/boot/boot/netio.c | 7 +------
sys/dev/md.h | 7 +------
sys/dev/sun/kbd_tables.c | 9 ++-------
sys/dev/sun/kbd_tables.h | 7 +------
sys/lib/libsa/bootparam.c | 7 +------
usr.sbin/mdconfig/mdconfig.c | 9 ++-------
23 files changed, 25 insertions(+), 140 deletions(-)
diffs (truncated from 501 to 300 lines):
diff -r 92609fbe7e92 -r 4c70a03e78bc distrib/utils/ssh/ssh.c
--- a/distrib/utils/ssh/ssh.c Wed Oct 21 22:59:06 2009 +0000
+++ b/distrib/utils/ssh/ssh.c Wed Oct 21 23:12:09 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ssh.c,v 1.2 2002/05/26 00:09:09 wiz Exp $ */
+/* $NetBSD: ssh.c,v 1.3 2009/10/21 23:12:09 snj Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +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. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Gordon W. Ross
*
* 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 92609fbe7e92 -r 4c70a03e78bc distrib/utils/tls/tls.c
--- a/distrib/utils/tls/tls.c Wed Oct 21 22:59:06 2009 +0000
+++ b/distrib/utils/tls/tls.c Wed Oct 21 23:12:09 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tls.c,v 1.2 2006/06/24 05:12:13 mrg Exp $ */
+/* $NetBSD: tls.c,v 1.3 2009/10/21 23:12:09 snj Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +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. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Gordon W. Ross
*
* 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 92609fbe7e92 -r 4c70a03e78bc sbin/edlabel/edlabel.c
--- a/sbin/edlabel/edlabel.c Wed Oct 21 22:59:06 2009 +0000
+++ b/sbin/edlabel/edlabel.c Wed Oct 21 23:12:09 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: edlabel.c,v 1.16 2006/10/23 03:56:38 mrg Exp $ */
+/* $NetBSD: edlabel.c,v 1.17 2009/10/21 23:12:09 snj Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +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. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Gordon W. Ross
*
* 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 92609fbe7e92 -r 4c70a03e78bc sys/arch/alpha/stand/netboot/dev_net.c
--- a/sys/arch/alpha/stand/netboot/dev_net.c Wed Oct 21 22:59:06 2009 +0000
+++ b/sys/arch/alpha/stand/netboot/dev_net.c Wed Oct 21 23:12:09 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dev_net.c,v 1.14 2009/03/14 15:36:00 dsl Exp $ */
+/* $NetBSD: dev_net.c,v 1.15 2009/10/21 23:12:09 snj Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +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. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Gordon W. Ross
*
* 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 92609fbe7e92 -r 4c70a03e78bc sys/arch/hp300/stand/common/netio.c
--- a/sys/arch/hp300/stand/common/netio.c Wed Oct 21 22:59:06 2009 +0000
+++ b/sys/arch/hp300/stand/common/netio.c Wed Oct 21 23:12:09 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netio.c,v 1.12 2008/04/28 20:23:19 martin Exp $ */
+/* $NetBSD: netio.c,v 1.13 2009/10/21 23:12:09 snj Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -41,11 +41,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. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Gordon W. Ross
*
* 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 92609fbe7e92 -r 4c70a03e78bc sys/arch/hp300/stand/common/rawfs.c
--- a/sys/arch/hp300/stand/common/rawfs.c Wed Oct 21 22:59:06 2009 +0000
+++ b/sys/arch/hp300/stand/common/rawfs.c Wed Oct 21 23:12:09 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rawfs.c,v 1.7 2006/06/25 17:36:07 tsutsui Exp $ */
+/* $NetBSD: rawfs.c,v 1.8 2009/10/21 23:12:09 snj Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +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. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Gordon W. Ross
*
* 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 92609fbe7e92 -r 4c70a03e78bc sys/arch/i386/stand/lib/netif/netif_small.c
--- a/sys/arch/i386/stand/lib/netif/netif_small.c Wed Oct 21 22:59:06 2009 +0000
+++ b/sys/arch/i386/stand/lib/netif/netif_small.c Wed Oct 21 23:12:09 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netif_small.c,v 1.11 2009/03/14 15:36:07 dsl Exp $ */
+/* $NetBSD: netif_small.c,v 1.12 2009/10/21 23:12:09 snj Exp $ */
/* minimal netif - for boot ROMs we don't have to select between
several interfaces, and we have to save space
@@ -18,11 +18,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. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Gordon W. Ross
*
* 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 92609fbe7e92 -r 4c70a03e78bc sys/arch/i386/stand/lib/netif/netif_small.h
--- a/sys/arch/i386/stand/lib/netif/netif_small.h Wed Oct 21 22:59:06 2009 +0000
+++ b/sys/arch/i386/stand/lib/netif/netif_small.h Wed Oct 21 23:12:09 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netif_small.h,v 1.4 2008/12/14 18:46:33 christos Exp $ */
+/* $NetBSD: netif_small.h,v 1.5 2009/10/21 23:12:09 snj Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +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. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Gordon W. Ross
*
* 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 92609fbe7e92 -r 4c70a03e78bc sys/arch/mvme68k/stand/bootst/rawfs.c
--- a/sys/arch/mvme68k/stand/bootst/rawfs.c Wed Oct 21 22:59:06 2009 +0000
+++ b/sys/arch/mvme68k/stand/bootst/rawfs.c Wed Oct 21 23:12:09 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rawfs.c,v 1.10 2008/01/12 09:54:30 tsutsui Exp $ */
+/* $NetBSD: rawfs.c,v 1.11 2009/10/21 23:12:09 snj Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +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. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Gordon W. Ross
*
* 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 92609fbe7e92 -r 4c70a03e78bc sys/arch/mvme68k/stand/libsa/SRT0.S
--- a/sys/arch/mvme68k/stand/libsa/SRT0.S Wed Oct 21 22:59:06 2009 +0000
+++ b/sys/arch/mvme68k/stand/libsa/SRT0.S Wed Oct 21 23:12:09 2009 +0000
@@ -1,4 +1,4 @@
-| $NetBSD: SRT0.S,v 1.3 2000/11/30 22:26:27 scw Exp $
+| $NetBSD: SRT0.S,v 1.4 2009/10/21 23:12:09 snj Exp $
| Copyright (c) 1995 Gordon W. Ross
| All rights reserved.
@@ -11,11 +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. The name of the author may not be used to endorse or promote products
-| derived from this software without specific prior written permission.
-| 4. All advertising materials mentioning features or use of this software
-| must display the following acknowledgement:
-| This product includes software developed by Gordon Ross
|
| 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 92609fbe7e92 -r 4c70a03e78bc sys/arch/newsmips/stand/boot/net.c
--- a/sys/arch/newsmips/stand/boot/net.c Wed Oct 21 22:59:06 2009 +0000
+++ b/sys/arch/newsmips/stand/boot/net.c Wed Oct 21 23:12:09 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: net.c,v 1.4 2005/12/11 12:18:25 christos Exp $ */
+/* $NetBSD: net.c,v 1.5 2009/10/21 23:12:09 snj Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +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. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Gordon W. Ross
*
* 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 92609fbe7e92 -r 4c70a03e78bc sys/arch/newsmips/stand/boot/netif_news.c
--- a/sys/arch/newsmips/stand/boot/netif_news.c Wed Oct 21 22:59:06 2009 +0000
+++ b/sys/arch/newsmips/stand/boot/netif_news.c Wed Oct 21 23:12:09 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netif_news.c,v 1.7 2009/01/12 11:32:44 tsutsui Exp $ */
+/* $NetBSD: netif_news.c,v 1.8 2009/10/21 23:12:09 snj Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +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. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Gordon W. Ross
*
* 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 92609fbe7e92 -r 4c70a03e78bc sys/arch/sbmips/stand/netboot/dev_net.c
--- a/sys/arch/sbmips/stand/netboot/dev_net.c Wed Oct 21 22:59:06 2009 +0000
+++ b/sys/arch/sbmips/stand/netboot/dev_net.c Wed Oct 21 23:12:09 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dev_net.c,v 1.4 2009/03/14 15:36:13 dsl Exp $ */
+/* $NetBSD: dev_net.c,v 1.5 2009/10/21 23:12:09 snj Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +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. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Gordon W. Ross
*
* 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 92609fbe7e92 -r 4c70a03e78bc sys/arch/sparc/stand/common/dvma.c
--- a/sys/arch/sparc/stand/common/dvma.c Wed Oct 21 22:59:06 2009 +0000
+++ b/sys/arch/sparc/stand/common/dvma.c Wed Oct 21 23:12:09 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dvma.c,v 1.14 2006/07/13 20:03:34 uwe Exp $ */
+/* $NetBSD: dvma.c,v 1.15 2009/10/21 23:12:09 snj Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
* All rights reserved.
@@ -11,11 +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. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Gordon Ross
*
* 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 92609fbe7e92 -r 4c70a03e78bc sys/arch/sparc/stand/common/net.c
--- a/sys/arch/sparc/stand/common/net.c Wed Oct 21 22:59:06 2009 +0000
+++ b/sys/arch/sparc/stand/common/net.c Wed Oct 21 23:12:09 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: net.c,v 1.8 2006/07/13 20:03:34 uwe Exp $ */
+/* $NetBSD: net.c,v 1.9 2009/10/21 23:12:09 snj Exp $ */
Home |
Main Index |
Thread Index |
Old Index