kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 1.8.192

Browse source 
Changelog:
New Features
security-libs/javax.net.ssl
➜ Support for Customization of Default Enabled Cipher Suites via System Properties

The system property jdk.tls.client.cipherSuites can be used to customize the default enabled cipher suites for the client side of SSL/TLS connections. In a similar way, the system property jdk.tls.server.cipherSuites can be used for customization on the server side.

The system properties contain a comma-separated list of supported cipher suite names that specify the default enabled cipher suites. All other supported cipher suites are disabled for this default setting. Unrecognized or unsupported cipher suite names specified in properties are ignored. Explicit setting of enabled cipher suites will override the system properties.

Please refer to the "Java Cryptography Architecture Standard Algorithm Name Documentation" for the standard JSSE cipher suite names, and the "Java Cryptography Architecture Oracle Providers Documentation" for the cipher suite names supported by the SunJSSE provider.

Note that the actual use of enabled cipher suites is restricted by algorithm constraints.

Note also that these system properties are currently supported by the JDK Reference Implementation. They are not guaranteed to be supported by other implementations.

Warning: These system properties can be used to configure weak cipher suites, or the configured cipher suites may become more weak over time. We do not recommend using the system properties unless you understand the security implications. Use them at your own risk.
See JDK-8162362


Bug Fixes

This release contains fixes for security vulnerabilities described in the Oracle Critical Patch Update. For a more complete list of the bug fixes included in this release, see the JDK 8u192 Bug Fixes page.

Security bugs:
CVE-2018-3183
CVE-2018-3209
CVE-2018-3169
CVE-2018-3149
CVE-2018-3211
CVE-2018-3180
CVE-2018-3214
CVE-2018-3157
CVE-2018-3150
CVE-2018-13785
CVE-2018-3136
CVE-2018-3139
This commit is contained in:
ryoon 2018-12-12 14:22:11 +00:00
parent b526f17b3b
commit 6470164c19
7 changed files with 84 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lang/openjdk8/Makefile
View file

@ -1,9 +1,8 @@
# $NetBSD: Makefile,v 1.74 2018/11/14 22:21:55 kleink Exp $
# $NetBSD: Makefile,v 1.75 2018/12/12 14:22:11 ryoon Exp $
DISTNAME= openjdk-1.8.181-20180914
PKGNAME= openjdk8-1.8.181
DISTNAME= openjdk-1.8.192-20181209
PKGNAME= openjdk8-1.8.192
CATEGORIES= lang
PKGREVISION= 3
MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/}
EXTRACT_SUFX= .tar.xz
@ -26,7 +25,7 @@ JAVA_WRAPPERS= jar java javac javadoc javah javap jcmd jhat jps jstack \
BUILD_DEPENDS+= mozilla-rootcerts>=1.0.20140820nb2:../../security/mozilla-rootcerts
GNU_CONFIGURE= yes
CONFIGURE_SCRIPT= common/autoconf/configure
CONFIGURE_SCRIPT= configure
CONFIG_SHELL= bash
CONFIG_SUB_OVERRIDE+= common/autoconf/build-aux/config.sub
CONFIG_GUESS_OVERRIDE+= common/autoconf/build-aux/config.guess
@ -116,6 +115,7 @@ MAKE_ENV+= ARCH_DATA_MODEL=${ABI:Q}
.endif
.if !empty(PKGSRC_COMPILER:Mclang)
CONFIGURE_ARGS+= --with-toolchain-type=clang
MAKE_ENV+= USE_CLANG=true
_WRAP_EXTRA_ARGS.CC+= -Wno-return-type
CWRAPPERS_APPEND.cc+= -Wno-return-type
@ -145,6 +145,9 @@ BUILDLINK_TRANSFORM+= rm:-fpch-deps
_WRAP_EXTRA_ARGS.CXX+= -mstackrealign
CWRAPPERS_APPEND.cxx+= -mstackrealign
. endif
.else
# GCC
CONFIGURE_ARGS+= --with-toolchain-type=gcc
.endif
.include "bootstrap.mk"

