NetBSD-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
misc/39573: UCB ad clause leftover in genassym.cf
>Number: 39573
>Category: misc
>Synopsis: UCB ad clause leftover in genassym.cf
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: misc-bug-people
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Wed Sep 17 17:55:00 +0000 2008
>Originator: Izumi Tsutsui
>Release: NetBSD 4.99.72
>Organization:
>Environment:
Architecture: all
Machine: all
>Description:
Some genassym.cf files whose copyright holder is UCB
still contain the advertising clause for UCB.
>How-To-Repeat:
Code inspection.
>Fix:
Apply the following diff.
Several files have co-copyright holders other than UCB.
In such files license notice is split into two part (UCB and others)
like existing other files (like src/sys/kern/kern_todr.c etc).
Index: acorn32/acorn32/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/acorn32/acorn32/genassym.cf,v
retrieving revision 1.3
diff -u -r1.3 genassym.cf
--- acorn32/acorn32/genassym.cf 5 Oct 2002 23:30:03 -0000 1.3
+++ acorn32/acorn32/genassym.cf 30 Apr 2008 08:35:56 -0000
@@ -14,11 +14,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 the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. 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.
#
Index: alpha/alpha/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/alpha/genassym.cf,v
retrieving revision 1.15
diff -u -r1.15 genassym.cf
--- alpha/alpha/genassym.cf 17 Oct 2007 19:52:55 -0000 1.15
+++ alpha/alpha/genassym.cf 30 Apr 2008 08:35:56 -0000
@@ -1,8 +1,6 @@
# $NetBSD: genassym.cf,v 1.15 2007/10/17 19:52:55 garbled Exp $
#
-# Copyright (c) 1994, 1995 Gordon W. Ross
-# Copyright (c) 1993 Adam Glass
# Copyright (c) 1982, 1990, 1993
# The Regents of the University of California. All rights reserved.
#
@@ -14,6 +12,37 @@
# 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 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: @(#)genassym.c 8.3 (Berkeley) 1/4/94
+#
+
+#
+# Copyright (c) 1994, 1995 Gordon W. Ross
+# Copyright (c) 1993 Adam Glass
+#
+# 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
Index: amd64/amd64/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/amd64/amd64/genassym.cf,v
retrieving revision 1.30
diff -u -r1.30 genassym.cf
--- amd64/amd64/genassym.cf 28 Apr 2008 22:47:37 -0000 1.30
+++ amd64/amd64/genassym.cf 30 Apr 2008 08:35:56 -0000
@@ -44,11 +44,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 the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. 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.
#
Index: amiga/amiga/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/amiga/amiga/genassym.cf,v
retrieving revision 1.25
diff -u -r1.25 genassym.cf
--- amiga/amiga/genassym.cf 17 Oct 2007 19:53:12 -0000 1.25
+++ amiga/amiga/genassym.cf 30 Apr 2008 08:35:56 -0000
@@ -12,11 +12,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 the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. 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.
#
Index: arm/arm32/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/arm32/genassym.cf,v
retrieving revision 1.39
diff -u -r1.39 genassym.cf
--- arm/arm32/genassym.cf 27 Apr 2008 18:58:44 -0000 1.39
+++ arm/arm32/genassym.cf 30 Apr 2008 08:35:57 -0000
@@ -14,11 +14,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 the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. 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.
#
Index: arm/sa11x0/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/sa11x0/genassym.cf,v
retrieving revision 1.1
diff -u -r1.1 genassym.cf
--- arm/sa11x0/genassym.cf 9 Jan 2002 15:54:19 -0000 1.1
+++ arm/sa11x0/genassym.cf 30 Apr 2008 08:35:57 -0000
@@ -14,11 +14,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 the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. 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.
#
Index: cesfic/cesfic/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/cesfic/cesfic/genassym.cf,v
retrieving revision 1.10
diff -u -r1.10 genassym.cf
--- cesfic/cesfic/genassym.cf 17 Oct 2007 19:54:07 -0000 1.10
+++ cesfic/cesfic/genassym.cf 30 Apr 2008 08:35:57 -0000
@@ -12,11 +12,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 the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. 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.
#
Index: hp300/hp300/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/hp300/hp300/genassym.cf,v
retrieving revision 1.37
diff -u -r1.37 genassym.cf
--- hp300/hp300/genassym.cf 24 Mar 2008 23:02:38 -0000 1.37
+++ hp300/hp300/genassym.cf 30 Apr 2008 08:35:57 -0000
@@ -12,11 +12,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 the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. 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.
#
Index: hp700/hp700/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/hp700/genassym.cf,v
retrieving revision 1.15
diff -u -r1.15 genassym.cf
--- hp700/hp700/genassym.cf 23 Jan 2008 18:11:29 -0000 1.15
+++ hp700/hp700/genassym.cf 30 Apr 2008 08:35:57 -0000
@@ -14,11 +14,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 the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. 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.
#
Index: hpcarm/hpcarm/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/hpcarm/hpcarm/genassym.cf,v
retrieving revision 1.7
diff -u -r1.7 genassym.cf
--- hpcarm/hpcarm/genassym.cf 27 Apr 2008 18:58:47 -0000 1.7
+++ hpcarm/hpcarm/genassym.cf 30 Apr 2008 08:35:57 -0000
@@ -14,11 +14,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 the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. 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.
#
Index: i386/bioscall/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/bioscall/genassym.cf,v
retrieving revision 1.3
diff -u -r1.3 genassym.cf
--- i386/bioscall/genassym.cf 28 Apr 2008 20:23:23 -0000 1.3
+++ i386/bioscall/genassym.cf 30 Apr 2008 08:35:57 -0000
@@ -44,11 +44,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 the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. 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.
#
Index: i386/i386/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/i386/genassym.cf,v
retrieving revision 1.68
diff -u -r1.68 genassym.cf
--- i386/i386/genassym.cf 28 Apr 2008 22:47:37 -0000 1.68
+++ i386/i386/genassym.cf 30 Apr 2008 08:35:57 -0000
@@ -44,11 +44,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 the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. 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.
#
Index: ia64/ia64/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/ia64/ia64/genassym.cf,v
retrieving revision 1.4
diff -u -r1.4 genassym.cf
--- ia64/ia64/genassym.cf 28 Apr 2008 20:23:25 -0000 1.4
+++ ia64/ia64/genassym.cf 30 Apr 2008 08:35:57 -0000
@@ -44,11 +44,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 the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. 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.
#
Index: luna68k/luna68k/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/luna68k/luna68k/genassym.cf,v
retrieving revision 1.14
diff -u -r1.14 genassym.cf
--- luna68k/luna68k/genassym.cf 17 Oct 2007 19:55:04 -0000 1.14
+++ luna68k/luna68k/genassym.cf 30 Apr 2008 08:35:57 -0000
@@ -12,11 +12,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 the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. 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.
#
Index: mac68k/mac68k/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/mac68k/mac68k/genassym.cf,v
retrieving revision 1.31
diff -u -r1.31 genassym.cf
--- mac68k/mac68k/genassym.cf 17 Oct 2007 19:55:14 -0000 1.31
+++ mac68k/mac68k/genassym.cf 30 Apr 2008 08:35:57 -0000
@@ -12,11 +12,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 the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. 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.
#
Index: mips/mips/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/mips/genassym.cf,v
retrieving revision 1.43
diff -u -r1.43 genassym.cf
--- mips/mips/genassym.cf 17 Oct 2007 19:55:38 -0000 1.43
+++ mips/mips/genassym.cf 30 Apr 2008 08:35:57 -0000
@@ -1,7 +1,5 @@
# $NetBSD: genassym.cf,v 1.43 2008/06/04 11:30:25 ad Exp $
#
-# Copyright (c) 1997
-# Jonathan Stone. All rights reserved.
# Copyright (c) 1992, 1993
# The Regents of the University of California. All rights reserved.
#
@@ -16,6 +14,40 @@
# 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 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 @(#)genassym.c 8.2 (Berkeley) 9/23/93
+#
+
+#
+# Copyright (c) 1997
+# Jonathan Stone. All rights reserved.
+#
+# This code is derived from software contributed to Berkeley by
+# Ralph Campbell.
+#
+# 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
Index: mvme68k/mvme68k/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/mvme68k/mvme68k/genassym.cf,v
retrieving revision 1.30
diff -u -r1.30 genassym.cf
--- mvme68k/mvme68k/genassym.cf 17 Oct 2007 19:55:47 -0000 1.30
+++ mvme68k/mvme68k/genassym.cf 30 Apr 2008 08:35:57 -0000
@@ -12,11 +12,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 the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. 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.
#
Index: news68k/news68k/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/news68k/news68k/genassym.cf,v
retrieving revision 1.21
diff -u -r1.21 genassym.cf
--- news68k/news68k/genassym.cf 17 Oct 2007 19:55:53 -0000 1.21
+++ news68k/news68k/genassym.cf 30 Apr 2008 08:35:58 -0000
@@ -12,11 +12,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 the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. 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.
#
Index: next68k/next68k/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/next68k/next68k/genassym.cf,v
retrieving revision 1.21
diff -u -r1.21 genassym.cf
--- next68k/next68k/genassym.cf 17 Oct 2007 19:56:04 -0000 1.21
+++ next68k/next68k/genassym.cf 30 Apr 2008 08:35:58 -0000
@@ -12,11 +12,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 the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. 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.
#
Index: shark/shark/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/shark/shark/genassym.cf,v
retrieving revision 1.4
diff -u -r1.4 genassym.cf
--- shark/shark/genassym.cf 27 Apr 2008 18:58:47 -0000 1.4
+++ shark/shark/genassym.cf 30 Apr 2008 08:35:58 -0000
@@ -14,11 +14,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 the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. 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.
#
Index: sparc/sparc/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/genassym.cf,v
retrieving revision 1.55
diff -u -r1.55 genassym.cf
--- sparc/sparc/genassym.cf 8 Jan 2008 21:32:11 -0000 1.55
+++ sparc/sparc/genassym.cf 30 Apr 2008 08:35:58 -0000
@@ -48,11 +48,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 the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. 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.
#
Index: sparc64/sparc64/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/sparc64/genassym.cf,v
retrieving revision 1.59
diff -u -r1.59 genassym.cf
--- sparc64/sparc64/genassym.cf 22 Apr 2008 16:51:30 -0000 1.59
+++ sparc64/sparc64/genassym.cf 30 Apr 2008 08:35:58 -0000
@@ -48,11 +48,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 the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. 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.
#
Index: sun2/sun2/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/sun2/sun2/genassym.cf,v
retrieving revision 1.9
diff -u -r1.9 genassym.cf
--- sun2/sun2/genassym.cf 17 Oct 2007 19:57:43 -0000 1.9
+++ sun2/sun2/genassym.cf 30 Apr 2008 08:35:58 -0000
@@ -1,8 +1,6 @@
# $NetBSD: genassym.cf,v 1.9 2007/10/17 19:57:43 garbled Exp $
#
-# Copyright (c) 1994, 1995 Gordon W. Ross
-# Copyright (c) 1993 Adam Glass
# Copyright (c) 1982, 1990, 1993
# The Regents of the University of California. All rights reserved.
#
@@ -14,6 +12,37 @@
# 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 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: @(#)genassym.c 8.3 (Berkeley) 1/4/94
+#
+
+#
+# Copyright (c) 1994, 1995 Gordon W. Ross
+# Copyright (c) 1993 Adam Glass
+#
+# 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
Index: sun3/sun3/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/sun3/sun3/genassym.cf,v
retrieving revision 1.10
diff -u -r1.10 genassym.cf
--- sun3/sun3/genassym.cf 17 Oct 2007 19:57:46 -0000 1.10
+++ sun3/sun3/genassym.cf 30 Apr 2008 08:35:58 -0000
@@ -1,8 +1,6 @@
# $NetBSD: genassym.cf,v 1.10 2007/10/17 19:57:46 garbled Exp $
#
-# Copyright (c) 1994, 1995 Gordon W. Ross
-# Copyright (c) 1993 Adam Glass
# Copyright (c) 1982, 1990, 1993
# The Regents of the University of California. All rights reserved.
#
@@ -14,6 +12,37 @@
# 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 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: @(#)genassym.c 8.3 (Berkeley) 1/4/94
+#
+
+#
+# Copyright (c) 1994, 1995 Gordon W. Ross
+# Copyright (c) 1993 Adam Glass
+#
+# 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
Index: sun3/sun3x/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/sun3/sun3x/genassym.cf,v
retrieving revision 1.9
diff -u -r1.9 genassym.cf
--- sun3/sun3x/genassym.cf 28 Mar 2008 00:35:04 -0000 1.9
+++ sun3/sun3x/genassym.cf 30 Apr 2008 08:35:58 -0000
@@ -1,8 +1,6 @@
# $NetBSD: genassym.cf,v 1.9 2008/03/28 00:35:04 he Exp $
#
-# Copyright (c) 1994, 1995 Gordon W. Ross
-# Copyright (c) 1993 Adam Glass
# Copyright (c) 1982, 1990, 1993
# The Regents of the University of California. All rights reserved.
#
@@ -14,6 +12,37 @@
# 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 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: @(#)genassym.c 8.3 (Berkeley) 1/4/94
+#
+
+#
+# Copyright (c) 1994, 1995 Gordon W. Ross
+# Copyright (c) 1993 Adam Glass
+#
+# 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
Index: x68k/x68k/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/x68k/x68k/genassym.cf,v
retrieving revision 1.27
diff -u -r1.27 genassym.cf
--- x68k/x68k/genassym.cf 17 Oct 2007 19:58:04 -0000 1.27
+++ x68k/x68k/genassym.cf 30 Apr 2008 08:35:58 -0000
@@ -12,11 +12,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 the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. 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.
#
Home |
Main Index |
Thread Index |
Old Index