harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Oliver Deakin <oliver.dea...@googlemail.com>
Subject Re: [general] More license fixes for M11
Date Thu, 27 Aug 2009 12:35:32 GMT
This patch looks good to me, +1.

Mark Hindess wrote:
> I also updated APR during this milestone.  (However, the LICENSE/NOTICE
> sections were missing already AFAICT.)  I'd like to commit the appended
> patch to fix this.
>
> -Mark
>
> Index: NOTICE
> ===================================================================
> --- NOTICE	(revision 808343)
> +++ NOTICE	(working copy)
> @@ -47,3 +47,16 @@
>  International Business Machines Corporation in accordance with the NIST
>  Software Acknowledgment and Redistribution document at
>  http://www.itl.nist.gov/div897/ctg/sql_form.htm
> +
> +
> +
> +
> +Portions of the Apache Portable Runtime used by DRLVM were
> +developed at the National Center for Supercomputing Applications
> +(NCSA) at the University of Illinois at Urbana-Champaign.
> +
> +This software contains code derived from the RSA Data Security
> +Inc. MD5 Message-Digest Algorithm.
> +
> +This software contains code derived from UNIX V7, Copyright(C)
> +Caldera International Inc.
> Index: working_vm/NOTICE
> ===================================================================
> --- working_vm/NOTICE	(revision 808343)
> +++ working_vm/NOTICE	(working copy)
> @@ -12,3 +12,13 @@
>           (C) Copyright 2005 Intel Corporation
>           (C) Copyright 2005-2006 Intel Corporation
>           (C) Copyright 2006 Intel Corporation
> +
> +Portions of the Apache Portable Runtime used by DRLVM were
> +developed at the National Center for Supercomputing Applications
> +(NCSA) at the University of Illinois at Urbana-Champaign.
> +
> +This software contains code derived from the RSA Data Security
> +Inc. MD5 Message-Digest Algorithm.
> +
> +This software contains code derived from UNIX V7, Copyright(C)
> +Caldera International Inc.
> Index: working_vm/LICENSE
> ===================================================================
> --- working_vm/LICENSE	(revision 808343)
> +++ working_vm/LICENSE	(working copy)
> @@ -200,3 +200,138 @@
>     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
>     See the License for the specific language governing permissions and
>     limitations under the License.
> +
> +
> +The Apache Harmony DRLVM uses the Apache Portable Runtime which
> +includes a number of subcomponents with separate copyright notices and
> +license terms. Your use of the source code for the these subcomponents
> +is subject to the terms and conditions of the following licenses.
> +
> +From strings/apr_fnmatch.c, include/apr_fnmatch.h, misc/unix/getopt.c,
> +file_io/unix/mktemp.c, strings/apr_strings.c:
> +
> +/* 
> + * Copyright (c) 1987, 1993, 1994
> + *      The 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. 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.
> +
> +From network_io/unix/inet_ntop.c, network_io/unix/inet_pton.c:
> +
> +/* 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.
> +
> +From dso/aix/dso.c:
> +
> + *  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.
> + *
> + *  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.
> +
> +From strings/apr_strnatcmp.c, include/apr_strings.h:
> +
> +  strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
> +  Copyright (C) 2000 by Martin Pool <mbp@humbug.org.au>
> +
> +  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.
> +
> +From strings/apr_snprintf.c:
> +
> +  *
> +  * cvt - IEEE floating point formatting routines.
> +  *       Derived from UNIX V7, Copyright(C) Caldera International Inc.
> +  *
> +
> +  Copyright(C) Caldera International Inc.  2001-2002.  All rights reserved.
> +  
> +  Redistribution and use in source and binary forms, with or without
> +  modification, are permitted provided that the following conditions are
> +  met:
> +
> +  Redistributions of source code and documentation must retain the above
> +  copyright notice, this list of conditions and the following disclaimer.
> +
> +  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.
> +
> +  All advertising materials mentioning features or use of this software
> +  must display the following acknowledgement:
> +
> +     This product includes software developed or owned by  Caldera
> +     International, Inc.
> +
> +  Neither the name of Caldera International, Inc. nor the names of other
> +  contributors may be used to endorse or promote products derived from
> +  this software without specific prior written permission.
> +
> +  USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
> +  INTERNATIONAL, INC. 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 CALDERA INTERNATIONAL, INC. 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.
> Index: LICENSE
> ===================================================================
> --- LICENSE	(revision 808343)
> +++ LICENSE	(working copy)
> @@ -1218,3 +1218,144 @@
>  
>  ===============================================================================
>  ===============================================================================
> +
> +
> +
> +The Apache Harmony DRLVM uses the Apache Portable Runtime which
> +includes a number of subcomponents with separate copyright notices and
> +license terms. Your use of the source code for the these subcomponents
> +is subject to the terms and conditions of the following licenses.
> +
> +From strings/apr_fnmatch.c, include/apr_fnmatch.h, misc/unix/getopt.c,
> +file_io/unix/mktemp.c, strings/apr_strings.c:
> +
> +/* 
> + * Copyright (c) 1987, 1993, 1994
> + *      The 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. 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.
> +
> +From network_io/unix/inet_ntop.c, network_io/unix/inet_pton.c:
> +
> +/* 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.
> +
> +From dso/aix/dso.c:
> +
> + *  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.
> + *
> + *  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.
> +
> +From strings/apr_strnatcmp.c, include/apr_strings.h:
> +
> +  strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
> +  Copyright (C) 2000 by Martin Pool <mbp@humbug.org.au>
> +
> +  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.
> +
> +From strings/apr_snprintf.c:
> +
> +  *
> +  * cvt - IEEE floating point formatting routines.
> +  *       Derived from UNIX V7, Copyright(C) Caldera International Inc.
> +  *
> +
> +  Copyright(C) Caldera International Inc.  2001-2002.  All rights reserved.
> +  
> +  Redistribution and use in source and binary forms, with or without
> +  modification, are permitted provided that the following conditions are
> +  met:
> +
> +  Redistributions of source code and documentation must retain the above
> +  copyright notice, this list of conditions and the following disclaimer.
> +
> +  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.
> +
> +  All advertising materials mentioning features or use of this software
> +  must display the following acknowledgement:
> +
> +     This product includes software developed or owned by  Caldera
> +     International, Inc.
> +
> +  Neither the name of Caldera International, Inc. nor the names of other
> +  contributors may be used to endorse or promote products derived from
> +  this software without specific prior written permission.
> +
> +  USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
> +  INTERNATIONAL, INC. 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 CALDERA INTERNATIONAL, INC. 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.
> +
> +
> +
> +===============================================================================
> +===============================================================================
>
>
>
>
>   

-- 
Oliver Deakin
Unless stated otherwise above:
IBM United Kingdom Limited - Registered in England and Wales with number 741598. 
Registered office: PO Box 41, North Harbour, Portsmouth, Hampshire PO6 3AU


Mime
View raw message