[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/files/, dev-java/openjdk/
commit: 250d2f45f958ccb2a4e3c437d396b88f5d3bd59e Author: Sam James gentoo org> AuthorDate: Wed Mar 6 12:36:46 2024 + Commit: Sam James gentoo org> CommitDate: Wed Mar 6 12:42:18 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=250d2f45 dev-java/openjdk: add 8.402_p06 * Fix various modern C issues - all by backporting parts of later JDK 11/17/21 patches. * cgroup2 issues: Assuming bug #926247 affects the source build too, but not verified, so tagging that. * Drop stale -fcommon workaround (bug #850505). * Build with -std=gnu++14 because of -Wregister for Clang 17+ compat (bug #918655). (Part of the build uses -std=gnu++98 but not all of it.) Bug: https://bugs.gentoo.org/926247 Closes: https://bugs.gentoo.org/850505 Closes: https://bugs.gentoo.org/874621 Closes: https://bugs.gentoo.org/918655 Signed-off-by: Sam James gentoo.org> dev-java/openjdk/Manifest | 1 + ...penjdk-8.402_p06-0001-Fix-Wint-conversion.patch | 41 ..._p06-0002-Fix-Wincompatible-pointer-types.patch | 48 ...02_p06-0003-Fix-negative-value-left-shift.patch | 38 ...openjdk-8.402_p06-0004-Fix-misc.-warnings.patch | 61 ++ dev-java/openjdk/openjdk-8.402_p06.ebuild | 244 + 6 files changed, 433 insertions(+) diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest index 4bda6b86f359..d2297f205a54 100644 --- a/dev-java/openjdk/Manifest +++ b/dev-java/openjdk/Manifest @@ -4,6 +4,7 @@ DIST openjdk-11.0.20.1_p1.tar.gz 116165519 BLAKE2B 3f3627d6535770c6654226ca2c188 DIST openjdk-17.0.8.1_p1.tar.gz 105878760 BLAKE2B e4d752dc87717855bfe4bd84c97056f0d93b554c67bdbb3e750e20479e2156628c85aea7b404577ea6ff40d49669d5f53aab06d0c4cf9aa926b060a0cd93cd03 SHA512 0d8e9e54173be855c15d121d4d6cd36996700e1e2fb194ad93ba8ad794a342c87b7d2f81a32d0bb215e45f1dc1f4efdfe1be5e8de99395730902d443ac773813 DIST openjdk-21.0.1_p12.tar.gz 112241360 BLAKE2B 68a542a1dd65cf74b826e255d08350ec662c37337e45aec18d91e0dbdcce5c6e50172ad482cc21f1aacbf356722e009d4b6431aecf5a1d6b67b74a5007ca702a SHA512 def4b6688f063758235bc454bbbdb4caefa45d2724a9f2296af11d684801f05f1375f0be771b52d9235676e7f89dec816a34b3a1a1cc972662ee50de89600455 DIST openjdk-8.382_p05.tar.gz 93105951 BLAKE2B 07e2961dbbd8de153650a1f92fd88960e6b1b39e7d212cc158bd943d35da5fdab0595583226ac12134eb176b1c550576e7aef5dfaf4a76ac0060daa42f4b4495 SHA512 5879cfbd5795f0260897c52fe2503754767faf1e229832e0c4c6dd9957055fd7105d14403d82ccf92eed0adfecc5bc858a89643e68d3c81d437fd543fbfce49a +DIST openjdk-8.402_p06.tar.gz 93136112 BLAKE2B 023422ca2b4dfc08fd3642e3cb3ec0503d57d09dbcb54841e4a04f67a6cd118712cba90b7760eaf9135f9f001f7c15221c4bcb19986547fb2b6b3fb852bb8af4 SHA512 476d195ef500d8dd2013b17de0669a77ef8076b55c2753eb88b1a13f7a48526b1be7a1befabd284eb9ee8411df19ab1f39c81287ab659984d2d67e8aa7192d79 DIST openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz 108215404 BLAKE2B 5e6c0b905b34b437137922b73a9724da96b8832186fea945f8c73d941db822ca1cc5718f3ecb4607ed98d1f8241c9f365b54caaf978863e8b84680a94f067b5d SHA512 732e2220219d42be10589fcaf2420da87ebc8564b4afc6bd02f61f31cdca9c31b339366e34d374fb814499b92f8aa796435a18f28e10c8cb00d9a0f5953bb60e DIST openjdk-bootstrap-11.0.13_p8-x86.tar.xz 105420236 BLAKE2B d3137ad497937a9a04dedf38776f3ac45bf3b115d275991fd8582b72ade48390b6aa8ad89e0b4d34fa6a787a3c413dab20b32ef347dc8733544e810150c55d29 SHA512 f71a7ef8fbf19b0595dd7d4ebe52bbe1c95b8c17f34d092472c5f5ce8caf52a053f22db8587f1649f9a96ad01c0c632be343342812f5a8cc4ff843b33b8d9b0f DIST openjdk-bootstrap-11.0.14_p9-riscv.tar.xz 104601676 BLAKE2B 5f976e8a626a829fae70ad6c007f10bfeff79e29c85d6c75fb2f5ff8984fd2a2bd44ee6e07958dbbdaaed761c6839d375e1b5ba6cffc63b02ad9e2c9178310db SHA512 580dec81626553fe3e7afd0f6385a733ba80a0502cf0f9e8bdc973048887290c9ab6171267d61d8838c4ece4de58c9ca8b78540bd52b1757495a27175057ec64 diff --git a/dev-java/openjdk/files/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch b/dev-java/openjdk/files/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch new file mode 100644 index ..317f1aa226b3 --- /dev/null +++ b/dev-java/openjdk/files/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch @@ -0,0 +1,41 @@ +From cc568d4d246ffc9bf08a96db0889d3b89c852718 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Wed, 6 Mar 2024 11:22:11 + +Subject: [PATCH 1/4] Fix -Wint-conversion +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Backport of upstream commit https://github.com/openjdk/jdk21u-dev/commit/7b1455163ed893639059b3d62b71b2ff347c2e3f. + +Fixes the following warning/error: +``` +jdk8u-jdk8u402-ga/jdk/src/share/bin/splashscreen_stubs.c:64:5: error: returning ‘void *’ from a function with return type ‘int’ makes integer from pointer without a cast [-Wint-conversion] +``` + +Signed-off-by: Sam James +--- + jdk/src/share/bin/splashscreen_stubs.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/files/
commit: 2ddc8a8013b6e7e30028a19b4872b6f11279eeeb Author: Michael Mair-Keimberger levelnine at> AuthorDate: Fri Oct 27 05:22:29 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Fri Oct 27 07:10:52 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ddc8a80 dev-java/openjdk: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/33532 Signed-off-by: Florian Schmaus gentoo.org> .../files/openjdk-17.0.6-multihead-fix.patch | 24 -- 1 file changed, 24 deletions(-) diff --git a/dev-java/openjdk/files/openjdk-17.0.6-multihead-fix.patch b/dev-java/openjdk/files/openjdk-17.0.6-multihead-fix.patch deleted file mode 100644 index 46f503dd8e0b.. --- a/dev-java/openjdk/files/openjdk-17.0.6-multihead-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -From cfc9a881afd300bd7c1ce784287d1669308e89fc Mon Sep 17 00:00:00 2001 -From: Sergey Bylokhov -Date: Sat, 2 Jul 2022 00:25:20 + -Subject: [PATCH] 8288854: getLocalGraphicsEnvironment() on for multi-screen - setups throws exception NPE - -Reviewed-by: azvegint, aivanov - .../unix/classes/sun/awt/X11GraphicsEnvironment.java| 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java b/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java -index 5c9d2a1b695..93f5eaf6656 100644 a/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java -+++ b/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java -@@ -236,7 +236,7 @@ private synchronized void initDevices() { - throw new AWTError("no screen devices"); - } - int index = getDefaultScreenNum(); --mainScreen = 0 < index && index < screens.length ? index : 0; -+mainScreen = 0 < index && index < numScreens ? index : 0; - - for (int id = 0; id < numScreens; ++id) { - devices.put(id, old.containsKey(id) ? old.remove(id) :
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/files/, dev-java/openjdk/
commit: 141ab9e4fa81526f4f05e319329e2943a2e7d5a5 Author: Hank Leininger korelogic com> AuthorDate: Thu May 18 23:18:23 2023 + Commit: Sam James gentoo org> CommitDate: Sat May 20 06:27:47 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=141ab9e4 dev-java/openjdk: fix multi-screen bug See $BUG, https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=264356, https://bugs.openjdk.org/browse/JDK-8299417 Cherry-picked the fix that has landed in the next openjdk release. Signed-off-by: Hank Leininger korelogic.com> Closes: https://bugs.gentoo.org/906708 Closes: https://github.com/gentoo/gentoo/pull/31091 Signed-off-by: Sam James gentoo.org> .../files/openjdk-17.0.6-multihead-fix.patch | 24 ++ dev-java/openjdk/openjdk-17.0.6_p10-r1.ebuild | 325 + 2 files changed, 349 insertions(+) diff --git a/dev-java/openjdk/files/openjdk-17.0.6-multihead-fix.patch b/dev-java/openjdk/files/openjdk-17.0.6-multihead-fix.patch new file mode 100644 index ..46f503dd8e0b --- /dev/null +++ b/dev-java/openjdk/files/openjdk-17.0.6-multihead-fix.patch @@ -0,0 +1,24 @@ +From cfc9a881afd300bd7c1ce784287d1669308e89fc Mon Sep 17 00:00:00 2001 +From: Sergey Bylokhov +Date: Sat, 2 Jul 2022 00:25:20 + +Subject: [PATCH] 8288854: getLocalGraphicsEnvironment() on for multi-screen + setups throws exception NPE + +Reviewed-by: azvegint, aivanov +--- + .../unix/classes/sun/awt/X11GraphicsEnvironment.java| 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java b/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java +index 5c9d2a1b695..93f5eaf6656 100644 +--- a/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java b/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java +@@ -236,7 +236,7 @@ private synchronized void initDevices() { + throw new AWTError("no screen devices"); + } + int index = getDefaultScreenNum(); +-mainScreen = 0 < index && index < screens.length ? index : 0; ++mainScreen = 0 < index && index < numScreens ? index : 0; + + for (int id = 0; id < numScreens; ++id) { + devices.put(id, old.containsKey(id) ? old.remove(id) : diff --git a/dev-java/openjdk/openjdk-17.0.6_p10-r1.ebuild b/dev-java/openjdk/openjdk-17.0.6_p10-r1.ebuild new file mode 100644 index ..1a2fcdf2672e --- /dev/null +++ b/dev-java/openjdk/openjdk-17.0.6_p10-r1.ebuild @@ -0,0 +1,325 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs + +# variable name format: _XPAK +ARM64_XPAK="17.0.2_p8" # musl bootstrap install +PPC64_XPAK="17.0.1_p12" # big-endian bootstrap tarball +RISCV_XPAK="17.0.3_p7" +X86_XPAK="17.0.1_p12" + +# Usage: bootstrap_uri [extracond] +# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian) +# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) ) +bootstrap_uri() { + local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap; + local suff="tar.xz" + local kw="${1:?${FUNCNAME[0]}: keyword not specified}" + local ver="${2:?${FUNCNAME[0]}: version not specified}" + local cond="${3-}" + [[ ${cond} == elibc_musl* ]] && local musl=yes + + # here be dragons + echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })" +} + +# don't change versioning scheme +# to find correct _p number, look at +# https://github.com/openjdk/jdk${SLOT}u/tags +# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point +# to exact same commit sha. we should always use the full version. +# -ga tag is just for humans to easily identify General Availability release tag. +MY_PV="${PV%_p*}-ga" +SLOT="${MY_PV%%[.+]*}" + +DESCRIPTION="Open source implementation of the Java programming language" +HOMEPAGE="https://openjdk.org; +SRC_URI=" + https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz + -> ${P}.tar.gz + !system-bootstrap? ( + $(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl) + $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian) + $(bootstrap_uri x86 ${X86_XPAK}) + $(bootstrap_uri riscv ${RISCV_XPAK}) + ) + riscv? ( https://dev.gentoo.org/~gyakovlev/distfiles/dev-java/openjdk/java17-riscv64.patch ) +" +# riscv patch origin: +# https://raw.githubusercontent.com/felixonmars/archriscv-packages/master/java17-openjdk/java17-riscv64.patch + +LICENSE="GPL-2-with-classpath-exception" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + +IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source system-bootstrap
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/files/, dev-java/openjdk/
commit: 47a6b18cec31fafb037c2aa6189cc1c026055e42 Author: Mike Gilbert gentoo org> AuthorDate: Tue Jun 28 18:28:56 2022 + Commit: Georgy Yakovlev gentoo org> CommitDate: Mon Jul 4 10:44:32 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47a6b18c dev-java/openjdk: consolidate env files Also drop the pointless copyright notice. Signed-off-by: Mike Gilbert gentoo.org> Signed-off-by: Georgy Yakovlev gentoo.org> dev-java/openjdk/files/openjdk-17.env.sh | 16 dev-java/openjdk/files/openjdk-8.env.sh | 3 --- .../openjdk/files/{openjdk-11.env.sh => openjdk.env.sh} | 3 --- dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild | 2 +- dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild | 2 +- 5 files changed, 2 insertions(+), 24 deletions(-) diff --git a/dev-java/openjdk/files/openjdk-17.env.sh b/dev-java/openjdk/files/openjdk-17.env.sh deleted file mode 100644 index 7db6461bf48f.. --- a/dev-java/openjdk/files/openjdk-17.env.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -VERSION="OpenJDK ${PV}" -JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" -JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" -JAVAC="\${JAVA_HOME}/bin/javac" -PATH="\${JAVA_HOME}/bin" -ROOTPATH="\${JAVA_HOME}/bin" -LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" -MANPATH="" -PROVIDES_TYPE="JDK JRE" -PROVIDES_VERSION="${SLOT}" -BOOTCLASSPATH="" -GENERATION="2" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/openjdk/files/openjdk-8.env.sh b/dev-java/openjdk/files/openjdk-8.env.sh index 8f863e4c869a..cc0bc80b474b 100644 --- a/dev-java/openjdk/files/openjdk-8.env.sh +++ b/dev-java/openjdk/files/openjdk-8.env.sh @@ -1,6 +1,3 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - VERSION="OpenJDK ${PV}" JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" diff --git a/dev-java/openjdk/files/openjdk-11.env.sh b/dev-java/openjdk/files/openjdk.env.sh similarity index 80% rename from dev-java/openjdk/files/openjdk-11.env.sh rename to dev-java/openjdk/files/openjdk.env.sh index 96c4be79c33f..287c0578b7c2 100644 --- a/dev-java/openjdk/files/openjdk-11.env.sh +++ b/dev-java/openjdk/files/openjdk.env.sh @@ -1,6 +1,3 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - VERSION="OpenJDK ${PV}" JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" diff --git a/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild b/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild index 8431ae423614..4b7612e1259b 100644 --- a/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild +++ b/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild @@ -278,7 +278,7 @@ src_install() { einfo "Creating the Class Data Sharing archives and disabling usage tracking" "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die - java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh + java-vm_install-env "${FILESDIR}"/${PN}.env.sh java-vm_revdep-mask java-vm_sandbox-predict /dev/random /proc/self/coredump_filter diff --git a/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild b/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild index 18915c340d94..226b675fbd2f 100644 --- a/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild +++ b/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild @@ -291,7 +291,7 @@ src_install() { einfo "Creating the Class Data Sharing archives and disabling usage tracking" "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh + use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh java-vm_revdep-mask java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/files/, dev-java/openjdk/
commit: be4e238f48ff45815c2a5a37b09edec7c0030118 Author: Georgy Yakovlev gentoo org> AuthorDate: Tue Jul 27 01:05:14 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Tue Jul 27 01:23:52 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be4e238f dev-java/openjdk: add 8.302_p08 Bug: https://bugs.gentoo.org/803605 Signed-off-by: Georgy Yakovlev gentoo.org> dev-java/openjdk/Manifest | 16 ++ dev-java/openjdk/files/openjdk-8.env.sh | 2 +- dev-java/openjdk/openjdk-8.302_p08.ebuild | 253 ++ 3 files changed, 270 insertions(+), 1 deletion(-) diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest index 35d7bee2b77..ceba6878ea9 100644 --- a/dev-java/openjdk/Manifest +++ b/dev-java/openjdk/Manifest @@ -1,17 +1,33 @@ DIST openjdk-11.0.11_p9.tar.bz2 95298760 BLAKE2B 7572d297fecffa9d38998c79dda00ea9361c1cf2f6c8bf51bac782da17cd3b6b272d08ab57fff96d523a1299f5514cb3788d05eeb37ef467ee7ad8bbb156d98e SHA512 72deecf32b793fa331deb6a1c0294b1efc68b72af9aebc1ba0528189e0097ff6d226cd0c3947d3cdc35c3cf28b3450cc538d375be0b9d43dca379f244894d20e DIST openjdk-8.292_p10.tar.bz2 457861 BLAKE2B 043c1d6f7d040dedaadd05091ce4fdf3f516c1cd241e3603c81f2c49fd81df9c4f1082822a5471255381d56f3ab838a24e499b4ec647f3354ee051078c496b2c SHA512 6e1ac380db32fa5f1decc80291dcdb5e1d3d9afb0dc4587966c5a1b840588a984bc07109c23cb0c69c60509c6db8152e7306509280063f7d2e853aed41e391cc +DIST openjdk-8.302_p08.tar.bz2 459824 BLAKE2B 19909605f3ae93f94875268e88b8fea0a49be0d8adbf2d2369c5fa1e66f6880094730294cb52bad009984c7ac7f63b8271fa43d0901fe4ce52b7b03696aaa6e3 SHA512 2be9c2965e307b09dcd07225e09665bbc818ba851d9e854645218194f0052eb4736f49915fddebb2a89043b0c14d7a6d5de145fb712034661568610e596fe0e5 DIST openjdk-aarch64-shenandoah-8.292_p10.tar.bz2 464164 BLAKE2B 3f50f20517ef7b4599f9062330b3bc86900c137751e65d3047d165ad153032447b5f9c88e0d390c0ed758ad10d818295ce2cde04150da5036dd6b05fa26c2745 SHA512 074e9ea2fe83f4edb4d0de72f0d1a9c9091c28707c17b08ffab11cad2620790e740bfe53cef41a07d04b31cc32c1388e52e09eb07ca0b9929300d611c514619e +DIST openjdk-aarch64-shenandoah-8.302_p08.tar.bz2 466591 BLAKE2B 3ef3939a2ed30c628d92319b2ef68472e53b47752faa331728966432c8469138b61e634e021aa5f69eef608e951cee5f0b77c1de6f3768cf568900f2eb78c5be SHA512 deb126036fecdc9a65b8a203ba32f99a2114cbcba2680950963d3e87565277e14ac53d802278e1f27c2a73be02d0ef77549de4ecd9ee355b1c8e45a86c83b095 DIST openjdk-aarch64-shenandoah-corba-8.292_p10.tar.bz2 1052188 BLAKE2B b4acda6a4d97cdfb4cfe16e1442dac6989af5fec82143dabb914ee31632b5421bc091708b06e37f95d552b21dbf24ed681b026635e96d32f05ac7d964eb53ac0 SHA512 9f4cfdf8a2580414f90ce0b128fd2ebbeb46977994605d3182ee5033be92898f3b292bafe6c0ca3a0fc767c03de598c93e25cbbc06726383b35961d40c601cee +DIST openjdk-aarch64-shenandoah-corba-8.302_p08.tar.bz2 1053085 BLAKE2B 02296f31b6ad8f72e89baf669c47d59a71ff02dcb87efac020b3dd443b033e8e9e4faa831a08922db5fc5f07872233e3314bd416eb97d7946110d89fa2cc9f87 SHA512 11f3413ec44b3cd7d543464b1757fa041798861e3b323641b26abe5edd3ba8edaacb6a5fd26d5b9f27d60cbb38983c6fd55ba80c13ff7ec09839d2c340f305bb DIST openjdk-aarch64-shenandoah-hotspot-8.292_p10.tar.bz2 8787501 BLAKE2B 628c84ad165e82b782a66c159ea2bfc2e739eafa41981d353272911bce3338b8eedeb204bf5c8238270ef22259c215301dbf30bcbcc366bbb1c1ed05c6bcf0fc SHA512 50a97c8bbf225c7b2dae50d398eb17831ad761fafb210a481942101bac54164604c76353ca4f0ec7c3a601039eb80164afdfc62f509c0b87e9c948970c0e6140 +DIST openjdk-aarch64-shenandoah-hotspot-8.302_p08.tar.bz2 8790278 BLAKE2B 4dfc70455f680f683c51620acc4624f2301b4304ff5e56783665a00b0366a67612b0219f45fd97021f7e6c396ffcd60355bc642e2cb4fd87c9f93443f72df9de SHA512 68473f17aeb4bdac87385ae33f8c241003b8dde51200633a1cc7f7f92e2ed92151c49ad023427970d855d52f35615709f0076b1cf073a00961f320b825ecbf78 DIST openjdk-aarch64-shenandoah-jaxp-8.292_p10.tar.bz2 2726660 BLAKE2B dc720b115212084ab59a4af6b257b485592a84e630650445ed3bdc0c471d529bdc8a1f2b73c5e38fbdd65ff1c221309e814adbba851c59279c8b3740b4560d90 SHA512 43c0e6327c3f7ff2d6320e7d1504f1575c0993c53a207dcabc75a0e1785fcca2aac7f78856db374198e3e95bce4bb05520a9a4e94f2ec03446b28f4d65cd69b6 +DIST openjdk-aarch64-shenandoah-jaxp-8.302_p08.tar.bz2 2726090 BLAKE2B b15a940dc1832f9c5536da5b0f024a091e62500eed7300075e7e8b21491cbe67a4e56f0cbb0e247e288b766619212f34e5cbb4265bb7688f44dc85f6d666c622 SHA512 e77d10caa9e2844470e01512a78cfce10c4d93c1d0597e405fa7233d5b402bb5c015045770fc2f338d24d98c978d23bfa7c6c0edc65f8bb48233c3a5a846e3e9 DIST openjdk-aarch64-shenandoah-jaxws-8.292_p10.tar.bz2 2560138 BLAKE2B 6e40ca6fd363c6ef9500b6b40c7f6c836b496899d289d0626f0e52412924498eb6b000291b58af8d42b9bc7dcc2beb1374ef6b8ea18d483841568d3848230842 SHA512 0ffbe33f375f18679797a7e724b621015650a6a9374ff231814f8e8ad0eafe42f281f76a83e87e234604c266ccbc15bd6e84692c3d7e272e702be316ce0048b2 +DIST openjdk-aarch64-shenandoah-jaxws-8.302_p08.tar.bz2 2560243 BLAKE2B
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/files/, dev-java/openjdk/
commit: c79be6d69533e45fb077c952085eb2dd38b3a745 Author: Georgy Yakovlev gentoo org> AuthorDate: Thu Mar 25 01:44:54 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Thu Mar 25 01:46:32 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c79be6d6 dev-java/openjdk: revbump 8, fix build with gcc10 _ZN14ArrayAllocatorImL10MemoryType7EE4freeEv: symbol not found Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Georgy Yakovlev gentoo.org> .../files/openjdk-8-insantiate-arrayallocator.patch | 16 ...njdk-8.282_p08.ebuild => openjdk-8.282_p08-r1.ebuild} | 2 ++ 2 files changed, 18 insertions(+) diff --git a/dev-java/openjdk/files/openjdk-8-insantiate-arrayallocator.patch b/dev-java/openjdk/files/openjdk-8-insantiate-arrayallocator.patch new file mode 100644 index 000..ba5283f1577 --- /dev/null +++ b/dev-java/openjdk/files/openjdk-8-insantiate-arrayallocator.patch @@ -0,0 +1,16 @@ +Workarounds build error: +Error: dl failure on line 895 +Error relocating .../libjvm.so: _ZN14ArrayAllocatorImL10MemoryType7EE4freeEv: symbol not found + +Possibly due to g++ 10.x error on not properly instantiating the template. + +--- openjdk/hotspot/src/share/vm/utilities/bitMap.cpp.orig 2020-11-10 14:07:08.372045326 +0200 openjdk/hotspot/src/share/vm/utilities/bitMap.cpp 2020-11-10 14:08:07.911412813 +0200 +@@ -42,6 +42,7 @@ + # include "os_bsd.inline.hpp" + #endif + ++template class ArrayAllocator; + + BitMap::BitMap(bm_word_t* map, idx_t size_in_bits) : + _map(map), _size(size_in_bits), _map_allocator(false) diff --git a/dev-java/openjdk/openjdk-8.282_p08.ebuild b/dev-java/openjdk/openjdk-8.282_p08-r1.ebuild similarity index 99% rename from dev-java/openjdk/openjdk-8.282_p08.ebuild rename to dev-java/openjdk/openjdk-8.282_p08-r1.ebuild index 093a181abbf..88eb48ba9b1 100644 --- a/dev-java/openjdk/openjdk-8.282_p08.ebuild +++ b/dev-java/openjdk/openjdk-8.282_p08-r1.ebuild @@ -91,6 +91,8 @@ DEPEND=" PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )" +PATCHES=( "${FILESDIR}/openjdk-8-insantiate-arrayallocator.patch" ) + # The space required to build varies wildly depending on USE flags, # ranging from 2GB to 16GB. This function is certainly not exact but # should be close enough to be useful.
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/files/, dev-java/openjdk/
commit: b2e262024d4c564b29a7da88732e2c422234549e Author: Georgy Yakovlev gentoo org> AuthorDate: Tue Aug 4 21:44:55 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Tue Aug 4 21:58:23 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2e26202 dev-java/openjdk: drop old Bug: https://bugs.gentoo.org/732624 Closes: https://bugs.gentoo.org/734320 Closes: https://bugs.gentoo.org/706012 Closes: https://bugs.gentoo.org/713180 Closes: https://bugs.gentoo.org/706638 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Georgy Yakovlev gentoo.org> dev-java/openjdk/Manifest | 17 -- .../openjdk/files/openjdk-11.0.7_p10-sigsegv.patch | 55 .../openjdk/files/openjdk-8-detect-gcc10.patch | 49 dev-java/openjdk/openjdk-11.0.7_p10.ebuild | 280 - dev-java/openjdk/openjdk-8.252_p09.ebuild | 231 - dev-java/openjdk/openjdk-8.262_p10.ebuild | 226 - 6 files changed, 858 deletions(-) diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest index c3e413b9dd0..e5d12e87686 100644 --- a/dev-java/openjdk/Manifest +++ b/dev-java/openjdk/Manifest @@ -1,26 +1,9 @@ -DIST openjdk-11.0.7_p10.tar.bz2 91317054 BLAKE2B 113f6d0b1ea97aa6c3a619a3f4183b72f5e0448422d17b6ffc4d778ce50eee68e4495d610845d1f3aace2e5660703dad96583203c6d12b5528e0f33f78df7cec SHA512 c6776bd05e2cbb42134ccf5cd522e4b73d1662e3cf136a8718c5d302b9c44e76b74a554b81aa14c5deda20bee76abc80a144f5c2e1941b70c9503579c325aa12 DIST openjdk-11.0.8_p10.tar.bz2 91141175 BLAKE2B eeef0f6b6a8f804e043cde01de256c86ed35d5a391588100caea49c8c2b617c3f06aa37df894feaa89734e68c32fe28d8bc5337755050c457d657cf88fcff7f3 SHA512 f8fd26a11cb044197d3b04a1347e27e177e79cb58436e67116f63025a2a5c39c0083ac17362e7d2234caf89df530422ead088e3fc4546f8d9f68482fc75eb7a0 -DIST openjdk-8.252_p09.tar.bz2 454656 BLAKE2B 7132af72a09da9ded1759ccf92da6237a24e3fd15209b8d5aecb7011b890cd3484b4724f6b6a144e4bc5cb41931076985f75a9089c178938be62ac1a1d2a7f07 SHA512 0f03f1549dea1577cb01895d4e34721d16443977c5e7b3f0744af9cf2c0b09e60cb6d91b35a5e474c593d518d5610fb4c14fc4b9a907a7e13bb2351cea51bd06 -DIST openjdk-8.262_p10.tar.bz2 455868 BLAKE2B 22637a8ecd2af97b8cdc335fff5d4a14c56f53a26f0fe1ccb61f7f6542961126f4a2dadfc596ae561ea27cfdbc5f23fb10350d1533f43f1740540367565cb160 SHA512 196e201cbbd53132a78f276df7407346ba611798d813272c68cd3d654f34b84874009cda1df62e51fd5e33c5bc4aa4bdda6bd0ef7cac9857c609fcdb3fa3fd53 DIST openjdk-8.265_p01.tar.bz2 456095 BLAKE2B 8de4d0293f3062583654da99a29d5be02197c323772f663d37ab21bdfdf32a723412d301094e6f70cbba99883241f52406a799a91c3d7c2a69ab7b35932c0a38 SHA512 686b869f9278462c6cb52036c4c9261e1689b917ce0afd4e6b47bb3d3207b2e79b2d03c2d3808a5853ab2fa070ac2206877849f5837282cb6deb80f610ba67f5 -DIST openjdk-corba-8.252_p09.tar.bz2 1034367 BLAKE2B d281a0b2e092c637adae4a206ac4b3f7beeb65f0fce5862f996ac71a814c5c3ee3261dd1145660cb50fde0398e42ca1e8c86d6aad07e43b44aa1f903c204b21c SHA512 08f348849eeadefee3dce9658b519091a14b9f972a1ee1dc51c37a3cd766e5265faed1931b967410ebff2132dd18cedf8840277d804b402ee43a862e37575ab1 -DIST openjdk-corba-8.262_p10.tar.bz2 1033428 BLAKE2B 979f86546dc4c558c8615e4cc1887bcc4a0b82845cf6474ef3802321cb205037c2c753c55f0c219cba3e0771bc2e1a7096b6ad93ce8582e45ef6b5815c0c593b SHA512 4b91cbcc55b983719aa1e0fb683bf2d169b908eb4d4e24857dfd918f4f086e6ce1317f980ba89ff911673131c71c27149091ee114deb75e6f98f31b0922bc04f DIST openjdk-corba-8.265_p01.tar.bz2 1034140 BLAKE2B 4b176bf2d9ff461b5682ad7f4b994091acf017df2caabf292dcda9baa34abd7d8016f56f2aff0866508eac565f4079e6f8ba8cbd8167abf1e38cd1fac727e141 SHA512 d92b69ab33176c29c5b7c0a5a21947d5d28dafa32a5933414bea5d16d4e68e1a381b2a73114952d507e7ee76c132e70dc8234175edfd3a086c4775417eaa7d9a -DIST openjdk-hotspot-8.252_p09.tar.bz2 7954548 BLAKE2B a791d3c3385be3c8543bea1fc8d5bee9b3de873122ec850c3ad0082430083ec9dff2aa7c0cae33e628047a18a76fca8146b68aa52f32845cf7a61a45fdc8d9eb SHA512 53079cc255f75f246a67937bdf2b7715882f9baf8bcbc46ab2963c259359b1008642aeeae7ba7705c39f7a04e69ba286421a83b90294e81071f8e630db48ba7c -DIST openjdk-hotspot-8.262_p10.tar.bz2 8204485 BLAKE2B dd4411fdceb36c378d15fce45dc75ea6b2e19c219a6b46e10de3864407d9eff0a4fcb7fcf2f5f0bc613b68cd54766404f25c76346c7500e7a2018c0001ad4981 SHA512 11880562cebbdc4abd59cd2ac234ca697316c1ec78ad291fa41d69fe8f5f01f30db0c3e224226521afcaf798619a5afc9055ea12fcd41f5da179a353351dff2a DIST openjdk-hotspot-8.265_p01.tar.bz2 8204133 BLAKE2B 3c574da38c9c787e2b40dafa6d7885f9632804a158de26fb4e6f9b5266c955adad8adb1917043eecba97fbb1e53c063da08231e806f5ba8f6c0ef762e88c45b6 SHA512 a3fbc527456aeb8566db24f910e6a64f976e3434fe3717058ee91e66e88d03d77641d342801002f7fa35fb8bb94ce397c95ac2abb86c0616ff25f167878b478b -DIST openjdk-jaxp-8.252_p09.tar.bz2 2736174 BLAKE2B c198f144be7d0e7439e2184768db8649973f9e6869e67d3a950abd4872584160f4aaec1f4bec727f0d38830d34a4be7bd2f3e897b8ca10c758212262fa1672c3 SHA512
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/files/
commit: 6ba3df1ca9031ed30ef761e48a6afd61e20a2e4a Author: Georgy Yakovlev gentoo org> AuthorDate: Sun May 24 04:06:40 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Sun May 24 04:06:40 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ba3df1c dev-java/openjdk: drop unused patch Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Georgy Yakovlev gentoo.org> dev-java/openjdk/files/openjdk-11-make43.patch | 12 1 file changed, 12 deletions(-) diff --git a/dev-java/openjdk/files/openjdk-11-make43.patch b/dev-java/openjdk/files/openjdk-11-make43.patch deleted file mode 100644 index 9466e2be56f..000 --- a/dev-java/openjdk/files/openjdk-11-make43.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk -index 170c3ed..b3b49f1 100644 a/make/common/MakeBase.gmk -+++ b/make/common/MakeBase.gmk -@@ -974,6 +974,7 @@ DependOnVariableFileName = \ - # Param 2 - (optional) name of file to store value in - DependOnVariableHelper = \ - $(strip \ -+$(eval $(call DependOnVariableFileName, $1, $2):$(NEWLINE)true) \ - $(eval -include $(call DependOnVariableFileName, $1, $2)) \ - $(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\ - $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/files/, dev-java/openjdk/
commit: 9465512df55b6c865841953f2d8b5c64550fb7ba Author: Georgy Yakovlev gentoo org> AuthorDate: Sun May 24 03:51:32 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Sun May 24 03:51:47 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9465512d dev-java/openjdk: add gcc10 patch to openjdk-8 Bug: https://bugs.gentoo.org/721970 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Georgy Yakovlev gentoo.org> .../openjdk/files/openjdk-8-detect-gcc10.patch | 49 ++ dev-java/openjdk/openjdk-8.252_p09.ebuild | 5 +++ 2 files changed, 54 insertions(+) diff --git a/dev-java/openjdk/files/openjdk-8-detect-gcc10.patch b/dev-java/openjdk/files/openjdk-8-detect-gcc10.patch new file mode 100644 index 000..b47e012d4a3 --- /dev/null +++ b/dev-java/openjdk/files/openjdk-8-detect-gcc10.patch @@ -0,0 +1,49 @@ +From 6d96aaac5662f734b0a933397ebb8cd4ff66606d Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev +Date: Sat, 23 May 2020 20:48:10 -0700 +Subject: [PATCH] backport gcc10 fix + +https://hg.openjdk.java.net/jdk8u/jdk8u/rev/39a7914e14a0 +--- + common/autoconf/generated-configure.sh | 4 ++-- + common/autoconf/toolchain.m4 | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh +index 5e71c50..90c017d 100644 +--- a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh +@@ -27955,7 +27955,7 @@ $as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSIO + COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \ + $SED -e 's/ *Copyright .*//'` + COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ +-$SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'` ++$SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'` + elif test "x$TOOLCHAIN_TYPE" = xclang; then + # clang --version output typically looks like + #Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn) +@@ -29696,7 +29696,7 @@ $as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSIO + COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \ + $SED -e 's/ *Copyright .*//'` + COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ +-$SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'` ++$SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'` + elif test "x$TOOLCHAIN_TYPE" = xclang; then + # clang --version output typically looks like + #Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn) +diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4 +index e3a82c8..c0a4af5 100644 +--- a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4 +@@ -433,7 +433,7 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION], + COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \ + $SED -e 's/ *Copyright .*//'` + COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ +-$SED -e 's/^.* \(@<:@1-9@:>@\.@<:@0-9.@:>@*\) .*$/\1/'` ++$SED -e 's/^.* \(@<:@1-9@:>@@<:@0-9@:>@*\.@<:@0-9.@:>@*\) .*$/\1/'` + elif test "x$TOOLCHAIN_TYPE" = xclang; then + # clang --version output typically looks like + #Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn) +-- +2.26.2 + diff --git a/dev-java/openjdk/openjdk-8.252_p09.ebuild b/dev-java/openjdk/openjdk-8.252_p09.ebuild index 1b3576eacaf..45c3e3cc90c 100644 --- a/dev-java/openjdk/openjdk-8.252_p09.ebuild +++ b/dev-java/openjdk/openjdk-8.252_p09.ebuild @@ -80,6 +80,11 @@ PDEPEND=" S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}" +# bug 721970, JDK-8244760 +PATCHES=( + "${FILESDIR}/openjdk-8-detect-gcc10.patch" +) + # The space required to build varies wildly depending on USE flags, # ranging from 2GB to 16GB. This function is certainly not exact but # should be close enough to be useful.
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/files/
commit: dc0e12c39497c9706b07a83b0751abede88d1bc5 Author: Georgy Yakovlev gentoo org> AuthorDate: Sun May 10 07:51:21 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Sun May 10 07:51:21 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc0e12c3 dev-java/openjdk: remove unused generate-cacerts.pl we use system java store now Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Georgy Yakovlev gentoo.org> dev-java/openjdk/files/generate-cacerts.pl | 358 - 1 file changed, 358 deletions(-) diff --git a/dev-java/openjdk/files/generate-cacerts.pl b/dev-java/openjdk/files/generate-cacerts.pl deleted file mode 100644 index 17d29b36676..000 --- a/dev-java/openjdk/files/generate-cacerts.pl +++ /dev/null @@ -1,358 +0,0 @@ -#!/usr/bin/perl - -# Copyright (C) 2007, 2008 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# generate-cacerts.pl generates a JKS keystore named 'cacerts' from -# OpenSSL's certificate bundle using OpenJDK's keytool. - -# First extract each of OpenSSL's bundled certificates into its own -# aliased filename. - -# Downloaded from http://cvs.fedoraproject.org/viewvc/rpms/ca-certificates/F-12/generate-cacerts.pl?revision=1.2 -# Check and prevention of duplicate aliases added by Vlastimil Babka - -$file = $ARGV[1]; -open(CERTS, $file); -@certs = ; -close(CERTS); - -$pem_file_count = 0; -$in_cert_block = 0; -$write_current_cert = 1; -foreach $cert (@certs) -{ -if ($cert =~ /Issuer: /) -{ -$_ = $cert; -if ($cert =~ /personal-freemail/) -{ -$cert_alias = "thawtepersonalfreemailca"; -} -elsif ($cert =~ /personal-basic/) -{ -$cert_alias = "thawtepersonalbasicca"; -} -elsif ($cert =~ /personal-premium/) -{ -$cert_alias = "thawtepersonalpremiumca"; -} -elsif ($cert =~ /server-certs/) -{ -$cert_alias = "thawteserverca"; -} -elsif ($cert =~ /premium-server/) -{ -$cert_alias = "thawtepremiumserverca"; -} -elsif ($cert =~ /Class 1 Public Primary Certification Authority$/) -{ -$cert_alias = "verisignclass1ca"; -} -elsif ($cert =~ /Class 1 Public Primary Certification Authority - G2/) -{ -$cert_alias = "verisignclass1g2ca"; -} -elsif ($cert =~ - /VeriSign Class 1 Public Primary Certification Authority - G3/) -{ -$cert_alias = "verisignclass1g3ca"; -} -elsif ($cert =~ /Class 2 Public Primary Certification Authority$/) -{ -$cert_alias = "verisignclass2ca"; -} -elsif ($cert =~ /Class 2 Public Primary Certification Authority - G2/) -{ -$cert_alias = "verisignclass2g2ca"; -} -elsif ($cert =~ - /VeriSign Class 2 Public Primary Certification Authority - G3/) -{ -$cert_alias = "verisignclass2g3ca"; -} -elsif ($cert =~ /Class 3 Public Primary Certification Authority$/) -{ -$cert_alias = "verisignclass3ca"; -} -# Version 1 of Class 3 Public Primary Certification Authority -# - G2 is added. Version 3 is excluded. See below. -elsif ($cert =~ - /VeriSign Class 3 Public Primary Certification Authority - G3/) -{ -$cert_alias = "verisignclass3g3ca"; -} -elsif ($cert =~ - /RSA Data Security.*Secure Server Certification Authority/) -{ -$cert_alias = "verisignserverca"; -} -elsif ($cert =~ /GTE CyberTrust Global Root/) -{ -$cert_alias = "gtecybertrustglobalca"; -} -elsif ($cert =~ /Baltimore CyberTrust Root/) -{ -$cert_alias = "baltimorecybertrustca"; -} -elsif ($cert =~ /www.entrust.net\/Client_CA_Info\/CPS/) -{ -$cert_alias = "entrustclientca"; -} -elsif ($cert =~ /www.entrust.net\/GCCA_CPS/) -{ -$cert_alias = "entrustglobalclientca"; -} -elsif ($cert =~ /www.entrust.net\/CPS_2048/) -{ -$cert_alias = "entrust2048ca"; -} -elsif ($cert =~ /www.entrust.net\/CPS /) -{ -$cert_alias = "entrustsslca"; -} -elsif ($cert =~ /www.entrust.net\/SSL_CPS/) -{ -
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/files/, dev-java/openjdk/
commit: 15f4b287d4e51821577b32f7f7d435d0e9030461 Author: Georgy Yakovlev gentoo org> AuthorDate: Thu Apr 23 20:41:15 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Thu Apr 23 20:41:47 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15f4b287 dev-java/openjdk: add patch to 11.0.7 to fix SIGSEGV in bootstrap Happens if bootstrap jvm was compiled with 11.0.7 (like -bin version) Bug: https://bugs.gentoo.org/719118 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Georgy Yakovlev gentoo.org> .../openjdk/files/openjdk-11.0.7_p10-sigsegv.patch | 55 ++ dev-java/openjdk/openjdk-11.0.7_p10.ebuild | 4 ++ 2 files changed, 59 insertions(+) diff --git a/dev-java/openjdk/files/openjdk-11.0.7_p10-sigsegv.patch b/dev-java/openjdk/files/openjdk-11.0.7_p10-sigsegv.patch new file mode 100644 index 000..04c61c06589 --- /dev/null +++ b/dev-java/openjdk/files/openjdk-11.0.7_p10-sigsegv.patch @@ -0,0 +1,55 @@ + +# HG changeset patch +# User ccheung +# Date 1564075552 25200 +# Node ID f1332f6025515e4fc9e42fbf79f983d782abaaf0 +# Parent 966fc6d784a737ec25cd0b1be48109a4a3fa02ad +8228407: JVM crashes with shared archive file mismatch +Summary: Stop processing other header fields if initial header check has failed. +Reviewed-by: dholmes, jiangli + +diff -r 966fc6d784a7 -r f1332f602551 src/hotspot/share/memory/filemap.cpp +--- a/src/hotspot/share/memory/filemap.cpp Mon Mar 02 12:30:59 2020 +0100 b/src/hotspot/share/memory/filemap.cpp Thu Jul 25 10:25:52 2019 -0700 +@@ -1287,7 +1287,9 @@ + } + + init_from_file(_fd); +- if (!validate_header()) { ++ // UseSharedSpaces could be disabled if the checking of some of the header fields in ++ // init_from_file has failed. ++ if (!UseSharedSpaces || !validate_header()) { + return false; + } + return true; +diff -r 966fc6d784a7 -r f1332f602551 test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java +--- a/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java Mon Mar 02 12:30:59 2020 +0100 b/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java Thu Jul 25 10:25:52 2019 -0700 +@@ -385,8 +385,16 @@ + output.shouldNotContain("Checksum verification failed"); + + copyFile(orgJsaFile, jsa); ++// modify _jvm_ident and run with -Xshare:auto ++System.out.println("\n2b. Corrupt _jvm_ident run with -Xshare:auto\n"); ++modifyJvmIdent(); ++output = TestCommon.execAuto(execArgs); ++output.shouldContain("The shared archive file was created by a different version or build of HotSpot"); ++output.shouldContain("Hello World"); ++ ++copyFile(orgJsaFile, jsa); + // modify _magic and _paths_misc_info_size, test should fail +-System.out.println("\n2b. Corrupt _magic and _paths_misc_info_size, should fail\n"); ++System.out.println("\n2c. Corrupt _magic and _paths_misc_info_size, should fail\n"); + modifyHeaderIntField(offset_magic, 0x); + modifyHeaderIntField(offset_paths_misc_info_size, Integer.MAX_VALUE); + output = TestCommon.execCommon(execArgs); +@@ -395,7 +403,7 @@ + + copyFile(orgJsaFile, jsa); + // modify _version and _paths_misc_info_size, test should fail +-System.out.println("\n2c. Corrupt _version and _paths_misc_info_size, should fail\n"); ++System.out.println("\n2d. Corrupt _version and _paths_misc_info_size, should fail\n"); + modifyHeaderIntField(offset_version, 0x); + modifyHeaderIntField(offset_paths_misc_info_size, Integer.MAX_VALUE); + output = TestCommon.execCommon(execArgs); + diff --git a/dev-java/openjdk/openjdk-11.0.7_p10.ebuild b/dev-java/openjdk/openjdk-11.0.7_p10.ebuild index 9df2e6c723a..76d41a4eb08 100644 --- a/dev-java/openjdk/openjdk-11.0.7_p10.ebuild +++ b/dev-java/openjdk/openjdk-11.0.7_p10.ebuild @@ -77,6 +77,10 @@ REQUIRED_USE="javafx? ( alsa !headless-awt )" S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}" +PATCHES=( + "${FILESDIR}/${P}-sigsegv.patch" +) + # The space required to build varies wildly depending on USE flags, # ranging from 2GB to 16GB. This function is certainly not exact but # should be close enough to be useful.
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/files/, dev-java/openjdk/
commit: b1ef64c6d48de6bb0e3bd1155ace461ed17d0893 Author: Georgy Yakovlev gentoo org> AuthorDate: Tue Jan 28 09:21:36 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Tue Jan 28 09:21:36 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1ef64c6 dev-java/openjdk: add patch to fix build with make-4.3 Bug: https://bugs.gentoo.org/706012 Thanks-to: Alex Parker gmail.com> Package-Manager: Portage-2.3.86, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev gentoo.org> dev-java/openjdk/files/openjdk-11-make43.patch | 12 dev-java/openjdk/openjdk-11.0.6.ebuild | 2 ++ 2 files changed, 14 insertions(+) diff --git a/dev-java/openjdk/files/openjdk-11-make43.patch b/dev-java/openjdk/files/openjdk-11-make43.patch new file mode 100644 index 000..9466e2be56f --- /dev/null +++ b/dev-java/openjdk/files/openjdk-11-make43.patch @@ -0,0 +1,12 @@ +diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk +index 170c3ed..b3b49f1 100644 +--- a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk +@@ -974,6 +974,7 @@ DependOnVariableFileName = \ + # Param 2 - (optional) name of file to store value in + DependOnVariableHelper = \ + $(strip \ ++$(eval $(call DependOnVariableFileName, $1, $2):$(NEWLINE)true) \ + $(eval -include $(call DependOnVariableFileName, $1, $2)) \ + $(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\ + $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \ diff --git a/dev-java/openjdk/openjdk-11.0.6.ebuild b/dev-java/openjdk/openjdk-11.0.6.ebuild index c5cf008ef3e..f98807e652b 100644 --- a/dev-java/openjdk/openjdk-11.0.6.ebuild +++ b/dev-java/openjdk/openjdk-11.0.6.ebuild @@ -73,6 +73,8 @@ PDEPEND=" REQUIRED_USE="javafx? ( alsa !headless-awt )" +PATCHES=( "${FILESDIR}/openjdk-11-make43.patch" ) + S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}" # The space required to build varies wildly depending on USE flags,
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/files/, dev-java/openjdk/
commit: 74977ef710bda41d15f6c741f88c4b119c29df28 Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Feb 1 08:22:55 2019 + Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Feb 1 09:07:05 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74977ef7 dev-java/openjdk: add openjdk:8 Bug: https://bugs.gentoo.org/672058 Closes: https://github.com/gentoo/gentoo/pull/10858 Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Georgy Yakovlev gentoo.org> dev-java/openjdk/Manifest | 8 + dev-java/openjdk/files/generate-cacerts.pl | 358 + dev-java/openjdk/files/openjdk-8.env.sh| 16 ++ dev-java/openjdk/openjdk-8.202_p08.ebuild | 240 +++ 4 files changed, 622 insertions(+) diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest index ad45e64d341..500148f6cfd 100644 --- a/dev-java/openjdk/Manifest +++ b/dev-java/openjdk/Manifest @@ -1,2 +1,10 @@ DIST jdk-11.0.1+13.tar.bz2 90134818 BLAKE2B c79f32dc5b531a06317afb87ef15495267e914b9b292a1d434514a90298d8234e7e0ba92659416b15d9392c7513d976a0c81411953cb6706a27ee57c965e36fb SHA512 c534c2fa8dcd4fdebef6f00473d5ceaae4a33bd1e1a417846508e25f154b1ded649a73468c8c71ac0c1e27bab5f641a3b480a264b532a0c30be2869c3d11a15d DIST jdk-11.0.2+7.tar.bz2 90189455 BLAKE2B 37473a8db4c6ad6789ea67b44f4dda94b9f59143c681a206aa0931b3a2a376fbc480c0c5a6b617072cf9ce1faca34a6c5c5e56cfec9fbf5482b82520fb2463c4 SHA512 03214d9fc920c04f3057594efa78ff588a630e6c594e5bbcc24b4c327fa08273ce060063d98720cdc04bc6978a3d04e172f38ba7a3bcabf02dd5dad397fd9952 +DIST openjdk-8.202_p08.tar.bz2 449202 BLAKE2B 8f7442918c083e94cda0e029cf2348dd9242653027f84d66deebe162e0928b2c6a86d3f273ba235bad5e5656f2b109e6521aaccfa81332fea92873d008ac0c0d SHA512 586713b889dd60c7dc65fccd39ef3ddd985ebb95a7c6c1feaef3c8d76fd1d929bbf19a99f72274c1afb77bd7f80b581d44add4aa232358d8951f7cc5befb43d0 +DIST openjdk-corba-8.202_p08.tar.bz2 1033539 BLAKE2B 9cbe20fb771157142329db037866ec7d67ff7e70318bec8b74034ce59574cd730975f0e7a3d6b88fc946b1d340558a92ca867639765a205883481fd071d7059e SHA512 9b25132c76f559055698c52888f6cae287096e05b89541cb8e445b46a488126a38e58d4f28649e277862eac7aa20f75f64dbcdcf56c900dcb0530a9545c4f717 +DIST openjdk-hotspot-8.202_p08.tar.bz2 7918616 BLAKE2B a35cedf99a5067896dc498d4baa9b10f4ceb1ffcf946632b578c45d6354e4d025d82462797e56773507e504e5e25a25cdf63485460f9a8df234474a2e110f91a SHA512 ab53e77a4081a34c250750d7b975f790936cf370e81807d0081b006a12c0ceb452f54bd40cc8085a9f16047d270b9b610ee777f6fcd1431ff9d77461c32db464 +DIST openjdk-jaxp-8.202_p08.tar.bz2 2733553 BLAKE2B 53341136b427152115ea0d4f758228090a607270104c88ebb61bc442ddd51a43cfed03c34660a47ab55bb601e1a9d8bf4fcdab05874bf0a5ada33b1ecb60df45 SHA512 9671fb56b6127359376cc2f85d91eb027fb1df1f808e36abbe3a1265d88d50809c34d73b84f52fb6e058ef78017d8d7a24bd097a9d720ad70a6861aa9fcc80f2 +DIST openjdk-jaxws-8.202_p08.tar.bz2 2541554 BLAKE2B a92aae4290e1901b736a6a93aed3b8c4bca14046a1f3eb9939ea9bf8ae0cd09785cf37045a8274641f13e543b49114ff158b9bc0cdd58163b42791e952ac76d0 SHA512 ce385f247a57695f716894137d868fa492d610776d120966c86b741688d6df54ae9538da7cf7b9530212a288ac4ff0d156e09bd5d01305b8165b939fa518fede +DIST openjdk-jdk-8.202_p08.tar.bz2 46618401 BLAKE2B e73b1341b837a0983ded4b4969ce83f9b77283e1d4d51e8d31a1b7401961a0b78943a41d2fe0aa724d85ac93dc3082511bcea341e87daecd070278ae59c8f240 SHA512 20e6747b506091383166298aeed6ff4ffd9deb92f20765ef839bf46d3ecae6b1aa218eb6857e6541df0522b8d571379341e94eb5bef765a1164cf9f59b20dfac +DIST openjdk-langtools-8.202_p08.tar.bz2 2392880 BLAKE2B 45ebebe4864e3274e14cf27986cd96facfe2f8e5c1292344e05743d1448f95367caf0f68886c506ce10435fbf53948c6b9f7087ad5d2cd090cf0f1becb962843 SHA512 a1e1c3dc06b3a58082e1d67d58ffeaf0bc3c5534fd1ba368e835a54d3c6ba9232e277ae685ed3ff5ccdf3cd7fe0612ad78a08ed55d1d2d06de54914a19377907 +DIST openjdk-nashorn-8.202_p08.tar.bz2 2854026 BLAKE2B 05ba828160270e52f27023db83b1ffc4e6611b7a74b300a93a6d476f319a265834b48c7de57b0d3bea502d88279e72fd9cfbc5f3eb0e719650e34e82ba4a3d09 SHA512 bea0eaa4b2247cf1e5ee33613754c8f2f6ffe074a7be562f26e63c6327f56d67f60d4877dd363ed8a812689db1d837f5c257637460e247a1592c3258f3add11b diff --git a/dev-java/openjdk/files/generate-cacerts.pl b/dev-java/openjdk/files/generate-cacerts.pl new file mode 100644 index 000..17d29b36676 --- /dev/null +++ b/dev-java/openjdk/files/generate-cacerts.pl @@ -0,0 +1,358 @@ +#!/usr/bin/perl + +# Copyright (C) 2007, 2008 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +#
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/files/, dev-java/openjdk/
commit: 369063cc1474a9a6bc49b2012e8fe08469a477cc Author: James Le Cuirot gentoo org> AuthorDate: Sun Nov 4 15:10:39 2018 + Commit: James Le Cuirot gentoo org> CommitDate: Thu Nov 8 23:11:09 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=369063cc dev-java/openjdk: New package to provide Java 11 from source I'm not sure if this will build on hardened. There used to be an upstream mechanism to handle PaX markings but this disappeared in an earlier version. It might build with USE=-jbootstrap though. Please let us know. Thanks to Alex Dubov for the initial ebuild attempt. Closes: https://github.com/gentoo/gentoo/pull/9835 Signed-off-by: James Le Cuirot gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 dev-java/openjdk/Manifest | 1 + dev-java/openjdk/files/openjdk-11.env.sh | 16 ++ dev-java/openjdk/metadata.xml | 16 ++ dev-java/openjdk/openjdk-11.0.1_p13.ebuild | 234 + 4 files changed, 267 insertions(+) diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest new file mode 100644 index 000..351991ab4ea --- /dev/null +++ b/dev-java/openjdk/Manifest @@ -0,0 +1 @@ +DIST jdk-11.0.1+13.tar.bz2 90134818 BLAKE2B c79f32dc5b531a06317afb87ef15495267e914b9b292a1d434514a90298d8234e7e0ba92659416b15d9392c7513d976a0c81411953cb6706a27ee57c965e36fb SHA512 c534c2fa8dcd4fdebef6f00473d5ceaae4a33bd1e1a417846508e25f154b1ded649a73468c8c71ac0c1e27bab5f641a3b480a264b532a0c30be2869c3d11a15d diff --git a/dev-java/openjdk/files/openjdk-11.env.sh b/dev-java/openjdk/files/openjdk-11.env.sh new file mode 100644 index 000..96c4be79c33 --- /dev/null +++ b/dev-java/openjdk/files/openjdk-11.env.sh @@ -0,0 +1,16 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +VERSION="OpenJDK ${PV}" +JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" +JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" +JAVAC="\${JAVA_HOME}/bin/javac" +PATH="\${JAVA_HOME}/bin" +ROOTPATH="\${JAVA_HOME}/bin" +LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" +MANPATH="" +PROVIDES_TYPE="JDK JRE" +PROVIDES_VERSION="${SLOT}" +BOOTCLASSPATH="" +GENERATION="2" +ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/openjdk/metadata.xml b/dev-java/openjdk/metadata.xml new file mode 100644 index 000..c76b9ca5d45 --- /dev/null +++ b/dev-java/openjdk/metadata.xml @@ -0,0 +1,16 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + +j...@gentoo.org +Java + + Java™ is the world's leading programming language and platform. The code for Java is open source and available at OpenJDK™. + +Don't install the X backend for AWT, needed by some GUIs +Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!) +Build OpenJDK twice, the second time using the result of the first +Install JVM sources +Provide javaws command through symlink to icedtea-web + + diff --git a/dev-java/openjdk/openjdk-11.0.1_p13.ebuild b/dev-java/openjdk/openjdk-11.0.1_p13.ebuild new file mode 100644 index 000..8bc5d1fa01e --- /dev/null +++ b/dev-java/openjdk/openjdk-11.0.1_p13.ebuild @@ -0,0 +1,234 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs + +MY_PV=${PV/_p/+} +SLOT=${MY_PV%%[.+]*} + +DESCRIPTION="Open source implementation of the Java programming language" +HOMEPAGE="https://openjdk.java.net; +SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2; +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm64 ~ppc64" + +# Default variant must be first! +# The rest do not matter. +JVM_VARIANTS=" + server + client + core + minimal + zero +" + +IUSE=+$(printf "jvm_variant_%s " ${JVM_VARIANTS}) +IUSE+="alsa debug doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source +webstart" + +REQUIRED_USE=" + ^^ ( + || ( jvm_variant_server jvm_variant_client jvm_variant_minimal ) + jvm_variant_core + jvm_variant_zero + ) +" + +CDEPEND=" + media-libs/freetype:2= + net-print/cups + sys-libs/zlib + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst + ) +" + +RDEPEND=" + ${CDEPEND} + alsa? ( media-libs/alsa-lib ) + selinux? ( sec-policy/selinux-java ) +" + +DEPEND=" + ${CDEPEND} + app-arch/zip + media-libs/alsa-lib + !headless-awt? ( + x11-base/xorg-proto + ) + || ( + dev-java/openjdk-bin:${SLOT} +