diff options
author | ryoon <ryoon@pkgsrc.org> | 2017-09-02 04:13:41 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2017-09-02 04:13:41 +0000 |
commit | a92bf5e8e047d5ab9f99948460f936eaa7e69c10 (patch) | |
tree | b99295a9fa58d67f2aa4ed5e1f5d26971b3103dc /lang/openjdk8 | |
parent | b987a59846878892aeddc53375f895dc51086bc4 (diff) | |
download | pkgsrc-a92bf5e8e047d5ab9f99948460f936eaa7e69c10.tar.gz |
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-10193
Diffstat (limited to 'lang/openjdk8')
-rw-r--r-- | lang/openjdk8/Makefile | 6 | ||||
-rw-r--r-- | lang/openjdk8/distinfo | 14 | ||||
-rw-r--r-- | lang/openjdk8/patches/patch-aa | 31 | ||||
-rw-r--r-- | lang/openjdk8/patches/patch-hotspot_src_share_vm_opto_lcm.cpp | 15 | ||||
-rw-r--r-- | lang/openjdk8/patches/patch-hotspot_src_share_vm_runtime_virtualspace.cpp | 15 |
5 files changed, 20 insertions, 61 deletions
diff --git a/lang/openjdk8/Makefile b/lang/openjdk8/Makefile index 6928640d827..fc9de702405 100644 --- a/lang/openjdk8/Makefile +++ b/lang/openjdk8/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.50 2017/07/24 12:27:33 wiz Exp $ +# $NetBSD: Makefile,v 1.51 2017/09/02 04:13:41 ryoon Exp $ -DISTNAME= openjdk-1.8.131-20170427 -PKGNAME= openjdk8-1.8.131 +DISTNAME= openjdk-1.8.144-20170830 +PKGNAME= openjdk8-1.8.144 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} EXTRACT_SUFX= .tar.xz diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo index 85d4e95329a..00920f6f0b6 100644 --- a/lang/openjdk8/distinfo +++ b/lang/openjdk8/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.49 2017/07/24 12:27:33 wiz Exp $ +$NetBSD: distinfo,v 1.50 2017/09/02 04:13:41 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 @@ -44,11 +44,11 @@ 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.131-20170427.tar.xz) = 1e3e6c385f26515dff92539ff6e52f8463839404 -RMD160 (openjdk7/openjdk-1.8.131-20170427.tar.xz) = 71b2cc0d06ebe98707b35a4bed7e96a3e398f46e -SHA512 (openjdk7/openjdk-1.8.131-20170427.tar.xz) = 71eb5a6683722560c345a315f0f329009bd3408e9cff2c41e42e1645c7a9bc751a85d15c131cb53d50450a7be320d4446ee0844e1f68b2ad6541990d94ff5660 -Size (openjdk7/openjdk-1.8.131-20170427.tar.xz) = 55406864 bytes -SHA1 (patch-aa) = fd07ea984cb0127b56a9b591c21c8d4f236fd9fc +SHA1 (openjdk7/openjdk-1.8.144-20170830.tar.xz) = a897c539fec09e9f97769f4fd64e4f387569c8b4 +RMD160 (openjdk7/openjdk-1.8.144-20170830.tar.xz) = 4506dc7484898d397adf34922d534082d9f598ad +SHA512 (openjdk7/openjdk-1.8.144-20170830.tar.xz) = 207f9ba412276a87b6305c83290266a65f7a9ae93299bcf8e6169863c1fceeae4345687efb99b3c02822c84f2d1ad0bec66c66c6a74c002958a4bc2db34ed0a7 +Size (openjdk7/openjdk-1.8.144-20170830.tar.xz) = 55434592 bytes +SHA1 (patch-aa) = 512a42ff1a0d6c4a0672ec32e9396cc0c5c8c9fb SHA1 (patch-al) = f65f739805c2ef471a4de10d6da42e86c5561b8c SHA1 (patch-an) = fce4da00762770c1c0592bd225bf73e875252178 SHA1 (patch-ap) = 89114a9ee048b92d897509feb283cf9aeeac9fc5 @@ -100,11 +100,9 @@ SHA1 (patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compacti 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_lcm.cpp) = a5ffd0c6e5dedade3438df017eae5415f6bc69bf SHA1 (patch-hotspot_src_share_vm_opto_library__call.cpp) = 4654248e3fdf9a1be8ef5563e50b12dcd59aa1aa 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_runtime_virtualspace.cpp) = b5d77a6b50ecbe6724c694d8e4bec67020b8e1d2 SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = a8e8fef04d7acb4772f57961e7df3681bd53d0b9 SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 83b90d951ce3aa9e913a36d792ac7376fb3d8bc7 SHA1 (patch-jdk_make_CompileDemos.gmk) = 4d5e2e9b0e35e373e6246408c775c25094b6f1c7 diff --git a/lang/openjdk8/patches/patch-aa b/lang/openjdk8/patches/patch-aa index d0006e912d8..198401b9aca 100644 --- a/lang/openjdk8/patches/patch-aa +++ b/lang/openjdk8/patches/patch-aa @@ -1,11 +1,11 @@ -$NetBSD: patch-aa,v 1.4 2015/06/10 11:38:51 tnn Exp $ +$NetBSD: patch-aa,v 1.5 2017/09/02 04:13:42 ryoon Exp $ DragonFly support. Add workaround for missing sem_timedwait() in NetBSD < 6.99.4 ---- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2015-06-09 13:49:54.000000000 +0000 +--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2017-08-29 17:18:54.000000000 +0000 +++ hotspot/src/os/bsd/vm/os_bsd.cpp -@@ -113,8 +113,11 @@ +@@ -114,8 +114,11 @@ # include <vm/vm_param.h> #endif @@ -18,7 +18,7 @@ Add workaround for missing sem_timedwait() in NetBSD < 6.99.4 #endif #ifdef __NetBSD__ -@@ -287,6 +290,7 @@ void os::Bsd::initialize_system_info() { +@@ -292,6 +295,7 @@ void os::Bsd::initialize_system_info() { size_t len; int cpu_val; julong mem_val; @@ -26,16 +26,7 @@ Add workaround for missing sem_timedwait() in NetBSD < 6.99.4 /* get processors count via hw.ncpus sysctl */ mib[0] = CTL_HW; -@@ -307,6 +311,8 @@ void os::Bsd::initialize_system_info() { - - #if defined (HW_MEMSIZE) // Apple - mib[1] = HW_MEMSIZE; -+#elif defined(HW_PHYSMEM64) // NetBSD -+ mib[1] = HW_PHYSMEM64; - #elif defined(HW_PHYSMEM) // Most of BSD - mib[1] = HW_PHYSMEM; - #elif defined(HW_REALMEM) // Old FreeBSD -@@ -323,14 +329,11 @@ void os::Bsd::initialize_system_info() { +@@ -330,14 +334,11 @@ void os::Bsd::initialize_system_info() { _physical_memory = 256*1024*1024; // fallback (XXXBSD?) } @@ -55,7 +46,7 @@ Add workaround for missing sem_timedwait() in NetBSD < 6.99.4 #endif } -@@ -382,7 +385,7 @@ void os::init_system_properties_values() +@@ -389,7 +390,7 @@ void os::init_system_properties_values() // ... // 7: The default directories, normally /lib and /usr/lib. #ifndef DEFAULT_LIBPATH @@ -64,7 +55,7 @@ Add workaround for missing sem_timedwait() in NetBSD < 6.99.4 #endif // Base path of extensions installed on the system. -@@ -1566,7 +1569,9 @@ void * os::dll_load(const char *filename +@@ -1587,7 +1588,9 @@ void * os::dll_load(const char *filename {EM_PPC, EM_PPC, ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"}, {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"}, {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"}, @@ -74,7 +65,7 @@ Add workaround for missing sem_timedwait() in NetBSD < 6.99.4 {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"}, {EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"}, {EM_MIPS, EM_MIPS, ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"}, -@@ -2097,6 +2102,33 @@ bool Semaphore::timedwait(unsigned int s +@@ -2121,6 +2124,33 @@ bool Semaphore::timedwait(unsigned int s #else @@ -108,7 +99,7 @@ Add workaround for missing sem_timedwait() in NetBSD < 6.99.4 bool Semaphore::trywait() { return sem_trywait(&_semaphore) == 0; } -@@ -2247,7 +2279,7 @@ static void warn_fail_commit_memory(char +@@ -2271,7 +2301,7 @@ static void warn_fail_commit_memory(char // problem. bool os::pd_commit_memory(char* addr, size_t size, bool exec) { int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; @@ -117,7 +108,7 @@ Add workaround for missing sem_timedwait() in NetBSD < 6.99.4 // XXX: Work-around mmap/MAP_FIXED bug temporarily on OpenBSD if (::mprotect(addr, size, prot) == 0) { return true; -@@ -2850,7 +2882,7 @@ OSReturn os::set_native_priority(Thread* +@@ -2874,7 +2904,7 @@ OSReturn os::set_native_priority(Thread* #ifdef __OpenBSD__ // OpenBSD pthread_setprio starves low priority threads return OS_OK; @@ -126,7 +117,7 @@ Add workaround for missing sem_timedwait() in NetBSD < 6.99.4 int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri); return (ret == 0) ? OS_OK : OS_ERR; #elif defined(__APPLE__) || defined(__NetBSD__) -@@ -2879,7 +2911,7 @@ OSReturn os::get_native_priority(const T +@@ -2903,7 +2933,7 @@ OSReturn os::get_native_priority(const T } errno = 0; diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_opto_lcm.cpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_opto_lcm.cpp deleted file mode 100644 index 496ead847bd..00000000000 --- a/lang/openjdk8/patches/patch-hotspot_src_share_vm_opto_lcm.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-hotspot_src_share_vm_opto_lcm.cpp,v 1.1 2016/12/15 23:56:53 joerg Exp $ - -Pointers are not ordered relative to 0. - ---- hotspot/src/share/vm/opto/lcm.cpp.orig 2016-12-10 16:03:32.851968675 +0000 -+++ hotspot/src/share/vm/opto/lcm.cpp -@@ -49,7 +49,7 @@ - // Check whether val is not-null-decoded compressed oop, - // i.e. will grab into the base of the heap if it represents NULL. - static bool accesses_heap_base_zone(Node *val) { -- if (Universe::narrow_oop_base() > 0) { // Implies UseCompressedOops. -+ if (Universe::narrow_oop_base()) { // Implies UseCompressedOops. - if (val && val->is_Mach()) { - if (val->as_Mach()->ideal_Opcode() == Op_DecodeN) { - // This assumes all Decodes with TypePtr::NotNull are matched to nodes that diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_runtime_virtualspace.cpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_runtime_virtualspace.cpp deleted file mode 100644 index 70f393d0b1f..00000000000 --- a/lang/openjdk8/patches/patch-hotspot_src_share_vm_runtime_virtualspace.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-hotspot_src_share_vm_runtime_virtualspace.cpp,v 1.1 2016/12/15 23:56:53 joerg Exp $ - -Pointers are not ordered relative to 0. - ---- hotspot/src/share/vm/runtime/virtualspace.cpp.orig 2016-12-10 16:09:08.597267563 +0000 -+++ hotspot/src/share/vm/runtime/virtualspace.cpp -@@ -342,7 +342,7 @@ ReservedHeapSpace::ReservedHeapSpace(siz - (UseCompressedOops && (Universe::narrow_oop_base() != NULL) && - Universe::narrow_oop_use_implicit_null_checks()) ? - lcm(os::vm_page_size(), alignment) : 0) { -- if (base() > 0) { -+ if (base()) { - MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap); - } - |