From: Gurusamy Sarathy Date: Thu, 4 Nov 1999 15:59:46 +0000 (+0000) Subject: display BSD license in Glob.pm (for clause #2 conformity) X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=0e950d832564d240b1bebd0a01f04f9f5d57cc79;p=p5sagit%2Fp5-mst-13.2.git display BSD license in Glob.pm (for clause #2 conformity) p4raw-id: //depot/perl@4514 --- diff --git a/ext/File/Glob/Glob.pm b/ext/File/Glob/Glob.pm index a4531a1..c3b25fa 100644 --- a/ext/File/Glob/Glob.pm +++ b/ext/File/Glob/Glob.pm @@ -294,17 +294,41 @@ the standard Perl distribution. =head1 AUTHOR -The Perl interface was written by Nathan Torkington (gnat@frii.com), +The Perl interface was written by Nathan Torkington Egnat@frii.comE, and is released under the artistic license. Further modifications were made by Greg Bacon Egbacon@cs.uah.eduE and Gurusamy Sarathy Egsar@activestate.comE. The C glob code has the following copyright: - Copyright (c) 1989, 1993 The Regents of the University of California. - All rights reserved. This code is derived from software contributed - to Berkeley by Guido van Rossum. - -For redistribution of the C glob code, read the copyright notice in -the file bsd_glob.c, which is part of the File::Glob source distribution. + Copyright (c) 1989, 1993 The Regents of the University of California. + All rights reserved. + + This code is derived from software contributed to Berkeley by + Guido van Rossum. + + 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 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. =cut diff --git a/ext/File/Glob/bsd_glob.c b/ext/File/Glob/bsd_glob.c index 3ff4c92..f42b689 100644 --- a/ext/File/Glob/bsd_glob.c +++ b/ext/File/Glob/bsd_glob.c @@ -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 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. * @@ -34,12 +30,6 @@ * SUCH DAMAGE. */ -/* - * Clause 3 above should be considered "deleted in its entirety". - * For the actual notice of withdrawal, see: - * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change - */ - #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93"; #endif /* LIBC_SCCS and not lint */ diff --git a/ext/File/Glob/bsd_glob.h b/ext/File/Glob/bsd_glob.h index 625adfd..410b007 100644 --- a/ext/File/Glob/bsd_glob.h +++ b/ext/File/Glob/bsd_glob.h @@ -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 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. * @@ -36,12 +32,6 @@ * @(#)glob.h 8.1 (Berkeley) 6/2/93 */ -/* - * Clause 3 above should be considered "deleted in its entirety". - * For the actual notice of withdrawal, see: - * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change - */ - #ifndef _BSD_GLOB_H_ #define _BSD_GLOB_H_