pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2022Q2]: pkgsrc/lang Pullup ticket #6668 - requested by khorben
details: https://anonhg.NetBSD.org/pkgsrc/rev/5e7e63221d94
branches: pkgsrc-2022Q2
changeset: 384405:5e7e63221d94
user: spz <spz%pkgsrc.org@localhost>
date: Sun Aug 28 13:58:00 2022 +0000
description:
Pullup ticket #6668 - requested by khorben
lang/openjdk8: security update
lang/openjdk11: security update
Revisions pulled up:
- lang/openjdk11/Makefile 1.45
- lang/openjdk11/distinfo 1.35
- lang/openjdk11/patches/patch-make_common_NativeCompilation.gmk deleted
- lang/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk deleted
- lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1__LIRAssembler__arm.cpp deleted
- lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1__LIRGenerator__arm.cpp deleted
- lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__arm_vm__version__bsd__arm__32.cpp deleted
- lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp deleted
- lang/openjdk11/patches/patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc deleted
- lang/openjdk8/Makefile 1.111-1.112
- lang/openjdk8/distinfo 1.89-1.91
- lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh 1.22
- lang/openjdk8/patches/patch-hotspot_src_cpu_aarch64_vm_pauth__aarch64.hpp deleted
- lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp 1.2-1.3
- lang/openjdk8/patches/patch-hotspot_src_share_vm_classfile_symbolTable.cpp deleted
- lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp deleted
- lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp deleted
- lang/openjdk8/patches/patch-hotspot_src_share_vm_memory_metaspace.cpp deleted
- lang/openjdk8/patches/patch-make_common_MakeBase.gmk deleted
-------------------------------------------------------------------
Module Name: pkgsrc
Committed By: ryoon
Date: Sun Jul 10 14:47:25 UTC 2022
Modified Files:
pkgsrc/lang/openjdk8: Makefile distinfo
pkgsrc/lang/openjdk8/patches:
patch-common_autoconf_generated-configure.sh
patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp
Added Files:
pkgsrc/lang/openjdk8/patches: patch-make_common_MakeBase.gmk
Removed Files:
pkgsrc/lang/openjdk8/patches:
patch-hotspot_src_share_vm_classfile_symbolTable.cpp
patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp
patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp
patch-hotspot_src_share_vm_memory_metaspace.cpp
Log Message:
openjdk8: Update to 1.8.332
CHangelog:
Follow OpenJDK 8u332 GA.
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 pkgsrc/lang/openjdk8/Makefile
cvs rdiff -u -r1.88 -r1.89 pkgsrc/lang/openjdk8/distinfo
cvs rdiff -u -r1.21 -r1.22 \
pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp
cvs rdiff -u -r1.1 -r0 \
pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_classfile_symbolTable.cpp \
pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp \
pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp \
pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_memory_metaspace.cpp
cvs rdiff -u -r0 -r1.3 \
pkgsrc/lang/openjdk8/patches/patch-make_common_MakeBase.gmk
-------------------------------------------------------------------
Module Name: pkgsrc
Committed By: tnn
Date: Sun Jul 17 03:03:41 UTC 2022
Modified Files:
pkgsrc/lang/openjdk8: distinfo
pkgsrc/lang/openjdk8/patches:
patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp
Added Files:
pkgsrc/lang/openjdk8/patches:
patch-hotspot_src_cpu_aarch64_vm_pauth__aarch64.hpp
Log Message:
openjdk8: fix NetBSD/evbarm-aarch64 build; PAC is only supported on Linux
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 pkgsrc/lang/openjdk8/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/lang/openjdk8/patches/patch-hotspot_src_cpu_aarch64_vm_pauth__aarch64.hpp
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp
-------------------------------------------------------------------
Module Name: pkgsrc
Committed By: tnn
Date: Mon Aug 15 12:23:06 UTC 2022
Modified Files:
pkgsrc/lang/openjdk11: Makefile distinfo
pkgsrc/lang/openjdk8: Makefile distinfo
Removed Files:
pkgsrc/lang/openjdk11/patches: patch-make_common_NativeCompilation.gmk
patch-make_lib_Awt2dLibraries.gmk
patch-src_hotspot_cpu_arm_c1__LIRAssembler__arm.cpp
patch-src_hotspot_cpu_arm_c1__LIRGenerator__arm.cpp
patch-src_hotspot_os__cpu_bsd__arm_vm__version__bsd__arm__32.cpp
patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp
patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc
pkgsrc/lang/openjdk8/patches:
patch-hotspot_src_cpu_aarch64_vm_pauth__aarch64.hpp
patch-make_common_MakeBase.gmk
Log Message:
openjdk*: Security & bugfix update for the long term support branches
Upstream kindly merged many of the NetBSD-specific patches. Thanks! <3
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/lang/openjdk11/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/lang/openjdk11/distinfo
cvs rdiff -u -r1.1 -r0 \
pkgsrc/lang/openjdk11/patches/patch-make_common_NativeCompilation.gmk \
pkgsrc/lang/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk \
pkgsrc/lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1__LIRAssembler__arm.cpp \
pkgsrc/lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1__LIRGenerator__arm.cpp \
pkgsrc/lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__arm_vm__version__bsd__arm__32.cpp \
pkgsrc/lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp
cvs rdiff -u -r1.2 -r0 \
pkgsrc/lang/openjdk11/patches/patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc
cvs rdiff -u -r1.111 -r1.112 pkgsrc/lang/openjdk8/Makefile
cvs rdiff -u -r1.90 -r1.91 pkgsrc/lang/openjdk8/distinfo
cvs rdiff -u -r1.1 -r0 \
pkgsrc/lang/openjdk8/patches/patch-hotspot_src_cpu_aarch64_vm_pauth__aarch64.hpp
cvs rdiff -u -r1.3 -r0 \
pkgsrc/lang/openjdk8/patches/patch-make_common_MakeBase.gmk
diffstat:
lang/openjdk11/Makefile | 5 +-
lang/openjdk11/distinfo | 15 +-
lang/openjdk11/patches/patch-make_common_NativeCompilation.gmk | 16 -
lang/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk | 17 -
lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1__LIRAssembler__arm.cpp | 19 --
lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1__LIRGenerator__arm.cpp | 27 ---
lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__arm_vm__version__bsd__arm__32.cpp | 25 --
lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp | 31 ---
lang/openjdk11/patches/patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc | 34 ---
lang/openjdk8/Makefile | 9 +-
lang/openjdk8/distinfo | 16 +-
lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh | 90 ++++-----
lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp | 18 +-
lang/openjdk8/patches/patch-hotspot_src_share_vm_classfile_symbolTable.cpp | 16 -
lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp | 17 -
lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp | 19 --
lang/openjdk8/patches/patch-hotspot_src_share_vm_memory_metaspace.cpp | 17 -
17 files changed, 68 insertions(+), 323 deletions(-)
diffs (truncated from 851 to 300 lines):
diff -r f6b07357a18a -r 5e7e63221d94 lang/openjdk11/Makefile
--- a/lang/openjdk11/Makefile Sun Aug 28 08:15:06 2022 +0000
+++ b/lang/openjdk11/Makefile Sun Aug 28 13:58:00 2022 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.44 2022/05/14 12:02:56 tnn Exp $
+# $NetBSD: Makefile,v 1.44.2.1 2022/08/28 13:58:00 spz Exp $
DISTNAME= jdk11u-${GITHUB_TAG:C/\+/-/}
PKGNAME= openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
-PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/}
GITHUB_PROJECT= jdk11u
-GITHUB_TAG= jdk-11.0.15+10-1
+GITHUB_TAG= jdk-11.0.16+8-1
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://openjdk.java.net/
diff -r f6b07357a18a -r 5e7e63221d94 lang/openjdk11/distinfo
--- a/lang/openjdk11/distinfo Sun Aug 28 08:15:06 2022 +0000
+++ b/lang/openjdk11/distinfo Sun Aug 28 13:58:00 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2022/05/25 19:53:26 tnn Exp $
+$NetBSD: distinfo,v 1.34.2.1 2022/08/28 13:58:00 spz Exp $
BLAKE2s (bootstrap-jdk-1.11.0.15.10-netbsd-8-earmv6hf-20220525.tar.xz) = f93572f551f242344e5d6d5e46b9812e5b426772842b5fa06fea4422e327c871
SHA512 (bootstrap-jdk-1.11.0.15.10-netbsd-8-earmv6hf-20220525.tar.xz) =
c4030c99e4c1bb209f0c1ca6c10665c3f4c906f9d7dc13b912c3fbb8031f3dbb6f8d2e5e966cbbc452c307ba5d6de816c0f000b5b7c5d4e3fe8511baf12aab49
@@ -12,9 +12,9 @@
BLAKE2s (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = 5aac0ec747ac714032dfcb4cc4f093ee3f9ddeb070301856727a8597cedd65cf
SHA512 (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = 735f47d7398a48f0963c5d629c6c319dfe22d84bacd45f84a34f4784433c8cf6bfe6b356363a4591f035bec4a32e2e38d0a9c6be361aa57e5f0170ad4e16a1ad
Size (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = 99673444 bytes
-BLAKE2s (jdk11u-jdk-11.0.15-10-1.tar.gz) = 1ead16eff10210e68cd9c1407a9d729e248bb1ff075606d7fe3e5e62e4cde42d
-SHA512 (jdk11u-jdk-11.0.15-10-1.tar.gz) = f2d3b5cea79d737c7f4c5cdd2924aa7fd69fa6fb02fc8672f21060452f7483dc09157a7828642b3e43b033c26eaba0507ddd50491daceb6cf176cea47333857a
-Size (jdk11u-jdk-11.0.15-10-1.tar.gz) = 123036045 bytes
+BLAKE2s (jdk11u-jdk-11.0.16-8-1.tar.gz) = 335896a9a7c173f9e6d69b7e2bd2b98e773cfe5dc997bfb2ec367d13fe39be58
+SHA512 (jdk11u-jdk-11.0.16-8-1.tar.gz) = 33954a05fa8e2a2f0fb97db311569a6b6b9133450d143c78bf01fabee0435b245a9c2318b2c49b8b3023168ba171019e08d5dce5116b6b7c94dad8dd7d047b61
+Size (jdk11u-jdk-11.0.16-8-1.tar.gz) = 123280743 bytes
SHA1 (patch-make_autoconf_buildjdk-spec.gmk.in) = d0b600237853c17ecc2864604f0bd847ba6b0149
SHA1 (patch-make_autoconf_flags-cflags.m4) = 3b37853298805e2ffb92d3babd700d0048f24d8d
SHA1 (patch-make_autoconf_hotspot.m4) = 437c8b09114933cca22c4a847a90a415cd113e5a
@@ -22,17 +22,10 @@
SHA1 (patch-make_autoconf_lib-bundled.m4) = 8720c3f674955e8a51b2ab7dba80c36d34ba8594
SHA1 (patch-make_autoconf_lib-freetype.m4) = 3dbdfea4011dc69593ab302626b9ec4dfc7a7d54
SHA1 (patch-make_autoconf_lib-x11.m4) = f609a726f2d795f1d05cc933df587d3440c09b9f
-SHA1 (patch-make_common_NativeCompilation.gmk) = fc97a952ba87efb450f59e87f19fb4c47558ae1d
SHA1 (patch-make_data_fontconfig_bsd.fontconfig.properties) = 9fd9f6ef4af0eece0b4ca0acbb44331566f17e07
-SHA1 (patch-make_lib_Awt2dLibraries.gmk) = ab77cfd0f07425b694688ffa98c2c661d1ac017d
-SHA1 (patch-src_hotspot_cpu_arm_c1__LIRAssembler__arm.cpp) = 97c6a06d6e957e267969cae3c9ad09c7ab9d0e56
-SHA1 (patch-src_hotspot_cpu_arm_c1__LIRGenerator__arm.cpp) = cfaace9741b0b30daf827119127478a195f8374f
SHA1 (patch-src_hotspot_os__cpu_bsd__arm_bsd__arm__32.s) = 474a66abfb25030d4e32134816c14b157d1ebe6a
-SHA1 (patch-src_hotspot_os__cpu_bsd__arm_vm__version__bsd__arm__32.cpp) = 8a99417711c4826490954d43f142afc0a0c68e9f
-SHA1 (patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp) = 384214d554db82dc9092ee8f975aa5a73aae67ab
SHA1 (patch-src_hotspot_os_bsd_os__bsd.cpp) = 6322cbdda03dee528e89ac8b725f3df5e2165797
SHA1 (patch-src_hotspot_os_bsd_os__perf__bsd.cpp) = 7bb57f82f3a93adc1970ed4215148fc02ecbcd5a
SHA1 (patch-src_hotspot_os_posix_os__posix.cpp) = e70e8c1e59f0be184a7a1d6e9d11ac7b934ce4b2
SHA1 (patch-src_hotspot_share_libadt_dict.cpp) = a5c62973f563742d4ccc7db341b33366d14e2a01
-SHA1 (patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc) = 6635bba71373f65107f5324f68de41d1320bcad8
SHA1 (patch-src_java.desktop_unix_native_common_awt_fontpath.c) = c27a058dbcc836fa5a9f979f193284a706a7c50b
diff -r f6b07357a18a -r 5e7e63221d94 lang/openjdk11/patches/patch-make_common_NativeCompilation.gmk
--- a/lang/openjdk11/patches/patch-make_common_NativeCompilation.gmk Sun Aug 28 08:15:06 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-make_common_NativeCompilation.gmk,v 1.1 2019/10/01 12:36:34 tnn Exp $
-
-Disable PaX mprotect.
-
---- make/common/NativeCompilation.gmk.orig 2019-09-19 12:22:38.000000000 +0000
-+++ make/common/NativeCompilation.gmk
-@@ -1012,6 +1012,9 @@ define SetupNativeCompilationBody
- $$($1_MT) -nologo -manifest $$($1_MANIFEST) -identity:"$$($1_NAME).exe, version=$$($1_MANIFEST_VERSION)" -outputresource:$$@;#1
- endif
- endif
-+ ifeq ($(OPENJDK_TARGET_OS_ENV), bsd.netbsd)
-+ /usr/sbin/paxctl +m $$@
-+ endif
- # This only works if the openjdk_codesign identity is present on the system. Let
- # silently fail otherwise.
- ifneq ($(CODESIGN), )
diff -r f6b07357a18a -r 5e7e63221d94 lang/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk
--- a/lang/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk Sun Aug 28 08:15:06 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-make_lib_Awt2dLibraries.gmk,v 1.1 2019/10/03 16:57:20 tnn Exp $
-
-bundled harfbuzz code needs to use -std=c++11 for static_assert().
-But we can't add it to USE_LANGUAGES because the rest of the JDK
-contains legacy code that requires -std=gnu++98.
-
---- make/lib/Awt2dLibraries.gmk.orig 2019-09-19 12:22:38.000000000 +0000
-+++ make/lib/Awt2dLibraries.gmk
-@@ -612,7 +612,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIB
- AccelGlyphCache.c, \
- TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
- CFLAGS := $(CFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
-- CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
-+ CXXFLAGS := $(CXXFLAGS_JDKLIB) -std=c++11 $(LIBFONTMANAGER_CFLAGS), \
- OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
- CFLAGS_windows = -DCC_NOEX, \
- EXTRA_HEADER_DIRS := $(LIBFONTMANAGER_EXTRA_HEADER_DIRS), \
diff -r f6b07357a18a -r 5e7e63221d94 lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1__LIRAssembler__arm.cpp
--- a/lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1__LIRAssembler__arm.cpp Sun Aug 28 08:15:06 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_hotspot_cpu_arm_c1__LIRAssembler__arm.cpp,v 1.1 2021/06/28 22:53:05 tnn Exp $
-
-error: call of overloaded 'log2_intptr(int&)' is ambiguous
-note: candidate: int log2_intptr(uintptr_t)
- inline int log2_intptr(uintptr_t x) {
-note: candidate: int log2_intptr(intptr_t)
- inline int log2_intptr(intptr_t x) {
-
---- src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp.orig 2021-04-24 02:47:22.000000000 +0000
-+++ src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
-@@ -1062,7 +1062,7 @@ void LIR_Assembler::emit_op3(LIR_Op3* op
- __ add_32(dest, left, AsmOperand(left, lsr, 31));
- __ asr_32(dest, dest, 1);
- } else if (c != (int) 0x80000000) {
-- int power = log2_intptr(c);
-+ int power = log2_intptr((intptr_t)c);
- __ asr_32(Rtemp, left, 31);
- __ add_32(dest, left, AsmOperand(Rtemp, lsr, 32-power)); // dest = left + (left < 0 ? 2^power - 1 : 0);
- __ asr_32(dest, dest, power); // dest = dest >>> power;
diff -r f6b07357a18a -r 5e7e63221d94 lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1__LIRGenerator__arm.cpp
--- a/lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1__LIRGenerator__arm.cpp Sun Aug 28 08:15:06 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-$NetBSD: patch-src_hotspot_cpu_arm_c1__LIRGenerator__arm.cpp,v 1.1 2021/06/28 22:53:05 tnn Exp $
-
-error: call of overloaded 'log2_intptr(int)' is ambiguous
- LIR_Address::Scale scale = (LIR_Address::Scale) log2_intptr(c + 1);
-note: candidate: int log2_intptr(uintptr_t)
- inline int log2_intptr(uintptr_t x) {
-note: candidate: int log2_intptr(intptr_t)
- inline int log2_intptr(intptr_t x) {
-
---- src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp.orig 2021-04-24 02:47:22.000000000 +0000
-+++ src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp
-@@ -443,13 +443,13 @@ bool LIRGenerator::strength_reduce_multi
- __ shift_left(left, log2_intptr(c + 1), result);
- __ sub(result, left, result);
- #else
-- LIR_Address::Scale scale = (LIR_Address::Scale) log2_intptr(c + 1);
-+ LIR_Address::Scale scale = (LIR_Address::Scale) log2_intptr((intptr_t)(c + 1));
- LIR_Address* addr = new LIR_Address(left, left, scale, 0, T_INT);
- __ sub(LIR_OprFact::address(addr), left, result); // rsb with shifted register
- #endif // AARCH64
- return true;
- } else if (is_power_of_2(c - 1)) {
-- LIR_Address::Scale scale = (LIR_Address::Scale) log2_intptr(c - 1);
-+ LIR_Address::Scale scale = (LIR_Address::Scale) log2_intptr((intptr_t)(c - 1));
- LIR_Address* addr = new LIR_Address(left, left, scale, 0, T_INT);
- __ add(left, LIR_OprFact::address(addr), result); // add with shifted register
- return true;
diff -r f6b07357a18a -r 5e7e63221d94 lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__arm_vm__version__bsd__arm__32.cpp
--- a/lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__arm_vm__version__bsd__arm__32.cpp Sun Aug 28 08:15:06 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_hotspot_os__cpu_bsd__arm_vm__version__bsd__arm__32.cpp,v 1.1 2021/06/28 22:53:05 tnn Exp $
-
-fix arch detection of NetBSD 32-bit ARM targets
-
---- src/hotspot/os_cpu/bsd_arm/vm_version_bsd_arm_32.cpp.orig 2021-04-24 02:47:22.000000000 +0000
-+++ src/hotspot/os_cpu/bsd_arm/vm_version_bsd_arm_32.cpp
-@@ -35,7 +35,7 @@ void VM_Version::get_os_cpu_info() {
-
- int mib[2];
- size_t len;
-- char machine[8]; // 8 chars max : "arm" + "v6|v7" + "|eb" + '\0'
-+ char machine[11]; // 11 chars max : "earm" + "v6|v7" + "|hf" + "|eb" + '\0'
-
- // Support for multiple calls in the init phase
- if (done) return;
-@@ -55,6 +55,9 @@ void VM_Version::get_os_cpu_info() {
- } else if (strncmp(machine, "armv", 4) == 0 &&
- machine[4] >= '5' && machine[4] <= '9') {
- _arm_arch = (int)(machine[4] - '0');
-+ } else if (strncmp(machine, "earmv", 5) == 0 &&
-+ machine[5] >= '5' && machine[5] <= '9') {
-+ _arm_arch = (int)(machine[5] - '0');
- }
- }
-
diff -r f6b07357a18a -r 5e7e63221d94 lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp
--- a/lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp Sun Aug 28 08:15:06 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp,v 1.1 2022/05/25 06:05:34 tnn Exp $
-
-#if 0 functions already defined in os_bsd.cpp
-
---- src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp.orig 2022-05-03 03:11:37.000000000 +0000
-+++ src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp
-@@ -340,13 +340,16 @@ static void current_stack_region(address
- *size = stack_top - stack_bottom;
- }
-
-+#if 0
- address os::current_stack_base() {
- address bottom;
- size_t size;
- current_stack_region(&bottom, &size);
- return bottom + size;
- }
-+#endif
-
-+#if 0
- size_t os::current_stack_size() {
- // stack size includes normal stack and HotSpot guard pages
- address bottom;
-@@ -354,6 +357,7 @@ size_t os::current_stack_size() {
- current_stack_region(&bottom, &size);
- return size;
- }
-+#endif
-
- /////////////////////////////////////////////////////////////////////////////
- // helper functions for fatal error handler
diff -r f6b07357a18a -r 5e7e63221d94 lang/openjdk11/patches/patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc
--- a/lang/openjdk11/patches/patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc Sun Aug 28 08:15:06 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-$NetBSD: patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc,v 1.2 2021/02/01 15:51:55 ryoon Exp $
-
-Completely remove _POSIX_C_SOURCE; with g++7 it causes errors about undeclared
-symbols such as
-
-In file included from /usr/pkg/gcc7/include/c++/math.h:36:0,
- from /pkg_comp/obj/pkgsrc/lang/openjdk11/default/openjdk-jdk11u-jdk-11.0.5-10-1/src/java.desktop/share/native/libfontmanager/harfbuzz/hb.hh:171,
- from /pkg_comp/obj/pkgsrc/lang/openjdk11/default/openjdk-jdk11u-jdk-11.0.5-10-1/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.cc:40:
-/usr/pkg/gcc7/include/c++/cmath:1084:11: error: '::acosh' has not been declared
- using ::acosh;
- ^~~~~
-
-Very briefly: defining _POSIX_C_SOURCE only removes features, and therefore is
-almost never the correct thing to do.
-
-Filed upstream report to harfbuzz to patch this the same way:
-https://github.com/harfbuzz/harfbuzz/issues/2084
-
-
---- src/java.desktop/share/native/libharfbuzz/hb-blob.cc.orig 2019-10-16 18:31:09.000000000 +0000
-+++ src/java.desktop/share/native/libharfbuzz/hb-blob.cc
-@@ -30,12 +30,6 @@
- * http://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html
- * https://www.oracle.com/technetwork/articles/servers-storage-dev/standardheaderfiles-453865.html
- */
--#ifndef _POSIX_C_SOURCE
--#pragma GCC diagnostic push
--#pragma GCC diagnostic ignored "-Wunused-macros"
--#define _POSIX_C_SOURCE 200809L
--#pragma GCC diagnostic pop
--#endif
-
- #include "hb.hh"
- #include "hb-blob.hh"
diff -r f6b07357a18a -r 5e7e63221d94 lang/openjdk8/Makefile
--- a/lang/openjdk8/Makefile Sun Aug 28 08:15:06 2022 +0000
+++ b/lang/openjdk8/Makefile Sun Aug 28 13:58:00 2022 +0000
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.110 2021/12/08 16:05:22 adam Exp $
+# $NetBSD: Makefile,v 1.110.6.1 2022/08/28 13:58:00 spz Exp $
-DISTNAME= openjdk-jdk8u-${GITHUB_TAG}
+DISTNAME= jdk8u-${GITHUB_TAG}
PKGNAME= openjdk8-1.8.${GITHUB_TAG:C/.*u([0-9]+).*/\1/}
-PKGREVISION= 3
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/}
MASTER_SITES+= ${MASTER_SITE_LOCAL:=openjdk7/} # for bootstrap kits
-GITHUB_PROJECT= openjdk-jdk8u
-GITHUB_TAG= jdk8u292-b10.2
+GITHUB_PROJECT= jdk8u
+GITHUB_TAG= jdk8u342-b07.1
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://openjdk.java.net/
diff -r f6b07357a18a -r 5e7e63221d94 lang/openjdk8/distinfo
--- a/lang/openjdk8/distinfo Sun Aug 28 08:15:06 2022 +0000
+++ b/lang/openjdk8/distinfo Sun Aug 28 13:58:00 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.88 2022/05/24 21:32:43 tnn Exp $
+$NetBSD: distinfo,v 1.88.2.1 2022/08/28 13:58:00 spz Exp $
BLAKE2s (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 8745b980e290e509c0dd09706398b89afce85fee1405b9367b6684c83d56b96a
SHA512 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) =
6ed928cc68503c27edd6f3a90f94e1e762192d41997b12903e37071f4fcd34f5579fa970e59c240928eaae60729300fbfdb02a5ec1136bc757ee24f1ee554af4
@@ -24,9 +24,9 @@
BLAKE2s (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 98777d4ff1f864a9ff5a42870b30319abd39488be2abfdc5e7d3d59b016c5807
SHA512 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) =
1403e582dacd0474e57d9aa8f1333060c50d099ef5d2c5a992ff7f63dcde2e538ff1e7fb78e45d12fd5aea6daf0704672e7f326399d415ee0d6bb53b6f925e9f
Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 37883700 bytes
-BLAKE2s (openjdk7/openjdk-jdk8u-jdk8u292-b10.2.tar.gz) = e0f2a86f4b2f07229023bd9f18046bd490ecd98752cec47a1dfba66369b2d269
-SHA512 (openjdk7/openjdk-jdk8u-jdk8u292-b10.2.tar.gz) = 3614ef9ee4327242c62cdf80bee746c648a91e515e5611dcc8a2576fc6aaf073351132d910fcb16366302d59e615142ce9948be38eccbf236f250e9b15e6d752
-Size (openjdk7/openjdk-jdk8u-jdk8u292-b10.2.tar.gz) = 88568471 bytes
+BLAKE2s (openjdk7/jdk8u-jdk8u342-b07.1.tar.gz) = d6fab9676f8823b787cab9a818b4dfda9899e7a38f5d5c7cfeaafd172c64f05a
+SHA512 (openjdk7/jdk8u-jdk8u342-b07.1.tar.gz) = 8e3055a680d640879035246c1a0c612dd09f59f3b58d44c035c32fb7351e32d353c7b79a6cf784b432a533f98d462355da6456c6508175f7a15bb7297d138304
+Size (openjdk7/jdk8u-jdk8u342-b07.1.tar.gz) = 88770755 bytes
SHA1 (patch-aa) = 8810cfed600ee3bf36a408cc77e497ac7b3e6838
SHA1 (patch-al) = f65f739805c2ef471a4de10d6da42e86c5561b8c
SHA1 (patch-an) = fce4da00762770c1c0592bd225bf73e875252178
@@ -38,7 +38,7 @@
SHA1 (patch-bi) = 5409f0944d6f850baeaaa7c64d2e8ad52233e1e9
Home |
Main Index |
Thread Index |
Old Index