diff options
| author | J0WI <J0WI@users.noreply.github.com> | 2020-01-20 19:57:28 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2020-01-29 08:21:17 +0000 |
| commit | b7342d2b8824c97f1e386f8d0406d269c2cc0829 (patch) | |
| tree | 96caad7778a42e458c8d0cd972af88322246848a /community | |
| parent | c0756ad6450664d5e284418696eb09fa7268b25f (diff) | |
| download | aports-b7342d2b8824c97f1e386f8d0406d269c2cc0829.tar.bz2 aports-b7342d2b8824c97f1e386f8d0406d269c2cc0829.tar.xz | |
community/openjdk11: security upgrade to 11.0.6_p10
Diffstat (limited to 'community')
| -rw-r--r-- | community/openjdk11/APKBUILD | 17 | ||||
| -rw-r--r-- | community/openjdk11/ppc64le.patch | 18 |
2 files changed, 22 insertions, 13 deletions
diff --git a/community/openjdk11/APKBUILD b/community/openjdk11/APKBUILD index 1a009368ab..1f791487ea 100644 --- a/community/openjdk11/APKBUILD +++ b/community/openjdk11/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Simon Frankenberger <simon-alpine@fraho.eu> # Maintainer: Simon Frankenberger <simon-alpine@fraho.eu> pkgname=openjdk11 -pkgver=11.0.5_p10 +pkgver=11.0.6_p10 _pkgver=${pkgver/_p/+} pkgrel=0 pkgdesc="Oracle OpenJDK 11" @@ -42,7 +42,7 @@ $pkgname-jre:_jre $pkgname-src:_src:noarch $pkgname-jre-headless:_jre_headless $pkgname-jdk:_jdk" -source="jdk-$_pkgver.tar.bz2::http://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-$_pkgver.tar.bz2 +source="jdk-$_pkgver.tar.bz2::https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-$_pkgver.tar.bz2 build.patch aarch64.patch @@ -70,6 +70,15 @@ if [ $_run_jtreg -ne 0 ]; then checkdepends="$checkdepends ttf-freefont xvfb" fi +# secfixes: +# 11.0.6_p10-r0: +# - CVE-2020-2583 +# - CVE-2020-2590 +# - CVE-2020-2593 +# - CVE-2020-2601 +# - CVE-2020-2604 +# - CVE-2020-2654 +# - CVE-2020-2655 prepare() { default_prepare @@ -307,11 +316,11 @@ _jdk() { mv "$_fromroot/include" "$_toroot" } -sha512sums="0d52c78e217b79756be0fc6b3f9204bae254ec7b9ae10b6c3114463a9c028143807f4422711f0c02b81a034ae6e88fa2efc6bed85022720807344230a8aa12a6 jdk-11.0.5+10.tar.bz2 +sha512sums="2c17182d3dd16dcf9ab527ce84ad1737946c80259ac227f9eddf385444471a78b3b112ba58cce0e30818bb35fcfdbb1436e063aac1af69e7b68a83540a31cebf jdk-11.0.6+10.tar.bz2 66a9f2736da87de09d7bcc136771ab760bdba7847f3a23b2aa4efbc2e55ac8b49510c6d7afdf3f8d046c6e3fe9dca0d4cb0b5a38d7a3aebaf86fa0e3cc635eac build.patch 8c0f1f8d2a78ebb30a8460bc0ea9cd2349cea98819df1577bf7de19a1dd82d06a593f36b4e17c282ed53d23f00163e387e3dd1f3c9e5a092726e78c3aa710370 aarch64.patch d2903a5b3b9f82c4888416580f0b93888bf21ae0dac0ce6e926607a82a9e53b7e10e13f07a984f65dc116e81f58cd3844d6156088534c0059be8f6ee68e19a43 arm.patch -4eb577645e7b6d4563290480e162702030033515ff4845edbd1dbf2604b6f1e7d2a3cdd85058d6b41938b54c097635125c4429b9df3fcda589b980aa1740fd2e ppc64le.patch +592bf6c1be99879735f0b2484d7d286be049170f5fb7de8526b452cde732e97f2b9b5b0af0073ec0a525bd52ce9f207a7dcace9d9d83a950eee38b11d6f5ad8d ppc64le.patch 89e681da2de0bcb5131e2512d1280ce8da684ede5b38379c6325cd9f57e78a4bdde3abfa0a0a496889411dd57264312094973ce2da301293d0826114a3ef09d3 x86.patch d1767dddd8e0956e25c0f77ed45c6fc86a1191bae1704a6dc33be490fd20eaa50461fe5c2a3349512059d555651e2eb41437dd3c1096c351e8ee68b4534a2579 HelloWorld.java 27e91edef89d26c0c5b9a813e2045f8d2b348745a506ae37b34b660fa7093da9a4e0e676ea41dc4a5c901bce02e5304d95e90f68d6c99cbf461b2da40a7a9853 TestECDSA.java diff --git a/community/openjdk11/ppc64le.patch b/community/openjdk11/ppc64le.patch index 88ee55ae05..c3f7165bd8 100644 --- a/community/openjdk11/ppc64le.patch +++ b/community/openjdk11/ppc64le.patch @@ -206,15 +206,15 @@ if (ret_frame.pc() == NULL) { // ucontext wasn't useful -@@ -69,7 +74,11 @@ - if (!((Method*)(istate->method))->is_metaspace_object()) { - return false; - } +@@ -70,7 +75,11 @@ + if (m == NULL || !m->is_valid_method()) return false; + if (!Metaspace::contains((const void*)m->constMethod())) return false; + +#if defined(__GLIBC__) || defined(__UCLIBC__) - uint64_t reg_bcp = uc->uc_mcontext.regs->gpr[14/*R14_bcp*/]; + uint64_t reg_bcp = uc->uc_mcontext.regs->gpr[14/*R14_bcp*/]; +#else // Musl -+ uint64_t reg_bcp = uc->uc_mcontext.gp_regs[14/*R14_bcp*/]; ++ uint64_t reg_bcp = uc->uc_mcontext.gp_regs[14/*R14_bcp*/]; +#endif - uint64_t istate_bcp = istate->bcp; - uint64_t code_start = (uint64_t)(((Method*)(istate->method))->code_base()); - uint64_t code_end = (uint64_t)(((Method*)istate->method)->code_base() + ((Method*)istate->method)->code_size()); + uint64_t istate_bcp = istate->bcp; + uint64_t code_start = (uint64_t)(m->code_base()); + uint64_t code_end = (uint64_t)(m->code_base() + m->code_size()); |