From e0edea9de3efb8292d7819d3f65e1d01c1c67062 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 17 Jan 2022 19:10:29 -0500 Subject: [PATCH 1/6] openjdk7-bootstrap: fix license --- srcpkgs/openjdk7-bootstrap/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openjdk7-bootstrap/template b/srcpkgs/openjdk7-bootstrap/template index 3ba05dcd6df0..1e40e5803c7f 100644 --- a/srcpkgs/openjdk7-bootstrap/template +++ b/srcpkgs/openjdk7-bootstrap/template @@ -27,7 +27,7 @@ makedepends="nss-devel cups-devel libjpeg-turbo-devel giflib-devel libpng-devel pcsclite-devel lksctp-tools-devel" short_desc="OpenJDK 7 via IcedTea (bootstrap)" maintainer="q66 " -license="GPL-2.0-or-later" +license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="https://icedtea.classpath.org/" lib32disabled=yes From c3af5ac0185758c36d885c1140652185a7b01ebd Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 17 Jan 2022 19:11:21 -0500 Subject: [PATCH 2/6] openjdk8: fix license --- srcpkgs/openjdk8/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template index 7b68e8de53ac..c10b5216435b 100644 --- a/srcpkgs/openjdk8/template +++ b/srcpkgs/openjdk8/template @@ -41,7 +41,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel depends="openjdk8-jre-${version}_${revision}" short_desc="OpenJDK Java Development Kit (version 8)" maintainer="Toyam Cox " -license="GPL-2.0-or-later" +license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="http://openjdk.java.net/" distfiles=" http://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/archive/${_repo_ver}.tar.gz>jdk8u-${_repo_ver}.tar.gz From 67f62dd4c0f077fb2397d3dc6b953f09f2109b25 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 17 Jan 2022 19:11:46 -0500 Subject: [PATCH 3/6] openjdk9-bootstrap: fix license --- srcpkgs/openjdk9-bootstrap/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openjdk9-bootstrap/template b/srcpkgs/openjdk9-bootstrap/template index ca0d3b2c3c7e..48cc14fb712c 100644 --- a/srcpkgs/openjdk9-bootstrap/template +++ b/srcpkgs/openjdk9-bootstrap/template @@ -29,7 +29,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel freetype-devel alsa-lib-devel fontconfig-devel zlib-devel" short_desc="OpenJDK Java Development Kit (bootstrap version 9)" maintainer="q66 " -license="GPL-2.0-or-later" +license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="http://openjdk.java.net/" distfiles=" http://hg.openjdk.java.net/jdk-updates/jdk9u/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-root.tar.bz2 From 4e712ba637389178c754635d3066467623467368 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 17 Jan 2022 19:12:02 -0500 Subject: [PATCH 4/6] openjdk10-bootstrap: fix license --- srcpkgs/openjdk10-bootstrap/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openjdk10-bootstrap/template b/srcpkgs/openjdk10-bootstrap/template index de4f06293656..3d99cd14af98 100644 --- a/srcpkgs/openjdk10-bootstrap/template +++ b/srcpkgs/openjdk10-bootstrap/template @@ -29,7 +29,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel freetype-devel alsa-lib-devel fontconfig-devel zlib-devel" short_desc="OpenJDK Java Development Kit (bootstrap version 10)" maintainer="q66 " -license="GPL-2.0-or-later" +license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="http://openjdk.java.net/" distfiles="http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/jdk-${_repo_ver}.tar.bz2" checksum="374f7ae35f0a7439a40bd2c765d1f410607c75c6c1e788f1a344a42e59431f51" From 907ba84228741febbfc9fc786c998f0d229095e5 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 17 Jan 2022 19:22:05 -0500 Subject: [PATCH 5/6] openjdk11: fix license --- srcpkgs/openjdk11/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template index 7ff1a89d3249..bd38c0c5c010 100644 --- a/srcpkgs/openjdk11/template +++ b/srcpkgs/openjdk11/template @@ -32,13 +32,13 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel fontconfig-devel zlib-devel lcms2-devel" depends="fontconfig" -provides="java-environment-${version}_1 java-runtime-${version}_1" short_desc="OpenJDK Java Development Kit" maintainer="Kyle Nusbaum " -license="GPL-2.0-or-later" +license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="http://openjdk.java.net/" distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz" checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559 +provides="java-environment-${version}_1 java-runtime-${version}_1" shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so" # Build is still parallel, but don't use -jN. From e8dab7e4d3a365fd12ad1aec641da7adb050a07d Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 17 Jan 2022 19:22:15 -0500 Subject: [PATCH 6/6] openjdk11-bin: fix license --- srcpkgs/openjdk11-bin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openjdk11-bin/template b/srcpkgs/openjdk11-bin/template index b2da83d21eb6..59e336f13597 100644 --- a/srcpkgs/openjdk11-bin/template +++ b/srcpkgs/openjdk11-bin/template @@ -6,7 +6,7 @@ archs="x86_64" wrksrc=jdk-11 short_desc="Official Reference Implementation for Java SE 11" maintainer="Kyle Nusbaum " -license="GPL-2.0-or-later" +license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="https://jdk.java.net/java-se-ri/11" distfiles="https://download.java.net/openjdk/jdk11/ri/openjdk-${version}_linux-x64_bin.tar.gz" checksum=3784cfc4670f0d4c5482604c7c513beb1a92b005f569df9bf100e8bef6610f2e