Switch openjdk:10 sources to github and fix timebomb issue.

This commit is contained in:
Andrius Štikonas 2024-03-02 00:11:31 +00:00
parent 59173233da
commit 7ded94d0b8
3 changed files with 46 additions and 20 deletions

View File

@ -59,6 +59,7 @@ AUX openjdk-8.env.sh 746 BLAKE2B b8a18bb5e2dd3c4722b78531428d4291236a6295973fdcd
AUX openjdk-9.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e
AUX openjdk.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e
AUX patches/10/aarch64_gcc_fix.patch 371 BLAKE2B 4662b97aba0022cfbf8f781425ffbf6ac68c444a468d4a8f2f70584f76c3d8ba04a65c600604e15ba2d0ace4a33b7c74ad2a060fcd6174d6212122a7b7eb2744 SHA512 f4f1bd49bb459caf62a5ef6bf96e0f7c69e8c40dec9a5413549d3b90dc29c8edf8d57e79d3810c5052253eea3d91131a94ea1ebade0f1e0b904724bae4dd5c3f
AUX patches/10/jdk-currency-timebomb.patch 459 BLAKE2B 5c39699c60e214e5eda95b5fff1e261d4509e143840c9aa08551fa41822b2fe91fa1ce1787fa3bb3539e6da38a69f73f4e6be3c5664189732b93762d07fbb9b0 SHA512 fddceba5c7861beb89578d1a53af0fc9f1432dafa8fde8d52bee28bba08a45744e0d3003e620951e730129310ff1ee90684884fd727e945285fd338682362559
AUX patches/10/make-4.3.patch 741 BLAKE2B 6dab3601e6a6260f9813fab663211d8afe7fc08ff1af243bbd8ad90f8c58df5c713aec5cea7788eeabee9fce17e0aec5cf9b6f19becd5baf37a772773a445b36 SHA512 7d6ada121fbd7a4b29459b000fca225b3fb7d95d855459d43749d6ece60b8282418bd349cf235ccd41b86ac36b158e81f3184884883a551c240cb30dfe66fccd
AUX patches/10/pointer-comparison.patch 471 BLAKE2B 807c0970dc766d5fea54b8af1d2d0cdddfe75368bca32c6a8cb2c516db21c5e8056fce7715eb1b33ece68970ce6e0686bd061194ac2829432ad44da010767858 SHA512 48faf682eeb2d57873148d3fd948c66d20eebab360ce31352761ff5400bafbeca55a85dded04c38a0e4263d14521b4da41fd02b608b774e4d8e3784452c5c847
AUX patches/12/aarch64_gcc_fix.patch 371 BLAKE2B 1678b268d692fa7c187d822620e3d48475426090a5ecda6f89aa565260ace98a60f7215958b8ac18aff30dbfebb144469d9ac39021105ed9ccde62c695f4e946 SHA512 805b07b95066407a22bfb7d2b6650e7dfbe76b27f8b1f7172ed0955d75704e71150679303e8c0fe07407aaf771501e9adc91b7016fc46e2c0b39e72f21061b10
@ -73,7 +74,7 @@ AUX patches/9/fix-no-such-field-ipv6-error.patch 309 BLAKE2B aa76a8cf41bc902dd91
AUX patches/9/jdk-currency-timebomb.patch 467 BLAKE2B e543e95b184504e54c99eedde0e84e565968b416b810d748f72777cf69b0943e0c2eb96badd89bd4b3ac49b8ddfe5b6e4dc92f3927f5aba138e910b8f1312460 SHA512 b6aff66b2486b94f64607fac86bd33cb85add9b047afeee49a8641e39e6c21f4d28fd5cf6dba33f9db2e41a5cd2c59b4ca4d3ab119d216f655431644d2c3f6ac
AUX patches/9/make-4.3.patch 740 BLAKE2B c155e808f69221c6720841c6ce9bb2fb58b413ad2864fd5b5b3e661e57796d75ac5740d2873d9222174045015c8ad96e6b3b966b3361a3a7cd164ad0968552e0 SHA512 8460dde4d40d57254f14e995090bc4255ee7662d18c19f127d56a1d12d53ec56731574a784ed5d68e89aef1133da760f30ae0982389cf1512ccab1d5f62c4b75
AUX patches/9/pointer-comparison.patch 1162 BLAKE2B 048b67bfe50d658bb0e4756b66a307fb680d0e1c6f18458eff3a666334f5d94425138ba343907247b284402f47d78a6fc85df5aa6381ad78b3d7a7e116d822c7 SHA512 8d92d8be4a3a0227d602b99e581f05a16f54ad633111abf3355bd933db344c726e22e285b33f936d6e70c7da9087bc113477aba78554f37b273a70e784aaca5a
DIST jdk-10.0.2+13.tar.bz2 88365048 BLAKE2B f898a0976cff12cca439ccdba2bf7eff7fcbc5f00709fa41302fd781819a44165fa864d5e551023c507ad18dc957abd24b15744fc6dc5304ee1a26bd4cb8cb86 SHA512 7491da11d5e0013db75d33e09be7a91ac0dbcde6282541a39fe471fd5368d49b15403bc7508b330ca60210b3ca02730743ba280657283a231853f6882a3ca74d
DIST openjdk-10.0.2_p13.tar.gz 111178953 BLAKE2B c5572768ce068048afb106ab17e23d8f90bbca1a1d06b71fc1ace7e209088b37df5372b977648716464363c5500af749830a37e647c217f1d6270fd8b6d4a849 SHA512 8d8e47006308d9a794090f1051a4f1fad1eabe609736e9039f29a60a9593d6c415759d607ee4557cceb18d6ce76b30d6d186b9453525fd4a2e6d158848cfd30c
DIST openjdk-11.0.9_p11.tar.bz2 91638327 BLAKE2B a04b7fb5ebde3b6c024e5f3931a2efe796e08ad66c0190cddfa4268d5181f46f24685d9d51ae328547916e8ece723967bf653feeac87347ee14ecbe213ad657a SHA512 a0a6726d5adbe95904b78d8b4319bc4386c594a563f80f63d59072cf72d00928b451163b91258b44193a80851400ce8b8d142fecfd2bd902ff7a5e47cb4a9976
DIST openjdk-12.0.2_p01.tar.bz2 83912905 BLAKE2B cf81872dc9a68758bd46a0c486893321461323872d204028b84c36fdd8f9de54c88bb70d4f0c50b7370f589a424852e74a383dea71e17c227ac740283dd933e4 SHA512 53c66ae9bdc6aa47b05f57845d696edf55c5e5eeb6c7dd6cd46b9a0cfad9864db846ac88e00aefbc86ff9ffa77ab9bcf9cf3c73b7f3b797ad68d9e8609438dd9
DIST openjdk-13.0.4_p01.tar.gz 107539608 BLAKE2B b6887819aa2cb7c90be019fa0a7b11c6e65f2f307e36062ef95f38ec85b279ad55bdfd398343405b834ce59e56249bf2653856265752c3e00fdb94fa230c02a9 SHA512 c5c1a961be02f9cd5eac8b7ce0d28024e6b7aa55ec45fb9bb2b62d8b4c2eec874098e74dbb4d19fb8525b097900f91eb900e5309bebeb4297f168f92321a0918
@ -87,7 +88,7 @@ DIST openjdk-20.0.2_p09.tar.gz 109625812 BLAKE2B ea3e9e306c2a5e1593977095db7c775
DIST openjdk-21.0.0_p35.tar.gz 112178860 BLAKE2B 03a81df4c2e16194c66299109e70a61093eec6885b615d8a1a4bff34139474876a290889b46f51065f473a5b0ab37aff1c1cf166d067f0dca16096fe67d06aae SHA512 97800cf55dc03fb1baa8da65ed5d991033c0023d4e9ada65ea79ebc2b2cb691add8e093b18efea238a95dab47daff21fcf29cca993fa7d11516ece72478383c8
DIST openjdk-8.272_p10.tar.gz 87119338 BLAKE2B 71ba8cc5c76d71047a555357e51789defaab7a316185aadb05a4666e64dc780cfe193aa754176891ce63c05fd64885d654c8328389822b5e7de82027b0b9a88e SHA512 e0d16cde4668dc006aaf9bdc6e7dfdc1685e3c4d6e0b8e07dc01300dd953251b84e8cc4fe96116ea26f2acae0166c65bf9944c689a34f4c268e7e15836023755
DIST openjdk-9.0.4_p12.tar.gz 110286927 BLAKE2B 50bfd023b11d2af6b3a0282e861c55d6b355134e3091e3f019beeff0b943f8894b8f0a173ea6c17a54b38efe409c786371c17d1073576d3e04d3919ccd2f6987 SHA512 999e7b726941db7ecbefb9d1d7b113fe39bd3b62e71b4250031bb24c056bc8cdb39ab30e930c8d8977c871ec1faaf6e489d61ceecf44ecc1245040f663400b22
EBUILD openjdk-10.0.2_p13.ebuild 8328 BLAKE2B c738c7bfa47070edc8e3aa20d238cdd251ded7e44d0fe1e138154424f56141d42e91f7e4c5c619b40cea7696b96f277b1af579a67a59a4fdb70e0474dc758a51 SHA512 3a5efdf6148c2c92068f09dd5219b90cb3bf27dedd17f653fef658dc7b47c96605b1a80fa85bf5ac1c25b69312bf56268f318a2e2c9867ae4ccb7f535757d753
EBUILD openjdk-10.0.2_p13.ebuild 8785 BLAKE2B 6521eaeb6894da11a86b451f9ff2e27b601981af5d522cb83f7fbaf0c58813bbce6e234d13ac4c5aad350b09bde65fdace6ed165d314e5cb055032482fb09cfa SHA512 232b93e2639f7c0c7ad447de95e0a1c52cd8a0d950923dd23c52b2495f59cc1219470eee0a4372b385c139fb1e0cb00205046e4b1c3446e1bd0d754c8759a3bf
EBUILD openjdk-11.0.9_p11.ebuild 8321 BLAKE2B 68259ff36688d96c9f48989ea9f015e41d47562307b65d0191e997779c92342d1e8be40a0210df69bacec5fcf9ee9d3c5a4a6c60234c9c7c14f6d3eff88e017c SHA512 404d35e206d34eb6aa67450a65ef9d694a7c9cf73521e7d7c390f2107fbdea5f6f65e21cb24225df357258fcecbd5a4e5f37034b8a8a61ee98a92b42faf321ab
EBUILD openjdk-12.0.2_p01.ebuild 8827 BLAKE2B 108c522f5b57698485914945e6b4e17e689cb6944441d0e54aef5abfaef897f9b36338cd4af026d6f31b2316bcdc0cc8e70c48ee0e49d86ee779cfdbdfb5615f SHA512 56cec08b9625453c4a7e7c34203a35aa09efe9c146c9dda16fe0f8b02a8133b2b47eeb71dc1a30666b67181982719d69cee99780d201c65bea6770bb0db964a0
EBUILD openjdk-13.0.4_p01.ebuild 8296 BLAKE2B 1c1eeda18af3408cb18bdd8854aadba35c248d9ebcc8a3b6a8f84e31cc20d57bd6d4944070050d7ff5b5753c5bcb82d5f6dc9ce2221ec66f4405dcbec200a3fb SHA512 42a2ecc5d0abf65b848029e421af0fd11f82c878d86bc5c592cc28cf5ac90d7d3d0594c46564513333aac0f57021a21a5042cfc7707a777ef383df8eedd5875f

