Attachment 1455380 Details for Bug 1594313 – Patch with suggested license changes.

[patch] Patch with suggested license changes.

license_update.patch (text/plain), 1.82 KB, created by Severin Gehwolf on 2018-06-28 16:18:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Severin Gehwolf

Created: 2018-06-28 16:18:21 UTC

Size: 1.82 KB

patch

obsolete

>diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
>index 4e2d260..13095d7 100644
>--- a/java-11-openjdk.spec
>+++ b/java-11-openjdk.spec
>@@ -861,15 +861,18 @@ Group:   Development/Languages
> 
> # HotSpot code is licensed under GPLv2
> # JDK library code is licensed under GPLv2 with the Classpath exception
>-# The Apache license is used in code taken from Apache projects (primarily JAXP & JAXWS)
>+# The Apache license is used in code taken from Apache projects (primarily xalan & xerces)
> # DOM levels 2 & 3 and the XML digital signature schemas are licensed under the W3C Software License
> # The JSR166 concurrency code is in the public domain
>-# The BSD and MIT licenses are used for a number of third-party libraries (see THIRD_PARTY_README)
>-# The OpenJDK source tree includes the JPEG library (IJG), zlib & libpng (zlib), giflib and LCMS (MIT)
>+# The BSD and MIT licenses are used for a number of third-party libraries (see ADDITIONAL_LICENSE_INFO)
>+# The OpenJDK source tree includes:
>+# - JPEG library (IJG), zlib & libpng (zlib), giflib (MIT), harfbuzz (ISC),
>+# - freetype (FTL), jline (BSD) and LCMS (MIT)
>+# - jquery (MIT), jdk.crypto.cryptoki PKCS 11 wrapper (RSA)
> # The test code includes copies of NSS under the Mozilla Public License v2.0
> # The PCSClite headers are under a BSD with advertising license
> # The elliptic curve cryptography (ECC) source code is licensed under the LGPLv2.1 or any later version
>-License:  ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib
>+License:  ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib and ISC and FTL and RSA
> URL:      http://openjdk.java.net/
> 
>

Actions: View | Diff

Attachments on bug 1594313: 1455277 | 1455279 | 1455281 | 1455380