30
lang/openjdk8/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.62 2018/09/17 10:50:26 tnn Exp $
$NetBSD: distinfo,v 1.63 2018/12/12 14:22:11 ryoon 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
@ -48,10 +48,10 @@ SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 29b
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-1.8.181-20180914.tar.xz) = e8c523f8955573c029a70d62a7434e495bd478ed
RMD160 (openjdk7/openjdk-1.8.181-20180914.tar.xz) = dc24acb3365ca4e37c7daf8d413a807ef6fc2604
SHA512 (openjdk7/openjdk-1.8.181-20180914.tar.xz) = c092425ed9dab4ddb91ca445c42be0911f6f6fefc523d9ac87ee01612eae8ed65b2e81c0102789b52ba6fe02d1acce3285262de5464d4a3c1f775027a66b3fca
Size (openjdk7/openjdk-1.8.181-20180914.tar.xz) = 55707936 bytes
SHA1 (openjdk7/openjdk-1.8.192-20181209.tar.xz) = eec0c783cf835f33d701f02bc468c6f5fe5ae2fd
RMD160 (openjdk7/openjdk-1.8.192-20181209.tar.xz) = 2a8dea4258c58d510fab9152f6acb8bf7713a30f
SHA512 (openjdk7/openjdk-1.8.192-20181209.tar.xz) = 1453ee1f99b1f8c7a7f279769e48e14eca80f7649b09b518ca47b2fa742f1bfff0b23646639acd4fe33fc0c93c3fe9c7931a87964ba52f609330a536f24008c3
Size (openjdk7/openjdk-1.8.192-20181209.tar.xz) = 55795332 bytes
SHA1 (patch-aa) = b3834c8a8d12a417638e0c5b886abea4767fb7f5
SHA1 (patch-al) = f65f739805c2ef471a4de10d6da42e86c5561b8c
SHA1 (patch-an) = fce4da00762770c1c0592bd225bf73e875252178
@ -60,17 +60,15 @@ SHA1 (patch-as) = 484ba6dd99c650ebe3df5639548ee2874c326aaa
SHA1 (patch-at) = 736ead4b9f391c711bf1f387d87ffb9363823557
SHA1 (patch-ba) = a54a25d4f8982ff4d2cb4e7e456fe2a44656b800
SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63
SHA1 (patch-bi) = 190056b3d4c42986ae0a600668b02711598361b8
SHA1 (patch-bi) = 5409f0944d6f850baeaaa7c64d2e8ad52233e1e9
SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892
SHA1 (patch-common_autoconf_boot-jdk.m4) = 530da90ea4062f9d8c208557ff634579b0b19f55
SHA1 (patch-common_autoconf_generated-configure.sh) = 71ceb540d46c9acd43b54c7d73c93e5b0a03f939
SHA1 (patch-common_autoconf_boot-jdk.m4) = a29767c79544dea243019cc841d834f756172462
SHA1 (patch-common_autoconf_generated-configure.sh) = bd10cdd8d06c6620cf350df8b5a0e6dd392ef058
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
SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 2c0d286c87f8239e8d5aa7fcc21e09b4b1c5a46e
SHA1 (patch-hotspot_make_bsd_makefiles_jsig.make) = 3ed5ea8c4bb595cd72837c986fdd131102a9e083
SHA1 (patch-hotspot_make_bsd_makefiles_saproc.make) = 76a0cc758ee1d62136e8e698df7e46fe20aa9e19
SHA1 (patch-hotspot_make_solaris_makefiles_adlc.make) = 1d1be862ed0d8fc3da4710da169ad5a965d9df14
SHA1 (patch-hotspot_make_bsd_makefiles_saproc.make) = cf90f6a3d170aa7291fb3cfe4df7df20ec377132
SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f2957b5c2a7a7982866f99239
SHA1 (patch-hotspot_make_solaris_makefiles_debug.make) = 7195c97c4f559b2e9410028315de351c5047d59d
SHA1 (patch-hotspot_make_solaris_makefiles_dtrace.make) = 84e3d6b6603887aaac13747b5c972dd3eec4c7f1
@ -114,7 +112,7 @@ SHA1 (patch-jdk_make_CompileLaunchers.gmk) = d496999f10fc56b1d68283ab4636787058f
SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5
SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828
SHA1 (patch-jdk_make_Images.gmk) = e6643dcb25ad5457efe610f6ab7fd0ccc9b5ed41
SHA1 (patch-jdk_make_lib_Awt2dLibraries.gmk) = 46afef0bd826145c3d6277c7b73c98e595e80092
SHA1 (patch-jdk_make_lib_Awt2dLibraries.gmk) = 1e29aaa4a4ce5bb104bdd8d8ba1b87f8ff09b8be
SHA1 (patch-jdk_make_lib_CoreLibraries.gmk) = 21a46be1c8247d528a2e0666ca9a40520327771a
SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 5a1044c444e534d627b46d820d27bb545e65959d
SHA1 (patch-jdk_make_lib_ServiceabilityLibraries.gmk) = ab0ed14a661412aeb91ecde4251883817ea3cad4
@ -123,7 +121,6 @@ SHA1 (patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java) = b7d53d
SHA1 (patch-jdk_src_share_lib_security_java.security-bsd) = 5a64fc1205a5bd2f6586ad65ca21f93dfffb1606
SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = 9d8900a6f9cc6af99b08e281b0d6d4c337916317
SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = 5986de69be2eb36546274a8242b8d13ed7599b50
SHA1 (patch-jdk_src_share_native_sun_awt_libpng_pngpriv.h) = 56e6390ae8cfb09b55f0d240b99284cc7f1736b3
SHA1 (patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h) = 18e79e74dc8ec2b24ab91ad8af2195bfd508d1b4
SHA1 (patch-jdk_src_solaris_bin_ergo.c) = 0e2e496a0d596cc9de546c722b3387ad5a08bc21
SHA1 (patch-jdk_src_solaris_bin_ergo__i586.c) = f6fd4c1e0627867ba8d5071da7c53697177805dd
@ -136,10 +133,3 @@ SHA1 (patch-jdk_src_solaris_native_java_lang_java__props__md.c) = 672c9a044936cb
SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 6d58169565503ef8e50224fce8380e42cb87baba
SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = c51d6b0687011a54c27e6253cad33d8f8cc27124
SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = cf0f8218e0088b677cd66fd5bc0d575ab08b710f
SHA1 (patch-jdk_test_Makefile) = 36430647c444dea491ae0c916c6ad7b1a3607ec6
SHA1 (patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java) = 5fb2dd92820afcca5a04956d81e5244840b513f7
SHA1 (patch-jdk_test_java_beans_Introspector_4520754_Test4520754.java) = e5d6121d2af74238347baa2d63670f0d520847f8
SHA1 (patch-jdk_test_java_beans_Introspector_Test4144543.java) = bb0a20f688093f2d60f4a4937ae418fcebfcc7ca
SHA1 (patch-jdk_test_java_lang_management_OperatingSystemMXBean_GetSystemLoadAverage.java) = 07b071ace2a91acd1968ed670aead67d72f0d490
SHA1 (patch-jdk_test_sun_security_ec_TestEC.java) = c2db0716408ae1d081b3516b6c866b8f43cf5b6f
SHA1 (patch-langtools_make_build.xml) = e9dccdb67a0f25b266755f66e520c6420afaf7ba

