Date: Sat, 31 Jul 2021 05:39:41 GMT From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 96fd8c3f5380 - main - java/openjdk15: Update to 15.0.4 Message-ID: <202107310539.16V5dftI066657@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by glewis: URL: https://cgit.FreeBSD.org/ports/commit/?id=96fd8c3f5380aebe9d5acf26fa0570682dadee61 commit 96fd8c3f5380aebe9d5acf26fa0570682dadee61 Author: Greg Lewis <glewis@FreeBSD.org> AuthorDate: 2021-07-31 05:39:26 +0000 Commit: Greg Lewis <glewis@FreeBSD.org> CommitDate: 2021-07-31 05:39:26 +0000 java/openjdk15: Update to 15.0.4 --- java/openjdk15/Makefile | 5 ++--- java/openjdk15/distinfo | 6 +++--- java/openjdk15/files/patch-commit-c484d890428 | 23 ---------------------- java/openjdk15/files/patch-commit-f8a9602a0a6 | 28 --------------------------- 4 files changed, 5 insertions(+), 57 deletions(-) diff --git a/java/openjdk15/Makefile b/java/openjdk15/Makefile index f5532ed909cd..fcad38034e76 100644 --- a/java/openjdk15/Makefile +++ b/java/openjdk15/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} @@ -55,8 +54,8 @@ NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 15 JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 2 -JDK_BUILD_NUMBER= 7 +JDK_PATCH_VERSION= 4 +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/openjdk15/distinfo b/java/openjdk15/distinfo index d13483e88296..f58ecd3f48cc 100644 --- a/java/openjdk15/distinfo +++ b/java/openjdk15/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1611282896 -SHA256 (battleblow-jdk15u-jdk-15.0.2+7-1_GH0.tar.gz) = 52b9804f89c2b4d597a485450b145b7f033731147d0c75ec14f8e940f88decd1 -SIZE (battleblow-jdk15u-jdk-15.0.2+7-1_GH0.tar.gz) = 101982613 +TIMESTAMP = 1627707749 +SHA256 (battleblow-jdk15u-jdk-15.0.4+5-1_GH0.tar.gz) = 8c7aa041517f3b7fd04756a7f4beb6581eb1aeeeb37ea1afe1277ec908728e64 +SIZE (battleblow-jdk15u-jdk-15.0.4+5-1_GH0.tar.gz) = 102068657 diff --git a/java/openjdk15/files/patch-commit-c484d890428 b/java/openjdk15/files/patch-commit-c484d890428 deleted file mode 100644 index 39ac7a7e8e46..000000000000 --- a/java/openjdk15/files/patch-commit-c484d890428 +++ /dev/null @@ -1,23 +0,0 @@ -commit c484d8904285652246c3af212a4211b9a8955149 -Author: Thomas Stuefe <stuefe@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/openjdk15/files/patch-commit-f8a9602a0a6 b/java/openjdk15/files/patch-commit-f8a9602a0a6 deleted file mode 100644 index 3222f6ceb871..000000000000 --- a/java/openjdk15/files/patch-commit-f8a9602a0a6 +++ /dev/null @@ -1,28 +0,0 @@ -commit f8a9602a0a65cdc98eb940aac9529256ded2bf42 -Author: Yasumasa Suenaga <ysuenaga@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. - "", - "", - "",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107310539.16V5dftI066657>