git: b16d9d899f3d - main - java/openjdk13: Update to 13.0.8

[Greg Lewis]

The branch main has been updated by glewis:

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

commit b16d9d899f3d9a3a7be7559cda78b74120918e22
Author:     Greg Lewis <glewis at FreeBSD.org>
AuthorDate: 2021-07-31 05:00:51 +0000
Commit:     Greg Lewis <glewis at FreeBSD.org>
CommitDate: 2021-07-31 05:00:51 +0000

    java/openjdk13: Update to 13.0.8
---
 java/openjdk13/Makefile                            |  7 +++---
 java/openjdk13/distinfo                            |  6 ++---
 java/openjdk13/files/patch-commit-c484d890428      | 23 ------------------
 java/openjdk13/files/patch-commit-f8a9602a0a6      | 28 ----------------------
 ...rc_hotspot_cpu_aarch64_vm__version__aarch64.cpp | 15 ------------
 5 files changed, 6 insertions(+), 73 deletions(-)

diff --git a/java/openjdk13/Makefile b/java/openjdk13/Makefile
index cb1eb36287df..e9ffb90a186e 100644
--- a/java/openjdk13/Makefile
+++ b/java/openjdk13/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	openjdk
 DISTVERSIONPREFIX=	jdk-
 DISTVERSION=	${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
-PORTREVISION=	1
 CATEGORIES=	java devel
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
 
@@ -30,7 +29,7 @@ USE_XORG=	x11 xext xi xrandr xrender xt xtst
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	battleblow
-GH_PROJECT=	openjdk-jdk13u
+GH_PROJECT=	jdk13u
 
 NO_CCACHE=	yes
 
@@ -54,8 +53,8 @@ NOPRECIOUSMAKEVARS=	yes
 
 JDK_MAJOR_VERSION=	13
 JDK_MINOR_VERSION=	0
-JDK_PATCH_VERSION=	7
-JDK_BUILD_NUMBER=	1
+JDK_PATCH_VERSION=	8
+JDK_BUILD_NUMBER=	5
 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/openjdk13/distinfo b/java/openjdk13/distinfo
index 3ab3c2e534ea..70a8faf9214a 100644
--- a/java/openjdk13/distinfo
+++ b/java/openjdk13/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612671777
-SHA256 (battleblow-openjdk-jdk13u-jdk-13.0.7+1-1_GH0.tar.gz) = 88d687b6ed0c79a7c6ffef2451d1e155ad898cea119d501e9d89c97753104185
-SIZE (battleblow-openjdk-jdk13u-jdk-13.0.7+1-1_GH0.tar.gz) = 109068987
+TIMESTAMP = 1627699765
+SHA256 (battleblow-jdk13u-jdk-13.0.8+5-1_GH0.tar.gz) = 45731945627cd6b0910200ac744697e9a159f7b801abcbe0283c74e5202c41ef
+SIZE (battleblow-jdk13u-jdk-13.0.8+5-1_GH0.tar.gz) = 109182266
diff --git a/java/openjdk13/files/patch-commit-c484d890428 b/java/openjdk13/files/patch-commit-c484d890428
deleted file mode 100644
index 39ac7a7e8e46..000000000000
--- a/java/openjdk13/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();
- }
- 
diff --git a/java/openjdk13/files/patch-commit-f8a9602a0a6 b/java/openjdk13/files/patch-commit-f8a9602a0a6
deleted file mode 100644
index 3222f6ceb871..000000000000
--- a/java/openjdk13/files/patch-commit-f8a9602a0a6
+++ /dev/null
@@ -1,28 +0,0 @@
-commit f8a9602a0a65cdc98eb940aac9529256ded2bf42
-Author: Yasumasa Suenaga <ysuenaga at openjdk.org>
-Date:   Thu Jan 21 06:08:13 2021 +0000
-
-    8260025: Missing comma in VM_Version_Ext::_family_id_amd
-    
-    Reviewed-by: dholmes, stuefe
-
-diff --git src/hotspot/cpu/x86/vm_version_ext_x86.cpp src/hotspot/cpu/x86/vm_version_ext_x86.cpp
-index 30d9494c654..a84b37f7977 100644
---- src/hotspot/cpu/x86/vm_version_ext_x86.cpp
-+++ src/hotspot/cpu/x86/vm_version_ext_x86.cpp
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -739,7 +739,7 @@ const char* const VM_Version_Ext::_family_id_amd[ExtendedFamilyIdLength_AMD] = {
-   "",
-   "",
-   "Opteron/Athlon64",
--  "Opteron QC/Phenom"  // Barcelona et.al.
-+  "Opteron QC/Phenom",  // Barcelona et.al.
-   "",
-   "",
-   "",
diff --git a/java/openjdk13/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp b/java/openjdk13/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp
deleted file mode 100644
index e89a35822d97..000000000000
--- a/java/openjdk13/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
-+++ src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
-@@ -34,8 +34,12 @@
- 
- #include OS_HEADER_INLINE(os)
- 
-+#if defined(__linux__)
- #include <sys/auxv.h>
- #include <asm/hwcap.h>
-+#elif defined(__FreeBSD__)
-+#include <machine/elf.h>
-+#endif
- 
- #ifndef HWCAP_ASIMD
- #define HWCAP_ASIMD (1<<1)