git: 811345dd18e9 - main - java/openjdk11: Update to 11.0.12

[Greg Lewis]

The branch main has been updated by glewis:

URL: https://cgit.FreeBSD.org/ports/commit/?id=811345dd18e9eabaeb89368b06796f5a60587c01

commit 811345dd18e9eabaeb89368b06796f5a60587c01
Author:     Greg Lewis <glewis at FreeBSD.org>
AuthorDate: 2021-07-31 02:43:33 +0000
Commit:     Greg Lewis <glewis at FreeBSD.org>
CommitDate: 2021-07-31 02:43:33 +0000

    java/openjdk11: Update to 11.0.12
---
 java/openjdk11/Makefile                       |  6 +++---
 java/openjdk11/distinfo                       |  6 +++---
 java/openjdk11/files/patch-commit-c484d890428 | 23 -----------------------
 3 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile
index f8ac0c8a8896..e5898db19bf8 100644
--- a/java/openjdk11/Makefile
+++ b/java/openjdk11/Makefile
@@ -30,7 +30,7 @@ USE_XORG=	x11 xext xi xrandr xrender xt xtst
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	battleblow
-GH_PROJECT=	openjdk-jdk11u
+GH_PROJECT=	jdk11u
 
 NO_CCACHE=	yes
 
@@ -58,8 +58,8 @@ NOPRECIOUSMAKEVARS=	yes
 
 JDK_MAJOR_VERSION=	11
 JDK_MINOR_VERSION=	0
-JDK_PATCH_VERSION=	11
-JDK_BUILD_NUMBER=	9
+JDK_PATCH_VERSION=	12
+JDK_BUILD_NUMBER=	7
 BSD_JDK_VERSION=	1
 
 JDK_BUG_URL=	https://bugs.freebsd.org/bugzilla/enter_bug.cgi?product=Ports%20%26%20Packages&component=Individual%20Port(s)&short_desc=java/${PORTNAME}${JDK_MAJOR_VERSION}%3A%20
diff --git a/java/openjdk11/distinfo b/java/openjdk11/distinfo
index 8d144e200f4b..1782c7f0bced 100644
--- a/java/openjdk11/distinfo
+++ b/java/openjdk11/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619831556
-SHA256 (battleblow-openjdk-jdk11u-jdk-11.0.11+9-1_GH0.tar.gz) = 46b2c680c4f35da43258bbd77dfe52210d0c6be313b733f151d3ca94e8db181d
-SIZE (battleblow-openjdk-jdk11u-jdk-11.0.11+9-1_GH0.tar.gz) = 122607262
+TIMESTAMP = 1627697320
+SHA256 (battleblow-jdk11u-jdk-11.0.12+7-1_GH0.tar.gz) = 689b625a70f54096f8c193b441aa425be5c765d4db23825b461a84fd616be1cb
+SIZE (battleblow-jdk11u-jdk-11.0.12+7-1_GH0.tar.gz) = 122773821
diff --git a/java/openjdk11/files/patch-commit-c484d890428 b/java/openjdk11/files/patch-commit-c484d890428
deleted file mode 100644
index 39ac7a7e8e46..000000000000
--- a/java/openjdk11/files/patch-commit-c484d890428
+++ /dev/null
@@ -1,23 +0,0 @@
-commit c484d8904285652246c3af212a4211b9a8955149
-Author: Thomas Stuefe <stuefe at openjdk.org>
-Date:   Tue Mar 16 05:49:01 2021 +0000
-
-    8263557: Possible NULL dereference in Arena::destruct_contents()
-    
-    Reviewed-by: kbarrett, coleenp
-
-diff --git src/hotspot/share/memory/arena.cpp src/hotspot/share/memory/arena.cpp
-index 8388f68c359..16059bed9be 100644
---- src/hotspot/share/memory/arena.cpp
-+++ src/hotspot/share/memory/arena.cpp
-@@ -310,7 +310,9 @@ void Arena::destruct_contents() {
-   // reset size before chop to avoid a rare racing condition
-   // that can have total arena memory exceed total chunk memory
-   set_size_in_bytes(0);
--  _first->chop();
-+  if (_first != NULL) {
-+    _first->chop();
-+  }
-   reset();
- }
-