readlicense_oo/license/license.xml | 26 +-------------------------
1 file changed, 1 insertion(+), 25 deletions(-)
New commits:
commit fc5189a4509a432c54c82551b2da2ec8525ee01c
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sat May 10 23:38:00 2025 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun May 11 10:15:02 2025 +0200
license: NSS is MPLv2
Change-Id: Ibaebc102e7347cefbe982412e27e86e972c9fc6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185158
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/readlicense_oo/license/license.xml
b/readlicense_oo/license/license.xml
index 6afa863b78a1..22ad92a2821e 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -1525,7 +1525,7 @@
<h2>Network Security Services (NSS)</h2>
<p>The following software may be included in this product: Network
Security Services (NSS). Use of any of this
software is governed by the terms of the license below:</p>
- <p><a href="#a__MPL_version_1_1">Jump to MPL 1.1</a></p>
+ <p><a href="#a__MPL_version_2">Jump to MPL 2.0</a></p>
</div>
<div class="OPENLDAP">
<h2>OpenLDAP</h2>
commit e75c5b8687c2798f263c10d625e0ea71a39edecd
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sat May 10 23:32:38 2025 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun May 11 10:14:49 2025 +0200
license: zxcvbn-c section was there 2 times
Change-Id: I009d2084d7a399d70c7a9592620c373a7be23f63
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185157
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/readlicense_oo/license/license.xml
b/readlicense_oo/license/license.xml
index fab83b6c784b..6afa863b78a1 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -1830,30 +1830,6 @@
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.</p>
</div>
- <h2>zxcvbn-c</h2>
- <p>The following software may be included in this product: zxcvbn-c.</p>
- <p>zxcvbn-c code is covered by the MIT license:</p>
- <blockquote>
- <p>Copyright (c) 2015-2017 Tony Evans </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>
- </blockquote>
<h2>Dragonbox</h2>
<p>The following software may be included in this product: Dragonbox.</p>
<p>Dragonbox code is covered by the following license:</p>
