aboutsummaryrefslogtreecommitdiffstats
path: root/community/openjdk8/APKBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'community/openjdk8/APKBUILD')
-rw-r--r--community/openjdk8/APKBUILD211
1 files changed, 131 insertions, 80 deletions
diff --git a/community/openjdk8/APKBUILD b/community/openjdk8/APKBUILD
index 92045b14e59..8f6474a2244 100644
--- a/community/openjdk8/APKBUILD
+++ b/community/openjdk8/APKBUILD
@@ -2,20 +2,19 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Timo Teras <timo.teras@iki.fi>
pkgname=openjdk8
-_icedteaver=3.22.0
+_icedteaver=3.30.0
# pkgver is <JDK version>.<JDK update>.<JDK build>
# Check https://icedtea.classpath.org/wiki/Main_Page when updating!
-pkgver=8.322.06
+pkgver=8.402.06
pkgrel=0
pkgdesc="OpenJDK 8 provided by IcedTea"
-provider_priority=8
url="https://icedtea.classpath.org/"
# riscv64 blocked by openjdk7
arch="all !riscv64"
license="custom"
-depends="$pkgname-jre java-cacerts nss"
options="sover-namecheck"
makedepends="
+ $pkgname-bootstrap
alsa-lib-dev
attr-dev
autoconf
@@ -31,13 +30,14 @@ makedepends="
gawk
giflib-dev
gtk+2.0-dev
+ java-cacerts
+ java-common
jpeg-dev
krb5-dev
lcms2-dev
libpng-dev
libxcomposite-dev
libxinerama-dev
- libxp-dev
libxrender-dev
libxslt
libxt-dev
@@ -45,8 +45,6 @@ makedepends="
linux-headers
lksctp-tools-dev
nss-dev
- nss-static
- openjdk7
pcsc-lite-dev
sed
util-linux
@@ -55,6 +53,8 @@ makedepends="
zlib-dev
"
+provides="$pkgname-bootstrap=$pkgver-r$pkgrel"
+
case $CARCH in
x86) _jarch=i386;;
x86_64) _jarch=amd64;;
@@ -68,7 +68,6 @@ x86|x86_64|aarch64)
*) _configure_jfr="--disable-jfr";;
esac
-_bootstrap_java_home="/usr/lib/jvm/java-1.7-openjdk"
_java_home="/usr/lib/jvm/java-1.8-openjdk"
_jrelib="$_java_home/jre/lib/$_jarch"
@@ -78,7 +77,7 @@ ldpath="$_jrelib:$_jrelib/native_threads:$_jrelib/headless:$_jrelib/server:$_jre
sonameprefix="$pkgname:"
subpackages="$pkgname-dbg $pkgname-jre-lib:jrelib:noarch $pkgname-jre $pkgname-jre-base:jrebase
- $pkgname-doc $pkgname-demos"
+ $pkgname-doc $pkgname-demos $pkgname-jdk"
_dropsver=$_icedteaver
_dropsurl="https://icedtea.classpath.org/download/drops/icedtea8/$_dropsver"
@@ -90,22 +89,60 @@ source="https://icedtea.classpath.org/download/source/icedtea-$_icedteaver.tar.x
icedtea-hotspot-musl-ppc.patch
icedtea-hotspot-noagent-musl.patch
icedtea-hotspot-insantiate-arrayallocator.patch
+ icedtea-hotspot-lfs64.patch
icedtea-jdk-execinfo.patch
icedtea-jdk-fix-ipv6-init.patch
icedtea-jdk-fix-libjvm-load.patch
+ icedtea-jdk-implicit.patch
icedtea-jdk-musl.patch
icedtea-jdk-includes.patch
- icedtea-jdk-close-fds.patch
+ icedtea-int-conversion.patch
icedtea-autoconf-config.patch
icedtea-jdk-disable-vfork.patch
icedtea-JDK-6515172_0_revert-jdk8-version.patch
icedtea-JDK-6515172_1_apply-jdk9-version.patch
icedtea-issue13032.patch
- autoconf-2.7x.patch
"
builddir="$srcdir/icedtea-$_icedteaver"
# secfixes:
+# 8.402.06-r0:
+# - CVE-2024-20918
+# - CVE-2024-20919
+# - CVE-2024-20921
+# - CVE-2024-20926
+# - CVE-2024-20945
+# - CVE-2024-20952
+# 8.392.08-r0:
+# - CVE-2023-22067
+# - CVE-2023-22081
+# 8.382.05-r0:
+# - CVE-2023-22045
+# - CVE-2023-22049
+# 8.372.07-r0:
+# - CVE-2023-21930
+# - CVE-2023-21937
+# - CVE-2023-21938
+# - CVE-2023-21939
+# - CVE-2023-21954
+# - CVE-2023-21967
+# - CVE-2023-21968
+# 8.362.09-r0:
+# - CVE-2022-21619
+# - CVE-2022-21624
+# - CVE-2022-21626
+# - CVE-2022-21628
+# - CVE-2023-21830
+# - CVE-2023-21843
+# 8.345.01-r0:
+# - CVE-2022-21426
+# - CVE-2022-21434
+# - CVE-2022-21443
+# - CVE-2022-21476
+# - CVE-2022-21496
+# - CVE-2022-21540
+# - CVE-2022-21541
+# - CVE-2022-34169
# 8.322.06-r0:
# - CVE-2022-21248
# - CVE-2022-21283
@@ -224,16 +261,6 @@ builddir="$srcdir/icedtea-$_icedteaver"
# - CVE-2018-2973
# - CVE-2018-3639
-unpack() {
- if [ -z "$force" ]; then
- verify
- initdcheck
- fi
- mkdir -p "$srcdir"
- msg "Unpacking sources..."
- unxz -c icedtea-$_icedteaver.tar.xz | tar -C "$srcdir" -x
-}
-
prepare() {
local ver_u=$(sed -En 's/^\s*JDK_UPDATE_VERSION\s*=\s*(\S+).*/\1/p' acinclude.m4)
local ver_b=$(sed -En 's/^\s*BUILD_VERSION\s*=\s*b(\S+).*/\1/p' acinclude.m4)
@@ -259,7 +286,7 @@ prepare() {
}
build() {
- export JAVA_HOME="$_bootstrap_java_home"
+ export JAVA_HOME="$_java_home"
export PATH="$JAVA_HOME/bin:$PATH"
if [ -z "$JOBS" ]; then
@@ -277,6 +304,21 @@ build() {
export DISTRIBUTION_PATCHES
echo "icedtea patches: $DISTRIBUTION_PATCHES"
+ # cannot pass -j through here
+ unset MAKEFLAGS
+
+ # we want to build hotspot with better optimisations; it's set to this
+ # (prepended) anyway, and it's huge
+ export CFLAGS="$CFLAGS -O3"
+ export CXXFLAGS="$CXXFLAGS -O3"
+
+ case "$CARCH" in
+ x86)
+ export CFLAGS="${CFLAGS/-fno-plt}"
+ export CXXFLAGS="${CXXFLAGS/-fno-plt}"
+ ;;
+ esac
+
bash ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -292,12 +334,13 @@ build() {
--with-parallel-jobs=${JOBS:-2} \
--with-hotspot-build=default \
--with-openjdk-src-zip="$srcdir/openjdk-$_dropsver.tar.xz" \
- --with-jdk-home="$_bootstrap_java_home" \
+ --with-jdk-home="$_java_home" \
--with-pkgversion="Alpine $pkgver-r$pkgrel" \
--with-curves="nist+" \
--enable-nss \
$_configure_jfr
- make
+ # in rare cases the build hangs
+ timeout 9000 make JOBS="${JOBS:-2}"
}
# TODO: Run tests or at least try to compile and run hello world.
@@ -308,7 +351,8 @@ check() {
}
package() {
- provides=java-jdk
+ depends="$pkgname-jdk=$pkgver-r$pkgrel"
+
mkdir -p "$pkgdir"/$_java_home
cp -a openjdk.build/images/j2sdk-image/* "$pkgdir"/$_java_home/
@@ -329,98 +373,105 @@ jrelib() {
pkgdesc="OpenJDK 8 Java Runtime (class libraries)"
depends=""
- local file dir
- for file in jre/lib/images \
- jre/lib/*.jar \
- jre/lib/security \
- jre/lib/ext/*.jar \
- jre/lib/cmm \
- jre/ASSEMBLY_EXCEPTION \
- jre/THIRD_PARTY_README \
- jre/LICENSE; do
-
- dir=${file%/*}
- mkdir -p "$subpkgdir"/$_java_home/$dir
- mv "$pkgdir"/$_java_home/$file "$subpkgdir"/$_java_home/$dir
- done
+ amove \
+ $_java_home/jre/lib/images \
+ $_java_home/jre/lib/*.jar \
+ $_java_home/jre/lib/security \
+ $_java_home/jre/lib/ext/*.jar \
+ $_java_home/jre/lib/cmm \
+ $_java_home/jre/ASSEMBLY_EXCEPTION \
+ $_java_home/jre/THIRD_PARTY_README \
+ $_java_home/jre/LICENSE
}
jre() {
pkgdesc="OpenJDK 8 Java Runtime"
- depends="ttf-dejavu"
+ depends="font-dejavu"
provides=java-jre
- local file dir
-
- mkdir -p "$subpkgdir"
- for file in jre/bin/policytool \
- bin/appletviewer \
- bin/policytool \
- jre/lib/$_jarch/libawt_xawt.so \
- jre/lib/$_jarch/libfontmanager.so \
- jre/lib/$_jarch/libjawt.so \
- jre/lib/$_jarch/libjsoundalsa.so \
- jre/lib/$_jarch/libsplashscreen.so; do
-
- dir=${file%/*}
- mkdir -p "$subpkgdir"/$_java_home/$dir
- mv "$pkgdir"/$_java_home/$file "$subpkgdir"/$_java_home/$dir
- done
+
+ amove \
+ $_java_home/jre/bin/policytool \
+ $_java_home/bin/appletviewer \
+ $_java_home/bin/policytool \
+ $_java_home/jre/lib/$_jarch/libawt_xawt.so \
+ $_java_home/jre/lib/$_jarch/libfontmanager.so \
+ $_java_home/jre/lib/$_jarch/libjawt.so \
+ $_java_home/jre/lib/$_jarch/libjsoundalsa.so \
+ $_java_home/jre/lib/$_jarch/libsplashscreen.so
}
jrebase() {
pkgdesc="OpenJDK 8 Java Runtime (no GUI support)"
- depends="$pkgname-jre-lib java-common java-cacerts nss"
+ depends="$pkgname-jre-lib=$pkgver-r$pkgrel java-common java-cacerts nss"
provides=java-jre-headless
- mkdir -p "$subpkgdir"/$_java_home/bin \
- "$subpkgdir"/$_java_home/lib/$_jarch
- ln -s java-1.8-openjdk "$subpkgdir"/usr/lib/jvm/java-8-openjdk
-
- mv "$pkgdir"/$_java_home/lib/$_jarch/jli \
- "$subpkgdir"/$_java_home/lib/$_jarch/
-
- local file; for file in java orbd rmid servertool unpack200 keytool \
- pack200 rmiregistry tnameserv; do
- mv "$pkgdir"/$_java_home/bin/$file "$subpkgdir"/$_java_home/bin/
- done
+ amove \
+ $_java_home/bin/java \
+ $_java_home/bin/orbd \
+ $_java_home/bin/rmid \
+ $_java_home/bin/servertool \
+ $_java_home/bin/unpack200 \
+ $_java_home/bin/keytool \
+ $_java_home/bin/pack200 \
+ $_java_home/bin/rmiregistry \
+ $_java_home/bin/tnameserv \
+ $_java_home/lib/$_jarch/jli
# Rest of the jre subdir (which were not taken by -jre subpkg).
- mv "$pkgdir"/$_java_home/jre "$subpkgdir"/$_java_home/
+ amove $_java_home/jre
+
+ ln -s java-1.8-openjdk "$subpkgdir"/usr/lib/jvm/java-8-openjdk
}
doc() {
default_doc
- mkdir -p "$subpkgdir"/$_java_home/
- mv "$pkgdir"/$_java_home/man "$subpkgdir"/$_java_home/
+ amove $_java_home/man
}
demos() {
pkgdesc="OpenJDK 8 Java Demos and Samples"
- depends="$pkgname"
+ depends="$pkgname-jdk=$pkgver-r$pkgrel"
+
+ amove \
+ $_java_home/demo \
+ $_java_home/sample
+}
+
+jdk() {
+ pkgdesc="$pkgdesc (JDK)"
+ depends="
+ $pkgname-jre=$pkgver-r$pkgrel
+ nss
+ java-cacerts
+ "
+ provides=java-jdk
+ provider_priority=8
- mkdir -p "$subpkgdir"/$_java_home/
- mv "$pkgdir"/$_java_home/demo "$pkgdir"/$_java_home/sample \
- "$subpkgdir"/$_java_home/
+ amove \
+ $_java_home/bin \
+ $_java_home/lib \
+ $_java_home/include
}
sha512sums="
-dc5825dbf2cab3967bcfd9635724428b7e8c0859d05587a1b8d648cc509066489f6518998f923c2ec8a4d6b30556ef5fda534dfab69bde9e0f046f970d8b4dfa icedtea-3.22.0.tar.xz
-f1fb1d67a25d54c906804fea5edbdc4a6af89c94c54972526a6869a8f2dd84fcf1c2caeba13ea3fdfe89690a0fa5441fa8e1ecf07966e37ecfeec81718ac96e1 openjdk-3.22.0.tar.xz
+ce57b0af11d224cd58fb1352d8b8f442588594967f0e529753b206b588abaf54206cc7e59831971f066908cd411d8323aabfa5a922af61083fd032995d3cb851 icedtea-3.30.0.tar.xz
+de4df2dea4e3649a4fb785e4932c2e19b87cff8c21823259a00d8bbb3f9f99badb97082e19e65494a97d9997890d7837f6e4eab929885a80c72cfa89110fc1cb openjdk-3.30.0.tar.xz
28709285390a997adbd56ebda42ef718fbc08daf572b8568f484436d255514f9d25f033e3333dff8aa352fc9846057ac5bb42fa955d3e5e44eddc96dc273c07c icedtea-hotspot-musl.patch
-86e77c1e5e8a48f121e608dce5eafad7a714e4029b55dbd554c2c94633b49a4239f71a40a41273b54d62fcdcfdee21340c8b85f96001cf15b719b02a520e8d9a icedtea-hotspot-musl-ppc.patch
+e6fff8ab886f42006ad5c210f46e82a3a4c0b654edecc4764a0d20f0e5dc81138c2c5181b034095b93f94b5aa96b7e5068f42bafa283809f6fe9d2c8655d64d7 icedtea-hotspot-musl-ppc.patch
19459dbb922f5a71cd15b53199481498626a783c24f91d2544d55b7dddd2cdb34a64bbf0226b99548612dd1743af01b3f9ff32c30abbbc90ce727ca2dbbbd1f9 icedtea-hotspot-noagent-musl.patch
4bf002ec25844f4e55b588d0516e658c548700d3bcae79be74bf75d9cf30cf9cd448767db36935924dd3b07f34d0cf087321cb35abb4943690353d11485ab0de icedtea-hotspot-insantiate-arrayallocator.patch
+f0e6e69a3032b6167b21a6ace20534c2e50333b3a2c8d8d7d6b610c0ccf0f12d325d55b88b1b739e120adfc3071bdae113c5a7861f1a9107172eaff9da3093eb icedtea-hotspot-lfs64.patch
f6365cfafafa008bd6c1bf0ccec01a63f8a39bd1a8bc87baa492a27234d47793ba02d455e5667a873ef50148df3baaf6a8421e2da0b15faac675867da714dd5f icedtea-jdk-execinfo.patch
48533f87fc2cf29d26b259be0df51087d2fe5b252e72d00c6ea2f4add7b0fb113141718c116279c5905e03f64a1118082e719393786811367cf4d472b5d36774 icedtea-jdk-fix-ipv6-init.patch
b135991c76b0db8fa7c363e0903624668e11eda7b54a943035c214aa4d7fc8c3e8110ed200edcec82792f3c9393150a9bd628625ddf7f3e55720ff163fbbb471 icedtea-jdk-fix-libjvm-load.patch
+21a16599d7e0aaf2997db59ada5af63e25484949ca965a34536ee44b950a132a6b5ca0b4922a6919d840a84ba0bb8413d87d2b97ea2c65c00e8766cc470c267d icedtea-jdk-implicit.patch
3b01de971f64f082d3e289cf337e635ef001381e8ca427a77baa9c52c7ba423889f57665779ca5b3c8bcefb8feacbea31dfaac580c969a4f061439069ee34aae icedtea-jdk-musl.patch
974fb54532b7e7d738f4278187fc6bd9f9b2d99866b94f68a617ee4911c89a3b8cc41ecfdcaefecf9157492d006b1844b6b0b41ac4209d84f9e8d13c9e485dd3 icedtea-jdk-includes.patch
-26d33ea5c55f89beebb0c05cc520e839439285f80d8ffca66ee9ef833ba65332dd7848de0b1a7e040d2eed494410d446729db72b09d8a23b6eea55749b8f6f54 icedtea-jdk-close-fds.patch
+4fcad23d533d6a1fd5526223cb76330aebbbbab3766c43a5b6d5d8cc9c729381d153cced81aae2666798c82e90e10e193db33207b357e01fb5ebd0b686263394 icedtea-int-conversion.patch
662d662d0a7a84be2978e921317589f212f3ba3b7629527ba0f1140b5ac4c1024893e0ed176211688ed1a4505968c4befc841ed57ffcdbb9d355c2cb0571b167 icedtea-autoconf-config.patch
c70fee8f1a10c155494ab9c6e55e979d8a3e23f12358ffe9de2029ae15feff361957f1aa43af43c90ecf00523f92e3333b40311a8d0c132ebd456486cb85ed8a icedtea-jdk-disable-vfork.patch
2dfcb699b89c20ac573397a538fb89d13ecf95219044e95fcfd83f368e61c6e6c1ee85af0c9836afc4e1520a8c5a16d62acc7768aa38ce3ad6520d7492d2b232 icedtea-JDK-6515172_0_revert-jdk8-version.patch
52572221ed4f3129bb5de5f134448ffa12b9225980d92684c45b00be42d63f5f89bbf80e0b7294e768fdf6abbbc34301b96289a3c6543bfa4edd0249c1224c77 icedtea-JDK-6515172_1_apply-jdk9-version.patch
e1bca07aa1a25258ee9c8e9870f8d475db788bab1a354c5458196012aaf20fba8b3968b646d18792ab7135e9b75cbebafc53fda176166bc6ddfd13e4a43b1c8d icedtea-issue13032.patch
-d05ef2da69d3e02cbee5bd55be86b61c0a701f65e8cfac287f9b5025934059870d09d5b006c1ffe4e9b9c8aca33842199512d3433249e19346d855e768c0d94f autoconf-2.7x.patch
"
generated by cgit v1.2.3 (git 2.41.0) at 2024-04-20 04:25:35 +0000