From nobody Sun Jul 28 06:08:58 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WWrfM0JdVz5RXjB; Sun, 28 Jul 2024 06:08:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WWrfL5ybJz4t6y; Sun, 28 Jul 2024 06:08:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722146938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CXs/hd1IYTVzYwoq8Zfh+RtsJs+FybLLgrWuFa/nnk0=; b=aSrt2lN2Fg87qpE0BR/8ADA1AIsDrDdMO+v7c3sHSglz+cllWOgXK0HmYg8YK/TrME85dx D4NoXz1/RGhzT7CYzMYDoH3v3kDhuhYTBkuPg57oUh/T0+yFPhrQLQib8NtCdNfilP8Ww6 fngI5J10x0dj1S1yZiVjBxxv4MrxpQ8FMniLHcPTbpbMYsg4JsZncNmRHNzWkUjryreY7C saigeWYHMSXAQldDbH1tY/n/S5ppF6R+6yFkcSKCrSx6xD7M5SWI+6QLYYra7jVFAEbplB ufiCS6xoPrBxLqoFDwp5sGZvmpr2uwZQKP14rY1UqIPUxGnHWDJa4LyQId0HgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722146938; a=rsa-sha256; cv=none; b=wQIhtNM7CxleSowctTmlmGFt2QeXaGuN9lzafOFtulgC2IS642CsTp8OyX5Q7ZaAy37ghs w38DJOlEP/geZtqljZlBsQ7ENeYbvO2IpdZew4QMEOvbTbL6ORp/zCZQmUVL9Wi9cDKFP4 XaIEYcjs4oVPTGkT0gDir+UQo6C61UEw453vj3JZkrRB6tkwtVFwLD79lGe2ivF4mpVSH5 TwYIMMgN+N9CnK+q2L4BZl3Jx3KnbM2607Ur6excxTZQoveytRAmgB4s247HZ824zODTHd aIEKgb5v56unAq4TQUe0ldRkwUCv+DhNJNlgtVdP7zX7jDb9pxJcVc+ehN9Pqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722146938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CXs/hd1IYTVzYwoq8Zfh+RtsJs+FybLLgrWuFa/nnk0=; b=jlDVO+/OrYXToyYhMG5cOcJ71fw5C11nI9TBjxlB7PcN0p2zHkGgj9hS0vsv9tQl+Zitb7 UHVrRYyXFcOQDHc1/jhm7ryzOTrJedhNeNQqWO9oH+KAvXNfb63V9wgFRZoKLpABFIGRkC Zaf0/qZSvNIbpHxitPg6N1AKex7/VwoqmRDvoHluaAHBjRZUZO2dbBvjTbDOA5rkQOiBpw EOT3Wa/fLwT5nTsuoOPh8HLFirXq1UBOeUkUQY3NUK7//kLlXQXo77u9jYV4c6DBemzLdR GNbVUZOJmdPBxO2V2WPb7T8TKUfUCigDKH5S37tWHxYgPl7QlWWtvD4p5F12GQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WWrfL5b33zfQS; Sun, 28 Jul 2024 06:08:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46S68w4Y095465; Sun, 28 Jul 2024 06:08:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46S68wHH095462; Sun, 28 Jul 2024 06:08:58 GMT (envelope-from git) Date: Sun, 28 Jul 2024 06:08:58 GMT Message-Id: <202407280608.46S68wHH095462@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Greg Lewis Subject: git: 274bbd72a971 - main - java/openjdk22: Update to 22.0.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glewis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 274bbd72a971381b75e46e682ca3fea7a7b8fc0d Auto-Submitted: auto-generated The branch main has been updated by glewis: URL: https://cgit.FreeBSD.org/ports/commit/?id=274bbd72a971381b75e46e682ca3fea7a7b8fc0d commit 274bbd72a971381b75e46e682ca3fea7a7b8fc0d Author: Greg Lewis AuthorDate: 2024-07-28 06:07:40 +0000 Commit: Greg Lewis CommitDate: 2024-07-28 06:08:33 +0000 java/openjdk22: Update to 22.0.2 --- java/openjdk22/Makefile | 8 ++-- java/openjdk22/distinfo | 6 +-- ...h-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp | 44 ---------------------- 3 files changed, 7 insertions(+), 51 deletions(-) diff --git a/java/openjdk22/Makefile b/java/openjdk22/Makefile index cd6505fee645..9456a355bb6a 100644 --- a/java/openjdk22/Makefile +++ b/java/openjdk22/Makefile @@ -1,6 +1,6 @@ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- -DISTVERSION= ${JDK_MAJOR_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} +DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -34,7 +34,7 @@ CPE_VENDOR= oracle USE_GITHUB= yes GH_ACCOUNT= battleblow -GH_PROJECT= jdk22 +GH_PROJECT= jdk22u NO_CCACHE= yes @@ -62,8 +62,8 @@ NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 22 JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 0 -JDK_BUILD_NUMBER= 36 +JDK_PATCH_VERSION= 2 +JDK_BUILD_NUMBER= 9 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/openjdk22/distinfo b/java/openjdk22/distinfo index b9846af000e1..fb2c92e36e3a 100644 --- a/java/openjdk22/distinfo +++ b/java/openjdk22/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1709401903 -SHA256 (battleblow-jdk22-jdk-22+36-1_GH0.tar.gz) = 5defdd386289a0ac4c898642216f45bf71f58dddae66d67df113ca63847d65c9 -SIZE (battleblow-jdk22-jdk-22+36-1_GH0.tar.gz) = 112090664 +TIMESTAMP = 1722138875 +SHA256 (battleblow-jdk22u-jdk-22.0.2+9-1_GH0.tar.gz) = 5e2731b979cab49d5004cf0aca58c642c94c1808c48278bff6c440945874f24c +SIZE (battleblow-jdk22u-jdk-22.0.2+9-1_GH0.tar.gz) = 112154344 diff --git a/java/openjdk22/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp b/java/openjdk22/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp deleted file mode 100644 index dda6fd26cce0..000000000000 --- a/java/openjdk22/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp +++ /dev/null @@ -1,44 +0,0 @@ ---- src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.cpp.orig 2024-04-11 22:23:08 UTC -+++ src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.cpp -@@ -61,6 +61,7 @@ - # include - # include - # include -+# include - # include - # include - # include -@@ -432,6 +433,33 @@ size_t os::Posix::default_stack_size(os::ThreadType th - // Default stack size (compiler thread needs larger stack). - size_t s = (thr_type == os::compiler_thread ? 4 * M : 1024 * K); - return s; -+} -+ -+void os::current_stack_base_and_size(address* base, size_t* size) { -+ address bottom; -+ pthread_attr_t attr; -+ -+ int rslt = pthread_attr_init(&attr); -+ -+ // JVM needs to know exact stack location, abort if it fails -+ if (rslt != 0) -+ fatal("pthread_attr_init failed with error = %d", rslt); -+ -+ rslt = pthread_attr_get_np(pthread_self(), &attr); -+ -+ if (rslt != 0) -+ fatal("pthread_attr_get_np failed with error = %d", rslt); -+ -+ if (pthread_attr_getstackaddr(&attr, (void **)&bottom) != 0 || -+ pthread_attr_getstacksize(&attr, size) != 0) { -+ fatal("Can not locate current stack attributes!"); -+ } -+ -+ *base = bottom + *size; -+ -+ pthread_attr_destroy(&attr); -+ assert(os::current_stack_pointer() >= bottom && -+ os::current_stack_pointer() < *base, "just checking"); - } - - /////////////////////////////////////////////////////////////////////////////