apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: apr LICENSE
Date Sun, 07 Mar 2004 20:50:41 GMT
jorton      2004/03/07 12:50:41

  Modified:    .        LICENSE
  Log:
  Restore copyright notices.
  
  Revision  Changes    Path
  1.4       +113 -75   apr/LICENSE
  
  Index: LICENSE
  ===================================================================
  RCS file: /home/cvs/apr/LICENSE,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -w -d -u -r1.3 -r1.4
  --- LICENSE	13 Feb 2004 09:38:23 -0000	1.3
  +++ LICENSE	7 Mar 2004 20:50:41 -0000	1.4
  @@ -209,79 +209,117 @@
   code for the these subcomponents is subject to the terms and
   conditions of the following licenses. 
   
  -For the include\apr_md5.h component: 
  +From strings/apr_fnmatch.c, include/apr_fnmatch.h, misc/unix/getopt.c,
  +file_io/unix/mktemp.c, strings/apr_strings.c:
  +
   /*
  - * This is work is derived from material Copyright RSA Data Security, Inc.
  + * Copyright (c) 1987, 1993, 1994
  + *      The Regents of the University of California.  All rights reserved.
    *
  - * The RSA copyright statement and Licence for that original material is
  - * included below. This is followed by the Apache copyright statement and
  - * licence for the modifications made to that material.
  - */
  -
  -/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
  -   rights reserved.
  -
  -   License to copy and use this software is granted provided that it
  -   is identified as the "RSA Data Security, Inc. MD5 Message-Digest
  -   Algorithm" in all material mentioning or referencing this software
  -   or this function.
  -
  -   License is also granted to make and use derivative works provided
  -   that such works are identified as "derived from the RSA Data
  -   Security, Inc. MD5 Message-Digest Algorithm" in all material
  -   mentioning or referencing the derived work.
  + * 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
  + *      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.
  + *
  + * 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.
   
  -   RSA Data Security, Inc. makes no representations concerning either
  -   the merchantability of this software or the suitability of this
  -   software for any particular purpose. It is provided "as is"
  -   without express or implied warranty of any kind.
  +From network_io/unix/inet_ntop.c, network_io/unix/inet_pton.c:
   
  -   These notices must be retained in any copies of any part of this
  -   documentation and/or software.
  - */
  +/* Copyright (c) 1996 by Internet Software Consortium.
  + *
  + * Permission to use, copy, modify, and distribute this software for any
  + * purpose with or without fee is hereby granted, provided that the above
  + * copyright notice and this permission notice appear in all copies.
  + *
  + * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
  + * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
  + * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
  + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
  + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
  + * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  + * SOFTWARE.
   
  -For the passwd\apr_md5.c component:
  +From dso/aix/dso.c:
   
  -/*
  - * This is work is derived from material Copyright RSA Data Security, Inc.
  + *  Based on libdl (dlfcn.c/dlfcn.h) which is
  + *  Copyright (c) 1992,1993,1995,1996,1997,1988
  + *  Jens-Uwe Mager, Helios Software GmbH, Hannover, Germany.
    *
  - * The RSA copyright statement and Licence for that original material is
  - * included below. This is followed by the Apache copyright statement and
  - * licence for the modifications made to that material.
  - */
  + *  Not derived from licensed software.
  + *
  + *  Permission is granted to freely use, copy, modify, and redistribute
  + *  this software, provided that the author is not construed to be liable
  + *  for any results of using the software, alterations are clearly marked
  + *  as such, and this notice is not modified.
   
  -/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
  - */
  +From strings/apr_strnatcmp.c, include/apr_strings.h:
   
  -/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
  -   rights reserved.
  +  strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
  +  Copyright (C) 2000 by Martin Pool <mbp@humbug.org.au>
   
  -   License to copy and use this software is granted provided that it
  -   is identified as the "RSA Data Security, Inc. MD5 Message-Digest
  -   Algorithm" in all material mentioning or referencing this software
  -   or this function.
  +  This software is provided 'as-is', without any express or implied
  +  warranty.  In no event will the authors be held liable for any damages
  +  arising from the use of this software.
   
  -   License is also granted to make and use derivative works provided
  -   that such works are identified as "derived from the RSA Data
  -   Security, Inc. MD5 Message-Digest Algorithm" in all material
  -   mentioning or referencing the derived work.
  +  Permission is granted to anyone to use this software for any purpose,
  +  including commercial applications, and to alter it and redistribute it
  +  freely, subject to the following restrictions:
   
  -   RSA Data Security, Inc. makes no representations concerning either
  -   the merchantability of this software or the suitability of this
  -   software for any particular purpose. It is provided "as is"
  -   without express or implied warranty of any kind.
  +  1. The origin of this software must not be misrepresented; you must not
  +     claim that you wrote the original software. If you use this software
  +     in a product, an acknowledgment in the product documentation would be
  +     appreciated but is not required.
  +  2. Altered source versions must be plainly marked as such, and must not be
  +     misrepresented as being the original software.
  +  3. This notice may not be removed or altered from any source distribution.
   
  -   These notices must be retained in any copies of any part of this
  -   documentation and/or software.
  - */
  -/*
  - * The apr_md5_encode() routine uses much code obtained from the FreeBSD 3.0
  - * MD5 crypt() function, which is licenced as follows:
  - * ----------------------------------------------------------------------------
  - * "THE BEER-WARE LICENSE" (Revision 42):
  - * <phk@login.dknet.dk> wrote this file.  As long as you retain this notice you
  - * can do whatever you want with this stuff. If we meet some day, and you think
  - * this stuff is worth it, you can buy me a beer in return.  Poul-Henning Kamp
  - * ----------------------------------------------------------------------------
  - */
   
  +From test/CuTest.c, test/CuTest.h:
  +
  + * Copyright (c) 2002-2006 Asim Jalis
  + * 
  + * This library is released under the zlib/libpng license as described at
  + * 
  + * http://www.opensource.org/licenses/zlib-license.html
  + * 
  + * Here is the statement of the license:
  + * 
  + * This software is provided 'as-is', without any express or implied warranty. 
  + * In no event will the authors be held liable for any damages arising from 
  + * the use of this software.
  + * 
  + * Permission is granted to anyone to use this software for any purpose, 
  + * including commercial applications, and to alter it and redistribute it 
  + * freely, subject to the following restrictions:
  + * 
  + * 1. The origin of this software must not be misrepresented; you must not 
  + * claim that you wrote the original software. If you use this software in a 
  + * product, an acknowledgment in the product documentation would be 
  + * appreciated but is not required.
  + * 
  + * 2. Altered source versions must be plainly marked as such, and must not be
  + * misrepresented as being the original software.
  + * 
  + * 3. This notice may not be removed or altered from any source distribution.
  
  
  

Mime
View raw message