18242736 libxml2 package license file needs some adjustment
authorPetr Sumbera <petr.sumbera@oracle.com>
Fri, 14 Feb 2014 08:20:33 -0800
changeset 1711 d19b95bc2d59
parent 1710 7af9a5a0f495
child 1712 ef0ff60083f1
18242736 libxml2 package license file needs some adjustment
components/libxml2/libxml2-26.p5m
components/libxml2/libxml2-27.p5m
components/libxml2/libxml2.license
components/libxml2/libxml2.p5m
--- a/components/libxml2/libxml2-26.p5m	Thu Feb 13 17:12:07 2014 -0800
+++ b/components/libxml2/libxml2-26.p5m	Fri Feb 14 08:20:33 2014 -0800
@@ -37,7 +37,7 @@
 file path=usr/lib/python2.6/vendor-packages/drv_libxml2.py
 file path=usr/lib/python2.6/vendor-packages/libxml2.py
 file path=usr/lib/python2.6/vendor-packages/libxml2mod.so
-license COPYING license="libxml license"
+license libxml2.license license="libxml license"
 
 # force the rename with an optional dependency on the old name
 depend type=optional fmri=library/python-2/[email protected],5.12-5.12.0.0.0.41.0
--- a/components/libxml2/libxml2-27.p5m	Thu Feb 13 17:12:07 2014 -0800
+++ b/components/libxml2/libxml2-27.p5m	Fri Feb 14 08:20:33 2014 -0800
@@ -37,7 +37,7 @@
 file path=usr/lib/python2.7/vendor-packages/drv_libxml2.py
 file path=usr/lib/python2.7/vendor-packages/libxml2.py
 file path=usr/lib/python2.7/vendor-packages/libxml2mod.so
-license COPYING license="libxml license"
+license libxml2.license license="libxml license"
 
 # force the rename with an optional dependency on the old name
 depend type=optional fmri=library/python-2/[email protected],5.12-5.12.0.0.0.41.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libxml2/libxml2.license	Fri Feb 14 08:20:33 2014 -0800
@@ -0,0 +1,28 @@
+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:
+
+ Copyright (C) 1998-2012 Daniel Veillard.  All Rights Reserved.
+ Copyright (C) 1998 Bjorn Reese and Daniel Stenberg.
+ Copyright (C) 2000 Bjorn Reese and Daniel Stenberg.
+ Copyright (C) 2000 Gary Pennington and Daniel Veillard.
+ Copyright (C) 2001 Bjorn Reese
+ Copyright (C) 2000,2012 Bjorn Reese and Daniel Veillard.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is fur-
+nished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+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.
--- a/components/libxml2/libxml2.p5m	Thu Feb 13 17:12:07 2014 -0800
+++ b/components/libxml2/libxml2.p5m	Fri Feb 14 08:20:33 2014 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -98,7 +98,7 @@
 file path=usr/share/man/man3/libxml.3
 file libxml2.3 path=usr/share/man/man3/libxml2.3
 legacy pkg=SUNWlxml desc="The XML library" name="The XML library"
-license COPYING license="libxml license"
+license libxml2.license license="libxml license"
 link path=lib/$(MACH64)/libxml2.so target=libxml2.so.2
 link path=lib/libxml2.so target=libxml2.so.2
 link path=usr/lib/$(MACH64)/libxml2.so target=libxml2.so.2