This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Patch to update BSD license
- To: gcc-patches at gcc dot gnu dot org
- Subject: Patch to update BSD license
- From: Jason Merrill <jason at cygnus dot com>
- Date: Mon, 22 Nov 1999 10:36:01 -0800
The "obnoxious BSD advertising clause" has been rescinded.
1999-11-22 Jason Merrill <jason@casey.cygnus.com>
* strtoul.c, strtol.c, random.c: Remove advertising clause from
BSD license, pursuant with
ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
Index: libiberty/strtoul.c
===================================================================
RCS file: /cvs/gcc/egcs/libiberty/strtoul.c,v
retrieving revision 1.4
diff -c -p -r1.4 strtoul.c
*** libiberty/strtoul.c 1999/08/24 08:51:03 1.4
--- libiberty/strtoul.c 1999/11/22 18:22:16
***************
*** 10,19 ****
* 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.
--- 10,16 ----
* 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. [rescinded 22 July 1999]
* 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.
Index: libiberty/strtol.c
===================================================================
RCS file: /cvs/gcc/egcs/libiberty/strtol.c,v
retrieving revision 1.3
diff -c -p -r1.3 strtol.c
*** libiberty/strtol.c 1998/12/14 07:01:02 1.3
--- libiberty/strtol.c 1999/11/22 18:22:17
***************
*** 10,19 ****
* 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.
--- 10,16 ----
* 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. [rescinded 22 July 1999]
* 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.
Index: libiberty/random.c
===================================================================
RCS file: /cvs/gcc/egcs/libiberty/random.c,v
retrieving revision 1.3
diff -c -p -r1.3 random.c
*** libiberty/random.c 1999/01/13 21:38:14 1.3
--- libiberty/random.c 1999/11/22 18:22:17
***************
*** 2,18 ****
* Copyright (c) 1983 Regents of the University of California.
* All rights reserved.
*
! * Redistribution and use in source and binary forms are permitted
! * provided that the above copyright notice and this paragraph are
! * duplicated in all such forms and that any documentation,
! * advertising materials, and other materials related to such
! * distribution and use acknowledge that the software was developed
! * by the University of California, Berkeley. The name of the
! * University may not be used to endorse or promote products derived
! * from this software without specific prior written permission.
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
! * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
! * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
/*
--- 2,31 ----
* Copyright (c) 1983 Regents of the University of California.
* 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. [rescinded 22 July 1999]
! * 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.
*/
/*
1999-11-22 Jason Merrill <jason@casey.cygnus.com>
* gmon.c, i386/gmon-sol2.c, sparc/gmon-sol2.c: Remove advertising
clause from BSD license, pursuant with
ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
Index: gcc/gmon.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/gmon.c,v
retrieving revision 1.5
diff -c -p -r1.5 gmon.c
*** gcc/gmon.c 1999/01/06 20:44:33 1.5
--- gcc/gmon.c 1999/11/22 18:22:17
***************
*** 10,19 ****
* 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.
--- 10,16 ----
* 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. [rescinded 22 July 1999]
* 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.
Index: gcc/config/sparc/gmon-sol2.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/config/sparc/gmon-sol2.c,v
retrieving revision 1.4
diff -c -p -r1.4 gmon-sol2.c
*** gcc/config/sparc/gmon-sol2.c 1999/03/07 05:46:26 1.4
--- gcc/config/sparc/gmon-sol2.c 1999/11/22 18:22:18
***************
*** 10,19 ****
* 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.
--- 10,16 ----
* 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. [rescinded 22 July 1999]
* 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.
Index: gcc/config/i386/gmon-sol2.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/config/i386/gmon-sol2.c,v
retrieving revision 1.2
diff -c -p -r1.2 gmon-sol2.c
*** gcc/config/i386/gmon-sol2.c 1998/12/16 21:03:20 1.2
--- gcc/config/i386/gmon-sol2.c 1999/11/22 18:22:18
***************
*** 10,19 ****
* 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.
--- 10,16 ----
* 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. [rescinded 22 July 1999]
* 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.