10
lang/openjdk8/patches/patch-bi
View file

@ -1,8 +1,8 @@
$NetBSD: patch-bi,v 1.1 2015/02/08 08:41:25 tnn Exp $
$NetBSD: patch-bi,v 1.2 2018/12/12 14:22:11 ryoon Exp $
DragonFly support.
--- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.orig 2015-02-02 15:32:37.000000000 +0000
--- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.orig 2018-12-09 09:51:15.000000000 +0000
+++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
@@ -96,7 +96,7 @@
#define SPELL_REG_FP "ebp"
@ -15,11 +15,11 @@ DragonFly support.
# define context_pc uc_mcontext.mc_rip
@@ -283,13 +283,8 @@ address os::current_stack_pointer() {
register void *esp;
__asm__("mov %%"SPELL_REG_SP", %0":"=r"(esp));
__asm__("mov %%" SPELL_REG_SP ", %0" : "=r" (esp));
return (address) esp;
-#elif defined(SPARC_WORKS)
- register void *esp;
- __asm__("mov %%"SPELL_REG_SP", %0":"=r"(esp));
- __asm__("mov %%" SPELL_REG_SP ", %0" : "=r" (esp));
- return (address) ((char*)esp + sizeof(long)*2);
#else
- register void *esp __asm__ (SPELL_REG_SP);
@ -34,7 +34,7 @@ DragonFly support.
intptr_t* _get_previous_fp() {
-#if defined(SPARC_WORKS) || defined(__clang__) || defined(__llvm__)
- register intptr_t **ebp;
- __asm__("mov %%"SPELL_REG_FP", %0":"=r"(ebp));
- __asm__("mov %%" SPELL_REG_FP ", %0" : "=r" (ebp));
-#else
- register intptr_t **ebp __asm__ (SPELL_REG_FP);
-#endif

11
lang/openjdk8/patches/patch-common_autoconf_boot-jdk.m4
View file

@ -1,12 +1,12 @@
$NetBSD: patch-common_autoconf_boot-jdk.m4,v 1.2 2016/02/08 14:45:39 ryoon Exp $
$NetBSD: patch-common_autoconf_boot-jdk.m4,v 1.3 2018/12/12 14:22:11 ryoon Exp $
--- common/autoconf/boot-jdk.m4.orig 2016-02-08 13:44:13.000000000 +0000
--- common/autoconf/boot-jdk.m4.orig 2018-12-09 09:50:43.000000000 +0000
+++ common/autoconf/boot-jdk.m4
@@ -334,16 +334,15 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_AR
@@ -334,14 +334,12 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_AR
# Maximum amount of heap memory.
# Maximum stack size.
if test "x$BOOT_JDK_BITS" = x32; then
- JVM_MAX_HEAP=1100M
- JVM_MAX_HEAP=768M
STACK_SIZE=768
else
# Running Javac on a JVM on a 64-bit machine, takes more space since 64-bit
@ -16,7 +16,4 @@ $NetBSD: patch-common_autoconf_boot-jdk.m4,v 1.2 2016/02/08 14:45:39 ryoon Exp $
- JVM_MAX_HEAP=1600M
STACK_SIZE=1536
fi
+ JVM_MAX_HEAP=800M
ADD_JVM_ARG_IF_OK([-Xmx$JVM_MAX_HEAP],boot_jdk_jvmargs_big,[$JAVA])
ADD_JVM_ARG_IF_OK([-XX:ThreadStackSize=$STACK_SIZE],boot_jdk_jvmargs_big,[$JAVA])
ADD_JVM_ARG_IF_OK([-XX:PermSize=32m],boot_jdk_jvmargs_big,[$JAVA])

158
lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
View file

@ -1,24 +1,21 @@
$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.14 2018/05/27 04:58:20 tsutsui Exp $
$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.15 2018/12/12 14:22:11 ryoon Exp $
BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386) and
pkg/53223.
--- common/autoconf/generated-configure.sh.orig 2018-02-12 08:30:01.000000000 +0000
--- common/autoconf/generated-configure.sh.orig 2018-12-09 09:50:43.000000000 +0000
+++ common/autoconf/generated-configure.sh
@@ -8486,9 +8486,9 @@ done
@@ -15404,9 +15404,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.
- if test ! -f "$MAKE"; then
- as_fn_error $? "The specified make (by MAKE=$MAKE) is not found." "$LINENO" 5
- fi
+# if test ! -f "$MAKE"; then
+# as_fn_error $? "The specified make (by MAKE=$MAKE) is not found." "$LINENO" 5
+# fi
MAKE_CANDIDATE=""$MAKE""
DESCRIPTION="user supplied MAKE=$MAKE"
@@ -11455,7 +11455,7 @@ $as_echo "$as_me: Potential Boot JDK fou
@@ -19994,7 +19991,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?
@ -27,7 +24,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -11787,7 +11787,7 @@ $as_echo "$as_me: Potential Boot JDK fou
@@ -20326,7 +20323,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?
@ -36,7 +33,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -12105,7 +12105,7 @@ $as_echo "$as_me: Potential Boot JDK fou
@@ -20644,7 +20641,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?
@ -45,7 +42,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -12293,7 +12293,7 @@ $as_echo "$as_me: Potential Boot JDK fou
@@ -20832,7 +20829,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?
@ -54,7 +51,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -12571,7 +12571,7 @@ fi
@@ -21110,7 +21107,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/'`
@ -63,7 +60,7 @@ pkg/53223.
# This is not a symbolic link! We are done!
break
fi
@@ -12621,7 +12621,7 @@ $as_echo "$as_me: Potential Boot JDK fou
@@ -21160,7 +21157,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?
@ -72,7 +69,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -12836,7 +12836,7 @@ $as_echo "$as_me: Potential Boot JDK fou
@@ -21375,7 +21372,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?
@ -81,7 +78,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -13016,7 +13016,7 @@ $as_echo "$as_me: Potential Boot JDK fou
@@ -21555,7 +21552,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?
@ -90,7 +87,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -13224,7 +13224,7 @@ $as_echo "$as_me: Potential Boot JDK fou
@@ -21763,7 +21760,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?
@ -99,7 +96,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -13404,7 +13404,7 @@ $as_echo "$as_me: Potential Boot JDK fou
@@ -21943,7 +21940,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?
@ -108,7 +105,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -13612,7 +13612,7 @@ $as_echo "$as_me: Potential Boot JDK fou
@@ -22151,7 +22148,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?
@ -117,7 +114,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -13792,7 +13792,7 @@ $as_echo "$as_me: Potential Boot JDK fou
@@ -22331,7 +22328,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?
@ -126,7 +123,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -14000,7 +14000,7 @@ $as_echo "$as_me: Potential Boot JDK fou
@@ -22539,7 +22536,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?
@ -135,7 +132,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -14180,7 +14180,7 @@ $as_echo "$as_me: Potential Boot JDK fou
@@ -22719,7 +22716,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?
@ -144,7 +141,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -14375,7 +14375,7 @@ $as_echo "$as_me: Potential Boot JDK fou
@@ -22914,7 +22911,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?
@ -153,7 +150,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -14553,7 +14553,7 @@ $as_echo "$as_me: Potential Boot JDK fou
@@ -23092,7 +23089,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?
@ -162,7 +159,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -14749,7 +14749,7 @@ $as_echo "$as_me: Potential Boot JDK fou
@@ -23288,7 +23285,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?
@ -171,7 +168,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -14927,7 +14927,7 @@ $as_echo "$as_me: Potential Boot JDK fou
@@ -23466,7 +23463,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?
@ -180,7 +177,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -15122,7 +15122,7 @@ $as_echo "$as_me: Potential Boot JDK fou
@@ -23661,7 +23658,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?
@ -189,7 +186,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -15300,7 +15300,7 @@ $as_echo "$as_me: Potential Boot JDK fou
@@ -23839,7 +23836,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?
@ -198,7 +195,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -15496,7 +15496,7 @@ $as_echo "$as_me: Potential Boot JDK fou
@@ -24035,7 +24032,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?
@ -207,7 +204,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -15674,7 +15674,7 @@ $as_echo "$as_me: Potential Boot JDK fou
@@ -24213,7 +24210,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?
@ -216,7 +213,7 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -15851,7 +15851,7 @@ $as_echo "$as_me: Potential Boot JDK fou
@@ -24390,7 +24387,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?
@ -225,11 +222,11 @@ pkg/53223.
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -16257,16 +16257,15 @@ $as_echo_n "checking flags for boot jdk
@@ -24796,16 +24793,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
- JVM_MAX_HEAP=1100M
- JVM_MAX_HEAP=768M
STACK_SIZE=768
else
# Running Javac on a JVM on a 64-bit machine, takes more space since 64-bit
@ -243,16 +240,7 @@ pkg/53223.
$ECHO "Check if jvm arg is ok: -Xmx$JVM_MAX_HEAP" >&5
$ECHO "Command: $JAVA -Xmx$JVM_MAX_HEAP -version" >&5
@@ -19486,7 +19485,7 @@ $as_echo "(none, will use system headers
elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
COMPILER_CHECK_LIST="cl"
elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
- COMPILER_CHECK_LIST="cc gcc"
+ COMPILER_CHECK_LIST="gcc cc"
elif test "x$OPENJDK_TARGET_OS" = "xaix"; then
# Do not probe for cc on AIX.
COMPILER_CHECK_LIST="xlc_r"
@@ -19942,7 +19941,7 @@ $as_echo_n "checking resolved symbolic l
@@ -27334,7 +27330,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/'`
@ -261,7 +249,7 @@ pkg/53223.
# This is not a symbolic link! We are done!
break
fi
@@ -20380,7 +20379,7 @@ $as_echo_n "checking for resolved symbol
@@ -27789,7 +27785,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/'`
@ -270,16 +258,7 @@ pkg/53223.
# This is not a symbolic link! We are done!
break
fi
@@ -20408,7 +20407,7 @@ $as_echo "no, keeping CC" >&6; }
COMPILER=$CC
COMPILER_NAME=$COMPILER_NAME
- if test "x$OPENJDK_TARGET_OS" = xsolaris; then
+ if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$GCC" = xno; then
# Make sure we use the Sun Studio compiler and not gcc on Solaris, which won't work
COMPILER_VERSION_TEST=`$COMPILER -V 2>&1 | $HEAD -n 1`
$ECHO $COMPILER_VERSION_TEST | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null
@@ -21544,7 +21543,7 @@ $as_echo_n "checking resolved symbolic l
@@ -29075,7 +29071,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/'`
@ -288,7 +267,7 @@ pkg/53223.
# This is not a symbolic link! We are done!
break
fi
@@ -21982,7 +21981,7 @@ $as_echo_n "checking for resolved symbol
@@ -29530,7 +29526,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/'`
@ -297,55 +276,7 @@ pkg/53223.
# This is not a symbolic link! We are done!
break
fi
@@ -22010,7 +22009,7 @@ $as_echo "no, keeping CXX" >&6; }
COMPILER=$CXX
COMPILER_NAME=$COMPILER_NAME
- if test "x$OPENJDK_TARGET_OS" = xsolaris; then
+ if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$GCC" = xno; then
# Make sure we use the Sun Studio compiler and not gcc on Solaris, which won't work
COMPILER_VERSION_TEST=`$COMPILER -V 2>&1 | $HEAD -n 1`
$ECHO $COMPILER_VERSION_TEST | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null
@@ -29451,6 +29450,15 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
if test "x$OPENJDK_TARGET_OS" = xbsd || test "x$OPENJDK_TARGET_OS" = xmacosx; then
SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
fi
+ if test "x$OPENJDK_TARGET_OS" = xsolaris; then
+ SET_SHARED_LIBRARY_NAME=''
+ SET_SHARED_LIBRARY_MAPFILE=''
+ SET_SHARED_LIBRARY_ORIGIN='-R\$$$$ORIGIN$1'
+ SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
+ CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__"
+ CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__"
+ POST_STRIP_CMD="$STRIP -x"
+ fi
else
if test "x$OPENJDK_TARGET_OS" = xsolaris; then
# If it is not gcc, then assume it is the Oracle Solaris Studio Compiler
@@ -29592,6 +29600,13 @@ rm -f core conftest.err conftest.$ac_obj
C_O_FLAG_NORM="-Os"
C_O_FLAG_NONE=""
;;
+ solaris )
+ # libverify currently crashes in 32-bit builds with
+ # alignment faults, temporary workaround with -O2
+ C_O_FLAG_HI="-O2"
+ C_O_FLAG_NORM="-O2"
+ C_O_FLAG_NONE="-O0"
+ ;;
*)
C_O_FLAG_HI="-O3"
C_O_FLAG_NORM="-O2"
@@ -29796,7 +29811,7 @@ fi
#
case $COMPILER_NAME in
gcc )
- COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses -Wno-sign-compare \
+ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses -Wno-sign-compare -Wno-unused-parameter \
-pipe \
-D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
CXXSTD_CXXFLAG="-std=gnu++98"
@@ -30753,7 +30768,8 @@ $as_echo "alsa pulse x11" >&6; }
@@ -42453,7 +42449,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; }
@ -355,7 +286,16 @@ pkg/53223.
ALSA_NOT_NEEDED=yes
PULSE_NOT_NEEDED=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5
@@ -31965,7 +31981,11 @@ $as_echo "$as_me: WARNING: freetype not
@@ -43683,7 +43680,7 @@ $as_echo "$as_me: WARNING: Can't find pr
BUILD_FREETYPE=no
fi
# Now check if configure found a version of 'msbuild.exe'
- if test "x$BUILD_FREETYPE" = xyes && test "x$MSBUILD" == x ; then
+ if test "x$BUILD_FREETYPE" = xyes && test "x$MSBUILD" = x ; then
{ $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
@@ -44099,7 +44096,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
@ -368,7 +308,7 @@ pkg/53223.
fi
if test "x$with_freetype_lib" != x; then
POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib"
@@ -34783,7 +34803,7 @@ $as_echo "$as_me: The path of FREETYPE_I
@@ -47209,7 +47210,7 @@ $as_echo "$as_me: The path of FREETYPE_I
FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
fi
@ -377,7 +317,7 @@ pkg/53223.
FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH"
else
FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH"
@@ -34916,7 +34936,7 @@ $as_echo "$as_me: The path of FREETYPE_L
@@ -47342,7 +47343,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
@ -386,7 +326,7 @@ pkg/53223.
fi
fi
@@ -36142,9 +36162,6 @@ fi
@@ -48571,9 +48572,6 @@ fi
@ -396,12 +336,12 @@ pkg/53223.
llvm_components="jit mcjit engine nativecodegen native"
unset LLVM_CFLAGS
@@ -36187,7 +36204,7 @@ fi
@@ -48616,7 +48614,7 @@ fi
fi
# libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)
- if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$LIBCXX" = x; then
- if test "x$TOOLCHAIN_TYPE" = xsolstudio && test "x$LIBCXX" = x; then
+ if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$LIBCXX" = x && test "x$GCC" = "xno"; then
LIBCXX="/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1"
LIBCXX="${SYSROOT}/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1"
fi

6
lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_saproc.make
View file

@ -1,6 +1,6 @@
$NetBSD: patch-hotspot_make_bsd_makefiles_saproc.make,v 1.1 2017/07/24 12:27:33 wiz Exp $
$NetBSD: patch-hotspot_make_bsd_makefiles_saproc.make,v 1.2 2018/12/12 14:22:11 ryoon Exp $
--- hotspot/make/bsd/makefiles/saproc.make.orig 2017-04-27 09:45:08.000000000 +0000
--- hotspot/make/bsd/makefiles/saproc.make.orig 2018-12-09 09:51:15.000000000 +0000
+++ hotspot/make/bsd/makefiles/saproc.make
@@ -107,7 +107,6 @@ ifneq ($(filter-out ia64 arm zero,$(SRCA
endif
@ -12,7 +12,7 @@ $NetBSD: patch-hotspot_make_bsd_makefiles_saproc.make,v 1.1 2017/07/24 12:27:33
else
@@ -116,6 +115,8 @@ SA_LFLAGS = $(LFLAGS)
endif
SA_LFLAGS += $(LDFLAGS_HASH_STYLE)
SA_LFLAGS += $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
+SA_LFLAGS += $(EXTRA_LDFLAGS)
+

23
lang/openjdk8/patches/patch-jdk_make_lib_Awt2dLibraries.gmk
View file

@ -1,11 +1,11 @@
$NetBSD: patch-jdk_make_lib_Awt2dLibraries.gmk,v 1.4 2018/02/23 14:43:49 fhajny Exp $
$NetBSD: patch-jdk_make_lib_Awt2dLibraries.gmk,v 1.5 2018/12/12 14:22:11 ryoon Exp $
GCC support.
Proper libiconv link (and SunOS needs it too).
--- jdk/make/lib/Awt2dLibraries.gmk.orig 2017-11-28 00:13:34.000000000 +0000
--- jdk/make/lib/Awt2dLibraries.gmk.orig 2018-12-09 09:51:37.000000000 +0000
+++ jdk/make/lib/Awt2dLibraries.gmk
@@ -48,6 +48,8 @@ ifneq ($(OPENJDK_TARGET_OS), windows)
@@ -45,6 +45,8 @@ ifneq ($(OPENJDK_TARGET_OS), windows)
BUILD_LIBMLIB_LDLIBS += $(LIBM) $(LIBDL)
endif
@ -14,7 +14,7 @@ Proper libiconv link (and SunOS needs it too).
$(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE, \
LIBRARY := mlib_image, \
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
@@ -695,7 +697,6 @@ $(eval $(call SetupNativeCompilation,BUI
@@ -684,7 +686,6 @@ $(eval $(call SetupNativeCompilation,BUI
$(SHARED_LIBRARY_FLAGS) \
-I$(JDK_TOPDIR)/src/share/native/sun/java2d \
-I$(JDK_TOPDIR)/src/share/native/sun/awt/debug, \
@ -22,7 +22,7 @@ Proper libiconv link (and SunOS needs it too).
CFLAGS_windows := -DCMS_IS_WINDOWS_, \
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
@@ -1070,7 +1071,7 @@ else # OPENJDK_TARGET_OS not windows
@@ -1062,7 +1063,7 @@ else # OPENJDK_TARGET_OS not windows
JAWT_LIBS += -lawt
endif
ifndef BUILD_HEADLESS_ONLY
@ -31,16 +31,3 @@ Proper libiconv link (and SunOS needs it too).
else
JAWT_LIBS += -lawt_headless
HEADLESS_CFLAG += -DHEADLESS
@@ -1273,10 +1274,9 @@ ifndef BUILD_HEADLESS_ONLY
else ifeq ($(OPENJDK_TARGET_OS), windows)
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll
else ifeq ($(OPENJDK_TARGET_OS), solaris)
- # Solaris still uses OPENWIN_LIB ..
- LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread
+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -L$(PACKAGE_PATH)/lib $(LIBICONV) -pthread
else ifeq ($(OPENJDK_TARGET_OS), bsd)
- LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -L$(PACKAGE_PATH)/lib -liconv -pthread
+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -L$(PACKAGE_PATH)/lib $(LIBICONV) -pthread
else # .. all other Unixes can use X_LIBS
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread
endif