Skip to content
Snippets Groups Projects
Commit 72743088 authored by Simon F's avatar Simon F Committed by Kevin Daudt
Browse files

community/openjdk7: disable vfork and fix wrong icedtea version

The new patch replaces calls to vfork() with regular fork().
As discussed in irclogs from 2020/12.
This should fix the deadlocks while building on aarch64.

Also this commit fixes the wrong icedtea version number
from previous upgrade.
parent a4abde86
No related branches found
No related tags found
1 merge request!15562community/openjdk7: disable vfork and fix wrong icedtea version
......@@ -2,7 +2,7 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Timo Teras <timo.teras@iki.fi>
pkgname=openjdk7
_icedteaver=2.6.23
_icedteaver=2.6.24
_icedteaversrc=$_icedteaver
# pkgver is <JDK version>.<JDK update>
# check icedtea JDK when updating
......@@ -85,12 +85,13 @@ source="https://icedtea.classpath.org/download/source/icedtea-$_icedteaversrc.ta
icedtea-jdk-no-soname.patch
icedtea-jdk-xattr.patch
icedtea-cpio.patch
icedtea-jdk-disable-vfork.patch
fix-xattr-include.patch
"
# secfixes:
# 7.271.2.6.23-r0:
# 7.281.2.6.24-r0:
# - CVE-2019-2745
# - CVE-2020-14779
# - CVE-2020-14781
......@@ -311,14 +312,14 @@ doc() {
mv "$pkgdir"/$_install_base/man "$subpkgdir"/$_install_base/
}
sha512sums="3e3d6651e196839479e843fa4926f3459d8254918f79771f51edf2db40c0a70d9ddb2066727a19177ade9ceb0b38c0dcd7d6f2074f249ade72c969bc8434c53a icedtea-2.6.23.tar.xz
0b43d782ba2799de44422491dbe2638d04e88297e74fc13f3b3a16d6eebdfa7ce2e26cf10832b724e20b13c3a6717c116fd1d5d1b912df6dc4d1e1b678fa3ead openjdk-2.6.23.tar.bz2
dddcda339b78536e3f04083afb8c7834cefb04955f713f4366704be8a2599590a5f7106cd4f2cefdee891110e3a4801193be1f4a44d9006e58f4e8d5fb9c5619 corba-2.6.23.tar.bz2
df8b634d71e8fbdd77923b7db68d20506ed2fd4cd63d54eb3c325e317e0cd3c2b70a2b51fe78c9da4f5f0a08e529db0fa2cd98a6272c6bff9e262c2d67ca141c jaxp-2.6.23.tar.bz2
b37416fb7f3f93bb4c9ffc171d1bf82e4026e609fd3e944027931e79c785a8257274e9267bfdfe31c8265d4256dda8ca4434d557613329f20e9d256f40eaa7dd jaxws-2.6.23.tar.bz2
da18adf031b557c55fd84c8ba842bef76f2908b0cb52cf93c35b5b16b8e88b5024ed9a92469bc547f72b9c7015bf8e5e2e3edba921b94716ac79bea966b93afc jdk-2.6.23.tar.bz2
ae86c875e33406f99873492a18f656a6578532571ed4d1cd2a91c816d3066bc007d1d402853a06c8ee5a984239d5558856a7f21422d55b1e7e88fb30a5b2a275 langtools-2.6.23.tar.bz2
b5d92b312d950d90938f5769d8475539a29cb796651acdbd830742c4f36024d04d4a40fe82edb7d89b7f027bb7ef2c2675d88a5374beadbb8d326c66ad4030b7 hotspot-2.6.23.tar.bz2
sha512sums="db97bd4106f732cab64528b5d087ea56333d9b0916f238a58b84d44bc8602ca64419f827afca483c0ba9538986bbf0bf5b92683b6f96d8df047b334328d76d11 icedtea-2.6.24.tar.xz
fb5bd58480194b556ecfdb3225e4d70ac710cf0cc75ada483ed81786ff2b5eb961508291261742eab2ba91bdab9ea38188b02caaa1eb5abbdee43db4daad0416 openjdk-2.6.24.tar.bz2
ed6244abf6a7ddfced08c8dd1d6f0ccee2344e0e85a9499c76a97f64708cbc9676bfb475c0ae907820ea1e8b5c1c4e73f57662bdcee6e41edf25a99d46d972fc corba-2.6.24.tar.bz2
7a867293ef178f0af8bd37bdf94dcbf56a646974742aaec1f009d328eb18f4083c0120eb16d50e4510dff344074558151736e22f767ba9aa311b9f4a0c53013d jaxp-2.6.24.tar.bz2
3257d4058e056f5664d185ea3357972e412033bc8f69f7e0778c31f47b354741a2c2e2c2a389939a06cc4c9eb6c024bf47f5b936a09b3606d2cdcc7d7236517a jaxws-2.6.24.tar.bz2
24ff2ca12aa2f2c1b84803586f90e77527fc2c3df726650e828ab7f8430ac5a2805eee46ee830a6e1141d6f8c5a476a3ed7edece5b0534e2d33037155779f0d4 jdk-2.6.24.tar.bz2
1d5def1076785a2a3097a18bdec0070fd69adff79e54fa24988da09b4457e9d363f05396016854301a1123b446d38e2c23c86cada43ae09e4fa8edf3b5d669b2 langtools-2.6.24.tar.bz2
21fe6c47b7d116662bd772ecb526b993b11033e13286bdf0257aab60ec374cce6194dfea87b78ea5a1a62d5fbe83b01e9539ce8b81c73333a9dfb6dc0bf8fec5 hotspot-2.6.24.tar.bz2
487dbd1d7f678a92924ba884a57e910ccb4fe565c554278795a8fdfc80c4e88d81ebc2ccecb5a8f353f0b2076572bb921499a2cadb064e0f44fc406a3c31da20 apache-ant-1.9.14-bin.tar.gz
1b9e8721749e81c5420a00af1e00ee0e4f48624ccb4e9aa969032114116ad50f59b254d4d16d74feff74de64157cc8b0a2ead9b555907c84b7055b796fba9a75 rhino-1.7.7.2.zip
74e38e41db0dcca6ec91d3a83330f06904342ba8e950d896c4544db72b76a3ae6665793b83d7bbeb5a0cd3896b48707c8beda92ef0eb0e7f821c15e591e2fd49 icedtea-hotspot-musl.patch
......@@ -334,4 +335,5 @@ e7a2c1771bb582d427041f8d22e48c0daf8f20d7c0926cbce3549d49c4e949359ee25a35682b486e
bf4b184e170f7b0ff64ab30d2162784fe2bd5460d1fa31973259f7065fd4c511c46f97724fe2bd72bb94e9006cb568d0e0c87d1a9c90819e65880f8f44830bb1 icedtea-jdk-no-soname.patch
e703e5f68e63f130e758b3fa813872363090c08eee6a6366f4784cf6a191a90a3642ec71e016bd05e48a66ad0ae56db8b0e318b101aca5d0885af8705423b770 icedtea-jdk-xattr.patch
a54c79c82afa1bc95265397b274260584c8b8c6be1651ddfb907d9523a809ea4581409e0d3fb0bbb63ef5a204e8ce29b7940e78cd640af1f490ae938c59129b6 icedtea-cpio.patch
c70fee8f1a10c155494ab9c6e55e979d8a3e23f12358ffe9de2029ae15feff361957f1aa43af43c90ecf00523f92e3333b40311a8d0c132ebd456486cb85ed8a icedtea-jdk-disable-vfork.patch
4c874f0e9f3f54f688a1faf64fa3734e31f139f465ce77d12aac87558764ef66055de6cfac5b60efef2833c64256136c70f3cf5dc2712de62fc5dbebe3a8fbcd fix-xattr-include.patch"
--- openjdk.orig/jdk/src/solaris/native/java/lang/UNIXProcess_md.c
+++ openjdk/jdk/src/solaris/native/java/lang/UNIXProcess_md.c
@@ -552,7 +552,11 @@
startChild(JNIEnv *env, jobject process, ChildStuff *c, const char *helperpath) {
switch (c->mode) {
case MODE_VFORK:
+// use regular fork when running on musl
+// this should fix deadlocks on aarch64
+#if defined(__GLIBC__) || defined(__UCLIBC__)
return vforkChild(c);
+#endif
case MODE_FORK:
return forkChild(c);
#if defined(__solaris__) || defined(_ALLBSD_SOURCE) || defined(_AIX)
@@ -651,8 +655,12 @@
if (resultPid < 0) {
switch (c->mode) {
case MODE_VFORK:
+// use regular fork when running on musl
+// this should fix deadlocks on aarch64
+#if defined(__GLIBC__) || defined(__UCLIBC__)
throwIOException(env, errno, "vfork failed");
break;
+#endif
case MODE_FORK:
throwIOException(env, errno, "fork failed");
break;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment