pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/lang/openjdk8
Module Name: pkgsrc
Committed By: tnn
Date: Sat Nov 2 21:31:15 UTC 2019
Modified Files:
pkgsrc/lang/openjdk8: Makefile PLIST distinfo
pkgsrc/lang/openjdk8/patches:
patch-common_autoconf_generated-configure.sh
patch-hotspot_make_solaris_makefiles_jsig.make
patch-hotspot_src_share_vm_opto_library__call.cpp
Log Message:
openjdk8: update to 8u232 GA
Bug fix and security update. Resolves in particular the following CVEs:
- S8213429, CVE-2019-2933: Windows file handling redux
- S8218573, CVE-2019-2945: Better socket support
- S8220302, CVE-2019-2949: Better Kerberos ccache handling
- S8221858, CVE-2019-2958: Build Better Processes
- S8222684, CVE-2019-2964: Better support for patterns
- S8222690, CVE-2019-2962: Better Glyph Images
- S8223505, CVE-2019-2973: Better pattern compilation
- S8223518, CVE-2019-2975: Unexpected exception in jjs
- S8223892, CVE-2019-2978: Improved handling of jar files
- S8224532, CVE-2019-2981: Better Path supports
- S8224915, CVE-2019-2983: Better serial attributes
- S8225286, CVE-2019-2987: Better rendering of native glyphs
- S8225292, CVE-2019-2988: Better Graphics2D drawing
- S8225298, CVE-2019-2989: Improve TLS connection support
- S8225597, CVE-2019-2992: Enhance font glyph mapping
- S8226765, CVE-2019-2999: Commentary on Javadoc comments
- S8228825, CVE-2019-2894: Enhance ECDSA operations
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 pkgsrc/lang/openjdk8/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/openjdk8/PLIST
cvs rdiff -u -r1.73 -r1.74 pkgsrc/lang/openjdk8/distinfo
cvs rdiff -u -r1.17 -r1.18 \
pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_jsig.make
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_opto_library__call.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/lang/openjdk8/Makefile
diff -u pkgsrc/lang/openjdk8/Makefile:1.85 pkgsrc/lang/openjdk8/Makefile:1.86
--- pkgsrc/lang/openjdk8/Makefile:1.85 Tue Oct 1 14:43:32 2019
+++ pkgsrc/lang/openjdk8/Makefile Sat Nov 2 21:31:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2019/10/01 14:43:32 tnn Exp $
+# $NetBSD: Makefile,v 1.86 2019/11/02 21:31:14 tnn Exp $
DISTNAME= openjdk-jdk8u-${GITHUB_TAG}
PKGNAME= openjdk8-1.8.${GITHUB_TAG:C/.*u([0-9]+).*/\1/}
@@ -6,7 +6,7 @@ CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/}
MASTER_SITES+= ${MASTER_SITE_LOCAL:=openjdk7/} # for bootstrap kits
GITHUB_PROJECT= openjdk-jdk8u
-GITHUB_TAG= jdk8u222-b10.1
+GITHUB_TAG= jdk8u232-b09.1
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://openjdk.java.net/
@@ -194,7 +194,7 @@ do-build: ${WRKDIR}/stage3-done
# stage 1 builds a native JDK using the bootstrap binaries
${WRKDIR}/stage1-done:
- ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} images
+ ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} images
rm -rf ${ALT_BOOTDIR}
cd ${BUILDDIR}/images && mv j2sdk-image ${ALT_BOOTDIR}
.for d in corba hotspot jaxp jaxws langtools tmp
@@ -220,7 +220,7 @@ ${WRKDIR}/stage1_5-done: ${WRKDIR}/stage
# stage 2 rebuilds the JDK using native tools
${WRKDIR}/stage2-done: ${WRKDIR}/stage1_5-done
- ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} images
+ ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} images
touch ${.TARGET}
# stage 3 builds third party add-ons
Index: pkgsrc/lang/openjdk8/PLIST
diff -u pkgsrc/lang/openjdk8/PLIST:1.11 pkgsrc/lang/openjdk8/PLIST:1.12
--- pkgsrc/lang/openjdk8/PLIST:1.11 Thu Jul 25 19:08:30 2019
+++ pkgsrc/lang/openjdk8/PLIST Sat Nov 2 21:31:14 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2019/07/25 19:08:30 tnn Exp $
+@comment $NetBSD: PLIST,v 1.12 2019/11/02 21:31:14 tnn Exp $
bin/openjdk8-jar
bin/openjdk8-java
bin/openjdk8-javac
@@ -338,8 +338,6 @@ java/openjdk8/include/${LOWER_OPSYS}/jni
java/openjdk8/jre/ASSEMBLY_EXCEPTION
java/openjdk8/jre/LICENSE
java/openjdk8/jre/THIRD_PARTY_README
-java/openjdk8/jre/bin/clhsdb
-java/openjdk8/jre/bin/hsdb
java/openjdk8/jre/bin/java
java/openjdk8/jre/bin/jjs
java/openjdk8/jre/bin/keytool
Index: pkgsrc/lang/openjdk8/distinfo
diff -u pkgsrc/lang/openjdk8/distinfo:1.73 pkgsrc/lang/openjdk8/distinfo:1.74
--- pkgsrc/lang/openjdk8/distinfo:1.73 Sun Sep 22 15:16:26 2019
+++ pkgsrc/lang/openjdk8/distinfo Sat Nov 2 21:31:14 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.73 2019/09/22 15:16:26 tnn Exp $
+$NetBSD: distinfo,v 1.74 2019/11/02 21:31:14 tnn Exp $
SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334
RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815
@@ -32,10 +32,10 @@ SHA1 (openjdk7/bootstrap-jdk7u60-bin-dra
RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = b13d0e42839fb746d41f9001e488162b47803140
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
-SHA1 (openjdk7/openjdk-jdk8u-jdk8u222-b10.1.tar.gz) = 01c72ea589f75c4e0c2d2f930c30053dd0414692
-RMD160 (openjdk7/openjdk-jdk8u-jdk8u222-b10.1.tar.gz) = a0d4d87155a1c86293d89d66b6130990ed0b404a
-SHA512 (openjdk7/openjdk-jdk8u-jdk8u222-b10.1.tar.gz) = e4c02422fe7652ad8b2987354626591efbaf94dde975d7eabfd852b6a5abada6d2ece463f9ebd21b73d67428456c7f7b9bbb66368f7ba486a8346f677a1a0ce2
-Size (openjdk7/openjdk-jdk8u-jdk8u222-b10.1.tar.gz) = 85692163 bytes
+SHA1 (openjdk7/openjdk-jdk8u-jdk8u232-b09.1.tar.gz) = 0cad18a0c348d32fc347d27f11a30b63c7b2912e
+RMD160 (openjdk7/openjdk-jdk8u-jdk8u232-b09.1.tar.gz) = 124ecc82ef3c80c6da9fe88f021600b8e90fa8fa
+SHA512 (openjdk7/openjdk-jdk8u-jdk8u232-b09.1.tar.gz) = 8179a402157f951ead3624b45bad8d5a7416f224a2b160f68b1f3788289a1cf8a2fc70efb7ad1a8a0416f48f89876e5d1c1c343d26c7452f2cf9d79906316107
+Size (openjdk7/openjdk-jdk8u-jdk8u232-b09.1.tar.gz) = 85766372 bytes
SHA1 (patch-aa) = df056ced73a06e9a2c5ae59d15218a6f38c2ab5e
SHA1 (patch-al) = f65f739805c2ef471a4de10d6da42e86c5561b8c
SHA1 (patch-an) = fce4da00762770c1c0592bd225bf73e875252178
@@ -47,7 +47,7 @@ SHA1 (patch-bh) = 6194a7c319a496f8ff7df1
SHA1 (patch-bi) = 5409f0944d6f850baeaaa7c64d2e8ad52233e1e9
SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892
SHA1 (patch-common_autoconf_boot-jdk.m4) = a29767c79544dea243019cc841d834f756172462
-SHA1 (patch-common_autoconf_generated-configure.sh) = ef90427a50ceef8b3761a44a4456a3da5348867e
+SHA1 (patch-common_autoconf_generated-configure.sh) = 89eb88343d3f2755d656bb16199de53ee7012697
SHA1 (patch-common_autoconf_spec.gmk.in) = e98bc4c8a09f49c6a26447e6f78abf4709ee694b
SHA1 (patch-hotspot_agent_src_os_bsd_Makefile) = 6e4c41b080577ed7cd418ee3b84f7f5a73dd11e6
SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928
@@ -58,7 +58,7 @@ SHA1 (patch-hotspot_make_solaris_makefil
SHA1 (patch-hotspot_make_solaris_makefiles_dtrace.make) = 84e3d6b6603887aaac13747b5c972dd3eec4c7f1
SHA1 (patch-hotspot_make_solaris_makefiles_fastdebug.make) = 632f96a322f1568df6f49bf31716bafe1d324976
SHA1 (patch-hotspot_make_solaris_makefiles_gcc.make) = 4763215f5ce2c3d9fcadb69e52afad7c9de97417
-SHA1 (patch-hotspot_make_solaris_makefiles_jsig.make) = 06d9e495fe7f28b11b169cf4e56d7f8a37944ed7
+SHA1 (patch-hotspot_make_solaris_makefiles_jsig.make) = cf3a42b377f5e470bcd665137420075900e2863e
SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc) = 58965fe7c142b67be35cab8b30f84dcee2096e39
SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc) = 2dfd843c450971ee0857cbd81b946a4d7c86ee3b
SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-TIERED.gcc) = 82ac550f4c342f657834f30f87b7b359e2b7b41b
@@ -85,7 +85,7 @@ SHA1 (patch-hotspot_src_share_vm_gc__imp
SHA1 (patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp) = 9e9347f9695cce3599fe12448445bb20d9b36f08
SHA1 (patch-hotspot_src_share_vm_memory_metaspace.cpp) = 260005e002e0926447952850bbc1150e50a05509
SHA1 (patch-hotspot_src_share_vm_oops_klass.hpp) = 2a728aa8fb04976195ebf58549a544b97e56b329
-SHA1 (patch-hotspot_src_share_vm_opto_library__call.cpp) = 4654248e3fdf9a1be8ef5563e50b12dcd59aa1aa
+SHA1 (patch-hotspot_src_share_vm_opto_library__call.cpp) = 35484c16c7ff1ce57b78c1c0fafa0dfcc7f0072a
SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = aacb4e03f62f1a6f9b38de39a966c318b70b1293
SHA1 (patch-hotspot_src_share_vm_runtime_arguments.cpp) = 80265396c62de95b0937d770c1dba0e8a53daa80
SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = a8e8fef04d7acb4772f57961e7df3681bd53d0b9
Index: pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
diff -u pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh:1.17 pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh:1.18
--- pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh:1.17 Sun Feb 24 16:43:28 2019
+++ pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh Sat Nov 2 21:31:14 2019
@@ -1,11 +1,11 @@
-$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.17 2019/02/24 16:43:28 jperkin Exp $
+$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.18 2019/11/02 21:31:14 tnn Exp $
BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386) and
pkg/53223.
---- common/autoconf/generated-configure.sh.orig 2019-02-19 13:34:21.000000000 +0000
+--- common/autoconf/generated-configure.sh.orig 2019-10-16 01:41:55.000000000 +0000
+++ common/autoconf/generated-configure.sh
-@@ -4137,7 +4137,7 @@ VALID_TOOLCHAINS_all="gcc clang solstudi
+@@ -4185,7 +4185,7 @@ VALID_TOOLCHAINS_all="gcc clang solstudi
# These toolchains are valid on different platforms
VALID_TOOLCHAINS_bsd="clang gcc"
VALID_TOOLCHAINS_linux="gcc clang"
@@ -14,7 +14,7 @@ pkg/53223.
VALID_TOOLCHAINS_macosx="gcc clang"
VALID_TOOLCHAINS_aix="xlc"
VALID_TOOLCHAINS_windows="microsoft"
-@@ -15416,9 +15416,6 @@ done
+@@ -15479,9 +15479,6 @@ done
# We need to find a recent version of GNU make. Especially on Solaris, this can be tricky.
if test "x$MAKE" != x; then
# User has supplied a make, test it.
@@ -24,7 +24,7 @@ pkg/53223.
MAKE_CANDIDATE=""$MAKE""
DESCRIPTION="user supplied MAKE=$MAKE"
-@@ -20006,7 +20003,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -20134,7 +20131,7 @@ $as_echo "$as_me: Potential Boot JDK fou
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -33,7 +33,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
-@@ -20338,7 +20335,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -20466,7 +20463,7 @@ $as_echo "$as_me: Potential Boot JDK fou
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -42,7 +42,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
-@@ -20656,7 +20653,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -20784,7 +20781,7 @@ $as_echo "$as_me: Potential Boot JDK fou
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -51,7 +51,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
-@@ -20844,7 +20841,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -20972,7 +20969,7 @@ $as_echo "$as_me: Potential Boot JDK fou
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -60,7 +60,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
-@@ -21122,7 +21119,7 @@ fi
+@@ -21250,7 +21247,7 @@ fi
# Resolve file symlinks
while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@@ -69,7 +69,7 @@ pkg/53223.
# This is not a symbolic link! We are done!
break
fi
-@@ -21172,7 +21169,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -21300,7 +21297,7 @@ $as_echo "$as_me: Potential Boot JDK fou
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -78,7 +78,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
-@@ -21387,7 +21384,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -21515,7 +21512,7 @@ $as_echo "$as_me: Potential Boot JDK fou
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -87,7 +87,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
-@@ -21567,7 +21564,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -21695,7 +21692,7 @@ $as_echo "$as_me: Potential Boot JDK fou
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -96,7 +96,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
-@@ -21775,7 +21772,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -21903,7 +21900,7 @@ $as_echo "$as_me: Potential Boot JDK fou
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -105,7 +105,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
-@@ -21955,7 +21952,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -22083,7 +22080,7 @@ $as_echo "$as_me: Potential Boot JDK fou
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -114,7 +114,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
-@@ -22163,7 +22160,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -22291,7 +22288,7 @@ $as_echo "$as_me: Potential Boot JDK fou
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -123,7 +123,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
-@@ -22343,7 +22340,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -22471,7 +22468,7 @@ $as_echo "$as_me: Potential Boot JDK fou
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -132,7 +132,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
-@@ -22551,7 +22548,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -22679,7 +22676,7 @@ $as_echo "$as_me: Potential Boot JDK fou
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -141,7 +141,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
-@@ -22731,7 +22728,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -22859,7 +22856,7 @@ $as_echo "$as_me: Potential Boot JDK fou
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -150,7 +150,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
-@@ -22926,7 +22923,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -23054,7 +23051,7 @@ $as_echo "$as_me: Potential Boot JDK fou
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -159,7 +159,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
-@@ -23104,7 +23101,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -23232,7 +23229,7 @@ $as_echo "$as_me: Potential Boot JDK fou
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -168,7 +168,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
-@@ -23300,7 +23297,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -23428,7 +23425,7 @@ $as_echo "$as_me: Potential Boot JDK fou
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -177,7 +177,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
-@@ -23478,7 +23475,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -23606,7 +23603,7 @@ $as_echo "$as_me: Potential Boot JDK fou
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -186,7 +186,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
-@@ -23673,7 +23670,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -23801,7 +23798,7 @@ $as_echo "$as_me: Potential Boot JDK fou
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -195,7 +195,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
-@@ -23851,7 +23848,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -23979,7 +23976,7 @@ $as_echo "$as_me: Potential Boot JDK fou
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -204,7 +204,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
-@@ -24047,7 +24044,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -24175,7 +24172,7 @@ $as_echo "$as_me: Potential Boot JDK fou
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -213,7 +213,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
-@@ -24225,7 +24222,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -24353,7 +24350,7 @@ $as_echo "$as_me: Potential Boot JDK fou
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -222,7 +222,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
-@@ -24402,7 +24399,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -24530,7 +24527,7 @@ $as_echo "$as_me: Potential Boot JDK fou
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -231,7 +231,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
-@@ -24808,16 +24805,15 @@ $as_echo_n "checking flags for boot jdk
+@@ -24936,16 +24933,15 @@ $as_echo_n "checking flags for boot jdk
# Maximum amount of heap memory.
# Maximum stack size.
if test "x$BOOT_JDK_BITS" = x32; then
@@ -249,7 +249,7 @@ pkg/53223.
$ECHO "Check if jvm arg is ok: -Xmx$JVM_MAX_HEAP" >&5
$ECHO "Command: $JAVA -Xmx$JVM_MAX_HEAP -version" >&5
-@@ -27351,7 +27347,7 @@ $as_echo_n "checking resolved symbolic l
+@@ -27479,7 +27475,7 @@ $as_echo_n "checking resolved symbolic l
# Resolve file symlinks
while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@@ -258,7 +258,7 @@ pkg/53223.
# This is not a symbolic link! We are done!
break
fi
-@@ -27806,7 +27802,7 @@ $as_echo_n "checking for resolved symbol
+@@ -27934,7 +27930,7 @@ $as_echo_n "checking for resolved symbol
# Resolve file symlinks
while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@@ -267,7 +267,7 @@ pkg/53223.
# This is not a symbolic link! We are done!
break
fi
-@@ -29092,7 +29088,7 @@ $as_echo_n "checking resolved symbolic l
+@@ -29220,7 +29216,7 @@ $as_echo_n "checking resolved symbolic l
# Resolve file symlinks
while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@@ -276,7 +276,7 @@ pkg/53223.
# This is not a symbolic link! We are done!
break
fi
-@@ -29547,7 +29543,7 @@ $as_echo_n "checking for resolved symbol
+@@ -29675,7 +29671,7 @@ $as_echo_n "checking for resolved symbol
# Resolve file symlinks
while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@@ -285,7 +285,7 @@ pkg/53223.
# This is not a symbolic link! We are done!
break
fi
-@@ -41263,6 +41259,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
+@@ -41391,6 +41387,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1'
SET_SHARED_LIBRARY_MAPFILE=''
@@ -298,7 +298,7 @@ pkg/53223.
else
# Default works for linux, might work on other platforms as well.
SHARED_LIBRARY_FLAGS='-shared'
-@@ -41311,7 +41313,9 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
+@@ -41439,7 +41441,9 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
if test "x$OPENJDK_TARGET_OS" = xsolaris; then
CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__"
CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__"
@@ -308,16 +308,16 @@ pkg/53223.
fi
# The (cross) compiler is now configured, we can now test capabilities
# of the target platform.
-@@ -41460,7 +41464,7 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
- LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
- ;;
- esac
+@@ -41580,7 +41584,7 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
+ elif test "x$TOOLCHAIN_TYPE" = xgcc; then
+ LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
+ LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
- if test "x$OPENJDK_TARGET_OS" != xmacosx; then
+ if test "x$OPENJDK_TARGET_OS" != xmacosx -a test "x$OPENJDK_TARGET_OS" != xsolaris; then
LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro"
LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro"
fi
-@@ -42536,7 +42540,8 @@ $as_echo "alsa pulse x11" >&6; }
+@@ -42798,7 +42802,8 @@ $as_echo "alsa pulse x11" >&6; }
if test "x$OPENJDK_TARGET_OS" = xbsd; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on BSD?" >&5
$as_echo_n "checking what is not needed on BSD?... " >&6; }
@@ -327,7 +327,7 @@ pkg/53223.
ALSA_NOT_NEEDED=yes
PULSE_NOT_NEEDED=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5
-@@ -43766,7 +43771,7 @@ $as_echo "$as_me: WARNING: Can't find pr
+@@ -44028,7 +44033,7 @@ $as_echo "$as_me: WARNING: Can't find pr
BUILD_FREETYPE=no
fi
# Now check if configure found a version of 'msbuild.exe'
@@ -336,7 +336,7 @@ pkg/53223.
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find an msbuild.exe executable (you may try to install .NET 4.0) - ignoring --with-freetype-src" >&5
$as_echo "$as_me: WARNING: Can't find an msbuild.exe executable (you may try to install .NET 4.0) - ignoring --with-freetype-src" >&2;}
BUILD_FREETYPE=no
-@@ -44182,7 +44187,11 @@ $as_echo "$as_me: WARNING: --with-freety
+@@ -44444,7 +44449,11 @@ $as_echo "$as_me: WARNING: --with-freety
# Allow --with-freetype-lib and --with-freetype-include to override
if test "x$with_freetype_include" != x; then
@@ -349,7 +349,7 @@ pkg/53223.
fi
if test "x$with_freetype_lib" != x; then
POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib"
-@@ -47292,7 +47301,7 @@ $as_echo "$as_me: The path of FREETYPE_I
+@@ -47554,7 +47563,7 @@ $as_echo "$as_me: The path of FREETYPE_I
FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
fi
@@ -358,7 +358,7 @@ pkg/53223.
FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH"
else
FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH"
-@@ -47425,7 +47434,7 @@ $as_echo "$as_me: The path of FREETYPE_L
+@@ -47687,7 +47696,7 @@ $as_echo "$as_me: The path of FREETYPE_L
if test "x$OPENJDK_TARGET_OS" = xwindows; then
FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib"
else
@@ -367,7 +367,7 @@ pkg/53223.
fi
fi
-@@ -48654,9 +48663,6 @@ fi
+@@ -49024,9 +49033,6 @@ fi
@@ -377,7 +377,7 @@ pkg/53223.
llvm_components="jit mcjit engine nativecodegen native"
unset LLVM_CFLAGS
-@@ -48699,7 +48705,7 @@ fi
+@@ -49069,7 +49075,7 @@ fi
fi
# libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)
Index: pkgsrc/lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_jsig.make
diff -u pkgsrc/lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_jsig.make:1.2 pkgsrc/lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_jsig.make:1.3
--- pkgsrc/lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_jsig.make:1.2 Fri Dec 15 14:27:52 2017
+++ pkgsrc/lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_jsig.make Sat Nov 2 21:31:14 2019
@@ -1,10 +1,10 @@
-$NetBSD: patch-hotspot_make_solaris_makefiles_jsig.make,v 1.2 2017/12/15 14:27:52 jperkin Exp $
+$NetBSD: patch-hotspot_make_solaris_makefiles_jsig.make,v 1.3 2019/11/02 21:31:14 tnn Exp $
GCC support.
---- hotspot/make/solaris/makefiles/jsig.make.orig 2017-11-28 00:13:38.000000000 +0000
+--- hotspot/make/solaris/makefiles/jsig.make.orig 2019-10-16 01:41:55.000000000 +0000
+++ hotspot/make/solaris/makefiles/jsig.make
-@@ -39,18 +39,29 @@ DEST_JSIG_DIZ = $(JDK_LIBDIR)/$(LI
+@@ -39,10 +39,11 @@ DEST_JSIG_DIZ = $(JDK_LIBDIR)/$(LI
LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig
@@ -17,21 +17,17 @@ GCC support.
else
LFLAGS_JSIG += -mt -xnolib
endif
+@@ -52,6 +53,13 @@ ifneq ($(DEBUG_LEVEL), slowdebug)
+ JSIG_OPT_FLAGS = -xO4 -g
+ endif
+# DEBUG_BINARIES overrides everything, use full -g debug information
-+ifeq ($(DEBUG_BINARIES), true)
-+JSIG_DEBUG_CFLAGS = -g
++ifdef USE_GCC
++ ifeq ($(DEBUG_BINARIES), true)
++ JSIG_OPT_FLAGS = -g
++ endif
+endif
+
$(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
@echo Making signal interposition lib...
-+ifdef USE_GCC
-+ $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
-+ $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $(JSIGSRCDIR)/jsig.c -ldl
-+else
$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
- $(LFLAGS_JSIG) -o $@ $(JSIGSRCDIR)/jsig.c -ldl
-+endif
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
- $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
Index: pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_opto_library__call.cpp
diff -u pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_opto_library__call.cpp:1.1 pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_opto_library__call.cpp:1.2
--- pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_opto_library__call.cpp:1.1 Sat Sep 12 16:56:48 2015
+++ pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_opto_library__call.cpp Sat Nov 2 21:31:14 2019
@@ -1,17 +1,15 @@
-$NetBSD: patch-hotspot_src_share_vm_opto_library__call.cpp,v 1.1 2015/09/12 16:56:48 joerg Exp $
+$NetBSD: patch-hotspot_src_share_vm_opto_library__call.cpp,v 1.2 2019/11/02 21:31:14 tnn Exp $
Left shift of negative values is UB.
---- hotspot/src/share/vm/opto/library_call.cpp.orig 2015-09-03 15:27:49.000000000 +0000
+--- hotspot/src/share/vm/opto/library_call.cpp.orig 2019-10-16 01:41:55.000000000 +0000
+++ hotspot/src/share/vm/opto/library_call.cpp
-@@ -3750,8 +3750,8 @@ Node* LibraryCallKit::generate_array_gua
+@@ -3803,7 +3803,7 @@ Node* LibraryCallKit::generate_array_gua
}
// Now test the correct condition.
jint nval = (obj_array
-- ? ((jint)Klass::_lh_array_tag_type_value
-- << Klass::_lh_array_tag_shift)
+- ? (jint)(Klass::_lh_array_tag_type_value
+ ? (jint)((juint)Klass::_lh_array_tag_type_value
-+ << Klass::_lh_array_tag_shift)
+ << Klass::_lh_array_tag_shift)
: Klass::_lh_neutral_value);
Node* cmp = _gvn.transform(new(C) CmpINode(layout_val, intcon(nval)));
- BoolTest::mask btest = BoolTest::lt; // correct for testing is_[obj]array
Home |
Main Index |
Thread Index |
Old Index