Update to 1.8.181

Changelog:
Fixed:
CVE-2018-2938
CVE-2018-2964
CVE-2018-2941
CVE-2018-2942
CVE-2018-2972
CVE-2018-2973
CVE-2018-2940
CVE-2018-2952

12 files changed, 20 insertions, 161 deletions

diff --git a/lang/openjdk8/Makefile b/lang/openjdk8/Makefile
index c737c8ce186..d8c0dcac29d 100644
--- a/lang/openjdk8/Makefile
+++ b/lang/openjdk8/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.69 2018/08/20 17:24:00 tnn Exp $
+# $NetBSD: Makefile,v 1.70 2018/09/15 02:51:02 ryoon Exp $
 
-DISTNAME=	openjdk-1.8.172-20180527
-PKGNAME=	openjdk8-1.8.172
-PKGREVISION=	1
+DISTNAME=	openjdk-1.8.181-20180914
+PKGNAME=	openjdk8-1.8.181
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo
index 7db65c23d6d..75cacbfc87c 100644
--- a/lang/openjdk8/distinfo
+++ b/lang/openjdk8/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.59 2018/09/14 15:53:46 tnn Exp $
+$NetBSD: distinfo,v 1.60 2018/09/15 02:51:02 ryoon Exp $
 
 SHA1 (openjdk7/bootstrap-jdk-1.7.141-netbsd-8-aarch64-20180914.tar.xz) = df24cbd6fb2ae529c80ab9d80b30680c24f43f44
 RMD160 (openjdk7/bootstrap-jdk-1.7.141-netbsd-8-aarch64-20180914.tar.xz) = e755550ef882116ea9d8e1d272d07e7b297deec8
@@ -65,10 +65,10 @@ SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892
 SHA1 (patch-common_autoconf_boot-jdk.m4) = 530da90ea4062f9d8c208557ff634579b0b19f55
 SHA1 (patch-common_autoconf_generated-configure.sh) = 71ceb540d46c9acd43b54c7d73c93e5b0a03f939
 SHA1 (patch-common_autoconf_spec.gmk.in) = e98bc4c8a09f49c6a26447e6f78abf4709ee694b
-SHA1 (patch-hotspot_agent_src_os_bsd_Makefile) = a686ca478011561df93cce6311b5a344d79c3a24
+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) = 36ba2dc2db7d802aa558ea984afa42ae2d61deb7
+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_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f2957b5c2a7a7982866f99239
@@ -85,7 +85,7 @@ SHA1 (patch-hotspot_make_solaris_makefiles_product.make) = c41b360302bffd9fbfaa3
 SHA1 (patch-hotspot_make_solaris_makefiles_saproc.make) = 0ca85ba72d154643b934815a0a2deb1e77371ff9
 SHA1 (patch-hotspot_make_solaris_makefiles_vm.make) = 787e0c68cf976fc0df3e19fb2a22b1b7e3662c07
 SHA1 (patch-hotspot_src_cpu_zero_vm_methodHandles__zero.cpp) = 9f7acf1eff3baba430880be9fd0f6148056dd088
-SHA1 (patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp) = dcd83b65a7d74e153a3e1c44f8c7980827ec20c7
+SHA1 (patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp) = 446b96a91a2e4fa76f43ac653d1608f037c64af9
 SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp) = e87224f8b67dc78fa411d30beff82ce5ccbb4cc5
 SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_orderAccess__bsd__zero.inline.hpp) = 6311d68db9064afc470f1d9fd37e63011899659a
 SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp) = cea10db5bf4ee4b939543b66340bfd59474ca5e0
@@ -107,15 +107,8 @@ SHA1 (patch-hotspot_src_share_vm_oops_klass.hpp) = 2a728aa8fb04976195ebf58549a54
 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_services_mallocSiteTable.hpp) = d0d8b8023d89c5cf6216d578478f5ed76a00740e
-SHA1 (patch-hotspot_src_share_vm_services_memTracker.cpp) = 8bd31a59a2514b99db2bb25b26bce54bd94a012e
-SHA1 (patch-hotspot_src_share_vm_services_memTracker.hpp) = 40239944a15cf5ef40a00bb5dd7078f412daca8e
-SHA1 (patch-hotspot_src_share_vm_services_virtualMemoryTracker.cpp) = 3bccafe6fb16029a065d74ea0b75a1541ee049d6
-SHA1 (patch-hotspot_src_share_vm_services_virtualMemoryTracker.hpp) = 8451d864668d7d78e148f684b4da46763f59a2b9
 SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = a8e8fef04d7acb4772f57961e7df3681bd53d0b9
 SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 83b90d951ce3aa9e913a36d792ac7376fb3d8bc7
