From 5c1c5728404a71a09d91b1c6737445d0d7449fcb Mon Sep 17 00:00:00 2001 From: kurt Date: Thu, 21 Jan 2021 19:29:01 +0000 Subject: [PATCH] Update to 11.0.10 GA: * Contains many upstream bug fixes which can be found in the release notes here: https://foojay.io/java-11/?quarter=102020&tab=allissues&version=11.0.10 https://openjdk.java.net/groups/vulnerability/advisories/2021-01-19 --- devel/jdk/11/Makefile | 11 ++++---- devel/jdk/11/distinfo | 4 +-- .../patch-src_hotspot_share_opto_addnode_cpp | 27 ------------------- devel/jdk/11/pkg/PLIST | 3 +-- 4 files changed, 9 insertions(+), 36 deletions(-) delete mode 100644 devel/jdk/11/patches/patch-src_hotspot_share_opto_addnode_cpp diff --git a/devel/jdk/11/Makefile b/devel/jdk/11/Makefile index 467d27cf592..d23223fe9a0 100644 --- a/devel/jdk/11/Makefile +++ b/devel/jdk/11/Makefile @@ -1,19 +1,18 @@ -# $OpenBSD: Makefile,v 1.21 2021/01/06 14:56:56 kurt Exp $ +# $OpenBSD: Makefile,v 1.22 2021/01/21 19:29:01 kurt Exp $ ONLY_FOR_ARCHS= i386 amd64 aarch64 USE_WXNEEDED= Yes DPB_PROPERTIES= parallel COMMENT= OpenJDK Software Development Kit v${VERSION_STR} -BASE_VER= 11.0.9 -PATCH_VER= 11 +BASE_VER= 11.0.10 +PATCH_VER= 9 BSD_PORT_REL= 1 VERSION_STR= ${BASE_VER}+${PATCH_VER}-${BSD_PORT_REL} PACKAGE_VER= ${BASE_VER}.${PATCH_VER}.${BSD_PORT_REL} PKGNAME= jdk-${PACKAGE_VER} PKGSTEM= jdk-11 EPOCH= 0 -REVISION= 0 DIST_SUBDIR= jdk DISTNAME= jdk-${VERSION_STR} @@ -40,7 +39,7 @@ PERMIT_PACKAGE= Yes DEBUG_PACKAGES= ${BUILD_PACKAGES} WANTLIB += ${COMPILER_LIBCXX} X11 Xext Xi Xrender Xtst c freetype gif -WANTLIB += iconv jpeg lcms2 m png pthread z +WANTLIB += harfbuzz iconv jpeg lcms2 m png pthread z NO_TEST= Yes @@ -78,6 +77,7 @@ BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPENDS} \ shells/bash LIB_DEPENDS= converters/libiconv \ + devel/harfbuzz \ graphics/jpeg \ graphics/lcms2 \ graphics/png \ @@ -105,6 +105,7 @@ CONFIGURE_ARGS= MAKE=${GMAKE} \ --with-libpng=system \ --with-lcms=system \ --with-libjpeg=system \ + --with-harfbuzz=system \ --with-giflib=system \ --with-giflib-include=${LOCALBASE}/include \ --with-giflib-lib=${LOCALBASE}/lib \ diff --git a/devel/jdk/11/distinfo b/devel/jdk/11/distinfo index 33124fbfeda..09c707dc2ec 100644 --- a/devel/jdk/11/distinfo +++ b/devel/jdk/11/distinfo @@ -1,8 +1,8 @@ -SHA256 (jdk/jdk-11.0.9+11-1.tar.gz) = VucT38681AG/V/gMRzk6AiUFSROVH2UcXwBL7fM+izE= +SHA256 (jdk/jdk-11.0.10+9-1.tar.gz) = Y1ZW/uxUjy3JChbGNAR5gOOHH+mVpPfouqgXQ1hYcsE= SHA256 (jdk/openjdk-jdk11u-bootjdk-aarch64-20200225.tar.gz) = ids081WM5yXCFQ3bu/Sni32Nhs/fe9hBVfTeg14hMxc= SHA256 (jdk/openjdk-jdk11u-bootjdk-amd64-20200225.tar.gz) = zt2x5jCsxQ0BgqyHtBH5dLBzt5l/5KBAQh9mp1eiVis= SHA256 (jdk/openjdk-jdk11u-bootjdk-i386-20200225.tar.gz) = jMZ1ZKktR/xvX1oQV8OrPuMYWLoBoAdjEAxfpDS+HWo= -SIZE (jdk/jdk-11.0.9+11-1.tar.gz) = 118255644 +SIZE (jdk/jdk-11.0.10+9-1.tar.gz) = 122486444 SIZE (jdk/openjdk-jdk11u-bootjdk-aarch64-20200225.tar.gz) = 103465813 SIZE (jdk/openjdk-jdk11u-bootjdk-amd64-20200225.tar.gz) = 113727367 SIZE (jdk/openjdk-jdk11u-bootjdk-i386-20200225.tar.gz) = 102190977 diff --git a/devel/jdk/11/patches/patch-src_hotspot_share_opto_addnode_cpp b/devel/jdk/11/patches/patch-src_hotspot_share_opto_addnode_cpp deleted file mode 100644 index 5fffa0b0ff8..00000000000 --- a/devel/jdk/11/patches/patch-src_hotspot_share_opto_addnode_cpp +++ /dev/null @@ -1,27 +0,0 @@ -$OpenBSD: patch-src_hotspot_share_opto_addnode_cpp,v 1.1 2020/11/20 20:49:59 kurt Exp $ - -Backport 11.0.9.1 fix for: -8250861: Crash in MinINode::Ideal(PhaseGVN*, bool) -https://bugs.openjdk.java.net/browse/JDK-8250861 - -Index: src/hotspot/share/opto/addnode.cpp ---- src/hotspot/share/opto/addnode.cpp.orig -+++ src/hotspot/share/opto/addnode.cpp -@@ -917,7 +917,7 @@ Node *MinINode::Ideal(PhaseGVN *phase, bool can_reshap - - // Transform MIN2(x + c0, MIN2(x + c1, z)) into MIN2(x + MIN2(c0, c1), z) - // if x == y and the additions can't overflow. -- if (phase->eqv(x,y) && -+ if (phase->eqv(x,y) && tx != NULL && - !can_overflow(tx, x_off) && - !can_overflow(tx, y_off)) { - return new MinINode(phase->transform(new AddINode(x, phase->intcon(MIN2(x_off, y_off)))), r->in(2)); -@@ -925,7 +925,7 @@ Node *MinINode::Ideal(PhaseGVN *phase, bool can_reshap - } else { - // Transform MIN2(x + c0, y + c1) into x + MIN2(c0, c1) - // if x == y and the additions can't overflow. -- if (phase->eqv(x,y) && -+ if (phase->eqv(x,y) && tx != NULL && - !can_overflow(tx, x_off) && - !can_overflow(tx, y_off)) { - return new AddINode(x,phase->intcon(MIN2(x_off,y_off))); diff --git a/devel/jdk/11/pkg/PLIST b/devel/jdk/11/pkg/PLIST index 1d1b1911c9d..c0823939192 100644 --- a/devel/jdk/11/pkg/PLIST +++ b/devel/jdk/11/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.8 2021/01/06 14:56:56 kurt Exp $ +@comment $OpenBSD: PLIST,v 1.9 2021/01/21 19:29:02 kurt Exp $ @option no-default-conflict @option is-branch @conflict jdk->=11v0,<12v0 @@ -319,7 +319,6 @@ jdk-11/legal/java.desktop/ADDITIONAL_LICENSE_INFO jdk-11/legal/java.desktop/ASSEMBLY_EXCEPTION jdk-11/legal/java.desktop/LICENSE jdk-11/legal/java.desktop/colorimaging.md -jdk-11/legal/java.desktop/harfbuzz.md jdk-11/legal/java.desktop/mesa3d.md jdk-11/legal/java.desktop/xwd.md jdk-11/legal/java.instrument/