From bf2e5df9df4eddbf213994ed93ee81d6ecac0192 Mon Sep 17 00:00:00 2001 From: Marc Dumais Date: Wed, 31 May 2023 14:18:21 -0400 Subject: [PATCH] Align text of our secondary license as per SPDX suggestion As per SPDX[1], it seems that our secondary license text has accidently deviated from stock, during a recent refactoring. Let's restore it to what it should be. [1]: https://spdx.org/licenses/GPL-2.0-with-classpath-exception.html Signed-off-by: Marc Dumais --- LICENSE-GPL-2.0-ONLY-CLASSPATH-EXCEPTION | 38 ++++++++++-------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/LICENSE-GPL-2.0-ONLY-CLASSPATH-EXCEPTION b/LICENSE-GPL-2.0-ONLY-CLASSPATH-EXCEPTION index b45e3cd5429ce..b8aa1bee43b6f 100644 --- a/LICENSE-GPL-2.0-ONLY-CLASSPATH-EXCEPTION +++ b/LICENSE-GPL-2.0-ONLY-CLASSPATH-EXCEPTION @@ -338,25 +338,19 @@ consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Oracle America and/or its affiliates are -subject to the following clarification and special exception to the GPL, but -only where Oracle has expressly included in the particular source file's header -the words "Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. +Class Path Exception + +Linking this library statically or dynamically with other modules is making +a combined work based on this library. Thus, the terms and conditions of +the GNU General Public License cover the whole combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent modules, +and to copy and distribute the resulting executable under terms of your +choice, provided that you also meet, for each linked independent module, +the terms and conditions of the license of that module. An independent +module is a module which is not derived from or based on this library. If +you modify this library, you may extend this exception to your version of +the library, but you are not obligated to do so. If you do not wish to do +so, delete this exception statement from your version.