[Libreoffice-commits] core.git: readlicense_oo/license

[Libreoffice Gerrit user]

 readlicense_oo/license/license.xml |   32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

New commits:
commit 39e3c719ac20bb247151bff7dfc66f6d75b69e30
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Mar 21 16:24:40 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Mar 21 20:37:25 2019 +0100

    license: libatomic_ops: the portion needed for Firebird is MIT licensed
    
    Change-Id: I58ae4b4c7b94ba4d821681448e2cca19210db346
    Reviewed-on: https://gerrit.libreoffice.org/69524
    Tested-by: Jenkins
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index 20ade0084df3..f93e8be5695c 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -617,7 +617,37 @@
         <h2>libatomic_ops</h2>
         <p>The following software may be included in this product: libatomic_ops. Use of any of this software is
         governed by the terms of the license below:</p>
-        <p><a href="#a__GPL_version_2">Jump to GPL Version 2</a></p>
+        <p>Our intent is to make it easy to use libatomic_ops, in both free and proprietary software. Hence most code
+        that we expect to be linked into a client application is covered by an MIT-style license.</p>
+        <p>A few library routines are covered by the <a href="#a__GPL_version_2">GNU General Public License</a>. These
+        are put into a separate library, libatomic_ops_gpl.a.</p>
+        <p>The low-level part of the library is mostly covered by the following license:</p>
+        <hr />
+        <p>Copyright (c) ...</p>
+        <p>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 furnished to do so, subject to the following conditions:</p>
+        <p>The above copyright notice and this permission notice shall be included in all copies or substantial
+        portions of the Software.</p>
+        <p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+        LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS 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.</p>
+        <hr />
+        <p>A few files in the sysdeps directory were inherited in part from the Boehm-Demers-Weiser conservative
+        garbage collector, and are covered by its license, which is similar in spirit:</p>
+        <hr />
+        <p>Copyright (c) ...</p>
+        <p>THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED OR IMPLIED. ANY USE IS AT YOUR OWN
+        RISK.</p>
+        <p>Permission is hereby granted to use or copy this program for any purpose, provided the above notices are
+        retained on all copies. Permission to modify the code and to distribute modified code is granted, provided the
+        above notices are retained, and a notice that the code was modified is included with the above copyright
+        notice.</p>
+        <hr />
+        <p>Note: the portion needed for Firebird (libatomic_ops) is MIT licensed.</p>
     </div>
     <div class="CDR">
         <h2>libcdr</h2>