7085609 openexr and ilmbase need license file upgrade
7085613 libmng needs license file upgrade
7085624 lighttpd needs TPNO and license file modifications
7085966 iperf needs TPNO and license file modifications
7085948 swig needs TPNO and license file modifications
7085963 tcpdump needs TPNO and license file modifications
7085967 Lua needs TPNO and license file modifications
7123118 libxslt needs TPNO and license file modifications
7123119 libxml2 needs TPNO and license file modifications
7133262 areca needs TPNO and license file modifications
7151922 autogen needs TPNO and license file modifications
--- a/components/areca/areca.copyright Fri Mar 16 04:35:32 2012 -0700
+++ b/components/areca/areca.copyright Tue Mar 20 09:27:53 2012 -0700
@@ -1,20 +1,17 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
---------------------------------------------------------------------
+-------------
+- areca 7.1 -
+-------------
-Copyright 2005-2009, Olivier PETRUCCI <[email protected]>
+Oracle Internal Tracking Number 6138
+
+Copyright 2005-2009, Olivier PETRUCCI.
+This program is distributed under the GNU General Public License v2.
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 675 Mass Ave, Cambridge, MA 02139, USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -315,9 +312,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
--- a/components/autogen/autogen.license Fri Mar 16 04:35:32 2012 -0700
+++ b/components/autogen/autogen.license Tue Mar 20 09:27:53 2012 -0700
@@ -1,18 +1,8 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
---------------------------------------------------------------------
+---------------
+- autogen 5.9 -
+---------------
-Copyright (C) 1989-2007 Free Software Foundation, Inc.
-Copyright (c) 1992-2007 Bruce Korb
-Copyright (C) 1994 X Consortium
-Copyright (C) 1998-2003 Gary V. Vaughan
-
+Oracle Internal Tracking Number 6148
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/ilmbase/ilmbase.license Fri Mar 16 04:35:32 2012 -0700
+++ b/components/ilmbase/ilmbase.license Tue Mar 20 09:27:53 2012 -0700
@@ -1,3 +1,11 @@
+-----------------
+- ilmbase 1.0.1 -
+-----------------
+
+Oracle Internal Tracking Number 5574
+
+OPENEXR:
+
Copyright (c) 2006, Industrial Light & Magic, a division of Lucasfilm
Entertainment Company Ltd. Portions contributed and copyright held by
others as indicated. All rights reserved.
--- a/components/iperf/iperf.license Fri Mar 16 04:35:32 2012 -0700
+++ b/components/iperf/iperf.license Tue Mar 20 09:27:53 2012 -0700
@@ -1,5 +1,9 @@
-Iperf license
-----------------------------------------------------------------------------
+---------------
+- iperf 2.0.4 -
+---------------
+
+Oracle Internal Tracking Number 5730
+
Copyright (c) 1999-2007, The Board of Trustees of the University of Illinois
All Rights Reserved.
--- a/components/libmng/libmng.license Fri Mar 16 04:35:32 2012 -0700
+++ b/components/libmng/libmng.license Tue Mar 20 09:27:53 2012 -0700
@@ -1,8 +1,13 @@
-/* ************************************************************************** */
+-----------------
+- libmng 1.0.10 -
+-----------------
+
+Oracle Internal Tracking Number 5583
+
/* * * */
/* * COPYRIGHT NOTICE: * */
/* * * */
-/* * Copyright (c) 2000-2007 Gerard Juyn ([email protected]) * */
+/* * Copyright (c) 2000-2007 Gerard Juyn ([email protected]) * */
/* * [You may insert additional notices after this sentence if you modify * */
/* * this source] * */
/* * * */
@@ -54,5 +59,3 @@
/* * (future modifications may include some more support for creation * */
/* * and or editing) * */
/* * * */
-/* ************************************************************************** */
-
--- a/components/libxml2/libxml2.license Fri Mar 16 04:35:32 2012 -0700
+++ b/components/libxml2/libxml2.license Tue Mar 20 09:27:53 2012 -0700
@@ -1,3 +1,9 @@
+-----------------
+- libxml2 2.7.6 -
+-----------------
+
+Oracle Internal Tracking Number 5302
+
Except where otherwise noted in the source code (e.g. the files hash.c,
list.c and the trio files, which are covered by a similar licence but
with different Copyright notices) all the files are:
--- a/components/libxslt/xsl.license Fri Mar 16 04:35:32 2012 -0700
+++ b/components/libxslt/xsl.license Tue Mar 20 09:27:53 2012 -0700
@@ -1,3 +1,9 @@
+------------------
+- libxslt 1.1.26 -
+------------------
+
+Oracle Internal Tracking Number 5303
+
Licence for libxslt except libexslt
----------------------------------------------------------------------
Copyright (C) 2001-2002 Daniel Veillard. All Rights Reserved.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/lighttpd/lighttpd.license Tue Mar 20 09:27:53 2012 -0700
@@ -0,0 +1,35 @@
+-------------------
+- lighttpd 1.4.23 -
+-------------------
+
+Oracle Internal Tracking Number 5585
+
+Copyright (c) 2004, Jan Kneschke, incremental
+ 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 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.
+
+- Neither the name of the 'incremental' 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
+
--- a/components/lighttpd/lighttpd.p5m Fri Mar 16 04:35:32 2012 -0700
+++ b/components/lighttpd/lighttpd.p5m Tue Mar 20 09:27:53 2012 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -36,7 +36,7 @@
set name=org.opensolaris.consolidation \
value=$(CONSOLIDATION)
-license COPYING license='Lighttpd license'
+license lighttpd.license license='Lighttpd license'
dir path=etc
dir path=etc/lighttpd
--- a/components/lua/lua.license Fri Mar 16 04:35:32 2012 -0700
+++ b/components/lua/lua.license Tue Mar 20 09:27:53 2012 -0700
@@ -1,15 +1,12 @@
-Lua License
------------
+-------------
+- lua 5.1.4 -
+-------------
-Lua is licensed under the terms of the MIT license reproduced below.
-This means that Lua is free software and can be used for both academic
-and commercial purposes at absolutely no cost.
+Oracle Internal Tracking Number 5814
-For details and rationale, see http://www.lua.org/license.html .
+License for Lua 5.0 and later versions
-===============================================================================
-
-Copyright (C) 1994-2008 Lua.org, PUC-Rio.
+Copyright (C) 1994-2010 Lua.org, PUC-Rio.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -28,7 +25,3 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-
-===============================================================================
-
-(end of COPYRIGHT)
--- a/components/openexr/openexr.license Fri Mar 16 04:35:32 2012 -0700
+++ b/components/openexr/openexr.license Tue Mar 20 09:27:53 2012 -0700
@@ -1,3 +1,11 @@
+-----------------
+- openexr 1.6.1 -
+-----------------
+
+Oracle Internal Tracking Number 5574
+
+OPENEXR:
+
Copyright (c) 2006, Industrial Light & Magic, a division of Lucasfilm
Entertainment Company Ltd. Portions contributed and copyright held by
others as indicated. All rights reserved.
--- a/components/swig/swig.license Fri Mar 16 04:35:32 2012 -0700
+++ b/components/swig/swig.license Tue Mar 20 09:27:53 2012 -0700
@@ -1,3 +1,9 @@
+---------------
+- swig 1.3.35 -
+---------------
+
+Oracle Internal Tracking Number 5686
+
SWIG is distributed under the following terms:
I.
--- a/components/tcpdump/tcpdump.license Fri Mar 16 04:35:32 2012 -0700
+++ b/components/tcpdump/tcpdump.license Tue Mar 20 09:27:53 2012 -0700
@@ -1,3 +1,9 @@
+-----------------
+- tcpdump 4.1.1 -
+-----------------
+
+Oracle Internal Tracking Number 5687
+
Copyright (C) 1982,1986,1988-2002 The Regents of the University of California
Copyright (C) 1998-2007 The TCPDUMP project
Copyright (C) 1995-1999,2001 WIDE Project