harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Mark Hindess <mark.hind...@googlemail.com>
Subject Re: [general] License fixes for M11?
Date Thu, 27 Aug 2009 09:50:46 GMT

In message <4A9650A6.8030806@gmail.com>, Tim Ellison writes:
>
> On 27/Aug/2009 10:10, Mark Hindess wrote:
> > In message <4A964971.5060402@gmail.com>, Tim Ellison writes:
> >> On 27/Aug/2009 09:30, Mark Hindess wrote:
> >>> I'd like to apply the appended diff which updates the LICENSE files
> >>> with respect to:
> >>>
> >>>   derby - now in the hdk
> >>>   junit - now in the hdk
> >>>   liblcms - updated since m10
> >>>   libpng - updated since m10
> >>>   ICU4J - updated since m10
> >>>
> >>> Do any other committers approve this change?
> >>>
> >>> Regards,
> >>>  Mark.
> >>>
> >>> Index: LICENSE
> >>> ===================================================================
> >>> --- LICENSE	(revision 807222)
> >>> +++ LICENSE	(working copy)
> >>> @@ -262,14 +262,14 @@
> >>>  
> >>>  
> >>>  
> >>> -License Notice for ICU4J version 4.0
> >>> -====================================
> >>> +License Notice for ICU4J version 4.2.1
> >>> +======================================
> >>>  
> >>>  ICU4J license - ICU4J 1.8.1 and later
> >>>  
> >>>  COPYRIGHT AND PERMISSION NOTICE
> >>>  
> >>> -Copyright (c) 1995-2008 International Business Machines Corporation and

> ot
> >> hers 
> >>> +Copyright (c) 1995-2009 International Business Machines Corporation and

> ot
> >> hers 
> >>>  
> >>>  All rights reserved. 
> >>>  
> >>> @@ -516,7 +516,7 @@
> >>>  This distribution may contain software that is based in part on Little
c
> ms
> >>>  for which the following notice applies:
> >>>  
> >>> -Copyright (C) 1998-2004 Marti Maria
> >>> +Copyright (c) 1998-2007 Marti Maria Saguer
> >>>  
> >>>  Permission is hereby granted, free of charge, to any person obtaining a

> co
> >> py
> >>>  of this software and associated documentation files (the "Software"), to
>  d
> >> eal
> >>> @@ -546,12 +546,67 @@
> >>>  Notice for libpng
> >>>  =================
> >> Just an observation.  The text that follows contains references to
> >> various versions.  Why not just pick the text that applies to the
> >> version we are including?
> > 
> > Because, it reads to me like each section builds on the previous.  So
> > the text for v1.2.38 says:
> > 
> >   according to the same disclaimer and license as libpng-1.2.5
> > 
> > so we need the v1.2.5 section too, which says:
> > 
> >   according to the same disclaimer and license as libpng-1.0.6
> > 
> > ...
> 
> Yep, it was just an observation that you can include all the text, or
> maybe try to 'work out' what the final text would be if you followed the
> directions, which is I think what happened previously.

I agree we could try to "work out" the text but I'd rather keep it as a
simple cut and paste from the original text since that seems easier to
maintain as evidenced by the fact that we tried to "work out" the text
before and missed some of the copyright information.

