Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Follow upstream license changes for files with Michael Shala...
details: https://anonhg.NetBSD.org/src/rev/56d69e512fc9
branches: trunk
changeset: 748722:56d69e512fc9
user: snj <snj%NetBSD.org@localhost>
date: Tue Nov 03 05:07:25 2009 +0000
description:
Follow upstream license changes for files with Michael Shalayeff's
copyright. In most cases, this means dropping the 3rd and 4th clauses.
diffstat:
lib/libc/arch/hppa/SYS.h | 9 +----
lib/libc/arch/hppa/sys/__sigtramp2.S | 7 +----
lib/libc/arch/hppa/sys/brk.S | 9 +----
lib/libc/arch/hppa/sys/exect.S | 9 +----
lib/libc/arch/hppa/sys/fork.S | 9 +----
lib/libc/arch/hppa/sys/sbrk.S | 9 +----
lib/libc/arch/hppa/sys/syscall.S | 9 +----
lib/libc/compat/arch/hppa/sys/compat_Ovfork.S | 11 ++-----
sys/arch/hp700/dev/asp.c | 26 +++++++----------
sys/arch/hp700/dev/clock.c | 26 +++++++----------
sys/arch/hp700/dev/lasi.c | 26 +++++++----------
sys/arch/hp700/dev/mongoose.c | 11 ++-----
sys/arch/hp700/dev/pdc.c | 26 +++++++----------
sys/arch/hp700/dev/phantomas.c | 7 +----
sys/arch/hp700/dev/sti_sgc.c | 24 ++++++---------
sys/arch/hp700/dev/wax.c | 26 +++++++----------
sys/arch/hp700/gsc/com_gsc.c | 26 +++++++----------
sys/arch/hp700/gsc/fdc_gsc.c | 24 ++++++---------
sys/arch/hp700/gsc/gscbus.c | 24 ++++++---------
sys/arch/hp700/gsc/gscbusvar.h | 24 ++++++---------
sys/arch/hp700/gsc/if_ie_gsc.c | 26 +++++++----------
sys/arch/hp700/gsc/oosiop_gsc.c | 9 ++----
sys/arch/hp700/gsc/osiop_gsc.c | 9 ++----
sys/arch/hp700/hp700/machdep.h | 24 ++++++---------
sys/arch/hp700/hp700/mainbus.c | 11 ++-----
sys/arch/hp700/include/autoconf.h | 24 ++++++---------
sys/arch/hp700/include/bus.h | 9 +----
sys/arch/hp700/include/eisa_machdep.h | 24 ++++++---------
sys/arch/hp700/include/isa_machdep.h | 24 ++++++---------
sys/arch/hp700/stand/boot/boot.c | 32 +++++++++-------------
sys/arch/hp700/stand/boot/conf.c | 24 ++++++---------
sys/arch/hp700/stand/cdboot/cdboot.c | 32 +++++++++-------------
sys/arch/hp700/stand/cdboot/conf.c | 24 ++++++---------
sys/arch/hp700/stand/common/ct.c | 24 ++++++---------
sys/arch/hp700/stand/common/dev_hppa.c | 29 ++++++++-----------
sys/arch/hp700/stand/common/exec_hppa.c | 32 +++++++++-------------
sys/arch/hp700/stand/common/exec_som.c | 7 +----
sys/arch/hp700/stand/common/itecons.c | 24 ++++++---------
sys/arch/hp700/stand/common/lf.c | 24 ++++++---------
sys/arch/hp700/stand/common/libsa.h | 24 ++++++---------
sys/arch/hp700/stand/common/lif.c | 24 ++++++---------
sys/arch/hp700/stand/common/machdep.c | 24 ++++++---------
sys/arch/hp700/stand/common/pdc.c | 24 ++++++---------
sys/arch/hp700/stand/common/srt0.S | 24 ++++++---------
sys/arch/hp700/stand/common/time.c | 24 ++++++---------
sys/arch/hppa/hppa/copy.S | 9 +----
sys/arch/hppa/hppa/core_machdep.c | 11 ++-----
sys/arch/hppa/hppa/db_disasm.c | 39 +++++++++------------------
sys/arch/hppa/hppa/db_interface.c | 26 +++++++----------
sys/arch/hppa/hppa/db_memrw.c | 26 +++++++----------
sys/arch/hppa/hppa/db_trace.c | 26 +++++++----------
sys/arch/hppa/hppa/fpemu.S | 24 ++++++---------
sys/arch/hppa/hppa/hpt.h | 22 ++++++---------
sys/arch/hppa/hppa/in_cksum.c | 9 +----
sys/arch/hppa/hppa/process_machdep.c | 26 +++++++----------
sys/arch/hppa/hppa/sigcode.S | 9 +----
sys/arch/hppa/hppa/support.S | 9 +----
sys/arch/hppa/hppa/trap.c | 26 +++++++----------
sys/arch/hppa/include/cpufunc.h | 24 ++++++---------
sys/arch/hppa/include/db_machdep.h | 24 ++++++---------
sys/arch/hppa/include/frame.h | 9 +----
sys/arch/hppa/include/kcore.h | 22 ++++++---------
sys/arch/hppa/include/pcb.h | 9 +----
sys/arch/hppa/include/psl.h | 9 +----
sys/arch/hppa/include/ptrace.h | 22 ++++++---------
sys/arch/hppa/include/reg.h | 24 ++++++---------
sys/arch/hppa/include/reloc.h | 22 ++++++---------
sys/arch/hppa/include/som.h | 22 ++++++---------
sys/arch/hppa/include/trap.h | 9 +----
69 files changed, 522 insertions(+), 834 deletions(-)
diffs (truncated from 2850 to 300 lines):
diff -r 0c09036caeb4 -r 56d69e512fc9 lib/libc/arch/hppa/SYS.h
--- a/lib/libc/arch/hppa/SYS.h Tue Nov 03 01:23:21 2009 +0000
+++ b/lib/libc/arch/hppa/SYS.h Tue Nov 03 05:07:25 2009 +0000
@@ -1,9 +1,9 @@
-/* $NetBSD: SYS.h,v 1.6 2007/11/18 13:25:39 skrll Exp $ */
+/* $NetBSD: SYS.h,v 1.7 2009/11/03 05:07:25 snj Exp $ */
/* $OpenBSD: SYS.h,v 1.9 2001/09/20 20:52:09 millert Exp $ */
/*
- * Copyright (c) 1998-1999 Michael Shalayeff
+ * Copyright (c) 1998-2002 Michael Shalayeff
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -14,11 +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 Michael Shalayeff.
- * 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 0c09036caeb4 -r 56d69e512fc9 lib/libc/arch/hppa/sys/__sigtramp2.S
--- a/lib/libc/arch/hppa/sys/__sigtramp2.S Tue Nov 03 01:23:21 2009 +0000
+++ b/lib/libc/arch/hppa/sys/__sigtramp2.S Tue Nov 03 05:07:25 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: __sigtramp2.S,v 1.3 2007/12/22 14:10:03 skrll Exp $ */
+/* $NetBSD: __sigtramp2.S,v 1.4 2009/11/03 05:07:25 snj Exp $ */
/*
* Copyright (c) 1998-2001 Michael Shalayeff
@@ -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. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Michael Shalayeff.
- * 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 0c09036caeb4 -r 56d69e512fc9 lib/libc/arch/hppa/sys/brk.S
--- a/lib/libc/arch/hppa/sys/brk.S Tue Nov 03 01:23:21 2009 +0000
+++ b/lib/libc/arch/hppa/sys/brk.S Tue Nov 03 05:07:25 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: brk.S,v 1.3 2003/10/06 05:30:21 matt Exp $ */
+/* $NetBSD: brk.S,v 1.4 2009/11/03 05:07:25 snj Exp $ */
/* $OpenBSD: brk.S,v 1.7 2001/06/04 23:14:04 mickey Exp $ */
@@ -14,11 +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 Michael Shalayeff.
- * 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 +31,7 @@
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
- RCSID("$NetBSD: brk.S,v 1.3 2003/10/06 05:30:21 matt Exp $")
+ RCSID("$NetBSD: brk.S,v 1.4 2009/11/03 05:07:25 snj Exp $")
#endif /* LIBC_SCCS and not lint */
.import curbrk, data
diff -r 0c09036caeb4 -r 56d69e512fc9 lib/libc/arch/hppa/sys/exect.S
--- a/lib/libc/arch/hppa/sys/exect.S Tue Nov 03 01:23:21 2009 +0000
+++ b/lib/libc/arch/hppa/sys/exect.S Tue Nov 03 05:07:25 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: exect.S,v 1.1 2002/06/06 20:31:23 fredette Exp $ */
+/* $NetBSD: exect.S,v 1.2 2009/11/03 05:07:25 snj Exp $ */
/* $OpenBSD: exect.S,v 1.5 2001/03/29 01:43:52 mickey Exp $ */
@@ -14,11 +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 Michael Shalayeff.
- * 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 +31,7 @@
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
- RCSID("$NetBSD: exect.S,v 1.1 2002/06/06 20:31:23 fredette Exp $")
+ RCSID("$NetBSD: exect.S,v 1.2 2009/11/03 05:07:25 snj Exp $")
#endif /* LIBC_SCCS and not lint */
/* we do no tracing yet */
diff -r 0c09036caeb4 -r 56d69e512fc9 lib/libc/arch/hppa/sys/fork.S
--- a/lib/libc/arch/hppa/sys/fork.S Tue Nov 03 01:23:21 2009 +0000
+++ b/lib/libc/arch/hppa/sys/fork.S Tue Nov 03 05:07:25 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fork.S,v 1.3 2003/10/06 05:30:21 matt Exp $ */
+/* $NetBSD: fork.S,v 1.4 2009/11/03 05:07:25 snj Exp $ */
/* $OpenBSD: fork.S,v 1.7 2001/06/04 23:14:04 mickey Exp $ */
@@ -14,11 +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 Michael Shalayeff.
- * 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 +31,7 @@
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
- RCSID("$NetBSD: fork.S,v 1.3 2003/10/06 05:30:21 matt Exp $")
+ RCSID("$NetBSD: fork.S,v 1.4 2009/11/03 05:07:25 snj Exp $")
#endif /* LIBC_SCCS and not lint */
ENTRY(__fork,0)
diff -r 0c09036caeb4 -r 56d69e512fc9 lib/libc/arch/hppa/sys/sbrk.S
--- a/lib/libc/arch/hppa/sys/sbrk.S Tue Nov 03 01:23:21 2009 +0000
+++ b/lib/libc/arch/hppa/sys/sbrk.S Tue Nov 03 05:07:25 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sbrk.S,v 1.3 2003/10/06 05:30:21 matt Exp $ */
+/* $NetBSD: sbrk.S,v 1.4 2009/11/03 05:07:25 snj Exp $ */
/* $OpenBSD: sbrk.S,v 1.7 2001/06/04 23:14:04 mickey Exp $ */
@@ -14,11 +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 Michael Shalayeff.
- * 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 +31,7 @@
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
- RCSID("$NetBSD: sbrk.S,v 1.3 2003/10/06 05:30:21 matt Exp $")
+ RCSID("$NetBSD: sbrk.S,v 1.4 2009/11/03 05:07:25 snj Exp $")
#endif /* LIBC_SCCS and not lint */
.import end, data
diff -r 0c09036caeb4 -r 56d69e512fc9 lib/libc/arch/hppa/sys/syscall.S
--- a/lib/libc/arch/hppa/sys/syscall.S Tue Nov 03 01:23:21 2009 +0000
+++ b/lib/libc/arch/hppa/sys/syscall.S Tue Nov 03 05:07:25 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall.S,v 1.1 2002/06/06 20:31:24 fredette Exp $ */
+/* $NetBSD: syscall.S,v 1.2 2009/11/03 05:07:25 snj Exp $ */
/* $OpenBSD: syscall.S,v 1.4 2001/03/29 01:43:53 mickey Exp $ */
@@ -14,11 +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 Michael Shalayeff.
- * 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 +31,7 @@
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
- RCSID("$NetBSD: syscall.S,v 1.1 2002/06/06 20:31:24 fredette Exp $")
+ RCSID("$NetBSD: syscall.S,v 1.2 2009/11/03 05:07:25 snj Exp $")
#endif /* LIBC_SCCS and not lint */
RSYSCALL(syscall)
diff -r 0c09036caeb4 -r 56d69e512fc9 lib/libc/compat/arch/hppa/sys/compat_Ovfork.S
--- a/lib/libc/compat/arch/hppa/sys/compat_Ovfork.S Tue Nov 03 01:23:21 2009 +0000
+++ b/lib/libc/compat/arch/hppa/sys/compat_Ovfork.S Tue Nov 03 05:07:25 2009 +0000
@@ -1,9 +1,9 @@
-/* $NetBSD: compat_Ovfork.S,v 1.1 2006/03/11 19:54:56 christos Exp $ */
+/* $NetBSD: compat_Ovfork.S,v 1.2 2009/11/03 05:07:25 snj Exp $ */
/* $OpenBSD: Ovfork.S,v 1.7 2001/06/04 23:14:04 mickey Exp $ */
/*
- * Copyright (c) 1999 Michael Shalayeff
+ * Copyright (c) 1999,2002 Michael Shalayeff
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -14,11 +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 Michael Shalayeff.
- * 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 +31,7 @@
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
- RCSID("$NetBSD: compat_Ovfork.S,v 1.1 2006/03/11 19:54:56 christos Exp $")
+ RCSID("$NetBSD: compat_Ovfork.S,v 1.2 2009/11/03 05:07:25 snj Exp $")
#endif /* LIBC_SCCS and not lint */
ENTRY(vfork,0)
diff -r 0c09036caeb4 -r 56d69e512fc9 sys/arch/hp700/dev/asp.c
--- a/sys/arch/hp700/dev/asp.c Tue Nov 03 01:23:21 2009 +0000
+++ b/sys/arch/hp700/dev/asp.c Tue Nov 03 05:07:25 2009 +0000
@@ -1,9 +1,9 @@
-/* $NetBSD: asp.c,v 1.14 2009/05/24 06:53:34 skrll Exp $ */
+/* $NetBSD: asp.c,v 1.15 2009/11/03 05:07:25 snj Exp $ */
/* $OpenBSD: asp.c,v 1.5 2000/02/09 05:04:22 mickey Exp $ */
/*
- * Copyright (c) 1998,1999 Michael Shalayeff
+ * Copyright (c) 1998-2003 Michael Shalayeff
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -14,22 +14,18 @@
* 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 Michael Shalayeff.
- * 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
* 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 MIND,
- * 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.
+ * IN NO EVENT SHALL THE AUTHOR OR HIS RELATIVES 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 MIND, 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.
*/
/*
@@ -41,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.14 2009/05/24 06:53:34 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.15 2009/11/03 05:07:25 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff -r 0c09036caeb4 -r 56d69e512fc9 sys/arch/hp700/dev/clock.c
--- a/sys/arch/hp700/dev/clock.c Tue Nov 03 01:23:21 2009 +0000
+++ b/sys/arch/hp700/dev/clock.c Tue Nov 03 05:07:25 2009 +0000
@@ -1,9 +1,9 @@
-/* $NetBSD: clock.c,v 1.6 2006/09/16 15:43:24 skrll Exp $ */
+/* $NetBSD: clock.c,v 1.7 2009/11/03 05:07:25 snj Exp $ */
/* $OpenBSD: clock.c,v 1.10 2001/08/31 03:13:42 mickey Exp $ */
/*
- * Copyright (c) 1998,1999 Michael Shalayeff
Home |
Main Index |
Thread Index |
Old Index