From nobody Tue Aug 02 04:16:31 2022 X-Original-To: dev-commits-ports-main@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 4LxhWg58w3z4Y1W1; Tue, 2 Aug 2022 04:16:31 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LxhWg4cLgz3k4r; Tue, 2 Aug 2022 04:16:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659413791; 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=Icmzc86VESR9ENFepapK+gA4yTdB356tmvyxOPeVrOk=; b=ht/kKeDkL/Z56q8237kuRb06+tJ+yFHhXFVvYqu3gcKAVFOFv1jfIpJDQk3EO+T+8h/MGS JPOWG3zwNlVfbtLZ6svAMvN7hGulcOpN16dWrpZ5fAsF8Il3yILtZgqI1dmi5c3NCZ+Li/ jOANFLQ6CBCfi2FRGiHkrQLyaO1isA4COGE4BejhO/sEu3KXD84Fr2nzssGrIGb9NYGwf8 P/4STsezSflfi2p31WC7XR1/06ktq9aNsZ88BNE1xrj+O0FWWn1/H/WR9vFl2J6oIuf2j+ Uc1wsEDMbeO4zO/i2u+vmV39gpXrkOXytphlnMprBlMCqhr/x63QYmxiZ+J5Pg== 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 4LxhWg3TLDz102Y; Tue, 2 Aug 2022 04:16:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2724GVgU063557; Tue, 2 Aug 2022 04:16:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2724GV7V063555; Tue, 2 Aug 2022 04:16:31 GMT (envelope-from git) Date: Tue, 2 Aug 2022 04:16:31 GMT Message-Id: <202208020416.2724GV7V063555@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: 8efb59db35f1 - main - java/openjdk8: Update to 8u342 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 8efb59db35f1d89bbd66e1b6ea5dbcbe99a611b2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659413791; 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=Icmzc86VESR9ENFepapK+gA4yTdB356tmvyxOPeVrOk=; b=p/qQ/3Qrj0u1TWpyVLtZwyzv495q+LFNN/ZjBLzuXgDbel/+Mr1/Cz9QJLVQ9IKoIfVmLd v5kQanIWpGXHuZMB0kWVJ2O5EHk2+XYzgx1Du12E39f3rlBQug2zElMY5AI1RteMAgZnHA Mmtvr9avRRgf2wFxFAMzrIcpB1Um1AbDOkDigDgJ1rUs7Wf8lWNHrCwuBju7tCJUXzQ/mm uJHCdVRpr8rsiox5WdOFvMLBTGVF71zTp9JzPJegkW+jjmGg41Na/R4rSI+FNAbUt7YZRG rMz/wuGWqDSGFq+4c+k+siGy1OfQjZlJL9c142bQY/GDCRnAmTminDnaTXb/DQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659413791; a=rsa-sha256; cv=none; b=aStfyT+Zy2hhD8L1k4XTssHBBh4a6OHZMVZdpCXPA5YhQCom9Gu1tTlNiixGWL4hRVe+BF ikNus5+QYofxIJRl7HQmXXwKevBEXfP1tTUeVgXTGOc/Ss1b4X0jKsOAGsIdxfeFUedUUd ivz5nc71cVsHAPxYiHg3BBsqtb2ORy28UFl8RNSTTuzeMPHA12yuR08gyZawStldM+QI91 T1Mi9FmQei5AvDtqDzfUC/xXKLxwtPxDxLu2HsBOzhCkw+arH3wSA9KHsIURe2a58Vo++2 lO35ZZYbDSfCKMuqEm/k11THaKzlA+jwjX7K0ANO0QOEBZZP4umYph99yWaGQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glewis: URL: https://cgit.FreeBSD.org/ports/commit/?id=8efb59db35f1d89bbd66e1b6ea5dbcbe99a611b2 commit 8efb59db35f1d89bbd66e1b6ea5dbcbe99a611b2 Author: Greg Lewis AuthorDate: 2022-08-02 04:15:45 +0000 Commit: Greg Lewis CommitDate: 2022-08-02 04:15:45 +0000 java/openjdk8: Update to 8u342 --- java/openjdk8/Makefile | 5 ++--- java/openjdk8/distinfo | 6 +++--- .../patch-hotspot_src_cpu_aarch64_vm_pauth___aarch64.hpp | 14 -------------- java/openjdk8/files/patch-make-common-MakeBase.gmk | 14 -------------- 4 files changed, 5 insertions(+), 34 deletions(-) diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index 3e433a8e7c86..e259fa17033b 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -1,6 +1,5 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION} -PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= LOCAL/jkim:jtreg PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -52,8 +51,8 @@ INSTALLDIR= ${PREFIX}/${PKGBASE} NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 8 -JDK_UPDATE_VERSION= 332 -JDK_BUILD_NUMBER= 09 +JDK_UPDATE_VERSION= 342 +JDK_BUILD_NUMBER= 07 BSD_JDK_VERSION= 1 JTREG_VERSION= 4.1 JTREG_BUILD_NUMBER= b08 diff --git a/java/openjdk8/distinfo b/java/openjdk8/distinfo index 480f11064325..f73bf2b844fc 100644 --- a/java/openjdk8/distinfo +++ b/java/openjdk8/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1651712203 +TIMESTAMP = 1659411435 SHA256 (jtreg4.1-b08.tar.gz) = a9fbfac903313c12687e60978c4688c20189cdf873560125917d6ad53d55b30c SIZE (jtreg4.1-b08.tar.gz) = 6834252 -SHA256 (battleblow-jdk8u-8.332.09.1-jdk8u332-b09.1_GH0.tar.gz) = 7dda7e79b920d8dd79f54dc28a236126c360c42ef14874447339afd2906a6599 -SIZE (battleblow-jdk8u-8.332.09.1-jdk8u332-b09.1_GH0.tar.gz) = 88705654 +SHA256 (battleblow-jdk8u-8.342.07.1-jdk8u342-b07.1_GH0.tar.gz) = ca878757e98b38f53ac7aa47cd2fb00e01404256c6fd0feced4c563d651ea002 +SIZE (battleblow-jdk8u-8.342.07.1-jdk8u342-b07.1_GH0.tar.gz) = 88770755 diff --git a/java/openjdk8/files/patch-hotspot_src_cpu_aarch64_vm_pauth___aarch64.hpp b/java/openjdk8/files/patch-hotspot_src_cpu_aarch64_vm_pauth___aarch64.hpp deleted file mode 100644 index 0495a62ccb3b..000000000000 --- a/java/openjdk8/files/patch-hotspot_src_cpu_aarch64_vm_pauth___aarch64.hpp +++ /dev/null @@ -1,14 +0,0 @@ ---- hotspot/src/cpu/aarch64/vm/pauth_aarch64.hpp -+++ hotspot/src/cpu/aarch64/vm/pauth_aarch64.hpp -@@ -25,7 +25,11 @@ - #ifndef CPU_AARCH64_PAUTH_AARCH64_INLINE_HPP - #define CPU_AARCH64_PAUTH_AARCH64_INLINE_HPP - -+#if defined(LINUX) - #include "pauth_linux_aarch64.inline.hpp" -+#elif defined(_ALLBSD_SOURCE) -+#include "pauth_bsd_aarch64.inline.hpp" -+#endif - - inline bool pauth_ptr_is_raw(address ptr) { - // Confirm none of the high bits are set in the pointer. diff --git a/java/openjdk8/files/patch-make-common-MakeBase.gmk b/java/openjdk8/files/patch-make-common-MakeBase.gmk deleted file mode 100644 index b7a7ffaa719e..000000000000 --- a/java/openjdk8/files/patch-make-common-MakeBase.gmk +++ /dev/null @@ -1,14 +0,0 @@ ---- make/common/MakeBase.gmk.orig 2022-05-04 18:19:33.661930000 -0700 -+++ make/common/MakeBase.gmk 2022-05-04 18:19:45.573627000 -0700 -@@ -318,11 +318,6 @@ - # Emit the scm:id pair to $@ - define GetSourceTips - $(CD) $(SRC_ROOT) ; \ -- if [ -d $(SCM_DIR) -a "$(SCM_VERSION)" != "" ] ; then \ -- $(ID_COMMAND) >> $@ ; \ -- elif [ -f $(SCM_TIP_FILENAME) ] ; then \ -- $(SCM_TIP_FILECMD) >> $@ ; \ -- fi; - $(PRINTF) "\n" >> $@ - endef -