View File

@ -0,0 +1,20 @@
--- openjdk/make/data/currency/CurrencyData.properties 2024-02-18 13:38:19.525666416 +0000
+++ openjdk/make/data/currency/CurrencyData.properties 2024-02-18 13:38:40.436243388 +0000
@@ -324,7 +324,7 @@
# LAO PEOPLE'S DEMOCRATIC REPUBLIC
LA=LAK
# LATVIA
-LV=LVL;2013-12-31-22-00-00;EUR
+LV=LVL
# LEBANON
LB=LBP
# LESOTHO
@@ -336,7 +336,7 @@
# LIECHTENSTEIN
LI=CHF
# LITHUANIA
-LT=LTL;2014-12-31-22-00-00;EUR
+LT=LTL
# LUXEMBOURG
LU=EUR
# MACAU

View File

@ -1,21 +1,21 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EAPI=7
inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
inherit eapi8-dosym check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
MY_PV=${PV/_p/+}
SLOT=${MY_PV%%[.+]*}
SLOT=${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"
SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
LICENSE="GPL-2-with-classpath-exception"
KEYWORDS="amd64 arm64"
IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx pch selinux source systemtap"
IUSE="alsa cups debug doc examples +gentoo-vm headless-awt javafx pch selinux source systemtap"
COMMON_DEPEND="
media-libs/freetype:2=
@ -68,7 +68,7 @@ DEPEND="
REQUIRED_USE="javafx? ( alsa !headless-awt )"
S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
S="${WORKDIR}/jdk${SLOT}u-jdk-${PV/_p/-}"
# The space required to build varies wildly depending on USE flags,
# ranging from 2GB to 16GB. This function is certainly not exact but
@ -151,6 +151,7 @@ src_prepare() {
eapply "${FILESDIR}/patches/${SLOT}/make-4.3.patch"
eapply "${FILESDIR}/patches/${SLOT}/pointer-comparison.patch"
eapply "${FILESDIR}/patches/${SLOT}/aarch64_gcc_fix.patch"
eapply "${FILESDIR}/patches/${SLOT}/jdk-currency-timebomb.patch"
chmod +x configure || die
}
@ -164,29 +165,33 @@ src_configure() {
# graphviz are detected. pandoc has loads of dependencies anyway.
local myconf=(
--disable-warnings-as-errors
--disable-ccache
--disable-precompiled-headers
--enable-full-docs=no
--with-boot-jdk="${JDK_HOME}"
--with-extra-cflags="${CFLAGS} -fcommon -fno-delete-null-pointer-checks -fno-lifetime-dse"
--with-extra-cxxflags="${CXXFLAGS}"
--with-extra-ldflags="${LDFLAGS}"
--disable-warnings-as-errors
--with-giflib=system
--with-lcms=system
--with-libjpeg=system
--with-libpng=system
--with-freetype-lib="$( $(tc-getPKG_CONFIG) --variable=libdir freetype2 )"
--with-freetype-include="$( $(tc-getPKG_CONFIG) --variable=includedir freetype2)/freetype2"
--with-giflib="${XPAK_BOOTSTRAP:-system}"
--with-lcms="${XPAK_BOOTSTRAP:-system}"
--with-libjpeg="${XPAK_BOOTSTRAP:-system}"
--with-libpng="${XPAK_BOOTSTRAP:-system}"
--with-native-debug-symbols=$(usex debug internal none)
--with-vendor-name="Gentoo"
--with-vendor-url="https://gentoo.org"
--with-vendor-bug-url="https://bugs.gentoo.org"
--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
--with-vendor-version-string="${PV}"
--with-version-pre=gentoo
--with-version-string=${MY_PV%+*}
--with-version-build=${MY_PV#*+}
--with-zlib=system
--with-vendor-version-string="${PVR}"
--with-version-pre=""
--with-version-string="${PV%_p*}"
--with-version-build="${PV#*_p}"
--with-zlib="${XPAK_BOOTSTRAP:-system}"
--enable-dtrace=$(usex systemtap yes no)
--enable-headless-only=$(usex headless-awt yes no)
$(tc-is-clang && echo "--with-toolchain-type=clang")
)
if use javafx; then
@ -225,7 +230,7 @@ src_compile() {
src_install() {
local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
local ddest="${ED}${dest#/}"
local ddest="${ED}/${dest#/}"
cd "${S}"/build/*-release/images/jdk || die