aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Frankenberger <simon-alpine@fraho.eu>2021-07-29 19:12:51 +0200
committerAndy Postnikov <apostnikov@gmail.com>2021-07-30 17:45:28 +0000
commitc9c2580f7e0d46c97a2e9f3d9127a1c2c7af4c6e (patch)
treebe221cf172d7e2713b2ffd282683f78ead1bf528
parentd2f6f47a1bef725a508a587347f2fc329f55b165 (diff)
downloadaports-c9c2580f7e0d46c97a2e9f3d9127a1c2c7af4c6e.tar.gz
aports-c9c2580f7e0d46c97a2e9f3d9127a1c2c7af4c6e.tar.bz2
aports-c9c2580f7e0d46c97a2e9f3d9127a1c2c7af4c6e.tar.xz
community/openjdk11: upgrade to 11.0.12
-rw-r--r--community/openjdk11/APKBUILD16
-rw-r--r--community/openjdk11/build.patch11
2 files changed, 11 insertions, 16 deletions
diff --git a/community/openjdk11/APKBUILD b/community/openjdk11/APKBUILD
index 2e699eaeef..29bba2732b 100644
--- a/community/openjdk11/APKBUILD
+++ b/community/openjdk11/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Simon Frankenberger <simon-alpine@fraho.eu>
# Maintainer: Simon Frankenberger <simon-alpine@fraho.eu>
pkgname=openjdk11
-pkgver=11.0.11_p9
-_pkgver=${pkgver/_p9/-ga}
+pkgver=11.0.12_p7
+_pkgver=${pkgver/_p7/-ga}
pkgrel=0
pkgdesc="Oracle OpenJDK 11"
provider_priority=11
@@ -78,6 +78,10 @@ case "$CARCH" in
esac
# secfixes:
+# 11.0.12_p7-r0:
+# - CVE-2021-2341
+# - CVE-2021-2369
+# - CVE-2021-2388
# 11.0.9_p11-r0:
# - CVE-2020-14779
# - CVE-2020-14781
@@ -333,12 +337,14 @@ _jdk() {
mv "$_fromroot/include" "$_toroot"
}
-sha512sums="903bbe25342eb83ef37935b172ed983f75f8e86f0907e20e023fb2ca09af95ef04331306fd0faadc9c3c12a6e48abc6f4f0d4d4da8be78f66546c78c8f4e67de jdk-11.0.11-ga.tar.gz
-6dffbedd8e6843d29c4ae46c3d58da8a36b6ecac235d325755fc62466278e76660957724de305ccb3328e36a224c066168d32d738d1bb09fd0708eec5255455d build.patch
+sha512sums="
+218c15227cab6e32d37664b42cb9302c2fe018f71688d6465ed21236ec23ef1fd7956abdde9438aad6440232904ca7ce25a155c106d954c961f4f5649acaf082 jdk-11.0.12-ga.tar.gz
+b12077649a0553cd607f04854faf6cd21807a572e1321be2ea209c09e18517ea784a7c141da8fc8d0332242f90baf9024765530fce6485c5d72500083e8ff3a4 build.patch
f7fd94b04740e2a3f966577a5c02f7d6db38ef0ab3ef7b3183cd3ba3d8ff7304e3151fba03a4bcbb9f82f380a723d7823794e168ebf9f2fa8d5e7a9dbc895ce9 aarch64.patch
000880e80e3b4c43db432b2ef5faab348742b1fe6b7dcfb2043c4678ba2b19ed09a3cd07b2dcc27286fd2daef7b765076c0c0eae6a244f15f421258058f3a82b ppc64le.patch
53d0596fdb7bda21948ca233e3a402e60fd167c9147d86eac0c743f7987652840cc49aeaa1c0d3770ee8e37d8f4c5cd86aa85b4b83f8c8e8bf3248c258737d03 fix-bootjdk-check.patch
d1767dddd8e0956e25c0f77ed45c6fc86a1191bae1704a6dc33be490fd20eaa50461fe5c2a3349512059d555651e2eb41437dd3c1096c351e8ee68b4534a2579 HelloWorld.java
27e91edef89d26c0c5b9a813e2045f8d2b348745a506ae37b34b660fa7093da9a4e0e676ea41dc4a5c901bce02e5304d95e90f68d6c99cbf461b2da40a7a9853 TestECDSA.java
b02dff8d549f88317bb4c741a9e269e8d59eef990197d085388fc49c7423a4eb9367dbe1e02bffb10e7862f5980301eb58d4494e177d0e8f60af6b05c7fbbe60 TestCryptoLevel.java
-cc466f64fcc8762cf6e3c1f5739be6425209b27aa58acff4e7eb126003d61fa18266f0e79e57e9d84224654010185ab45dc0a8043543dea227258458a00a1eb1 Alpine_Bug_10126.java"
+cc466f64fcc8762cf6e3c1f5739be6425209b27aa58acff4e7eb126003d61fa18266f0e79e57e9d84224654010185ab45dc0a8043543dea227258458a00a1eb1 Alpine_Bug_10126.java
+"
diff --git a/community/openjdk11/build.patch b/community/openjdk11/build.patch
index 2223250727..8ffb3ef1a6 100644
--- a/community/openjdk11/build.patch
+++ b/community/openjdk11/build.patch
@@ -152,17 +152,6 @@ The base was taken from a diff with the portola project and adjusted for latest
ScratchBlock *cur = *prev_ptr;
while (cur) {
assert(*prev_ptr == cur, "just checking");
---- old/src/hotspot/share/runtime/vm_version.cpp
-+++ new/src/hotspot/share/runtime/vm_version.cpp
-@@ -284,7 +284,7 @@
- #endif
-
- #define INTERNAL_VERSION_SUFFIX VM_RELEASE ")" \
-- " for " OS "-" CPU FLOAT_ARCH_STR \
-+ " for " OS "-" CPU FLOAT_ARCH_STR LIBC \
- " JRE (" VERSION_STRING "), built on " __DATE__ " " __TIME__ \
- " by " XSTR(HOTSPOT_BUILD_USER) " with " HOTSPOT_BUILD_COMPILER
-
--- old/src/hotspot/share/utilities/globalDefinitions_gcc.hpp
+++ new/src/hotspot/share/utilities/globalDefinitions_gcc.hpp
@@ -204,7 +204,7 @@