Update to 1.8.144 Changelog: Fix the following security bugs. CVE-2017-10110 CVE-2017-10089 CVE-2017-10086 CVE-2017-10096 CVE-2017-10101 CVE-2017-10087 CVE-2017-10090 CVE-2017-10111 CVE-2017-10107 CVE-2017-10102 CVE-2017-10114 CVE-2017-10074 CVE-2017-10116 CVE-2017-10078 CVE-2017-10067 CVE-2017-10115 CVE-2017-10118 CVE-2017-10176 CVE-2017-10104 CVE-2017-10145 CVE-2017-10125 CVE-2017-10198 CVE-2017-10243 CVE-2017-10121 CVE-2017-10135 CVE-2017-10117 CVE-2017-10053 CVE-2017-10108 CVE-2017-10109 CVE-2017-10105 CVE-2017-10081 CVE-2017-10193diff -r1.50 -r1.51 pkgsrc/lang/openjdk8/Makefile
(ryoon)
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.50 2017/07/24 12:27:33 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.51 2017/09/02 04:13:41 ryoon Exp $ | |
2 | 2 | |||
3 | DISTNAME= openjdk-1.8.131-20170427 | 3 | DISTNAME= openjdk-1.8.144-20170830 | |
4 | PKGNAME= openjdk8-1.8.131 | 4 | PKGNAME= openjdk8-1.8.144 | |
5 | CATEGORIES= lang | 5 | CATEGORIES= lang | |
6 | MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} | 6 | MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} | |
7 | EXTRACT_SUFX= .tar.xz | 7 | EXTRACT_SUFX= .tar.xz | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://openjdk.java.net/ | 10 | HOMEPAGE= http://openjdk.java.net/ | |
11 | COMMENT= Open-source implementation of the Java Platform, Standard Edition | 11 | COMMENT= Open-source implementation of the Java Platform, Standard Edition | |
12 | LICENSE= gnu-gpl-v2 | 12 | LICENSE= gnu-gpl-v2 | |
13 | 13 | |||
14 | DISTFILES= ${DEFAULT_DISTFILES} | 14 | DISTFILES= ${DEFAULT_DISTFILES} | |
15 | EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} | 15 | EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} | |
16 | 16 | |||
17 | # Use same DIST_SUBDIR as openjdk7 to avoid duplication of common distfiles | 17 | # Use same DIST_SUBDIR as openjdk7 to avoid duplication of common distfiles |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | $NetBSD: distinfo,v 1.49 2017/07/24 12:27:33 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.50 2017/09/02 04:13:41 ryoon Exp $ | |
2 | 2 | |||
3 | SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334 | 3 | SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334 | |
4 | RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815 | 4 | RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815 | |
5 | SHA512 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 6ed928cc68503c27edd6f3a90f94e1e762192d41997b12903e37071f4fcd34f5579fa970e59c240928eaae60729300fbfdb02a5ec1136bc757ee24f1ee554af4 | 5 | SHA512 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 6ed928cc68503c27edd6f3a90f94e1e762192d41997b12903e37071f4fcd34f5579fa970e59c240928eaae60729300fbfdb02a5ec1136bc757ee24f1ee554af4 | |
6 | Size (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 26404752 bytes | 6 | Size (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 26404752 bytes | |
7 | SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 358c533580700065fd5c3c5c99ce3fd087589c00 | 7 | SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 358c533580700065fd5c3c5c99ce3fd087589c00 | |
8 | RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 96e74f40360f0d4c1272bf5f37cf8869b718a5ee | 8 | RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 96e74f40360f0d4c1272bf5f37cf8869b718a5ee | |
9 | SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 10b80dd953e68c958732ccb56464ee95d8727a95fd7e930a988355348eb3ee47b27350225b28bcc3ec1480a2297c193675150c70bf2ee1820b118f48cdcf67b2 | 9 | SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 10b80dd953e68c958732ccb56464ee95d8727a95fd7e930a988355348eb3ee47b27350225b28bcc3ec1480a2297c193675150c70bf2ee1820b118f48cdcf67b2 | |
10 | Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 26580632 bytes | 10 | Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 26580632 bytes | |
11 | SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 2cd7df823723e67531d268286e31168d3eed01a9 | 11 | SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 2cd7df823723e67531d268286e31168d3eed01a9 | |
12 | RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = af4e195a1da1be15df30808fe9b10f684146a3ea | 12 | RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = af4e195a1da1be15df30808fe9b10f684146a3ea | |
13 | SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = eec0b48e62e29d526911b71079627e3b3a0057e78d1a0195072bac432e4e772f29f9dcc39d6ce972ec56c4b48ec103833779d5b50dae8164303174540f360c1d | 13 | SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = eec0b48e62e29d526911b71079627e3b3a0057e78d1a0195072bac432e4e772f29f9dcc39d6ce972ec56c4b48ec103833779d5b50dae8164303174540f360c1d | |
14 | Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 26857692 bytes | 14 | Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 26857692 bytes | |
@@ -34,31 +34,31 @@ SHA512 (openjdk7/bootstrap-jdk-1.7.76-ne | @@ -34,31 +34,31 @@ SHA512 (openjdk7/bootstrap-jdk-1.7.76-ne | |||
34 | Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = 27615992 bytes | 34 | Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = 27615992 bytes | |
35 | SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 69375362b2638d803c71392008a73f956d315085 | 35 | SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 69375362b2638d803c71392008a73f956d315085 | |
36 | RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 06b40db72e7154daff49093f3b6e8aa39cae27b3 | 36 | RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 06b40db72e7154daff49093f3b6e8aa39cae27b3 | |
37 | SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 5391de2d35934b79462b603cd19c65b21712891d59afe9d6e5319ea479fe2bc528e4f423648cd6fc9bcaec97ed57b9e01d1c46d04bc4edb9ed5ae7131b7cd5d7 | 37 | SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 5391de2d35934b79462b603cd19c65b21712891d59afe9d6e5319ea479fe2bc528e4f423648cd6fc9bcaec97ed57b9e01d1c46d04bc4edb9ed5ae7131b7cd5d7 | |
38 | Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 23041084 bytes | 38 | Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 23041084 bytes | |
39 | SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 98fdb66b429148ae3922a2f9b2db736a1708e337 | 39 | SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 98fdb66b429148ae3922a2f9b2db736a1708e337 | |
40 | RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 4835c6361f66138d73f583c40df0e04a31257157 | 40 | RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 4835c6361f66138d73f583c40df0e04a31257157 | |
41 | SHA512 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 15ee0583de67df94c980eec197e5279344eaf94d4830e2030f8c8cbc795bce1e0abdf435be4be4c5da271a41d5441e9ebf4bd4f088b17698b5a1e4cc685ebf3a | 41 | SHA512 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 15ee0583de67df94c980eec197e5279344eaf94d4830e2030f8c8cbc795bce1e0abdf435be4be4c5da271a41d5441e9ebf4bd4f088b17698b5a1e4cc685ebf3a | |
42 | Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 37910104 bytes | 42 | Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 37910104 bytes | |
43 | SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 29bd7aa925941933b2da671340e1d325d9603e5d | 43 | SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 29bd7aa925941933b2da671340e1d325d9603e5d | |
44 | RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = b13d0e42839fb746d41f9001e488162b47803140 | 44 | RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = b13d0e42839fb746d41f9001e488162b47803140 | |
45 | SHA512 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 1403e582dacd0474e57d9aa8f1333060c50d099ef5d2c5a992ff7f63dcde2e538ff1e7fb78e45d12fd5aea6daf0704672e7f326399d415ee0d6bb53b6f925e9f | 45 | SHA512 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 1403e582dacd0474e57d9aa8f1333060c50d099ef5d2c5a992ff7f63dcde2e538ff1e7fb78e45d12fd5aea6daf0704672e7f326399d415ee0d6bb53b6f925e9f | |
46 | Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 37883700 bytes | 46 | Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 37883700 bytes | |
47 | SHA1 (openjdk7/openjdk-1.8.131-20170427.tar.xz) = 1e3e6c385f26515dff92539ff6e52f8463839404 | 47 | SHA1 (openjdk7/openjdk-1.8.144-20170830.tar.xz) = a897c539fec09e9f97769f4fd64e4f387569c8b4 | |
48 | RMD160 (openjdk7/openjdk-1.8.131-20170427.tar.xz) = 71b2cc0d06ebe98707b35a4bed7e96a3e398f46e | 48 | RMD160 (openjdk7/openjdk-1.8.144-20170830.tar.xz) = 4506dc7484898d397adf34922d534082d9f598ad | |
49 | SHA512 (openjdk7/openjdk-1.8.131-20170427.tar.xz) = 71eb5a6683722560c345a315f0f329009bd3408e9cff2c41e42e1645c7a9bc751a85d15c131cb53d50450a7be320d4446ee0844e1f68b2ad6541990d94ff5660 | 49 | SHA512 (openjdk7/openjdk-1.8.144-20170830.tar.xz) = 207f9ba412276a87b6305c83290266a65f7a9ae93299bcf8e6169863c1fceeae4345687efb99b3c02822c84f2d1ad0bec66c66c6a74c002958a4bc2db34ed0a7 | |
50 | Size (openjdk7/openjdk-1.8.131-20170427.tar.xz) = 55406864 bytes | 50 | Size (openjdk7/openjdk-1.8.144-20170830.tar.xz) = 55434592 bytes | |
51 | SHA1 (patch-aa) = fd07ea984cb0127b56a9b591c21c8d4f236fd9fc | 51 | SHA1 (patch-aa) = 512a42ff1a0d6c4a0672ec32e9396cc0c5c8c9fb | |
52 | SHA1 (patch-al) = f65f739805c2ef471a4de10d6da42e86c5561b8c | 52 | SHA1 (patch-al) = f65f739805c2ef471a4de10d6da42e86c5561b8c | |
53 | SHA1 (patch-an) = fce4da00762770c1c0592bd225bf73e875252178 | 53 | SHA1 (patch-an) = fce4da00762770c1c0592bd225bf73e875252178 | |
54 | SHA1 (patch-ap) = 89114a9ee048b92d897509feb283cf9aeeac9fc5 | 54 | SHA1 (patch-ap) = 89114a9ee048b92d897509feb283cf9aeeac9fc5 | |
55 | SHA1 (patch-as) = 484ba6dd99c650ebe3df5639548ee2874c326aaa | 55 | SHA1 (patch-as) = 484ba6dd99c650ebe3df5639548ee2874c326aaa | |
56 | SHA1 (patch-at) = 736ead4b9f391c711bf1f387d87ffb9363823557 | 56 | SHA1 (patch-at) = 736ead4b9f391c711bf1f387d87ffb9363823557 | |
57 | SHA1 (patch-ba) = a54a25d4f8982ff4d2cb4e7e456fe2a44656b800 | 57 | SHA1 (patch-ba) = a54a25d4f8982ff4d2cb4e7e456fe2a44656b800 | |
58 | SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63 | 58 | SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63 | |
59 | SHA1 (patch-bi) = 190056b3d4c42986ae0a600668b02711598361b8 | 59 | SHA1 (patch-bi) = 190056b3d4c42986ae0a600668b02711598361b8 | |
60 | SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892 | 60 | SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892 | |
61 | SHA1 (patch-common_autoconf_boot-jdk.m4) = 530da90ea4062f9d8c208557ff634579b0b19f55 | 61 | SHA1 (patch-common_autoconf_boot-jdk.m4) = 530da90ea4062f9d8c208557ff634579b0b19f55 | |
62 | SHA1 (patch-common_autoconf_generated-configure.sh) = 116f1b37fc737ca30998a28b40ef00f7be95a744 | 62 | SHA1 (patch-common_autoconf_generated-configure.sh) = 116f1b37fc737ca30998a28b40ef00f7be95a744 | |
63 | SHA1 (patch-common_autoconf_spec.gmk.in) = e98bc4c8a09f49c6a26447e6f78abf4709ee694b | 63 | SHA1 (patch-common_autoconf_spec.gmk.in) = e98bc4c8a09f49c6a26447e6f78abf4709ee694b | |
64 | SHA1 (patch-hotspot_agent_src_os_bsd_Makefile) = a686ca478011561df93cce6311b5a344d79c3a24 | 64 | SHA1 (patch-hotspot_agent_src_os_bsd_Makefile) = a686ca478011561df93cce6311b5a344d79c3a24 | |
@@ -90,31 +90,29 @@ SHA1 (patch-hotspot_src_os__cpu_solaris_ | @@ -90,31 +90,29 @@ SHA1 (patch-hotspot_src_os__cpu_solaris_ | |||
90 | SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp) = 6a6b719a52408e88b27d3f2a5a41789dc15ef39d | 90 | SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp) = 6a6b719a52408e88b27d3f2a5a41789dc15ef39d | |
91 | SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp) = 92377183e9b9f232dfd7161bf37a8856441f3977 | 91 | SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp) = 92377183e9b9f232dfd7161bf37a8856441f3977 | |
92 | SHA1 (patch-hotspot_src_os_bsd_vm_osThread__bsd.cpp) = b56cfc0abb53f9ec79005d9169566aadeecc51e7 | 92 | SHA1 (patch-hotspot_src_os_bsd_vm_osThread__bsd.cpp) = b56cfc0abb53f9ec79005d9169566aadeecc51e7 | |
93 | SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = bb1d9b46b43b61e29e9bdf1e4311a486a81dc6f4 | 93 | SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = bb1d9b46b43b61e29e9bdf1e4311a486a81dc6f4 | |
94 | SHA1 (patch-hotspot_src_os_solaris_dtrace_jhelper.d) = e4321382dc95fe9e363abc8c8a740e9f3f23c170 | 94 | SHA1 (patch-hotspot_src_os_solaris_dtrace_jhelper.d) = e4321382dc95fe9e363abc8c8a740e9f3f23c170 | |
95 | SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18a40b18dccfad4ef2765d47 | 95 | SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18a40b18dccfad4ef2765d47 | |
96 | SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = c8840633681c01d4a911e32e8d79060fbbdc506e | 96 | SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = c8840633681c01d4a911e32e8d79060fbbdc506e | |
97 | SHA1 (patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp) = 589bf0707023b9f799caf2cafe5aeba89af46b05 | 97 | SHA1 (patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp) = 589bf0707023b9f799caf2cafe5aeba89af46b05 | |
98 | SHA1 (patch-hotspot_src_share_vm_classfile_symbolTable.cpp) = c0077a7691ce2ba698f46d9fc8c81bf974aef68c | 98 | SHA1 (patch-hotspot_src_share_vm_classfile_symbolTable.cpp) = c0077a7691ce2ba698f46d9fc8c81bf974aef68c | |
99 | SHA1 (patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp) = b2bb8e74e43099fa9d1e157400bbb78386281235 | 99 | SHA1 (patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp) = b2bb8e74e43099fa9d1e157400bbb78386281235 | |
100 | SHA1 (patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp) = 9e9347f9695cce3599fe12448445bb20d9b36f08 | 100 | SHA1 (patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp) = 9e9347f9695cce3599fe12448445bb20d9b36f08 | |
101 | SHA1 (patch-hotspot_src_share_vm_memory_metaspace.cpp) = 260005e002e0926447952850bbc1150e50a05509 | 101 | SHA1 (patch-hotspot_src_share_vm_memory_metaspace.cpp) = 260005e002e0926447952850bbc1150e50a05509 | |
102 | SHA1 (patch-hotspot_src_share_vm_oops_klass.hpp) = 2a728aa8fb04976195ebf58549a544b97e56b329 | 102 | SHA1 (patch-hotspot_src_share_vm_oops_klass.hpp) = 2a728aa8fb04976195ebf58549a544b97e56b329 | |
103 | SHA1 (patch-hotspot_src_share_vm_opto_lcm.cpp) = a5ffd0c6e5dedade3438df017eae5415f6bc69bf | |||
104 | SHA1 (patch-hotspot_src_share_vm_opto_library__call.cpp) = 4654248e3fdf9a1be8ef5563e50b12dcd59aa1aa | 103 | SHA1 (patch-hotspot_src_share_vm_opto_library__call.cpp) = 4654248e3fdf9a1be8ef5563e50b12dcd59aa1aa | |
105 | SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = aacb4e03f62f1a6f9b38de39a966c318b70b1293 | 104 | SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = aacb4e03f62f1a6f9b38de39a966c318b70b1293 | |
106 | SHA1 (patch-hotspot_src_share_vm_runtime_arguments.cpp) = 80265396c62de95b0937d770c1dba0e8a53daa80 | 105 | SHA1 (patch-hotspot_src_share_vm_runtime_arguments.cpp) = 80265396c62de95b0937d770c1dba0e8a53daa80 | |
107 | SHA1 (patch-hotspot_src_share_vm_runtime_virtualspace.cpp) = b5d77a6b50ecbe6724c694d8e4bec67020b8e1d2 | |||
108 | SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = a8e8fef04d7acb4772f57961e7df3681bd53d0b9 | 106 | SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = a8e8fef04d7acb4772f57961e7df3681bd53d0b9 | |
109 | SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 83b90d951ce3aa9e913a36d792ac7376fb3d8bc7 | 107 | SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 83b90d951ce3aa9e913a36d792ac7376fb3d8bc7 | |
110 | SHA1 (patch-jdk_make_CompileDemos.gmk) = 4d5e2e9b0e35e373e6246408c775c25094b6f1c7 | 108 | SHA1 (patch-jdk_make_CompileDemos.gmk) = 4d5e2e9b0e35e373e6246408c775c25094b6f1c7 | |
111 | SHA1 (patch-jdk_make_CompileLaunchers.gmk) = fc386f8992db579483ad779f1aecfca762a29f92 | 109 | SHA1 (patch-jdk_make_CompileLaunchers.gmk) = fc386f8992db579483ad779f1aecfca762a29f92 | |
112 | SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5 | 110 | SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5 | |
113 | SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828 | 111 | SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828 | |
114 | SHA1 (patch-jdk_make_Images.gmk) = e6643dcb25ad5457efe610f6ab7fd0ccc9b5ed41 | 112 | SHA1 (patch-jdk_make_Images.gmk) = e6643dcb25ad5457efe610f6ab7fd0ccc9b5ed41 | |
115 | SHA1 (patch-jdk_make_lib_Awt2dLibraries.gmk) = 519960ee33b748b5d91b101c2d644117a6b18e12 | 113 | SHA1 (patch-jdk_make_lib_Awt2dLibraries.gmk) = 519960ee33b748b5d91b101c2d644117a6b18e12 | |
116 | SHA1 (patch-jdk_make_lib_CoreLibraries.gmk) = 0afdb43822b01b244d56446ae11d15629eeec285 | 114 | SHA1 (patch-jdk_make_lib_CoreLibraries.gmk) = 0afdb43822b01b244d56446ae11d15629eeec285 | |
117 | SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 5a1044c444e534d627b46d820d27bb545e65959d | 115 | SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 5a1044c444e534d627b46d820d27bb545e65959d | |
118 | SHA1 (patch-jdk_make_lib_ServiceabilityLibraries.gmk) = 76eb64f3602f67ccb346df7a0acedf097869ba76 | 116 | SHA1 (patch-jdk_make_lib_ServiceabilityLibraries.gmk) = 76eb64f3602f67ccb346df7a0acedf097869ba76 | |
119 | SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = b63cf0ebe204acf7264704916df875a31de84393 | 117 | SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = b63cf0ebe204acf7264704916df875a31de84393 | |
120 | SHA1 (patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java) = b7d53d0c3554eebde8f7180e75259eb25123ce8b | 118 | SHA1 (patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java) = b7d53d0c3554eebde8f7180e75259eb25123ce8b |
@@ -1,90 +1,81 @@ | @@ -1,90 +1,81 @@ | |||
1 | $NetBSD: patch-aa,v 1.4 2015/06/10 11:38:51 tnn Exp $ | 1 | $NetBSD: patch-aa,v 1.5 2017/09/02 04:13:42 ryoon Exp $ | |
2 | 2 | |||
3 | DragonFly support. | 3 | DragonFly support. | |
4 | Add workaround for missing sem_timedwait() in NetBSD < 6.99.4 | 4 | Add workaround for missing sem_timedwait() in NetBSD < 6.99.4 | |
5 | 5 | |||
6 | --- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2015-06-09 13:49:54.000000000 +0000 | 6 | --- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2017-08-29 17:18:54.000000000 +0000 | |
7 | +++ hotspot/src/os/bsd/vm/os_bsd.cpp | 7 | +++ hotspot/src/os/bsd/vm/os_bsd.cpp | |
8 | @@ -113,8 +113,11 @@ | 8 | @@ -114,8 +114,11 @@ | |
9 | # include <vm/vm_param.h> | 9 | # include <vm/vm_param.h> | |
10 | #endif | 10 | #endif | |
11 | 11 | |||
12 | -#if defined(__FreeBSD__) || defined(__NetBSD__) | 12 | -#if defined(__FreeBSD__) || defined(__NetBSD__) | |
13 | +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) | 13 | +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) | |
14 | # include <elf.h> | 14 | # include <elf.h> | |
15 | +#if !defined(EM_ALPHA) | 15 | +#if !defined(EM_ALPHA) | |
16 | +#define EM_ALPHA 0x9026 | 16 | +#define EM_ALPHA 0x9026 | |
17 | +#endif | 17 | +#endif | |
18 | #endif | 18 | #endif | |
19 | 19 | |||
20 | #ifdef __NetBSD__ | 20 | #ifdef __NetBSD__ | |
21 | @@ -287,6 +290,7 @@ void os::Bsd::initialize_system_info() { | 21 | @@ -292,6 +295,7 @@ void os::Bsd::initialize_system_info() { | |
22 | size_t len; | 22 | size_t len; | |
23 | int cpu_val; | 23 | int cpu_val; | |
24 | julong mem_val; | 24 | julong mem_val; | |
25 | + struct rlimit limits; | 25 | + struct rlimit limits; | |
26 | 26 | |||
27 | /* get processors count via hw.ncpus sysctl */ | 27 | /* get processors count via hw.ncpus sysctl */ | |
28 | mib[0] = CTL_HW; | 28 | mib[0] = CTL_HW; | |
29 | @@ -307,6 +311,8 @@ void os::Bsd::initialize_system_info() { | 29 | @@ -330,14 +334,11 @@ void os::Bsd::initialize_system_info() { | |
30 | ||||
31 | #if defined (HW_MEMSIZE) // Apple | |||
32 | mib[1] = HW_MEMSIZE; | |||
33 | +#elif defined(HW_PHYSMEM64) // NetBSD | |||
34 | + mib[1] = HW_PHYSMEM64; | |||
35 | #elif defined(HW_PHYSMEM) // Most of BSD | |||
36 | mib[1] = HW_PHYSMEM; | |||
37 | #elif defined(HW_REALMEM) // Old FreeBSD | |||
38 | @@ -323,14 +329,11 @@ void os::Bsd::initialize_system_info() { | |||
39 | _physical_memory = 256*1024*1024; // fallback (XXXBSD?) | 30 | _physical_memory = 256*1024*1024; // fallback (XXXBSD?) | |
40 | } | 31 | } | |
41 | 32 | |||
42 | -#ifdef __OpenBSD__ | 33 | -#ifdef __OpenBSD__ | |
43 | - { | 34 | - { | |
44 | - // limit _physical_memory memory view on OpenBSD since | 35 | - // limit _physical_memory memory view on OpenBSD since | |
45 | - // datasize rlimit restricts us anyway. | 36 | - // datasize rlimit restricts us anyway. | |
46 | - struct rlimit limits; | 37 | - struct rlimit limits; | |
47 | - getrlimit(RLIMIT_DATA, &limits); | 38 | - getrlimit(RLIMIT_DATA, &limits); | |
48 | - _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur); | 39 | - _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur); | |
49 | - } | 40 | - } | |
50 | + getrlimit(RLIMIT_DATA, &limits); | 41 | + getrlimit(RLIMIT_DATA, &limits); | |
51 | + _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur); | 42 | + _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur); | |
52 | +#if defined(RLIMIT_AS) | 43 | +#if defined(RLIMIT_AS) | |
53 | + getrlimit(RLIMIT_AS, &limits); | 44 | + getrlimit(RLIMIT_AS, &limits); | |
54 | + _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur); | 45 | + _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur); | |
55 | #endif | 46 | #endif | |
56 | } | 47 | } | |
57 | 48 | |||
58 | @@ -382,7 +385,7 @@ void os::init_system_properties_values() | 49 | @@ -389,7 +390,7 @@ void os::init_system_properties_values() | |
59 | // ... | 50 | // ... | |
60 | // 7: The default directories, normally /lib and /usr/lib. | 51 | // 7: The default directories, normally /lib and /usr/lib. | |
61 | #ifndef DEFAULT_LIBPATH | 52 | #ifndef DEFAULT_LIBPATH | |
62 | -#define DEFAULT_LIBPATH "/lib:/usr/lib" | 53 | -#define DEFAULT_LIBPATH "/lib:/usr/lib" | |
63 | +#define DEFAULT_LIBPATH "@PREFIX@/lib/jni:@PREFIX@/lib:/lib:/usr/lib" | 54 | +#define DEFAULT_LIBPATH "@PREFIX@/lib/jni:@PREFIX@/lib:/lib:/usr/lib" | |
64 | #endif | 55 | #endif | |
65 | 56 | |||
66 | // Base path of extensions installed on the system. | 57 | // Base path of extensions installed on the system. | |
67 | @@ -1566,7 +1569,9 @@ void * os::dll_load(const char *filename | 58 | @@ -1587,7 +1588,9 @@ void * os::dll_load(const char *filename | |
68 | {EM_PPC, EM_PPC, ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"}, | 59 | {EM_PPC, EM_PPC, ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"}, | |
69 | {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"}, | 60 | {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"}, | |
70 | {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"}, | 61 | {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"}, | |
71 | +#if 0 | 62 | +#if 0 | |
72 | {EM_S390, EM_S390, ELFCLASSNONE, ELFDATA2MSB, (char*)"IBM System/390"}, | 63 | {EM_S390, EM_S390, ELFCLASSNONE, ELFDATA2MSB, (char*)"IBM System/390"}, | |
73 | +#endif | 64 | +#endif | |
74 | {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"}, | 65 | {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"}, | |
75 | {EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"}, | 66 | {EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"}, | |
76 | {EM_MIPS, EM_MIPS, ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"}, | 67 | {EM_MIPS, EM_MIPS, ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"}, | |
77 | @@ -2097,6 +2102,33 @@ bool Semaphore::timedwait(unsigned int s | 68 | @@ -2121,6 +2124,33 @@ bool Semaphore::timedwait(unsigned int s | |
78 | 69 | |||
79 | #else | 70 | #else | |
80 | 71 | |||
81 | +#if defined(__NetBSD__) && (__NetBSD_Version__ < 699000400) | 72 | +#if defined(__NetBSD__) && (__NetBSD_Version__ < 699000400) | |
82 | +static inline int sem_timedwait(sem_t *sem, struct timespec *ts) { | 73 | +static inline int sem_timedwait(sem_t *sem, struct timespec *ts) { | |
83 | + struct timespec onems = { 0, 1000000 }; | 74 | + struct timespec onems = { 0, 1000000 }; | |
84 | + struct timespec total = { 0, 0 }; | 75 | + struct timespec total = { 0, 0 }; | |
85 | + struct timespec unslept; | 76 | + struct timespec unslept; | |
86 | + struct timespec elapsed; | 77 | + struct timespec elapsed; | |
87 | + struct timespec tmp; | 78 | + struct timespec tmp; | |
88 | + | 79 | + | |
89 | + while (timespeccmp(ts, &total, >)) { | 80 | + while (timespeccmp(ts, &total, >)) { | |
90 | + if (sem_trywait(sem) == 0) | 81 | + if (sem_trywait(sem) == 0) | |
@@ -98,40 +89,40 @@ Add workaround for missing sem_timedwai | @@ -98,40 +89,40 @@ Add workaround for missing sem_timedwai | |||
98 | + timespecsub(&onems, &unslept, &elapsed); | 89 | + timespecsub(&onems, &unslept, &elapsed); | |
99 | + timespecadd(&total, &elapsed, &tmp); | 90 | + timespecadd(&total, &elapsed, &tmp); | |
100 | + total.tv_sec = tmp.tv_sec; | 91 | + total.tv_sec = tmp.tv_sec; | |
101 | + total.tv_nsec = tmp.tv_nsec; | 92 | + total.tv_nsec = tmp.tv_nsec; | |
102 | + } | 93 | + } | |
103 | + errno = ETIMEDOUT; | 94 | + errno = ETIMEDOUT; | |
104 | + return -1; | 95 | + return -1; | |
105 | +} | 96 | +} | |
106 | +#endif /* __NetBSD__ */ | 97 | +#endif /* __NetBSD__ */ | |
107 | + | 98 | + | |
108 | bool Semaphore::trywait() { | 99 | bool Semaphore::trywait() { | |
109 | return sem_trywait(&_semaphore) == 0; | 100 | return sem_trywait(&_semaphore) == 0; | |
110 | } | 101 | } | |
111 | @@ -2247,7 +2279,7 @@ static void warn_fail_commit_memory(char | 102 | @@ -2271,7 +2301,7 @@ static void warn_fail_commit_memory(char | |
112 | // problem. | 103 | // problem. | |
113 | bool os::pd_commit_memory(char* addr, size_t size, bool exec) { | 104 | bool os::pd_commit_memory(char* addr, size_t size, bool exec) { | |
114 | int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; | 105 | int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; | |
115 | -#ifdef __OpenBSD__ | 106 | -#ifdef __OpenBSD__ | |
116 | +#if defined(__OpenBSD__) || defined(__NetBSD__) | 107 | +#if defined(__OpenBSD__) || defined(__NetBSD__) | |
117 | // XXX: Work-around mmap/MAP_FIXED bug temporarily on OpenBSD | 108 | // XXX: Work-around mmap/MAP_FIXED bug temporarily on OpenBSD | |
118 | if (::mprotect(addr, size, prot) == 0) { | 109 | if (::mprotect(addr, size, prot) == 0) { | |
119 | return true; | 110 | return true; | |
120 | @@ -2850,7 +2882,7 @@ OSReturn os::set_native_priority(Thread* | 111 | @@ -2874,7 +2904,7 @@ OSReturn os::set_native_priority(Thread* | |
121 | #ifdef __OpenBSD__ | 112 | #ifdef __OpenBSD__ | |
122 | // OpenBSD pthread_setprio starves low priority threads | 113 | // OpenBSD pthread_setprio starves low priority threads | |
123 | return OS_OK; | 114 | return OS_OK; | |
124 | -#elif defined(__FreeBSD__) | 115 | -#elif defined(__FreeBSD__) | |
125 | +#elif defined(__FreeBSD__) || defined(__DragonFly__) | 116 | +#elif defined(__FreeBSD__) || defined(__DragonFly__) | |
126 | int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri); | 117 | int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri); | |
127 | return (ret == 0) ? OS_OK : OS_ERR; | 118 | return (ret == 0) ? OS_OK : OS_ERR; | |
128 | #elif defined(__APPLE__) || defined(__NetBSD__) | 119 | #elif defined(__APPLE__) || defined(__NetBSD__) | |
129 | @@ -2879,7 +2911,7 @@ OSReturn os::get_native_priority(const T | 120 | @@ -2903,7 +2933,7 @@ OSReturn os::get_native_priority(const T | |
130 | } | 121 | } | |
131 | 122 | |||
132 | errno = 0; | 123 | errno = 0; | |
133 | -#if defined(__OpenBSD__) || defined(__FreeBSD__) | 124 | -#if defined(__OpenBSD__) || defined(__FreeBSD__) | |
134 | +#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) | 125 | +#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) | |
135 | *priority_ptr = pthread_getprio(thread->osthread()->pthread_id()); | 126 | *priority_ptr = pthread_getprio(thread->osthread()->pthread_id()); | |
136 | #elif defined(__APPLE__) || defined(__NetBSD__) | 127 | #elif defined(__APPLE__) || defined(__NetBSD__) | |
137 | int policy; | 128 | int policy; |