-SHA1 (patch-hotspot_src_share_vm_utilities_nativeCallStack.cpp) = bfda35cac1f44eeededa2e26747f1439fea34e8e
-SHA1 (patch-hotspot_src_share_vm_utilities_nativeCallStack.hpp) = e3d2aa1a98d7fc6e6a797cde3efbcf61fea03a27
 SHA1 (patch-jdk_make_CompileDemos.gmk) = 4d5e2e9b0e35e373e6246408c775c25094b6f1c7
 SHA1 (patch-jdk_make_CompileLaunchers.gmk) = d496999f10fc56b1d68283ab4636787058f51090
 SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5
diff --git a/lang/openjdk8/patches/patch-hotspot_agent_src_os_bsd_Makefile b/lang/openjdk8/patches/patch-hotspot_agent_src_os_bsd_Makefile
index 8d3b49c00c1..2e9cc56e76c 100644
--- a/lang/openjdk8/patches/patch-hotspot_agent_src_os_bsd_Makefile
+++ b/lang/openjdk8/patches/patch-hotspot_agent_src_os_bsd_Makefile
@@ -1,10 +1,10 @@
-$NetBSD: patch-hotspot_agent_src_os_bsd_Makefile,v 1.1 2017/07/24 12:27:33 wiz Exp $
+$NetBSD: patch-hotspot_agent_src_os_bsd_Makefile,v 1.2 2018/09/15 02:51:02 ryoon Exp $
 
---- hotspot/agent/src/os/bsd/Makefile.orig	2017-04-27 09:45:04.000000000 +0000
+--- hotspot/agent/src/os/bsd/Makefile.orig	2018-09-14 14:55:42.000000000 +0000
 +++ hotspot/agent/src/os/bsd/Makefile
-@@ -85,6 +85,8 @@ ifndef LDNOMAP
-   LFLAGS_LIBSA = -Xlinker --version-script=mapfile
- endif
+@@ -88,6 +88,8 @@ endif
+ LDFLAGS_NO_EXEC_STACK="-Wl,-z,noexecstack"
+ LFLAGS_LIBSA += $(LDFLAGS_NO_EXEC_STACK)
  
 +LFLAGS_LIBSA += $(EXTRA_LDFLAGS)
 +
diff --git a/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_jsig.make b/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_jsig.make
index 5ff779bb59c..4dc1db45d31 100644
--- a/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_jsig.make
+++ b/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_jsig.make
@@ -1,13 +1,13 @@
-$NetBSD: patch-hotspot_make_bsd_makefiles_jsig.make,v 1.1 2017/07/24 12:27:33 wiz Exp $
+$NetBSD: patch-hotspot_make_bsd_makefiles_jsig.make,v 1.2 2018/09/15 02:51:02 ryoon Exp $
 
---- hotspot/make/bsd/makefiles/jsig.make.orig	2017-04-27 09:45:08.000000000 +0000
+--- hotspot/make/bsd/makefiles/jsig.make.orig	2018-09-14 14:55:42.000000000 +0000
 +++ hotspot/make/bsd/makefiles/jsig.make
 @@ -52,7 +52,7 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfi
  # cause problems with interposing. See CR: 6466665
  # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
  
--LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE)
-+LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
+-LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE) $(LDFLAGS_NO_EXEC_STACK)
++LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE) $(LDFLAGS_NO_EXEC_STACK) $(EXTRA_LDFLAGS)
  
  # DEBUG_BINARIES overrides everything, use full -g debug information
  ifeq ($(DEBUG_BINARIES), true)
diff --git a/lang/openjdk8/patches/patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp b/lang/openjdk8/patches/patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp
index d9df6bf372a..c36802ba2dc 100644
--- a/lang/openjdk8/patches/patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp
+++ b/lang/openjdk8/patches/patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp
@@ -1,8 +1,6 @@
-$NetBSD: patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp,v 1.1 2015/02/20 09:38:00 tnn Exp $
+$NetBSD: patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp,v 1.2 2018/09/15 02:51:02 ryoon Exp $
 
-Fix zero build w/ debug enabled
-
---- hotspot/src/cpu/zero/vm/nativeInst_zero.cpp.orig	2015-02-02 15:32:37.000000000 +0000
+--- hotspot/src/cpu/zero/vm/nativeInst_zero.cpp.orig	2018-09-14 14:55:42.000000000 +0000
 +++ hotspot/src/cpu/zero/vm/nativeInst_zero.cpp
 @@ -24,6 +24,7 @@
   */
