From 0ccb2b8bdd254a1f0ad6d739129d81f50231900f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 30 Sep 2022 19:07:17 -0400
Subject: [PATCH] openjdk17: update to 17.0.5+7.

---
 .../files/musl_patches/8289477.patch          | 35 -------------------
 srcpkgs/openjdk17/template                    |  4 +--
 2 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 srcpkgs/openjdk17/files/musl_patches/8289477.patch

diff --git a/srcpkgs/openjdk17/files/musl_patches/8289477.patch b/srcpkgs/openjdk17/files/musl_patches/8289477.patch
deleted file mode 100644
index 57ac4866b578..000000000000
--- a/srcpkgs/openjdk17/files/musl_patches/8289477.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From da6d1fc0e0aeb1fdb504aced4b0dba0290ec240f Mon Sep 17 00:00:00 2001
-From: Thomas Stuefe <stuefe@openjdk.org>
-Date: Thu, 30 Jun 2022 06:19:25 +0000
-Subject: [PATCH] 8289477: Memory corruption with CPU_ALLOC, CPU_FREE on muslc
-
-Reviewed-by: dholmes, clanger
----
- src/hotspot/os/linux/os_linux.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
-index 726926218907..8ee10e201c69 100644
---- a/src/hotspot/os/linux/os_linux.cpp
-+++ b/src/hotspot/os/linux/os_linux.cpp
-@@ -4591,7 +4591,8 @@ static int _cpu_count(const cpu_set_t* cpus) {
- // dynamic check - see 6515172 for details.
- // If anything goes wrong we fallback to returning the number of online
- // processors - which can be greater than the number available to the process.
--int os::Linux::active_processor_count() {
-+static int get_active_processor_count() {
-+  // Note: keep this function, with its CPU_xx macros, *outside* the os namespace (see JDK-8289477).
-   cpu_set_t cpus;  // can represent at most 1024 (CPU_SETSIZE) processors
-   cpu_set_t* cpus_p = &cpus;
-   int cpus_size = sizeof(cpu_set_t);
-@@ -4663,6 +4664,10 @@ int os::Linux::active_processor_count() {
-   return cpu_count;
- }
- 
-+int os::Linux::active_processor_count() {
-+  return get_active_processor_count();
-+}
-+
- // Determine the active processor count from one of
- // three different sources:
- //
diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index 06d100ad24b0..e4b6a8a3b5bb 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -1,6 +1,6 @@
 # Template file for 'openjdk17'
 pkgname=openjdk17
-version=17.0.4+8
+version=17.0.5+7
 revision=1
 _gtest_ver=1.8.1
 _java_ver="${version%%.*}"
@@ -45,7 +45,7 @@ license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz
  https://github.com/google/googletest/archive/refs/tags/release-${_gtest_ver}.tar.gz"
-checksum="b10b80aa96ac43c75163c1888bb42b66e1eeaecb02412d30de5369df7337ac8f
+checksum="f268e91052adb773ed5ecac70b232e70e830c89dd2d570c8c872bfaf2772867e
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1"
 patch_args="-Np1 --directory=$build_wrksrc"