> >>> -This distribution may contain software that is based in part on libpng
v
> 1.
> >> 2.10
> >>> -for which the following notice applies:
> >>> +This distribution may contain software that is based in part on libpng
> >>> +v1.2.38 for which the following notice applies:
> >>>  
> >>> -Copyright (c) 2004, 2006 Glenn Randers-Pehrson
> >>> +libpng versions 1.2.6, August 15, 2004, through 1.2.38, July 16, 2009,
a
> re
> >>> +Copyright (c) 2004, 2006-2009 Glenn Randers-Pehrson, and are
> >>> +distributed according to the same disclaimer and license as libpng-1.2.5
> >>> +with the following individual added to the list of Contributing Authors:
> >>>  
> >>> +   Cosmin Truta
> >>>  
> >>> +libpng versions 1.0.7, July 1, 2000, through 1.2.5, October 3, 2002, are
> >>> +Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
> >>> +distributed according to the same disclaimer and license as libpng-1.0.6
> >>> +with the following individuals added to the list of Contributing Authors
> :
> >>> +
> >>> +   Simon-Pierre Cadieux
> >>> +   Eric S. Raymond
> >>> +   Gilles Vollant
> >>> +
> >>> +and with the following additions to the disclaimer:
> >>> +
> >>> +   There is no warranty against interference with your enjoyment of the
> >>> +   library or against infringement.  There is no warranty that our
> >>> +   efforts or the library will fulfill any of your particular purposes
> >>> +   or needs.  This library is provided with all faults, and the entire
> >>> +   risk of satisfactory quality, performance, accuracy, and effort is wi
> th
> >>> +   the user.
> >>> +
> >>> +libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
> >>> +Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson, and are
> >>> +distributed according to the same disclaimer and license as libpng-0.96,
> >>> +with the following individuals added to the list of Contributing Authors
> :
> >>> +
> >>> +   Tom Lane
> >>> +   Glenn Randers-Pehrson
> >>> +   Willem van Schaik
> >>> +
> >>> +libpng versions 0.89, June 1996, through 0.96, May 1997, are
> >>> +Copyright (c) 1996, 1997 Andreas Dilger
> >>> +Distributed according to the same disclaimer and license as libpng-0.88,
> >>> +with the following individuals added to the list of Contributing Authors
> :
> >>> +
> >>> +   John Bowler
> >>> +   Kevin Bracey
> >>> +   Sam Bushell
> >>> +   Magnus Holmgren
> >>> +   Greg Roelofs
> >>> +   Tom Tanner
> >>> +
> >>> +libpng versions 0.5, May 1995, through 0.88, January 1996, are
> >>> +Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
> >>> +
> >>> +For the purposes of this copyright and license, "Contributing Authors"
> >>> +is defined as the following set of individuals:
> >>> +
> >>> +   Andreas Dilger
> >>> +   Dave Martindale
> >>> +   Guy Eric Schalnat
> >>> +   Paul Schmidt
> >>> +   Tim Wegner
> >>> +
> >>>  The PNG Reference Library is supplied "AS IS".  The Contributing Authors
> >>>  and Group 42, Inc. disclaim all warranties, expressed or implied,
> >>>  including, without limitation, the warranties of merchantability and of
> >>> @@ -560,13 +615,6 @@
> >>>  or consequential damages, which may result from the use of the PNG
> >>>  Reference Library, even if advised of the possibility of such damage.
> >>>  
> >>> -   There is no warranty against interference with your enjoyment of the
> >>> -   library or against infringement.  There is no warranty that our
> >>> -   efforts or the library will fulfill any of your particular purposes
> >>> -   or needs.  This library is provided with all faults, and the entire
> >>> -   risk of satisfactory quality, performance, accuracy, and effort is wi
> th
> >>> -   the user.
> >>> -
> >>>  Permission is hereby granted to use, copy, modify, and distribute this
> >>>  source code, or portions hereof, for any purpose, without fee, subject
> >>>  to the following restrictions:
> >>> @@ -930,3 +978,281 @@
> >>>   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.
> >>> +
> >>> +
> >>> +
> >>> +========================================================================
> ==
> >> =====
> >>> +========================================================================
> ==
> >> =====
> 
> <snip>
> 
> >>> +
> >>> +
> >>> +
> >>> +This distribution may contain a jar file based on Apache Derby which
> >>> +is covered by the Apache License and for which the following notice
> >>> +applies:
> >>> +
> >>> +Apache Derby
> >>> +Copyright 2004-2007 The Apache Software Foundation
> >>> +
> >>> +This product includes software developed by
> >>> +The Apache Software Foundation (http://www.apache.org/).
> >>> +
> >>> +Portions of Derby were originally developed by
> >>> +International Business Machines Corporation and are
> >>> +licensed to the Apache Software Foundation under the
> >>> +"Software Grant and Corporate Contribution License Agreement",
> >>> +informally known as the "Derby CLA".
> >>> +The following copyright notice(s) were affixed to portions of the code
> >>> +with which this file is now or was at one time distributed
> >>> +and are placed here unaltered.
> >>> +
> >>> +(C) Copyright 1997,2004 International Business Machines Corporation.
> >>> +All rights reserved.
> >>> +
> >>> +(C) Copyright IBM Corp. 2003. 
> >>> +
> >>> +The portion of the functionTests under 'nist' was originally 
> >>> +developed by the National Institute of Standards and Technology (NIST),

> >>> +an agency of the United States Department of Commerce, and adapted by
> >>> +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
> >>> +
> >>> +
> >>> +
> >>> +========================================================================
> ==
> >> =====
> >>> +========================================================================
> ==
> >> =====
> >>
> >> Since this came from Derby's NOTICE file, shouldn't it be in our NOTICE
> >> file rather than our LICENSE file?
> > 
> > I agree.  I will commit a fix for this shortly.
> 
> If you are modifying our NOTICE, then you might also like to tweak our
> copyright claim on the combined works, which currently states
> 
> Copyright 2006, 2009 The Apache Software Foundation.
> 
> but reading the legal discussion list, best practice seems to be only to
> include the year we are first distributing this package, i.e.
> 
> Copyright 2009 The Apache Software Foundation.
> 
> Not a reason to delay M11 though IMHO.

I think we should leave this for M12 since I'd rather do it consistently
for all NOTICE files and I don't plan to make other changes to the
working_vm/NOITCE file at this point.

-Mark.



Mime
View raw message