@@ -10,5 +8,5 @@ Fix zero build w/ debug enabled
  #include "precompiled.hpp"
 +#include "interpreter/interpreter.hpp"
  #include "assembler_zero.inline.hpp"
- #include "memory/resourceArea.hpp"
- #include "nativeInst_zero.hpp"
+ #include "entry_zero.hpp"
+ #include "interpreter/cppInterpreter.hpp"
diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_mallocSiteTable.hpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_mallocSiteTable.hpp
deleted file mode 100644
index e6cda8949b9..00000000000
--- a/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_mallocSiteTable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-hotspot_src_share_vm_services_mallocSiteTable.hpp,v 1.1 2018/08/20 17:24:00 tnn Exp $
-
-clang>6 fixes.
-Ref: http://mail.openjdk.java.net/pipermail/bsd-port-dev/2018-May/003177.html
-
---- hotspot/src/share/vm/services/mallocSiteTable.hpp.orig	2018-05-26 23:58:31.000000000 +0000
-+++ hotspot/src/share/vm/services/mallocSiteTable.hpp
-@@ -42,7 +42,7 @@ class MallocSite : public AllocationSite
- 
-  public:
-   MallocSite() :
--    AllocationSite<MemoryCounter>(NativeCallStack::EMPTY_STACK), _flags(mtNone) {}
-+    AllocationSite<MemoryCounter>(NativeCallStack::EMPTY_STACK()), _flags(mtNone) {}
- 
-   MallocSite(const NativeCallStack& stack, MEMFLAGS flags) :
-     AllocationSite<MemoryCounter>(stack), _flags(flags) {}
diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_memTracker.cpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_memTracker.cpp
deleted file mode 100644
index d412c1dbc6a..00000000000
--- a/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_memTracker.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-hotspot_src_share_vm_services_memTracker.cpp,v 1.1 2018/08/20 17:24:00 tnn Exp $
-
-clang>6 fixes.
-Ref: http://mail.openjdk.java.net/pipermail/bsd-port-dev/2018-May/003177.html
-
---- hotspot/src/share/vm/services/memTracker.cpp.orig	2018-05-26 23:58:31.000000000 +0000
-+++ hotspot/src/share/vm/services/memTracker.cpp
-@@ -67,10 +67,6 @@ NMT_TrackingLevel MemTracker::init_track
-     os::unsetenv(buf);
-   }
- 
--  // Construct NativeCallStack::EMPTY_STACK. It may get constructed twice,
--  // but it is benign, the results are the same.
--  ::new ((void*)&NativeCallStack::EMPTY_STACK) NativeCallStack(0, false);
--
-   if (!MallocTracker::initialize(level) ||
-       !VirtualMemoryTracker::initialize(level)) {
-     level = NMT_off;
diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_memTracker.hpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_memTracker.hpp
deleted file mode 100644
index 9bf91dc77e3..00000000000
--- a/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_memTracker.hpp
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-hotspot_src_share_vm_services_memTracker.hpp,v 1.1 2018/08/20 17:24:00 tnn Exp $
-
-clang>6 fixes.
-Ref: http://mail.openjdk.java.net/pipermail/bsd-port-dev/2018-May/003177.html
-
---- hotspot/src/share/vm/services/memTracker.hpp.orig	2018-05-26 23:58:31.000000000 +0000
-+++ hotspot/src/share/vm/services/memTracker.hpp
-@@ -31,8 +31,8 @@
- 
- #if !INCLUDE_NMT
- 
--#define CURRENT_PC   NativeCallStack::EMPTY_STACK
--#define CALLER_PC    NativeCallStack::EMPTY_STACK
-+#define CURRENT_PC   NativeCallStack::EMPTY_STACK()
-+#define CALLER_PC    NativeCallStack::EMPTY_STACK()
- 
- class Tracker : public StackObj {
-  public:
-@@ -83,9 +83,9 @@ class MemTracker : AllStatic {
- extern volatile bool NMT_stack_walkable;
- 
- #define CURRENT_PC ((MemTracker::tracking_level() == NMT_detail && NMT_stack_walkable) ? \
--                    NativeCallStack(0, true) : NativeCallStack::EMPTY_STACK)
-+                    NativeCallStack(0, true) : NativeCallStack::EMPTY_STACK())
- #define CALLER_PC  ((MemTracker::tracking_level() == NMT_detail && NMT_stack_walkable) ?  \
--                    NativeCallStack(1, true) : NativeCallStack::EMPTY_STACK)
-+                    NativeCallStack(1, true) : NativeCallStack::EMPTY_STACK())
- 
- class MemBaseline;
- class Mutex;
diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_virtualMemoryTracker.cpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_virtualMemoryTracker.cpp
deleted file mode 100644
index 83f4980f1d4..00000000000
--- a/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_virtualMemoryTracker.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-hotspot_src_share_vm_services_virtualMemoryTracker.cpp,v 1.1 2018/08/20 17:24:00 tnn Exp $
-
-clang>6 fixes.
-Ref: http://mail.openjdk.java.net/pipermail/bsd-port-dev/2018-May/003177.html
-
---- hotspot/src/share/vm/services/virtualMemoryTracker.cpp.orig	2018-05-26 23:58:31.000000000 +0000
-+++ hotspot/src/share/vm/services/virtualMemoryTracker.cpp
-@@ -167,7 +167,7 @@ bool ReservedMemoryRegion::remove_uncomm
-           // higher part
-           address high_base = addr + sz;
-           size_t  high_size = top - high_base;
--          CommittedMemoryRegion high_rgn(high_base, high_size, NativeCallStack::EMPTY_STACK);
-+          CommittedMemoryRegion high_rgn(high_base, high_size, NativeCallStack::EMPTY_STACK());
-           return add_committed_region(high_rgn);
-         } else {
-           return false;
diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_virtualMemoryTracker.hpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_virtualMemoryTracker.hpp
deleted file mode 100644
index ee559ca43ba..00000000000
--- a/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_virtualMemoryTracker.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-hotspot_src_share_vm_services_virtualMemoryTracker.hpp,v 1.1 2018/08/20 17:24:00 tnn Exp $
-
-clang>6 fixes.
-Ref: http://mail.openjdk.java.net/pipermail/bsd-port-dev/2018-May/003177.html
-
---- hotspot/src/share/vm/services/virtualMemoryTracker.hpp.orig	2018-05-26 23:58:31.000000000 +0000
-+++ hotspot/src/share/vm/services/virtualMemoryTracker.hpp
-@@ -305,7 +305,7 @@ class ReservedMemoryRegion : public Virt
- 
- 
-   ReservedMemoryRegion(address base, size_t size) :
--    VirtualMemoryRegion(base, size), _stack(NativeCallStack::EMPTY_STACK), _flag(mtNone),
-+    VirtualMemoryRegion(base, size), _stack(NativeCallStack::EMPTY_STACK()), _flag(mtNone),
-     _all_committed(false) { }
- 
-   // Copy constructor
diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_nativeCallStack.cpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_nativeCallStack.cpp
deleted file mode 100644
index 46d1e8e6821..00000000000
--- a/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_nativeCallStack.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-hotspot_src_share_vm_utilities_nativeCallStack.cpp,v 1.1 2018/08/20 17:24:00 tnn Exp $
-
-clang>6 fixes.
-Ref: http://mail.openjdk.java.net/pipermail/bsd-port-dev/2018-May/003177.html
-
---- hotspot/src/share/vm/utilities/nativeCallStack.cpp.orig	2018-05-26 23:58:31.000000000 +0000
-+++ hotspot/src/share/vm/utilities/nativeCallStack.cpp
-@@ -27,7 +27,10 @@
- #include "utilities/globalDefinitions.hpp"
- #include "utilities/nativeCallStack.hpp"
- 
--const NativeCallStack NativeCallStack::EMPTY_STACK(0, false);
-+const NativeCallStack& NativeCallStack::EMPTY_STACK() {
-+  static const NativeCallStack empty(0, false);
-+  return empty;
-+}
- 
- NativeCallStack::NativeCallStack(int toSkip, bool fillStack) :
-   _hash_value(0) {
diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_nativeCallStack.hpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_nativeCallStack.hpp
deleted file mode 100644
index 4d3e2411d90..00000000000
--- a/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_nativeCallStack.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-hotspot_src_share_vm_utilities_nativeCallStack.hpp,v 1.1 2018/08/20 17:24:00 tnn Exp $
-
-clang>6 fixes.
-Ref: http://mail.openjdk.java.net/pipermail/bsd-port-dev/2018-May/003177.html
-
---- hotspot/src/share/vm/utilities/nativeCallStack.hpp.orig	2018-05-26 23:58:31.000000000 +0000
-+++ hotspot/src/share/vm/utilities/nativeCallStack.hpp
-@@ -53,7 +53,7 @@
-  */
- class NativeCallStack : public StackObj {
-  public:
--  static const NativeCallStack EMPTY_STACK;
-+  static const NativeCallStack& EMPTY_STACK();
- 
-  private:
-   address   _stack[NMT_TrackingStackDepth];